diff --git a/.changeset/bump-patch-1732728542480.md b/.changeset/bump-patch-1732728542480.md
new file mode 100644
index 000000000000..e1eaa7980afb
--- /dev/null
+++ b/.changeset/bump-patch-1732728542480.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Bump @rocket.chat/meteor version.
diff --git a/.changeset/bump-patch-1732835767114.md b/.changeset/bump-patch-1732835767114.md
new file mode 100644
index 000000000000..e1eaa7980afb
--- /dev/null
+++ b/.changeset/bump-patch-1732835767114.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Bump @rocket.chat/meteor version.
diff --git a/.changeset/bump-patch-1733170421495.md b/.changeset/bump-patch-1733170421495.md
new file mode 100644
index 000000000000..e1eaa7980afb
--- /dev/null
+++ b/.changeset/bump-patch-1733170421495.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Bump @rocket.chat/meteor version.
diff --git a/.changeset/clean-flies-collect.md b/.changeset/clean-flies-collect.md
new file mode 100644
index 000000000000..4921355b51e8
--- /dev/null
+++ b/.changeset/clean-flies-collect.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fix user highlights not matching only whole words
diff --git a/.changeset/curvy-flies-greet.md b/.changeset/curvy-flies-greet.md
new file mode 100644
index 000000000000..aeac8382b152
--- /dev/null
+++ b/.changeset/curvy-flies-greet.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Remove unused client side `setUserActiveStatus` meteor method.
diff --git a/.changeset/fair-colts-remain.md b/.changeset/fair-colts-remain.md
new file mode 100644
index 000000000000..7ce003e50fd5
--- /dev/null
+++ b/.changeset/fair-colts-remain.md
@@ -0,0 +1,13 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/account-service": patch
+"@rocket.chat/authorization-service": patch
+"@rocket.chat/ddp-streamer": patch
+"@rocket.chat/omnichannel-transcript": patch
+"@rocket.chat/presence-service": patch
+"@rocket.chat/queue-worker": patch
+"@rocket.chat/stream-hub-service": patch
+"rocketchat-services": patch
+---
+
+Bump meteor to 3.0.4 and Node version to 20.18.0
diff --git a/.changeset/forty-gorillas-kneel.md b/.changeset/forty-gorillas-kneel.md
new file mode 100644
index 000000000000..42df0ed8c0e4
--- /dev/null
+++ b/.changeset/forty-gorillas-kneel.md
@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/apps-engine": patch
+---
+
+Deprecated the `from` field in the apps email bridge and made it optional, using the server's settings when the field is omitted
diff --git a/.changeset/friendly-ravens-teach.md b/.changeset/friendly-ravens-teach.md
new file mode 100644
index 000000000000..1c464a8679b6
--- /dev/null
+++ b/.changeset/friendly-ravens-teach.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': minor
+---
+
+adds unread badge to sidebar collapser
diff --git a/.changeset/green-papayas-thank.md b/.changeset/green-papayas-thank.md
new file mode 100644
index 000000000000..22547db942ef
--- /dev/null
+++ b/.changeset/green-papayas-thank.md
@@ -0,0 +1,7 @@
+---
+'@rocket.chat/model-typings': patch
+'@rocket.chat/core-typings': patch
+'@rocket.chat/meteor': patch
+---
+
+Fixes an issue where updating custom emojis didn’t work as expected, ensuring that uploaded emojis now update correctly and display without any caching problems.
diff --git a/.changeset/happy-stingrays-provide.md b/.changeset/happy-stingrays-provide.md
new file mode 100644
index 000000000000..fba25665133a
--- /dev/null
+++ b/.changeset/happy-stingrays-provide.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixes issue that could cause multiple discussions to be created when creating it from a message action
diff --git a/.changeset/honest-pumpkins-joke.md b/.changeset/honest-pumpkins-joke.md
new file mode 100644
index 000000000000..aa1abce9ad6d
--- /dev/null
+++ b/.changeset/honest-pumpkins-joke.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+adds missing html attributes in sidebar item templates
diff --git a/.changeset/lazy-avocados-whisper.md b/.changeset/lazy-avocados-whisper.md
new file mode 100644
index 000000000000..b1296186c37c
--- /dev/null
+++ b/.changeset/lazy-avocados-whisper.md
@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": minor
+"@rocket.chat/i18n": minor
+---
+
+Improves thread metrics featuring user avatars, better titles and repositioned elements.
diff --git a/.changeset/lemon-foxes-carry.md b/.changeset/lemon-foxes-carry.md
new file mode 100644
index 000000000000..7e14dda30747
--- /dev/null
+++ b/.changeset/lemon-foxes-carry.md
@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/i18n": patch
+---
+
+Fixes message character limit not being applied to file upload descriptions
\ No newline at end of file
diff --git a/.changeset/light-terms-ring.md b/.changeset/light-terms-ring.md
new file mode 100644
index 000000000000..4437c5c4d596
--- /dev/null
+++ b/.changeset/light-terms-ring.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes the issue where newly created teams are incorrectly displayed as channels on the sidebar when the DISABLE_DB_WATCHERS environment variable is enabled
diff --git a/.changeset/mean-cobras-sneeze.md b/.changeset/mean-cobras-sneeze.md
new file mode 100644
index 000000000000..39717f0c0d89
--- /dev/null
+++ b/.changeset/mean-cobras-sneeze.md
@@ -0,0 +1,6 @@
+---
+'@rocket.chat/rest-typings': minor
+'@rocket.chat/meteor': minor
+---
+
+Adds cursor pagination on chat.syncMessages endpoint
diff --git a/.changeset/metal-avocados-serve.md b/.changeset/metal-avocados-serve.md
new file mode 100644
index 000000000000..478407fcb97b
--- /dev/null
+++ b/.changeset/metal-avocados-serve.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/livechat": patch
+---
+
+Fixes the 'Finish Chat' option in Livechat appearing before the conversation is started, which caused the action to fail.
diff --git a/.changeset/neat-flies-drive.md b/.changeset/neat-flies-drive.md
new file mode 100644
index 000000000000..27b5270f81f9
--- /dev/null
+++ b/.changeset/neat-flies-drive.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Adds a divider on Create team modal - advanced settings
diff --git a/.changeset/nervous-rivers-fry.md b/.changeset/nervous-rivers-fry.md
new file mode 100644
index 000000000000..278259c53a86
--- /dev/null
+++ b/.changeset/nervous-rivers-fry.md
@@ -0,0 +1,6 @@
+---
+'@rocket.chat/apps-engine': patch
+'@rocket.chat/meteor': patch
+---
+
+Fixed an issue that would grant network permission to app's processes in wrong cases
diff --git a/.changeset/old-coins-bow.md b/.changeset/old-coins-bow.md
new file mode 100644
index 000000000000..1790cc205160
--- /dev/null
+++ b/.changeset/old-coins-bow.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/apps-engine': patch
+---
+
+Fixes an issue that would cause apps to appear disabled after a subprocess restart
diff --git a/.changeset/pink-dodos-greet.md b/.changeset/pink-dodos-greet.md
new file mode 100644
index 000000000000..f122a2e72fc7
--- /dev/null
+++ b/.changeset/pink-dodos-greet.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes sidepanel not replicating sidebar sort preference
diff --git a/.changeset/plenty-snakes-dream.md b/.changeset/plenty-snakes-dream.md
new file mode 100644
index 000000000000..eecbf0cbb466
--- /dev/null
+++ b/.changeset/plenty-snakes-dream.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": minor
+---
+
+Adds a new route to allow fetching avatars by the user's id `/avatar/uid/<UserID>`
diff --git a/.changeset/popular-queens-brake.md b/.changeset/popular-queens-brake.md
new file mode 100644
index 000000000000..5114920b8fde
--- /dev/null
+++ b/.changeset/popular-queens-brake.md
@@ -0,0 +1,17 @@
+---
+'@rocket.chat/model-typings': minor
+'@rocket.chat/core-typings': minor
+'@rocket.chat/rest-typings': minor
+'@rocket.chat/apps-engine': minor
+'@rocket.chat/i18n': minor
+'@rocket.chat/meteor': minor
+---
+
+These changes aims to add:
+- A brand-new omnichannel contact profile
+- The ability to communicate with known contacts only
+- Communicate with verified contacts only
+- Merge verified contacts across different channels
+- Block contact channels
+- Resolve conflicting contact information when registered via different channels
+- An advanced contact center filters
diff --git a/.changeset/pre.json b/.changeset/pre.json
new file mode 100644
index 000000000000..7ef999ab9254
--- /dev/null
+++ b/.changeset/pre.json
@@ -0,0 +1,113 @@
+{
+  "mode": "pre",
+  "tag": "rc",
+  "initialVersions": {
+    "@rocket.chat/meteor": "7.1.0-develop",
+    "rocketchat-services": "2.0.0",
+    "@rocket.chat/uikit-playground": "0.6.0",
+    "@rocket.chat/account-service": "0.4.9",
+    "@rocket.chat/authorization-service": "0.4.9",
+    "@rocket.chat/ddp-streamer": "0.3.9",
+    "@rocket.chat/omnichannel-transcript": "0.4.9",
+    "@rocket.chat/presence-service": "0.4.9",
+    "@rocket.chat/queue-worker": "0.4.9",
+    "@rocket.chat/stream-hub-service": "0.4.9",
+    "@rocket.chat/license": "1.0.0",
+    "@rocket.chat/network-broker": "0.1.1",
+    "@rocket.chat/omnichannel-services": "0.3.6",
+    "@rocket.chat/pdf-worker": "0.2.6",
+    "@rocket.chat/presence": "0.2.9",
+    "@rocket.chat/ui-theming": "0.4.0",
+    "@rocket.chat/account-utils": "0.0.2",
+    "@rocket.chat/agenda": "0.1.0",
+    "@rocket.chat/api-client": "0.2.9",
+    "@rocket.chat/apps": "0.2.0",
+    "@rocket.chat/apps-engine": "1.47.0",
+    "@rocket.chat/base64": "1.0.13",
+    "@rocket.chat/cas-validate": "0.0.2",
+    "@rocket.chat/core-services": "0.7.1",
+    "@rocket.chat/core-typings": "7.1.0-develop",
+    "@rocket.chat/cron": "0.1.9",
+    "@rocket.chat/ddp-client": "0.3.9",
+    "@rocket.chat/eslint-config": "0.7.0",
+    "@rocket.chat/favicon": "0.0.2",
+    "@rocket.chat/freeswitch": "1.0.0",
+    "@rocket.chat/fuselage-ui-kit": "12.0.0",
+    "@rocket.chat/gazzodown": "12.0.0",
+    "@rocket.chat/i18n": "1.0.0",
+    "@rocket.chat/instance-status": "0.1.9",
+    "@rocket.chat/jest-presets": "0.0.1",
+    "@rocket.chat/jwt": "0.1.1",
+    "@rocket.chat/livechat": "1.20.1",
+    "@rocket.chat/log-format": "0.0.2",
+    "@rocket.chat/logger": "0.0.2",
+    "@rocket.chat/message-parser": "0.31.31",
+    "@rocket.chat/mock-providers": "0.1.4",
+    "@rocket.chat/model-typings": "1.0.0",
+    "@rocket.chat/models": "1.0.0",
+    "@rocket.chat/poplib": "0.0.2",
+    "@rocket.chat/password-policies": "0.0.2",
+    "@rocket.chat/patch-injection": "0.0.1",
+    "@rocket.chat/peggy-loader": "0.31.27",
+    "@rocket.chat/random": "1.2.2",
+    "@rocket.chat/release-action": "2.2.3",
+    "@rocket.chat/release-changelog": "0.1.0",
+    "@rocket.chat/rest-typings": "7.1.0-develop",
+    "@rocket.chat/server-cloud-communication": "0.0.2",
+    "@rocket.chat/server-fetch": "0.0.3",
+    "@rocket.chat/sha256": "1.0.10",
+    "@rocket.chat/tools": "0.2.2",
+    "@rocket.chat/tracing": "0.0.1",
+    "@rocket.chat/ui-avatar": "8.0.0",
+    "@rocket.chat/ui-client": "12.0.0",
+    "@rocket.chat/ui-composer": "0.4.0",
+    "@rocket.chat/ui-contexts": "12.0.0",
+    "@rocket.chat/ui-kit": "0.37.0",
+    "@rocket.chat/ui-video-conf": "12.0.0",
+    "@rocket.chat/ui-voip": "2.0.0",
+    "@rocket.chat/web-ui-registration": "12.0.0"
+  },
+  "changesets": [
+    "bump-patch-1732728542480",
+    "bump-patch-1732835767114",
+    "bump-patch-1733170421495",
+    "clean-flies-collect",
+    "curvy-flies-greet",
+    "fair-colts-remain",
+    "forty-gorillas-kneel",
+    "friendly-ravens-teach",
+    "green-papayas-thank",
+    "happy-stingrays-provide",
+    "honest-pumpkins-joke",
+    "lazy-avocados-whisper",
+    "lemon-foxes-carry",
+    "light-terms-ring",
+    "mean-cobras-sneeze",
+    "metal-avocados-serve",
+    "neat-flies-drive",
+    "nervous-rivers-fry",
+    "old-coins-bow",
+    "pink-dodos-greet",
+    "plenty-snakes-dream",
+    "popular-queens-brake",
+    "real-jeans-worry",
+    "serious-mice-film",
+    "seven-berries-check",
+    "seven-otters-fold",
+    "silent-steaks-happen",
+    "smart-radios-reflect",
+    "spicy-spiders-search",
+    "spotty-ads-knock",
+    "stale-actors-enjoy",
+    "sweet-needles-melt",
+    "swift-suns-perform",
+    "three-dragons-brush",
+    "tricky-trees-destroy",
+    "twelve-horses-suffer",
+    "twenty-news-own",
+    "two-guests-tan",
+    "unlucky-kangaroos-yawn",
+    "unlucky-wasps-check",
+    "weak-trees-exercise"
+  ]
+}
diff --git a/.changeset/real-jeans-worry.md b/.changeset/real-jeans-worry.md
new file mode 100644
index 000000000000..9b16e7681a98
--- /dev/null
+++ b/.changeset/real-jeans-worry.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixes banner breaking the UI with specific payloads
diff --git a/.changeset/serious-mice-film.md b/.changeset/serious-mice-film.md
new file mode 100644
index 000000000000..35a2d6704071
--- /dev/null
+++ b/.changeset/serious-mice-film.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes client-side updates for recent emoji list when custom emojis are modified.
diff --git a/.changeset/seven-berries-check.md b/.changeset/seven-berries-check.md
new file mode 100644
index 000000000000..b8cd3c49897f
--- /dev/null
+++ b/.changeset/seven-berries-check.md
@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/i18n": patch
+---
+
+Adds "Master volume" and "Call ringer volume" to the user preferences sound section.
diff --git a/.changeset/seven-otters-fold.md b/.changeset/seven-otters-fold.md
new file mode 100644
index 000000000000..7f2af2075f73
--- /dev/null
+++ b/.changeset/seven-otters-fold.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Sends server statistics only once a day despite multiple instance being started at different times.
diff --git a/.changeset/silent-steaks-happen.md b/.changeset/silent-steaks-happen.md
new file mode 100644
index 000000000000..1ae791c68177
--- /dev/null
+++ b/.changeset/silent-steaks-happen.md
@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": minor
+"@rocket.chat/i18n": minor
+---
+
+Improves the customizability of the naming of automatic Persistent video calls discussions, allowing the date of the call to be in different parts of the name, using the `[date]` keyword.
diff --git a/.changeset/smart-radios-reflect.md b/.changeset/smart-radios-reflect.md
new file mode 100644
index 000000000000..58ea7413e51c
--- /dev/null
+++ b/.changeset/smart-radios-reflect.md
@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/core-services": patch
+---
+
+stops calling an object through proxy calling getQueueWorker
diff --git a/.changeset/spicy-spiders-search.md b/.changeset/spicy-spiders-search.md
new file mode 100644
index 000000000000..d86bc93313c5
--- /dev/null
+++ b/.changeset/spicy-spiders-search.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixed an issue where the installed apps list would go stale without a refresh in some cases
diff --git a/.changeset/spotty-ads-knock.md b/.changeset/spotty-ads-knock.md
new file mode 100644
index 000000000000..b40e70b74a98
--- /dev/null
+++ b/.changeset/spotty-ads-knock.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes display of emoji aliases in custom emoji list by adding commas between aliases
diff --git a/.changeset/stale-actors-enjoy.md b/.changeset/stale-actors-enjoy.md
new file mode 100644
index 000000000000..baff2b19b667
--- /dev/null
+++ b/.changeset/stale-actors-enjoy.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixes `waiting queue` feature. When `Livechat_waiting_queue` setting is enabled, incoming conversations should be sent to the queue instead of being assigned directly.
diff --git a/.changeset/sweet-needles-melt.md b/.changeset/sweet-needles-melt.md
new file mode 100644
index 000000000000..51cd6e03d831
--- /dev/null
+++ b/.changeset/sweet-needles-melt.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes edge case of thread unread not being added to unread group
diff --git a/.changeset/swift-suns-perform.md b/.changeset/swift-suns-perform.md
new file mode 100644
index 000000000000..2a52249d984c
--- /dev/null
+++ b/.changeset/swift-suns-perform.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/livechat": patch
+---
+
+Fixes livechat popout mode not working correctly in cross domain situations
diff --git a/.changeset/three-dragons-brush.md b/.changeset/three-dragons-brush.md
new file mode 100644
index 000000000000..d80c4dc83306
--- /dev/null
+++ b/.changeset/three-dragons-brush.md
@@ -0,0 +1,8 @@
+---
+'@rocket.chat/apps-engine': minor
+'@rocket.chat/livechat': minor
+'@rocket.chat/i18n': minor
+'@rocket.chat/meteor': minor
+---
+
+Prevent apps' subprocesses from crashing on unhandled rejections or uncaught exceptions
diff --git a/.changeset/tricky-trees-destroy.md b/.changeset/tricky-trees-destroy.md
new file mode 100644
index 000000000000..3d43cc5b571a
--- /dev/null
+++ b/.changeset/tricky-trees-destroy.md
@@ -0,0 +1,4 @@
+---
+"@rocket.chat/meteor": patch
+---
+Adds login and permission validation for resetIrcConnection method
diff --git a/.changeset/twelve-horses-suffer.md b/.changeset/twelve-horses-suffer.md
new file mode 100644
index 000000000000..bc7f7d5b3ba4
--- /dev/null
+++ b/.changeset/twelve-horses-suffer.md
@@ -0,0 +1,6 @@
+---
+'@rocket.chat/i18n': minor
+'@rocket.chat/meteor': minor
+---
+
+Adds a confirmation modal to the cancel subscription action
diff --git a/.changeset/twenty-news-own.md b/.changeset/twenty-news-own.md
new file mode 100644
index 000000000000..c48d06e0a05e
--- /dev/null
+++ b/.changeset/twenty-news-own.md
@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": minor
+"@rocket.chat/i18n": minor
+---
+
+Disables the possiblity to upload exempted apps
diff --git a/.changeset/two-guests-tan.md b/.changeset/two-guests-tan.md
new file mode 100644
index 000000000000..ff44f0ef493b
--- /dev/null
+++ b/.changeset/two-guests-tan.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/apps-engine': patch
+---
+
+Removed the 1 second timeout of `Pre` app events. Now they will follow the "global" configuration
diff --git a/.changeset/unlucky-kangaroos-yawn.md b/.changeset/unlucky-kangaroos-yawn.md
new file mode 100644
index 000000000000..1aaa97cbd8d8
--- /dev/null
+++ b/.changeset/unlucky-kangaroos-yawn.md
@@ -0,0 +1,6 @@
+---
+"@rocket.chat/meteor": patch
+"@rocket.chat/i18n": patch
+---
+
+Updates VoIP field labels from 'Free Extension Numbers' to 'Available Extensions' to better describe the field's purpose and improve clarity.
diff --git a/.changeset/unlucky-wasps-check.md b/.changeset/unlucky-wasps-check.md
new file mode 100644
index 000000000000..fd7e8af17824
--- /dev/null
+++ b/.changeset/unlucky-wasps-check.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixes an issue where resizable handler renders over the expanded thread view while using contextualbarResizable feature preview
diff --git a/.changeset/weak-trees-exercise.md b/.changeset/weak-trees-exercise.md
new file mode 100644
index 000000000000..230c087ccd83
--- /dev/null
+++ b/.changeset/weak-trees-exercise.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/apps-engine': minor
+---
+
+Add support to configure apps runtime timeout via the APPS_ENGINE_RUNTIME_TIMEOUT environment variable
diff --git a/.github/actions/build-docker-image/action.yml b/.github/actions/build-docker-image/action.yml
deleted file mode 100644
index fa0535d332c6..000000000000
--- a/.github/actions/build-docker-image/action.yml
+++ /dev/null
@@ -1,91 +0,0 @@
-name: 'Build Docker image'
-description: 'Build Rocket.Chat Docker image'
-
-inputs:
-  root-dir:
-    required: true
-  docker-tag:
-    required: true
-  release:
-    required: true
-  username:
-    required: false
-  password:
-    required: false
-  deno-version:
-    required: true
-    type: string
-
-outputs:
-  image-name:
-    value: ${{ steps.build-image.outputs.image-name }}
-
-runs:
-  using: composite
-  steps:
-    # - shell: bash
-    #   name: Free disk space
-    #   run: |
-    #     sudo swapoff -a
-    #     sudo rm -f /swapfile
-    #     sudo apt clean
-    #     docker rmi $(docker image ls -aq)
-    #     df -h
-
-    - shell: bash
-      id: build-image
-      run: |
-        cd ${{ inputs.root-dir }}
-
-        LOWERCASE_REPOSITORY=$(echo "${{ github.repository_owner }}" | tr "[:upper:]" "[:lower:]")
-
-        IMAGE_NAME_BASE="ghcr.io/${LOWERCASE_REPOSITORY}/rocket.chat:${{ inputs.docker-tag }}"
-
-        IMAGE_NAME="${IMAGE_NAME_BASE}.${{ inputs.release }}"
-
-        echo "Build Docker image ${IMAGE_NAME}"
-
-        DOCKER_PATH="${GITHUB_WORKSPACE}/apps/meteor/.docker"
-        if [[ '${{ inputs.release }}' = 'preview' ]]; then
-          DOCKER_PATH="${DOCKER_PATH}-mongo"
-        fi;
-
-        DOCKERFILE_PATH="${DOCKER_PATH}/Dockerfile"
-        if [[ '${{ inputs.release }}' = 'debian' ]]; then
-          DOCKERFILE_PATH="${DOCKERFILE_PATH}.${{ inputs.release }}"
-        fi;
-
-        echo "Copy Dockerfile for release: ${{ inputs.release }}"
-        cp $DOCKERFILE_PATH ./Dockerfile
-        if [ -e ${DOCKER_PATH}/entrypoint.sh ]; then
-          cp ${DOCKER_PATH}/entrypoint.sh .
-        fi;
-
-        echo "Build ${{ inputs.release }} Docker image"
-        docker build --build-arg DENO_VERSION=${{ inputs.deno-version }} -t $IMAGE_NAME .
-
-        echo "image-name-base=${IMAGE_NAME_BASE}" >> $GITHUB_OUTPUT
-        echo "image-name=${IMAGE_NAME}" >> $GITHUB_OUTPUT
-
-    - name: Login to GitHub Container Registry
-      if: github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'release' || github.ref == 'refs/heads/develop'
-      uses: docker/login-action@v2
-      with:
-        registry: ghcr.io
-        username: ${{ inputs.username }}
-        password: ${{ inputs.password }}
-
-    - name: Publish image
-      shell: bash
-      if: github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'release' || github.ref == 'refs/heads/develop'
-      run: |
-        echo "Push Docker image: ${{ steps.build-image.outputs.image-name }}"
-
-        docker push ${{ steps.build-image.outputs.image-name }}
-
-        if [[ '${{ inputs.release }}' = 'official' ]]; then
-          echo "Push release official without variant"
-
-          docker tag ${{ steps.build-image.outputs.image-name }} ${{ steps.build-image.outputs.image-name-base }}
-          docker push ${{ steps.build-image.outputs.image-name-base }}
-        fi;
diff --git a/.github/actions/build-docker/action.yml b/.github/actions/build-docker/action.yml
index 2891d892c359..5c601abe7811 100644
--- a/.github/actions/build-docker/action.yml
+++ b/.github/actions/build-docker/action.yml
@@ -16,7 +16,7 @@ inputs:
   platform:
     required: false
     description: 'Platform'
-    type: string
+    default: 'alpine'
   build-containers:
     required: false
     description: 'Containers to build along with Rocket.Chat'
@@ -42,8 +42,8 @@ runs:
 
   steps:
     - name: Login to GitHub Container Registry
-      if: inputs.publish-image == 'true' &&(github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'release' || github.ref == 'refs/heads/develop')
-      uses: docker/login-action@v2
+      if: inputs.publish-image == 'true' && github.actor != 'dependabot[bot]' && (github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'release' || github.ref == 'refs/heads/develop')
+      uses: docker/login-action@v3
       with:
         registry: ghcr.io
         username: ${{ inputs.CR_USER }}
@@ -61,6 +61,7 @@ runs:
         cd /tmp/build
         tar xzf Rocket.Chat.tar.gz
         rm Rocket.Chat.tar.gz
+
     - uses: rharkor/caching-for-turbo@v1.5
       # if we are testing a PR from a fork, we already called the turbo cache at this point, so it should be false
       if: inputs.turbo-cache == 'true'
@@ -84,7 +85,7 @@ runs:
     - run: yarn build
       if: inputs.setup == 'true'
       shell: bash
-    - if: ${{ inputs.platform == 'official' }}
+    - if: ${{ inputs.platform == 'alpine' }}
       uses: actions/cache@v3
       with:
         path: /tmp/build/matrix-sdk-crypto.linux-x64-musl.node
@@ -100,7 +101,7 @@ runs:
         docker compose -f docker-compose-ci.yml build "${args[@]}"
 
     - name: Publish Docker images to GitHub Container Registry
-      if: inputs.publish-image == 'true' && (github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'release' || github.ref == 'refs/heads/develop')
+      if: inputs.publish-image == 'true' && github.actor != 'dependabot[bot]' && (github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'release' || github.ref == 'refs/heads/develop')
       shell: bash
       run: |
         args=(rocketchat ${{ inputs.build-containers }})
diff --git a/.github/actions/setup-node/action.yml b/.github/actions/setup-node/action.yml
index ea90fc57b07c..b538d485535d 100644
--- a/.github/actions/setup-node/action.yml
+++ b/.github/actions/setup-node/action.yml
@@ -53,7 +53,7 @@ runs:
 
     - name: Use Node.js ${{ inputs.node-version }}
       id: node-version
-      uses: actions/setup-node@v3.7.0
+      uses: actions/setup-node@v4.1.0
       with:
         node-version: ${{ inputs.node-version }}
         cache: 'yarn'
diff --git a/.github/actions/update-version-durability/package-lock.json b/.github/actions/update-version-durability/package-lock.json
index 2d3043be183d..c4a4dac3b61d 100644
--- a/.github/actions/update-version-durability/package-lock.json
+++ b/.github/actions/update-version-durability/package-lock.json
@@ -46,54 +46,50 @@
 			}
 		},
 		"node_modules/@octokit/auth-token": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-4.0.0.tgz",
-			"integrity": "sha512-tY/msAuJo6ARbK6SPIxZrPBms3xPbfwBrulZe0Wtr/DIY9lje2HeV1uoebShn6mx7SjCHif6EjMvoREj+gZ+SA==",
-			"peer": true,
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-5.1.1.tgz",
+			"integrity": "sha512-rh3G3wDO8J9wSjfI436JUKzHIxq8NaiL0tVeB2aXmG6p/9859aUOAjA9pmSPNGGZxfwmaJ9ozOJImuNVJdpvbA==",
 			"engines": {
 				"node": ">= 18"
 			}
 		},
 		"node_modules/@octokit/core": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/@octokit/core/-/core-5.2.0.tgz",
-			"integrity": "sha512-1LFfa/qnMQvEOAdzlQymH0ulepxbxnCYAKJZfMci/5XJyIHWgEYnDmgnKakbTh7CH2tFQ5O60oYDvns4i9RAIg==",
-			"peer": true,
+			"version": "6.1.2",
+			"resolved": "https://registry.npmjs.org/@octokit/core/-/core-6.1.2.tgz",
+			"integrity": "sha512-hEb7Ma4cGJGEUNOAVmyfdB/3WirWMg5hDuNFVejGEDFqupeOysLc2sG6HJxY2etBp5YQu5Wtxwi020jS9xlUwg==",
 			"dependencies": {
-				"@octokit/auth-token": "^4.0.0",
-				"@octokit/graphql": "^7.1.0",
-				"@octokit/request": "^8.3.1",
-				"@octokit/request-error": "^5.1.0",
+				"@octokit/auth-token": "^5.0.0",
+				"@octokit/graphql": "^8.0.0",
+				"@octokit/request": "^9.0.0",
+				"@octokit/request-error": "^6.0.1",
 				"@octokit/types": "^13.0.0",
-				"before-after-hook": "^2.2.0",
-				"universal-user-agent": "^6.0.0"
+				"before-after-hook": "^3.0.2",
+				"universal-user-agent": "^7.0.0"
 			},
 			"engines": {
 				"node": ">= 18"
 			}
 		},
 		"node_modules/@octokit/endpoint": {
-			"version": "9.0.5",
-			"resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-9.0.5.tgz",
-			"integrity": "sha512-ekqR4/+PCLkEBF6qgj8WqJfvDq65RH85OAgrtnVp1mSxaXF03u2xW/hUdweGS5654IlC0wkNYC18Z50tSYTAFw==",
-			"peer": true,
+			"version": "10.1.1",
+			"resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-10.1.1.tgz",
+			"integrity": "sha512-JYjh5rMOwXMJyUpj028cu0Gbp7qe/ihxfJMLc8VZBMMqSwLgOxDI1911gV4Enl1QSavAQNJcwmwBF9M0VvLh6Q==",
 			"dependencies": {
-				"@octokit/types": "^13.1.0",
-				"universal-user-agent": "^6.0.0"
+				"@octokit/types": "^13.0.0",
+				"universal-user-agent": "^7.0.2"
 			},
 			"engines": {
 				"node": ">= 18"
 			}
 		},
 		"node_modules/@octokit/graphql": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-7.1.0.tgz",
-			"integrity": "sha512-r+oZUH7aMFui1ypZnAvZmn0KSqAUgE1/tUXIWaqUCa1758ts/Jio84GZuzsvUkme98kv0WFY8//n0J1Z+vsIsQ==",
-			"peer": true,
+			"version": "8.1.1",
+			"resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-8.1.1.tgz",
+			"integrity": "sha512-ukiRmuHTi6ebQx/HFRCXKbDlOh/7xEV6QUXaE7MJEKGNAncGI/STSbOkl12qVXZrfZdpXctx5O9X1AIaebiDBg==",
 			"dependencies": {
-				"@octokit/request": "^8.3.0",
+				"@octokit/request": "^9.0.0",
 				"@octokit/types": "^13.0.0",
-				"universal-user-agent": "^6.0.0"
+				"universal-user-agent": "^7.0.0"
 			},
 			"engines": {
 				"node": ">= 18"
@@ -144,29 +140,25 @@
 			}
 		},
 		"node_modules/@octokit/request": {
-			"version": "8.4.0",
-			"resolved": "https://registry.npmjs.org/@octokit/request/-/request-8.4.0.tgz",
-			"integrity": "sha512-9Bb014e+m2TgBeEJGEbdplMVWwPmL1FPtggHQRkV+WVsMggPtEkLKPlcVYm/o8xKLkpJ7B+6N8WfQMtDLX2Dpw==",
-			"peer": true,
+			"version": "9.1.3",
+			"resolved": "https://registry.npmjs.org/@octokit/request/-/request-9.1.3.tgz",
+			"integrity": "sha512-V+TFhu5fdF3K58rs1pGUJIDH5RZLbZm5BI+MNF+6o/ssFNT4vWlCh/tVpF3NxGtP15HUxTTMUbsG5llAuU2CZA==",
 			"dependencies": {
-				"@octokit/endpoint": "^9.0.1",
-				"@octokit/request-error": "^5.1.0",
+				"@octokit/endpoint": "^10.0.0",
+				"@octokit/request-error": "^6.0.1",
 				"@octokit/types": "^13.1.0",
-				"universal-user-agent": "^6.0.0"
+				"universal-user-agent": "^7.0.2"
 			},
 			"engines": {
 				"node": ">= 18"
 			}
 		},
 		"node_modules/@octokit/request-error": {
-			"version": "5.1.0",
-			"resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-5.1.0.tgz",
-			"integrity": "sha512-GETXfE05J0+7H2STzekpKObFe765O5dlAKUTLNGeH+x47z7JjXHfsHKo5z21D/o/IOZTUEI6nyWyR+bZVP/n5Q==",
-			"peer": true,
+			"version": "6.1.5",
+			"resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-6.1.5.tgz",
+			"integrity": "sha512-IlBTfGX8Yn/oFPMwSfvugfncK2EwRLjzbrpifNaMY8o/HTEAFqCA1FZxjD9cWvSKBHgrIhc4CSBIzMxiLsbzFQ==",
 			"dependencies": {
-				"@octokit/types": "^13.1.0",
-				"deprecation": "^2.0.0",
-				"once": "^1.4.0"
+				"@octokit/types": "^13.0.0"
 			},
 			"engines": {
 				"node": ">= 18"
@@ -186,91 +178,6 @@
 				"node": ">= 18"
 			}
 		},
-		"node_modules/@octokit/rest/node_modules/@octokit/auth-token": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-5.1.1.tgz",
-			"integrity": "sha512-rh3G3wDO8J9wSjfI436JUKzHIxq8NaiL0tVeB2aXmG6p/9859aUOAjA9pmSPNGGZxfwmaJ9ozOJImuNVJdpvbA==",
-			"engines": {
-				"node": ">= 18"
-			}
-		},
-		"node_modules/@octokit/rest/node_modules/@octokit/core": {
-			"version": "6.1.2",
-			"resolved": "https://registry.npmjs.org/@octokit/core/-/core-6.1.2.tgz",
-			"integrity": "sha512-hEb7Ma4cGJGEUNOAVmyfdB/3WirWMg5hDuNFVejGEDFqupeOysLc2sG6HJxY2etBp5YQu5Wtxwi020jS9xlUwg==",
-			"dependencies": {
-				"@octokit/auth-token": "^5.0.0",
-				"@octokit/graphql": "^8.0.0",
-				"@octokit/request": "^9.0.0",
-				"@octokit/request-error": "^6.0.1",
-				"@octokit/types": "^13.0.0",
-				"before-after-hook": "^3.0.2",
-				"universal-user-agent": "^7.0.0"
-			},
-			"engines": {
-				"node": ">= 18"
-			}
-		},
-		"node_modules/@octokit/rest/node_modules/@octokit/endpoint": {
-			"version": "10.1.1",
-			"resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-10.1.1.tgz",
-			"integrity": "sha512-JYjh5rMOwXMJyUpj028cu0Gbp7qe/ihxfJMLc8VZBMMqSwLgOxDI1911gV4Enl1QSavAQNJcwmwBF9M0VvLh6Q==",
-			"dependencies": {
-				"@octokit/types": "^13.0.0",
-				"universal-user-agent": "^7.0.2"
-			},
-			"engines": {
-				"node": ">= 18"
-			}
-		},
-		"node_modules/@octokit/rest/node_modules/@octokit/graphql": {
-			"version": "8.1.1",
-			"resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-8.1.1.tgz",
-			"integrity": "sha512-ukiRmuHTi6ebQx/HFRCXKbDlOh/7xEV6QUXaE7MJEKGNAncGI/STSbOkl12qVXZrfZdpXctx5O9X1AIaebiDBg==",
-			"dependencies": {
-				"@octokit/request": "^9.0.0",
-				"@octokit/types": "^13.0.0",
-				"universal-user-agent": "^7.0.0"
-			},
-			"engines": {
-				"node": ">= 18"
-			}
-		},
-		"node_modules/@octokit/rest/node_modules/@octokit/request": {
-			"version": "9.1.1",
-			"resolved": "https://registry.npmjs.org/@octokit/request/-/request-9.1.1.tgz",
-			"integrity": "sha512-pyAguc0p+f+GbQho0uNetNQMmLG1e80WjkIaqqgUkihqUp0boRU6nKItXO4VWnr+nbZiLGEyy4TeKRwqaLvYgw==",
-			"dependencies": {
-				"@octokit/endpoint": "^10.0.0",
-				"@octokit/request-error": "^6.0.1",
-				"@octokit/types": "^13.1.0",
-				"universal-user-agent": "^7.0.2"
-			},
-			"engines": {
-				"node": ">= 18"
-			}
-		},
-		"node_modules/@octokit/rest/node_modules/@octokit/request-error": {
-			"version": "6.1.1",
-			"resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-6.1.1.tgz",
-			"integrity": "sha512-1mw1gqT3fR/WFvnoVpY/zUM2o/XkMs/2AszUUG9I69xn0JFLv6PGkPhNk5lbfvROs79wiS0bqiJNxfCZcRJJdg==",
-			"dependencies": {
-				"@octokit/types": "^13.0.0"
-			},
-			"engines": {
-				"node": ">= 18"
-			}
-		},
-		"node_modules/@octokit/rest/node_modules/before-after-hook": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-3.0.2.tgz",
-			"integrity": "sha512-Nik3Sc0ncrMK4UUdXQmAnRtzmNQTAAXmXIopizwZ1W1t8QmfJj+zL4OA2I7XPTPW5z5TDqv4hRo/JzouDJnX3A=="
-		},
-		"node_modules/@octokit/rest/node_modules/universal-user-agent": {
-			"version": "7.0.2",
-			"resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-7.0.2.tgz",
-			"integrity": "sha512-0JCqzSKnStlRRQfCdowvqy3cy0Dvtlb8xecj/H8JFZuCze4rwjPZQOgvFvn0Ws/usCHQFGpyr+pB9adaGwXn4Q=="
-		},
 		"node_modules/@octokit/types": {
 			"version": "13.5.0",
 			"resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.5.0.tgz",
@@ -294,9 +201,9 @@
 			"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
 		},
 		"node_modules/axios": {
-			"version": "1.7.2",
-			"resolved": "https://registry.npmjs.org/axios/-/axios-1.7.2.tgz",
-			"integrity": "sha512-2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==",
+			"version": "1.7.4",
+			"resolved": "https://registry.npmjs.org/axios/-/axios-1.7.4.tgz",
+			"integrity": "sha512-DukmaFRnY6AzAALSH4J2M3k6PkaC+MfaAGdEERRWcC9q3/TWQwLpHR8ZRLKTdQ3aBDL64EdluRDjJqKw+BPZEw==",
 			"dependencies": {
 				"follow-redirects": "^1.15.6",
 				"form-data": "^4.0.0",
@@ -309,10 +216,9 @@
 			"integrity": "sha512-c0iKWc527T2MQcYhIMMw9OHN8kcXSf/ijadWzURhZWi6e6cnBXxAQ5IlXbYd0YZJE9lFtXRB1fJVQrvJf5DmPQ=="
 		},
 		"node_modules/before-after-hook": {
-			"version": "2.2.3",
-			"resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.3.tgz",
-			"integrity": "sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==",
-			"peer": true
+			"version": "3.0.2",
+			"resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-3.0.2.tgz",
+			"integrity": "sha512-Nik3Sc0ncrMK4UUdXQmAnRtzmNQTAAXmXIopizwZ1W1t8QmfJj+zL4OA2I7XPTPW5z5TDqv4hRo/JzouDJnX3A=="
 		},
 		"node_modules/colors": {
 			"version": "1.4.0",
@@ -341,12 +247,6 @@
 				"node": ">=0.4.0"
 			}
 		},
-		"node_modules/deprecation": {
-			"version": "2.3.1",
-			"resolved": "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz",
-			"integrity": "sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==",
-			"peer": true
-		},
 		"node_modules/diff": {
 			"version": "5.2.0",
 			"resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz",
@@ -406,15 +306,6 @@
 				"node": ">= 0.6"
 			}
 		},
-		"node_modules/once": {
-			"version": "1.4.0",
-			"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-			"integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-			"peer": true,
-			"dependencies": {
-				"wrappy": "1"
-			}
-		},
 		"node_modules/proxy-from-env": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
@@ -451,10 +342,9 @@
 			}
 		},
 		"node_modules/universal-user-agent": {
-			"version": "6.0.1",
-			"resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.1.tgz",
-			"integrity": "sha512-yCzhz6FN2wU1NiiQRogkTQszlQSlpWaw8SvVegAc+bDxbzHgh1vX8uIe8OYyMH6DwH+sdTJsgMl36+mSMdRJIQ==",
-			"peer": true
+			"version": "7.0.2",
+			"resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-7.0.2.tgz",
+			"integrity": "sha512-0JCqzSKnStlRRQfCdowvqy3cy0Dvtlb8xecj/H8JFZuCze4rwjPZQOgvFvn0Ws/usCHQFGpyr+pB9adaGwXn4Q=="
 		},
 		"node_modules/uuid": {
 			"version": "8.3.2",
@@ -463,12 +353,6 @@
 			"bin": {
 				"uuid": "dist/bin/uuid"
 			}
-		},
-		"node_modules/wrappy": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-			"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-			"peer": true
 		}
 	}
 }
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index c3b3e868f2a5..7b7e7e3ba392 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,22 +1,25 @@
 version: 2
 updates:
+  # Main repo NPM package
+  - package-ecosystem: npm
+    directory: '/'
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    labels:
+      - 'automerge'
 
-# Main repo NPM package
-- package-ecosystem: npm
-  directory: "/"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 10
+  ## EE dependencies
+  - package-ecosystem: npm
+    directory: '/ee/server/services'
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
+    labels:
+      - 'automerge'
 
-## EE dependencies
-- package-ecosystem: npm
-  directory: "/ee/server/services"
-  schedule:
-    interval: daily
-  open-pull-requests-limit: 10
-
-# Maintain dependencies for GitHub Actions
-- package-ecosystem: "github-actions"
-  directory: "/"
-  schedule:
-    interval: "daily"
+  # Maintain dependencies for GitHub Actions
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: 'daily'
diff --git a/.github/workflows/ci-code-check.yml b/.github/workflows/ci-code-check.yml
index 6712cc49356d..ccdd37cf6ac4 100644
--- a/.github/workflows/ci-code-check.yml
+++ b/.github/workflows/ci-code-check.yml
@@ -55,7 +55,7 @@ jobs:
           name: turbo-build
           path: .turbo/cache
       - name: Cache TypeCheck
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         if: matrix.check == 'ts'
         with:
           path: ./apps/meteor/tsconfig.typecheck.tsbuildinfo
@@ -70,7 +70,7 @@ jobs:
         run: yarn turbo run typecheck
 
       - name: Cache eslint
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         if: matrix.check == 'lint'
         with:
           path: ./apps/meteor/.eslintcache
diff --git a/.github/workflows/ci-deploy-gh-pages.yml b/.github/workflows/ci-deploy-gh-pages.yml
index 6da5693303b4..abfe62d51389 100644
--- a/.github/workflows/ci-deploy-gh-pages.yml
+++ b/.github/workflows/ci-deploy-gh-pages.yml
@@ -11,13 +11,13 @@ jobs:
   deploy-preview:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: rharkor/caching-for-turbo@v1.5
 
       - name: Setup NodeJS
         uses: ./.github/actions/setup-node
         with:
-          node-version: 20.17.0
+          node-version: 20.18.0
           deno-version: 1.37.1
           cache-modules: true
           install: true
diff --git a/.github/workflows/ci-test-e2e.yml b/.github/workflows/ci-test-e2e.yml
index 8f5d258ef165..58dc52bb25d4 100644
--- a/.github/workflows/ci-test-e2e.yml
+++ b/.github/workflows/ci-test-e2e.yml
@@ -18,12 +18,6 @@ on:
       rc-docker-tag:
         required: true
         type: string
-      rc-dockerfile-debian:
-        required: true
-        type: string
-      rc-docker-tag-debian:
-        required: true
-        type: string
       gh-docker-tag:
         required: true
         type: string
@@ -83,8 +77,8 @@ jobs:
   test:
     runs-on: ubuntu-20.04
     env:
-      RC_DOCKERFILE: ${{ matrix.mongodb-version == '7.0' && inputs.rc-dockerfile-debian || inputs.rc-dockerfile }}
-      RC_DOCKER_TAG: ${{ matrix.mongodb-version == '7.0' && inputs.rc-docker-tag-debian || inputs.rc-docker-tag }}
+      RC_DOCKERFILE: ${{ inputs.rc-dockerfile }}.${{ (matrix.mongodb-version == '7.0' && 'debian' && false) || 'alpine' }}
+      RC_DOCKER_TAG: ${{ inputs.rc-docker-tag }}.${{ (matrix.mongodb-version == '7.0' && 'debian' && false) || 'alpine' }}
 
     strategy:
       fail-fast: false
@@ -92,7 +86,7 @@ jobs:
         mongodb-version: ${{ fromJSON(inputs.mongodb-version) }}
         shard: ${{ fromJSON(inputs.shard) }}
 
-    name: MongoDB ${{ matrix.mongodb-version }}${{ inputs.db-watcher-disabled == 'true' && ' [no watchers]' || '' }} (${{ matrix.shard }}/${{ inputs.total-shard }}) - ${{ matrix.mongodb-version == '7.0' && 'Debian' || 'Alpine (Official)' }}
+    name: MongoDB ${{ matrix.mongodb-version }}${{ inputs.db-watcher-disabled == 'true' && ' [no watchers]' || '' }} (${{ matrix.shard }}/${{ inputs.total-shard }}) - ${{ (matrix.mongodb-version == '7.0' && 'Debian' && false) || 'Alpine (Official)' }}
 
     steps:
       - name: Collect Workflow Telemetry
@@ -112,8 +106,8 @@ jobs:
           sudo sysctl -p
 
       - name: Login to GitHub Container Registry
-        if: (github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'release' || github.ref == 'refs/heads/develop')
-        uses: docker/login-action@v2
+        if: (github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'release' || github.ref == 'refs/heads/develop') && github.actor != 'dependabot[bot]'
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ secrets.CR_USER }}
@@ -143,10 +137,12 @@ jobs:
         with:
           name: turbo-build
           path: .turbo/cache
+
       - run: yarn build
+
       # if we are testing a PR from a fork, we need to build the docker image at this point
       - uses: ./.github/actions/build-docker
-        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository
+        if: github.event_name == 'pull_request' && (github.event.pull_request.head.repo.full_name != github.repository || github.actor == 'dependabot[bot]')
         with:
           CR_USER: ${{ secrets.CR_USER }}
           CR_PAT: ${{ secrets.CR_PAT }}
@@ -204,13 +200,13 @@ jobs:
 
       - name: Cache Playwright binaries
         if: inputs.type == 'ui'
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: cache-playwright
         with:
           path: |
             ~/.cache/ms-playwright
           # This is the version of Playwright that we are using, if you are willing to upgrade, you should update this.
-          key: playwright-1.40.1
+          key: playwright-1.48.2
 
       - name: Install Playwright
         if: inputs.type == 'ui' && steps.cache-playwright.outputs.cache-hit != 'true'
@@ -238,6 +234,7 @@ jobs:
 
       - name: Remove unused Docker images
         run: docker system prune -af
+
       - name: E2E Test API
         if: inputs.type == 'api'
         working-directory: ./apps/meteor
@@ -305,7 +302,11 @@ jobs:
           include-hidden-files: true
 
       - name: Show server logs if E2E test failed
-        if: failure()
+        if: failure() && inputs.release == 'ee'
+        run: docker compose -f docker-compose-ci.yml logs
+
+      - name: Show server logs if E2E test failed
+        if: failure() && inputs.release != 'ee'
         run: docker compose -f docker-compose-ci.yml logs rocketchat
 
       - name: Extract e2e:ee:coverage
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 07870e10e520..bc56fe6b309a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -31,11 +31,10 @@ jobs:
       gh-docker-tag: ${{ steps.docker.outputs.gh-docker-tag }}
       lowercase-repo: ${{ steps.var.outputs.lowercase-repo }}
       rc-dockerfile: '${{ github.workspace }}/apps/meteor/.docker/Dockerfile'
-      rc-docker-tag: '${{ steps.docker.outputs.gh-docker-tag }}.official'
-      rc-dockerfile-debian: '${{ github.workspace }}/apps/meteor/.docker/Dockerfile.debian'
-      rc-docker-tag-debian: '${{ steps.docker.outputs.gh-docker-tag }}.debian'
+      rc-docker-tag: '${{ steps.docker.outputs.gh-docker-tag }}'
       node-version: ${{ steps.var.outputs.node-version }}
       deno-version: ${{ steps.var.outputs.deno-version }}
+      official-platform: 'alpine'
       # this is 100% intentional, secrets are not available for forks, so ee-tests will always fail
       # to avoid this, we are using a dummy license, expiring at 2025-06-31
       enterprise-license: X/XumwIkgwQuld0alWKt37lVA90XjKOrfiMvMZ0/RtqsMtrdL9GoAk+4jXnaY1b2ePoG7XSzGhuxEDxFKIWJK3hIKGNTvrd980LgH5sM5+1T4P42ivSpd8UZi0bwjJkCFLIu9RozzYwslGG0IehMxe0S6VjcO0UYlUJtbMCBHuR2WmTAmO6YVU3ln+pZCbrPFaTPSS1RovhKaNCNkZwIx/CLWW8UTXUuFV/ML4PbKKVoa5nvvJwPeatgL7UCnlSD90lfCiiuikpzj/Y/JLkIL6velFbwNxsrxg9iRJ2k0sKheMMSmlTiGzSvZUm+na5WQq91aKGncih+DmaEZA7QGrjp4eoA0dqTk6OmItsy0fHmQhvZIOKNMeO7vNQiLbaSV6rqibrzu7WPpeIvsvL57T1h37USoCSB6+jDqkzdfoqIpz8BxTiJDj1d8xGPJFVrgxoqQqkj9qIP/gCaEz5DF39QFv5sovk4yK2O8fEQYod2d14V9yECYl4szZPMk1IBfCAC2w7czWGHHFonhL+CQGT403y5wmDmnsnjlCqMKF72odqfTPTI8XnCvJDriPMWohnQEAGtTTyciAhNokx/mjAVJ4NeZPcsbm4BjhvJvnjxx/BhYhBBTNWPaCSZzocfrGUj9Z+ZA7BEz+xAFQyGDx3xRzqIXfT0G7w8fvgYJMU=
@@ -167,7 +166,7 @@ jobs:
           HARDENED_MODE: '1'
 
       - name: Cache vite
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ./node_modules/.vite
           key: vite-local-cache-${{ runner.OS }}-${{ hashFiles('package.json') }}
@@ -191,7 +190,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [release-versions, packages-build]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: rharkor/caching-for-turbo@v1.5
         if: github.event.action != 'closed'
@@ -200,7 +199,7 @@ jobs:
         uses: ./.github/actions/setup-node
         if: github.event.action != 'closed'
         with:
-          node-version: 20.17.0
+          node-version: 20.18.0
           deno-version: 1.37.1
           cache-modules: true
           install: true
@@ -291,7 +290,7 @@ jobs:
     steps:
       - name: check cache for matrix-rust-sdk-crypto-nodejs
         id: matrix-rust-sdk-crypto-nodejs
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: /tmp/build/matrix-sdk-crypto.linux-x64-musl.node
           key: matrix-rust-sdk-crypto-nodejs-v0.2.0-beta.1
@@ -307,7 +306,7 @@ jobs:
       - if: steps.matrix-rust-sdk-crypto-nodejs.outputs.cache-hit != 'true'
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '20.18.0'
 
       - if: steps.matrix-rust-sdk-crypto-nodejs.outputs.cache-hit != 'true'
         uses: dtolnay/rust-toolchain@stable
@@ -335,51 +334,60 @@ jobs:
     runs-on: ubuntu-20.04
 
     env:
-      RC_DOCKERFILE: ${{ matrix.platform == 'debian' && needs.release-versions.outputs.rc-dockerfile-debian || needs.release-versions.outputs.rc-dockerfile }}
-      RC_DOCKER_TAG: ${{ matrix.platform == 'debian' && needs.release-versions.outputs.rc-docker-tag-debian || needs.release-versions.outputs.rc-docker-tag }}
+      RC_DOCKERFILE: ${{ needs.release-versions.outputs.rc-dockerfile }}.${{ matrix.platform }}
+      RC_DOCKER_TAG: ${{ needs.release-versions.outputs.rc-docker-tag }}.${{ matrix.platform }}
       DOCKER_TAG: ${{ needs.release-versions.outputs.gh-docker-tag }}
       LOWERCASE_REPOSITORY: ${{ needs.release-versions.outputs.lowercase-repo }}
 
     strategy:
       fail-fast: false
       matrix:
-        platform: ['official', 'debian']
+        platform: ['alpine']
 
     steps:
       - uses: actions/checkout@v4
 
       # we only build and publish the actual docker images if not a PR from a fork
       - uses: ./.github/actions/build-docker
-        if: (github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'release' || github.ref == 'refs/heads/develop')
+        if: (github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'release' || github.ref == 'refs/heads/develop') && github.actor != 'dependabot[bot]'
         with:
           CR_USER: ${{ secrets.CR_USER }}
           CR_PAT: ${{ secrets.CR_PAT }}
           node-version: ${{ needs.release-versions.outputs.node-version }}
           deno-version: ${{ needs.release-versions.outputs.deno-version }}
           platform: ${{ matrix.platform }}
-          build-containers: ${{ matrix.platform == 'debian' && 'authorization-service account-service ddp-streamer-service presence-service stream-hub-service queue-worker-service omnichannel-transcript-service' || '' }}
+          build-containers: ${{ matrix.platform == needs.release-versions.outputs.official-platform && 'authorization-service account-service ddp-streamer-service presence-service stream-hub-service queue-worker-service omnichannel-transcript-service' || '' }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
       - name: Make sure matrix bindings load
-        if: ${{ matrix.platform == 'official' }}
+        if: (github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'release' || github.ref == 'refs/heads/develop') && matrix.platform == 'alpine' && github.actor != 'dependabot[bot]'
         run: |
           docker run --rm -w /app/bundle/programs/server/npm/node_modules/matrix-appservice-bridge ghcr.io/rocketchat/rocket.chat:$RC_DOCKER_TAG -e 'require(".")'
 
+      - name: Rename official Docker tag to GitHub Container Registry
+        if: matrix.platform == needs.release-versions.outputs.official-platform
+        run: |
+          IMAGE_NAME_BASE="ghcr.io/${LOWERCASE_REPOSITORY}/rocket.chat:${DOCKER_TAG}"
+
+          echo "Push Docker image: ${IMAGE_NAME_BASE}.official"
+          docker tag ${IMAGE_NAME_BASE}.${{matrix.platform}} ${IMAGE_NAME_BASE}.official
+          docker push ${IMAGE_NAME_BASE}.official
+
   build-gh-docker:
     name: 🚢 Build Docker Images for Production
     needs: [build-prod, release-versions]
     runs-on: ubuntu-20.04
 
     env:
-      RC_DOCKERFILE: ${{ matrix.platform == 'debian' && needs.release-versions.outputs.rc-dockerfile-debian || needs.release-versions.outputs.rc-dockerfile }}
-      RC_DOCKER_TAG: ${{ matrix.platform == 'debian' && needs.release-versions.outputs.rc-docker-tag-debian || needs.release-versions.outputs.rc-docker-tag }}
+      RC_DOCKERFILE: ${{ needs.release-versions.outputs.rc-dockerfile }}.${{ matrix.platform }}
+      RC_DOCKER_TAG: ${{ needs.release-versions.outputs.rc-docker-tag }}.${{ matrix.platform }}
       DOCKER_TAG: ${{ needs.release-versions.outputs.gh-docker-tag }}
       LOWERCASE_REPOSITORY: ${{ needs.release-versions.outputs.lowercase-repo }}
 
     strategy:
       fail-fast: false
       matrix:
-        platform: ['official', 'debian']
+        platform: ['alpine']
 
     steps:
       - uses: actions/checkout@v4
@@ -391,18 +399,22 @@ jobs:
           node-version: ${{ needs.release-versions.outputs.node-version }}
           deno-version: ${{ needs.release-versions.outputs.deno-version }}
           platform: ${{ matrix.platform }}
-          build-containers: ${{ matrix.platform == 'debian' && 'authorization-service account-service ddp-streamer-service presence-service stream-hub-service queue-worker-service omnichannel-transcript-service' || '' }}
+          build-containers: ${{ matrix.platform == needs.release-versions.outputs.official-platform && 'authorization-service account-service ddp-streamer-service presence-service stream-hub-service queue-worker-service omnichannel-transcript-service' || '' }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
       - name: Rename official Docker tag to GitHub Container Registry
-        if: matrix.platform == 'official'
+        if: matrix.platform == needs.release-versions.outputs.official-platform
         run: |
           IMAGE_NAME_BASE="ghcr.io/${LOWERCASE_REPOSITORY}/rocket.chat:${DOCKER_TAG}"
 
           echo "Push Docker image: ${IMAGE_NAME_BASE}"
-          docker tag ${IMAGE_NAME_BASE}.official $IMAGE_NAME_BASE
+          docker tag ${IMAGE_NAME_BASE}.${{matrix.platform}} $IMAGE_NAME_BASE
           docker push $IMAGE_NAME_BASE
 
+          echo "Push Docker image: ${IMAGE_NAME_BASE}.official"
+          docker tag ${IMAGE_NAME_BASE}.${{matrix.platform}} ${IMAGE_NAME_BASE}.official
+          docker push ${IMAGE_NAME_BASE}.official
+
   checks:
     needs: [release-versions, packages-build]
 
@@ -437,8 +449,6 @@ jobs:
       lowercase-repo: ${{ needs.release-versions.outputs.lowercase-repo }}
       rc-dockerfile: ${{ needs.release-versions.outputs.rc-dockerfile }}
       rc-docker-tag: ${{ needs.release-versions.outputs.rc-docker-tag }}
-      rc-dockerfile-debian: ${{ needs.release-versions.outputs.rc-dockerfile-debian }}
-      rc-docker-tag-debian: ${{ needs.release-versions.outputs.rc-docker-tag-debian }}
       gh-docker-tag: ${{ needs.release-versions.outputs.gh-docker-tag }}
     secrets:
       CR_USER: ${{ secrets.CR_USER }}
@@ -461,8 +471,6 @@ jobs:
       lowercase-repo: ${{ needs.release-versions.outputs.lowercase-repo }}
       rc-dockerfile: ${{ needs.release-versions.outputs.rc-dockerfile }}
       rc-docker-tag: ${{ needs.release-versions.outputs.rc-docker-tag }}
-      rc-dockerfile-debian: ${{ needs.release-versions.outputs.rc-dockerfile-debian }}
-      rc-docker-tag-debian: ${{ needs.release-versions.outputs.rc-docker-tag-debian }}
       gh-docker-tag: ${{ needs.release-versions.outputs.gh-docker-tag }}
       retries: ${{ (github.event_name == 'release' || github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/master') && 2 || 0 }}
     secrets:
@@ -489,8 +497,6 @@ jobs:
       lowercase-repo: ${{ needs.release-versions.outputs.lowercase-repo }}
       rc-dockerfile: ${{ needs.release-versions.outputs.rc-dockerfile }}
       rc-docker-tag: ${{ needs.release-versions.outputs.rc-docker-tag }}
-      rc-dockerfile-debian: ${{ needs.release-versions.outputs.rc-dockerfile-debian }}
-      rc-docker-tag-debian: ${{ needs.release-versions.outputs.rc-docker-tag-debian }}
       gh-docker-tag: ${{ needs.release-versions.outputs.gh-docker-tag }}
     secrets:
       CR_USER: ${{ secrets.CR_USER }}
@@ -514,8 +520,6 @@ jobs:
       lowercase-repo: ${{ needs.release-versions.outputs.lowercase-repo }}
       rc-dockerfile: ${{ needs.release-versions.outputs.rc-dockerfile }}
       rc-docker-tag: ${{ needs.release-versions.outputs.rc-docker-tag }}
-      rc-dockerfile-debian: ${{ needs.release-versions.outputs.rc-dockerfile-debian }}
-      rc-docker-tag-debian: ${{ needs.release-versions.outputs.rc-docker-tag-debian }}
       gh-docker-tag: ${{ needs.release-versions.outputs.gh-docker-tag }}
       retries: ${{ (github.event_name == 'release' || github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/master') && 2 || 0 }}
     secrets:
@@ -545,8 +549,6 @@ jobs:
       lowercase-repo: ${{ needs.release-versions.outputs.lowercase-repo }}
       rc-dockerfile: ${{ needs.release-versions.outputs.rc-dockerfile }}
       rc-docker-tag: ${{ needs.release-versions.outputs.rc-docker-tag }}
-      rc-dockerfile-debian: ${{ needs.release-versions.outputs.rc-dockerfile-debian }}
-      rc-docker-tag-debian: ${{ needs.release-versions.outputs.rc-docker-tag-debian }}
       gh-docker-tag: ${{ needs.release-versions.outputs.gh-docker-tag }}
       retries: ${{ (github.event_name == 'release' || github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/master') && 2 || 0 }}
       db-watcher-disabled: 'true'
@@ -651,48 +653,15 @@ jobs:
 
           aws s3 cp $ROCKET_DEPLOY_DIR/ s3://download.rocket.chat/build/ --recursive
 
-  build-docker-preview:
-    name: 🚢 Build Docker Image (preview)
-    runs-on: ubuntu-20.04
-    needs: [build, checks, release-versions]
-    if: github.event_name == 'release' || github.ref == 'refs/heads/develop'
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Restore build
-        uses: actions/download-artifact@v4
-        with:
-          name: build
-          path: /tmp/build
-
-      - name: Unpack build
-        run: |
-          cd /tmp/build
-          tar xzf Rocket.Chat.tar.gz
-          rm Rocket.Chat.tar.gz
-
-      - name: Build Docker image
-        id: build-docker-image-preview
-        uses: ./.github/actions/build-docker-image
-        with:
-          root-dir: /tmp/build
-          docker-tag: ${{ needs.release-versions.outputs.gh-docker-tag }}
-          release: preview
-          username: ${{ secrets.CR_USER }}
-          password: ${{ secrets.CR_PAT }}
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-          deno-version: ${{ needs.release-versions.outputs.deno-version }}
-
   docker-image-publish:
     name: 🚀 Publish Docker Image (main)
     runs-on: ubuntu-20.04
-    needs: [deploy, build-docker-preview, release-versions]
+    needs: [deploy, release-versions]
 
     strategy:
       matrix:
         # this is currently a mix of variants and different images
-        release: ['official', 'preview', 'debian']
-
+        release: ['alpine']
     env:
       IMAGE_NAME: 'rocketchat/rocket.chat'
 
diff --git a/.github/workflows/new-release.yml b/.github/workflows/new-release.yml
index cd6fc3dec3f2..b3ead30e8966 100644
--- a/.github/workflows/new-release.yml
+++ b/.github/workflows/new-release.yml
@@ -34,7 +34,7 @@ jobs:
       - name: Setup NodeJS
         uses: ./.github/actions/setup-node
         with:
-          node-version: 20.17.0
+          node-version: 20.18.0
           deno-version: 1.37.1
           cache-modules: true
           install: true
diff --git a/.github/workflows/pr-update-description.yml b/.github/workflows/pr-update-description.yml
index 66a8e4436a34..7a0d8650a97f 100644
--- a/.github/workflows/pr-update-description.yml
+++ b/.github/workflows/pr-update-description.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Setup NodeJS
         uses: ./.github/actions/setup-node
         with:
-          node-version: 20.17.0
+          node-version: 20.18.0
           deno-version: 1.37.1
           cache-modules: true
           install: true
diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
index 33f2de48feeb..2f803576ef51 100644
--- a/.github/workflows/publish-release.yml
+++ b/.github/workflows/publish-release.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Setup NodeJS
         uses: ./.github/actions/setup-node
         with:
-          node-version: 20.17.0
+          node-version: 20.18.0
           deno-version: 1.37.1
           cache-modules: true
           install: true
diff --git a/.github/workflows/release-candidate.yml b/.github/workflows/release-candidate.yml
index ad64416da04c..506f4cc1e5dd 100644
--- a/.github/workflows/release-candidate.yml
+++ b/.github/workflows/release-candidate.yml
@@ -1,7 +1,7 @@
 name: Release candidate cut
 on:
   schedule:
-    - cron: '28 0 20 * *' # run at minute 28 to avoid the chance of delay due to high load on GH
+    - cron: '28 12 20 * *' # run at minute 28 to avoid the chance of delay due to high load on GH
 jobs:
   new-release:
     runs-on: ubuntu-latest
@@ -15,7 +15,7 @@ jobs:
       - name: Setup NodeJS
         uses: ./.github/actions/setup-node
         with:
-          node-version: 20.17.0
+          node-version: 20.18.0
           deno-version: 1.37.1
           cache-modules: true
           install: true
diff --git a/.github/workflows/update-version-durability.yml b/.github/workflows/update-version-durability.yml
index bdf6b75e0f5b..45fd4859502b 100644
--- a/.github/workflows/update-version-durability.yml
+++ b/.github/workflows/update-version-durability.yml
@@ -14,22 +14,22 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
+      - uses: actions/checkout@v4
 
-    - name: Use Node.js
-      uses: actions/setup-node@v4.0.4
-      with:
-        node-version: '20.17.0'
+      - name: Use Node.js
+        uses: actions/setup-node@v4.1.0
+        with:
+          node-version: '20.18.0'
 
-    - name: Install dependencies
-      run: |
-        cd ./.github/actions/update-version-durability
-        npm install
+      - name: Install dependencies
+        run: |
+          cd ./.github/actions/update-version-durability
+          npm install
 
-    - name: Update Version Durability
-      uses: ./.github/actions/update-version-durability
-      with:
-        GH_TOKEN: ${{ secrets.CI_PAT }}
-        D360_TOKEN: ${{ secrets.D360_TOKEN }}
-        D360_ARTICLE_ID: 800f8d52-409d-478d-b560-f82a2c0eb7fb
-        PUBLISH: true
+      - name: Update Version Durability
+        uses: ./.github/actions/update-version-durability
+        with:
+          GH_TOKEN: ${{ secrets.CI_PAT }}
+          D360_TOKEN: ${{ secrets.D360_TOKEN }}
+          D360_ARTICLE_ID: 800f8d52-409d-478d-b560-f82a2c0eb7fb
+          PUBLISH: true
diff --git a/.kodiak.toml b/.kodiak.toml
index 7f89eed8f169..378f922d81e4 100644
--- a/.kodiak.toml
+++ b/.kodiak.toml
@@ -16,3 +16,5 @@ include_coauthors=true
 [merge.automerge_dependencies]
 versions = ["minor", "patch"]
 usernames = ["dependabot"]
+[approve]
+auto_approve_usernames = ["dependabot"]
diff --git a/.yarn/patches/swiper-npm-11.1.14-8126fa478a.patch b/.yarn/patches/swiper-npm-11.1.14-8126fa478a.patch
new file mode 100644
index 000000000000..b70fd3bb9d26
--- /dev/null
+++ b/.yarn/patches/swiper-npm-11.1.14-8126fa478a.patch
@@ -0,0 +1,62 @@
+diff --git a/package.json b/package.json
+index 9f37b1dd9e3ea128aafb0ceef83641e864474308..795e15b1b008596f0a278ff43cb1103794c10d9d 100644
+--- a/package.json
++++ b/package.json
+@@ -24,6 +24,7 @@
+       "default": "./swiper-bundle.mjs"
+     },
+     "./css": "./swiper.css",
++    "./swiper.css": "./swiper.css",
+     "./css/bundle": "./swiper-bundle.css",
+     "./swiper-bundle.css": "./swiper-bundle.css",
+     "./css/a11y": "./modules/a11y.css",
+@@ -49,6 +50,7 @@
+     "./css/thumbs": "./modules/thumbs.css",
+     "./css/virtual": "./modules/virtual.css",
+     "./css/zoom": "./modules/zoom.css",
++    "./modules/zoom.css": "./modules/zoom.css",
+     "./less": "./swiper.less",
+     "./less/a11y": "./modules/a11y.less",
+     "./less/autoplay": "./modules/autoplay.less",
+@@ -136,6 +138,10 @@
+       "types": "./swiper-react.d.ts",
+       "default": "./swiper-react.mjs"
+     },
++    "./swiper-react.mjs": {
++      "types": "./swiper-react.d.ts",
++      "default": "./swiper-react.mjs"
++    },
+     "./vue": {
+       "types": "./swiper-vue.d.ts",
+       "default": "./swiper-vue.mjs"
+@@ -144,6 +150,10 @@
+       "types": "./types/modules/index.d.ts",
+       "default": "./modules/index.mjs"
+     },
++    "./modules/index.mjs": {
++      "types": "./types/modules/index.d.ts",
++      "default": "./modules/index.mjs"
++    },
+     "./types": "./types/index.d.ts",
+     "./package.json": "./package.json"
+   },
+@@ -152,6 +162,9 @@
+       "modules": [
+         "./types/modules/index.d.ts"
+       ],
++      "modules/index.mjs": [
++        "./types/modules/index.d.ts"
++      ],
+       "element": [
+         "./swiper-element.d.ts"
+       ],
+@@ -161,6 +174,9 @@
+       "react": [
+         "./swiper-react.d.ts"
+       ],
++      "swiper-react.mjs": [
++        "./swiper-react.d.ts"
++      ],
+       "vue": [
+         "./swiper-vue.d.ts"
+       ]
diff --git a/README.md b/README.md
index 564ca75d2b11..d4053587a5c7 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ Free for 30 days. Afterward, choose between continuing to host on our secure clo
 
 You can follow these instructions to setup a dev environment:
 
-- Install **Node 14.x (LTS)** either [manually](https://nodejs.org/dist/latest-v14.x/) or using a tool like [nvm](https://github.com/creationix/nvm) or [volta](https://volta.sh/) (recommended)
+- Install **Node 20.x (LTS)** either [manually](https://nodejs.org/dist/latest-v20.x/) or using a tool like [nvm](https://github.com/creationix/nvm) or [volta](https://volta.sh/) (recommended)
 - Install **Meteor** ([version here](apps/meteor/.meteor/release)): https://docs.meteor.com/about/install.html
 - Install **yarn**: https://yarnpkg.com/getting-started/install
 - Install **Deno 1.x**: https://docs.deno.com/runtime/fundamentals/installation/
@@ -88,7 +88,7 @@ yarn turbo run ms
 
 After initialized, you can access the server at http://localhost:4000
 
-> ⚠️ Check more detailed information in the [Rocket.Chat Environment Setup](https://developer.rocket.chat/rocket.chat/rocket-chat-environment-setup) guide
+> ⚠️ Check more detailed information in the [Rocket.Chat Environment Setup](https://developer.rocket.chat/docs/server-environment-setup) guide
 
 # 💻 Installation
 
diff --git a/apps/meteor/.docker-mongo/Dockerfile b/apps/meteor/.docker-mongo/Dockerfile
index 17784e1769a3..560fde4a69dc 100644
--- a/apps/meteor/.docker-mongo/Dockerfile
+++ b/apps/meteor/.docker-mongo/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20.17.0-bullseye-slim
+FROM node:20.18.0-bullseye-slim
 
 LABEL maintainer="buildmaster@rocket.chat"
 
diff --git a/apps/meteor/.docker/Dockerfile b/apps/meteor/.docker/Dockerfile.alpine
similarity index 98%
rename from apps/meteor/.docker/Dockerfile
rename to apps/meteor/.docker/Dockerfile.alpine
index 7bff2a067c0a..0f1e170f9570 100644
--- a/apps/meteor/.docker/Dockerfile
+++ b/apps/meteor/.docker/Dockerfile.alpine
@@ -1,4 +1,4 @@
-FROM node:20.17.0-alpine3.20
+FROM node:20.18.0-alpine3.20
 
 LABEL maintainer="buildmaster@rocket.chat"
 
diff --git a/apps/meteor/.docker/Dockerfile.debian b/apps/meteor/.docker/Dockerfile.debian
index 7bbca15a9142..22134532ece0 100644
--- a/apps/meteor/.docker/Dockerfile.debian
+++ b/apps/meteor/.docker/Dockerfile.debian
@@ -2,7 +2,7 @@ ARG DENO_VERSION="1.37.1"
 
 FROM denoland/deno:bin-${DENO_VERSION} as deno
 
-FROM node:20.17.0-bullseye-slim
+FROM node:20.18.0-bullseye-slim
 
 LABEL maintainer="buildmaster@rocket.chat"
 
diff --git a/apps/meteor/.eslintignore b/apps/meteor/.eslintignore
index 3ff422a3ed3f..f7051767d772 100644
--- a/apps/meteor/.eslintignore
+++ b/apps/meteor/.eslintignore
@@ -12,3 +12,5 @@
 !/.storybook/
 !/client/.eslintrc.js
 !/ee/client/.eslintrc.js
+/storybook-static/
+/packages/
diff --git a/apps/meteor/.meteor/packages b/apps/meteor/.meteor/packages
index 70518d252df9..ead1cc41fd09 100644
--- a/apps/meteor/.meteor/packages
+++ b/apps/meteor/.meteor/packages
@@ -14,7 +14,7 @@ rocketchat:streamer
 rocketchat:version
 rocketchat:user-presence
 
-accounts-base@3.0.2
+accounts-base@3.0.3
 accounts-facebook@1.3.4
 accounts-github@1.5.1
 accounts-google@1.4.1
@@ -27,14 +27,14 @@ google-oauth@1.4.5
 oauth@3.0.0
 oauth2@1.3.3
 
-check@1.4.2
+check@1.4.4
 ddp-rate-limiter@1.2.2
 rate-limit@1.1.2
 email@3.1.0
 
 meteor-base@1.5.2
 ddp-common@1.4.4
-webapp@2.0.1
+webapp@2.0.3
 
 mongo@2.0.2
 
@@ -59,7 +59,7 @@ tracker@1.3.4
 reactive-dict@1.3.2
 reactive-var@1.0.13
 
-babel-compiler@7.11.0
+babel-compiler@7.11.1
 standard-minifier-css@1.9.3
 dynamic-import@0.7.4
 ecmascript@0.16.9
diff --git a/apps/meteor/.meteor/release b/apps/meteor/.meteor/release
index c41cba9c61a2..b1e86a359f7c 100644
--- a/apps/meteor/.meteor/release
+++ b/apps/meteor/.meteor/release
@@ -1 +1 @@
-METEOR@3.0.3
+METEOR@3.0.4
diff --git a/apps/meteor/.meteor/versions b/apps/meteor/.meteor/versions
index c41710f5aa16..0f8f733b3148 100644
--- a/apps/meteor/.meteor/versions
+++ b/apps/meteor/.meteor/versions
@@ -1,4 +1,4 @@
-accounts-base@3.0.2
+accounts-base@3.0.3
 accounts-facebook@1.3.4
 accounts-github@1.5.1
 accounts-google@1.4.1
@@ -8,24 +8,24 @@ accounts-password@3.0.2
 accounts-twitter@1.5.2
 allow-deny@2.0.0
 autoupdate@2.0.0
-babel-compiler@7.11.0
+babel-compiler@7.11.1
 babel-runtime@1.5.2
 base64@1.0.13
 binary-heap@1.0.12
 boilerplate-generator@2.0.0
 callback-hook@1.6.0
-check@1.4.2
+check@1.4.4
 core-runtime@1.0.0
 ddp@1.4.2
-ddp-client@3.0.1
+ddp-client@3.0.2
 ddp-common@1.4.4
 ddp-rate-limiter@1.2.2
-ddp-server@3.0.1
+ddp-server@3.0.2
 diff-sequence@1.1.3
 dispatch:run-as-user@1.1.1
 dynamic-import@0.7.4
 ecmascript@0.16.9
-ecmascript-runtime@0.8.2
+ecmascript-runtime@0.8.3
 ecmascript-runtime-client@0.12.2
 ecmascript-runtime-server@0.11.1
 ejson@1.1.4
@@ -51,7 +51,7 @@ meteorhacks:inject-initial@1.0.5
 minifier-css@2.0.0
 minimongo@2.0.1
 modern-browsers@0.1.11
-modules@0.20.1
+modules@0.20.2
 modules-runtime@0.13.2
 mongo@2.0.2
 mongo-decimal@0.1.4-beta300.7
@@ -89,8 +89,8 @@ tracker@1.3.4
 twitter-oauth@1.3.4
 typescript@5.4.3
 underscore@1.6.4
-url@1.3.3
-webapp@2.0.1
+url@1.3.4
+webapp@2.0.3
 webapp-hashing@1.1.2
 zodern:caching-minifier@0.5.0
 zodern:standard-minifier-js@5.2.0
diff --git a/apps/meteor/.mocharc.js b/apps/meteor/.mocharc.js
index fb5324f4c0fd..f11b315b8cef 100644
--- a/apps/meteor/.mocharc.js
+++ b/apps/meteor/.mocharc.js
@@ -32,8 +32,10 @@ module.exports = {
 		'tests/unit/app/**/*.tests.js',
 		'tests/unit/app/**/*.tests.ts',
 		'tests/unit/lib/**/*.tests.ts',
+		'server/routes/avatar/**/*.spec.ts',
 		'tests/unit/lib/**/*.spec.ts',
 		'tests/unit/server/**/*.tests.ts',
 		'tests/unit/server/**/*.spec.ts',
+		'app/api/**/*.spec.ts',
 	],
 };
diff --git a/apps/meteor/.stylelintignore b/apps/meteor/.stylelintignore
index 4bd9c6d458d6..33637d3dd3e7 100644
--- a/apps/meteor/.stylelintignore
+++ b/apps/meteor/.stylelintignore
@@ -1,3 +1,4 @@
 app/theme/client/vendor/fontello/css/fontello.css
 app/meteor-autocomplete/client/autocomplete.css
 app/emoji-emojione/client/*.css
+storybook-static
diff --git a/apps/meteor/.stylelintrc b/apps/meteor/.stylelintrc
index 0b2488ab89f3..f0a8cfc1475e 100644
--- a/apps/meteor/.stylelintrc
+++ b/apps/meteor/.stylelintrc
@@ -1,327 +1,59 @@
 {
-    "plugins": [
-		"stylelint-order"
-	],
-    "rules": {
-		"at-rule-empty-line-before": [ "always", {
-			except: [
-				"blockless-after-same-name-blockless",
-				"first-nested",
-			],
-			ignore: ["after-comment"],
-		} ],
-		"at-rule-name-case": "lower",
-		"at-rule-name-space-after": "always",
-		"at-rule-semicolon-newline-after": "always",
-		"block-closing-brace-empty-line-before": "never",
-		"block-closing-brace-newline-after": "always",
-		"block-closing-brace-newline-before": "always",
-		"block-closing-brace-space-before": "never-single-line",
+	"extends": ["stylelint-config-standard"],
+	"plugins": ["stylelint-order", "stylelint-selector-bem-pattern"],
+	"rules": {
+		"at-rule-empty-line-before": [
+			"always",
+			{
+				"except": ["blockless-after-same-name-blockless", "first-nested"],
+				"ignore": ["after-comment"]
+			}
+		],
 		"block-no-empty": true,
-		"block-opening-brace-newline-after": "always",
-		"block-opening-brace-space-after": "never-single-line",
-		"block-opening-brace-space-before": "always",
-		"color-hex-case": "lower",
 		"color-hex-length": "long",
 		"color-no-invalid-hex": true,
-		"comment-empty-line-before": [ "always", {
-			except: ["first-nested"],
-			ignore: ["stylelint-commands"],
-		} ],
+		"comment-empty-line-before": [
+			"always",
+			{
+				"except": ["first-nested"],
+				"ignore": ["stylelint-commands"]
+			}
+		],
 		"comment-no-empty": true,
 		"comment-whitespace-inside": "always",
 		"custom-property-empty-line-before": "never",
-		"declaration-bang-space-after": "never",
-		"declaration-bang-space-before": "always",
-		"declaration-block-no-duplicate-properties": [ true, {
-			ignore: ["consecutive-duplicates-with-different-values"],
-		} ],
+		"declaration-block-no-duplicate-properties": [
+			true,
+			{
+				"ignore": ["consecutive-duplicates-with-different-values"]
+			}
+		],
 		"declaration-block-no-redundant-longhand-properties": true,
 		"declaration-block-no-shorthand-property-overrides": true,
-		"declaration-block-semicolon-newline-after": "always",
-		"declaration-block-semicolon-space-after": "always-single-line",
-		"declaration-block-semicolon-space-before": "never",
 		"declaration-block-single-line-max-declarations": 1,
-		"declaration-block-trailing-semicolon": "always",
-		"declaration-colon-newline-after": "always-multi-line",
-		"declaration-colon-space-after": "always-single-line",
-		"declaration-colon-space-before": "never",
 		"font-family-no-duplicate-names": true,
-		"function-comma-newline-after": "always-multi-line",
-		"function-comma-space-after": "always-single-line",
-		"function-comma-space-before": "never",
 		"function-linear-gradient-no-nonstandard-direction": true,
-		"function-max-empty-lines": 0,
 		"function-name-case": "lower",
-		"function-parentheses-newline-inside": "always-multi-line",
-		"function-parentheses-space-inside": "never-single-line",
-		"function-whitespace-after": "always",
-		"indentation": "tab",
 		"keyframe-declaration-no-important": true,
 		"length-zero-no-unit": true,
-		"max-empty-lines": 1,
-		"media-feature-colon-space-after": "always",
-		"media-feature-colon-space-before": "never",
-		"media-feature-name-case": "lower",
 		"media-feature-name-no-unknown": true,
-		"media-feature-parentheses-space-inside": "never",
-		"media-feature-range-operator-space-after": "always",
-		"media-feature-range-operator-space-before": "always",
-		"media-query-list-comma-newline-after": "always-multi-line",
-		"media-query-list-comma-space-after": "always-single-line",
-		"media-query-list-comma-space-before": "never",
 		"no-duplicate-selectors": true,
 		"no-empty-source": true,
-		"no-eol-whitespace": true,
-		"no-extra-semicolons": true,
-		"no-missing-end-of-source-newline": true,
-		"number-leading-zero": "always",
-		"number-no-trailing-zeros": true,
-		"property-case": "lower",
 		"property-no-unknown": true,
-		"rule-empty-line-before": [ "always", {
-			except: ["first-nested"],
-			ignore: ["after-comment"],
-		} ],
-		"selector-attribute-brackets-space-inside": "never",
-		"selector-attribute-operator-space-after": "never",
-		"selector-attribute-operator-space-before": "never",
-		"selector-combinator-space-after": "always",
-		"selector-combinator-space-before": "always",
-		"selector-descendant-combinator-no-non-space": true,
-		"selector-list-comma-newline-after": "always",
-		"selector-list-comma-space-before": "never",
-		"selector-max-empty-lines": 0,
-		"selector-pseudo-class-case": "lower",
+		"rule-empty-line-before": [
+			"always",
+			{
+				"except": ["first-nested"],
+				"ignore": ["after-comment"]
+			}
+		],
 		"selector-pseudo-class-no-unknown": true,
-		"selector-pseudo-class-parentheses-space-inside": "never",
-		"selector-pseudo-element-case": "lower",
 		"selector-pseudo-element-colon-notation": "double",
 		"selector-pseudo-element-no-unknown": true,
 		"selector-type-case": "lower",
 		"selector-type-no-unknown": true,
 		"shorthand-property-no-redundant-values": true,
 		"string-no-newline": true,
-		"unit-case": "lower",
-		"unit-no-unknown": true,
-		"value-list-comma-newline-after": "always-multi-line",
-		"value-list-comma-space-after": "always-single-line",
-		"value-list-comma-space-before": "never",
-		"value-list-max-empty-lines": 0,
-		"order/properties-order": [
-            [
-                {
-                    "emptyLineBefore": "always",
-                    "order": "strict",
-                    "properties": [
-                        "position",
-                        "z-index",
-                        "top",
-                        "right",
-                        "bottom",
-                        "left"
-                    ]
-                },
-                {
-                    "emptyLineBefore": "always",
-                    "order": "strict",
-                    "properties": [
-                        "display",
-                        "visibility",
-                        "float",
-                        "clear",
-                        "overflow",
-                        "overflow-x",
-                        "overflow-y",
-                        "clip",
-                        "zoom",
-                        "flex-direction",
-                        "flex-order",
-                        "flex-pack",
-                        "flex-align",
-                        "flex"
-                    ]
-                },
-                {
-                    "emptyLineBefore": "always",
-                    "order": "strict",
-                    "properties": [
-                        "box-sizing",
-                        "width",
-                        "min-width",
-                        "max-width",
-                        "height",
-                        "min-height",
-                        "max-height",
-                        "margin",
-                        "margin-top",
-                        "margin-right",
-                        "margin-bottom",
-                        "margin-left",
-                        "padding",
-                        "padding-top",
-                        "padding-right",
-                        "padding-bottom",
-                        "padding-left"
-                    ]
-                },
-                {
-                    "emptyLineBefore": "always",
-                    "order": "strict",
-                    "properties": [
-                        "table-layout",
-                        "empty-cells",
-                        "caption-side",
-                        "border-spacing",
-                        "border-collapse",
-                        "list-style",
-                        "list-style-position",
-                        "list-style-type",
-                        "list-style-image"
-                    ]
-                },
-                {
-                    "emptyLineBefore": "always",
-                    "order": "strict",
-                    "properties": [
-                        "content",
-                        "quotes",
-                        "counter-reset",
-                        "counter-increment",
-                        "resize",
-                        "cursor",
-                        "user-select",
-                        "nav-index",
-                        "nav-up",
-                        "nav-right",
-                        "nav-down",
-                        "nav-left",
-                        "transition",
-                        "transition-delay",
-                        "transition-timing-function",
-                        "transition-duration",
-                        "transition-property",
-                        "transform",
-                        "transform-origin",
-                        "animation",
-                        "animation-name",
-                        "animation-duration",
-                        "animation-play-state",
-                        "animation-timing-function",
-                        "animation-delay",
-                        "animation-iteration-count",
-                        "animation-direction",
-                        "text-align",
-                        "text-align-last",
-                        "vertical-align",
-                        "white-space",
-                        "text-decoration",
-                        "text-emphasis",
-                        "text-emphasis-color",
-                        "text-emphasis-style",
-                        "text-emphasis-position",
-                        "text-indent",
-                        "text-justify",
-                        "text-transform",
-                        "letter-spacing",
-                        "word-spacing",
-                        "text-outline",
-                        "text-transform",
-                        "text-wrap",
-                        "text-overflow",
-                        "text-overflow-ellipsis",
-                        "text-overflow-mode",
-                        "word-wrap",
-                        "word-break",
-                        "tab-size",
-                        "hyphens",
-                        "pointer-events"
-                    ]
-                },
-                {
-                    "emptyLineBefore": "always",
-                    "order": "strict",
-                    "properties": [
-                        "opacity",
-                        "filter:progid:DXImageTransform.Microsoft.Alpha(Opacity",
-                        "color",
-                        "border",
-                        "border-collapse",
-                        "border-width",
-                        "border-style",
-                        "border-color",
-                        "border-top",
-                        "border-top-width",
-                        "border-top-style",
-                        "border-top-color",
-                        "border-right",
-                        "border-right-width",
-                        "border-right-style",
-                        "border-right-color",
-                        "border-bottom",
-                        "border-bottom-width",
-                        "border-bottom-style",
-                        "border-bottom-color",
-                        "border-left",
-                        "border-left-width",
-                        "border-left-style",
-                        "border-left-color",
-                        "border-radius",
-                        "border-top-left-radius",
-                        "border-top-right-radius",
-                        "border-bottom-right-radius",
-                        "border-bottom-left-radius",
-                        "border-image",
-                        "border-image-source",
-                        "border-image-slice",
-                        "border-image-width",
-                        "border-image-outset",
-                        "border-image-repeat",
-                        "outline",
-                        "outline-width",
-                        "outline-style",
-                        "outline-color",
-                        "outline-offset",
-                        "background",
-                        "filter:progid:DXImageTransform.Microsoft.AlphaImageLoader",
-                        "background-color",
-                        "background-image",
-                        "background-repeat",
-                        "background-attachment",
-                        "background-position",
-                        "background-position-x",
-                        "background-position-y",
-                        "background-clip",
-                        "background-origin",
-                        "background-size",
-                        "box-decoration-break",
-                        "box-shadow",
-                        "filter:progid:DXImageTransform.Microsoft.gradient",
-                        "text-shadow"
-                    ]
-                },
-                {
-                    "emptyLineBefore": "always",
-                    "order": "strict",
-                    "properties": [
-                        "font",
-                        "font-family",
-                        "font-size",
-                        "font-weight",
-                        "font-style",
-                        "font-variant",
-                        "font-size-adjust",
-                        "font-stretch",
-                        "font-effect",
-                        "font-emphasize",
-                        "font-emphasize-position",
-                        "font-emphasize-style",
-                        "font-smooth",
-                        "line-height"
-                    ]
-                }
-            ],
-            { unspecified: "bottomAlphabetical" }
-        ]
+		"unit-no-unknown": true
 	}
 }
diff --git a/apps/meteor/CHANGELOG.md b/apps/meteor/CHANGELOG.md
index 60da08d7fcd5..179042fce8a9 100644
--- a/apps/meteor/CHANGELOG.md
+++ b/apps/meteor/CHANGELOG.md
@@ -1,5 +1,219 @@
 # @rocket.chat/meteor
 
+## 7.1.0-rc.3
+
+### Patch Changes
+
+- Bump @rocket.chat/meteor version.
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.3
+  - @rocket.chat/rest-typings@7.1.0-rc.3
+  - @rocket.chat/license@1.0.1-rc.3
+  - @rocket.chat/omnichannel-services@0.3.7-rc.3
+  - @rocket.chat/pdf-worker@0.2.7-rc.3
+  - @rocket.chat/presence@0.2.10-rc.3
+  - @rocket.chat/api-client@0.2.10-rc.3
+  - @rocket.chat/apps@0.2.1-rc.3
+  - @rocket.chat/core-services@0.7.2-rc.3
+  - @rocket.chat/cron@0.1.10-rc.3
+  - @rocket.chat/freeswitch@1.0.1-rc.3
+  - @rocket.chat/fuselage-ui-kit@13.0.0-rc.3
+  - @rocket.chat/gazzodown@13.0.0-rc.3
+  - @rocket.chat/model-typings@1.1.0-rc.3
+  - @rocket.chat/ui-contexts@13.0.0-rc.3
+  - @rocket.chat/server-cloud-communication@0.0.2
+  - @rocket.chat/network-broker@0.1.2-rc.3
+  - @rocket.chat/models@1.0.1-rc.3
+  - @rocket.chat/ui-theming@0.4.0
+  - @rocket.chat/ui-avatar@9.0.0-rc.3
+  - @rocket.chat/ui-client@13.0.0-rc.3
+  - @rocket.chat/ui-video-conf@13.0.0-rc.3
+  - @rocket.chat/ui-voip@3.0.0-rc.3
+  - @rocket.chat/web-ui-registration@13.0.0-rc.3
+  - @rocket.chat/instance-status@0.1.10-rc.3
+  </details>
+
+## 7.1.0-rc.2
+
+### Patch Changes
+
+- Bump @rocket.chat/meteor version.
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.2
+  - @rocket.chat/rest-typings@7.1.0-rc.2
+  - @rocket.chat/license@1.0.1-rc.2
+  - @rocket.chat/omnichannel-services@0.3.7-rc.2
+  - @rocket.chat/pdf-worker@0.2.7-rc.2
+  - @rocket.chat/presence@0.2.10-rc.2
+  - @rocket.chat/api-client@0.2.10-rc.2
+  - @rocket.chat/apps@0.2.1-rc.2
+  - @rocket.chat/core-services@0.7.2-rc.2
+  - @rocket.chat/cron@0.1.10-rc.2
+  - @rocket.chat/freeswitch@1.0.1-rc.2
+  - @rocket.chat/fuselage-ui-kit@13.0.0-rc.2
+  - @rocket.chat/gazzodown@13.0.0-rc.2
+  - @rocket.chat/model-typings@1.1.0-rc.2
+  - @rocket.chat/ui-contexts@13.0.0-rc.2
+  - @rocket.chat/server-cloud-communication@0.0.2
+  - @rocket.chat/network-broker@0.1.2-rc.2
+  - @rocket.chat/models@1.0.1-rc.2
+  - @rocket.chat/ui-theming@0.4.0
+  - @rocket.chat/ui-avatar@9.0.0-rc.2
+  - @rocket.chat/ui-client@13.0.0-rc.2
+  - @rocket.chat/ui-video-conf@13.0.0-rc.2
+  - @rocket.chat/ui-voip@3.0.0-rc.2
+  - @rocket.chat/web-ui-registration@13.0.0-rc.2
+  - @rocket.chat/instance-status@0.1.10-rc.2
+  </details>
+
+## 7.1.0-rc.1
+
+### Patch Changes
+
+- Bump @rocket.chat/meteor version.
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.1
+  - @rocket.chat/rest-typings@7.1.0-rc.1
+  - @rocket.chat/license@1.0.1-rc.1
+  - @rocket.chat/omnichannel-services@0.3.7-rc.1
+  - @rocket.chat/pdf-worker@0.2.7-rc.1
+  - @rocket.chat/presence@0.2.10-rc.1
+  - @rocket.chat/api-client@0.2.10-rc.1
+  - @rocket.chat/apps@0.2.1-rc.1
+  - @rocket.chat/core-services@0.7.2-rc.1
+  - @rocket.chat/cron@0.1.10-rc.1
+  - @rocket.chat/freeswitch@1.0.1-rc.1
+  - @rocket.chat/fuselage-ui-kit@13.0.0-rc.1
+  - @rocket.chat/gazzodown@13.0.0-rc.1
+  - @rocket.chat/model-typings@1.1.0-rc.1
+  - @rocket.chat/ui-contexts@13.0.0-rc.1
+  - @rocket.chat/server-cloud-communication@0.0.2
+  - @rocket.chat/network-broker@0.1.2-rc.1
+  - @rocket.chat/models@1.0.1-rc.1
+  - @rocket.chat/ui-theming@0.4.0
+  - @rocket.chat/ui-avatar@9.0.0-rc.1
+  - @rocket.chat/ui-client@13.0.0-rc.1
+  - @rocket.chat/ui-video-conf@13.0.0-rc.1
+  - @rocket.chat/ui-voip@3.0.0-rc.1
+  - @rocket.chat/web-ui-registration@13.0.0-rc.1
+  - @rocket.chat/instance-status@0.1.10-rc.1
+  </details>
+
+## 7.1.0-rc.0
+
+### Minor Changes
+
+- ([#33897](https://github.com/RocketChat/Rocket.Chat/pull/33897)) adds unread badge to sidebar collapser
+
+- ([#32906](https://github.com/RocketChat/Rocket.Chat/pull/32906)) Improves thread metrics featuring user avatars, better titles and repositioned elements.
+
+- ([#33810](https://github.com/RocketChat/Rocket.Chat/pull/33810)) Adds cursor pagination on chat.syncMessages endpoint
+
+- ([#33214](https://github.com/RocketChat/Rocket.Chat/pull/33214)) Adds a new route to allow fetching avatars by the user's id `/avatar/uid/<UserID>`
+
+- ([#32727](https://github.com/RocketChat/Rocket.Chat/pull/32727)) These changes aims to add:
+  - A brand-new omnichannel contact profile
+  - The ability to communicate with known contacts only
+  - Communicate with verified contacts only
+  - Merge verified contacts across different channels
+  - Block contact channels
+  - Resolve conflicting contact information when registered via different channels
+  - An advanced contact center filters
+- ([#33920](https://github.com/RocketChat/Rocket.Chat/pull/33920)) Improves the customizability of the naming of automatic Persistent video calls discussions, allowing the date of the call to be in different parts of the name, using the `[date]` keyword.
+
+- ([#33997](https://github.com/RocketChat/Rocket.Chat/pull/33997)) Prevent apps' subprocesses from crashing on unhandled rejections or uncaught exceptions
+
+- ([#33814](https://github.com/RocketChat/Rocket.Chat/pull/33814)) Adds a confirmation modal to the cancel subscription action
+
+- ([#33949](https://github.com/RocketChat/Rocket.Chat/pull/33949)) Disables the possiblity to upload exempted apps
+
+### Patch Changes
+
+- ([#33776](https://github.com/RocketChat/Rocket.Chat/pull/33776)) Fix user highlights not matching only whole words
+
+- ([#33818](https://github.com/RocketChat/Rocket.Chat/pull/33818)) Remove unused client side `setUserActiveStatus` meteor method.
+
+- ([#33596](https://github.com/RocketChat/Rocket.Chat/pull/33596)) Bump meteor to 3.0.4 and Node version to 20.18.0
+
+- ([#33713](https://github.com/RocketChat/Rocket.Chat/pull/33713)) Deprecated the `from` field in the apps email bridge and made it optional, using the server's settings when the field is omitted
+
+- ([#32991](https://github.com/RocketChat/Rocket.Chat/pull/32991)) Fixes an issue where updating custom emojis didn’t work as expected, ensuring that uploaded emojis now update correctly and display without any caching problems.
+
+- ([#33985](https://github.com/RocketChat/Rocket.Chat/pull/33985)) Fixes issue that could cause multiple discussions to be created when creating it from a message action
+
+- ([#33904](https://github.com/RocketChat/Rocket.Chat/pull/33904)) adds missing html attributes in sidebar item templates
+
+- ([#33218](https://github.com/RocketChat/Rocket.Chat/pull/33218)) Fixes message character limit not being applied to file upload descriptions
+
+- ([#33908](https://github.com/RocketChat/Rocket.Chat/pull/33908)) Fixes the issue where newly created teams are incorrectly displayed as channels on the sidebar when the DISABLE_DB_WATCHERS environment variable is enabled
+
+- ([#33953](https://github.com/RocketChat/Rocket.Chat/pull/33953)) Adds a divider on Create team modal - advanced settings
+
+- ([#33786](https://github.com/RocketChat/Rocket.Chat/pull/33786)) Fixed an issue that would grant network permission to app's processes in wrong cases
+
+- ([#33986](https://github.com/RocketChat/Rocket.Chat/pull/33986)) Fixes sidepanel not replicating sidebar sort preference
+
+- ([#33689](https://github.com/RocketChat/Rocket.Chat/pull/33689)) Fixes banner breaking the UI with specific payloads
+
+- ([#33808](https://github.com/RocketChat/Rocket.Chat/pull/33808)) Fixes client-side updates for recent emoji list when custom emojis are modified.
+
+- ([#33902](https://github.com/RocketChat/Rocket.Chat/pull/33902)) Adds "Master volume" and "Call ringer volume" to the user preferences sound section.
+
+- ([#33311](https://github.com/RocketChat/Rocket.Chat/pull/33311)) Sends server statistics only once a day despite multiple instance being started at different times.
+
+- ([#33719](https://github.com/RocketChat/Rocket.Chat/pull/33719)) stops calling an object through proxy calling getQueueWorker
+
+- ([#33785](https://github.com/RocketChat/Rocket.Chat/pull/33785)) Fixed an issue where the installed apps list would go stale without a refresh in some cases
+
+- ([#33278](https://github.com/RocketChat/Rocket.Chat/pull/33278)) Fixes display of emoji aliases in custom emoji list by adding commas between aliases
+
+- ([#33772](https://github.com/RocketChat/Rocket.Chat/pull/33772)) Fixes `waiting queue` feature. When `Livechat_waiting_queue` setting is enabled, incoming conversations should be sent to the queue instead of being assigned directly.
+
+- ([#33963](https://github.com/RocketChat/Rocket.Chat/pull/33963)) Fixes edge case of thread unread not being added to unread group
+
+- ([#33994](https://github.com/RocketChat/Rocket.Chat/pull/33994)) Adds login and permission validation for resetIrcConnection method
+
+- ([#33880](https://github.com/RocketChat/Rocket.Chat/pull/33880)) Updates VoIP field labels from 'Free Extension Numbers' to 'Available Extensions' to better describe the field's purpose and improve clarity.
+
+- ([#33958](https://github.com/RocketChat/Rocket.Chat/pull/33958)) Fixes an issue where resizable handler renders over the expanded thread view while using contextualbarResizable feature preview
+
+- <details><summary>Updated dependencies [82767d8fd8a52ac348e8aded1d238e688d36129b, 80e36bfc3938775eb26aa5576f1b9b98896e1cc4, 66ecc64fc1d4464ad2818ad04e23a09cdf221194, 6c83bf0657004ee9cf43d5c832f51826a6591165, e7edeac3bdd22da0a04b8e873d5a008e249fb4be, 3569b0a9c48f8b94ebaef2f8b607c52fdb8e570a, b4841cb7206d855d7a1bc7604683a5b4a48b7176, 32d93a0666fa1cbe857d02889e93d9bbf45bd4f0, d1e6a73796269824fb1aa7afcc7b8aa242e34e90, 661cc01237629ce83699d6c25df25d12985e88bf, 63ccadc012499e004445ad6bc6cd2ff777aecbd1, ce7024af36fcde97b1da5b2731f6edc4a4c236b8, 616655585cb1c5c60d7cee97e25b17af3dfda794, e5fe727f6a2f0e60cdf7ba225e1f6caa6db2045c, d398866dba725918017e3609807f9d0ab9b89b72, 322bafd4bd1fe91ed34610501b269e4d8951944c, d398866dba725918017e3609807f9d0ab9b89b72]:</summary>
+
+  - @rocket.chat/apps-engine@1.48.0-rc.0
+  - @rocket.chat/model-typings@1.1.0-rc.0
+  - @rocket.chat/core-typings@7.1.0-rc.0
+  - @rocket.chat/i18n@1.1.0-rc.0
+  - @rocket.chat/rest-typings@7.1.0-rc.0
+  - @rocket.chat/core-services@0.7.2-rc.0
+  - @rocket.chat/presence@0.2.10-rc.0
+  - @rocket.chat/apps@0.2.1-rc.0
+  - @rocket.chat/fuselage-ui-kit@13.0.0-rc.0
+  - @rocket.chat/omnichannel-services@0.3.7-rc.0
+  - @rocket.chat/models@1.0.1-rc.0
+  - @rocket.chat/license@1.0.1-rc.0
+  - @rocket.chat/pdf-worker@0.2.7-rc.0
+  - @rocket.chat/api-client@0.2.10-rc.0
+  - @rocket.chat/cron@0.1.10-rc.0
+  - @rocket.chat/freeswitch@1.0.1-rc.0
+  - @rocket.chat/gazzodown@13.0.0-rc.0
+  - @rocket.chat/ui-contexts@13.0.0-rc.0
+  - @rocket.chat/web-ui-registration@13.0.0-rc.0
+  - @rocket.chat/network-broker@0.1.2-rc.0
+  - @rocket.chat/instance-status@0.1.10-rc.0
+  - @rocket.chat/server-cloud-communication@0.0.2
+  - @rocket.chat/ui-theming@0.4.0
+  - @rocket.chat/ui-avatar@9.0.0-rc.0
+  - @rocket.chat/ui-client@13.0.0-rc.0
+  - @rocket.chat/ui-video-conf@13.0.0-rc.0
+  - @rocket.chat/ui-voip@3.0.0-rc.0
+  </details>
+
 ## 7.0.0
 
 ### Major Changes
diff --git a/apps/meteor/app/2fa/server/code/EmailCheck.ts b/apps/meteor/app/2fa/server/code/EmailCheck.ts
index 5baf218a62bb..8c9865c0b004 100644
--- a/apps/meteor/app/2fa/server/code/EmailCheck.ts
+++ b/apps/meteor/app/2fa/server/code/EmailCheck.ts
@@ -4,10 +4,10 @@ import { Random } from '@rocket.chat/random';
 import bcrypt from 'bcrypt';
 import { Accounts } from 'meteor/accounts-base';
 
+import type { ICodeCheck, IProcessInvalidCodeResult } from './ICodeCheck';
 import { i18n } from '../../../../server/lib/i18n';
 import * as Mailer from '../../../mailer/server/api';
 import { settings } from '../../../settings/server';
-import type { ICodeCheck, IProcessInvalidCodeResult } from './ICodeCheck';
 
 export class EmailCheck implements ICodeCheck {
 	public readonly name = 'email';
diff --git a/apps/meteor/app/2fa/server/code/PasswordCheckFallback.ts b/apps/meteor/app/2fa/server/code/PasswordCheckFallback.ts
index 6c441127f79d..ba462abc1f93 100644
--- a/apps/meteor/app/2fa/server/code/PasswordCheckFallback.ts
+++ b/apps/meteor/app/2fa/server/code/PasswordCheckFallback.ts
@@ -1,8 +1,8 @@
 import type { IUser } from '@rocket.chat/core-typings';
 import { Accounts } from 'meteor/accounts-base';
 
-import { settings } from '../../../settings/server';
 import type { ICodeCheck, IProcessInvalidCodeResult } from './ICodeCheck';
+import { settings } from '../../../settings/server';
 
 export class PasswordCheckFallback implements ICodeCheck {
 	public readonly name = 'password';
diff --git a/apps/meteor/app/2fa/server/code/TOTPCheck.ts b/apps/meteor/app/2fa/server/code/TOTPCheck.ts
index 3aa2604c7965..236016883f89 100644
--- a/apps/meteor/app/2fa/server/code/TOTPCheck.ts
+++ b/apps/meteor/app/2fa/server/code/TOTPCheck.ts
@@ -1,8 +1,8 @@
 import type { IUser } from '@rocket.chat/core-typings';
 
+import type { ICodeCheck, IProcessInvalidCodeResult } from './ICodeCheck';
 import { settings } from '../../../settings/server';
 import { TOTP } from '../lib/totp';
-import type { ICodeCheck, IProcessInvalidCodeResult } from './ICodeCheck';
 
 export class TOTPCheck implements ICodeCheck {
 	public readonly name = 'totp';
diff --git a/apps/meteor/app/2fa/server/code/index.ts b/apps/meteor/app/2fa/server/code/index.ts
index b05157416e31..d4be080259cf 100644
--- a/apps/meteor/app/2fa/server/code/index.ts
+++ b/apps/meteor/app/2fa/server/code/index.ts
@@ -5,11 +5,11 @@ import { Users } from '@rocket.chat/models';
 import { Accounts } from 'meteor/accounts-base';
 import { Meteor } from 'meteor/meteor';
 
-import { settings } from '../../../settings/server';
 import { EmailCheck } from './EmailCheck';
 import type { ICodeCheck } from './ICodeCheck';
 import { PasswordCheckFallback } from './PasswordCheckFallback';
 import { TOTPCheck } from './TOTPCheck';
+import { settings } from '../../../settings/server';
 
 export interface ITwoFactorOptions {
 	disablePasswordFallback?: boolean;
diff --git a/apps/meteor/app/2fa/server/loginHandler.ts b/apps/meteor/app/2fa/server/loginHandler.ts
index a51ba72ec7fa..b554330e140f 100644
--- a/apps/meteor/app/2fa/server/loginHandler.ts
+++ b/apps/meteor/app/2fa/server/loginHandler.ts
@@ -3,8 +3,8 @@ import { check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 import { OAuth } from 'meteor/oauth';
 
-import { callbacks } from '../../../lib/callbacks';
 import { checkCodeForUser } from './code/index';
+import { callbacks } from '../../../lib/callbacks';
 
 const isMeteorError = (error: any): error is Meteor.Error => {
 	return error?.meteorError !== undefined;
diff --git a/apps/meteor/app/api/server/api.ts b/apps/meteor/app/api/server/api.ts
index 7bb7f5af28ba..51930f1e9e50 100644
--- a/apps/meteor/app/api/server/api.ts
+++ b/apps/meteor/app/api/server/api.ts
@@ -14,15 +14,6 @@ import type { Request, Response } from 'meteor/rocketchat:restivus';
 import { Restivus } from 'meteor/rocketchat:restivus';
 import _ from 'underscore';
 
-import { isObject } from '../../../lib/utils/isObject';
-import { getNestedProp } from '../../../server/lib/getNestedProp';
-import { getRestPayload } from '../../../server/lib/logger/logPayloads';
-import { checkCodeForUser } from '../../2fa/server/code';
-import { hasPermissionAsync } from '../../authorization/server/functions/hasPermission';
-import { notifyOnUserChangeAsync } from '../../lib/server/lib/notifyListener';
-import { metrics } from '../../metrics/server';
-import { settings } from '../../settings/server';
-import { getDefaultUserFields } from '../../utils/server/functions/getDefaultUserFields';
 import type { PermissionsPayload } from './api.helpers';
 import { checkPermissionsForInvocation, checkPermissions, parseDeprecation } from './api.helpers';
 import type {
@@ -37,6 +28,15 @@ import type {
 } from './definition';
 import { getUserInfo } from './helpers/getUserInfo';
 import { parseJsonQuery } from './helpers/parseJsonQuery';
+import { isObject } from '../../../lib/utils/isObject';
+import { getNestedProp } from '../../../server/lib/getNestedProp';
+import { getRestPayload } from '../../../server/lib/logger/logPayloads';
+import { checkCodeForUser } from '../../2fa/server/code';
+import { hasPermissionAsync } from '../../authorization/server/functions/hasPermission';
+import { notifyOnUserChangeAsync } from '../../lib/server/lib/notifyListener';
+import { metrics } from '../../metrics/server';
+import { settings } from '../../settings/server';
+import { getDefaultUserFields } from '../../utils/server/functions/getDefaultUserFields';
 
 const logger = new Logger('API');
 
@@ -189,10 +189,13 @@ export class APIClass<TBasePath extends string = ''> extends Restivus {
 	}
 
 	public setLimitedCustomFields(customFields: string[]): void {
-		const nonPublicFieds = customFields.reduce((acc, customField) => {
-			acc[`customFields.${customField}`] = 0;
-			return acc;
-		}, {} as Record<string, any>);
+		const nonPublicFieds = customFields.reduce(
+			(acc, customField) => {
+				acc[`customFields.${customField}`] = 0;
+				return acc;
+			},
+			{} as Record<string, any>,
+		);
 		this.limitedUserFieldsToExclude = {
 			...this.defaultLimitedUserFieldsToExclude,
 			...nonPublicFieds,
diff --git a/apps/meteor/app/api/server/definition.ts b/apps/meteor/app/api/server/definition.ts
index acace73a8226..c15e0bc10d98 100644
--- a/apps/meteor/app/api/server/definition.ts
+++ b/apps/meteor/app/api/server/definition.ts
@@ -22,7 +22,7 @@ export type FailureResult<T, TStack = undefined, TErrorType = undefined, TErrorD
 				errorType?: TErrorType;
 				details?: TErrorDetails;
 				message?: string;
-		  } & (undefined extends TErrorType ? object : { errorType: TErrorType }) &
+			} & (undefined extends TErrorType ? object : { errorType: TErrorType }) &
 				(undefined extends TErrorDetails ? object : { details: TErrorDetails extends string ? unknown : TErrorDetails });
 };
 
@@ -130,20 +130,20 @@ export type ActionThis<TMethod extends Method, TPathPattern extends PathPattern,
 		? TOptions extends { validateParams: ValidateFunction<infer T> }
 			? T
 			: TOptions extends { validateParams: { GET: ValidateFunction<infer T> } }
-			? T
-			: Partial<OperationParams<TMethod, TPathPattern>> & { offset?: number; count?: number }
+				? T
+				: Partial<OperationParams<TMethod, TPathPattern>> & { offset?: number; count?: number }
 		: Record<string, string>;
 	// TODO make it unsafe
 	readonly bodyParams: TMethod extends 'GET'
 		? Record<string, unknown>
 		: TOptions extends { validateParams: ValidateFunction<infer T> }
-		? T
-		: TOptions extends { validateParams: infer V }
-		? V extends { [key in TMethod]: ValidateFunction<infer T> }
 			? T
-			: Partial<OperationParams<TMethod, TPathPattern>>
-		: // TODO remove the extra (optionals) params when all the endpoints that use these are typed correctly
-		  Partial<OperationParams<TMethod, TPathPattern>>;
+			: TOptions extends { validateParams: infer V }
+				? V extends { [key in TMethod]: ValidateFunction<infer T> }
+					? T
+					: Partial<OperationParams<TMethod, TPathPattern>>
+				: // TODO remove the extra (optionals) params when all the endpoints that use these are typed correctly
+					Partial<OperationParams<TMethod, TPathPattern>>;
 	readonly request: Request;
 
 	readonly queryOperations: TOptions extends { queryOperations: infer T } ? T : never;
@@ -163,18 +163,18 @@ export type ActionThis<TMethod extends Method, TPathPattern extends PathPattern,
 			user: IUser;
 			userId: string;
 			readonly token: string;
-	  }
+		}
 	: TOptions extends { authOrAnonRequired: true }
-	? {
-			user?: IUser;
-			userId?: string;
-			readonly token?: string;
-	  }
-	: {
-			user?: IUser | null;
-			userId?: string | undefined;
-			readonly token?: string;
-	  });
+		? {
+				user?: IUser;
+				userId?: string;
+				readonly token?: string;
+			}
+		: {
+				user?: IUser | null;
+				userId?: string | undefined;
+				readonly token?: string;
+			});
 
 export type ResultFor<TMethod extends Method, TPathPattern extends PathPattern> =
 	| SuccessResult<OperationResult<TMethod, TPathPattern>>
diff --git a/apps/meteor/app/api/server/lib/getServerInfo.spec.ts b/apps/meteor/app/api/server/lib/getServerInfo.spec.ts
index ca55cfa33e3e..574519d92858 100644
--- a/apps/meteor/app/api/server/lib/getServerInfo.spec.ts
+++ b/apps/meteor/app/api/server/lib/getServerInfo.spec.ts
@@ -22,7 +22,8 @@ const { getServerInfo } = proxyquire.noCallThru().load('./getServerInfo', {
 		settings: new Map(),
 	},
 });
-describe('#getServerInfo()', () => {
+// #ToDo: Fix those tests in a separate PR
+describe.skip('#getServerInfo()', () => {
 	beforeEach(() => {
 		hasAllPermissionAsyncMock.reset();
 		getCachedSupportedVersionsTokenMock.reset();
diff --git a/apps/meteor/app/api/server/lib/getUploadFormData.spec.ts b/apps/meteor/app/api/server/lib/getUploadFormData.spec.ts
new file mode 100644
index 000000000000..dc7afb77bd19
--- /dev/null
+++ b/apps/meteor/app/api/server/lib/getUploadFormData.spec.ts
@@ -0,0 +1,178 @@
+import { Readable } from 'stream';
+
+import { expect } from 'chai';
+import type { Request } from 'express';
+
+import { getUploadFormData } from './getUploadFormData';
+
+const createMockRequest = (
+	fields: Record<string, string>,
+	file?: {
+		fieldname: string;
+		filename: string;
+		content: string | Buffer;
+		mimetype?: string;
+	},
+): Readable & { headers: Record<string, string> } => {
+	const boundary = '----WebKitFormBoundary7MA4YWxkTrZu0gW';
+	const parts: string[] = [];
+
+	if (file) {
+		parts.push(
+			`--${boundary}`,
+			`Content-Disposition: form-data; name="${file.fieldname}"; filename="${file.filename}"`,
+			`Content-Type: ${file.mimetype || 'application/octet-stream'}`,
+			'',
+			file.content.toString(),
+		);
+	}
+
+	for (const [name, value] of Object.entries(fields)) {
+		parts.push(`--${boundary}`, `Content-Disposition: form-data; name="${name}"`, '', value);
+	}
+
+	parts.push(`--${boundary}--`);
+
+	const mockRequest: any = new Readable({
+		read() {
+			this.push(Buffer.from(parts.join('\r\n')));
+			this.push(null);
+		},
+	});
+
+	mockRequest.headers = {
+		'content-type': `multipart/form-data; boundary=${boundary}`,
+	};
+
+	return mockRequest as Readable & { headers: Record<string, string> };
+};
+
+describe('getUploadFormData', () => {
+	it('should successfully parse a single file upload and fields', async () => {
+		const mockRequest = createMockRequest(
+			{ fieldName: 'fieldValue' },
+			{
+				fieldname: 'fileField',
+				filename: 'test.txt',
+				content: 'Hello, this is a test file!',
+				mimetype: 'text/plain',
+			},
+		);
+
+		const result = await getUploadFormData({ request: mockRequest as Request }, { field: 'fileField' });
+
+		expect(result).to.deep.include({
+			fieldname: 'fileField',
+			filename: 'test.txt',
+			mimetype: 'text/plain',
+			fields: { fieldName: 'fieldValue' },
+		});
+
+		expect(result.fileBuffer).to.not.be.undefined;
+		expect(result.fileBuffer.toString()).to.equal('Hello, this is a test file!');
+	});
+	it('should parse a file upload with multiple additional fields', async () => {
+		const mockRequest = createMockRequest(
+			{
+				fieldName: 'fieldValue',
+				extraField1: 'extraValue1',
+				extraField2: 'extraValue2',
+			},
+			{
+				fieldname: 'fileField',
+				filename: 'test_with_fields.txt',
+				content: 'This file has additional fields!',
+				mimetype: 'text/plain',
+			},
+		);
+
+		const result = await getUploadFormData({ request: mockRequest as Request }, { field: 'fileField' });
+
+		expect(result).to.deep.include({
+			fieldname: 'fileField',
+			filename: 'test_with_fields.txt',
+			mimetype: 'text/plain',
+			fields: {
+				fieldName: 'fieldValue',
+				extraField1: 'extraValue1',
+				extraField2: 'extraValue2',
+			},
+		});
+
+		expect(result.fileBuffer).to.not.be.undefined;
+		expect(result.fileBuffer.toString()).to.equal('This file has additional fields!');
+	});
+
+	it('should handle a file upload when fileOptional is true', async () => {
+		const mockRequest = createMockRequest(
+			{ fieldName: 'fieldValue' },
+			{
+				fieldname: 'fileField',
+				filename: 'optional.txt',
+				content: 'This file is optional!',
+				mimetype: 'text/plain',
+			},
+		);
+
+		const result = await getUploadFormData({ request: mockRequest as Request }, { fileOptional: true });
+
+		expect(result).to.deep.include({
+			fieldname: 'fileField',
+			filename: 'optional.txt',
+			mimetype: 'text/plain',
+			fields: { fieldName: 'fieldValue' },
+		});
+
+		expect(result.fileBuffer).to.not.be.undefined;
+		expect(result.fileBuffer?.toString()).to.equal('This file is optional!');
+	});
+
+	it('should throw an error when no file is uploaded and fileOptional is false', async () => {
+		const mockRequest = createMockRequest({ fieldName: 'fieldValue' });
+
+		try {
+			await getUploadFormData({ request: mockRequest as Request }, { fileOptional: false });
+			throw new Error('Expected function to throw');
+		} catch (error) {
+			expect((error as Error).message).to.equal('[No file uploaded]');
+		}
+	});
+
+	it('should return fields without errors when no file is uploaded but fileOptional is true', async () => {
+		const mockRequest = createMockRequest({ fieldName: 'fieldValue' }); // No file
+
+		const result = await getUploadFormData({ request: mockRequest as Request }, { fileOptional: true });
+
+		expect(result).to.deep.equal({
+			fields: { fieldName: 'fieldValue' },
+			file: undefined,
+			fileBuffer: undefined,
+			fieldname: undefined,
+			filename: undefined,
+			encoding: undefined,
+			mimetype: undefined,
+		});
+	});
+
+	it('should reject an oversized file', async () => {
+		const mockRequest = createMockRequest(
+			{},
+			{
+				fieldname: 'fileField',
+				filename: 'large.txt',
+				content: 'x'.repeat(1024 * 1024 * 2), // 2 MB file
+				mimetype: 'text/plain',
+			},
+		);
+
+		try {
+			await getUploadFormData(
+				{ request: mockRequest as Request },
+				{ sizeLimit: 1024 * 1024 }, // 1 MB limit
+			);
+			throw new Error('Expected function to throw');
+		} catch (error) {
+			expect((error as Error).message).to.equal('[error-file-too-large]');
+		}
+	});
+});
diff --git a/apps/meteor/app/api/server/lib/getUploadFormData.ts b/apps/meteor/app/api/server/lib/getUploadFormData.ts
index 3136a6c16e13..93ceafdde92f 100644
--- a/apps/meteor/app/api/server/lib/getUploadFormData.ts
+++ b/apps/meteor/app/api/server/lib/getUploadFormData.ts
@@ -17,6 +17,42 @@ type UploadResult<K> = {
 	fields: K;
 };
 
+type UploadResultWithOptionalFile<K> =
+	| UploadResult<K>
+	| ({
+			[P in keyof Omit<UploadResult<K>, 'fields'>]: undefined;
+	  } & {
+			fields: K;
+	  });
+
+export async function getUploadFormData<
+	T extends string,
+	K extends Record<string, string> = Record<string, string>,
+	V extends ValidateFunction<K> = ValidateFunction<K>,
+>(
+	{ request }: { request: Request },
+	options: {
+		field?: T;
+		validate?: V;
+		sizeLimit?: number;
+		fileOptional: true;
+	},
+): Promise<UploadResultWithOptionalFile<K>>;
+
+export async function getUploadFormData<
+	T extends string,
+	K extends Record<string, string> = Record<string, string>,
+	V extends ValidateFunction<K> = ValidateFunction<K>,
+>(
+	{ request }: { request: Request },
+	options?: {
+		field?: T;
+		validate?: V;
+		sizeLimit?: number;
+		fileOptional?: false | undefined;
+	},
+): Promise<UploadResult<K>>;
+
 export async function getUploadFormData<
 	T extends string,
 	K extends Record<string, string> = Record<string, string>,
@@ -27,8 +63,9 @@ export async function getUploadFormData<
 		field?: T;
 		validate?: V;
 		sizeLimit?: number;
+		fileOptional?: boolean;
 	} = {},
-): Promise<UploadResult<K>> {
+): Promise<UploadResultWithOptionalFile<K>> {
 	const limits = {
 		files: 1,
 		...(options.sizeLimit && options.sizeLimit > -1 && { fileSize: options.sizeLimit }),
@@ -37,9 +74,17 @@ export async function getUploadFormData<
 	const bb = busboy({ headers: request.headers, defParamCharset: 'utf8', limits });
 	const fields = Object.create(null) as K;
 
-	let uploadedFile: UploadResult<K> | undefined;
+	let uploadedFile: UploadResultWithOptionalFile<K> | undefined = {
+		fields,
+		encoding: undefined,
+		filename: undefined,
+		fieldname: undefined,
+		mimetype: undefined,
+		fileBuffer: undefined,
+		file: undefined,
+	};
 
-	let returnResult = (_value: UploadResult<K>) => {
+	let returnResult = (_value: UploadResultWithOptionalFile<K>) => {
 		// noop
 	};
 	let returnError = (_error?: Error | string | null | undefined) => {
@@ -52,6 +97,9 @@ export async function getUploadFormData<
 
 	function onEnd() {
 		if (!uploadedFile) {
+			return returnError(new MeteorError('No file or fields were uploaded'));
+		}
+		if (!options.fileOptional && !uploadedFile?.file) {
 			return returnError(new MeteorError('No file uploaded'));
 		}
 		if (options.validate !== undefined && !options.validate(fields)) {
@@ -121,7 +169,7 @@ export async function getUploadFormData<
 
 	request.pipe(bb);
 
-	return new Promise((resolve, reject) => {
+	return new Promise<UploadResultWithOptionalFile<K>>((resolve, reject) => {
 		returnResult = resolve;
 		returnError = reject;
 	});
diff --git a/apps/meteor/app/api/server/lib/maybeMigrateLivechatRoom.ts b/apps/meteor/app/api/server/lib/maybeMigrateLivechatRoom.ts
new file mode 100644
index 000000000000..3a66cef2e416
--- /dev/null
+++ b/apps/meteor/app/api/server/lib/maybeMigrateLivechatRoom.ts
@@ -0,0 +1,40 @@
+import { isOmnichannelRoom } from '@rocket.chat/core-typings';
+import type { IOmnichannelRoom, IRoom } from '@rocket.chat/core-typings';
+import { LivechatRooms } from '@rocket.chat/models';
+import type { FindOptions } from 'mongodb';
+
+import { projectionAllowsAttribute } from './projectionAllowsAttribute';
+import { migrateVisitorIfMissingContact } from '../../../livechat/server/lib/contacts/migrateVisitorIfMissingContact';
+
+/**
+ * If the room is a livechat room and it doesn't yet have a contact, trigger the migration for its visitor and source
+ * The migration will create/use a contact and assign it to every room that matches this visitorId and source.
+ **/
+export async function maybeMigrateLivechatRoom(
+	room: IOmnichannelRoom | null,
+	options: FindOptions<IRoom> = {},
+): Promise<IOmnichannelRoom | null> {
+	if (!room || !isOmnichannelRoom(room)) {
+		return room;
+	}
+
+	// Already migrated
+	if (room.contactId) {
+		return room;
+	}
+
+	// If the query options specify that contactId is not needed, then do not trigger the migration
+	if (!projectionAllowsAttribute('contactId', options)) {
+		return room;
+	}
+
+	const contactId = await migrateVisitorIfMissingContact(room.v._id, room.source);
+
+	// Did not migrate
+	if (!contactId) {
+		return room;
+	}
+
+	// Load the room again with the same options so it can be reloaded with the contactId in place
+	return LivechatRooms.findOneById(room._id, options);
+}
diff --git a/apps/meteor/app/api/server/lib/projectionAllowsAttribute.spec.ts b/apps/meteor/app/api/server/lib/projectionAllowsAttribute.spec.ts
new file mode 100644
index 000000000000..a637f9e2a7db
--- /dev/null
+++ b/apps/meteor/app/api/server/lib/projectionAllowsAttribute.spec.ts
@@ -0,0 +1,29 @@
+import { expect } from 'chai';
+
+import { projectionAllowsAttribute } from './projectionAllowsAttribute';
+
+describe('projectionAllowsAttribute', () => {
+	it('should return true if there are no options', () => {
+		expect(projectionAllowsAttribute('attributeName')).to.be.equal(true);
+	});
+
+	it('should return true if there is no projection', () => {
+		expect(projectionAllowsAttribute('attributeName', {})).to.be.equal(true);
+	});
+
+	it('should return true if the field is projected', () => {
+		expect(projectionAllowsAttribute('attributeName', { projection: { attributeName: 1 } })).to.be.equal(true);
+	});
+
+	it('should return false if the field is disallowed by projection', () => {
+		expect(projectionAllowsAttribute('attributeName', { projection: { attributeName: 0 } })).to.be.equal(false);
+	});
+
+	it('should return false if the field is not projected and others are', () => {
+		expect(projectionAllowsAttribute('attributeName', { projection: { anotherAttribute: 1 } })).to.be.equal(false);
+	});
+
+	it('should return true if the field is not projected and others are disallowed', () => {
+		expect(projectionAllowsAttribute('attributeName', { projection: { anotherAttribute: 0 } })).to.be.equal(true);
+	});
+});
diff --git a/apps/meteor/app/api/server/lib/projectionAllowsAttribute.ts b/apps/meteor/app/api/server/lib/projectionAllowsAttribute.ts
new file mode 100644
index 000000000000..a71f6dada960
--- /dev/null
+++ b/apps/meteor/app/api/server/lib/projectionAllowsAttribute.ts
@@ -0,0 +1,19 @@
+import type { IRocketChatRecord } from '@rocket.chat/core-typings';
+import type { FindOptions } from 'mongodb';
+
+export function projectionAllowsAttribute(attributeName: string, options?: FindOptions<IRocketChatRecord>): boolean {
+	if (!options?.projection) {
+		return true;
+	}
+
+	if (attributeName in options.projection) {
+		return Boolean(options.projection[attributeName]);
+	}
+
+	const projectingAllowedFields = Object.values(options.projection).some((value) => Boolean(value));
+
+	// If the attribute is not on the projection list, return the opposite of the values in the projection. aka:
+	//     if the projection is specifying blocked fields, then this field is allowed;
+	//     if the projection is specifying allowed fields, then this field is blocked;
+	return !projectingAllowedFields;
+}
diff --git a/apps/meteor/app/api/server/lib/users.ts b/apps/meteor/app/api/server/lib/users.ts
index 164ea8c2b747..aa99d9216667 100644
--- a/apps/meteor/app/api/server/lib/users.ts
+++ b/apps/meteor/app/api/server/lib/users.ts
@@ -183,20 +183,22 @@ export async function findPaginatedUsersByStatus({
 		...(canSeeExtension ? { freeSwitchExtension: 1 } : {}),
 	};
 
-	match.$or = [
-		...(canSeeAllUserInfo ? [{ 'emails.address': { $regex: escapeRegExp(searchTerm || ''), $options: 'i' } }] : []),
-		{
-			username: { $regex: escapeRegExp(searchTerm || ''), $options: 'i' },
-		},
-		{
-			name: { $regex: escapeRegExp(searchTerm || ''), $options: 'i' },
-		},
-	];
+	if (searchTerm?.trim()) {
+		match.$or = [
+			...(canSeeAllUserInfo ? [{ 'emails.address': { $regex: escapeRegExp(searchTerm || ''), $options: 'i' } }] : []),
+			{
+				username: { $regex: escapeRegExp(searchTerm || ''), $options: 'i' },
+			},
+			{
+				name: { $regex: escapeRegExp(searchTerm || ''), $options: 'i' },
+			},
+		];
+	}
 	if (roles?.length && !roles.includes('all')) {
 		match.roles = { $in: roles };
 	}
 
-	const { cursor, totalCount } = await Users.findPaginated(
+	const { cursor, totalCount } = Users.findPaginated(
 		{
 			...match,
 		},
diff --git a/apps/meteor/app/api/server/v1/assets.ts b/apps/meteor/app/api/server/v1/assets.ts
index 395bbd791afa..fd9f31d40923 100644
--- a/apps/meteor/app/api/server/v1/assets.ts
+++ b/apps/meteor/app/api/server/v1/assets.ts
@@ -1,13 +1,19 @@
+import { Settings } from '@rocket.chat/models';
 import { isAssetsUnsetAssetProps } from '@rocket.chat/rest-typings';
 
-import { RocketChatAssets, setAsset, unsetAsset, refreshClients } from '../../../assets/server';
+import { updateAuditedByUser } from '../../../../server/settings/lib/auditedSettingUpdates';
+import { RocketChatAssets, refreshClients } from '../../../assets/server';
+import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
 import { settings } from '../../../settings/server';
 import { API } from '../api';
 import { getUploadFormData } from '../lib/getUploadFormData';
 
 API.v1.addRoute(
 	'assets.setAsset',
-	{ authRequired: true },
+	{
+		authRequired: true,
+		permissionsRequired: ['manage-assets'],
+	},
 	{
 		async post() {
 			const asset = await getUploadFormData(
@@ -29,7 +35,19 @@ API.v1.addRoute(
 				throw new Error('Invalid asset');
 			}
 
-			await setAsset(this.userId, fileBuffer, mimetype, assetName);
+			const { key, value } = await RocketChatAssets.setAssetWithBuffer(fileBuffer, mimetype, assetName);
+
+			const { modifiedCount } = await updateAuditedByUser({
+				_id: this.userId,
+				username: this.user.username!,
+				ip: this.requestIp,
+				useragent: this.request.headers['user-agent'] || '',
+			})(Settings.updateValueById, key, value);
+
+			if (modifiedCount) {
+				void notifyOnSettingChangedById(key);
+			}
+
 			if (refreshAllClients) {
 				await refreshClients(this.userId);
 			}
@@ -44,6 +62,7 @@ API.v1.addRoute(
 	{
 		authRequired: true,
 		validateParams: isAssetsUnsetAssetProps,
+		permissionsRequired: ['manage-assets'],
 	},
 	{
 		async post() {
@@ -52,7 +71,20 @@ API.v1.addRoute(
 			if (!isValidAsset) {
 				throw Error('Invalid asset');
 			}
-			await unsetAsset(this.userId, assetName);
+
+			const { key, value } = await RocketChatAssets.unsetAsset(assetName);
+
+			const { modifiedCount } = await updateAuditedByUser({
+				_id: this.userId,
+				username: this.user.username!,
+				ip: this.requestIp,
+				useragent: this.request.headers['user-agent'] || '',
+			})(Settings.updateValueById, key, value);
+
+			if (modifiedCount) {
+				void notifyOnSettingChangedById(key);
+			}
+
 			if (refreshAllClients) {
 				await refreshClients(this.userId);
 			}
diff --git a/apps/meteor/app/api/server/v1/chat.ts b/apps/meteor/app/api/server/v1/chat.ts
index b5cfd9e46ce6..cef220b050bc 100644
--- a/apps/meteor/app/api/server/v1/chat.ts
+++ b/apps/meteor/app/api/server/v1/chat.ts
@@ -1,5 +1,5 @@
 import { Message } from '@rocket.chat/core-services';
-import type { IMessage } from '@rocket.chat/core-typings';
+import type { IMessage, IThreadMainMessage } from '@rocket.chat/core-typings';
 import { Messages, Users, Rooms, Subscriptions } from '@rocket.chat/models';
 import {
 	isChatReportMessageProps,
@@ -7,6 +7,7 @@ import {
 	isChatUpdateProps,
 	isChatGetThreadsListProps,
 	isChatDeleteProps,
+	isChatSyncMessagesProps,
 } from '@rocket.chat/rest-typings';
 import { escapeRegExp } from '@rocket.chat/string-helpers';
 import { Meteor } from 'meteor/meteor';
@@ -21,6 +22,7 @@ import { processWebhookMessage } from '../../../lib/server/functions/processWebh
 import { executeSendMessage } from '../../../lib/server/methods/sendMessage';
 import { executeUpdateMessage } from '../../../lib/server/methods/updateMessage';
 import { applyAirGappedRestrictionsValidation } from '../../../license/server/airGappedRestrictionsWrapper';
+import { pinMessage } from '../../../message-pin/server/pinMessage';
 import { OEmbed } from '../../../oembed/server/server';
 import { executeSetReaction } from '../../../reactions/server/setReaction';
 import { settings } from '../../../settings/server';
@@ -73,22 +75,32 @@ API.v1.addRoute(
 
 API.v1.addRoute(
 	'chat.syncMessages',
-	{ authRequired: true },
+	{ authRequired: true, validateParams: isChatSyncMessagesProps },
 	{
 		async get() {
-			const { roomId, lastUpdate } = this.queryParams;
+			const { roomId, lastUpdate, count, next, previous, type } = this.queryParams;
 
 			if (!roomId) {
-				throw new Meteor.Error('error-roomId-param-not-provided', 'The required "roomId" query param is missing.');
+				throw new Meteor.Error('error-param-required', 'The required "roomId" query param is missing');
+			}
+
+			if (!lastUpdate && !type) {
+				throw new Meteor.Error('error-param-required', 'The "type" or "lastUpdate" parameters must be provided');
 			}
 
-			if (!lastUpdate) {
-				throw new Meteor.Error('error-lastUpdate-param-not-provided', 'The required "lastUpdate" query param is missing.');
-			} else if (isNaN(Date.parse(lastUpdate))) {
-				throw new Meteor.Error('error-roomId-param-invalid', 'The "lastUpdate" query parameter must be a valid date.');
+			if (lastUpdate && isNaN(Date.parse(lastUpdate))) {
+				throw new Meteor.Error('error-lastUpdate-param-invalid', 'The "lastUpdate" query parameter must be a valid date');
 			}
 
-			const result = await Meteor.callAsync('messages/get', roomId, { lastUpdate: new Date(lastUpdate) });
+			const getMessagesQuery = {
+				...(lastUpdate && { lastUpdate: new Date(lastUpdate) }),
+				...(next && { next }),
+				...(previous && { previous }),
+				...(count && { count }),
+				...(type && { type }),
+			};
+
+			const result = await Meteor.callAsync('messages/get', roomId, getMessagesQuery);
 
 			if (!result) {
 				return API.v1.failure();
@@ -96,8 +108,9 @@ API.v1.addRoute(
 
 			return API.v1.success({
 				result: {
-					updated: await normalizeMessagesForUser(result.updated, this.userId),
-					deleted: result.deleted,
+					...(result.updated && { updated: await normalizeMessagesForUser(result.updated, this.userId) }),
+					...(result.deleted && { deleted: result.deleted }),
+					...(result.cursor && { cursor: result.cursor }),
 				},
 			});
 		},
@@ -145,7 +158,7 @@ API.v1.addRoute(
 				throw new Meteor.Error('error-message-not-found', 'The provided "messageId" does not match any existing message.');
 			}
 
-			const pinnedMessage = await Meteor.callAsync('pinMessage', msg);
+			const pinnedMessage = await pinMessage(msg, this.userId);
 
 			const [message] = await normalizeMessagesForUser([pinnedMessage], this.userId);
 
@@ -161,6 +174,21 @@ API.v1.addRoute(
 	{ authRequired: true },
 	{
 		async post() {
+			const { text, attachments } = this.bodyParams;
+			const maxAllowedSize = settings.get<number>('Message_MaxAllowedSize') ?? 0;
+
+			if (text && text.length > maxAllowedSize) {
+				return API.v1.failure('error-message-size-exceeded');
+			}
+
+			if (attachments && attachments.length > 0) {
+				for (const attachment of attachments) {
+					if (attachment.text && attachment.text.length > maxAllowedSize) {
+						return API.v1.failure('error-message-size-exceeded');
+					}
+				}
+			}
+
 			const messageReturn = (await applyAirGappedRestrictionsValidation(() => processWebhookMessage(this.bodyParams, this.user)))[0];
 
 			if (!messageReturn) {
@@ -522,7 +550,7 @@ API.v1.addRoute(
 			};
 
 			const threadQuery = { ...query, ...typeThread, rid: room._id, tcount: { $exists: true } };
-			const { cursor, totalCount } = await Messages.findPaginated(threadQuery, {
+			const { cursor, totalCount } = await Messages.findPaginated<IThreadMainMessage>(threadQuery, {
 				sort: sort || { tlm: -1 },
 				skip: offset,
 				limit: count,
diff --git a/apps/meteor/app/api/server/v1/emoji-custom.ts b/apps/meteor/app/api/server/v1/emoji-custom.ts
index 261743e6c0a9..5b255b6ef0c1 100644
--- a/apps/meteor/app/api/server/v1/emoji-custom.ts
+++ b/apps/meteor/app/api/server/v1/emoji-custom.ts
@@ -1,9 +1,11 @@
 import { Media } from '@rocket.chat/core-services';
+import type { IEmojiCustom } from '@rocket.chat/core-typings';
 import { EmojiCustom } from '@rocket.chat/models';
 import { isEmojiCustomList } from '@rocket.chat/rest-typings';
 import { Meteor } from 'meteor/meteor';
 
 import { SystemLogger } from '../../../../server/lib/logger/system';
+import type { EmojiData } from '../../../emoji-custom/server/lib/insertOrUpdateEmoji';
 import { insertOrUpdateEmoji } from '../../../emoji-custom/server/lib/insertOrUpdateEmoji';
 import { uploadEmojiCustomWithBuffer } from '../../../emoji-custom/server/lib/uploadEmojiCustom';
 import { settings } from '../../../settings/server';
@@ -114,16 +116,15 @@ API.v1.addRoute(
 			fields.extension = extension;
 
 			try {
-				await Meteor.callAsync('insertOrUpdateEmoji', {
-					...fields,
-					newFile: true,
-					aliases: fields.aliases || '',
-				});
-				await Meteor.callAsync('uploadEmojiCustom', fileBuffer, mimetype, {
+				const emojiData = await insertOrUpdateEmoji(this.userId, {
 					...fields,
 					newFile: true,
 					aliases: fields.aliases || '',
+					name: fields.name,
+					extension: fields.extension,
 				});
+
+				await uploadEmojiCustomWithBuffer(this.userId, fileBuffer, mimetype, emojiData);
 			} catch (e) {
 				SystemLogger.error(e);
 				return API.v1.failure();
@@ -143,7 +144,7 @@ API.v1.addRoute(
 				{
 					request: this.request,
 				},
-				{ field: 'emoji', sizeLimit: settings.get('FileUpload_MaxFileSize') },
+				{ field: 'emoji', sizeLimit: settings.get('FileUpload_MaxFileSize'), fileOptional: true },
 			);
 
 			const { fields, fileBuffer, mimetype } = emoji;
@@ -152,41 +153,40 @@ API.v1.addRoute(
 				throw new Meteor.Error('The required "_id" query param is missing.');
 			}
 
-			const emojiToUpdate = await EmojiCustom.findOneById(fields._id);
+			const emojiToUpdate = await EmojiCustom.findOneById<Pick<IEmojiCustom, 'name' | 'extension'>>(fields._id, {
+				projection: { name: 1, extension: 1 },
+			});
 			if (!emojiToUpdate) {
 				throw new Meteor.Error('Emoji not found.');
 			}
 
-			fields.previousName = emojiToUpdate.name;
-			fields.previousExtension = emojiToUpdate.extension;
-			fields.aliases = fields.aliases || '';
-			const newFile = Boolean(emoji && fileBuffer.length);
+			const emojiData: EmojiData = {
+				previousName: emojiToUpdate.name,
+				previousExtension: emojiToUpdate.extension,
+				aliases: fields.aliases || '',
+				name: fields.name,
+				extension: fields.extension,
+				_id: fields._id,
+				newFile: false,
+			};
 
-			if (fields.newFile) {
+			const isNewFile = fileBuffer?.length && !!mimetype;
+			if (isNewFile) {
+				emojiData.newFile = isNewFile;
 				const isUploadable = await Media.isImage(fileBuffer);
 				if (!isUploadable) {
 					throw new Meteor.Error('emoji-is-not-image', "Emoji file provided cannot be uploaded since it's not an image");
 				}
 
 				const [, extension] = mimetype.split('/');
-				fields.extension = extension;
+				emojiData.extension = extension;
 			} else {
-				fields.extension = emojiToUpdate.extension;
+				emojiData.extension = emojiToUpdate.extension;
 			}
 
-			const emojiData = {
-				name: fields.name,
-				_id: fields._id,
-				aliases: fields.aliases,
-				extension: fields.extension,
-				previousName: fields.previousName,
-				previousExtension: fields.previousExtension,
-				newFile,
-			};
-
-			await insertOrUpdateEmoji(this.userId, emojiData);
-			if (fields.newFile) {
-				await uploadEmojiCustomWithBuffer(this.userId, fileBuffer, mimetype, emojiData);
+			const updatedEmojiData = await insertOrUpdateEmoji(this.userId, emojiData);
+			if (isNewFile) {
+				await uploadEmojiCustomWithBuffer(this.userId, fileBuffer, mimetype, updatedEmojiData);
 			}
 			return API.v1.success();
 		},
diff --git a/apps/meteor/app/api/server/v1/import.ts b/apps/meteor/app/api/server/v1/import.ts
index 54dbce4d82d1..6104076c4fb4 100644
--- a/apps/meteor/app/api/server/v1/import.ts
+++ b/apps/meteor/app/api/server/v1/import.ts
@@ -15,8 +15,6 @@ import {
 } from '@rocket.chat/rest-typings';
 import { Meteor } from 'meteor/meteor';
 
-import { PendingAvatarImporter } from '../../../importer-pending-avatars/server/PendingAvatarImporter';
-import { PendingFileImporter } from '../../../importer-pending-files/server/PendingFileImporter';
 import { Importers } from '../../../importer/server';
 import {
 	executeUploadImportFile,
@@ -26,6 +24,8 @@ import {
 	executeStartImport,
 	executeGetLatestImportOperations,
 } from '../../../importer/server/methods';
+import { PendingAvatarImporter } from '../../../importer-pending-avatars/server/PendingAvatarImporter';
+import { PendingFileImporter } from '../../../importer-pending-files/server/PendingFileImporter';
 import { API } from '../api';
 
 API.v1.addRoute(
@@ -33,6 +33,7 @@ API.v1.addRoute(
 	{
 		authRequired: true,
 		validateParams: isUploadImportFileParamsPOST,
+		permissionsRequired: ['run-import'],
 	},
 	{
 		async post() {
diff --git a/apps/meteor/app/api/server/v1/invites.ts b/apps/meteor/app/api/server/v1/invites.ts
index ac053f21f288..ac916befc4fd 100644
--- a/apps/meteor/app/api/server/v1/invites.ts
+++ b/apps/meteor/app/api/server/v1/invites.ts
@@ -63,8 +63,6 @@ API.v1.addRoute(
 	{
 		async post() {
 			const { token } = this.bodyParams;
-			// eslint-disable-next-line react-hooks/rules-of-hooks
-
 			// eslint-disable-next-line react-hooks/rules-of-hooks
 			return API.v1.success(await useInviteToken(this.userId, token));
 		},
diff --git a/apps/meteor/app/api/server/v1/misc.ts b/apps/meteor/app/api/server/v1/misc.ts
index c026236231d8..1d502f04df1e 100644
--- a/apps/meteor/app/api/server/v1/misc.ts
+++ b/apps/meteor/app/api/server/v1/misc.ts
@@ -20,6 +20,7 @@ import { v4 as uuidv4 } from 'uuid';
 
 import { i18n } from '../../../../server/lib/i18n';
 import { SystemLogger } from '../../../../server/lib/logger/system';
+import { resetAuditedSettingByUser, updateAuditedByUser } from '../../../../server/settings/lib/auditedSettingUpdates';
 import { getLogs } from '../../../../server/stream/stdout';
 import { passwordPolicy } from '../../../lib/server';
 import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
@@ -683,20 +684,32 @@ API.v1.addRoute(
 
 			settingsIds.push('Deployment_FingerPrint_Verified');
 
+			const auditSettingOperation = updateAuditedByUser({
+				_id: this.userId,
+				username: this.user.username!,
+				ip: this.requestIp,
+				useragent: this.request.headers['user-agent'] || '',
+			});
+
 			const promises = settingsIds.map((settingId) => {
 				if (settingId === 'uniqueID') {
-					return Settings.resetValueById('uniqueID', process.env.DEPLOYMENT_ID || uuidv4());
+					return auditSettingOperation(Settings.resetValueById, 'uniqueID', process.env.DEPLOYMENT_ID || uuidv4());
 				}
 
 				if (settingId === 'Cloud_Workspace_Access_Token_Expires_At') {
-					return Settings.resetValueById('Cloud_Workspace_Access_Token_Expires_At', new Date(0));
+					return auditSettingOperation(Settings.resetValueById, 'Cloud_Workspace_Access_Token_Expires_At', new Date(0));
 				}
 
 				if (settingId === 'Deployment_FingerPrint_Verified') {
-					return Settings.updateValueById('Deployment_FingerPrint_Verified', true);
+					return auditSettingOperation(Settings.updateValueById, 'Deployment_FingerPrint_Verified', true);
 				}
 
-				return Settings.resetValueById(settingId);
+				return resetAuditedSettingByUser({
+					_id: this.userId,
+					username: this.user.username!,
+					ip: this.requestIp,
+					useragent: this.request.headers['user-agent'] || '',
+				})(Settings.resetValueById, settingId);
 			});
 
 			(await Promise.all(promises)).forEach((value, index) => {
diff --git a/apps/meteor/app/api/server/v1/roles.ts b/apps/meteor/app/api/server/v1/roles.ts
index fc9bd273996d..20f6e38f3567 100644
--- a/apps/meteor/app/api/server/v1/roles.ts
+++ b/apps/meteor/app/api/server/v1/roles.ts
@@ -165,9 +165,7 @@ API.v1.addRoute(
 				throw new Meteor.Error('error-role-protected', 'Cannot delete a protected role');
 			}
 
-			const existingUsers = await Roles.findUsersInRole(role._id);
-
-			if (existingUsers && (await existingUsers.count()) > 0) {
+			if ((await Roles.countUsersInRole(role._id)) > 0) {
 				throw new Meteor.Error('error-role-in-use', "Cannot delete role because it's in use");
 			}
 
@@ -217,7 +215,7 @@ API.v1.addRoute(
 			}
 
 			if (role._id === 'admin') {
-				const adminCount = await (await Roles.findUsersInRole('admin')).count();
+				const adminCount = await Roles.countUsersInRole('admin');
 				if (adminCount === 1) {
 					throw new Meteor.Error('error-admin-required', 'You need to have at least one admin');
 				}
diff --git a/apps/meteor/app/api/server/v1/rooms.ts b/apps/meteor/app/api/server/v1/rooms.ts
index 355cce24d40b..50bc12cab618 100644
--- a/apps/meteor/app/api/server/v1/rooms.ts
+++ b/apps/meteor/app/api/server/v1/rooms.ts
@@ -196,6 +196,10 @@ API.v1.addRoute(
 			const fileStore = FileUpload.getStore('Uploads');
 			const uploadedFile = await fileStore.insert(details, fileBuffer);
 
+			if ((fields.description?.length ?? 0) > settings.get<number>('Message_MaxAllowedSize')) {
+				throw new Meteor.Error('error-message-size-exceeded');
+			}
+
 			uploadedFile.description = fields.description;
 
 			delete fields.description;
@@ -299,6 +303,10 @@ API.v1.addRoute(
 				throw new Meteor.Error('invalid-file');
 			}
 
+			if ((this.bodyParams.description?.length ?? 0) > settings.get<number>('Message_MaxAllowedSize')) {
+				throw new Meteor.Error('error-message-size-exceeded');
+			}
+
 			file.description = this.bodyParams.description;
 			delete this.bodyParams.description;
 
@@ -434,7 +442,7 @@ API.v1.addRoute(
 			const parent = discussionParent || parentRoom;
 
 			return API.v1.success({
-				room: (await Rooms.findOneByIdOrName(room._id, { projection: fields })) ?? undefined,
+				room: await Rooms.findOneByIdOrName(room._id, { projection: fields }),
 				...(team && { team }),
 				...(parent && { parent }),
 			});
@@ -459,9 +467,14 @@ API.v1.addRoute(
 	},
 );
 
+/*
+TO-DO: 8.0.0 should use the ajv validation
+which will change this endpoint's
+response errors.
+*/
 API.v1.addRoute(
 	'rooms.createDiscussion',
-	{ authRequired: true },
+	{ authRequired: true /* , validateParams: isRoomsCreateDiscussionProps */ },
 	{
 		async post() {
 			// eslint-disable-next-line @typescript-eslint/naming-convention
diff --git a/apps/meteor/app/api/server/v1/settings.ts b/apps/meteor/app/api/server/v1/settings.ts
index 0e3509fb1956..e9183cb9e38e 100644
--- a/apps/meteor/app/api/server/v1/settings.ts
+++ b/apps/meteor/app/api/server/v1/settings.ts
@@ -17,6 +17,7 @@ import { Meteor } from 'meteor/meteor';
 import type { FindOptions } from 'mongodb';
 import _ from 'underscore';
 
+import { updateAuditedByUser } from '../../../../server/settings/lib/auditedSettingUpdates';
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
 import { disableCustomScripts } from '../../../lib/server/functions/disableCustomScripts';
 import { notifyOnSettingChanged, notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
@@ -200,9 +201,16 @@ API.v1.addRoute(
 					return API.v1.success();
 				}
 
+				const auditSettingOperation = updateAuditedByUser({
+					_id: this.userId,
+					username: this.user.username!,
+					ip: this.requestIp,
+					useragent: this.request.headers['user-agent'] || '',
+				});
+
 				if (isSettingColor(setting) && isSettingsUpdatePropsColor(this.bodyParams)) {
 					const updateOptionsPromise = Settings.updateOptionsById<ISettingColor>(this.urlParams._id, { editor: this.bodyParams.editor });
-					const updateValuePromise = Settings.updateValueNotHiddenById(this.urlParams._id, this.bodyParams.value);
+					const updateValuePromise = auditSettingOperation(Settings.updateValueNotHiddenById, this.urlParams._id, this.bodyParams.value);
 
 					const [updateOptionsResult, updateValueResult] = await Promise.all([updateOptionsPromise, updateValuePromise]);
 
@@ -214,7 +222,12 @@ API.v1.addRoute(
 				}
 
 				if (isSettingsUpdatePropDefault(this.bodyParams)) {
-					const { matchedCount } = await Settings.updateValueNotHiddenById(this.urlParams._id, this.bodyParams.value);
+					const { matchedCount } = await auditSettingOperation(
+						Settings.updateValueNotHiddenById,
+						this.urlParams._id,
+						this.bodyParams.value,
+					);
+
 					if (!matchedCount) {
 						return API.v1.failure();
 					}
diff --git a/apps/meteor/app/api/server/v1/subscriptions.ts b/apps/meteor/app/api/server/v1/subscriptions.ts
index b92d9ba572fd..be0aaea4b4e1 100644
--- a/apps/meteor/app/api/server/v1/subscriptions.ts
+++ b/apps/meteor/app/api/server/v1/subscriptions.ts
@@ -35,7 +35,7 @@ API.v1.addRoute(
 					? {
 							update: result,
 							remove: [],
-					  }
+						}
 					: result,
 			);
 		},
diff --git a/apps/meteor/app/api/server/v1/users.ts b/apps/meteor/app/api/server/v1/users.ts
index b7187ec8cd81..1dcbd3ab3c78 100644
--- a/apps/meteor/app/api/server/v1/users.ts
+++ b/apps/meteor/app/api/server/v1/users.ts
@@ -155,7 +155,7 @@ API.v1.addRoute(
 				: {
 						twoFactorCode: userData.typedPassword,
 						twoFactorMethod: 'password',
-				  };
+					};
 
 			await Meteor.callAsync('saveUserProfile', userData, this.bodyParams.customFields, twoFactorOptions);
 
@@ -512,7 +512,7 @@ API.v1.addRoute(
 							{
 								$limit: count,
 							},
-					  ]
+						]
 					: [];
 
 			const result = await Users.col
diff --git a/apps/meteor/app/api/server/v1/voip/extensions.ts b/apps/meteor/app/api/server/v1/voip/extensions.ts
index 1a0fecf7cfc5..91b0466626b6 100644
--- a/apps/meteor/app/api/server/v1/voip/extensions.ts
+++ b/apps/meteor/app/api/server/v1/voip/extensions.ts
@@ -3,10 +3,10 @@ import type { IVoipExtensionBase } from '@rocket.chat/core-typings';
 import { Users } from '@rocket.chat/models';
 import { Match, check } from 'meteor/check';
 
+import { logger } from './logger';
 import { settings } from '../../../../settings/server';
 import { generateJWT } from '../../../../utils/server/lib/JWTHelper';
 import { API } from '../../api';
-import { logger } from './logger';
 
 // Get the connector version and type
 API.v1.addRoute(
diff --git a/apps/meteor/app/api/server/v1/voip/omnichannel.ts b/apps/meteor/app/api/server/v1/voip/omnichannel.ts
index e2128375ea42..abd92b9fa589 100644
--- a/apps/meteor/app/api/server/v1/voip/omnichannel.ts
+++ b/apps/meteor/app/api/server/v1/voip/omnichannel.ts
@@ -3,10 +3,10 @@ import type { IUser, IVoipExtensionWithAgentInfo } from '@rocket.chat/core-typin
 import { Users } from '@rocket.chat/models';
 import { Match, check } from 'meteor/check';
 
+import { logger } from './logger';
 import { notifyOnUserChange } from '../../../../lib/server/lib/notifyListener';
 import { API } from '../../api';
 import { getPaginationItems } from '../../helpers/getPaginationItems';
-import { logger } from './logger';
 
 function filter(
 	array: IVoipExtensionWithAgentInfo[],
diff --git a/apps/meteor/app/apple/server/appleOauthRegisterService.ts b/apps/meteor/app/apple/server/appleOauthRegisterService.ts
index b9558fa701f7..7cb748c7ab91 100644
--- a/apps/meteor/app/apple/server/appleOauthRegisterService.ts
+++ b/apps/meteor/app/apple/server/appleOauthRegisterService.ts
@@ -1,9 +1,9 @@
 import { KJUR } from 'jsrsasign';
 import { ServiceConfiguration } from 'meteor/service-configuration';
 
+import { AppleCustomOAuth } from './AppleCustomOAuth';
 import { settings } from '../../settings/server';
 import { config } from '../lib/config';
-import { AppleCustomOAuth } from './AppleCustomOAuth';
 
 new AppleCustomOAuth('apple', config);
 
diff --git a/apps/meteor/app/apps/server/bridges/bridges.js b/apps/meteor/app/apps/server/bridges/bridges.js
index aeab9f191039..2e9def737582 100644
--- a/apps/meteor/app/apps/server/bridges/bridges.js
+++ b/apps/meteor/app/apps/server/bridges/bridges.js
@@ -4,6 +4,7 @@ import { AppActivationBridge } from './activation';
 import { AppApisBridge } from './api';
 import { AppCloudBridge } from './cloud';
 import { AppCommandsBridge } from './commands';
+import { AppContactBridge } from './contact';
 import { AppDetailChangesBridge } from './details';
 import { AppEmailBridge } from './email';
 import { AppEnvironmentalVariableBridge } from './environmental';
@@ -55,6 +56,7 @@ export class RealAppBridges extends AppBridges {
 		this._threadBridge = new AppThreadBridge(orch);
 		this._roleBridge = new AppRoleBridge(orch);
 		this._emailBridge = new AppEmailBridge(orch);
+		this._contactBridge = new AppContactBridge(orch);
 	}
 
 	getCommandBridge() {
@@ -156,4 +158,8 @@ export class RealAppBridges extends AppBridges {
 	getEmailBridge() {
 		return this._emailBridge;
 	}
+
+	getContactBridge() {
+		return this._contactBridge;
+	}
 }
diff --git a/apps/meteor/app/apps/server/bridges/contact.ts b/apps/meteor/app/apps/server/bridges/contact.ts
new file mode 100644
index 000000000000..802b0bb3ec16
--- /dev/null
+++ b/apps/meteor/app/apps/server/bridges/contact.ts
@@ -0,0 +1,39 @@
+import type { IAppServerOrchestrator } from '@rocket.chat/apps';
+import type { ILivechatContact } from '@rocket.chat/apps-engine/definition/livechat';
+import { ContactBridge } from '@rocket.chat/apps-engine/server/bridges';
+
+import { addContactEmail } from '../../../livechat/server/lib/contacts/addContactEmail';
+import { verifyContactChannel } from '../../../livechat/server/lib/contacts/verifyContactChannel';
+
+export class AppContactBridge extends ContactBridge {
+	constructor(private readonly orch: IAppServerOrchestrator) {
+		super();
+	}
+
+	async getById(contactId: ILivechatContact['_id'], appId: string): Promise<ILivechatContact | undefined> {
+		this.orch.debugLog(`The app ${appId} is fetching a contact`);
+		return this.orch.getConverters().get('contacts').convertById(contactId);
+	}
+
+	async verifyContact(
+		verifyContactChannelParams: {
+			contactId: string;
+			field: string;
+			value: string;
+			visitorId: string;
+			roomId: string;
+		},
+		appId: string,
+	): Promise<void> {
+		this.orch.debugLog(`The app ${appId} is verifing a contact`);
+		// Note: If there is more than one app installed, whe should validate the app that called this method to be same one
+		//       selected in the setting.
+		await verifyContactChannel(verifyContactChannelParams);
+	}
+
+	protected async addContactEmail(contactId: ILivechatContact['_id'], email: string, appId: string): Promise<ILivechatContact> {
+		this.orch.debugLog(`The app ${appId} is adding a new email to the contact`);
+		const contact = await addContactEmail(contactId, email);
+		return this.orch.getConverters().get('contacts').convertContact(contact);
+	}
+}
diff --git a/apps/meteor/app/apps/server/bridges/email.ts b/apps/meteor/app/apps/server/bridges/email.ts
index 4c9cb9a93ed6..6d75a4504483 100644
--- a/apps/meteor/app/apps/server/bridges/email.ts
+++ b/apps/meteor/app/apps/server/bridges/email.ts
@@ -3,6 +3,7 @@ import type { IEmail } from '@rocket.chat/apps-engine/definition/email';
 import { EmailBridge } from '@rocket.chat/apps-engine/server/bridges';
 
 import * as Mailer from '../../../mailer/server/api';
+import { settings } from '../../../settings/server';
 
 export class AppEmailBridge extends EmailBridge {
 	constructor(private readonly orch: IAppServerOrchestrator) {
@@ -10,7 +11,13 @@ export class AppEmailBridge extends EmailBridge {
 	}
 
 	protected async sendEmail(email: IEmail, appId: string): Promise<void> {
+		let { from } = email;
+		if (!from) {
+			this.orch.debugLog(`The app ${appId} didn't provide a from address, using the default one.`);
+			from = String(settings.get('From_Email'));
+		}
+
 		this.orch.debugLog(`The app ${appId} is sending an email.`);
-		await Mailer.send(email);
+		await Mailer.send({ ...email, from });
 	}
 }
diff --git a/apps/meteor/app/apps/server/bridges/livechat.ts b/apps/meteor/app/apps/server/bridges/livechat.ts
index 821d1fdd60d5..f2521d2f8cf5 100644
--- a/apps/meteor/app/apps/server/bridges/livechat.ts
+++ b/apps/meteor/app/apps/server/bridges/livechat.ts
@@ -10,7 +10,9 @@ import { LivechatVisitors, LivechatRooms, LivechatDepartment, Users } from '@roc
 
 import { callbacks } from '../../../../lib/callbacks';
 import { deasyncPromise } from '../../../../server/deasync/deasync';
-import { type ILivechatMessage, Livechat as LivechatTyped } from '../../../livechat/server/lib/LivechatTyped';
+import { Livechat as LivechatTyped } from '../../../livechat/server/lib/LivechatTyped';
+import { getRoomMessages } from '../../../livechat/server/lib/getRoomMessages';
+import type { ILivechatMessage } from '../../../livechat/server/lib/localTypes';
 import { settings } from '../../../settings/server';
 
 declare module '@rocket.chat/apps/dist/converters/IAppMessagesConverter' {
@@ -352,7 +354,7 @@ export class AppLivechatBridge extends LivechatBridge {
 			throw new Error('Could not get the message converter to process livechat room messages');
 		}
 
-		const livechatMessages = await LivechatTyped.getRoomMessages({ rid: roomId });
+		const livechatMessages = await getRoomMessages({ rid: roomId });
 		return Promise.all(await livechatMessages.map((message) => messageConverter.convertMessage(message, livechatMessages)).toArray());
 	}
 
diff --git a/apps/meteor/app/apps/server/bridges/settings.ts b/apps/meteor/app/apps/server/bridges/settings.ts
index 37803d4f94f3..cada833aadbd 100644
--- a/apps/meteor/app/apps/server/bridges/settings.ts
+++ b/apps/meteor/app/apps/server/bridges/settings.ts
@@ -3,6 +3,7 @@ import type { ISetting } from '@rocket.chat/apps-engine/definition/settings';
 import { ServerSettingBridge } from '@rocket.chat/apps-engine/server/bridges/ServerSettingBridge';
 import { Settings } from '@rocket.chat/models';
 
+import { updateAuditedByApp } from '../../../../server/settings/lib/auditedSettingUpdates';
 import { notifyOnSettingChanged, notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
 
 export class AppSettingBridge extends ServerSettingBridge {
@@ -56,7 +57,15 @@ export class AppSettingBridge extends ServerSettingBridge {
 			throw new Error(`The setting "${setting.id}" is not readable.`);
 		}
 
-		(await Settings.updateValueById(setting.id, setting.value)).modifiedCount && void notifyOnSettingChangedById(setting.id);
+		if (
+			(
+				await updateAuditedByApp({
+					_id: appId,
+				})(Settings.updateValueById, setting.id, setting.value)
+			).modifiedCount
+		) {
+			void notifyOnSettingChangedById(setting.id);
+		}
 	}
 
 	protected async incrementValue(id: string, value: number, appId: string): Promise<void> {
diff --git a/apps/meteor/app/apps/server/converters/contacts.ts b/apps/meteor/app/apps/server/converters/contacts.ts
new file mode 100644
index 000000000000..8dc49a829d09
--- /dev/null
+++ b/apps/meteor/app/apps/server/converters/contacts.ts
@@ -0,0 +1,125 @@
+import type { IAppContactsConverter, IAppsLivechatContact } from '@rocket.chat/apps';
+import type { ILivechatContact } from '@rocket.chat/core-typings';
+import { LivechatContacts } from '@rocket.chat/models';
+
+import { transformMappedData } from './transformMappedData';
+
+export class AppContactsConverter implements IAppContactsConverter {
+	async convertById(contactId: ILivechatContact['_id']): Promise<IAppsLivechatContact | undefined> {
+		const contact = await LivechatContacts.findOneById(contactId);
+		if (!contact) {
+			return;
+		}
+
+		return this.convertContact(contact);
+	}
+
+	async convertContact(contact: undefined | null): Promise<undefined>;
+
+	async convertContact(contact: ILivechatContact): Promise<IAppsLivechatContact>;
+
+	async convertContact(contact: ILivechatContact | undefined | null): Promise<IAppsLivechatContact | undefined> {
+		if (!contact) {
+			return;
+		}
+
+		return structuredClone(contact);
+	}
+
+	convertAppContact(contact: undefined | null): Promise<undefined>;
+
+	convertAppContact(contact: IAppsLivechatContact): Promise<ILivechatContact>;
+
+	async convertAppContact(contact: IAppsLivechatContact | undefined | null): Promise<ILivechatContact | undefined> {
+		if (!contact) {
+			return;
+		}
+
+		// Map every attribute individually to ensure there are no extra data coming from the app and leaking into anything else.
+		const map = {
+			_id: '_id',
+			_updatedAt: '_updatedAt',
+			name: 'name',
+			phones: {
+				from: 'phones',
+				list: true,
+				map: {
+					phoneNumber: 'phoneNumber',
+				},
+			},
+			emails: {
+				from: 'emails',
+				list: true,
+				map: {
+					address: 'address',
+				},
+			},
+			contactManager: 'contactManager',
+			unknown: 'unknown',
+			conflictingFields: {
+				from: 'conflictingFields',
+				list: true,
+				map: {
+					field: 'field',
+					value: 'value',
+				},
+			},
+			customFields: 'customFields',
+			channels: {
+				from: 'channels',
+				list: true,
+				map: {
+					name: 'name',
+					verified: 'verified',
+					visitor: {
+						from: 'visitor',
+						map: {
+							visitorId: 'visitorId',
+							source: {
+								from: 'source',
+								map: {
+									type: 'type',
+									id: 'id',
+								},
+							},
+						},
+					},
+					blocked: 'blocked',
+					field: 'field',
+					value: 'value',
+					verifiedAt: 'verifiedAt',
+					details: {
+						from: 'details',
+						map: {
+							type: 'type',
+							id: 'id',
+							alias: 'alias',
+							label: 'label',
+							sidebarIcon: 'sidebarIcon',
+							defaultIcon: 'defaultIcon',
+							destination: 'destination',
+						},
+					},
+					lastChat: {
+						from: 'lastChat',
+						map: {
+							_id: '_id',
+							ts: 'ts',
+						},
+					},
+				},
+			},
+			createdAt: 'createdAt',
+			lastChat: {
+				from: 'lastChat',
+				map: {
+					_id: '_id',
+					ts: 'ts',
+				},
+			},
+			importIds: 'importIds',
+		};
+
+		return transformMappedData(contact, map);
+	}
+}
diff --git a/apps/meteor/app/apps/server/converters/index.ts b/apps/meteor/app/apps/server/converters/index.ts
index 96716af03ca7..af64888f4d26 100644
--- a/apps/meteor/app/apps/server/converters/index.ts
+++ b/apps/meteor/app/apps/server/converters/index.ts
@@ -1,3 +1,4 @@
+import { AppContactsConverter } from './contacts';
 import { AppDepartmentsConverter } from './departments';
 import { AppMessagesConverter } from './messages';
 import { AppRolesConverter } from './roles';
@@ -9,6 +10,7 @@ import { AppVideoConferencesConverter } from './videoConferences';
 import { AppVisitorsConverter } from './visitors';
 
 export {
+	AppContactsConverter,
 	AppMessagesConverter,
 	AppRoomsConverter,
 	AppSettingsConverter,
diff --git a/apps/meteor/app/apps/server/converters/rooms.js b/apps/meteor/app/apps/server/converters/rooms.js
index a98a6701b2c2..741f98932191 100644
--- a/apps/meteor/app/apps/server/converters/rooms.js
+++ b/apps/meteor/app/apps/server/converters/rooms.js
@@ -1,5 +1,5 @@
 import { RoomType } from '@rocket.chat/apps-engine/definition/rooms';
-import { LivechatVisitors, Rooms, LivechatDepartment, Users } from '@rocket.chat/models';
+import { LivechatVisitors, Rooms, LivechatDepartment, Users, LivechatContacts } from '@rocket.chat/models';
 
 import { transformMappedData } from './transformMappedData';
 
@@ -75,6 +75,12 @@ export class AppRoomsConverter {
 			};
 		}
 
+		let contactId;
+		if (room.contact?._id) {
+			const contact = await LivechatContacts.findOneById(room.contact._id, { projection: { _id: 1 } });
+			contactId = contact._id;
+		}
+
 		const newRoom = {
 			...(room.id && { _id: room.id }),
 			fname: room.displayName,
@@ -100,6 +106,7 @@ export class AppRoomsConverter {
 			customFields: room.customFields,
 			livechatData: room.livechatData,
 			prid: typeof room.parentRoom === 'undefined' ? undefined : room.parentRoom.id,
+			contactId,
 			...(room._USERNAMES && { _USERNAMES: room._USERNAMES }),
 			...(room.source && {
 				source: {
@@ -180,6 +187,15 @@ export class AppRoomsConverter {
 
 				return this.orch.getConverters().get('visitors').convertById(v._id);
 			},
+			contact: (room) => {
+				const { contactId } = room;
+
+				if (!contactId) {
+					return undefined;
+				}
+
+				return this.orch.getConverters().get('contacts').convertById(contactId);
+			},
 			// Note: room.v is not just visitor, it also contains channel related visitor data
 			// so we need to pass this data to the converter
 			// So suppose you have a contact whom we're contacting using SMS via 2 phone no's,
diff --git a/apps/meteor/app/apps/server/converters/threads.ts b/apps/meteor/app/apps/server/converters/threads.ts
index e31ee094b4d7..d6284688b984 100644
--- a/apps/meteor/app/apps/server/converters/threads.ts
+++ b/apps/meteor/app/apps/server/converters/threads.ts
@@ -1,8 +1,8 @@
 import type { IAppRoomsConverter, IAppThreadsConverter, IAppUsersConverter, IAppsMessage, IAppsUser } from '@rocket.chat/apps';
 import type { IMessage as AppsEngineMessage, IMessageAttachment } from '@rocket.chat/apps-engine/definition/messages';
 import type { IRoom } from '@rocket.chat/apps-engine/definition/rooms';
-import type { IUser } from '@rocket.chat/core-typings';
-import { isEditedMessage, type IMessage } from '@rocket.chat/core-typings';
+import { isEditedMessage } from '@rocket.chat/core-typings';
+import type { IUser, IMessage } from '@rocket.chat/core-typings';
 import { Messages } from '@rocket.chat/models';
 
 import { cachedFunction } from './cachedFunction';
diff --git a/apps/meteor/app/apps/server/converters/transformMappedData.ts b/apps/meteor/app/apps/server/converters/transformMappedData.ts
index df2f16138d73..f18a89df11ee 100644
--- a/apps/meteor/app/apps/server/converters/transformMappedData.ts
+++ b/apps/meteor/app/apps/server/converters/transformMappedData.ts
@@ -1,5 +1,3 @@
-import cloneDeep from 'lodash.clonedeep';
-
 /**
  * Transforms a `data` source object to another object,
  * essentially applying a to -> from mapping provided by
@@ -62,16 +60,41 @@ import cloneDeep from 'lodash.clonedeep';
  * @returns Object The data after transformations have been applied
  */
 
-export const transformMappedData = async <
-	ResultType extends {
-		-readonly [p in keyof MapType]: MapType[p] extends keyof DataType
-			? DataType[MapType[p]]
-			: MapType[p] extends (...args: any[]) => any
+type MapFor<DataType> = {
+	[p in string]:
+		| string
+		| ((data: DataType) => Promise<unknown>)
+		| ((data: DataType) => unknown)
+		| { from: string; list: true }
+		| { from: string; map: MapFor<DataType[keyof DataType]>; list?: boolean };
+};
+
+type ResultFor<DataType extends Record<string, any>, MapType extends MapFor<DataType>> = {
+	-readonly [p in keyof MapType]: MapType[p] extends keyof DataType
+		? DataType[MapType[p]]
+		: MapType[p] extends (...args: any[]) => any
 			? Awaited<ReturnType<MapType[p]>>
-			: never;
-	},
+			: MapType[p] extends { from: infer KeyName; map?: Record<string, any>; list?: boolean }
+				? KeyName extends keyof DataType
+					? MapType[p]['list'] extends true
+						? DataType[KeyName] extends any[]
+							? MapType[p]['map'] extends MapFor<DataType[KeyName][number]>
+								? ResultFor<DataType[KeyName][number], MapType[p]['map']>[]
+								: DataType[KeyName]
+							: DataType[KeyName][]
+						: DataType[KeyName] extends object
+							? MapType[p]['map'] extends MapFor<DataType[KeyName]>
+								? ResultFor<DataType[KeyName], MapType[p]['map']>
+								: never
+							: never
+					: never
+				: never;
+};
+
+export const transformMappedData = async <
+	ResultType extends ResultFor<DataType, MapType>,
 	DataType extends Record<string, any>,
-	MapType extends { [p in string]: string | ((data: DataType) => Promise<unknown>) | ((data: DataType) => unknown) },
+	MapType extends MapFor<DataType>,
 	UnmappedProperties extends {
 		[p in keyof DataType as Exclude<p, MapType[keyof MapType]>]: DataType[p];
 	},
@@ -79,7 +102,7 @@ export const transformMappedData = async <
 	data: DataType,
 	map: MapType,
 ): Promise<ResultType & { _unmappedProperties_: UnmappedProperties }> => {
-	const originalData: DataType = cloneDeep(data);
+	const originalData: DataType = structuredClone(data);
 	const transformedData: Record<string, any> = {};
 
 	for await (const [to, from] of Object.entries(map)) {
@@ -94,6 +117,26 @@ export const transformMappedData = async <
 				transformedData[to] = originalData[from];
 			}
 			delete originalData[from];
+		} else if (typeof from === 'object' && 'from' in from) {
+			const { from: fromName } = from;
+
+			if (from.list) {
+				if (Array.isArray(originalData[fromName])) {
+					if ('map' in from && from.map) {
+						if (typeof originalData[fromName] === 'object') {
+							transformedData[to] = await Promise.all(originalData[fromName].map((item) => transformMappedData(item, from.map)));
+						}
+					} else {
+						transformedData[to] = [...originalData[fromName]];
+					}
+				} else if (originalData[fromName] !== undefined && originalData[fromName] !== null) {
+					transformedData[to] = [originalData[fromName]];
+				}
+			} else {
+				transformedData[to] = await transformMappedData(originalData[fromName], from.map);
+			}
+
+			delete originalData[fromName];
 		}
 	}
 
diff --git a/apps/meteor/app/apps/server/converters/visitors.js b/apps/meteor/app/apps/server/converters/visitors.js
index 32864e3e900e..c8fb0b7c4a21 100644
--- a/apps/meteor/app/apps/server/converters/visitors.js
+++ b/apps/meteor/app/apps/server/converters/visitors.js
@@ -36,7 +36,6 @@ export class AppVisitorsConverter {
 			visitorEmails: 'visitorEmails',
 			livechatData: 'livechatData',
 			status: 'status',
-			contactId: 'contactId',
 		};
 
 		return transformMappedData(visitor, map);
@@ -55,7 +54,6 @@ export class AppVisitorsConverter {
 			phone: visitor.phone,
 			livechatData: visitor.livechatData,
 			status: visitor.status || 'online',
-			contactId: visitor.contactId,
 			...(visitor.visitorEmails && { visitorEmails: visitor.visitorEmails }),
 			...(visitor.department && { department: visitor.department }),
 		};
diff --git a/apps/meteor/app/assets/server/assets.ts b/apps/meteor/app/assets/server/assets.ts
index ef307f00b30c..e9160b0ece61 100644
--- a/apps/meteor/app/assets/server/assets.ts
+++ b/apps/meteor/app/assets/server/assets.ts
@@ -220,16 +220,14 @@ class RocketChatAssetsClass {
 		return assets;
 	}
 
-	public async setAsset(binaryContent: string, contentType: string, asset: string): Promise<void> {
-		const file = Buffer.from(binaryContent, 'binary');
-		await this.setAssetWithBuffer(file, contentType, asset);
-	}
-
-	public async setAssetWithBuffer(binaryContent: Buffer, contentType: string, asset: string): Promise<void> {
-		await this._setAsset(binaryContent, contentType, asset);
-	}
-
-	private async _setAsset(file: Buffer, contentType: string, asset: string): Promise<void> {
+	public async setAssetWithBuffer(
+		file: Buffer,
+		contentType: string,
+		asset: string,
+	): Promise<{
+		key: string;
+		value: IRocketChatAsset;
+	}> {
 		const assetInstance = getAssetByKey(asset);
 		if (!assetInstance) {
 			throw new Meteor.Error('error-invalid-asset', 'Invalid asset', {
@@ -260,29 +258,29 @@ class RocketChatAssetsClass {
 		await RocketChatAssetsInstance.deleteFile(asset);
 
 		const ws = RocketChatAssetsInstance.createWriteStream(asset, contentType);
-		ws.on('end', () => {
-			return setTimeout(async () => {
-				const key = `Assets_${asset}`;
-				const value = {
-					url: `assets/${asset}.${extension}`,
-					defaultUrl: assetInstance.defaultUrl,
-				};
-
-				void (async () => {
-					const { modifiedCount } = await Settings.updateValueById(key, value);
-					if (modifiedCount) {
-						void notifyOnSettingChangedById(key);
-					}
-				})();
-
-				return RocketChatAssets.processAsset(key, value);
-			}, 200);
-		});
 
-		rs.pipe(ws);
+		return new Promise((resolve) => {
+			ws.on('end', () => {
+				return setTimeout(async () => {
+					const key = `Assets_${asset}`;
+					const value = {
+						url: `assets/${asset}.${extension}`,
+						defaultUrl: assetInstance.defaultUrl,
+					} as IRocketChatAsset;
+
+					await RocketChatAssets.processAsset(key, value);
+					resolve({
+						key,
+						value,
+					});
+				}, 200);
+			});
+
+			rs.pipe(ws);
+		});
 	}
 
-	public async unsetAsset(asset: string): Promise<void> {
+	public async unsetAsset(asset: string) {
 		if (!getAssetByKey(asset)) {
 			throw new Meteor.Error('error-invalid-asset', 'Invalid asset', {
 				function: 'RocketChat.Assets.unsetAsset',
@@ -295,14 +293,12 @@ class RocketChatAssetsClass {
 			defaultUrl: getAssetByKey(asset).defaultUrl,
 		};
 
-		void (async () => {
-			const { modifiedCount } = await Settings.updateValueById(key, value);
-			if (modifiedCount) {
-				void notifyOnSettingChangedById(key);
-			}
-		})();
-
 		await RocketChatAssets.processAsset(key, value);
+
+		return {
+			key,
+			value,
+		};
 	}
 
 	public refreshClients(): boolean {
@@ -374,14 +370,12 @@ export async function addAssetToSetting(asset: string, value: IRocketChatAsset,
 			defaultUrl: value.defaultUrl,
 		},
 		{
-			...{
-				type: 'asset',
-				group: 'Assets',
-				fileConstraints: value.constraints,
-				i18nLabel: value.label,
-				asset,
-				public: true,
-			},
+			type: 'asset',
+			group: 'Assets',
+			fileConstraints: value.constraints,
+			i18nLabel: value.label,
+			asset,
+			public: true,
 			...options,
 		},
 	);
@@ -425,32 +419,6 @@ export const refreshClients = async (userId: string) => {
 	return RocketChatAssets.refreshClients();
 };
 
-export const unsetAsset = async (userId: string, asset: string) => {
-	if (!userId) {
-		throw new Error('Invalid user');
-	}
-
-	const _hasPermission = await hasPermissionAsync(userId, 'manage-assets');
-	if (!_hasPermission) {
-		throw new Error('Managing assets not allowed');
-	}
-
-	return RocketChatAssets.unsetAsset(asset);
-};
-
-export const setAsset = async (userId: string, binaryContent: Buffer, contentType: string, asset: string) => {
-	if (!userId) {
-		throw new Error('Invalid user');
-	}
-
-	const _hasPermission = await hasPermissionAsync(userId, 'manage-assets');
-	if (!_hasPermission) {
-		throw new Error('Managing assets not allowed');
-	}
-
-	await RocketChatAssets.setAssetWithBuffer(binaryContent, contentType, asset);
-};
-
 const listener = (req: IncomingMessage, res: ServerResponse, next: NextHandleFunction) => {
 	if (!req.url) {
 		return;
diff --git a/apps/meteor/app/assets/server/index.ts b/apps/meteor/app/assets/server/index.ts
index 8aa8c123f928..6802fadf6d20 100644
--- a/apps/meteor/app/assets/server/index.ts
+++ b/apps/meteor/app/assets/server/index.ts
@@ -1 +1 @@
-export { RocketChatAssets, setAsset, unsetAsset, refreshClients } from './assets';
+export { RocketChatAssets, refreshClients } from './assets';
diff --git a/apps/meteor/app/authentication/server/startup/index.js b/apps/meteor/app/authentication/server/startup/index.js
index 0577ceac0ba7..03c9602e59f0 100644
--- a/apps/meteor/app/authentication/server/startup/index.js
+++ b/apps/meteor/app/authentication/server/startup/index.js
@@ -338,6 +338,7 @@ Accounts.insertUserDoc = async function (options, user) {
 		if (!roles.includes('admin') && !hasAdmin) {
 			roles.push('admin');
 			if (settings.get('Show_Setup_Wizard') === 'pending') {
+				// TODO: audit
 				(await Settings.updateValueById('Show_Setup_Wizard', 'in_progress')).modifiedCount &&
 					void notifyOnSettingChangedById('Show_Setup_Wizard');
 			}
diff --git a/apps/meteor/app/authorization/client/hasPermission.ts b/apps/meteor/app/authorization/client/hasPermission.ts
index 66171aeadd28..3495da05556c 100644
--- a/apps/meteor/app/authorization/client/hasPermission.ts
+++ b/apps/meteor/app/authorization/client/hasPermission.ts
@@ -26,7 +26,7 @@ const createPermissionValidator =
 				}
 			}
 
-			const permission = Models.ChatPermissions.findOne(permissionId, {
+			const permission = Models.Permissions.findOne(permissionId, {
 				fields: { roles: 1 },
 			});
 			const roles = permission?.roles ?? [];
@@ -99,18 +99,3 @@ export const userHasAllPermission = (
 ): boolean => validatePermissions(permissions, scope, all, userId);
 
 export const hasPermission = hasAllPermission;
-
-/**
- * This function is used to check if the user will have the permission after something happens.
- * For example, The user is creating a new channel and he wants to set read-only config to true.
- * This is a problem, set-readonly is a permission related with the scoped permissions `owner`
- * so the user cannot set this permission to true during the channel creation, because there is no room yet to be owned and used as scope, but is possible
- * during the channel update, which is weird.
- *
- * @param permissions The permissions to check
- * @param scopedRoles The scoped roles to check to be included in the user roles
- * @returns If the user will have the permission
- */
-
-export const willHavePermission = (permissions: IPermission['_id'] | IPermission['_id'][], scopedRoles: IPermission['_id'][]): boolean =>
-	validatePermissions(permissions, undefined, all, undefined, scopedRoles);
diff --git a/apps/meteor/app/authorization/server/functions/canDeleteMessage.ts b/apps/meteor/app/authorization/server/functions/canDeleteMessage.ts
index fea37fd1c2a5..1651affba0de 100644
--- a/apps/meteor/app/authorization/server/functions/canDeleteMessage.ts
+++ b/apps/meteor/app/authorization/server/functions/canDeleteMessage.ts
@@ -1,9 +1,9 @@
 import type { IUser, IRoom } from '@rocket.chat/core-typings';
 import { Rooms } from '@rocket.chat/models';
 
-import { getValue } from '../../../settings/server/raw';
 import { canAccessRoomAsync } from './canAccessRoom';
 import { hasPermissionAsync } from './hasPermission';
+import { getValue } from '../../../settings/server/raw';
 
 const elapsedTime = (ts: Date): number => {
 	const dif = Date.now() - ts.getTime();
diff --git a/apps/meteor/app/authorization/server/functions/canSendMessage.ts b/apps/meteor/app/authorization/server/functions/canSendMessage.ts
index 9cf5c5ec78d2..97767ee001b0 100644
--- a/apps/meteor/app/authorization/server/functions/canSendMessage.ts
+++ b/apps/meteor/app/authorization/server/functions/canSendMessage.ts
@@ -1,10 +1,10 @@
 import type { IRoom, IUser } from '@rocket.chat/core-typings';
 import { Subscriptions, Rooms } from '@rocket.chat/models';
 
-import { RoomMemberActions } from '../../../../definition/IRoomTypeConfig';
-import { roomCoordinator } from '../../../../server/lib/rooms/roomCoordinator';
 import { canAccessRoomAsync } from './canAccessRoom';
 import { hasPermissionAsync } from './hasPermission';
+import { RoomMemberActions } from '../../../../definition/IRoomTypeConfig';
+import { roomCoordinator } from '../../../../server/lib/rooms/roomCoordinator';
 
 const subscriptionOptions = {
 	projection: {
diff --git a/apps/meteor/app/authorization/server/functions/getRoles.ts b/apps/meteor/app/authorization/server/functions/getRoles.ts
index 59ab1ef53732..bee995f885d3 100644
--- a/apps/meteor/app/authorization/server/functions/getRoles.ts
+++ b/apps/meteor/app/authorization/server/functions/getRoles.ts
@@ -2,3 +2,6 @@ import type { IRole } from '@rocket.chat/core-typings';
 import { Roles } from '@rocket.chat/models';
 
 export const getRoles = async (): Promise<IRole[]> => Roles.find().toArray();
+
+export const getRoleIds = async (): Promise<IRole['_id'][]> =>
+	(await Roles.find({}, { projection: { _id: 1 } }).toArray()).map(({ _id }) => _id);
diff --git a/apps/meteor/app/authorization/server/methods/deleteRole.ts b/apps/meteor/app/authorization/server/methods/deleteRole.ts
index 140852e0f1ec..512468f2d6d7 100644
--- a/apps/meteor/app/authorization/server/methods/deleteRole.ts
+++ b/apps/meteor/app/authorization/server/methods/deleteRole.ts
@@ -56,7 +56,7 @@ Meteor.methods<ServerMethods>({
 			});
 		}
 
-		const users = await (await Roles.findUsersInRole(role._id)).count();
+		const users = await Roles.countUsersInRole(role._id);
 
 		if (users > 0) {
 			throw new Meteor.Error('error-role-in-use', "Cannot delete role because it's in use", {
diff --git a/apps/meteor/app/autotranslate/client/lib/actionButton.ts b/apps/meteor/app/autotranslate/client/lib/actionButton.ts
index 24cea2d8d28a..3901ef2df8e7 100644
--- a/apps/meteor/app/autotranslate/client/lib/actionButton.ts
+++ b/apps/meteor/app/autotranslate/client/lib/actionButton.ts
@@ -1,8 +1,8 @@
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 
+import { AutoTranslate } from './autotranslate';
 import { roomCoordinator } from '../../../../client/lib/rooms/roomCoordinator';
-import { messageArgs } from '../../../../client/lib/utils/messageArgs';
 import {
 	hasTranslationLanguageInAttachments,
 	hasTranslationLanguageInMessage,
@@ -12,7 +12,6 @@ import { Messages } from '../../../models/client';
 import { settings } from '../../../settings/client';
 import { MessageAction } from '../../../ui-utils/client/lib/MessageAction';
 import { sdk } from '../../../utils/client/lib/SDKClient';
-import { AutoTranslate } from './autotranslate';
 
 Meteor.startup(() => {
 	AutoTranslate.init();
@@ -25,8 +24,7 @@ Meteor.startup(() => {
 				label: 'Translate',
 				context: ['message', 'message-mobile', 'threads'],
 				type: 'interaction',
-				action(_, props) {
-					const { message = messageArgs(this).msg } = props;
+				action(_, { message }) {
 					const language = AutoTranslate.getLanguage(message.rid);
 					if (!hasTranslationLanguageInMessage(message, language) && !hasTranslationLanguageInAttachments(message.attachments, language)) {
 						(AutoTranslate.messageIdsToWait as any)[message._id] = true;
@@ -61,7 +59,7 @@ Meteor.startup(() => {
 				context: ['message', 'message-mobile', 'threads'],
 				type: 'interaction',
 				action(_, props) {
-					const { message = messageArgs(this).msg } = props;
+					const { message } = props;
 					const language = AutoTranslate.getLanguage(message.rid);
 					if (!hasTranslationLanguageInMessage(message, language) && !hasTranslationLanguageInAttachments(message.attachments, language)) {
 						(AutoTranslate.messageIdsToWait as any)[message._id] = true;
diff --git a/apps/meteor/app/autotranslate/server/deeplTranslate.ts b/apps/meteor/app/autotranslate/server/deeplTranslate.ts
index 349133f7fd4c..caa4cf97c9a8 100644
--- a/apps/meteor/app/autotranslate/server/deeplTranslate.ts
+++ b/apps/meteor/app/autotranslate/server/deeplTranslate.ts
@@ -13,10 +13,10 @@ import type {
 import { serverFetch as fetch } from '@rocket.chat/server-fetch';
 import _ from 'underscore';
 
+import { TranslationProviderRegistry, AutoTranslate } from './autotranslate';
 import { i18n } from '../../../server/lib/i18n';
 import { SystemLogger } from '../../../server/lib/logger/system';
 import { settings } from '../../settings/server';
-import { TranslationProviderRegistry, AutoTranslate } from './autotranslate';
 
 const proApiEndpoint = 'https://api.deepl.com/v2/translate';
 const freeApiEndpoint = 'https://api-free.deepl.com/v2/translate';
diff --git a/apps/meteor/app/autotranslate/server/googleTranslate.ts b/apps/meteor/app/autotranslate/server/googleTranslate.ts
index 0e0b7a205765..da5e156458dc 100644
--- a/apps/meteor/app/autotranslate/server/googleTranslate.ts
+++ b/apps/meteor/app/autotranslate/server/googleTranslate.ts
@@ -13,10 +13,10 @@ import type {
 import { serverFetch as fetch } from '@rocket.chat/server-fetch';
 import _ from 'underscore';
 
+import { AutoTranslate, TranslationProviderRegistry } from './autotranslate';
 import { i18n } from '../../../server/lib/i18n';
 import { SystemLogger } from '../../../server/lib/logger/system';
 import { settings } from '../../settings/server';
-import { AutoTranslate, TranslationProviderRegistry } from './autotranslate';
 
 /**
  * Represents google translate class
diff --git a/apps/meteor/app/autotranslate/server/msTranslate.ts b/apps/meteor/app/autotranslate/server/msTranslate.ts
index f885a23b8e6b..ad36ff0b8b77 100644
--- a/apps/meteor/app/autotranslate/server/msTranslate.ts
+++ b/apps/meteor/app/autotranslate/server/msTranslate.ts
@@ -6,10 +6,10 @@ import type { IMessage, IProviderMetadata, ISupportedLanguage, ITranslationResul
 import { serverFetch as fetch } from '@rocket.chat/server-fetch';
 import _ from 'underscore';
 
-import { i18n } from '../../../server/lib/i18n';
-import { settings } from '../../settings/server';
 import { TranslationProviderRegistry, AutoTranslate } from './autotranslate';
 import { msLogger } from './logger';
+import { i18n } from '../../../server/lib/i18n';
+import { settings } from '../../settings/server';
 
 /**
  * Microsoft translation service provider class representation.
diff --git a/apps/meteor/app/canned-responses/client/startup/responses.js b/apps/meteor/app/canned-responses/client/startup/responses.ts
similarity index 72%
rename from apps/meteor/app/canned-responses/client/startup/responses.js
rename to apps/meteor/app/canned-responses/client/startup/responses.ts
index 595945283261..6d761adb890d 100644
--- a/apps/meteor/app/canned-responses/client/startup/responses.js
+++ b/apps/meteor/app/canned-responses/client/startup/responses.ts
@@ -6,13 +6,6 @@ import { settings } from '../../../settings/client';
 import { sdk } from '../../../utils/client/lib/SDKClient';
 import { CannedResponse } from '../collections/CannedResponse';
 
-const events = {
-	changed: ({ type, ...response }) => {
-		CannedResponse.upsert({ _id: response._id }, response);
-	},
-	removed: (response) => CannedResponse.remove({ _id: response._id }),
-};
-
 Meteor.startup(() => {
 	Tracker.autorun(async (c) => {
 		if (!Meteor.userId()) {
@@ -27,12 +20,24 @@ Meteor.startup(() => {
 		Tracker.afterFlush(() => {
 			try {
 				// TODO: check options
-				sdk.stream('canned-responses', ['canned-responses'], (response, options) => {
+				sdk.stream('canned-responses', ['canned-responses'], (...[response, options]) => {
 					const { agentsId } = options || {};
 					if (Array.isArray(agentsId) && !agentsId.includes(Meteor.userId())) {
 						return;
 					}
-					events[response.type](response);
+
+					switch (response.type) {
+						case 'changed': {
+							const { type, ...fields } = response;
+							CannedResponse.upsert({ _id: response._id }, fields);
+							break;
+						}
+
+						case 'removed': {
+							CannedResponse.remove({ _id: response._id });
+							break;
+						}
+					}
 				});
 			} catch (error) {
 				console.log(error);
diff --git a/apps/meteor/app/cloud/server/functions/connectWorkspace.ts b/apps/meteor/app/cloud/server/functions/connectWorkspace.ts
index b7dc1d8b21b0..9d29fb7eb399 100644
--- a/apps/meteor/app/cloud/server/functions/connectWorkspace.ts
+++ b/apps/meteor/app/cloud/server/functions/connectWorkspace.ts
@@ -1,10 +1,10 @@
 import { serverFetch as fetch } from '@rocket.chat/server-fetch';
 
+import { getRedirectUri } from './getRedirectUri';
+import { saveRegistrationData } from './saveRegistrationData';
 import { CloudWorkspaceConnectionError } from '../../../../lib/errors/CloudWorkspaceConnectionError';
 import { SystemLogger } from '../../../../server/lib/logger/system';
 import { settings } from '../../../settings/server';
-import { getRedirectUri } from './getRedirectUri';
-import { saveRegistrationData } from './saveRegistrationData';
 
 const fetchRegistrationDataPayload = async ({
 	token,
diff --git a/apps/meteor/app/cloud/server/functions/getCheckoutUrl.ts b/apps/meteor/app/cloud/server/functions/getCheckoutUrl.ts
index 2665f31c8498..914020e96471 100644
--- a/apps/meteor/app/cloud/server/functions/getCheckoutUrl.ts
+++ b/apps/meteor/app/cloud/server/functions/getCheckoutUrl.ts
@@ -1,10 +1,10 @@
 import { serverFetch as fetch } from '@rocket.chat/server-fetch';
 
+import { getWorkspaceAccessTokenOrThrow } from './getWorkspaceAccessToken';
+import { syncWorkspace } from './syncWorkspace';
 import { SystemLogger } from '../../../../server/lib/logger/system';
 import { settings } from '../../../settings/server';
 import { getURL } from '../../../utils/server/getURL';
-import { getWorkspaceAccessTokenOrThrow } from './getWorkspaceAccessToken';
-import { syncWorkspace } from './syncWorkspace';
 
 export const fallback = `https://go.rocket.chat/i/contact-sales`;
 
diff --git a/apps/meteor/app/cloud/server/functions/getOAuthAuthorizationUrl.ts b/apps/meteor/app/cloud/server/functions/getOAuthAuthorizationUrl.ts
index 0550a3d7f238..d787fd16cf65 100644
--- a/apps/meteor/app/cloud/server/functions/getOAuthAuthorizationUrl.ts
+++ b/apps/meteor/app/cloud/server/functions/getOAuthAuthorizationUrl.ts
@@ -1,6 +1,7 @@
 import { Settings } from '@rocket.chat/models';
 import { Random } from '@rocket.chat/random';
 
+import { updateAuditedBySystem } from '../../../../server/settings/lib/auditedSettingUpdates';
 import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
 import { settings } from '../../../settings/server';
 import { userScopes } from '../oauthScopes';
@@ -9,7 +10,9 @@ import { getRedirectUri } from './getRedirectUri';
 export async function getOAuthAuthorizationUrl() {
 	const state = Random.id();
 
-	await Settings.updateValueById('Cloud_Workspace_Registration_State', state);
+	await updateAuditedBySystem({
+		reason: 'getOAuthAuthorizationUrl',
+	})(Settings.updateValueById, 'Cloud_Workspace_Registration_State', state);
 
 	void notifyOnSettingChangedById('Cloud_Workspace_Registration_State');
 
diff --git a/apps/meteor/app/cloud/server/functions/getWorkspaceKey.ts b/apps/meteor/app/cloud/server/functions/getWorkspaceKey.ts
index 639f29402fe9..2a2b8e8858fd 100644
--- a/apps/meteor/app/cloud/server/functions/getWorkspaceKey.ts
+++ b/apps/meteor/app/cloud/server/functions/getWorkspaceKey.ts
@@ -1,5 +1,5 @@
-import { settings } from '../../../settings/server';
 import { retrieveRegistrationStatus } from './retrieveRegistrationStatus';
+import { settings } from '../../../settings/server';
 
 export async function getWorkspaceKey() {
 	const { workspaceRegistered } = await retrieveRegistrationStatus();
diff --git a/apps/meteor/app/cloud/server/functions/registerPreIntentWorkspaceWizard.ts b/apps/meteor/app/cloud/server/functions/registerPreIntentWorkspaceWizard.ts
index e0865c24156a..a102ed359053 100644
--- a/apps/meteor/app/cloud/server/functions/registerPreIntentWorkspaceWizard.ts
+++ b/apps/meteor/app/cloud/server/functions/registerPreIntentWorkspaceWizard.ts
@@ -2,9 +2,9 @@ import type { IUser } from '@rocket.chat/core-typings';
 import { Users } from '@rocket.chat/models';
 import { serverFetch as fetch } from '@rocket.chat/server-fetch';
 
+import { buildWorkspaceRegistrationData } from './buildRegistrationData';
 import { SystemLogger } from '../../../../server/lib/logger/system';
 import { settings } from '../../../settings/server';
-import { buildWorkspaceRegistrationData } from './buildRegistrationData';
 
 export async function registerPreIntentWorkspaceWizard(): Promise<boolean> {
 	const firstUser = (await Users.getOldest({ projection: { name: 1, emails: 1 } })) as IUser | undefined;
diff --git a/apps/meteor/app/cloud/server/functions/removeLicense.ts b/apps/meteor/app/cloud/server/functions/removeLicense.ts
index b9afe2ddf09a..88f1d6825177 100644
--- a/apps/meteor/app/cloud/server/functions/removeLicense.ts
+++ b/apps/meteor/app/cloud/server/functions/removeLicense.ts
@@ -1,12 +1,12 @@
 import { serverFetch as fetch } from '@rocket.chat/server-fetch';
 
+import { CloudWorkspaceAccessTokenEmptyError, getWorkspaceAccessToken } from './getWorkspaceAccessToken';
+import { retrieveRegistrationStatus } from './retrieveRegistrationStatus';
+import { syncWorkspace } from './syncWorkspace';
 import { callbacks } from '../../../../lib/callbacks';
 import { CloudWorkspaceConnectionError } from '../../../../lib/errors/CloudWorkspaceConnectionError';
 import { CloudWorkspaceRegistrationError } from '../../../../lib/errors/CloudWorkspaceRegistrationError';
 import { settings } from '../../../settings/server';
-import { CloudWorkspaceAccessTokenEmptyError, getWorkspaceAccessToken } from './getWorkspaceAccessToken';
-import { retrieveRegistrationStatus } from './retrieveRegistrationStatus';
-import { syncWorkspace } from './syncWorkspace';
 
 export async function removeLicense() {
 	try {
diff --git a/apps/meteor/app/cloud/server/functions/removeWorkspaceRegistrationInfo.ts b/apps/meteor/app/cloud/server/functions/removeWorkspaceRegistrationInfo.ts
index bf2b5d085945..678f6233b0a2 100644
--- a/apps/meteor/app/cloud/server/functions/removeWorkspaceRegistrationInfo.ts
+++ b/apps/meteor/app/cloud/server/functions/removeWorkspaceRegistrationInfo.ts
@@ -1,7 +1,8 @@
 import { Settings, WorkspaceCredentials } from '@rocket.chat/models';
 
-import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
 import { retrieveRegistrationStatus } from './retrieveRegistrationStatus';
+import { updateAuditedBySystem } from '../../../../server/settings/lib/auditedSettingUpdates';
+import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
 
 export async function removeWorkspaceRegistrationInfo() {
 	const { workspaceRegistered } = await retrieveRegistrationStatus();
@@ -24,10 +25,12 @@ export async function removeWorkspaceRegistrationInfo() {
 
 	const promises = settingsIds.map((settingId) => {
 		if (settingId === 'Show_Setup_Wizard') {
-			return Settings.updateValueById('Show_Setup_Wizard', 'in_progress');
+			return updateAuditedBySystem({
+				reason: 'removeWorkspaceRegistrationInfo',
+			})(Settings.updateValueById, 'Show_Setup_Wizard', 'in_progress');
 		}
 
-		return Settings.resetValueById(settingId, null);
+		return updateAuditedBySystem({ reason: 'removeWorkspaceRegistrationInfo' })(Settings.resetValueById, settingId, null);
 	});
 
 	(await Promise.all(promises)).forEach((value, index) => {
diff --git a/apps/meteor/app/cloud/server/functions/saveRegistrationData.ts b/apps/meteor/app/cloud/server/functions/saveRegistrationData.ts
index 63633c567845..c820411775d3 100644
--- a/apps/meteor/app/cloud/server/functions/saveRegistrationData.ts
+++ b/apps/meteor/app/cloud/server/functions/saveRegistrationData.ts
@@ -1,9 +1,10 @@
 import { applyLicense } from '@rocket.chat/license';
 import { Settings } from '@rocket.chat/models';
 
+import { syncCloudData } from './syncWorkspace/syncCloudData';
+import { updateAuditedBySystem } from '../../../../server/settings/lib/auditedSettingUpdates';
 import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
 import { settings } from '../../../settings/server';
-import { syncCloudData } from './syncWorkspace/syncCloudData';
 
 type SaveRegistrationDataDTO = {
 	workspaceId: string;
@@ -59,7 +60,13 @@ async function saveRegistrationDataBase({
 		{ _id: 'Cloud_Workspace_Registration_Client_Uri', value: registration_client_uri },
 	];
 
-	const promises = [...settingsData.map(({ _id, value }) => Settings.updateValueById(_id, value))];
+	const promises = [
+		...settingsData.map(({ _id, value }) =>
+			updateAuditedBySystem({
+				reason: 'saveRegistrationDataBase',
+			})(Settings.updateValueById, _id, value),
+		),
+	];
 
 	(await Promise.all(promises)).forEach((value, index) => {
 		if (value?.modifiedCount) {
@@ -67,7 +74,10 @@ async function saveRegistrationDataBase({
 		}
 	});
 
-	// TODO: Why is this taking so long that needs a timeout?
+	// Question: Why is this taking so long that needs a timeout?
+	// Answer: we use cache that requires a 'roundtrip' through the db and the application
+	// we need to make sure that the cache is updated before we continue the procedures
+	// we don't actually need to wait a whole second for this, but look this is just a retry mechanism it doesn't mean that actually takes all this time
 	for await (const retry of Array.from({ length: 10 })) {
 		const isSettingsUpdated =
 			settings.get('Register_Server') === true &&
diff --git a/apps/meteor/app/cloud/server/functions/startRegisterWorkspace.ts b/apps/meteor/app/cloud/server/functions/startRegisterWorkspace.ts
index 1fb2dcc06449..bdd6cedc018d 100644
--- a/apps/meteor/app/cloud/server/functions/startRegisterWorkspace.ts
+++ b/apps/meteor/app/cloud/server/functions/startRegisterWorkspace.ts
@@ -1,12 +1,13 @@
 import { Settings } from '@rocket.chat/models';
 import { serverFetch as fetch } from '@rocket.chat/server-fetch';
 
-import { SystemLogger } from '../../../../server/lib/logger/system';
-import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
-import { settings } from '../../../settings/server';
 import { buildWorkspaceRegistrationData } from './buildRegistrationData';
 import { retrieveRegistrationStatus } from './retrieveRegistrationStatus';
 import { syncWorkspace } from './syncWorkspace';
+import { SystemLogger } from '../../../../server/lib/logger/system';
+import { updateAuditedBySystem } from '../../../../server/settings/lib/auditedSettingUpdates';
+import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
+import { settings } from '../../../settings/server';
 
 export async function startRegisterWorkspace(resend = false) {
 	const { workspaceRegistered } = await retrieveRegistrationStatus();
@@ -15,7 +16,6 @@ export async function startRegisterWorkspace(resend = false) {
 
 		return true;
 	}
-
 	(await Settings.updateValueById('Register_Server', true)).modifiedCount && void notifyOnSettingChangedById('Register_Server');
 
 	const regInfo = await buildWorkspaceRegistrationData(undefined);
@@ -48,7 +48,9 @@ export async function startRegisterWorkspace(resend = false) {
 		return false;
 	}
 
-	await Settings.updateValueById('Cloud_Workspace_Id', payload.id);
+	await updateAuditedBySystem({
+		reason: 'startRegisterWorkspace',
+	})(Settings.updateValueById, 'Cloud_Workspace_Id', payload.id);
 
 	return true;
 }
diff --git a/apps/meteor/app/cloud/server/functions/startRegisterWorkspaceSetupWizard.ts b/apps/meteor/app/cloud/server/functions/startRegisterWorkspaceSetupWizard.ts
index 382478db61c7..36b858d932c8 100644
--- a/apps/meteor/app/cloud/server/functions/startRegisterWorkspaceSetupWizard.ts
+++ b/apps/meteor/app/cloud/server/functions/startRegisterWorkspaceSetupWizard.ts
@@ -1,9 +1,9 @@
 import type { CloudRegistrationIntentData } from '@rocket.chat/core-typings';
 import { serverFetch as fetch } from '@rocket.chat/server-fetch';
 
+import { buildWorkspaceRegistrationData } from './buildRegistrationData';
 import { SystemLogger } from '../../../../server/lib/logger/system';
 import { settings } from '../../../settings/server';
-import { buildWorkspaceRegistrationData } from './buildRegistrationData';
 
 export async function startRegisterWorkspaceSetupWizard(resend = false, email: string): Promise<CloudRegistrationIntentData> {
 	const regInfo = await buildWorkspaceRegistrationData(email);
diff --git a/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsToken.ts b/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsToken.ts
index f4334bd04d64..ad0dffca27d8 100644
--- a/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsToken.ts
+++ b/apps/meteor/app/cloud/server/functions/supportedVersionsToken/supportedVersionsToken.ts
@@ -12,6 +12,7 @@ import { supportedVersions as supportedVersionsFromBuild } from '../../../../uti
 import { buildVersionUpdateMessage } from '../../../../version-check/server/functions/buildVersionUpdateMessage';
 import { generateWorkspaceBearerHttpHeader } from '../getWorkspaceAccessToken';
 import { supportedVersionsChooseLatest } from './supportedVersionsChooseLatest';
+import { updateAuditedBySystem } from '../../../../../server/settings/lib/auditedSettingUpdates';
 
 declare module '@rocket.chat/core-typings' {
 	interface ILicenseV3 {
@@ -34,7 +35,7 @@ export const wrapPromise = <T>(
 	  }
 > =>
 	promise
-		.then((result) => ({ success: true, result } as const))
+		.then((result) => ({ success: true, result }) as const)
 		.catch((error) => ({
 			success: false,
 			error,
@@ -66,7 +67,15 @@ const cacheValueInSettings = <T extends SettingValue>(
 		SystemLogger.debug(`Resetting cached value ${key} in settings`);
 		const value = await fn();
 
-		(await Settings.updateValueById(key, value)).modifiedCount && void notifyOnSettingChangedById(key);
+		if (
+			(
+				await updateAuditedBySystem({
+					reason: 'cacheValueInSettings reset',
+				})(Settings.updateValueById, key, value)
+			).modifiedCount
+		) {
+			void notifyOnSettingChangedById(key);
+		}
 
 		return value;
 	};
diff --git a/apps/meteor/app/cloud/server/functions/syncWorkspace/index.ts b/apps/meteor/app/cloud/server/functions/syncWorkspace/index.ts
index a410ea274c07..2ae63939e9d9 100644
--- a/apps/meteor/app/cloud/server/functions/syncWorkspace/index.ts
+++ b/apps/meteor/app/cloud/server/functions/syncWorkspace/index.ts
@@ -1,10 +1,10 @@
 import { CloudWorkspaceRegistrationError } from '../../../../../lib/errors/CloudWorkspaceRegistrationError';
 import { SystemLogger } from '../../../../../server/lib/logger/system';
 import { CloudWorkspaceAccessTokenEmptyError, CloudWorkspaceAccessTokenError, isAbortError } from '../getWorkspaceAccessToken';
-import { getCachedSupportedVersionsToken } from '../supportedVersionsToken/supportedVersionsToken';
 import { announcementSync } from './announcementSync';
 import { legacySyncWorkspace } from './legacySyncWorkspace';
 import { syncCloudData } from './syncCloudData';
+import { getCachedSupportedVersionsToken } from '../supportedVersionsToken/supportedVersionsToken';
 
 /**
  * Syncs the workspace with the cloud
diff --git a/apps/meteor/app/cloud/server/functions/userLogout.ts b/apps/meteor/app/cloud/server/functions/userLogout.ts
index 386137ced604..590a581ed4f0 100644
--- a/apps/meteor/app/cloud/server/functions/userLogout.ts
+++ b/apps/meteor/app/cloud/server/functions/userLogout.ts
@@ -1,10 +1,10 @@
 import { Users } from '@rocket.chat/models';
 import { serverFetch as fetch } from '@rocket.chat/server-fetch';
 
-import { SystemLogger } from '../../../../server/lib/logger/system';
-import { settings } from '../../../settings/server';
 import { retrieveRegistrationStatus } from './retrieveRegistrationStatus';
 import { userLoggedOut } from './userLoggedOut';
+import { SystemLogger } from '../../../../server/lib/logger/system';
+import { settings } from '../../../settings/server';
 
 export async function userLogout(userId: string): Promise<string | boolean> {
 	const { workspaceRegistered } = await retrieveRegistrationStatus();
diff --git a/apps/meteor/app/cloud/server/index.ts b/apps/meteor/app/cloud/server/index.ts
index 6a82c16331c0..95c987610351 100644
--- a/apps/meteor/app/cloud/server/index.ts
+++ b/apps/meteor/app/cloud/server/index.ts
@@ -1,12 +1,12 @@
 import { cronJobs } from '@rocket.chat/cron';
 import { Meteor } from 'meteor/meteor';
 
-import { SystemLogger } from '../../../server/lib/logger/system';
 import { connectWorkspace } from './functions/connectWorkspace';
 import { CloudWorkspaceAccessTokenEmptyError, getWorkspaceAccessToken } from './functions/getWorkspaceAccessToken';
 import { getWorkspaceAccessTokenWithScope } from './functions/getWorkspaceAccessTokenWithScope';
 import { retrieveRegistrationStatus } from './functions/retrieveRegistrationStatus';
 import { syncWorkspace } from './functions/syncWorkspace';
+import { SystemLogger } from '../../../server/lib/logger/system';
 import './methods';
 
 const licenseCronName = 'Cloud Workspace Sync';
diff --git a/apps/meteor/app/cloud/server/methods.ts b/apps/meteor/app/cloud/server/methods.ts
index 29daefe0d58c..c132dbb1a48c 100644
--- a/apps/meteor/app/cloud/server/methods.ts
+++ b/apps/meteor/app/cloud/server/methods.ts
@@ -2,7 +2,6 @@ import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 
-import { hasPermissionAsync } from '../../authorization/server/functions/hasPermission';
 import { buildWorkspaceRegistrationData } from './functions/buildRegistrationData';
 import { checkUserHasCloudLogin } from './functions/checkUserHasCloudLogin';
 import { connectWorkspace } from './functions/connectWorkspace';
@@ -12,6 +11,7 @@ import { retrieveRegistrationStatus } from './functions/retrieveRegistrationStat
 import { startRegisterWorkspace } from './functions/startRegisterWorkspace';
 import { syncWorkspace } from './functions/syncWorkspace';
 import { userLogout } from './functions/userLogout';
+import { hasPermissionAsync } from '../../authorization/server/functions/hasPermission';
 
 declare module '@rocket.chat/ddp-client' {
 	// eslint-disable-next-line @typescript-eslint/naming-convention
diff --git a/apps/meteor/app/crowd/server/crowd.ts b/apps/meteor/app/crowd/server/crowd.ts
index 70f54dd7b726..3219a851c8c4 100644
--- a/apps/meteor/app/crowd/server/crowd.ts
+++ b/apps/meteor/app/crowd/server/crowd.ts
@@ -6,13 +6,13 @@ import AtlassianCrowd from 'atlassian-crowd-patched';
 import { Accounts } from 'meteor/accounts-base';
 import { Meteor } from 'meteor/meteor';
 
+import { logger } from './logger';
 import { crowdIntervalValuesToCronMap } from '../../../server/settings/crowd';
 import { deleteUser } from '../../lib/server/functions/deleteUser';
 import { _setRealName } from '../../lib/server/functions/setRealName';
 import { setUserActiveStatus } from '../../lib/server/functions/setUserActiveStatus';
 import { notifyOnUserChange, notifyOnUserChangeById, notifyOnUserChangeAsync } from '../../lib/server/lib/notifyListener';
 import { settings } from '../../settings/server';
-import { logger } from './logger';
 
 type CrowdUser = Pick<IUser, '_id' | 'username'> & { crowd: Record<string, any>; crowd_username: string };
 
diff --git a/apps/meteor/app/crowd/server/methods.ts b/apps/meteor/app/crowd/server/methods.ts
index 48faa2fcbcab..c659afc4fbf3 100644
--- a/apps/meteor/app/crowd/server/methods.ts
+++ b/apps/meteor/app/crowd/server/methods.ts
@@ -2,10 +2,10 @@ import type { ServerMethods } from '@rocket.chat/ddp-client';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import { Meteor } from 'meteor/meteor';
 
-import { hasPermissionAsync } from '../../authorization/server/functions/hasPermission';
-import { settings } from '../../settings/server';
 import { CROWD } from './crowd';
 import { logger } from './logger';
+import { hasPermissionAsync } from '../../authorization/server/functions/hasPermission';
+import { settings } from '../../settings/server';
 
 declare module '@rocket.chat/ddp-client' {
 	// eslint-disable-next-line @typescript-eslint/naming-convention
diff --git a/apps/meteor/app/custom-oauth/client/CustomOAuth.ts b/apps/meteor/app/custom-oauth/client/CustomOAuth.ts
index 1d57d1969d93..7849498fa4b9 100644
--- a/apps/meteor/app/custom-oauth/client/CustomOAuth.ts
+++ b/apps/meteor/app/custom-oauth/client/CustomOAuth.ts
@@ -27,7 +27,10 @@ export class CustomOAuth implements IOAuthProvider {
 
 	public responseType: string;
 
-	constructor(public readonly name: string, options: OauthConfig) {
+	constructor(
+		public readonly name: string,
+		options: OauthConfig,
+	) {
 		this.name = name;
 		if (!Match.test(this.name, String)) {
 			throw new Meteor.Error('CustomOAuth: Name is required and must be String');
diff --git a/apps/meteor/app/custom-oauth/server/custom_oauth_server.js b/apps/meteor/app/custom-oauth/server/custom_oauth_server.js
index a546a7c527eb..c45f3619c8aa 100644
--- a/apps/meteor/app/custom-oauth/server/custom_oauth_server.js
+++ b/apps/meteor/app/custom-oauth/server/custom_oauth_server.js
@@ -9,12 +9,12 @@ import { OAuth } from 'meteor/oauth';
 import { ServiceConfiguration } from 'meteor/service-configuration';
 import _ from 'underscore';
 
+import { normalizers, fromTemplate, renameInvalidProperties } from './transform_helpers';
 import { callbacks } from '../../../lib/callbacks';
 import { isURL } from '../../../lib/utils/isURL';
 import { notifyOnUserChange } from '../../lib/server/lib/notifyListener';
 import { registerAccessTokenService } from '../../lib/server/oauth/oauth';
 import { settings } from '../../settings/server';
-import { normalizers, fromTemplate, renameInvalidProperties } from './transform_helpers';
 
 const logger = new Logger('CustomOAuth');
 
diff --git a/apps/meteor/app/custom-sounds/server/methods/uploadCustomSound.ts b/apps/meteor/app/custom-sounds/server/methods/uploadCustomSound.ts
index f955f373ed4d..64286bb71d86 100644
--- a/apps/meteor/app/custom-sounds/server/methods/uploadCustomSound.ts
+++ b/apps/meteor/app/custom-sounds/server/methods/uploadCustomSound.ts
@@ -3,10 +3,10 @@ import type { RequiredField } from '@rocket.chat/core-typings';
 import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { Meteor } from 'meteor/meteor';
 
+import type { ICustomSoundData } from './insertOrUpdateSound';
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
 import { RocketChatFile } from '../../../file/server';
 import { RocketChatFileCustomSoundsInstance } from '../startup/custom-sounds';
-import type { ICustomSoundData } from './insertOrUpdateSound';
 
 declare module '@rocket.chat/ddp-client' {
 	// eslint-disable-next-line @typescript-eslint/naming-convention
diff --git a/apps/meteor/app/discussion/client/createDiscussionMessageAction.ts b/apps/meteor/app/discussion/client/createDiscussionMessageAction.ts
deleted file mode 100644
index ecf014248830..000000000000
--- a/apps/meteor/app/discussion/client/createDiscussionMessageAction.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-import { Tracker } from 'meteor/tracker';
-
-import CreateDiscussion from '../../../client/components/CreateDiscussion/CreateDiscussion';
-import { imperativeModal } from '../../../client/lib/imperativeModal';
-import { roomCoordinator } from '../../../client/lib/rooms/roomCoordinator';
-import { messageArgs } from '../../../client/lib/utils/messageArgs';
-import { hasPermission } from '../../authorization/client';
-import { settings } from '../../settings/client';
-import { MessageAction } from '../../ui-utils/client';
-
-Meteor.startup(() => {
-	Tracker.autorun(() => {
-		if (!settings.get('Discussion_enabled')) {
-			return MessageAction.removeButton('start-discussion');
-		}
-
-		MessageAction.addButton({
-			id: 'start-discussion',
-			icon: 'discussion',
-			label: 'Discussion_start',
-			type: 'communication',
-			context: ['message', 'message-mobile', 'videoconf'],
-			async action(_, props) {
-				const { message = messageArgs(this).msg, room } = props;
-
-				imperativeModal.open({
-					component: CreateDiscussion,
-					props: {
-						defaultParentRoom: room?.prid || room?._id,
-						onClose: imperativeModal.close,
-						parentMessageId: message._id,
-						nameSuggestion: message?.msg?.substr(0, 140),
-					},
-				});
-			},
-			condition({
-				message: {
-					u: { _id: uid },
-					drid,
-					dcount,
-				},
-				room,
-				subscription,
-				user,
-			}) {
-				if (drid || !Number.isNaN(Number(dcount))) {
-					return false;
-				}
-				if (!subscription) {
-					return false;
-				}
-				const isLivechatRoom = roomCoordinator.isLivechatRoom(room.t);
-				if (isLivechatRoom) {
-					return false;
-				}
-
-				if (!user) {
-					return false;
-				}
-
-				return uid !== user._id ? hasPermission('start-discussion-other-user', room._id) : hasPermission('start-discussion', room._id);
-			},
-			order: 1,
-			group: 'menu',
-		});
-	});
-});
diff --git a/apps/meteor/app/discussion/client/index.ts b/apps/meteor/app/discussion/client/index.ts
deleted file mode 100644
index 7c0a6f72e6cc..000000000000
--- a/apps/meteor/app/discussion/client/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-// Other UI extensions
-import './createDiscussionMessageAction';
diff --git a/apps/meteor/app/discussion/server/methods/createDiscussion.ts b/apps/meteor/app/discussion/server/methods/createDiscussion.ts
index f2b4533489d8..c4b8fb8e9a2e 100644
--- a/apps/meteor/app/discussion/server/methods/createDiscussion.ts
+++ b/apps/meteor/app/discussion/server/methods/createDiscussion.ts
@@ -3,6 +3,7 @@ import type { IMessage, IRoom, IUser, MessageAttachmentDefault } from '@rocket.c
 import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { Messages, Rooms, Users } from '@rocket.chat/models';
 import { Random } from '@rocket.chat/random';
+import { check, Match } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 
 import { i18n } from '../../../../server/lib/i18n';
@@ -246,6 +247,13 @@ Meteor.methods<ServerMethods>({
 	 * @param {boolean} encrypted - if the discussion's e2e encryption should be enabled.
 	 */
 	async createDiscussion({ prid, pmid, t_name: discussionName, reply, users, encrypted }: CreateDiscussionProperties) {
+		check(prid, Match.Maybe(String));
+		check(pmid, Match.Maybe(String));
+		check(reply, Match.Maybe(String));
+		check(discussionName, String);
+		check(users, [String]);
+		check(encrypted, Match.Maybe(Boolean));
+
 		const uid = Meteor.userId();
 		if (!uid) {
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', {
diff --git a/apps/meteor/app/dolphin/client/index.ts b/apps/meteor/app/dolphin/client/index.ts
index 0cc16f78319d..cf327e4971bb 100644
--- a/apps/meteor/app/dolphin/client/index.ts
+++ b/apps/meteor/app/dolphin/client/index.ts
@@ -1,2 +1 @@
 import './lib';
-import './login-button.css';
diff --git a/apps/meteor/app/dolphin/client/login-button.css b/apps/meteor/app/dolphin/client/login-button.css
deleted file mode 100644
index b511270b27f1..000000000000
--- a/apps/meteor/app/dolphin/client/login-button.css
+++ /dev/null
@@ -1,16 +0,0 @@
-.icon-dolphin {
-	display: inline-block;
-
-	width: 30px;
-	height: 20px;
-
-	vertical-align: middle;
-
-	background-image: url(data:image/svg+xml;base64,PHN2ZyB2aWV3Qm94PSIwIDAgNDMwIDQzMCIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4NCjxnIGlkPSJzaWduLWluIiB0cmFuc2Zvcm09Im1hdHJpeCgwLjUgMCAwIDAuNSAwIDApIj4NCjxwYXRoIGZpbGw9IiNmZmZmZmYiIGQ9Ik02NjAuNjcyIDUwMC4wMzJxMCAxNC41MDggLTEwLjYwMiAyNS4xMWwtMzAzLjU1MiAzMDMuNTUycS0xMC42MDIgMTAuNjAyIC0yNS4xMSAxMC42MDJ0LTI1LjExIC0xMC42MDIgLTEwLjYwMiAtMjUuMTF2LTE2MC43MDRoLTI0OS45ODRxLTE0LjUwOCAwIC0yNS4xMSAtMTAuNjAydC0xMC42MDIgLTI1LjExdi0yMTQuMjcycTAgLTE0LjUwOCAxMC42MDIgLTI1LjExdDI1LjExIC0xMC42MDJoMjQ5Ljk4NHYtMTYwLjcwNHEwIC0xNC41MDggMTAuNjAyIC0yNS4xMXQyNS4xMSAtMTAuNjAyIDI1LjExIDEwLjYwMmwzMDMuNTUyIDMwMy41NTJxMTAuNjAyIDEwLjYwMiAxMC42MDIgMjUuMTF6bTE5Ni40MTYgLTE5Ni40MTZ2MzkyLjgzMnEwIDY2LjQwMiAtNDcuMTUxIDExMy41NTN0LTExMy41NTMgNDcuMTUxaC0xNzguNTZxLTcuMjU0IDAgLTEyLjU1NSAtNS4zMDF0LTUuMzAxIC0xMi41NTVxMCAtMi4yMzIgLS41NTggLTExLjE2dC0uMjc5IC0xNC43ODcgMS42NzQgLTEzLjExMyA1LjU4IC0xMC44ODEgMTEuNDM5IC0zLjYyN2gxNzguNTZxMzYuODI4IDAgNjMuMDU0IC0yNi4yMjZ0MjYuMjI2IC02My4wNTR2LTM5Mi44MzJxMCAtMzYuODI4IC0yNi4yMjYgLTYzLjA1NHQtNjMuMDU0IC0yNi4yMjZoLTE3NC4wOTZ0LTYuNDE3IC0uNTU4IC02LjQxNyAtMS42NzQgLTQuNDY0IC0zLjA2OSAtMy45MDYgLTUuMDIyIC0xLjExNiAtNy41MzNxMCAtMi4yMzIgLS41NTggLTExLjE2dC0uMjc5IC0xNC43ODcgMS42NzQgLTEzLjExMyA1LjU4IC0xMC44ODEgMTEuNDM5IC0zLjYyN2gxNzguNTZxNjYuNDAyIDAgMTEzLjU1MyA0Ny4xNTF0NDcuMTUxIDExMy41NTN6Ii8+DQo8L2c+DQo8L3N2Zz4=);
-	background-repeat: no-repeat;
-}
-
-.icon-dolphin ~ .icon-spin,
-.icon-dolphin ~ span {
-	vertical-align: middle;
-}
diff --git a/apps/meteor/app/drupal/client/index.ts b/apps/meteor/app/drupal/client/index.ts
index 0cc16f78319d..cf327e4971bb 100644
--- a/apps/meteor/app/drupal/client/index.ts
+++ b/apps/meteor/app/drupal/client/index.ts
@@ -1,2 +1 @@
 import './lib';
-import './login-button.css';
diff --git a/apps/meteor/app/drupal/client/login-button.css b/apps/meteor/app/drupal/client/login-button.css
deleted file mode 100644
index 2cda29b8c62e..000000000000
--- a/apps/meteor/app/drupal/client/login-button.css
+++ /dev/null
@@ -1,13 +0,0 @@
-.icon-drupal.service-icon {
-	display: inline-block;
-
-	width: 21px;
-	height: 28px;
-
-	background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABUAAAAcCAYAAACOGPReAAAABGdBTUEAALGPC/xhBQAAAAZiS0dEAP8A/wD/oL2nkwAAAcNJREFUSMetlbFrFFEQh7/dJnhpDHcx6SyiRLhLkUKDsRZB8S9IWi2Syj8iVooQ0FLBNlqJRpNO8Br7FLkoRDBooQHhNCr6WTjB48zd7d7uNI+d+c333pt9bx5kNPVGVm1WYF39rTbKhD7zr62XBVwI4MsYF4sCZ9S2uq6mMbbVmWGBx9WW+kGdCN+J+G6pY3mBo2pT/ape6IrNx2qb6mhW4Ii6qf5Ur/TQXI74pjoyCJioa3F8FgdoF0K3pib9hLfiDy9l3NVS6G/3EiyH4GbO+q9E3nJ3oKF+Vx/33Urvkj2K/EZn4JW6l/uY/MsfU9+rzUPHXCz/+jDADvC14Myhrqpf1EpB6LHgrCbqa+BzkiSXikAD/ByopcAUsFUUGLYFTKVABWiXBG0DlRTYB8ZLgo4D+ynQAuolQevAdgq8AM6rk0Vo0R7ngQ3UU+qvvNfzCOhKcE4fOu6r39TpIYHT0XsfdDon45puq7WcwFrk7f1XQvVsdPS3Wd+geMPeRN65XqJZdVf9od5Tz/TZ7t3Q7aqzg2avqnfUg2gQO+pT9WGMO+E/CF21m5H0gU8AV4GLwEmgCnwC3gEbwJMkST4elfsHJbIReGbv9uUAAAAASUVORK5CYII=);
-	background-repeat: no-repeat;
-}
-
-.button.external-login.drupal {
-	background-color: #0f85b6;
-}
diff --git a/apps/meteor/app/e2e/client/events.js b/apps/meteor/app/e2e/client/events.ts
similarity index 83%
rename from apps/meteor/app/e2e/client/events.js
rename to apps/meteor/app/e2e/client/events.ts
index c59b20594b85..9ccef3d7b28d 100644
--- a/apps/meteor/app/e2e/client/events.js
+++ b/apps/meteor/app/e2e/client/events.ts
@@ -3,5 +3,5 @@ import { Accounts } from 'meteor/accounts-base';
 import { e2e } from './rocketchat.e2e';
 
 Accounts.onLogout(() => {
-	e2e.stopClient();
+	void e2e.stopClient();
 });
diff --git a/apps/meteor/app/e2e/client/helper.js b/apps/meteor/app/e2e/client/helper.ts
similarity index 64%
rename from apps/meteor/app/e2e/client/helper.js
rename to apps/meteor/app/e2e/client/helper.ts
index 25d9e9407801..66ca3bf1cc2e 100644
--- a/apps/meteor/app/e2e/client/helper.js
+++ b/apps/meteor/app/e2e/client/helper.ts
@@ -1,24 +1,20 @@
 import { Random } from '@rocket.chat/random';
 import ByteBuffer from 'bytebuffer';
 
-// eslint-disable-next-line no-proto
-const StaticArrayBufferProto = new ArrayBuffer().__proto__;
-
-export function toString(thing) {
+export function toString(thing: any) {
 	if (typeof thing === 'string') {
 		return thing;
 	}
-	// eslint-disable-next-line new-cap
-	return new ByteBuffer.wrap(thing).toString('binary');
+
+	return ByteBuffer.wrap(thing).toString('binary');
 }
 
-export function toArrayBuffer(thing) {
+export function toArrayBuffer(thing: any) {
 	if (thing === undefined) {
 		return undefined;
 	}
-	if (thing === Object(thing)) {
-		// eslint-disable-next-line no-proto
-		if (thing.__proto__ === StaticArrayBufferProto) {
+	if (typeof thing === 'object') {
+		if (Object.getPrototypeOf(thing) === ArrayBuffer.prototype) {
 			return thing;
 		}
 	}
@@ -26,11 +22,11 @@ export function toArrayBuffer(thing) {
 	if (typeof thing !== 'string') {
 		throw new Error(`Tried to convert a non-string of type ${typeof thing} to an array buffer`);
 	}
-	// eslint-disable-next-line new-cap
-	return new ByteBuffer.wrap(thing, 'binary').toArrayBuffer();
+
+	return ByteBuffer.wrap(thing, 'binary').toArrayBuffer();
 }
 
-export function joinVectorAndEcryptedData(vector, encryptedData) {
+export function joinVectorAndEcryptedData(vector: any, encryptedData: any) {
 	const cipherText = new Uint8Array(encryptedData);
 	const output = new Uint8Array(vector.length + cipherText.length);
 	output.set(vector, 0);
@@ -38,30 +34,30 @@ export function joinVectorAndEcryptedData(vector, encryptedData) {
 	return output;
 }
 
-export function splitVectorAndEcryptedData(cipherText) {
+export function splitVectorAndEcryptedData(cipherText: any) {
 	const vector = cipherText.slice(0, 16);
 	const encryptedData = cipherText.slice(16);
 
 	return [vector, encryptedData];
 }
 
-export async function encryptRSA(key, data) {
+export async function encryptRSA(key: any, data: any) {
 	return crypto.subtle.encrypt({ name: 'RSA-OAEP' }, key, data);
 }
 
-export async function encryptAES(vector, key, data) {
+export async function encryptAES(vector: any, key: any, data: any) {
 	return crypto.subtle.encrypt({ name: 'AES-CBC', iv: vector }, key, data);
 }
 
-export async function encryptAESCTR(vector, key, data) {
+export async function encryptAESCTR(vector: any, key: any, data: any) {
 	return crypto.subtle.encrypt({ name: 'AES-CTR', counter: vector, length: 64 }, key, data);
 }
 
-export async function decryptRSA(key, data) {
+export async function decryptRSA(key: any, data: any) {
 	return crypto.subtle.decrypt({ name: 'RSA-OAEP' }, key, data);
 }
 
-export async function decryptAES(vector, key, data) {
+export async function decryptAES(vector: any, key: any, data: any) {
 	return crypto.subtle.decrypt({ name: 'AES-CBC', iv: vector }, key, data);
 }
 
@@ -86,54 +82,54 @@ export async function generateRSAKey() {
 	);
 }
 
-export async function exportJWKKey(key) {
+export async function exportJWKKey(key: any) {
 	return crypto.subtle.exportKey('jwk', key);
 }
 
-export async function importRSAKey(keyData, keyUsages = ['encrypt', 'decrypt']) {
+export async function importRSAKey(keyData: any, keyUsages: ReadonlyArray<KeyUsage> = ['encrypt', 'decrypt']) {
 	return crypto.subtle.importKey(
-		'jwk',
+		'jwk' as any,
 		keyData,
 		{
 			name: 'RSA-OAEP',
 			modulusLength: 2048,
 			publicExponent: new Uint8Array([0x01, 0x00, 0x01]),
 			hash: { name: 'SHA-256' },
-		},
+		} as any,
 		true,
 		keyUsages,
 	);
 }
 
-export async function importAESKey(keyData, keyUsages = ['encrypt', 'decrypt']) {
+export async function importAESKey(keyData: any, keyUsages: ReadonlyArray<KeyUsage> = ['encrypt', 'decrypt']) {
 	return crypto.subtle.importKey('jwk', keyData, { name: 'AES-CBC' }, true, keyUsages);
 }
 
-export async function importRawKey(keyData, keyUsages = ['deriveKey']) {
+export async function importRawKey(keyData: any, keyUsages: ReadonlyArray<KeyUsage> = ['deriveKey']) {
 	return crypto.subtle.importKey('raw', keyData, { name: 'PBKDF2' }, false, keyUsages);
 }
 
-export async function deriveKey(salt, baseKey, keyUsages = ['encrypt', 'decrypt']) {
+export async function deriveKey(salt: any, baseKey: any, keyUsages: ReadonlyArray<KeyUsage> = ['encrypt', 'decrypt']) {
 	const iterations = 1000;
 	const hash = 'SHA-256';
 
 	return crypto.subtle.deriveKey({ name: 'PBKDF2', salt, iterations, hash }, baseKey, { name: 'AES-CBC', length: 256 }, true, keyUsages);
 }
 
-export async function readFileAsArrayBuffer(file) {
-	return new Promise((resolve, reject) => {
+export async function readFileAsArrayBuffer(file: any) {
+	return new Promise<any>((resolve, reject) => {
 		const reader = new FileReader();
-		reader.onload = function (evt) {
-			resolve(evt.target.result);
+		reader.onload = (evt) => {
+			resolve(evt.target?.result);
 		};
-		reader.onerror = function (evt) {
+		reader.onerror = (evt) => {
 			reject(evt);
 		};
 		reader.readAsArrayBuffer(file);
 	});
 }
 
-export async function generateMnemonicPhrase(n, sep = ' ') {
+export async function generateMnemonicPhrase(n: any, sep = ' ') {
 	const { default: wordList } = await import('./wordList');
 	const result = new Array(n);
 	let len = wordList.length;
@@ -147,14 +143,14 @@ export async function generateMnemonicPhrase(n, sep = ' ') {
 	return result.join(sep);
 }
 
-export async function createSha256HashFromText(data) {
+export async function createSha256HashFromText(data: any) {
 	const hash = await crypto.subtle.digest('SHA-256', new TextEncoder().encode(data));
 	return Array.from(new Uint8Array(hash))
 		.map((b) => b.toString(16).padStart(2, '0'))
 		.join('');
 }
 
-export async function sha256HashFromArrayBuffer(arrayBuffer) {
+export async function sha256HashFromArrayBuffer(arrayBuffer: any) {
 	const hashArray = Array.from(new Uint8Array(await crypto.subtle.digest('SHA-256', arrayBuffer)));
 	return hashArray.map((b) => b.toString(16).padStart(2, '0')).join('');
 }
diff --git a/apps/meteor/app/e2e/client/rocketchat.e2e.room.js b/apps/meteor/app/e2e/client/rocketchat.e2e.room.ts
similarity index 88%
rename from apps/meteor/app/e2e/client/rocketchat.e2e.room.js
rename to apps/meteor/app/e2e/client/rocketchat.e2e.room.ts
index 4c9de837dce0..dc7efb60dc14 100644
--- a/apps/meteor/app/e2e/client/rocketchat.e2e.room.js
+++ b/apps/meteor/app/e2e/client/rocketchat.e2e.room.ts
@@ -2,12 +2,6 @@ import { Base64 } from '@rocket.chat/base64';
 import { Emitter } from '@rocket.chat/emitter';
 import EJSON from 'ejson';
 
-import { RoomManager } from '../../../client/lib/RoomManager';
-import { roomCoordinator } from '../../../client/lib/rooms/roomCoordinator';
-import { RoomSettingsEnum } from '../../../definition/IRoomTypeConfig';
-import { ChatRoom, Subscriptions, Messages } from '../../models/client';
-import { sdk } from '../../utils/client/lib/SDKClient';
-import { t } from '../../utils/lib/i18n';
 import { E2ERoomState } from './E2ERoomState';
 import {
 	toString,
@@ -30,11 +24,17 @@ import {
 } from './helper';
 import { log, logError } from './logger';
 import { e2e } from './rocketchat.e2e';
+import { RoomManager } from '../../../client/lib/RoomManager';
+import { roomCoordinator } from '../../../client/lib/rooms/roomCoordinator';
+import { RoomSettingsEnum } from '../../../definition/IRoomTypeConfig';
+import { Rooms, Subscriptions, Messages } from '../../models/client';
+import { sdk } from '../../utils/client/lib/SDKClient';
+import { t } from '../../utils/lib/i18n';
 
 const KEY_ID = Symbol('keyID');
 const PAUSED = Symbol('PAUSED');
 
-const permitedMutations = {
+const permitedMutations: any = {
 	[E2ERoomState.NOT_STARTED]: [E2ERoomState.ESTABLISHING, E2ERoomState.DISABLED, E2ERoomState.KEYS_RECEIVED],
 	[E2ERoomState.READY]: [E2ERoomState.DISABLED, E2ERoomState.CREATING_KEYS, E2ERoomState.WAITING_KEYS],
 	[E2ERoomState.ERROR]: [E2ERoomState.KEYS_RECEIVED, E2ERoomState.NOT_STARTED],
@@ -49,7 +49,7 @@ const permitedMutations = {
 	],
 };
 
-const filterMutation = (currentState, nextState) => {
+const filterMutation = (currentState: any, nextState: any): any => {
 	if (currentState === nextState) {
 		return nextState === E2ERoomState.ERROR;
 	}
@@ -66,11 +66,29 @@ const filterMutation = (currentState, nextState) => {
 };
 
 export class E2ERoom extends Emitter {
-	state = undefined;
+	state: any = undefined;
 
-	[PAUSED] = undefined;
+	[PAUSED]: boolean | undefined = undefined;
 
-	constructor(userId, room) {
+	[KEY_ID]: any;
+
+	userId: any;
+
+	roomId: any;
+
+	typeOfRoom: any;
+
+	roomKeyId: any;
+
+	groupSessionKey: any;
+
+	oldKeys: any;
+
+	sessionKeyExportedString: string | undefined;
+
+	sessionKeyExported: any;
+
+	constructor(userId: any, room: any) {
 		super();
 
 		this.userId = userId;
@@ -93,11 +111,11 @@ export class E2ERoom extends Emitter {
 		this.setState(E2ERoomState.NOT_STARTED);
 	}
 
-	log(...msg) {
+	log(...msg: unknown[]) {
 		log(`E2E ROOM { state: ${this.state}, rid: ${this.roomId} }`, ...msg);
 	}
 
-	error(...msg) {
+	error(...msg: unknown[]) {
 		logError(`E2E ROOM { state: ${this.state}, rid: ${this.roomId} }`, ...msg);
 	}
 
@@ -109,7 +127,7 @@ export class E2ERoom extends Emitter {
 		return this.state;
 	}
 
-	setState(requestedState) {
+	setState(requestedState: any) {
 		const currentState = this.state;
 		const nextState = filterMutation(currentState, requestedState);
 
@@ -120,7 +138,7 @@ export class E2ERoom extends Emitter {
 
 		this.state = nextState;
 		this.log(currentState, '->', nextState);
-		this.emit('STATE_CHANGED', currentState, nextState, this);
+		this.emit('STATE_CHANGED', currentState);
 		this.emit(nextState, this);
 	}
 
@@ -160,7 +178,7 @@ export class E2ERoom extends Emitter {
 		this.setState(E2ERoomState.KEYS_RECEIVED);
 	}
 
-	async shouldConvertSentMessages(message) {
+	async shouldConvertSentMessages(message: any) {
 		if (!this.isReady() || this[PAUSED]) {
 			return false;
 		}
@@ -197,7 +215,7 @@ export class E2ERoom extends Emitter {
 	async decryptSubscription() {
 		const subscription = Subscriptions.findOne({ rid: this.roomId });
 
-		if (subscription.lastMessage?.t !== 'e2e') {
+		if (subscription?.lastMessage?.t !== 'e2e') {
 			this.log('decryptSubscriptions nothing to do');
 			return;
 		}
@@ -245,7 +263,7 @@ export class E2ERoom extends Emitter {
 		this.log('decryptOldRoomKeys Done');
 	}
 
-	async exportOldRoomKeys(oldKeys) {
+	async exportOldRoomKeys(oldKeys: any) {
 		this.log('exportOldRoomKeys starting');
 		if (!oldKeys || oldKeys.length === 0) {
 			this.log('exportOldRoomKeys nothing to do');
@@ -294,7 +312,7 @@ export class E2ERoom extends Emitter {
 		this.setState(E2ERoomState.ESTABLISHING);
 
 		try {
-			const groupKey = Subscriptions.findOne({ rid: this.roomId }).E2EKey;
+			const groupKey = Subscriptions.findOne({ rid: this.roomId })?.E2EKey;
 			if (groupKey) {
 				await this.importGroupKey(groupKey);
 				this.setState(E2ERoomState.READY);
@@ -307,7 +325,7 @@ export class E2ERoom extends Emitter {
 		}
 
 		try {
-			const room = ChatRoom.findOne({ _id: this.roomId });
+			const room = Rooms.findOne({ _id: this.roomId })!;
 			// Only room creator can set keys for room
 			if (!room.e2eKeyId && this.userShouldCreateKeys(room)) {
 				this.setState(E2ERoomState.CREATING_KEYS);
@@ -325,7 +343,7 @@ export class E2ERoom extends Emitter {
 		}
 	}
 
-	userShouldCreateKeys(room) {
+	userShouldCreateKeys(room: any) {
 		// On DMs, we'll allow any user to set the keys
 		if (room.t === 'd') {
 			return true;
@@ -334,15 +352,15 @@ export class E2ERoom extends Emitter {
 		return room.u._id === this.userId;
 	}
 
-	isSupportedRoomType(type) {
+	isSupportedRoomType(type: any) {
 		return roomCoordinator.getRoomDirectives(type).allowRoomSettingChange({}, RoomSettingsEnum.E2E);
 	}
 
-	async decryptSessionKey(key) {
+	async decryptSessionKey(key: any) {
 		return importAESKey(JSON.parse(await this.exportSessionKey(key)));
 	}
 
-	async exportSessionKey(key) {
+	async exportSessionKey(key: any) {
 		key = key.slice(12);
 		key = Base64.decode(key);
 
@@ -350,7 +368,7 @@ export class E2ERoom extends Emitter {
 		return toString(decryptedKey);
 	}
 
-	async importGroupKey(groupKey) {
+	async importGroupKey(groupKey: any) {
 		this.log('Importing room key ->', this.roomId);
 		// Get existing group key
 		// const keyID = groupKey.slice(0, 12);
@@ -374,7 +392,7 @@ export class E2ERoom extends Emitter {
 
 		// Import session key for use.
 		try {
-			const key = await importAESKey(JSON.parse(this.sessionKeyExportedString));
+			const key = await importAESKey(JSON.parse(this.sessionKeyExportedString!));
 			// Key has been obtained. E2E is now in session.
 			this.groupSessionKey = key;
 		} catch (error) {
@@ -402,8 +420,8 @@ export class E2ERoom extends Emitter {
 			await sdk.rest.post('/v1/e2e.updateGroupKey', {
 				rid: this.roomId,
 				uid: this.userId,
-				key: await this.encryptGroupKeyForParticipant(e2e.publicKey),
-			});
+				key: await this.encryptGroupKeyForParticipant(e2e.publicKey!),
+			} as any);
 			await this.encryptKeyForOtherParticipants();
 		} catch (error) {
 			this.error('Error exporting group key: ', error);
@@ -434,7 +452,7 @@ export class E2ERoom extends Emitter {
 		}
 	}
 
-	onRoomKeyReset(keyID) {
+	onRoomKeyReset(keyID: any) {
 		this.log(`Room keyID was reset. New keyID: ${keyID} Previous keyID: ${this.keyID}`);
 		this.setState(E2ERoomState.WAITING_KEYS);
 		this.keyID = keyID;
@@ -455,10 +473,10 @@ export class E2ERoom extends Emitter {
 				return;
 			}
 
-			const usersSuggestedGroupKeys = { [this.roomId]: [] };
+			const usersSuggestedGroupKeys = { [this.roomId]: [] as any[] };
 			for await (const user of users) {
-				const encryptedGroupKey = await this.encryptGroupKeyForParticipant(user.e2e.public_key);
-				const oldKeys = await this.encryptOldKeysForParticipant(user.e2e.public_key, decryptedOldGroupKeys);
+				const encryptedGroupKey = await this.encryptGroupKeyForParticipant(user.e2e!.public_key!);
+				const oldKeys = await this.encryptOldKeysForParticipant(user.e2e?.public_key, decryptedOldGroupKeys);
 
 				usersSuggestedGroupKeys[this.roomId].push({ _id: user._id, key: encryptedGroupKey, ...(oldKeys && { oldKeys }) });
 			}
@@ -469,7 +487,7 @@ export class E2ERoom extends Emitter {
 		}
 	}
 
-	async encryptOldKeysForParticipant(public_key, oldRoomKeys) {
+	async encryptOldKeysForParticipant(publicKey: any, oldRoomKeys: any) {
 		if (!oldRoomKeys || oldRoomKeys.length === 0) {
 			return;
 		}
@@ -477,7 +495,7 @@ export class E2ERoom extends Emitter {
 		let userKey;
 
 		try {
-			userKey = await importRSAKey(JSON.parse(public_key), ['encrypt']);
+			userKey = await importRSAKey(JSON.parse(publicKey), ['encrypt']);
 		} catch (error) {
 			return this.error('Error importing user key: ', error);
 		}
@@ -499,10 +517,10 @@ export class E2ERoom extends Emitter {
 		}
 	}
 
-	async encryptGroupKeyForParticipant(public_key) {
+	async encryptGroupKeyForParticipant(publicKey: string) {
 		let userKey;
 		try {
-			userKey = await importRSAKey(JSON.parse(public_key), ['encrypt']);
+			userKey = await importRSAKey(JSON.parse(publicKey), ['encrypt']);
 		} catch (error) {
 			return this.error('Error importing user key: ', error);
 		}
@@ -519,7 +537,7 @@ export class E2ERoom extends Emitter {
 	}
 
 	// Encrypts files before upload. I/O is in arraybuffers.
-	async encryptFile(file) {
+	async encryptFile(file: any) {
 		// if (!this.isSupportedRoomType(this.typeOfRoom)) {
 		// 	return;
 		// }
@@ -554,7 +572,7 @@ export class E2ERoom extends Emitter {
 	}
 
 	// Decrypt uploaded encrypted files. I/O is in arraybuffers.
-	async decryptFile(file, key, iv) {
+	async decryptFile(file: any, key: any, iv: any) {
 		const ivArray = Base64.decode(iv);
 		const cryptoKey = await window.crypto.subtle.importKey('jwk', key, { name: 'AES-CTR' }, true, ['encrypt', 'decrypt']);
 
@@ -562,7 +580,7 @@ export class E2ERoom extends Emitter {
 	}
 
 	// Encrypts messages
-	async encryptText(data) {
+	async encryptText(data: any) {
 		const vector = crypto.getRandomValues(new Uint8Array(16));
 
 		try {
@@ -575,7 +593,7 @@ export class E2ERoom extends Emitter {
 	}
 
 	// Helper function for encryption of content
-	async encryptMessageContent(contentToBeEncrypted) {
+	async encryptMessageContent(contentToBeEncrypted: any) {
 		const data = new TextEncoder().encode(EJSON.stringify(contentToBeEncrypted));
 
 		return {
@@ -585,7 +603,7 @@ export class E2ERoom extends Emitter {
 	}
 
 	// Helper function for encryption of content
-	async encryptMessage(message) {
+	async encryptMessage(message: any) {
 		const { msg, attachments, ...rest } = message;
 
 		const content = await this.encryptMessageContent({ msg, attachments });
@@ -599,7 +617,7 @@ export class E2ERoom extends Emitter {
 	}
 
 	// Helper function for encryption of messages
-	encrypt(message) {
+	encrypt(message: any) {
 		if (!this.isSupportedRoomType(this.typeOfRoom)) {
 			return;
 		}
@@ -610,7 +628,7 @@ export class E2ERoom extends Emitter {
 
 		const ts = new Date();
 
-		const data = new TextEncoder('UTF-8').encode(
+		const data = new TextEncoder().encode(
 			EJSON.stringify({
 				_id: message._id,
 				text: message.msg,
@@ -622,7 +640,7 @@ export class E2ERoom extends Emitter {
 		return this.encryptText(data);
 	}
 
-	async decryptContent(data) {
+	async decryptContent(data: any) {
 		if (data.content && data.content.algorithm === 'rc.v1.aes-sha2') {
 			const content = await this.decrypt(data.content.ciphertext);
 			Object.assign(data, content);
@@ -632,7 +650,7 @@ export class E2ERoom extends Emitter {
 	}
 
 	// Decrypt messages
-	async decryptMessage(message) {
+	async decryptMessage(message: any) {
 		if (message.t !== 'e2e' || message.e2e === 'done') {
 			return message;
 		}
@@ -653,12 +671,12 @@ export class E2ERoom extends Emitter {
 		};
 	}
 
-	async doDecrypt(vector, key, cipherText) {
+	async doDecrypt(vector: any, key: any, cipherText: any) {
 		const result = await decryptAES(vector, key, cipherText);
 		return EJSON.parse(new TextDecoder('UTF-8').decode(new Uint8Array(result)));
 	}
 
-	async decrypt(message) {
+	async decrypt(message: any) {
 		const keyID = message.slice(0, 12);
 		message = message.slice(12);
 
@@ -666,7 +684,7 @@ export class E2ERoom extends Emitter {
 
 		let oldKey = '';
 		if (keyID !== this.keyID) {
-			const oldRoomKey = this.oldKeys?.find((key) => key.e2eKeyId === keyID);
+			const oldRoomKey = this.oldKeys?.find((key: any) => key.e2eKeyId === keyID);
 			// Messages already contain a keyID stored with them
 			// That means that if we cannot find a keyID for the key the message has preppended to
 			// The message is indecipherable.
@@ -691,21 +709,21 @@ export class E2ERoom extends Emitter {
 		}
 	}
 
-	provideKeyToUser(keyId) {
+	provideKeyToUser(keyId: any) {
 		if (this.keyID !== keyId) {
 			return;
 		}
 
-		this.encryptKeyForOtherParticipants();
+		void this.encryptKeyForOtherParticipants();
 		this.setState(E2ERoomState.READY);
 	}
 
-	onStateChange(cb) {
+	onStateChange(cb: any) {
 		this.on('STATE_CHANGED', cb);
 		return () => this.off('STATE_CHANGED', cb);
 	}
 
-	async encryptGroupKeyForParticipantsWaitingForTheKeys(users) {
+	async encryptGroupKeyForParticipantsWaitingForTheKeys(users: any[]) {
 		if (!this.isReady()) {
 			return;
 		}
diff --git a/apps/meteor/app/e2e/client/rocketchat.e2e.ts b/apps/meteor/app/e2e/client/rocketchat.e2e.ts
index 3b2fd01621e4..38df2ba1bc34 100644
--- a/apps/meteor/app/e2e/client/rocketchat.e2e.ts
+++ b/apps/meteor/app/e2e/client/rocketchat.e2e.ts
@@ -10,22 +10,6 @@ import { Accounts } from 'meteor/accounts-base';
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 
-import * as banners from '../../../client/lib/banners';
-import type { LegacyBannerPayload } from '../../../client/lib/banners';
-import { imperativeModal } from '../../../client/lib/imperativeModal';
-import { dispatchToastMessage } from '../../../client/lib/toast';
-import { mapMessageFromApi } from '../../../client/lib/utils/mapMessageFromApi';
-import { waitUntilFind } from '../../../client/lib/utils/waitUntilFind';
-import EnterE2EPasswordModal from '../../../client/views/e2e/EnterE2EPasswordModal';
-import SaveE2EPasswordModal from '../../../client/views/e2e/SaveE2EPasswordModal';
-import { createQuoteAttachment } from '../../../lib/createQuoteAttachment';
-import { getMessageUrlRegex } from '../../../lib/getMessageUrlRegex';
-import { isTruthy } from '../../../lib/isTruthy';
-import { ChatRoom, Subscriptions, Messages } from '../../models/client';
-import { settings } from '../../settings/client';
-import { getUserAvatarURL } from '../../utils/client';
-import { sdk } from '../../utils/client/lib/SDKClient';
-import { t } from '../../utils/lib/i18n';
 import { E2EEState } from './E2EEState';
 import {
 	toString,
@@ -43,8 +27,24 @@ import {
 } from './helper';
 import { log, logError } from './logger';
 import { E2ERoom } from './rocketchat.e2e.room';
+import * as banners from '../../../client/lib/banners';
+import type { LegacyBannerPayload } from '../../../client/lib/banners';
+import { imperativeModal } from '../../../client/lib/imperativeModal';
+import { dispatchToastMessage } from '../../../client/lib/toast';
+import { mapMessageFromApi } from '../../../client/lib/utils/mapMessageFromApi';
+import { waitUntilFind } from '../../../client/lib/utils/waitUntilFind';
+import EnterE2EPasswordModal from '../../../client/views/e2e/EnterE2EPasswordModal';
+import SaveE2EPasswordModal from '../../../client/views/e2e/SaveE2EPasswordModal';
+import { createQuoteAttachment } from '../../../lib/createQuoteAttachment';
+import { getMessageUrlRegex } from '../../../lib/getMessageUrlRegex';
+import { isTruthy } from '../../../lib/isTruthy';
+import { Rooms, Subscriptions, Messages } from '../../models/client';
+import { settings } from '../../settings/client';
+import { getUserAvatarURL } from '../../utils/client';
+import { sdk } from '../../utils/client/lib/SDKClient';
+import { t } from '../../utils/lib/i18n';
 
-import './events.js';
+import './events';
 
 let failedToDecodeKey = false;
 
@@ -254,7 +254,7 @@ class E2E extends Emitter {
 	}
 
 	async getInstanceByRoomId(rid: IRoom['_id']): Promise<E2ERoom | null> {
-		const room = await waitUntilFind(() => ChatRoom.findOne({ _id: rid }));
+		const room = await waitUntilFind(() => Rooms.findOne({ _id: rid }));
 
 		if (room.t !== 'd' && room.t !== 'p') {
 			return null;
@@ -835,7 +835,7 @@ class E2E extends Emitter {
 		}
 
 		const keyDistribution = async () => {
-			const roomIds = ChatRoom.find({
+			const roomIds = Rooms.find({
 				'usersWaitingForE2EKeys': { $exists: true },
 				'usersWaitingForE2EKeys.userId': { $ne: Meteor.userId() },
 			}).map((room) => room._id);
diff --git a/apps/meteor/app/emoji-custom/client/lib/emojiCustom.js b/apps/meteor/app/emoji-custom/client/lib/emojiCustom.ts
similarity index 57%
rename from apps/meteor/app/emoji-custom/client/lib/emojiCustom.js
rename to apps/meteor/app/emoji-custom/client/lib/emojiCustom.ts
index 64f1df9bd932..8b24cd0c29c7 100644
--- a/apps/meteor/app/emoji-custom/client/lib/emojiCustom.js
+++ b/apps/meteor/app/emoji-custom/client/lib/emojiCustom.ts
@@ -1,57 +1,63 @@
+import type { IEmoji } from '@rocket.chat/core-typings';
 import { escapeRegExp } from '@rocket.chat/string-helpers';
 import { Meteor } from 'meteor/meteor';
-import { Session } from 'meteor/session';
 
-import { emoji, updateRecent } from '../../../emoji/client';
-import { CachedCollectionManager } from '../../../ui-cached-collection/client';
+import { onLoggedIn } from '../../../../client/lib/loggedIn';
+import { emoji, removeFromRecent, replaceEmojiInRecent } from '../../../emoji/client';
 import { getURL } from '../../../utils/client';
 import { sdk } from '../../../utils/client/lib/SDKClient';
-import { isSetNotNull } from './function-isSet';
 
-export const getEmojiUrlFromName = function (name, extension) {
-	if (name == null) {
-		return;
+const isSetNotNull = (fn: () => unknown) => {
+	let value;
+	try {
+		value = fn();
+	} catch (e) {
+		value = null;
 	}
+	return value !== null && value !== undefined;
+};
 
-	const key = `emoji_random_${name}`;
-
-	const random = isSetNotNull(() => Session.keys[key]) ? Session.keys[key] : 0;
+const getEmojiUrlFromName = (name: string, extension: string, etag?: string) => {
+	if (!name) {
+		return;
+	}
 
-	return getURL(`/emoji-custom/${encodeURIComponent(name)}.${extension}?_dc=${random}`);
+	return getURL(`/emoji-custom/${encodeURIComponent(name)}.${extension}${etag ? `?etag=${etag}` : ''}`);
 };
 
-export const deleteEmojiCustom = function (emojiData) {
+export const deleteEmojiCustom = (emojiData: IEmoji) => {
 	delete emoji.list[`:${emojiData.name}:`];
 	const arrayIndex = emoji.packages.emojiCustom.emojisByCategory.rocket.indexOf(emojiData.name);
 	if (arrayIndex !== -1) {
 		emoji.packages.emojiCustom.emojisByCategory.rocket.splice(arrayIndex, 1);
 	}
-	const arrayIndexList = emoji.packages.emojiCustom.list.indexOf(`:${emojiData.name}:`);
+	const arrayIndexList = emoji.packages.emojiCustom.list?.indexOf(`:${emojiData.name}:`) ?? -1;
 	if (arrayIndexList !== -1) {
-		emoji.packages.emojiCustom.list.splice(arrayIndexList, 1);
+		emoji.packages.emojiCustom.list?.splice(arrayIndexList, 1);
 	}
-	if (isSetNotNull(() => emojiData.aliases)) {
+	if (emojiData.aliases) {
 		for (const alias of emojiData.aliases) {
 			delete emoji.list[`:${alias}:`];
-			const aliasIndex = emoji.packages.emojiCustom.list.indexOf(`:${alias}:`);
+			const aliasIndex = emoji.packages.emojiCustom.list?.indexOf(`:${alias}:`) ?? -1;
 			if (aliasIndex !== -1) {
-				emoji.packages.emojiCustom.list.splice(aliasIndex, 1);
+				emoji.packages.emojiCustom.list?.splice(aliasIndex, 1);
 			}
 		}
 	}
-	updateRecent('rocket');
+
+	removeFromRecent(emojiData.name, emoji.packages.base.emojisByCategory.recent);
 };
 
-export const updateEmojiCustom = function (emojiData) {
+export const updateEmojiCustom = (emojiData: IEmoji) => {
 	const previousExists = isSetNotNull(() => emojiData.previousName);
 	const currentAliases = isSetNotNull(() => emojiData.aliases);
 
 	if (previousExists && isSetNotNull(() => emoji.list[`:${emojiData.previousName}:`].aliases)) {
-		for (const alias of emoji.list[`:${emojiData.previousName}:`].aliases) {
+		for (const alias of emoji.list[`:${emojiData.previousName}:`].aliases ?? []) {
 			delete emoji.list[`:${alias}:`];
-			const aliasIndex = emoji.packages.emojiCustom.list.indexOf(`:${alias}:`);
+			const aliasIndex = emoji.packages.emojiCustom.list?.indexOf(`:${alias}:`) ?? -1;
 			if (aliasIndex !== -1) {
-				emoji.packages.emojiCustom.list.splice(aliasIndex, 1);
+				emoji.packages.emojiCustom.list?.splice(aliasIndex, 1);
 			}
 		}
 	}
@@ -61,9 +67,9 @@ export const updateEmojiCustom = function (emojiData) {
 		if (arrayIndex !== -1) {
 			emoji.packages.emojiCustom.emojisByCategory.rocket.splice(arrayIndex, 1);
 		}
-		const arrayIndexList = emoji.packages.emojiCustom.list.indexOf(`:${emojiData.previousName}:`);
+		const arrayIndexList = emoji.packages.emojiCustom.list?.indexOf(`:${emojiData.previousName}:`) ?? -1;
 		if (arrayIndexList !== -1) {
-			emoji.packages.emojiCustom.list.splice(arrayIndexList, 1);
+			emoji.packages.emojiCustom.list?.splice(arrayIndexList, 1);
 		}
 		delete emoji.list[`:${emojiData.previousName}:`];
 	}
@@ -71,23 +77,26 @@ export const updateEmojiCustom = function (emojiData) {
 	const categoryIndex = emoji.packages.emojiCustom.emojisByCategory.rocket.indexOf(`${emojiData.name}`);
 	if (categoryIndex === -1) {
 		emoji.packages.emojiCustom.emojisByCategory.rocket.push(`${emojiData.name}`);
-		emoji.packages.emojiCustom.list.push(`:${emojiData.name}:`);
+		emoji.packages.emojiCustom.list?.push(`:${emojiData.name}:`);
 	}
 	emoji.list[`:${emojiData.name}:`] = Object.assign({ emojiPackage: 'emojiCustom' }, emoji.list[`:${emojiData.name}:`], emojiData);
 	if (currentAliases) {
 		for (const alias of emojiData.aliases) {
-			emoji.packages.emojiCustom.list.push(`:${alias}:`);
-			emoji.list[`:${alias}:`] = {};
-			emoji.list[`:${alias}:`].emojiPackage = 'emojiCustom';
-			emoji.list[`:${alias}:`].aliasOf = emojiData.name;
+			emoji.packages.emojiCustom.list?.push(`:${alias}:`);
+			emoji.list[`:${alias}:`] = {
+				emojiPackage: 'emojiCustom',
+				aliasOf: emojiData.name,
+			};
 		}
 	}
 
-	updateRecent('rocket');
+	if (previousExists) {
+		replaceEmojiInRecent({ oldEmoji: emojiData.previousName, newEmoji: emojiData.name });
+	}
 };
 
-const customRender = (html) => {
-	const emojisMatchGroup = emoji.packages.emojiCustom.list.map(escapeRegExp).join('|');
+const customRender = (html: string) => {
+	const emojisMatchGroup = emoji.packages.emojiCustom.list?.map(escapeRegExp).join('|');
 	if (emojisMatchGroup !== emoji.packages.emojiCustom._regexpSignature) {
 		emoji.packages.emojiCustom._regexpSignature = emojisMatchGroup;
 		emoji.packages.emojiCustom._regexp = new RegExp(
@@ -96,22 +105,23 @@ const customRender = (html) => {
 		);
 	}
 
-	html = html.replace(emoji.packages.emojiCustom._regexp, (shortname) => {
-		if (typeof shortname === 'undefined' || shortname === '' || emoji.packages.emojiCustom.list.indexOf(shortname) === -1) {
+	html = html.replace(emoji.packages.emojiCustom._regexp!, (shortname) => {
+		if (typeof shortname === 'undefined' || shortname === '' || (emoji.packages.emojiCustom.list?.indexOf(shortname) ?? -1) === -1) {
 			return shortname;
 		}
 
 		let emojiAlias = shortname.replace(/:/g, '');
 
 		let dataCheck = emoji.list[shortname];
-		if (dataCheck.hasOwnProperty('aliasOf')) {
+		if (dataCheck.aliasOf) {
 			emojiAlias = dataCheck.aliasOf;
 			dataCheck = emoji.list[`:${emojiAlias}:`];
 		}
 
 		return `<span class="emoji" style="background-image:url(${getEmojiUrlFromName(
 			emojiAlias,
-			dataCheck.extension,
+			dataCheck.extension!,
+			dataCheck.etag,
 		)});" data-emoji="${emojiAlias}" title="${shortname}">${shortname}</span>`;
 	});
 
@@ -125,26 +135,25 @@ emoji.packages.emojiCustom = {
 	list: [],
 	_regexpSignature: null,
 	_regexp: null,
-
+	emojisByCategory: {},
 	render: customRender,
 	renderPicker: customRender,
 };
 
-Meteor.startup(() =>
-	CachedCollectionManager.onLogin(async () => {
+Meteor.startup(() => {
+	onLoggedIn(async () => {
 		try {
 			const {
 				emojis: { update: emojis },
-			} = await sdk.rest.get('/v1/emoji-custom.list');
+			} = await sdk.rest.get('/v1/emoji-custom.list', { query: '' });
 
 			emoji.packages.emojiCustom.emojisByCategory = { rocket: [] };
 			for (const currentEmoji of emojis) {
 				emoji.packages.emojiCustom.emojisByCategory.rocket.push(currentEmoji.name);
-				emoji.packages.emojiCustom.list.push(`:${currentEmoji.name}:`);
-				emoji.list[`:${currentEmoji.name}:`] = currentEmoji;
-				emoji.list[`:${currentEmoji.name}:`].emojiPackage = 'emojiCustom';
+				emoji.packages.emojiCustom.list?.push(`:${currentEmoji.name}:`);
+				emoji.list[`:${currentEmoji.name}:`] = { ...currentEmoji, emojiPackage: 'emojiCustom' } as any;
 				for (const alias of currentEmoji.aliases) {
-					emoji.packages.emojiCustom.list.push(`:${alias}:`);
+					emoji.packages.emojiCustom.list?.push(`:${alias}:`);
 					emoji.list[`:${alias}:`] = {
 						emojiPackage: 'emojiCustom',
 						aliasOf: currentEmoji.name,
@@ -154,5 +163,5 @@ Meteor.startup(() =>
 		} catch (e) {
 			console.error('Error getting custom emoji', e);
 		}
-	}),
-);
+	});
+});
diff --git a/apps/meteor/app/emoji-custom/client/lib/function-isSet.js b/apps/meteor/app/emoji-custom/client/lib/function-isSet.js
deleted file mode 100644
index 0ccf1abe02ab..000000000000
--- a/apps/meteor/app/emoji-custom/client/lib/function-isSet.js
+++ /dev/null
@@ -1,9 +0,0 @@
-export const isSetNotNull = function (fn) {
-	let value;
-	try {
-		value = fn();
-	} catch (e) {
-		value = null;
-	}
-	return value !== null && value !== undefined;
-};
diff --git a/apps/meteor/app/emoji-custom/server/lib/insertOrUpdateEmoji.ts b/apps/meteor/app/emoji-custom/server/lib/insertOrUpdateEmoji.ts
index 7e838baee9b0..85a9648cf6d9 100644
--- a/apps/meteor/app/emoji-custom/server/lib/insertOrUpdateEmoji.ts
+++ b/apps/meteor/app/emoji-custom/server/lib/insertOrUpdateEmoji.ts
@@ -2,16 +2,15 @@ import { api } from '@rocket.chat/core-services';
 import { EmojiCustom } from '@rocket.chat/models';
 import limax from 'limax';
 import { Meteor } from 'meteor/meteor';
-import _ from 'underscore';
 
 import { trim } from '../../../../lib/utils/stringUtils';
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
 import { RocketChatFileEmojiCustomInstance } from '../startup/emoji-custom';
 
-type EmojiData = {
+export type EmojiData = {
 	_id?: string;
 	name: string;
-	aliases: string;
+	aliases?: string;
 	extension: string;
 	previousName?: string;
 	previousExtension?: string;
@@ -33,7 +32,6 @@ export async function insertOrUpdateEmoji(userId: string | null, emojiData: Emoj
 	}
 
 	emojiData.name = limax(emojiData.name, { replacement: '_' });
-	emojiData.aliases = limax(emojiData.aliases, { replacement: '_' });
 
 	// allow all characters except colon, whitespace, comma, >, <, &, ", ', /, \, (, )
 	// more practical than allowing specific sets of characters; also allows foreign languages
@@ -42,7 +40,7 @@ export async function insertOrUpdateEmoji(userId: string | null, emojiData: Emoj
 
 	// silently strip colon; this allows for uploading :emojiname: as emojiname
 	emojiData.name = emojiData.name.replace(/:/g, '');
-	emojiData.aliases = emojiData.aliases.replace(/:/g, '');
+	emojiData.aliases = emojiData.aliases?.replace(/:/g, '');
 
 	if (nameValidation.test(emojiData.name)) {
 		throw new Meteor.Error('error-input-is-not-a-valid-field', `${emojiData.name} is not a valid name`, {
@@ -61,7 +59,11 @@ export async function insertOrUpdateEmoji(userId: string | null, emojiData: Emoj
 				field: 'Alias_Set',
 			});
 		}
-		aliases = _.without(emojiData.aliases.split(/[\s,]/).filter(Boolean), emojiData.name);
+		aliases = emojiData.aliases
+			.split(/\s*,\s*/)
+			.filter(Boolean)
+			.map((alias) => limax(alias, { replacement: '_' }))
+			.filter((alias) => alias !== emojiData.name);
 	}
 
 	emojiData.extension = emojiData.extension === 'svg+xml' ? 'png' : emojiData.extension;
@@ -119,7 +121,8 @@ export async function insertOrUpdateEmoji(userId: string | null, emojiData: Emoj
 		const rs = await RocketChatFileEmojiCustomInstance.getFileWithReadStream(
 			encodeURIComponent(`${emojiData.previousName}.${emojiData.previousExtension}`),
 		);
-		if (rs !== null) {
+
+		if (rs) {
 			await RocketChatFileEmojiCustomInstance.deleteFile(encodeURIComponent(`${emojiData.name}.${emojiData.extension}`));
 			const ws = RocketChatFileEmojiCustomInstance.createWriteStream(
 				encodeURIComponent(`${emojiData.name}.${emojiData.previousExtension}`),
diff --git a/apps/meteor/app/emoji-custom/server/lib/uploadEmojiCustom.ts b/apps/meteor/app/emoji-custom/server/lib/uploadEmojiCustom.ts
index 07633eaa1a7d..cfa887c4a441 100644
--- a/apps/meteor/app/emoji-custom/server/lib/uploadEmojiCustom.ts
+++ b/apps/meteor/app/emoji-custom/server/lib/uploadEmojiCustom.ts
@@ -1,8 +1,11 @@
 import { api, Media } from '@rocket.chat/core-services';
+import { EmojiCustom } from '@rocket.chat/models';
+import { Random } from '@rocket.chat/random';
 import limax from 'limax';
 import { Meteor } from 'meteor/meteor';
 import sharp from 'sharp';
 
+import type { EmojiData } from './insertOrUpdateEmoji';
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
 import { RocketChatFile } from '../../../file/server';
 import { RocketChatFileEmojiCustomInstance } from '../startup/emoji-custom';
@@ -15,17 +18,14 @@ const getFile = async (file: Buffer, extension: string) => {
 	return sharp(file).png().toBuffer();
 };
 
-type EmojiData = {
-	_id?: string;
-	name: string;
-	aliases?: string | string[];
-	extension: string;
-	previousName?: string;
-	previousExtension?: string;
-	newFile?: boolean;
-};
+export type EmojiDataWithAliases = Omit<EmojiData, 'aliases'> & { aliases?: string | string[] };
 
-export async function uploadEmojiCustom(userId: string | null, binaryContent: string, contentType: string, emojiData: EmojiData) {
+export async function uploadEmojiCustom(
+	userId: string | null,
+	binaryContent: string,
+	contentType: string,
+	emojiData: EmojiDataWithAliases,
+) {
 	return uploadEmojiCustomWithBuffer(userId, Buffer.from(binaryContent, 'binary'), contentType, emojiData);
 }
 
@@ -33,7 +33,7 @@ export async function uploadEmojiCustomWithBuffer(
 	userId: string | null,
 	buffer: Buffer,
 	contentType: string,
-	emojiData: EmojiData,
+	emojiData: EmojiDataWithAliases,
 ): Promise<void> {
 	// technically, since this method doesnt have any datatype validations, users can
 	// upload videos as emojis. The FE won't play them, but they will waste space for sure.
@@ -41,9 +41,12 @@ export async function uploadEmojiCustomWithBuffer(
 		throw new Meteor.Error('not_authorized');
 	}
 
+	if (!Array.isArray(emojiData.aliases)) {
+		// delete aliases for notification purposes. here, it is a string or undefined rather than an array
+		delete emojiData.aliases;
+	}
+
 	emojiData.name = limax(emojiData.name, { replacement: '_' });
-	// delete aliases for notification purposes. here, it is a string rather than an array
-	delete emojiData.aliases;
 
 	const file = await getFile(buffer, emojiData.extension);
 	emojiData.extension = emojiData.extension === 'svg+xml' ? 'png' : emojiData.extension;
@@ -67,8 +70,10 @@ export async function uploadEmojiCustomWithBuffer(
 			encodeURIComponent(`${emojiData.name}.${emojiData.extension}`),
 			contentType,
 		);
-		ws.on('end', () => {
-			setTimeout(() => api.broadcast('emoji.updateCustom', emojiData), 500);
+		ws.on('end', async () => {
+			const etag = Random.hexString(6);
+			await EmojiCustom.setETagByName(emojiData.name, etag);
+			setTimeout(() => api.broadcast('emoji.updateCustom', { ...emojiData, etag }), 500);
 			resolve();
 		});
 
diff --git a/apps/meteor/app/emoji/client/emojiParser.js b/apps/meteor/app/emoji/client/emojiParser.ts
similarity index 74%
rename from apps/meteor/app/emoji/client/emojiParser.js
rename to apps/meteor/app/emoji/client/emojiParser.ts
index 0b3b722aaebd..ff4a010bed5c 100644
--- a/apps/meteor/app/emoji/client/emojiParser.js
+++ b/apps/meteor/app/emoji/client/emojiParser.ts
@@ -1,12 +1,10 @@
-import { isIE11 } from '../../../client/lib/utils/isIE11';
 import { emoji } from './lib';
+import { isIE11 } from '../../../client/lib/utils/isIE11';
 
 /**
  * emojiParser is a function that will replace emojis
- * @param {{ html: string }} message - The message object
- * @return {{ html: string }}
  */
-export const emojiParser = ({ html }) => {
+export const emojiParser = (html: string) => {
 	html = html.trim();
 
 	// &#39; to apostrophe (') for emojis such as :')
@@ -28,8 +26,12 @@ export const emojiParser = ({ html }) => {
 	let hasText = false;
 
 	if (!isIE11) {
-		const filter = (node) => {
-			if (node.nodeType === Node.ELEMENT_NODE && (node.classList.contains('emojione') || node.classList.contains('emoji'))) {
+		const isElement = (node: Node): node is Element => node.nodeType === Node.ELEMENT_NODE;
+
+		const isTextNode = (node: Node): node is Text => node.nodeType === Node.TEXT_NODE;
+
+		const filter = (node: Node) => {
+			if (isElement(node) && (node.classList.contains('emojione') || node.classList.contains('emoji'))) {
 				return NodeFilter.FILTER_REJECT;
 			}
 			return NodeFilter.FILTER_ACCEPT;
@@ -38,7 +40,7 @@ export const emojiParser = ({ html }) => {
 		const walker = document.createTreeWalker(checkEmojiOnly, NodeFilter.SHOW_ELEMENT | NodeFilter.SHOW_TEXT, filter);
 
 		while (walker.nextNode()) {
-			if (walker.currentNode.nodeType === Node.TEXT_NODE && walker.currentNode.nodeValue.trim() !== '') {
+			if (isTextNode(walker.currentNode) && walker.currentNode.nodeValue.trim() !== '') {
 				hasText = true;
 				break;
 			}
@@ -60,5 +62,5 @@ export const emojiParser = ({ html }) => {
 	// line breaks ' <br> ' back to '<br>'
 	html = html.replace(/ <br> /g, '<br>');
 
-	return { html };
+	return html;
 };
diff --git a/apps/meteor/app/emoji/client/helpers.ts b/apps/meteor/app/emoji/client/helpers.ts
index 35badda26a73..a203216640f5 100644
--- a/apps/meteor/app/emoji/client/helpers.ts
+++ b/apps/meteor/app/emoji/client/helpers.ts
@@ -138,7 +138,7 @@ export const getEmojisBySearchTerm = (
 	return emojis;
 };
 
-export const removeFromRecent = (emoji: string, recentEmojis: string[], setRecentEmojis: (emojis: string[]) => void) => {
+export const removeFromRecent = (emoji: string, recentEmojis: string[], setRecentEmojis?: (emojis: string[]) => void) => {
 	const _emoji = emoji.replace(/(^:|:$)/g, '');
 	const pos = recentEmojis.indexOf(_emoji as never);
 
@@ -146,7 +146,7 @@ export const removeFromRecent = (emoji: string, recentEmojis: string[], setRecen
 		return;
 	}
 	recentEmojis.splice(pos, 1);
-	setRecentEmojis(recentEmojis);
+	setRecentEmojis?.(recentEmojis);
 };
 
 export const updateRecent = (recentList: string[]) => {
@@ -156,6 +156,15 @@ export const updateRecent = (recentList: string[]) => {
 	});
 };
 
+export const replaceEmojiInRecent = ({ oldEmoji, newEmoji }: { oldEmoji: string; newEmoji: string }) => {
+	const recentPkgList: string[] = emoji.packages.base.emojisByCategory.recent;
+	const pos = recentPkgList.indexOf(oldEmoji);
+
+	if (pos !== -1) {
+		recentPkgList[pos] = newEmoji;
+	}
+};
+
 const getEmojiRender = (emojiName: string) => {
 	const emojiPackageName = emoji.list[emojiName]?.emojiPackage;
 	const emojiPackage = emoji.packages[emojiPackageName];
diff --git a/apps/meteor/app/emoji/lib/rocketchat.ts b/apps/meteor/app/emoji/lib/rocketchat.ts
index 49d6ffbe41aa..1c5b515407ed 100644
--- a/apps/meteor/app/emoji/lib/rocketchat.ts
+++ b/apps/meteor/app/emoji/lib/rocketchat.ts
@@ -9,6 +9,9 @@ export type EmojiPackage = {
 	renderPicker: (emojiToRender: string) => string | undefined;
 	ascii?: boolean;
 	sprites?: unknown;
+	list?: string[];
+	_regexpSignature?: string | null;
+	_regexp?: RegExp | null;
 };
 
 export type EmojiPackages = {
@@ -16,14 +19,27 @@ export type EmojiPackages = {
 		[key: string]: EmojiPackage;
 	};
 	list: {
-		[key: keyof NonNullable<EmojiPackages['packages']>]: {
-			category: string;
-			emojiPackage: string;
-			shortnames: string[];
-			uc_base: string;
-			uc_greedy: string;
-			uc_match: string;
-			uc_output: string;
-		};
+		[key: keyof NonNullable<EmojiPackages['packages']>]:
+			| {
+					category: string;
+					emojiPackage: string;
+					shortnames: string[];
+					uc_base: string;
+					uc_greedy: string;
+					uc_match: string;
+					uc_output: string;
+					aliases?: string[];
+					aliasOf?: undefined;
+					extension?: string;
+					etag?: string;
+			  }
+			| {
+					emojiPackage: string;
+					aliasOf: string;
+					extension?: undefined;
+					aliases?: undefined;
+					shortnames?: undefined;
+					etag?: string;
+			  };
 	};
 };
diff --git a/apps/meteor/app/error-handler/server/lib/RocketChat.ErrorHandler.ts b/apps/meteor/app/error-handler/server/lib/RocketChat.ErrorHandler.ts
index 984561fe13cd..24224a599abf 100644
--- a/apps/meteor/app/error-handler/server/lib/RocketChat.ErrorHandler.ts
+++ b/apps/meteor/app/error-handler/server/lib/RocketChat.ErrorHandler.ts
@@ -110,7 +110,7 @@ process.on('unhandledRejection', (error) => {
 	console.error('Future node.js versions will automatically exit the process');
 	console.error('=================================');
 
-	if (process.env.NODE_ENV === 'development' || process.env.EXIT_UNHANDLEDPROMISEREJECTION) {
+	if (process.env.TEST_MODE || process.env.NODE_ENV === 'development' || process.env.EXIT_UNHANDLEDPROMISEREJECTION) {
 		process.exit(1);
 	}
 });
@@ -125,4 +125,8 @@ process.on('uncaughtException', async (error) => {
 	console.error('===========================');
 
 	void errorHandler.trackError(error.message, error.stack);
+
+	if (process.env.TEST_MODE || process.env.NODE_ENV === 'development' || process.env.EXIT_UNHANDLEDPROMISEREJECTION) {
+		process.exit(1);
+	}
 });
diff --git a/apps/meteor/app/federation/server/endpoints/dispatch.js b/apps/meteor/app/federation/server/endpoints/dispatch.js
index 4f2a197b25ee..d80f74bf18d3 100644
--- a/apps/meteor/app/federation/server/endpoints/dispatch.js
+++ b/apps/meteor/app/federation/server/endpoints/dispatch.js
@@ -6,6 +6,7 @@ import EJSON from 'ejson';
 import { API } from '../../../api/server';
 import { FileUpload } from '../../../file-upload/server';
 import { deleteRoom } from '../../../lib/server/functions/deleteRoom';
+import { apiDeprecationLogger } from '../../../lib/server/lib/deprecationWarningLogger';
 import {
 	notifyOnMessageChange,
 	notifyOnRoomChanged,
@@ -551,6 +552,18 @@ API.v1.addRoute(
 	{ authRequired: false, rateLimiterOptions: { numRequestsAllowed: 30, intervalTimeInMS: 1000 } },
 	{
 		async post() {
+			/*
+			The legacy federation has been deprecated for over a year
+			and no longer receives any updates. This feature also has
+			relevant security issues that weren't addressed.
+			Workspaces should migrate to the newer matrix federation.
+			*/
+			apiDeprecationLogger.endpoint(this.request.route, '8.0.0', this.response, 'Use Matrix Federation instead.');
+
+			if (!process.env.ENABLE_INSECURE_LEGACY_FEDERATION) {
+				return API.v1.failure('Deprecated. ENABLE_INSECURE_LEGACY_FEDERATION environment variable is needed to enable it.');
+			}
+
 			if (!isFederationEnabled()) {
 				return API.v1.failure('Federation not enabled');
 			}
diff --git a/apps/meteor/app/federation/server/endpoints/requestFromLatest.js b/apps/meteor/app/federation/server/endpoints/requestFromLatest.js
index b45e8944e466..8dca41d3f442 100644
--- a/apps/meteor/app/federation/server/endpoints/requestFromLatest.js
+++ b/apps/meteor/app/federation/server/endpoints/requestFromLatest.js
@@ -2,6 +2,7 @@ import { FederationRoomEvents } from '@rocket.chat/models';
 import EJSON from 'ejson';
 
 import { API } from '../../../api/server';
+import { apiDeprecationLogger } from '../../../lib/server/lib/deprecationWarningLogger';
 import { dispatchEvents } from '../handler';
 import { decryptIfNeeded } from '../lib/crypt';
 import { isFederationEnabled } from '../lib/isFederationEnabled';
@@ -12,6 +13,18 @@ API.v1.addRoute(
 	{ authRequired: false },
 	{
 		async post() {
+			/*
+			The legacy federation has been deprecated for over a year
+			and no longer receives any updates. This feature also has
+			relevant security issues that weren't addressed.
+			Workspaces should migrate to the newer matrix federation.
+			*/
+			apiDeprecationLogger.endpoint(this.request.route, '8.0.0', this.response, 'Use Matrix Federation instead.');
+
+			if (!process.env.ENABLE_INSECURE_LEGACY_FEDERATION) {
+				return API.v1.failure('Deprecated. ENABLE_INSECURE_LEGACY_FEDERATION environment variable is needed to enable it.');
+			}
+
 			if (!isFederationEnabled()) {
 				return API.v1.failure('Federation not enabled');
 			}
diff --git a/apps/meteor/app/federation/server/endpoints/uploads.js b/apps/meteor/app/federation/server/endpoints/uploads.js
index da5740f95f16..10c513b3741c 100644
--- a/apps/meteor/app/federation/server/endpoints/uploads.js
+++ b/apps/meteor/app/federation/server/endpoints/uploads.js
@@ -2,6 +2,7 @@ import { Uploads } from '@rocket.chat/models';
 
 import { API } from '../../../api/server';
 import { FileUpload } from '../../../file-upload/server';
+import { apiDeprecationLogger } from '../../../lib/server/lib/deprecationWarningLogger';
 import { isFederationEnabled } from '../lib/isFederationEnabled';
 
 API.v1.addRoute(
@@ -9,6 +10,18 @@ API.v1.addRoute(
 	{ authRequired: false },
 	{
 		async get() {
+			/*
+			The legacy federation has been deprecated for over a year
+			and no longer receives any updates. This feature also has
+			relevant security issues that weren't addressed.
+			Workspaces should migrate to the newer matrix federation.
+			*/
+			apiDeprecationLogger.endpoint(this.request.route, '8.0.0', this.response, 'Use Matrix Federation instead.');
+
+			if (!process.env.ENABLE_INSECURE_LEGACY_FEDERATION) {
+				return API.v1.failure('Deprecated. ENABLE_INSECURE_LEGACY_FEDERATION environment variable is needed to enable it.');
+			}
+
 			if (!isFederationEnabled()) {
 				return API.v1.failure('Federation not enabled');
 			}
diff --git a/apps/meteor/app/federation/server/endpoints/users.js b/apps/meteor/app/federation/server/endpoints/users.js
index 0d9a4ff4b0ce..fba9b1642e8f 100644
--- a/apps/meteor/app/federation/server/endpoints/users.js
+++ b/apps/meteor/app/federation/server/endpoints/users.js
@@ -1,6 +1,7 @@
 import { Users } from '@rocket.chat/models';
 
 import { API } from '../../../api/server';
+import { apiDeprecationLogger } from '../../../lib/server/lib/deprecationWarningLogger';
 import { isFederationEnabled } from '../lib/isFederationEnabled';
 import { serverLogger } from '../lib/logger';
 import { normalizers } from '../normalizers';
@@ -12,6 +13,18 @@ API.v1.addRoute(
 	{ authRequired: false },
 	{
 		async get() {
+			/*
+			The legacy federation has been deprecated for over a year
+			and no longer receives any updates. This feature also has
+			relevant security issues that weren't addressed.
+			Workspaces should migrate to the newer matrix federation.
+			*/
+			apiDeprecationLogger.endpoint(this.request.route, '8.0.0', this.response, 'Use Matrix Federation instead.');
+
+			if (!process.env.ENABLE_INSECURE_LEGACY_FEDERATION) {
+				return API.v1.failure('Deprecated. ENABLE_INSECURE_LEGACY_FEDERATION environment variable is needed to enable it.');
+			}
+
 			if (!isFederationEnabled()) {
 				return API.v1.failure('Federation not enabled');
 			}
@@ -39,6 +52,18 @@ API.v1.addRoute(
 	{ authRequired: false },
 	{
 		async get() {
+			/*
+			The legacy federation has been deprecated for over a year
+			and no longer receives any updates. This feature also has
+			relevant security issues that weren't addressed.
+			Workspaces should migrate to the newer matrix federation.
+			*/
+			apiDeprecationLogger.endpoint(this.request.route, '8.0.0', this.response, 'Use Matrix Federation instead.');
+
+			if (!process.env.ENABLE_INSECURE_LEGACY_FEDERATION) {
+				return API.v1.failure('Deprecated. ENABLE_INSECURE_LEGACY_FEDERATION environment variable is needed to enable it.');
+			}
+
 			if (!isFederationEnabled()) {
 				return API.v1.failure('Federation not enabled');
 			}
diff --git a/apps/meteor/app/federation/server/functions/helpers.ts b/apps/meteor/app/federation/server/functions/helpers.ts
index c684b7b8f74a..54df33cdfa2d 100644
--- a/apps/meteor/app/federation/server/functions/helpers.ts
+++ b/apps/meteor/app/federation/server/functions/helpers.ts
@@ -57,10 +57,13 @@ export const getFederatedRoomData = async (
 
 	// Find all subscriptions of this room
 	const s = await Subscriptions.findByRoomIdWhenUsernameExists(room._id).toArray();
-	const subscriptions = s.reduce((acc, s) => {
-		acc[s.u._id] = s;
-		return acc;
-	}, {} as { [k: string]: ISubscription });
+	const subscriptions = s.reduce(
+		(acc, s) => {
+			acc[s.u._id] = s;
+			return acc;
+		},
+		{} as { [k: string]: ISubscription },
+	);
 
 	// Get all user ids
 	const userIds = Object.keys(subscriptions);
diff --git a/apps/meteor/app/federation/server/handler/index.js b/apps/meteor/app/federation/server/handler/index.ts
similarity index 80%
rename from apps/meteor/app/federation/server/handler/index.js
rename to apps/meteor/app/federation/server/handler/index.ts
index c5b19856f19f..f7a3ae53ec29 100644
--- a/apps/meteor/app/federation/server/handler/index.js
+++ b/apps/meteor/app/federation/server/handler/index.ts
@@ -5,7 +5,7 @@ import { federationRequestToPeer } from '../lib/http';
 import { isFederationEnabled } from '../lib/isFederationEnabled';
 import { clientLogger } from '../lib/logger';
 
-export async function federationSearchUsers(query) {
+export async function federationSearchUsers(query: string) {
 	if (!isFederationEnabled()) {
 		throw disabled('client.searchUsers');
 	}
@@ -23,7 +23,7 @@ export async function federationSearchUsers(query) {
 	return users;
 }
 
-export async function getUserByUsername(query) {
+export async function getUserByUsername(query: string) {
 	if (!isFederationEnabled()) {
 		throw disabled('client.searchUsers');
 	}
@@ -41,7 +41,13 @@ export async function getUserByUsername(query) {
 	return user;
 }
 
-export async function requestEventsFromLatest(domain, fromDomain, contextType, contextQuery, latestEventIds) {
+export async function requestEventsFromLatest(
+	domain: string,
+	fromDomain: string,
+	contextType: unknown,
+	contextQuery: unknown,
+	latestEventIds: unknown,
+) {
 	if (!isFederationEnabled()) {
 		throw disabled('client.requestEventsFromLatest');
 	}
@@ -64,7 +70,7 @@ export async function requestEventsFromLatest(domain, fromDomain, contextType, c
 	});
 }
 
-export async function dispatchEvents(domains, events) {
+export async function dispatchEvents(domains: string[], events: unknown[]) {
 	if (!isFederationEnabled()) {
 		throw disabled('client.dispatchEvents');
 	}
@@ -80,11 +86,11 @@ export async function dispatchEvents(domains, events) {
 	}
 }
 
-export async function dispatchEvent(domains, event) {
+export async function dispatchEvent(domains: string[], event: unknown) {
 	await dispatchEvents([...new Set(domains)], [event]);
 }
 
-export async function getUpload(domain, fileId) {
+export async function getUpload(domain: string, fileId: string) {
 	const {
 		data: { upload, buffer },
 	} = await federationRequestToPeer('GET', domain, `/api/v1/federation.uploads?${qs.stringify({ upload_id: fileId })}`);
diff --git a/apps/meteor/app/federation/server/lib/dns.js b/apps/meteor/app/federation/server/lib/dns.js
index f8ef27e1dcf6..83ce0cc70349 100644
--- a/apps/meteor/app/federation/server/lib/dns.js
+++ b/apps/meteor/app/federation/server/lib/dns.js
@@ -3,10 +3,10 @@ import util from 'util';
 
 import mem from 'mem';
 
-import * as federationErrors from '../functions/errors';
 import { federationRequest } from './http';
 import { isFederationEnabled } from './isFederationEnabled';
 import { dnsLogger } from './logger';
+import * as federationErrors from '../functions/errors';
 
 const dnsResolveSRV = util.promisify(dnsResolver.resolveSrv);
 const dnsResolveTXT = util.promisify(dnsResolver.resolveTxt);
diff --git a/apps/meteor/app/file-upload/server/config/AmazonS3.ts b/apps/meteor/app/file-upload/server/config/AmazonS3.ts
index 0f551d3b90d1..48b7a9b850a9 100644
--- a/apps/meteor/app/file-upload/server/config/AmazonS3.ts
+++ b/apps/meteor/app/file-upload/server/config/AmazonS3.ts
@@ -3,11 +3,11 @@ import https from 'https';
 
 import _ from 'underscore';
 
+import { forceDownload } from './helper';
 import { settings } from '../../../settings/server';
 import type { S3Options } from '../../ufs/AmazonS3/server';
 import { FileUploadClass, FileUpload } from '../lib/FileUpload';
 import '../../ufs/AmazonS3/server';
-import { forceDownload } from './helper';
 
 const get: FileUploadClass['get'] = async function (this: FileUploadClass, file, req, res) {
 	const forcedDownload = forceDownload(req);
diff --git a/apps/meteor/app/file-upload/server/config/FileSystem.ts b/apps/meteor/app/file-upload/server/config/FileSystem.ts
index 75fdb5afc8ae..c39cf5807d60 100644
--- a/apps/meteor/app/file-upload/server/config/FileSystem.ts
+++ b/apps/meteor/app/file-upload/server/config/FileSystem.ts
@@ -1,10 +1,10 @@
 import fsp from 'fs/promises';
 
+import { getContentDisposition } from './helper';
 import { UploadFS } from '../../../../server/ufs';
 import { settings } from '../../../settings/server';
 import { FileUploadClass, FileUpload } from '../lib/FileUpload';
 import { getFileRange, setRangeHeaders } from '../lib/ranges';
-import { getContentDisposition } from './helper';
 
 const FileSystemUploads = new FileUploadClass({
 	name: 'FileSystem:Uploads',
diff --git a/apps/meteor/app/file-upload/server/config/GoogleStorage.ts b/apps/meteor/app/file-upload/server/config/GoogleStorage.ts
index 8fb901b5a123..ccd94d533b62 100644
--- a/apps/meteor/app/file-upload/server/config/GoogleStorage.ts
+++ b/apps/meteor/app/file-upload/server/config/GoogleStorage.ts
@@ -3,10 +3,10 @@ import https from 'https';
 
 import _ from 'underscore';
 
+import { forceDownload } from './helper';
 import { settings } from '../../../settings/server';
 import { FileUploadClass, FileUpload } from '../lib/FileUpload';
 import '../../ufs/GoogleStorage/server';
-import { forceDownload } from './helper';
 
 const get: FileUploadClass['get'] = async function (this: FileUploadClass, file, req, res) {
 	const forcedDownload = forceDownload(req);
diff --git a/apps/meteor/app/file-upload/server/config/GridFS.ts b/apps/meteor/app/file-upload/server/config/GridFS.ts
index 3bb5f806f3a7..551569d4c58c 100644
--- a/apps/meteor/app/file-upload/server/config/GridFS.ts
+++ b/apps/meteor/app/file-upload/server/config/GridFS.ts
@@ -6,10 +6,10 @@ import zlib from 'zlib';
 import type { IUpload } from '@rocket.chat/core-typings';
 import { Logger } from '@rocket.chat/logger';
 
+import { getContentDisposition } from './helper';
 import { UploadFS } from '../../../../server/ufs';
 import { FileUploadClass, FileUpload } from '../lib/FileUpload';
 import { getFileRange, setRangeHeaders } from '../lib/ranges';
-import { getContentDisposition } from './helper';
 
 const logger = new Logger('FileUpload');
 
diff --git a/apps/meteor/app/file-upload/server/lib/FileUpload.ts b/apps/meteor/app/file-upload/server/lib/FileUpload.ts
index ac97923be41e..cffdfe6288f2 100644
--- a/apps/meteor/app/file-upload/server/lib/FileUpload.ts
+++ b/apps/meteor/app/file-upload/server/lib/FileUpload.ts
@@ -22,6 +22,7 @@ import sharp from 'sharp';
 import type { WritableStreamBuffer } from 'stream-buffers';
 import streamBuffers from 'stream-buffers';
 
+import { streamToBuffer } from './streamToBuffer';
 import { i18n } from '../../../../server/lib/i18n';
 import { SystemLogger } from '../../../../server/lib/logger/system';
 import { roomCoordinator } from '../../../../server/lib/rooms/roomCoordinator';
@@ -33,7 +34,6 @@ import { settings } from '../../../settings/server';
 import { mime } from '../../../utils/lib/mimeTypes';
 import { isValidJWT, generateJWT } from '../../../utils/server/lib/JWTHelper';
 import { fileUploadIsValidContentType } from '../../../utils/server/restrictions';
-import { streamToBuffer } from './streamToBuffer';
 
 const cookie = new Cookies();
 let maxFileSize = 0;
@@ -384,7 +384,7 @@ export const FileUpload = {
 					? {
 							width,
 							height,
-					  }
+						}
 					: undefined,
 		};
 
diff --git a/apps/meteor/app/github-enterprise/client/github-enterprise-login-button.css b/apps/meteor/app/github-enterprise/client/github-enterprise-login-button.css
deleted file mode 100644
index e7ba61d7be38..000000000000
--- a/apps/meteor/app/github-enterprise/client/github-enterprise-login-button.css
+++ /dev/null
@@ -1,9 +0,0 @@
-.icon-github_enterprise::before {
-	height: 1em;
-
-	content: "";
-
-	background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9wJGBYxHYxl31wAAAHpSURBVDjLpZI/aFNRFMZ/973bJqGRPopV4qNq/+SpTYnWRhCKilShg9BGcHOM+GfQoZuLk4iLgw4qZNBaHLuIdBNHl7Ta1qdNFI3SihnaNG1MpH3vuiQYQnwZvHCG893zffc751z4z6PX5T5gA1DAKnAaOAQEgAfAVeCpl+CeCrlRuEC6maO4h0A1wl4tPAHMqNUthvrDdHYY7A3t4rDVjeO6rBU2FaABM1WCrBNoi48Mi+nH9yj+KtPibAKwJXfQ5vcRG7soUnYmWEuQgAEIYBv4cGpoILI0Z4tyYYPegS6UguyijZQ6J45GSNmZHzUcJYD2ii2Ajv7efZ8WZ6ZwXFj79hXpayW4O0SL1Nl/8jzZlZ9dQLFS70pgvZKIyGD0yvu5eRmMnrk1PjI81ir1qBACTdPevXj95mVuNX8XKDQc/+T334bZZ104cvzYw2s3J3qAL5WXSsDbf61NNMBu+wOBs+VSyQ84Nfhg028ZGx3/qyy0lC7lgi7lghBitoon03lvB8l0/k7Wnk+8mny0cyXzEcfZxgwfZPTyRMHsOzAFXE9YhtNQIJnOx4FpJXT1eSkn2g0frqMoFrfoCXcqlCOAGwnLuO/l4JymcWl5uRxzXUKghBAiZ5r+WaV4lrCM555zqO+x2d0ftGmpiA/0k70AAAAASUVORK5CYII=);
-	background-repeat: no-repeat;
-	background-position: center center;
-}
diff --git a/apps/meteor/app/github-enterprise/client/index.ts b/apps/meteor/app/github-enterprise/client/index.ts
index 7a032388cc0c..cf327e4971bb 100644
--- a/apps/meteor/app/github-enterprise/client/index.ts
+++ b/apps/meteor/app/github-enterprise/client/index.ts
@@ -1,2 +1 @@
 import './lib';
-import './github-enterprise-login-button.css';
diff --git a/apps/meteor/app/gitlab/client/gitlab-login-button.css b/apps/meteor/app/gitlab/client/gitlab-login-button.css
index c73a1ee23c91..fa9d41b34e74 100644
--- a/apps/meteor/app/gitlab/client/gitlab-login-button.css
+++ b/apps/meteor/app/gitlab/client/gitlab-login-button.css
@@ -1,3 +1,3 @@
 #login-buttons-image-gitlab {
-	background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9wJGBYxHYxl31wAAAHpSURBVDjLpZI/aFNRFMZ/973bJqGRPopV4qNq/+SpTYnWRhCKilShg9BGcHOM+GfQoZuLk4iLgw4qZNBaHLuIdBNHl7Ta1qdNFI3SihnaNG1MpH3vuiQYQnwZvHCG893zffc751z4z6PX5T5gA1DAKnAaOAQEgAfAVeCpl+CeCrlRuEC6maO4h0A1wl4tPAHMqNUthvrDdHYY7A3t4rDVjeO6rBU2FaABM1WCrBNoi48Mi+nH9yj+KtPibAKwJXfQ5vcRG7soUnYmWEuQgAEIYBv4cGpoILI0Z4tyYYPegS6UguyijZQ6J45GSNmZHzUcJYD2ii2Ajv7efZ8WZ6ZwXFj79hXpayW4O0SL1Nl/8jzZlZ9dQLFS70pgvZKIyGD0yvu5eRmMnrk1PjI81ir1qBACTdPevXj95mVuNX8XKDQc/+T334bZZ104cvzYw2s3J3qAL5WXSsDbf61NNMBu+wOBs+VSyQ84Nfhg028ZGx3/qyy0lC7lgi7lghBitoon03lvB8l0/k7Wnk+8mny0cyXzEcfZxgwfZPTyRMHsOzAFXE9YhtNQIJnOx4FpJXT1eSkn2g0frqMoFrfoCXcqlCOAGwnLuO/l4JymcWl5uRxzXUKghBAiZ5r+WaV4lrCM555zqO+x2d0ftGmpiA/0k70AAAAASUVORK5CYII=);
+	background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9wJGBYxHYxl31wAAAHpSURBVDjLpZI/aFNRFMZ/973bJqGRPopV4qNq/+SpTYnWRhCKilShg9BGcHOM+GfQoZuLk4iLgw4qZNBaHLuIdBNHl7Ta1qdNFI3SihnaNG1MpH3vuiQYQnwZvHCG893zffc751z4z6PX5T5gA1DAKnAaOAQEgAfAVeCpl+CeCrlRuEC6maO4h0A1wl4tPAHMqNUthvrDdHYY7A3t4rDVjeO6rBU2FaABM1WCrBNoi48Mi+nH9yj+KtPibAKwJXfQ5vcRG7soUnYmWEuQgAEIYBv4cGpoILI0Z4tyYYPegS6UguyijZQ6J45GSNmZHzUcJYD2ii2Ajv7efZ8WZ6ZwXFj79hXpayW4O0SL1Nl/8jzZlZ9dQLFS70pgvZKIyGD0yvu5eRmMnrk1PjI81ir1qBACTdPevXj95mVuNX8XKDQc/+T334bZZ104cvzYw2s3J3qAL5WXSsDbf61NNMBu+wOBs+VSyQ84Nfhg028ZGx3/qyy0lC7lgi7lghBitoon03lvB8l0/k7Wnk+8mny0cyXzEcfZxgwfZPTyRMHsOzAFXE9YhtNQIJnOx4FpJXT1eSkn2g0frqMoFrfoCXcqlCOAGwnLuO/l4JymcWl5uRxzXUKghBAiZ5r+WaV4lrCM555zqO+x2d0ftGmpiA/0k70AAAAASUVORK5CYII=");
 }
diff --git a/apps/meteor/app/importer-csv/server/CsvImporter.ts b/apps/meteor/app/importer-csv/server/CsvImporter.ts
index a9844e747640..88cd39a84758 100644
--- a/apps/meteor/app/importer-csv/server/CsvImporter.ts
+++ b/apps/meteor/app/importer-csv/server/CsvImporter.ts
@@ -7,10 +7,11 @@ import { Importer, ProgressStep, ImporterWebsocket } from '../../importer/server
 import type { ConverterOptions } from '../../importer/server/classes/ImportDataConverter';
 import type { ImporterProgress } from '../../importer/server/classes/ImporterProgress';
 import type { ImporterInfo } from '../../importer/server/definitions/ImporterInfo';
+import { addParsedContacts } from '../../importer-omnichannel-contacts/server/addParsedContacts';
 import { notifyOnSettingChanged } from '../../lib/server/lib/notifyListener';
 
 export class CsvImporter extends Importer {
-	private csvParser: (csv: string) => string[];
+	private csvParser: (csv: string) => string[][];
 
 	constructor(info: ImporterInfo, importRecord: IImport, converterOptions: ConverterOptions = {}) {
 		super(info, importRecord, converterOptions);
@@ -46,6 +47,7 @@ export class CsvImporter extends Importer {
 		let messagesCount = 0;
 		let usersCount = 0;
 		let channelsCount = 0;
+		let contactsCount = 0;
 		const dmRooms = new Set<string>();
 		const roomIds = new Map<string, string>();
 		const usedUsernames = new Set<string>();
@@ -140,6 +142,18 @@ export class CsvImporter extends Importer {
 				continue;
 			}
 
+			// Parse the contacts
+			if (entry.entryName.toLowerCase() === 'contacts.csv') {
+				await super.updateProgress(ProgressStep.PREPARING_CONTACTS);
+				const parsedContacts = this.csvParser(entry.getData().toString());
+
+				contactsCount = await addParsedContacts.call(this.converter, parsedContacts);
+
+				await super.updateRecord({ 'count.contacts': contactsCount });
+				increaseProgressCount();
+				continue;
+			}
+
 			// Parse the messages
 			if (entry.entryName.indexOf('/') > -1) {
 				if (this.progress.step !== ProgressStep.PREPARING_MESSAGES) {
@@ -258,12 +272,12 @@ export class CsvImporter extends Importer {
 			}
 		}
 
-		await super.addCountToTotal(messagesCount + usersCount + channelsCount);
+		await super.addCountToTotal(messagesCount + usersCount + channelsCount + contactsCount);
 		ImporterWebsocket.progressUpdated({ rate: 100 });
 
-		// Ensure we have at least a single user, channel, or message
-		if (usersCount === 0 && channelsCount === 0 && messagesCount === 0) {
-			this.logger.error('No users, channels, or messages found in the import file.');
+		// Ensure we have at least a single record of any kind
+		if (usersCount === 0 && channelsCount === 0 && messagesCount === 0 && contactsCount === 0) {
+			this.logger.error('No valid record found in the import file.');
 			await super.updateProgress(ProgressStep.ERROR);
 		}
 
diff --git a/apps/meteor/app/importer-csv/server/index.ts b/apps/meteor/app/importer-csv/server/index.ts
index 2d913f740955..f20c375ae943 100644
--- a/apps/meteor/app/importer-csv/server/index.ts
+++ b/apps/meteor/app/importer-csv/server/index.ts
@@ -1,5 +1,5 @@
-import { Importers } from '../../importer/server';
 import { CsvImporter } from './CsvImporter';
+import { Importers } from '../../importer/server';
 
 Importers.add({
 	key: 'csv',
diff --git a/apps/meteor/app/importer-omnichannel-contacts/server/ContactImporter.ts b/apps/meteor/app/importer-omnichannel-contacts/server/ContactImporter.ts
new file mode 100644
index 000000000000..ca5f66bc05ea
--- /dev/null
+++ b/apps/meteor/app/importer-omnichannel-contacts/server/ContactImporter.ts
@@ -0,0 +1,48 @@
+import fs from 'node:fs';
+
+import type { IImport } from '@rocket.chat/core-typings';
+import { parse } from 'csv-parse/lib/sync';
+
+import { addParsedContacts } from './addParsedContacts';
+import { Importer, ProgressStep, ImporterWebsocket } from '../../importer/server';
+import type { ConverterOptions } from '../../importer/server/classes/ImportDataConverter';
+import type { ImporterProgress } from '../../importer/server/classes/ImporterProgress';
+import type { ImporterInfo } from '../../importer/server/definitions/ImporterInfo';
+
+export class ContactImporter extends Importer {
+	private csvParser: (csv: string) => string[][];
+
+	constructor(info: ImporterInfo, importRecord: IImport, converterOptions: ConverterOptions = {}) {
+		super(info, importRecord, converterOptions);
+
+		this.csvParser = parse;
+	}
+
+	async prepareUsingLocalFile(fullFilePath: string): Promise<ImporterProgress> {
+		this.logger.debug('start preparing import operation');
+		await this.converter.clearImportData();
+
+		ImporterWebsocket.progressUpdated({ rate: 0 });
+
+		await super.updateProgress(ProgressStep.PREPARING_CONTACTS);
+		// Reading the whole file at once for compatibility with the code written for the other importers
+		// We can change this to a stream once we improve the rest of the importer classes
+		const fileContents = fs.readFileSync(fullFilePath, { encoding: 'utf8' });
+		if (!fileContents || typeof fileContents !== 'string') {
+			throw new Error('Failed to load file contents.');
+		}
+
+		const parsedContacts = this.csvParser(fileContents);
+		const contactsCount = await addParsedContacts.call(this.converter, parsedContacts);
+
+		if (contactsCount === 0) {
+			this.logger.error('No contacts found in the import file.');
+			await super.updateProgress(ProgressStep.ERROR);
+		} else {
+			await super.updateRecord({ 'count.contacts': contactsCount, 'count.total': contactsCount });
+			ImporterWebsocket.progressUpdated({ rate: 100 });
+		}
+
+		return super.getProgress();
+	}
+}
diff --git a/apps/meteor/app/importer-omnichannel-contacts/server/addParsedContacts.ts b/apps/meteor/app/importer-omnichannel-contacts/server/addParsedContacts.ts
new file mode 100644
index 000000000000..cc00e7ed1f9b
--- /dev/null
+++ b/apps/meteor/app/importer-omnichannel-contacts/server/addParsedContacts.ts
@@ -0,0 +1,39 @@
+import { Random } from '@rocket.chat/random';
+
+import type { ImportDataConverter } from '../../importer/server/classes/ImportDataConverter';
+
+export async function addParsedContacts(this: ImportDataConverter, parsedContacts: string[][]): Promise<number> {
+	const columnNames = parsedContacts.shift();
+	let addedContacts = 0;
+
+	for await (const parsedData of parsedContacts) {
+		const contactData = parsedData.reduce(
+			(acc, value, index) => {
+				const columnName = columnNames && index < columnNames.length ? columnNames[index] : `column${index}`;
+				return {
+					...acc,
+					[columnName]: value,
+				};
+			},
+			{} as Record<string, string>,
+		);
+
+		if (!contactData.emails && !contactData.phones && !contactData.name) {
+			continue;
+		}
+
+		const { emails = '', phones = '', name = '', manager: contactManager = undefined, id = Random.id(), ...customFields } = contactData;
+
+		await this.addContact({
+			importIds: [id],
+			emails: emails.split(';'),
+			phones: phones.split(';'),
+			name,
+			contactManager,
+			customFields,
+		});
+		addedContacts++;
+	}
+
+	return addedContacts;
+}
diff --git a/apps/meteor/app/importer-omnichannel-contacts/server/index.ts b/apps/meteor/app/importer-omnichannel-contacts/server/index.ts
new file mode 100644
index 000000000000..0ba882650bf0
--- /dev/null
+++ b/apps/meteor/app/importer-omnichannel-contacts/server/index.ts
@@ -0,0 +1,12 @@
+import { License } from '@rocket.chat/license';
+
+import { ContactImporter } from './ContactImporter';
+import { Importers } from '../../importer/server';
+
+License.onValidFeature('contact-id-verification', () => {
+	Importers.add({
+		key: 'omnichannel_contact',
+		name: 'omnichannel_contacts_importer',
+		importer: ContactImporter,
+	});
+});
diff --git a/apps/meteor/app/importer-pending-avatars/server/PendingAvatarImporter.ts b/apps/meteor/app/importer-pending-avatars/server/PendingAvatarImporter.ts
index de37ba200289..f057da4a625d 100644
--- a/apps/meteor/app/importer-pending-avatars/server/PendingAvatarImporter.ts
+++ b/apps/meteor/app/importer-pending-avatars/server/PendingAvatarImporter.ts
@@ -10,8 +10,7 @@ export class PendingAvatarImporter extends Importer {
 		this.logger.debug('start preparing import operation');
 		await super.updateProgress(ProgressStep.PREPARING_STARTED);
 
-		const users = Users.findAllUsersWithPendingAvatar();
-		const fileCount = await users.count();
+		const fileCount = await Users.countAllUsersWithPendingAvatar();
 
 		if (fileCount === 0) {
 			await super.updateProgress(ProgressStep.DONE);
diff --git a/apps/meteor/app/importer-pending-avatars/server/index.ts b/apps/meteor/app/importer-pending-avatars/server/index.ts
index b69c6de8e745..2710c06b9d15 100644
--- a/apps/meteor/app/importer-pending-avatars/server/index.ts
+++ b/apps/meteor/app/importer-pending-avatars/server/index.ts
@@ -1,5 +1,5 @@
-import { Importers } from '../../importer/server';
 import { PendingAvatarImporter } from './PendingAvatarImporter';
+import { Importers } from '../../importer/server';
 
 Importers.add({
 	key: 'pending-avatars',
diff --git a/apps/meteor/app/importer-pending-files/server/index.ts b/apps/meteor/app/importer-pending-files/server/index.ts
index 24961551cdb5..e18b0de0a29e 100644
--- a/apps/meteor/app/importer-pending-files/server/index.ts
+++ b/apps/meteor/app/importer-pending-files/server/index.ts
@@ -1,5 +1,5 @@
-import { Importers } from '../../importer/server';
 import { PendingFileImporter } from './PendingFileImporter';
+import { Importers } from '../../importer/server';
 
 Importers.add({
 	key: 'pending-files',
diff --git a/apps/meteor/app/importer-slack-users/server/index.ts b/apps/meteor/app/importer-slack-users/server/index.ts
index ab99ede8f912..67b2dbdb319a 100644
--- a/apps/meteor/app/importer-slack-users/server/index.ts
+++ b/apps/meteor/app/importer-slack-users/server/index.ts
@@ -1,5 +1,5 @@
-import { Importers } from '../../importer/server';
 import { SlackUsersImporter } from './SlackUsersImporter';
+import { Importers } from '../../importer/server';
 
 Importers.add({
 	key: 'slack-users',
diff --git a/apps/meteor/app/importer-slack/server/SlackImporter.ts b/apps/meteor/app/importer-slack/server/SlackImporter.ts
index 344db6656531..59c07d26e969 100644
--- a/apps/meteor/app/importer-slack/server/SlackImporter.ts
+++ b/apps/meteor/app/importer-slack/server/SlackImporter.ts
@@ -545,13 +545,16 @@ export class SlackImporter extends Importer {
 
 		// Process the reactions
 		if (message.reactions && message.reactions.length > 0) {
-			newMessage.reactions = message.reactions.reduce((newReactions, reaction) => {
-				const name = `:${reaction.name}:`;
-				return {
-					...newReactions,
-					...(reaction.users?.length ? { name: { name, users: this._replaceSlackUserIds(reaction.users) } } : {}),
-				};
-			}, {} as Required<IImportMessage>['reactions']);
+			newMessage.reactions = message.reactions.reduce(
+				(newReactions, reaction) => {
+					const name = `:${reaction.name}:`;
+					return {
+						...newReactions,
+						...(reaction.users?.length ? { name: { name, users: this._replaceSlackUserIds(reaction.users) } } : {}),
+					};
+				},
+				{} as Required<IImportMessage>['reactions'],
+			);
 		}
 
 		if (message.type === 'message') {
diff --git a/apps/meteor/app/importer-slack/server/index.ts b/apps/meteor/app/importer-slack/server/index.ts
index b8040d77538a..d32edde7271f 100644
--- a/apps/meteor/app/importer-slack/server/index.ts
+++ b/apps/meteor/app/importer-slack/server/index.ts
@@ -1,5 +1,5 @@
-import { Importers } from '../../importer/server';
 import { SlackImporter } from './SlackImporter';
+import { Importers } from '../../importer/server';
 
 Importers.add({
 	key: 'slack',
diff --git a/apps/meteor/app/importer/lib/ImporterProgressStep.ts b/apps/meteor/app/importer/lib/ImporterProgressStep.ts
index 1b5ffe53c93f..5e7ea1b75966 100644
--- a/apps/meteor/app/importer/lib/ImporterProgressStep.ts
+++ b/apps/meteor/app/importer/lib/ImporterProgressStep.ts
@@ -11,6 +11,7 @@ export const ProgressStep = Object.freeze({
 	PREPARING_USERS: 'importer_preparing_users',
 	PREPARING_CHANNELS: 'importer_preparing_channels',
 	PREPARING_MESSAGES: 'importer_preparing_messages',
+	PREPARING_CONTACTS: 'importer_preparing_contacts',
 
 	USER_SELECTION: 'importer_user_selection',
 
@@ -18,6 +19,7 @@ export const ProgressStep = Object.freeze({
 	IMPORTING_USERS: 'importer_importing_users',
 	IMPORTING_CHANNELS: 'importer_importing_channels',
 	IMPORTING_MESSAGES: 'importer_importing_messages',
+	IMPORTING_CONTACTS: 'importer_importing_contacts',
 	IMPORTING_FILES: 'importer_importing_files',
 	FINISHING: 'importer_finishing',
 
@@ -35,6 +37,7 @@ export const ImportPreparingStartedStates: IImportProgress['step'][] = [
 	ProgressStep.PREPARING_USERS,
 	ProgressStep.PREPARING_CHANNELS,
 	ProgressStep.PREPARING_MESSAGES,
+	ProgressStep.PREPARING_CONTACTS,
 ];
 
 export const ImportingStartedStates: IImportProgress['step'][] = [
@@ -42,6 +45,7 @@ export const ImportingStartedStates: IImportProgress['step'][] = [
 	ProgressStep.IMPORTING_USERS,
 	ProgressStep.IMPORTING_CHANNELS,
 	ProgressStep.IMPORTING_MESSAGES,
+	ProgressStep.IMPORTING_CONTACTS,
 	ProgressStep.IMPORTING_FILES,
 	ProgressStep.FINISHING,
 ];
diff --git a/apps/meteor/app/importer/server/classes/ImportDataConverter.ts b/apps/meteor/app/importer/server/classes/ImportDataConverter.ts
index 64226f8752a1..60275205de22 100644
--- a/apps/meteor/app/importer/server/classes/ImportDataConverter.ts
+++ b/apps/meteor/app/importer/server/classes/ImportDataConverter.ts
@@ -1,9 +1,10 @@
-import type { IImportRecord, IImportUser, IImportMessage, IImportChannel } from '@rocket.chat/core-typings';
+import type { IImportRecord, IImportUser, IImportMessage, IImportChannel, IImportContact } from '@rocket.chat/core-typings';
 import type { Logger } from '@rocket.chat/logger';
 import { ImportData } from '@rocket.chat/models';
 import { pick } from '@rocket.chat/tools';
 
 import type { IConversionCallbacks } from '../definitions/IConversionCallbacks';
+import { ContactConverter } from './converters/ContactConverter';
 import { ConverterCache } from './converters/ConverterCache';
 import { type MessageConversionCallbacks, MessageConverter } from './converters/MessageConverter';
 import type { RecordConverter, RecordConverterOptions } from './converters/RecordConverter';
@@ -21,6 +22,8 @@ export class ImportDataConverter {
 
 	protected _messageConverter: MessageConverter;
 
+	protected _contactConverter: ContactConverter;
+
 	protected _cache = new ConverterCache();
 
 	public get options(): ConverterOptions {
@@ -34,6 +37,7 @@ export class ImportDataConverter {
 		};
 
 		this.initializeUserConverter(logger);
+		this.initializeContactConverter(logger);
 		this.initializeRoomConverter(logger);
 		this.initializeMessageConverter(logger);
 	}
@@ -74,6 +78,14 @@ export class ImportDataConverter {
 		this._userConverter = new UserConverter(userOptions, logger, this._cache);
 	}
 
+	protected initializeContactConverter(logger: Logger): void {
+		const contactOptions = {
+			...this.getRecordConverterOptions(),
+		};
+
+		this._contactConverter = new ContactConverter(contactOptions, logger, this._cache);
+	}
+
 	protected initializeRoomConverter(logger: Logger): void {
 		const roomOptions = {
 			...this.getRecordConverterOptions(),
@@ -90,6 +102,10 @@ export class ImportDataConverter {
 		this._messageConverter = new MessageConverter(messageOptions, logger, this._cache);
 	}
 
+	async addContact(data: IImportContact): Promise<void> {
+		return this._contactConverter.addObject(data);
+	}
+
 	async addUser(data: IImportUser): Promise<void> {
 		return this._userConverter.addObject(data);
 	}
@@ -104,6 +120,10 @@ export class ImportDataConverter {
 		});
 	}
 
+	async convertContacts(callbacks: IConversionCallbacks): Promise<void> {
+		return this._contactConverter.convertData(callbacks);
+	}
+
 	async convertUsers(callbacks: IConversionCallbacks): Promise<void> {
 		return this._userConverter.convertData(callbacks);
 	}
@@ -118,6 +138,7 @@ export class ImportDataConverter {
 
 	async convertData(startedByUserId: string, callbacks: IConversionCallbacks = {}): Promise<void> {
 		await this.convertUsers(callbacks);
+		await this.convertContacts(callbacks);
 		await this.convertChannels(startedByUserId, callbacks);
 		await this.convertMessages(callbacks);
 
diff --git a/apps/meteor/app/importer/server/classes/Importer.ts b/apps/meteor/app/importer/server/classes/Importer.ts
index 5f40ead0e1ea..49430c101d45 100644
--- a/apps/meteor/app/importer/server/classes/Importer.ts
+++ b/apps/meteor/app/importer/server/classes/Importer.ts
@@ -6,6 +6,7 @@ import type {
 	IImportUser,
 	IImportProgress,
 	IImporterShortSelection,
+	IImportContact,
 } from '@rocket.chat/core-typings';
 import { Logger } from '@rocket.chat/logger';
 import { Settings, ImportData, Imports } from '@rocket.chat/models';
@@ -13,14 +14,14 @@ import AdmZip from 'adm-zip';
 import type { MatchKeysAndValues, MongoServerError } from 'mongodb';
 
 import { Selection, SelectionChannel, SelectionUser } from '..';
-import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
-import { t } from '../../../utils/lib/i18n';
-import { ProgressStep, ImportPreparingStartedStates } from '../../lib/ImporterProgressStep';
-import type { ImporterInfo } from '../definitions/ImporterInfo';
 import { ImportDataConverter } from './ImportDataConverter';
 import type { ConverterOptions } from './ImportDataConverter';
 import { ImporterProgress } from './ImporterProgress';
 import { ImporterWebsocket } from './ImporterWebsocket';
+import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
+import { t } from '../../../utils/lib/i18n';
+import { ProgressStep, ImportPreparingStartedStates } from '../../lib/ImporterProgressStep';
+import type { ImporterInfo } from '../definitions/ImporterInfo';
 
 type OldSettings = {
 	allowedDomainList?: string | null;
@@ -137,6 +138,20 @@ export class Importer {
 					const id = userData.importIds[0];
 					return importSelection.users.list.includes(id);
 				}
+
+				case 'contact': {
+					if (importSelection.contacts?.all) {
+						return true;
+					}
+					if (!importSelection.contacts?.list?.length) {
+						return false;
+					}
+
+					const contactData = data as IImportContact;
+
+					const id = contactData.importIds[0];
+					return importSelection.contacts.list.includes(id);
+				}
 			}
 
 			return false;
@@ -181,6 +196,9 @@ export class Importer {
 				await this.updateProgress(ProgressStep.IMPORTING_USERS);
 				await this.converter.convertUsers({ beforeImportFn, afterImportFn, onErrorFn, afterBatchFn });
 
+				await this.updateProgress(ProgressStep.IMPORTING_CONTACTS);
+				await this.converter.convertContacts({ beforeImportFn, afterImportFn, onErrorFn });
+
 				await this.updateProgress(ProgressStep.IMPORTING_CHANNELS);
 				await this.converter.convertChannels(startedByUserId, { beforeImportFn, afterImportFn, onErrorFn });
 
@@ -303,14 +321,10 @@ export class Importer {
 	}
 
 	async maybeUpdateRecord() {
-		// Only update the database every 500 messages (or 50 for users/channels)
+		// Only update the database every 500 messages (or 50 for other records)
 		// Or the completed is greater than or equal to the total amount
 		const count = this.progress.count.completed + this.progress.count.error;
-		const range = ([ProgressStep.IMPORTING_USERS, ProgressStep.IMPORTING_CHANNELS] as IImportProgress['step'][]).includes(
-			this.progress.step,
-		)
-			? 50
-			: 500;
+		const range = this.progress.step === ProgressStep.IMPORTING_MESSAGES ? 500 : 50;
 
 		if (count % range === 0 || count >= this.progress.count.total || count - this._lastProgressReportTotal > range) {
 			this._lastProgressReportTotal = this.progress.count.completed + this.progress.count.error;
@@ -358,6 +372,7 @@ export class Importer {
 
 		const users = await ImportData.getAllUsersForSelection();
 		const channels = await ImportData.getAllChannelsForSelection();
+		const contacts = await ImportData.getAllContactsForSelection();
 		const hasDM = await ImportData.checkIfDirectMessagesExists();
 
 		const selectionUsers = users.map(
@@ -367,13 +382,20 @@ export class Importer {
 		const selectionChannels = channels.map(
 			(c) => new SelectionChannel(c.data.importIds[0], c.data.name, Boolean(c.data.archived), true, c.data.t === 'p', c.data.t === 'd'),
 		);
+		const selectionContacts = contacts.map((c) => ({
+			id: c.data.importIds[0],
+			name: c.data.name || '',
+			emails: c.data.emails || [],
+			phones: c.data.phones || [],
+			do_import: true,
+		}));
 		const selectionMessages = await ImportData.countMessages();
 
 		if (hasDM) {
 			selectionChannels.push(new SelectionChannel('__directMessages__', t('Direct_Messages'), false, true, true, true));
 		}
 
-		const results = new Selection(this.info.name, selectionUsers, selectionChannels, selectionMessages);
+		const results = new Selection(this.info.name, selectionUsers, selectionChannels, selectionMessages, selectionContacts);
 
 		return results;
 	}
diff --git a/apps/meteor/app/importer/server/classes/ImporterSelection.ts b/apps/meteor/app/importer/server/classes/ImporterSelection.ts
index 107dbbf9c824..d955bd38b4f7 100644
--- a/apps/meteor/app/importer/server/classes/ImporterSelection.ts
+++ b/apps/meteor/app/importer/server/classes/ImporterSelection.ts
@@ -1,4 +1,9 @@
-import type { IImporterSelection, IImporterSelectionChannel, IImporterSelectionUser } from '@rocket.chat/core-typings';
+import type {
+	IImporterSelection,
+	IImporterSelectionChannel,
+	IImporterSelectionUser,
+	IImporterSelectionContact,
+} from '@rocket.chat/core-typings';
 
 export class ImporterSelection implements IImporterSelection {
 	public name: string;
@@ -7,6 +12,8 @@ export class ImporterSelection implements IImporterSelection {
 
 	public channels: IImporterSelectionChannel[];
 
+	public contacts: IImporterSelectionContact[];
+
 	public message_count: number;
 
 	/**
@@ -17,10 +24,17 @@ export class ImporterSelection implements IImporterSelection {
 	 * @param channels the channels which can be selected
 	 * @param messageCount the number of messages
 	 */
-	constructor(name: string, users: IImporterSelectionUser[], channels: IImporterSelectionChannel[], messageCount: number) {
+	constructor(
+		name: string,
+		users: IImporterSelectionUser[],
+		channels: IImporterSelectionChannel[],
+		messageCount: number,
+		contacts: IImporterSelectionContact[],
+	) {
 		this.name = name;
 		this.users = users;
 		this.channels = channels;
 		this.message_count = messageCount;
+		this.contacts = contacts;
 	}
 }
diff --git a/apps/meteor/app/importer/server/classes/converters/ContactConverter.ts b/apps/meteor/app/importer/server/classes/converters/ContactConverter.ts
new file mode 100644
index 000000000000..eb6b25acd385
--- /dev/null
+++ b/apps/meteor/app/importer/server/classes/converters/ContactConverter.ts
@@ -0,0 +1,42 @@
+import type { IImportContact, IImportContactRecord } from '@rocket.chat/core-typings';
+import { LivechatVisitors } from '@rocket.chat/models';
+
+import { RecordConverter } from './RecordConverter';
+import { createContact } from '../../../../livechat/server/lib/contacts/createContact';
+import { getAllowedCustomFields } from '../../../../livechat/server/lib/contacts/getAllowedCustomFields';
+import { validateCustomFields } from '../../../../livechat/server/lib/contacts/validateCustomFields';
+
+export class ContactConverter extends RecordConverter<IImportContactRecord> {
+	protected async convertCustomFields(customFields: IImportContact['customFields']): Promise<IImportContact['customFields']> {
+		if (!customFields) {
+			return;
+		}
+
+		const allowedCustomFields = await getAllowedCustomFields();
+		return validateCustomFields(allowedCustomFields, customFields, { ignoreAdditionalFields: true });
+	}
+
+	protected async convertRecord(record: IImportContactRecord): Promise<boolean> {
+		const { data } = record;
+
+		await createContact({
+			name: data.name || (await this.generateNewContactName()),
+			emails: data.emails,
+			phones: data.phones,
+			customFields: await this.convertCustomFields(data.customFields),
+			contactManager: await this._cache.getIdOfUsername(data.contactManager),
+			unknown: false,
+			importIds: data.importIds,
+		});
+
+		return true;
+	}
+
+	protected async generateNewContactName(): Promise<string> {
+		return LivechatVisitors.getNextVisitorUsername();
+	}
+
+	protected getDataType(): 'contact' {
+		return 'contact';
+	}
+}
diff --git a/apps/meteor/app/importer/server/classes/converters/ConverterCache.ts b/apps/meteor/app/importer/server/classes/converters/ConverterCache.ts
index cefbf9cc7dbb..284e51dddcd5 100644
--- a/apps/meteor/app/importer/server/classes/converters/ConverterCache.ts
+++ b/apps/meteor/app/importer/server/classes/converters/ConverterCache.ts
@@ -1,4 +1,4 @@
-import type { IImportUser } from '@rocket.chat/core-typings';
+import type { IImportUser, IUser } from '@rocket.chat/core-typings';
 import { Rooms, Users } from '@rocket.chat/models';
 
 export type UserIdentification = {
@@ -17,6 +17,8 @@ export class ConverterCache {
 	// display name uses a different cache because it's only used on mentions so we don't need to load it every time we load an user
 	private _userDisplayNameCache = new Map<string, string>();
 
+	private _userNameToIdCache = new Map<string, string | undefined>();
+
 	private _roomCache = new Map<string, string>();
 
 	private _roomNameCache = new Map<string, string>();
@@ -28,6 +30,9 @@ export class ConverterCache {
 		};
 
 		this._userCache.set(importId, cache);
+		if (username) {
+			this._userNameToIdCache.set(username, _id);
+		}
 		return cache;
 	}
 
@@ -57,6 +62,10 @@ export class ConverterCache {
 		this.addUser(userData.importIds[0], userData._id, userData.username);
 	}
 
+	addUsernameToId(username: string, id: string): void {
+		this._userNameToIdCache.set(username, id);
+	}
+
 	async findImportedRoomId(importId: string): Promise<string | null> {
 		if (this._roomCache.has(importId)) {
 			return this._roomCache.get(importId) as string;
@@ -195,4 +204,19 @@ export class ConverterCache {
 			)
 		).filter((user) => user) as string[];
 	}
+
+	async getIdOfUsername(username: string | undefined): Promise<string | undefined> {
+		if (!username) {
+			return;
+		}
+
+		if (this._userNameToIdCache.has(username)) {
+			return this._userNameToIdCache.get(username);
+		}
+
+		const user = await Users.findOneByUsername<Pick<IUser, '_id'>>(username, { projection: { _id: 1 } });
+		this.addUsernameToId(username, user?._id);
+
+		return user?._id;
+	}
 }
diff --git a/apps/meteor/app/importer/server/classes/converters/MessageConverter.ts b/apps/meteor/app/importer/server/classes/converters/MessageConverter.ts
index b4540ed6182f..732e46b4398b 100644
--- a/apps/meteor/app/importer/server/classes/converters/MessageConverter.ts
+++ b/apps/meteor/app/importer/server/classes/converters/MessageConverter.ts
@@ -2,10 +2,10 @@ import type { IImportMessageRecord, IMessage as IDBMessage, IImportMessage, IImp
 import { Rooms } from '@rocket.chat/models';
 import limax from 'limax';
 
-import { insertMessage } from '../../../../lib/server/functions/insertMessage';
-import type { IConversionCallbacks } from '../../definitions/IConversionCallbacks';
 import type { UserIdentification, MentionedChannel } from './ConverterCache';
 import { RecordConverter } from './RecordConverter';
+import { insertMessage } from '../../../../lib/server/functions/insertMessage';
+import type { IConversionCallbacks } from '../../definitions/IConversionCallbacks';
 
 export type MessageConversionCallbacks = IConversionCallbacks & { afterImportAllMessagesFn?: (roomIds: string[]) => Promise<void> };
 
diff --git a/apps/meteor/app/importer/server/classes/converters/RecordConverter.ts b/apps/meteor/app/importer/server/classes/converters/RecordConverter.ts
index d0a6d60fa723..9003fe4bd416 100644
--- a/apps/meteor/app/importer/server/classes/converters/RecordConverter.ts
+++ b/apps/meteor/app/importer/server/classes/converters/RecordConverter.ts
@@ -4,8 +4,8 @@ import { ImportData } from '@rocket.chat/models';
 import { Random } from '@rocket.chat/random';
 import { type FindCursor, ObjectId } from 'mongodb';
 
-import type { IConversionCallbacks } from '../../definitions/IConversionCallbacks';
 import { ConverterCache } from './ConverterCache';
+import type { IConversionCallbacks } from '../../definitions/IConversionCallbacks';
 
 export type RecordConverterOptions = {
 	workInMemory?: boolean;
diff --git a/apps/meteor/app/importer/server/classes/converters/RoomConverter.ts b/apps/meteor/app/importer/server/classes/converters/RoomConverter.ts
index f57fa1a7cb88..e9a14fed6a03 100644
--- a/apps/meteor/app/importer/server/classes/converters/RoomConverter.ts
+++ b/apps/meteor/app/importer/server/classes/converters/RoomConverter.ts
@@ -2,13 +2,13 @@ import type { IImportChannel, IImportChannelRecord, IRoom } from '@rocket.chat/c
 import { Subscriptions, Rooms, Users } from '@rocket.chat/models';
 import limax from 'limax';
 
+import { RecordConverter } from './RecordConverter';
 import { createDirectMessage } from '../../../../../server/methods/createDirectMessage';
 import { saveRoomSettings } from '../../../../channel-settings/server/methods/saveRoomSettings';
 import { notifyOnSubscriptionChangedByRoomId } from '../../../../lib/server/lib/notifyListener';
 import { createChannelMethod } from '../../../../lib/server/methods/createChannel';
 import { createPrivateGroupMethod } from '../../../../lib/server/methods/createPrivateGroup';
 import type { IConversionCallbacks } from '../../definitions/IConversionCallbacks';
-import { RecordConverter } from './RecordConverter';
 
 export class RoomConverter extends RecordConverter<IImportChannelRecord> {
 	public startedByUserId: string;
diff --git a/apps/meteor/app/importer/server/classes/converters/UserConverter.ts b/apps/meteor/app/importer/server/classes/converters/UserConverter.ts
index 2d2bb7bad80a..421af3cb611e 100644
--- a/apps/meteor/app/importer/server/classes/converters/UserConverter.ts
+++ b/apps/meteor/app/importer/server/classes/converters/UserConverter.ts
@@ -5,6 +5,8 @@ import { SHA256 } from '@rocket.chat/sha256';
 import { hash as bcryptHash } from 'bcrypt';
 import { Accounts } from 'meteor/accounts-base';
 
+import { RecordConverter, type RecordConverterOptions } from './RecordConverter';
+import { generateTempPassword } from './generateTempPassword';
 import { callbacks as systemCallbacks } from '../../../../../lib/callbacks';
 import { addUserToDefaultChannels } from '../../../../lib/server/functions/addUserToDefaultChannels';
 import { generateUsernameSuggestion } from '../../../../lib/server/functions/getUsernameSuggestion';
@@ -12,7 +14,6 @@ import { saveUserIdentity } from '../../../../lib/server/functions/saveUserIdent
 import { setUserActiveStatus } from '../../../../lib/server/functions/setUserActiveStatus';
 import { notifyOnUserChange } from '../../../../lib/server/lib/notifyListener';
 import type { IConversionCallbacks } from '../../definitions/IConversionCallbacks';
-import { RecordConverter, type RecordConverterOptions } from './RecordConverter';
 
 export type UserConverterOptions = {
 	flagEmailsAsVerified?: boolean;
@@ -319,15 +320,15 @@ export class UserConverter extends RecordConverter<IImportUserRecord, UserConver
 		void notifyOnUserChange({ clientAction: 'updated', id: _id, diff: updateData.$set });
 	}
 
-	private async hashPassword(password: string): Promise<string> {
+	async hashPassword(password: string): Promise<string> {
 		return bcryptHash(SHA256(password), Accounts._bcryptRounds());
 	}
 
-	private generateTempPassword(userData: IImportUser): string {
-		return `${Date.now()}${userData.name || ''}${userData.emails.length ? userData.emails[0].toUpperCase() : ''}`;
+	generateTempPassword(userData: IImportUser): string {
+		return generateTempPassword(userData);
 	}
 
-	private async buildNewUserObject(userData: IImportUser): Promise<Partial<IUser>> {
+	async buildNewUserObject(userData: IImportUser): Promise<Partial<IUser>> {
 		return {
 			type: userData.type || 'user',
 			...(userData.username && { username: userData.username }),
@@ -376,7 +377,7 @@ export class UserConverter extends RecordConverter<IImportUserRecord, UserConver
 										enabled: true,
 										changedAt: new Date(),
 									},
-							  }
+								}
 							: {}),
 					},
 				} as IUser;
diff --git a/apps/meteor/app/importer/server/classes/converters/generateTempPassword.ts b/apps/meteor/app/importer/server/classes/converters/generateTempPassword.ts
new file mode 100644
index 000000000000..689c982c8aa6
--- /dev/null
+++ b/apps/meteor/app/importer/server/classes/converters/generateTempPassword.ts
@@ -0,0 +1,5 @@
+import type { IImportUser } from '@rocket.chat/core-typings';
+
+export function generateTempPassword(userData: IImportUser): string {
+	return `${Date.now()}${userData.name || ''}${userData.emails.length ? userData.emails[0].toUpperCase() : ''}`;
+}
diff --git a/apps/meteor/app/importer/server/methods/getImportFileData.ts b/apps/meteor/app/importer/server/methods/getImportFileData.ts
index 1d36f7fc5a5e..522a9e8b7124 100644
--- a/apps/meteor/app/importer/server/methods/getImportFileData.ts
+++ b/apps/meteor/app/importer/server/methods/getImportFileData.ts
@@ -31,6 +31,7 @@ export const executeGetImportFileData = async (): Promise<IImporterSelection | {
 		ProgressStep.PREPARING_CHANNELS,
 		ProgressStep.PREPARING_MESSAGES,
 		ProgressStep.PREPARING_USERS,
+		ProgressStep.PREPARING_CONTACTS,
 		ProgressStep.PREPARING_STARTED,
 	];
 
diff --git a/apps/meteor/app/integrations/server/lib/updateHistory.ts b/apps/meteor/app/integrations/server/lib/updateHistory.ts
index e8068ad82ac1..1f1849798b19 100644
--- a/apps/meteor/app/integrations/server/lib/updateHistory.ts
+++ b/apps/meteor/app/integrations/server/lib/updateHistory.ts
@@ -60,7 +60,7 @@ export const updateHistory = async ({
 						...(userData ? { user: omit(userData, 'services') } : {}),
 						...(roomData ? { room: roomData } : {}),
 					},
-			  }
+				}
 			: {}),
 		...(triggerWord ? { triggerWord } : {}),
 		...(typeof ranPrepareScript !== 'undefined' ? { ranPrepareScript } : {}),
diff --git a/apps/meteor/app/integrations/server/lib/validateOutgoingIntegration.ts b/apps/meteor/app/integrations/server/lib/validateOutgoingIntegration.ts
index 398f81161279..e86b982d2cf2 100644
--- a/apps/meteor/app/integrations/server/lib/validateOutgoingIntegration.ts
+++ b/apps/meteor/app/integrations/server/lib/validateOutgoingIntegration.ts
@@ -5,10 +5,10 @@ import { Babel } from 'meteor/babel-compiler';
 import { Match } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 
+import { isScriptEngineFrozen } from './validateScriptEngine';
 import { parseCSV } from '../../../../lib/utils/parseCSV';
 import { hasPermissionAsync, hasAllPermissionAsync } from '../../../authorization/server/functions/hasPermission';
 import { outgoingEvents } from '../../lib/outgoingEvents';
-import { isScriptEngineFrozen } from './validateScriptEngine';
 
 const scopedChannels = ['all_public_channels', 'all_private_groups', 'all_direct_messages'];
 const validChannelChars = ['@', '#'];
diff --git a/apps/meteor/app/integrations/server/methods/incoming/updateIncomingIntegration.ts b/apps/meteor/app/integrations/server/methods/incoming/updateIncomingIntegration.ts
index 5264aa8763c8..071cb563b01a 100644
--- a/apps/meteor/app/integrations/server/methods/incoming/updateIncomingIntegration.ts
+++ b/apps/meteor/app/integrations/server/methods/incoming/updateIncomingIntegration.ts
@@ -181,7 +181,7 @@ Meteor.methods<ServerMethods>({
 								script: integration.script,
 								scriptEnabled: integration.scriptEnabled,
 								scriptEngine,
-						  }),
+							}),
 					...(typeof integration.overrideDestinationChannelEnabled !== 'undefined' && {
 						overrideDestinationChannelEnabled: integration.overrideDestinationChannelEnabled,
 					}),
diff --git a/apps/meteor/app/integrations/server/methods/outgoing/updateOutgoingIntegration.ts b/apps/meteor/app/integrations/server/methods/outgoing/updateOutgoingIntegration.ts
index 4449902437c9..6ee39d81a588 100644
--- a/apps/meteor/app/integrations/server/methods/outgoing/updateOutgoingIntegration.ts
+++ b/apps/meteor/app/integrations/server/methods/outgoing/updateOutgoingIntegration.ts
@@ -91,7 +91,7 @@ Meteor.methods<ServerMethods>({
 								scriptEnabled: integration.scriptEnabled,
 								scriptEngine,
 								...(integration.scriptCompiled ? { scriptCompiled: integration.scriptCompiled } : { scriptError: integration.scriptError }),
-						  }),
+							}),
 					triggerWords: integration.triggerWords,
 					retryFailedCalls: integration.retryFailedCalls,
 					retryCount: integration.retryCount,
@@ -107,7 +107,7 @@ Meteor.methods<ServerMethods>({
 							$unset: {
 								...(integration.scriptCompiled ? { scriptError: 1 as const } : { scriptCompiled: 1 as const }),
 							},
-					  }),
+						}),
 			},
 		);
 
diff --git a/apps/meteor/app/integrations/server/triggers.ts b/apps/meteor/app/integrations/server/triggers.ts
index 64b95827645f..06fc9b0a9e1a 100644
--- a/apps/meteor/app/integrations/server/triggers.ts
+++ b/apps/meteor/app/integrations/server/triggers.ts
@@ -1,6 +1,6 @@
+import { triggerHandler } from './lib/triggerHandler';
 import { callbacks } from '../../../lib/callbacks';
 import { afterLeaveRoomCallback } from '../../../lib/callbacks/afterLeaveRoomCallback';
-import { triggerHandler } from './lib/triggerHandler';
 
 const callbackHandler = function _callbackHandler(eventType: string) {
 	return function _wrapperFunction(...args: any[]) {
diff --git a/apps/meteor/app/invites/server/functions/useInviteToken.ts b/apps/meteor/app/invites/server/functions/useInviteToken.ts
index 21e89bd22fbc..f514736da590 100644
--- a/apps/meteor/app/invites/server/functions/useInviteToken.ts
+++ b/apps/meteor/app/invites/server/functions/useInviteToken.ts
@@ -1,10 +1,10 @@
 import { Invites, Subscriptions, Users } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
 
+import { validateInviteToken } from './validateInviteToken';
 import { RoomMemberActions } from '../../../../definition/IRoomTypeConfig';
 import { roomCoordinator } from '../../../../server/lib/rooms/roomCoordinator';
 import { addUserToRoom } from '../../../lib/server/functions/addUserToRoom';
-import { validateInviteToken } from './validateInviteToken';
 
 export const useInviteToken = async (userId: string, token: string) => {
 	if (!userId) {
diff --git a/apps/meteor/app/irc/server/irc-bridge/index.js b/apps/meteor/app/irc/server/irc-bridge/index.js
index bc5b4f0bc33f..26d4948bd0f1 100644
--- a/apps/meteor/app/irc/server/irc-bridge/index.js
+++ b/apps/meteor/app/irc/server/irc-bridge/index.js
@@ -7,6 +7,7 @@ import { callbacks } from '../../../../lib/callbacks';
 import { afterLeaveRoomCallback } from '../../../../lib/callbacks/afterLeaveRoomCallback';
 import { afterLogoutCleanUpCallback } from '../../../../lib/callbacks/afterLogoutCleanUpCallback';
 import { withThrottling } from '../../../../lib/utils/highOrderFunctions';
+import { updateAuditedBySystem } from '../../../../server/settings/lib/auditedSettingUpdates';
 import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
 import * as servers from '../servers';
 import * as localCommandHandlers from './localHandlers';
@@ -22,7 +23,9 @@ const updateLastPing = withThrottling({ wait: 10_000 })(() => {
 	}
 
 	void (async () => {
-		const updatedValue = await Settings.updateValueById('IRC_Bridge_Last_Ping', new Date(), { upsert: true });
+		const updatedValue = await updateAuditedBySystem({
+			reason: 'updateLastPing',
+		})(Settings.updateValueById, 'IRC_Bridge_Last_Ping', new Date(), { upsert: true });
 		if (updatedValue.modifiedCount || updatedValue.upsertedCount) {
 			void notifyOnSettingChangedById('IRC_Bridge_Last_Ping');
 		}
diff --git a/apps/meteor/app/irc/server/irc-bridge/localHandlers/index.js b/apps/meteor/app/irc/server/irc-bridge/localHandlers/index.ts
similarity index 100%
rename from apps/meteor/app/irc/server/irc-bridge/localHandlers/index.js
rename to apps/meteor/app/irc/server/irc-bridge/localHandlers/index.ts
diff --git a/apps/meteor/app/irc/server/irc-bridge/peerHandlers/index.js b/apps/meteor/app/irc/server/irc-bridge/peerHandlers/index.ts
similarity index 100%
rename from apps/meteor/app/irc/server/irc-bridge/peerHandlers/index.js
rename to apps/meteor/app/irc/server/irc-bridge/peerHandlers/index.ts
diff --git a/apps/meteor/app/irc/server/irc.js b/apps/meteor/app/irc/server/irc.js
index 2f6efcb99e41..7012e2829134 100644
--- a/apps/meteor/app/irc/server/irc.js
+++ b/apps/meteor/app/irc/server/irc.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 
-import { settings } from '../../settings/server';
 import Bridge from './irc-bridge';
+import { settings } from '../../settings/server';
 
 if (!!settings.get('IRC_Enabled') === true) {
 	// Normalize the config values
diff --git a/apps/meteor/app/irc/server/methods/resetIrcConnection.ts b/apps/meteor/app/irc/server/methods/resetIrcConnection.ts
index aaaeef1c06b8..1fed8c77d28e 100644
--- a/apps/meteor/app/irc/server/methods/resetIrcConnection.ts
+++ b/apps/meteor/app/irc/server/methods/resetIrcConnection.ts
@@ -2,6 +2,8 @@ import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { Settings } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
 
+import { updateAuditedByUser } from '../../../../server/settings/lib/auditedSettingUpdates';
+import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
 import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
 import { settings } from '../../../settings/server';
 import Bridge from '../irc-bridge';
@@ -16,13 +18,33 @@ declare module '@rocket.chat/ddp-client' {
 Meteor.methods<ServerMethods>({
 	async resetIrcConnection() {
 		const ircEnabled = Boolean(settings.get('IRC_Enabled'));
+		const uid = Meteor.userId();
 
-		const updatedLastPingValue = await Settings.updateValueById('IRC_Bridge_Last_Ping', new Date(0), { upsert: true });
+		if (!uid) {
+			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'resetIrcConnection' });
+		}
+
+		if (!(await hasPermissionAsync(uid, 'edit-privileged-setting'))) {
+			throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'resetIrcConnection' });
+		}
+
+		const auditSettingOperation = updateAuditedByUser({
+			_id: uid,
+			username: (await Meteor.userAsync())!.username!,
+			ip: this.connection?.clientAddress || '',
+			useragent: this.connection?.httpHeaders['user-agent'] || '',
+		});
+
+		const updatedLastPingValue = await auditSettingOperation(Settings.updateValueById, 'IRC_Bridge_Last_Ping', new Date(0), {
+			upsert: true,
+		});
 		if (updatedLastPingValue.modifiedCount || updatedLastPingValue.upsertedCount) {
 			void notifyOnSettingChangedById('IRC_Bridge_Last_Ping');
 		}
 
-		const updatedResetTimeValue = await Settings.updateValueById('IRC_Bridge_Reset_Time', new Date(), { upsert: true });
+		const updatedResetTimeValue = await auditSettingOperation(Settings.updateValueById, 'IRC_Bridge_Reset_Time', new Date(), {
+			upsert: true,
+		});
 		if (updatedResetTimeValue.modifiedCount || updatedResetTimeValue.upsertedCount) {
 			void notifyOnSettingChangedById('IRC_Bridge_Last_Ping');
 		}
diff --git a/apps/meteor/app/irc/server/servers/index.js b/apps/meteor/app/irc/server/servers/index.ts
similarity index 100%
rename from apps/meteor/app/irc/server/servers/index.js
rename to apps/meteor/app/irc/server/servers/index.ts
diff --git a/apps/meteor/app/lib/client/OAuthProxy.js b/apps/meteor/app/lib/client/OAuthProxy.ts
similarity index 86%
rename from apps/meteor/app/lib/client/OAuthProxy.js
rename to apps/meteor/app/lib/client/OAuthProxy.ts
index a5035783c676..ec9143528fc9 100644
--- a/apps/meteor/app/lib/client/OAuthProxy.js
+++ b/apps/meteor/app/lib/client/OAuthProxy.ts
@@ -6,12 +6,12 @@ OAuth.launchLogin = ((func) =>
 	function (options) {
 		const proxy = settings.get('Accounts_OAuth_Proxy_services').replace(/\s/g, '').split(',');
 		if (proxy.includes(options.loginService)) {
-			const redirect_uri = options.loginUrl.match(/(&redirect_uri=)([^&]+|$)/)[2];
+			const redirectUri = options.loginUrl.match(/(&redirect_uri=)([^&]+|$)/)?.[2];
 			options.loginUrl = options.loginUrl.replace(
 				/(&redirect_uri=)([^&]+|$)/,
 				`$1${encodeURIComponent(settings.get('Accounts_OAuth_Proxy_host'))}/oauth_redirect`,
 			);
-			options.loginUrl = options.loginUrl.replace(/(&state=)([^&]+|$)/, `$1${redirect_uri}!$2`);
+			options.loginUrl = options.loginUrl.replace(/(&state=)([^&]+|$)/, `$1${redirectUri}!$2`);
 			options.loginUrl = `${settings.get('Accounts_OAuth_Proxy_host')}/redirect/${encodeURIComponent(options.loginUrl)}`;
 		}
 
diff --git a/apps/meteor/app/lib/client/methods/sendMessage.ts b/apps/meteor/app/lib/client/methods/sendMessage.ts
index 19220f901458..f87684eb978e 100644
--- a/apps/meteor/app/lib/client/methods/sendMessage.ts
+++ b/apps/meteor/app/lib/client/methods/sendMessage.ts
@@ -6,7 +6,7 @@ import { onClientMessageReceived } from '../../../../client/lib/onClientMessageR
 import { dispatchToastMessage } from '../../../../client/lib/toast';
 import { callbacks } from '../../../../lib/callbacks';
 import { trim } from '../../../../lib/utils/stringUtils';
-import { ChatMessage, ChatRoom } from '../../../models/client';
+import { Messages, Rooms } from '../../../models/client';
 import { settings } from '../../../settings/client';
 import { t } from '../../../utils/lib/i18n';
 
@@ -16,7 +16,7 @@ Meteor.methods<ServerMethods>({
 		if (!uid || trim(message.msg) === '') {
 			return false;
 		}
-		const messageAlreadyExists = message._id && ChatMessage.findOne({ _id: message._id });
+		const messageAlreadyExists = message._id && Messages.findOne({ _id: message._id });
 		if (messageAlreadyExists) {
 			return dispatchToastMessage({ type: 'error', message: t('Message_Already_Sent') });
 		}
@@ -36,13 +36,13 @@ Meteor.methods<ServerMethods>({
 		}
 
 		// If the room is federated, send the message to matrix only
-		const room = ChatRoom.findOne({ _id: message.rid }, { fields: { federated: 1, name: 1 } });
+		const room = Rooms.findOne({ _id: message.rid }, { fields: { federated: 1, name: 1 } });
 		if (room?.federated) {
 			return;
 		}
 
 		await onClientMessageReceived(message as IMessage).then((message) => {
-			ChatMessage.insert(message);
+			Messages.insert(message);
 			return callbacks.run('afterSaveMessage', message, { room });
 		});
 	},
diff --git a/apps/meteor/app/lib/server/functions/addUserToDefaultChannels.ts b/apps/meteor/app/lib/server/functions/addUserToDefaultChannels.ts
index 3fb9c419aa5f..f5317a7b0e3b 100644
--- a/apps/meteor/app/lib/server/functions/addUserToDefaultChannels.ts
+++ b/apps/meteor/app/lib/server/functions/addUserToDefaultChannels.ts
@@ -2,11 +2,11 @@ import { Message } from '@rocket.chat/core-services';
 import type { IUser } from '@rocket.chat/core-typings';
 import { Subscriptions } from '@rocket.chat/models';
 
+import { getDefaultChannels } from './getDefaultChannels';
 import { callbacks } from '../../../../lib/callbacks';
 import { getSubscriptionAutotranslateDefaultConfig } from '../../../../server/lib/getSubscriptionAutotranslateDefaultConfig';
 import { getDefaultSubscriptionPref } from '../../../utils/lib/getDefaultSubscriptionPref';
 import { notifyOnSubscriptionChangedById } from '../lib/notifyListener';
-import { getDefaultChannels } from './getDefaultChannels';
 
 export const addUserToDefaultChannels = async function (user: IUser, silenced?: boolean): Promise<void> {
 	await callbacks.run('beforeJoinDefaultChannels', user);
diff --git a/apps/meteor/app/lib/server/functions/checkUsernameAvailability.ts b/apps/meteor/app/lib/server/functions/checkUsernameAvailability.ts
index 316a3b8779a0..498828444e4b 100644
--- a/apps/meteor/app/lib/server/functions/checkUsernameAvailability.ts
+++ b/apps/meteor/app/lib/server/functions/checkUsernameAvailability.ts
@@ -4,8 +4,8 @@ import { escapeRegExp } from '@rocket.chat/string-helpers';
 import { Meteor } from 'meteor/meteor';
 import _ from 'underscore';
 
-import { settings } from '../../../settings/server';
 import { validateName } from './validateName';
+import { settings } from '../../../settings/server';
 
 let usernameBlackList: RegExp[] = [];
 
diff --git a/apps/meteor/app/lib/server/functions/cleanRoomHistory.ts b/apps/meteor/app/lib/server/functions/cleanRoomHistory.ts
index 765a03cad87b..8fc449cdc615 100644
--- a/apps/meteor/app/lib/server/functions/cleanRoomHistory.ts
+++ b/apps/meteor/app/lib/server/functions/cleanRoomHistory.ts
@@ -2,10 +2,10 @@ import { api } from '@rocket.chat/core-services';
 import type { IRoom } from '@rocket.chat/core-typings';
 import { Messages, Rooms, Subscriptions, ReadReceipts, Users } from '@rocket.chat/models';
 
+import { deleteRoom } from './deleteRoom';
 import { i18n } from '../../../../server/lib/i18n';
 import { FileUpload } from '../../../file-upload/server';
 import { notifyOnRoomChangedById, notifyOnSubscriptionChangedById } from '../lib/notifyListener';
-import { deleteRoom } from './deleteRoom';
 
 export async function cleanRoomHistory({
 	rid = '',
diff --git a/apps/meteor/app/lib/server/functions/closeLivechatRoom.ts b/apps/meteor/app/lib/server/functions/closeLivechatRoom.ts
index 263b137ae00c..1e7672005867 100644
--- a/apps/meteor/app/lib/server/functions/closeLivechatRoom.ts
+++ b/apps/meteor/app/lib/server/functions/closeLivechatRoom.ts
@@ -3,8 +3,8 @@ import { isOmnichannelRoom } from '@rocket.chat/core-typings';
 import { LivechatRooms, Subscriptions } from '@rocket.chat/models';
 
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
-import type { CloseRoomParams } from '../../../livechat/server/lib/LivechatTyped';
 import { Livechat } from '../../../livechat/server/lib/LivechatTyped';
+import type { CloseRoomParams } from '../../../livechat/server/lib/localTypes';
 import { notifyOnSubscriptionChanged } from '../lib/notifyListener';
 
 export const closeLivechatRoom = async (
@@ -67,12 +67,12 @@ export const closeLivechatRoom = async (
 								requestedBy: user,
 							},
 						},
-				  }
+					}
 				: {
 						emailTranscript: {
 							sendToVisitor: false,
 						},
-				  }),
+					}),
 		}),
 	};
 
diff --git a/apps/meteor/app/lib/server/functions/createRoom.ts b/apps/meteor/app/lib/server/functions/createRoom.ts
index 769155b66b60..fda2314d3f2e 100644
--- a/apps/meteor/app/lib/server/functions/createRoom.ts
+++ b/apps/meteor/app/lib/server/functions/createRoom.ts
@@ -7,13 +7,13 @@ import type { ICreatedRoom, IUser, IRoom, RoomType } from '@rocket.chat/core-typ
 import { Rooms, Subscriptions, Users } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
 
+import { createDirectRoom } from './createDirectRoom';
 import { callbacks } from '../../../../lib/callbacks';
 import { beforeCreateRoomCallback } from '../../../../lib/callbacks/beforeCreateRoomCallback';
 import { getSubscriptionAutotranslateDefaultConfig } from '../../../../server/lib/getSubscriptionAutotranslateDefaultConfig';
 import { getDefaultSubscriptionPref } from '../../../utils/lib/getDefaultSubscriptionPref';
 import { getValidRoomName } from '../../../utils/server/lib/getValidRoomName';
 import { notifyOnRoomChanged, notifyOnSubscriptionChangedById } from '../lib/notifyListener';
-import { createDirectRoom } from './createDirectRoom';
 
 const isValidName = (name: unknown): name is string => {
 	return typeof name === 'string' && name.trim().length > 0;
diff --git a/apps/meteor/app/lib/server/functions/deleteUser.ts b/apps/meteor/app/lib/server/functions/deleteUser.ts
index 483085d40811..e0a217a0d39b 100644
--- a/apps/meteor/app/lib/server/functions/deleteUser.ts
+++ b/apps/meteor/app/lib/server/functions/deleteUser.ts
@@ -16,6 +16,10 @@ import {
 } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
 
+import { getSubscribedRoomsForUserWithDetails, shouldRemoveOrChangeOwner } from './getRoomsWithSingleOwner';
+import { getUserSingleOwnedRooms } from './getUserSingleOwnedRooms';
+import { relinquishRoomOwnerships } from './relinquishRoomOwnerships';
+import { updateGroupDMsName } from './updateGroupDMsName';
 import { callbacks } from '../../../../lib/callbacks';
 import { i18n } from '../../../../server/lib/i18n';
 import { FileUpload } from '../../../file-upload/server';
@@ -26,10 +30,6 @@ import {
 	notifyOnLivechatDepartmentAgentChanged,
 	notifyOnUserChange,
 } from '../lib/notifyListener';
-import { getSubscribedRoomsForUserWithDetails, shouldRemoveOrChangeOwner } from './getRoomsWithSingleOwner';
-import { getUserSingleOwnedRooms } from './getUserSingleOwnedRooms';
-import { relinquishRoomOwnerships } from './relinquishRoomOwnerships';
-import { updateGroupDMsName } from './updateGroupDMsName';
 
 export async function deleteUser(userId: string, confirmRelinquish = false, deletedBy?: IUser['_id']): Promise<void> {
 	if (userId === 'rocket.cat') {
diff --git a/apps/meteor/app/lib/server/functions/getRoomByNameOrIdWithOptionToJoin.ts b/apps/meteor/app/lib/server/functions/getRoomByNameOrIdWithOptionToJoin.ts
index 113f8f59a557..1dd803f8b13c 100644
--- a/apps/meteor/app/lib/server/functions/getRoomByNameOrIdWithOptionToJoin.ts
+++ b/apps/meteor/app/lib/server/functions/getRoomByNameOrIdWithOptionToJoin.ts
@@ -2,9 +2,9 @@ import type { IRoom, IUser, RoomType } from '@rocket.chat/core-typings';
 import { Rooms, Users } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
 
+import { addUserToRoom } from './addUserToRoom';
 import { isObject } from '../../../../lib/utils/isObject';
 import { createDirectMessage } from '../../../../server/methods/createDirectMessage';
-import { addUserToRoom } from './addUserToRoom';
 
 export const getRoomByNameOrIdWithOptionToJoin = async ({
 	user,
diff --git a/apps/meteor/app/lib/server/functions/loadMessageHistory.ts b/apps/meteor/app/lib/server/functions/loadMessageHistory.ts
index fee7061cae96..5addbd896889 100644
--- a/apps/meteor/app/lib/server/functions/loadMessageHistory.ts
+++ b/apps/meteor/app/lib/server/functions/loadMessageHistory.ts
@@ -49,7 +49,7 @@ export async function loadMessageHistory({
 				hiddenMessageTypes,
 				options,
 				showThreadMessages,
-		  ).toArray()
+			).toArray()
 		: await Messages.findVisibleByRoomIdNotContainingTypes(rid, hiddenMessageTypes, options, showThreadMessages).toArray();
 	const messages = await normalizeMessagesForUser(records, userId);
 	let unreadNotLoaded = 0;
diff --git a/apps/meteor/app/lib/server/functions/notifications/index.ts b/apps/meteor/app/lib/server/functions/notifications/index.ts
index 54b18f502ae7..538ff2ad5ed9 100644
--- a/apps/meteor/app/lib/server/functions/notifications/index.ts
+++ b/apps/meteor/app/lib/server/functions/notifications/index.ts
@@ -47,22 +47,3 @@ export function replaceMentionedUsernamesWithFullNames(message: string, mentions
 	});
 	return message;
 }
-
-/**
- * Checks if a message contains a user highlight
- *
- * @param {string} message
- * @param {array|undefined} highlights
- *
- * @returns {boolean}
- */
-export function messageContainsHighlight(message: Pick<IMessage, 'msg'>, highlights: string[] | undefined): boolean {
-	if (!highlights || highlights.length === 0) {
-		return false;
-	}
-
-	return highlights.some((highlight: string) => {
-		const regexp = new RegExp(escapeRegExp(highlight), 'i');
-		return regexp.test(message.msg);
-	});
-}
diff --git a/apps/meteor/app/lib/server/functions/notifications/messageContainsHighlight.ts b/apps/meteor/app/lib/server/functions/notifications/messageContainsHighlight.ts
new file mode 100644
index 000000000000..d749441ba0b4
--- /dev/null
+++ b/apps/meteor/app/lib/server/functions/notifications/messageContainsHighlight.ts
@@ -0,0 +1,22 @@
+import type { IMessage } from '@rocket.chat/core-typings';
+import { escapeRegExp } from '@rocket.chat/string-helpers';
+
+/**
+ * Checks if a message contains a user highlight
+ *
+ * @param {string} message
+ * @param {array|undefined} highlights
+ *
+ * @returns {boolean}
+ */
+export function messageContainsHighlight(message: Pick<IMessage, 'msg'>, highlights: string[] | undefined): boolean {
+	if (!highlights || highlights.length === 0) {
+		return false;
+	}
+
+	return highlights.some((highlight: string) => {
+		const hl = escapeRegExp(highlight);
+		const regexp = new RegExp(`(?<!:)\\b${hl}\\b:|:\\b${hl}(?!:)\\b|\\b(?<!:)${hl}(?!:)\\b`, 'i');
+		return regexp.test(message.msg);
+	});
+}
diff --git a/apps/meteor/app/lib/server/functions/processWebhookMessage.ts b/apps/meteor/app/lib/server/functions/processWebhookMessage.ts
index 2a4303a82ddc..ae304b2af01d 100644
--- a/apps/meteor/app/lib/server/functions/processWebhookMessage.ts
+++ b/apps/meteor/app/lib/server/functions/processWebhookMessage.ts
@@ -2,12 +2,12 @@ import type { IMessage, IUser, RequiredField, MessageAttachment } from '@rocket.
 import { Meteor } from 'meteor/meteor';
 import _ from 'underscore';
 
+import { getRoomByNameOrIdWithOptionToJoin } from './getRoomByNameOrIdWithOptionToJoin';
+import { sendMessage } from './sendMessage';
 import { ensureArray } from '../../../../lib/utils/arrayUtils';
 import { trim } from '../../../../lib/utils/stringUtils';
 import { SystemLogger } from '../../../../server/lib/logger/system';
 import { validateRoomMessagePermissionsAsync } from '../../../authorization/server/functions/canSendMessage';
-import { getRoomByNameOrIdWithOptionToJoin } from './getRoomByNameOrIdWithOptionToJoin';
-import { sendMessage } from './sendMessage';
 
 type Payload = {
 	channel?: string | string[];
diff --git a/apps/meteor/app/lib/server/functions/relinquishRoomOwnerships.ts b/apps/meteor/app/lib/server/functions/relinquishRoomOwnerships.ts
index 8f1981ca386d..2d53b9b55c7c 100644
--- a/apps/meteor/app/lib/server/functions/relinquishRoomOwnerships.ts
+++ b/apps/meteor/app/lib/server/functions/relinquishRoomOwnerships.ts
@@ -1,8 +1,8 @@
 import { Messages, Roles, Rooms, Subscriptions, ReadReceipts } from '@rocket.chat/models';
 
+import type { SubscribedRoomsForUserWithDetails } from './getRoomsWithSingleOwner';
 import { FileUpload } from '../../../file-upload/server';
 import { notifyOnSubscriptionChanged } from '../lib/notifyListener';
-import type { SubscribedRoomsForUserWithDetails } from './getRoomsWithSingleOwner';
 
 const bulkRoomCleanUp = async (rids: string[]): Promise<unknown> => {
 	// no bulk deletion for files
diff --git a/apps/meteor/app/lib/server/functions/saveCustomFields.ts b/apps/meteor/app/lib/server/functions/saveCustomFields.ts
index 0657ca4bbf2b..a67304d5c5a4 100644
--- a/apps/meteor/app/lib/server/functions/saveCustomFields.ts
+++ b/apps/meteor/app/lib/server/functions/saveCustomFields.ts
@@ -1,7 +1,7 @@
-import { trim } from '../../../../lib/utils/stringUtils';
-import { settings } from '../../../settings/server';
 import { saveCustomFieldsWithoutValidation } from './saveCustomFieldsWithoutValidation';
 import { validateCustomFields } from './validateCustomFields';
+import { trim } from '../../../../lib/utils/stringUtils';
+import { settings } from '../../../settings/server';
 
 export const saveCustomFields = async function (userId: string, formData: Record<string, any>): Promise<void> {
 	if (trim(settings.get('Accounts_CustomFields')) !== '') {
diff --git a/apps/meteor/app/lib/server/functions/saveUser.js b/apps/meteor/app/lib/server/functions/saveUser.js
deleted file mode 100644
index ef6a7e9fe7bd..000000000000
--- a/apps/meteor/app/lib/server/functions/saveUser.js
+++ /dev/null
@@ -1,475 +0,0 @@
-import { Apps, AppEvents } from '@rocket.chat/apps';
-import { isUserFederated } from '@rocket.chat/core-typings';
-import { Users } from '@rocket.chat/models';
-import Gravatar from 'gravatar';
-import { Accounts } from 'meteor/accounts-base';
-import { Meteor } from 'meteor/meteor';
-import _ from 'underscore';
-
-import { callbacks } from '../../../../lib/callbacks';
-import { trim } from '../../../../lib/utils/stringUtils';
-import { getNewUserRoles } from '../../../../server/services/user/lib/getNewUserRoles';
-import { getRoles } from '../../../authorization/server';
-import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
-import * as Mailer from '../../../mailer/server/api';
-import { settings } from '../../../settings/server';
-import { safeGetMeteorUser } from '../../../utils/server/functions/safeGetMeteorUser';
-import { validateEmailDomain } from '../lib';
-import { generatePassword } from '../lib/generatePassword';
-import { notifyOnUserChangeById, notifyOnUserChange } from '../lib/notifyListener';
-import { passwordPolicy } from '../lib/passwordPolicy';
-import { checkEmailAvailability } from './checkEmailAvailability';
-import { checkUsernameAvailability } from './checkUsernameAvailability';
-import { saveUserIdentity } from './saveUserIdentity';
-import { setEmail } from './setEmail';
-import { setStatusText } from './setStatusText';
-import { setUserAvatar } from './setUserAvatar';
-
-const MAX_BIO_LENGTH = 260;
-const MAX_NICKNAME_LENGTH = 120;
-
-let html = '';
-let passwordChangedHtml = '';
-Meteor.startup(() => {
-	Mailer.getTemplate('Accounts_UserAddedEmail_Email', (template) => {
-		html = template;
-	});
-
-	Mailer.getTemplate('Password_Changed_Email', (template) => {
-		passwordChangedHtml = template;
-	});
-});
-
-async function _sendUserEmail(subject, html, userData) {
-	const email = {
-		to: userData.email,
-		from: settings.get('From_Email'),
-		subject,
-		html,
-		data: {
-			email: userData.email,
-			password: userData.password,
-		},
-	};
-
-	if (typeof userData.name !== 'undefined') {
-		email.data.name = userData.name;
-	}
-
-	try {
-		await Mailer.send(email);
-	} catch (error) {
-		throw new Meteor.Error('error-email-send-failed', `Error trying to send email: ${error.message}`, {
-			function: 'RocketChat.saveUser',
-			message: error.message,
-		});
-	}
-}
-
-async function validateUserData(userId, userData) {
-	const existingRoles = _.pluck(await getRoles(), '_id');
-
-	if (userData.verified && userData._id && userId === userData._id) {
-		throw new Meteor.Error('error-action-not-allowed', 'Editing email verification is not allowed', {
-			method: 'insertOrUpdateUser',
-			action: 'Editing_user',
-		});
-	}
-
-	if (userData._id && userId !== userData._id && !(await hasPermissionAsync(userId, 'edit-other-user-info'))) {
-		throw new Meteor.Error('error-action-not-allowed', 'Editing user is not allowed', {
-			method: 'insertOrUpdateUser',
-			action: 'Editing_user',
-		});
-	}
-
-	if (!userData._id && !(await hasPermissionAsync(userId, 'create-user'))) {
-		throw new Meteor.Error('error-action-not-allowed', 'Adding user is not allowed', {
-			method: 'insertOrUpdateUser',
-			action: 'Adding_user',
-		});
-	}
-
-	if (userData.roles && _.difference(userData.roles, existingRoles).length > 0) {
-		throw new Meteor.Error('error-action-not-allowed', 'The field Roles consist invalid role id', {
-			method: 'insertOrUpdateUser',
-			action: 'Assign_role',
-		});
-	}
-
-	if (userData.roles && userData.roles.includes('admin') && !(await hasPermissionAsync(userId, 'assign-admin-role'))) {
-		throw new Meteor.Error('error-action-not-allowed', 'Assigning admin is not allowed', {
-			method: 'insertOrUpdateUser',
-			action: 'Assign_admin',
-		});
-	}
-
-	if (settings.get('Accounts_RequireNameForSignUp') && !userData._id && !trim(userData.name)) {
-		throw new Meteor.Error('error-the-field-is-required', 'The field Name is required', {
-			method: 'insertOrUpdateUser',
-			field: 'Name',
-		});
-	}
-
-	if (!userData._id && !trim(userData.username)) {
-		throw new Meteor.Error('error-the-field-is-required', 'The field Username is required', {
-			method: 'insertOrUpdateUser',
-			field: 'Username',
-		});
-	}
-
-	let nameValidation;
-
-	try {
-		nameValidation = new RegExp(`^${settings.get('UTF8_User_Names_Validation')}$`);
-	} catch (e) {
-		nameValidation = new RegExp('^[0-9a-zA-Z-_.]+$');
-	}
-
-	if (userData.username && !nameValidation.test(userData.username)) {
-		throw new Meteor.Error('error-input-is-not-a-valid-field', `${_.escape(userData.username)} is not a valid username`, {
-			method: 'insertOrUpdateUser',
-			input: userData.username,
-			field: 'Username',
-		});
-	}
-
-	if (!userData._id && !userData.password && !userData.setRandomPassword) {
-		throw new Meteor.Error('error-the-field-is-required', 'The field Password is required', {
-			method: 'insertOrUpdateUser',
-			field: 'Password',
-		});
-	}
-
-	if (!userData._id) {
-		if (!(await checkUsernameAvailability(userData.username))) {
-			throw new Meteor.Error('error-field-unavailable', `${_.escape(userData.username)} is already in use :(`, {
-				method: 'insertOrUpdateUser',
-				field: userData.username,
-			});
-		}
-
-		if (userData.email && !(await checkEmailAvailability(userData.email))) {
-			throw new Meteor.Error('error-field-unavailable', `${_.escape(userData.email)} is already in use :(`, {
-				method: 'insertOrUpdateUser',
-				field: userData.email,
-			});
-		}
-	}
-}
-
-/**
- * Validate permissions to edit user fields
- *
- * @param {string} userId
- * @param {{ _id: string, roles?: string[], username?: string, name?: string, statusText?: string, email?: string, password?: string}} userData
- */
-export async function validateUserEditing(userId, userData) {
-	const editingMyself = userData._id && userId === userData._id;
-
-	const canEditOtherUserInfo = await hasPermissionAsync(userId, 'edit-other-user-info');
-	const canEditOtherUserPassword = await hasPermissionAsync(userId, 'edit-other-user-password');
-	const user = await Users.findOneById(userData._id);
-
-	const isEditingUserRoles = (previousRoles, newRoles) =>
-		typeof newRoles !== 'undefined' && !_.isEqual(_.sortBy(previousRoles), _.sortBy(newRoles));
-	const isEditingField = (previousValue, newValue) => typeof newValue !== 'undefined' && newValue !== previousValue;
-
-	if (isEditingUserRoles(user.roles, userData.roles) && !(await hasPermissionAsync(userId, 'assign-roles'))) {
-		throw new Meteor.Error('error-action-not-allowed', 'Assign roles is not allowed', {
-			method: 'insertOrUpdateUser',
-			action: 'Assign_role',
-		});
-	}
-
-	if (!settings.get('Accounts_AllowUserProfileChange') && !canEditOtherUserInfo && !canEditOtherUserPassword) {
-		throw new Meteor.Error('error-action-not-allowed', 'Edit user profile is not allowed', {
-			method: 'insertOrUpdateUser',
-			action: 'Update_user',
-		});
-	}
-
-	if (
-		isEditingField(user.username, userData.username) &&
-		!settings.get('Accounts_AllowUsernameChange') &&
-		(!canEditOtherUserInfo || editingMyself)
-	) {
-		throw new Meteor.Error('error-action-not-allowed', 'Edit username is not allowed', {
-			method: 'insertOrUpdateUser',
-			action: 'Update_user',
-		});
-	}
-
-	if (
-		isEditingField(user.statusText, userData.statusText) &&
-		!settings.get('Accounts_AllowUserStatusMessageChange') &&
-		(!canEditOtherUserInfo || editingMyself)
-	) {
-		throw new Meteor.Error('error-action-not-allowed', 'Edit user status is not allowed', {
-			method: 'insertOrUpdateUser',
-			action: 'Update_user',
-		});
-	}
-
-	if (
-		isEditingField(user.name, userData.name) &&
-		!settings.get('Accounts_AllowRealNameChange') &&
-		(!canEditOtherUserInfo || editingMyself)
-	) {
-		throw new Meteor.Error('error-action-not-allowed', 'Edit user real name is not allowed', {
-			method: 'insertOrUpdateUser',
-			action: 'Update_user',
-		});
-	}
-
-	if (
-		user.emails?.[0] &&
-		isEditingField(user.emails[0].address, userData.email) &&
-		!settings.get('Accounts_AllowEmailChange') &&
-		(!canEditOtherUserInfo || editingMyself)
-	) {
-		throw new Meteor.Error('error-action-not-allowed', 'Edit user email is not allowed', {
-			method: 'insertOrUpdateUser',
-			action: 'Update_user',
-		});
-	}
-
-	if (userData.password && !settings.get('Accounts_AllowPasswordChange') && (!canEditOtherUserPassword || editingMyself)) {
-		throw new Meteor.Error('error-action-not-allowed', 'Edit user password is not allowed', {
-			method: 'insertOrUpdateUser',
-			action: 'Update_user',
-		});
-	}
-}
-
-const handleBio = (updateUser, bio) => {
-	if (bio && bio.trim()) {
-		if (bio.length > MAX_BIO_LENGTH) {
-			throw new Meteor.Error('error-bio-size-exceeded', `Bio size exceeds ${MAX_BIO_LENGTH} characters`, {
-				method: 'saveUserProfile',
-			});
-		}
-		updateUser.$set = updateUser.$set || {};
-		updateUser.$set.bio = bio;
-	} else {
-		updateUser.$unset = updateUser.$unset || {};
-		updateUser.$unset.bio = 1;
-	}
-};
-
-const handleNickname = (updateUser, nickname) => {
-	if (nickname && nickname.trim()) {
-		if (nickname.length > MAX_NICKNAME_LENGTH) {
-			throw new Meteor.Error('error-nickname-size-exceeded', `Nickname size exceeds ${MAX_NICKNAME_LENGTH} characters`, {
-				method: 'saveUserProfile',
-			});
-		}
-		updateUser.$set = updateUser.$set || {};
-		updateUser.$set.nickname = nickname;
-	} else {
-		updateUser.$unset = updateUser.$unset || {};
-		updateUser.$unset.nickname = 1;
-	}
-};
-
-const saveNewUser = async function (userData, sendPassword) {
-	await validateEmailDomain(userData.email);
-
-	const roles = (!!userData.roles && userData.roles.length > 0 && userData.roles) || getNewUserRoles();
-	const isGuest = roles && roles.length === 1 && roles.includes('guest');
-
-	// insert user
-	const createUser = {
-		username: userData.username,
-		password: userData.password,
-		joinDefaultChannels: userData.joinDefaultChannels,
-		isGuest,
-		globalRoles: roles,
-		skipNewUserRolesSetting: true,
-	};
-	if (userData.email) {
-		createUser.email = userData.email;
-	}
-
-	const _id = await Accounts.createUserAsync(createUser);
-
-	const updateUser = {
-		$set: {
-			...(typeof userData.name !== 'undefined' && { name: userData.name }),
-			settings: userData.settings || {},
-		},
-	};
-
-	if (typeof userData.requirePasswordChange !== 'undefined') {
-		updateUser.$set.requirePasswordChange = userData.requirePasswordChange;
-	}
-
-	if (typeof userData.verified === 'boolean') {
-		updateUser.$set['emails.0.verified'] = userData.verified;
-	}
-
-	handleBio(updateUser, userData.bio);
-	handleNickname(updateUser, userData.nickname);
-
-	await Users.updateOne({ _id }, updateUser);
-
-	if (userData.sendWelcomeEmail) {
-		await _sendUserEmail(settings.get('Accounts_UserAddedEmail_Subject'), html, userData);
-	}
-
-	if (sendPassword) {
-		await _sendUserEmail(settings.get('Password_Changed_Email_Subject'), passwordChangedHtml, userData);
-	}
-
-	userData._id = _id;
-
-	if (settings.get('Accounts_SetDefaultAvatar') === true && userData.email) {
-		const gravatarUrl = Gravatar.url(userData.email, {
-			default: '404',
-			size: '200',
-			protocol: 'https',
-		});
-
-		try {
-			await setUserAvatar(userData, gravatarUrl, '', 'url');
-		} catch (e) {
-			// Ignore this error for now, as it not being successful isn't bad
-		}
-	}
-
-	void notifyOnUserChangeById({ clientAction: 'inserted', id: _id });
-
-	return _id;
-};
-
-export const saveUser = async function (userId, userData) {
-	const oldUserData = userData._id && (await Users.findOneById(userData._id));
-	if (oldUserData && isUserFederated(oldUserData)) {
-		throw new Meteor.Error('Edit_Federated_User_Not_Allowed', 'Not possible to edit a federated user');
-	}
-
-	await validateUserData(userId, userData);
-
-	await callbacks.run('beforeSaveUser', {
-		user: userData,
-		oldUser: oldUserData,
-	});
-
-	let sendPassword = false;
-
-	if (userData.hasOwnProperty('setRandomPassword')) {
-		if (userData.setRandomPassword) {
-			userData.password = generatePassword();
-			userData.requirePasswordChange = true;
-			sendPassword = true;
-		}
-
-		delete userData.setRandomPassword;
-	}
-
-	if (!userData._id) {
-		return saveNewUser(userData, sendPassword);
-	}
-
-	await validateUserEditing(userId, userData);
-
-	// update user
-	if (userData.hasOwnProperty('username') || userData.hasOwnProperty('name')) {
-		if (
-			!(await saveUserIdentity({
-				_id: userData._id,
-				username: userData.username,
-				name: userData.name,
-				updateUsernameInBackground: true,
-			}))
-		) {
-			throw new Meteor.Error('error-could-not-save-identity', 'Could not save user identity', {
-				method: 'saveUser',
-			});
-		}
-	}
-
-	if (typeof userData.statusText === 'string') {
-		await setStatusText(userData._id, userData.statusText);
-	}
-
-	if (userData.email) {
-		const shouldSendVerificationEmailToUser = userData.verified !== true;
-		await setEmail(userData._id, userData.email, shouldSendVerificationEmailToUser);
-	}
-
-	if (
-		userData.password &&
-		userData.password.trim() &&
-		(await hasPermissionAsync(userId, 'edit-other-user-password')) &&
-		passwordPolicy.validate(userData.password)
-	) {
-		await Accounts.setPasswordAsync(userData._id, userData.password.trim());
-	} else {
-		sendPassword = false;
-	}
-
-	const updateUser = {
-		$set: {},
-		$unset: {},
-	};
-
-	handleBio(updateUser, userData.bio);
-	handleNickname(updateUser, userData.nickname);
-
-	if (userData.roles) {
-		updateUser.$set.roles = userData.roles;
-	}
-	if (userData.settings) {
-		updateUser.$set.settings = { preferences: userData.settings.preferences };
-	}
-
-	if (userData.language) {
-		updateUser.$set.language = userData.language;
-	}
-
-	if (typeof userData.requirePasswordChange !== 'undefined') {
-		updateUser.$set.requirePasswordChange = userData.requirePasswordChange;
-		if (!userData.requirePasswordChange) {
-			updateUser.$unset.requirePasswordChangeReason = 1;
-		}
-	}
-
-	if (typeof userData.verified === 'boolean') {
-		updateUser.$set['emails.0.verified'] = userData.verified;
-	}
-
-	await Users.updateOne({ _id: userData._id }, updateUser);
-
-	// App IPostUserUpdated event hook
-	const userUpdated = await Users.findOneById(userData._id);
-
-	await callbacks.run('afterSaveUser', {
-		user: userUpdated,
-		oldUser: oldUserData,
-	});
-
-	await Apps.self?.triggerEvent(AppEvents.IPostUserUpdated, {
-		user: userUpdated,
-		previousUser: oldUserData,
-		performedBy: await safeGetMeteorUser(),
-	});
-
-	if (sendPassword) {
-		await _sendUserEmail(settings.get('Password_Changed_Email_Subject'), passwordChangedHtml, userData);
-	}
-
-	if (typeof userData.verified === 'boolean') {
-		delete userData.verified;
-	}
-	void notifyOnUserChange({
-		clientAction: 'updated',
-		id: userData._id,
-		diff: {
-			...userData,
-			emails: userUpdated.emails,
-		},
-	});
-
-	return true;
-};
diff --git a/apps/meteor/app/lib/server/functions/saveUser/handleBio.ts b/apps/meteor/app/lib/server/functions/saveUser/handleBio.ts
new file mode 100644
index 000000000000..1d2f572f5cd9
--- /dev/null
+++ b/apps/meteor/app/lib/server/functions/saveUser/handleBio.ts
@@ -0,0 +1,22 @@
+import { MeteorError } from '@rocket.chat/core-services';
+import type { DeepPartial, DeepWritable, IUser } from '@rocket.chat/core-typings';
+import type { UpdateFilter } from 'mongodb';
+
+import type { SaveUserData } from './saveUser';
+
+const MAX_BIO_LENGTH = 260;
+
+export const handleBio = (updateUser: DeepWritable<UpdateFilter<DeepPartial<IUser>>>, bio: SaveUserData['bio']) => {
+	if (bio?.trim()) {
+		if (bio.length > MAX_BIO_LENGTH) {
+			throw new MeteorError('error-bio-size-exceeded', `Bio size exceeds ${MAX_BIO_LENGTH} characters`, {
+				method: 'saveUserProfile',
+			});
+		}
+		updateUser.$set = updateUser.$set || {};
+		updateUser.$set.bio = bio;
+	} else {
+		updateUser.$unset = updateUser.$unset || {};
+		updateUser.$unset.bio = 1;
+	}
+};
diff --git a/apps/meteor/app/lib/server/functions/saveUser/handleNickname.ts b/apps/meteor/app/lib/server/functions/saveUser/handleNickname.ts
new file mode 100644
index 000000000000..4a37ec9e1518
--- /dev/null
+++ b/apps/meteor/app/lib/server/functions/saveUser/handleNickname.ts
@@ -0,0 +1,22 @@
+import { MeteorError } from '@rocket.chat/core-services';
+import type { DeepPartial, DeepWritable, IUser } from '@rocket.chat/core-typings';
+import type { UpdateFilter } from 'mongodb';
+
+import type { SaveUserData } from './saveUser';
+
+const MAX_NICKNAME_LENGTH = 120;
+
+export const handleNickname = (updateUser: DeepWritable<UpdateFilter<DeepPartial<IUser>>>, nickname: SaveUserData['nickname']) => {
+	if (nickname?.trim()) {
+		if (nickname.length > MAX_NICKNAME_LENGTH) {
+			throw new MeteorError('error-nickname-size-exceeded', `Nickname size exceeds ${MAX_NICKNAME_LENGTH} characters`, {
+				method: 'saveUserProfile',
+			});
+		}
+		updateUser.$set = updateUser.$set || {};
+		updateUser.$set.nickname = nickname;
+	} else {
+		updateUser.$unset = updateUser.$unset || {};
+		updateUser.$unset.nickname = 1;
+	}
+};
diff --git a/apps/meteor/app/lib/server/functions/saveUser/index.ts b/apps/meteor/app/lib/server/functions/saveUser/index.ts
new file mode 100644
index 000000000000..3fd0668e6e47
--- /dev/null
+++ b/apps/meteor/app/lib/server/functions/saveUser/index.ts
@@ -0,0 +1,2 @@
+export { saveUser } from './saveUser';
+export { validateUserEditing } from './validateUserEditing';
diff --git a/apps/meteor/app/lib/server/functions/saveUser/saveNewUser.ts b/apps/meteor/app/lib/server/functions/saveUser/saveNewUser.ts
new file mode 100644
index 000000000000..18e2858e81c0
--- /dev/null
+++ b/apps/meteor/app/lib/server/functions/saveUser/saveNewUser.ts
@@ -0,0 +1,84 @@
+import type { DeepPartial, DeepWritable, IUser, RequiredField } from '@rocket.chat/core-typings';
+import { Users } from '@rocket.chat/models';
+import Gravatar from 'gravatar';
+import type { UpdateFilter } from 'mongodb';
+
+import { getNewUserRoles } from '../../../../../server/services/user/lib/getNewUserRoles';
+import { settings } from '../../../../settings/server';
+import { notifyOnUserChangeById } from '../../lib/notifyListener';
+import { validateEmailDomain } from '../../lib/validateEmailDomain';
+import { setUserAvatar } from '../setUserAvatar';
+import { handleBio } from './handleBio';
+import { handleNickname } from './handleNickname';
+import type { SaveUserData } from './saveUser';
+import { sendPasswordEmail, sendWelcomeEmail } from './sendUserEmail';
+
+export const saveNewUser = async function (userData: SaveUserData, sendPassword: boolean) {
+	await validateEmailDomain(userData.email);
+
+	const roles = (!!userData.roles && userData.roles.length > 0 && userData.roles) || getNewUserRoles();
+	const isGuest = roles && roles.length === 1 && roles.includes('guest');
+
+	// insert user
+	const createUser: Record<string, any> = {
+		username: userData.username,
+		password: userData.password,
+		joinDefaultChannels: userData.joinDefaultChannels,
+		isGuest,
+		globalRoles: roles,
+		skipNewUserRolesSetting: true,
+	};
+	if (userData.email) {
+		createUser.email = userData.email;
+	}
+
+	const _id = await Accounts.createUserAsync(createUser);
+
+	const updateUser: RequiredField<DeepWritable<UpdateFilter<DeepPartial<IUser>>>, '$set'> = {
+		$set: {
+			...(typeof userData.name !== 'undefined' && { name: userData.name }),
+			settings: userData.settings || {},
+		},
+	};
+
+	if (typeof userData.requirePasswordChange !== 'undefined') {
+		updateUser.$set.requirePasswordChange = userData.requirePasswordChange;
+	}
+
+	if (typeof userData.verified === 'boolean') {
+		updateUser.$set['emails.0.verified'] = userData.verified;
+	}
+
+	handleBio(updateUser, userData.bio);
+	handleNickname(updateUser, userData.nickname);
+
+	await Users.updateOne({ _id }, updateUser as UpdateFilter<IUser>);
+
+	if (userData.sendWelcomeEmail) {
+		await sendWelcomeEmail(userData);
+	}
+
+	if (sendPassword) {
+		await sendPasswordEmail(userData);
+	}
+
+	userData._id = _id;
+
+	if (settings.get('Accounts_SetDefaultAvatar') === true && userData.email) {
+		const gravatarUrl = Gravatar.url(userData.email, {
+			default: '404',
+			size: '200',
+			protocol: 'https',
+		});
+
+		try {
+			await setUserAvatar({ ...userData, _id }, gravatarUrl, '', 'url');
+		} catch (e) {
+			// Ignore this error for now, as it not being successful isn't bad
+		}
+	}
+
+	void notifyOnUserChangeById({ clientAction: 'inserted', id: _id });
+
+	return _id;
+};
diff --git a/apps/meteor/app/lib/server/functions/saveUser/saveUser.ts b/apps/meteor/app/lib/server/functions/saveUser/saveUser.ts
new file mode 100644
index 000000000000..ce9624c60444
--- /dev/null
+++ b/apps/meteor/app/lib/server/functions/saveUser/saveUser.ts
@@ -0,0 +1,179 @@
+import { Apps, AppEvents } from '@rocket.chat/apps';
+import { isUserFederated } from '@rocket.chat/core-typings';
+import type { DeepWritable, DeepPartial, IUser, IRole, IUserSettings, RequiredField } from '@rocket.chat/core-typings';
+import { Users } from '@rocket.chat/models';
+import { Accounts } from 'meteor/accounts-base';
+import { Meteor } from 'meteor/meteor';
+import type { UpdateFilter } from 'mongodb';
+
+import { callbacks } from '../../../../../lib/callbacks';
+import { hasPermissionAsync } from '../../../../authorization/server/functions/hasPermission';
+import { safeGetMeteorUser } from '../../../../utils/server/functions/safeGetMeteorUser';
+import { generatePassword } from '../../lib/generatePassword';
+import { notifyOnUserChange } from '../../lib/notifyListener';
+import { passwordPolicy } from '../../lib/passwordPolicy';
+import { saveUserIdentity } from '../saveUserIdentity';
+import { setEmail } from '../setEmail';
+import { setStatusText } from '../setStatusText';
+import { handleBio } from './handleBio';
+import { handleNickname } from './handleNickname';
+import { saveNewUser } from './saveNewUser';
+import { sendPasswordEmail } from './sendUserEmail';
+import { validateUserData } from './validateUserData';
+import { validateUserEditing } from './validateUserEditing';
+
+export type SaveUserData = {
+	_id?: IUser['_id'];
+	setRandomPassword?: boolean;
+
+	password?: string;
+	requirePasswordChange?: boolean;
+
+	username?: string;
+	name?: string;
+
+	statusText?: string;
+	email?: string;
+	verified?: boolean;
+
+	bio?: string;
+	nickname?: string;
+
+	roles?: IRole['_id'][];
+	settings?: Partial<IUserSettings>;
+	language?: string;
+
+	joinDefaultChannels?: boolean;
+	sendWelcomeEmail?: boolean;
+};
+
+export const saveUser = async function (userId: IUser['_id'], userData: SaveUserData) {
+	const oldUserData = userData._id && (await Users.findOneById(userData._id));
+	if (oldUserData && isUserFederated(oldUserData)) {
+		throw new Meteor.Error('Edit_Federated_User_Not_Allowed', 'Not possible to edit a federated user');
+	}
+
+	await validateUserData(userId, userData);
+
+	await callbacks.run('beforeSaveUser', {
+		user: userData,
+		oldUser: oldUserData,
+	});
+
+	let sendPassword = false;
+
+	if (userData.hasOwnProperty('setRandomPassword')) {
+		if (userData.setRandomPassword) {
+			userData.password = generatePassword();
+			userData.requirePasswordChange = true;
+			sendPassword = true;
+		}
+
+		delete userData.setRandomPassword;
+	}
+
+	if (!userData._id) {
+		return saveNewUser(userData, sendPassword);
+	}
+
+	await validateUserEditing(userId, userData as RequiredField<SaveUserData, '_id'>);
+
+	// update user
+	if (userData.hasOwnProperty('username') || userData.hasOwnProperty('name')) {
+		if (
+			!(await saveUserIdentity({
+				_id: userData._id,
+				username: userData.username,
+				name: userData.name,
+				updateUsernameInBackground: true,
+			}))
+		) {
+			throw new Meteor.Error('error-could-not-save-identity', 'Could not save user identity', {
+				method: 'saveUser',
+			});
+		}
+	}
+
+	if (typeof userData.statusText === 'string') {
+		await setStatusText(userData._id, userData.statusText);
+	}
+
+	if (userData.email) {
+		const shouldSendVerificationEmailToUser = userData.verified !== true;
+		await setEmail(userData._id, userData.email, shouldSendVerificationEmailToUser);
+	}
+
+	if (
+		userData.password?.trim() &&
+		(await hasPermissionAsync(userId, 'edit-other-user-password')) &&
+		passwordPolicy.validate(userData.password)
+	) {
+		await Accounts.setPasswordAsync(userData._id, userData.password.trim());
+	} else {
+		sendPassword = false;
+	}
+
+	const updateUser: RequiredField<DeepWritable<UpdateFilter<DeepPartial<IUser>>>, '$set' | '$unset'> = {
+		$set: {},
+		$unset: {},
+	};
+
+	handleBio(updateUser, userData.bio);
+	handleNickname(updateUser, userData.nickname);
+
+	if (userData.roles) {
+		updateUser.$set.roles = userData.roles;
+	}
+	if (userData.settings) {
+		updateUser.$set.settings = { preferences: userData.settings.preferences };
+	}
+
+	if (userData.language) {
+		updateUser.$set.language = userData.language;
+	}
+
+	if (typeof userData.requirePasswordChange !== 'undefined') {
+		updateUser.$set.requirePasswordChange = userData.requirePasswordChange;
+		if (!userData.requirePasswordChange) {
+			updateUser.$unset.requirePasswordChangeReason = 1;
+		}
+	}
+
+	if (typeof userData.verified === 'boolean') {
+		updateUser.$set['emails.0.verified'] = userData.verified;
+	}
+
+	await Users.updateOne({ _id: userData._id }, updateUser as UpdateFilter<IUser>);
+
+	// App IPostUserUpdated event hook
+	const userUpdated = await Users.findOneById(userData._id);
+
+	await callbacks.run('afterSaveUser', {
+		user: userUpdated,
+		oldUser: oldUserData,
+	});
+
+	await Apps.self?.triggerEvent(AppEvents.IPostUserUpdated, {
+		user: userUpdated,
+		previousUser: oldUserData,
+		performedBy: await safeGetMeteorUser(),
+	});
+
+	if (sendPassword) {
+		await sendPasswordEmail(userData);
+	}
+
+	if (typeof userData.verified === 'boolean') {
+		delete userData.verified;
+	}
+	void notifyOnUserChange({
+		clientAction: 'updated',
+		id: userData._id,
+		diff: {
+			...userData,
+			emails: userUpdated?.emails,
+		},
+	});
+
+	return true;
+};
diff --git a/apps/meteor/app/lib/server/functions/saveUser/sendUserEmail.ts b/apps/meteor/app/lib/server/functions/saveUser/sendUserEmail.ts
new file mode 100644
index 000000000000..cba836cdbf9c
--- /dev/null
+++ b/apps/meteor/app/lib/server/functions/saveUser/sendUserEmail.ts
@@ -0,0 +1,54 @@
+import { MeteorError } from '@rocket.chat/core-services';
+
+import type { SaveUserData } from './saveUser';
+import * as Mailer from '../../../../mailer/server/api';
+import { settings } from '../../../../settings/server';
+
+let html = '';
+let passwordChangedHtml = '';
+Meteor.startup(() => {
+	Mailer.getTemplate('Accounts_UserAddedEmail_Email', (template) => {
+		html = template;
+	});
+
+	Mailer.getTemplate('Password_Changed_Email', (template) => {
+		passwordChangedHtml = template;
+	});
+});
+
+export async function sendUserEmail(subject: string, html: string, userData: SaveUserData): Promise<void> {
+	if (!userData.email) {
+		return;
+	}
+
+	const email = {
+		to: userData.email,
+		from: settings.get<string>('From_Email'),
+		subject,
+		html,
+		data: {
+			email: userData.email,
+			password: userData.password,
+			...(typeof userData.name !== 'undefined' ? { name: userData.name } : {}),
+		},
+	};
+
+	try {
+		await Mailer.send(email);
+	} catch (error) {
+		const errorMessage = typeof error === 'object' && error && 'message' in error ? error.message : '';
+
+		throw new MeteorError('error-email-send-failed', `Error trying to send email: ${errorMessage}`, {
+			function: 'RocketChat.saveUser',
+			message: errorMessage,
+		});
+	}
+}
+
+export async function sendWelcomeEmail(userData: SaveUserData) {
+	return sendUserEmail(settings.get('Accounts_UserAddedEmail_Subject'), html, userData);
+}
+
+export async function sendPasswordEmail(userData: SaveUserData) {
+	return sendUserEmail(settings.get('Password_Changed_Email_Subject'), passwordChangedHtml, userData);
+}
diff --git a/apps/meteor/app/lib/server/functions/saveUser/validateUserData.ts b/apps/meteor/app/lib/server/functions/saveUser/validateUserData.ts
new file mode 100644
index 000000000000..52652a6c47b4
--- /dev/null
+++ b/apps/meteor/app/lib/server/functions/saveUser/validateUserData.ts
@@ -0,0 +1,107 @@
+import { MeteorError } from '@rocket.chat/core-services';
+import type { IUser } from '@rocket.chat/core-typings';
+import { makeFunction } from '@rocket.chat/patch-injection';
+import escape from 'lodash.escape';
+
+import { trim } from '../../../../../lib/utils/stringUtils';
+import { getRoleIds } from '../../../../authorization/server/functions/getRoles';
+import { hasPermissionAsync } from '../../../../authorization/server/functions/hasPermission';
+import { settings } from '../../../../settings/server';
+import { checkEmailAvailability } from '../checkEmailAvailability';
+import { checkUsernameAvailability } from '../checkUsernameAvailability';
+import type { SaveUserData } from './saveUser';
+
+export const validateUserData = makeFunction(async (userId: IUser['_id'], userData: SaveUserData): Promise<void> => {
+	const existingRoles = await getRoleIds();
+
+	if (userData.verified && userData._id && userId === userData._id) {
+		throw new MeteorError('error-action-not-allowed', 'Editing email verification is not allowed', {
+			method: 'insertOrUpdateUser',
+			action: 'Editing_user',
+		});
+	}
+
+	if (userData._id && userId !== userData._id && !(await hasPermissionAsync(userId, 'edit-other-user-info'))) {
+		throw new MeteorError('error-action-not-allowed', 'Editing user is not allowed', {
+			method: 'insertOrUpdateUser',
+			action: 'Editing_user',
+		});
+	}
+
+	if (!userData._id && !(await hasPermissionAsync(userId, 'create-user'))) {
+		throw new MeteorError('error-action-not-allowed', 'Adding user is not allowed', {
+			method: 'insertOrUpdateUser',
+			action: 'Adding_user',
+		});
+	}
+
+	if (userData.roles) {
+		const newRoles = userData.roles.filter((roleId) => !existingRoles.includes(roleId));
+		if (newRoles.length > 0) {
+			throw new MeteorError('error-action-not-allowed', 'The field Roles consist invalid role id', {
+				method: 'insertOrUpdateUser',
+				action: 'Assign_role',
+			});
+		}
+	}
+
+	if (userData.roles?.includes('admin') && !(await hasPermissionAsync(userId, 'assign-admin-role'))) {
+		throw new MeteorError('error-action-not-allowed', 'Assigning admin is not allowed', {
+			method: 'insertOrUpdateUser',
+			action: 'Assign_admin',
+		});
+	}
+
+	if (settings.get('Accounts_RequireNameForSignUp') && !userData._id && !trim(userData.name)) {
+		throw new MeteorError('error-the-field-is-required', 'The field Name is required', {
+			method: 'insertOrUpdateUser',
+			field: 'Name',
+		});
+	}
+
+	if (!userData._id && !trim(userData.username)) {
+		throw new MeteorError('error-the-field-is-required', 'The field Username is required', {
+			method: 'insertOrUpdateUser',
+			field: 'Username',
+		});
+	}
+
+	let nameValidation;
+
+	try {
+		nameValidation = new RegExp(`^${settings.get('UTF8_User_Names_Validation')}$`);
+	} catch (e) {
+		nameValidation = new RegExp('^[0-9a-zA-Z-_.]+$');
+	}
+
+	if (userData.username && !nameValidation.test(userData.username)) {
+		throw new MeteorError('error-input-is-not-a-valid-field', `${escape(userData.username)} is not a valid username`, {
+			method: 'insertOrUpdateUser',
+			input: userData.username,
+			field: 'Username',
+		});
+	}
+
+	if (!userData._id && !userData.password && !userData.setRandomPassword) {
+		throw new MeteorError('error-the-field-is-required', 'The field Password is required', {
+			method: 'insertOrUpdateUser',
+			field: 'Password',
+		});
+	}
+
+	if (!userData._id) {
+		if (userData.username && !(await checkUsernameAvailability(userData.username))) {
+			throw new MeteorError('error-field-unavailable', `${escape(userData.username)} is already in use :(`, {
+				method: 'insertOrUpdateUser',
+				field: userData.username,
+			});
+		}
+
+		if (userData.email && !(await checkEmailAvailability(userData.email))) {
+			throw new MeteorError('error-field-unavailable', `${escape(userData.email)} is already in use :(`, {
+				method: 'insertOrUpdateUser',
+				field: userData.email,
+			});
+		}
+	}
+});
diff --git a/apps/meteor/app/lib/server/functions/saveUser/validateUserEditing.ts b/apps/meteor/app/lib/server/functions/saveUser/validateUserEditing.ts
new file mode 100644
index 000000000000..fc151204fba1
--- /dev/null
+++ b/apps/meteor/app/lib/server/functions/saveUser/validateUserEditing.ts
@@ -0,0 +1,96 @@
+import { MeteorError } from '@rocket.chat/core-services';
+import type { IUser, RequiredField } from '@rocket.chat/core-typings';
+import { Users } from '@rocket.chat/models';
+
+import type { SaveUserData } from './saveUser';
+import { hasPermissionAsync } from '../../../../authorization/server/functions/hasPermission';
+import { settings } from '../../../../settings/server';
+
+const isEditingUserRoles = (previousRoles: IUser['roles'], newRoles?: IUser['roles']) =>
+	newRoles !== undefined &&
+	(newRoles.some((item) => !previousRoles.includes(item)) || previousRoles.some((item) => !newRoles.includes(item)));
+const isEditingField = (previousValue?: string, newValue?: string) => typeof newValue !== 'undefined' && newValue !== previousValue;
+
+/**
+ * Validate permissions to edit user fields
+ *
+ * @param {string} userId
+ * @param {{ _id: string, roles?: string[], username?: string, name?: string, statusText?: string, email?: string, password?: string}} userData
+ */
+export async function validateUserEditing(userId: IUser['_id'], userData: RequiredField<SaveUserData, '_id'>): Promise<void> {
+	const editingMyself = userData._id && userId === userData._id;
+
+	const canEditOtherUserInfo = await hasPermissionAsync(userId, 'edit-other-user-info');
+	const canEditOtherUserPassword = await hasPermissionAsync(userId, 'edit-other-user-password');
+	const user = await Users.findOneById(userData._id);
+
+	if (!user) {
+		throw new MeteorError('error-invalid-user', 'Invalid user');
+	}
+
+	if (isEditingUserRoles(user.roles, userData.roles) && !(await hasPermissionAsync(userId, 'assign-roles'))) {
+		throw new MeteorError('error-action-not-allowed', 'Assign roles is not allowed', {
+			method: 'insertOrUpdateUser',
+			action: 'Assign_role',
+		});
+	}
+
+	if (!settings.get('Accounts_AllowUserProfileChange') && !canEditOtherUserInfo && !canEditOtherUserPassword) {
+		throw new MeteorError('error-action-not-allowed', 'Edit user profile is not allowed', {
+			method: 'insertOrUpdateUser',
+			action: 'Update_user',
+		});
+	}
+
+	if (
+		isEditingField(user.username, userData.username) &&
+		!settings.get('Accounts_AllowUsernameChange') &&
+		(!canEditOtherUserInfo || editingMyself)
+	) {
+		throw new MeteorError('error-action-not-allowed', 'Edit username is not allowed', {
+			method: 'insertOrUpdateUser',
+			action: 'Update_user',
+		});
+	}
+
+	if (
+		isEditingField(user.statusText, userData.statusText) &&
+		!settings.get('Accounts_AllowUserStatusMessageChange') &&
+		(!canEditOtherUserInfo || editingMyself)
+	) {
+		throw new MeteorError('error-action-not-allowed', 'Edit user status is not allowed', {
+			method: 'insertOrUpdateUser',
+			action: 'Update_user',
+		});
+	}
+
+	if (
+		isEditingField(user.name, userData.name) &&
+		!settings.get('Accounts_AllowRealNameChange') &&
+		(!canEditOtherUserInfo || editingMyself)
+	) {
+		throw new MeteorError('error-action-not-allowed', 'Edit user real name is not allowed', {
+			method: 'insertOrUpdateUser',
+			action: 'Update_user',
+		});
+	}
+
+	if (
+		user.emails?.[0] &&
+		isEditingField(user.emails[0].address, userData.email) &&
+		!settings.get('Accounts_AllowEmailChange') &&
+		(!canEditOtherUserInfo || editingMyself)
+	) {
+		throw new MeteorError('error-action-not-allowed', 'Edit user email is not allowed', {
+			method: 'insertOrUpdateUser',
+			action: 'Update_user',
+		});
+	}
+
+	if (userData.password && !settings.get('Accounts_AllowPasswordChange') && (!canEditOtherUserPassword || editingMyself)) {
+		throw new MeteorError('error-action-not-allowed', 'Edit user password is not allowed', {
+			method: 'insertOrUpdateUser',
+			action: 'Update_user',
+		});
+	}
+}
diff --git a/apps/meteor/app/lib/server/functions/saveUserIdentity.ts b/apps/meteor/app/lib/server/functions/saveUserIdentity.ts
index 1729a1ba8abd..7a200a029725 100644
--- a/apps/meteor/app/lib/server/functions/saveUserIdentity.ts
+++ b/apps/meteor/app/lib/server/functions/saveUserIdentity.ts
@@ -1,6 +1,10 @@
 import type { IUser } from '@rocket.chat/core-typings';
 import { Messages, VideoConference, LivechatDepartmentAgents, Rooms, Subscriptions, Users } from '@rocket.chat/models';
 
+import { _setRealName } from './setRealName';
+import { _setUsername } from './setUsername';
+import { updateGroupDMsName } from './updateGroupDMsName';
+import { validateName } from './validateName';
 import { SystemLogger } from '../../../../server/lib/logger/system';
 import { FileUpload } from '../../../file-upload/server';
 import {
@@ -8,10 +12,6 @@ import {
 	notifyOnSubscriptionChangedByUserId,
 	notifyOnSubscriptionChangedByNameAndRoomType,
 } from '../lib/notifyListener';
-import { _setRealName } from './setRealName';
-import { _setUsername } from './setUsername';
-import { updateGroupDMsName } from './updateGroupDMsName';
-import { validateName } from './validateName';
 
 /**
  *
diff --git a/apps/meteor/app/lib/server/functions/sendMessage.ts b/apps/meteor/app/lib/server/functions/sendMessage.ts
index aba5ddb7264c..828de8451a21 100644
--- a/apps/meteor/app/lib/server/functions/sendMessage.ts
+++ b/apps/meteor/app/lib/server/functions/sendMessage.ts
@@ -4,6 +4,7 @@ import type { IMessage, IRoom } from '@rocket.chat/core-typings';
 import { Messages } from '@rocket.chat/models';
 import { Match, check } from 'meteor/check';
 
+import { parseUrlsInMessage } from './parseUrlsInMessage';
 import { isRelativeURL } from '../../../../lib/utils/isRelativeURL';
 import { isURL } from '../../../../lib/utils/isURL';
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
@@ -12,7 +13,6 @@ import { settings } from '../../../settings/server';
 import { afterSaveMessage } from '../lib/afterSaveMessage';
 import { notifyOnRoomChangedById, notifyOnMessageChange } from '../lib/notifyListener';
 import { validateCustomMessageFields } from '../lib/validateCustomMessageFields';
-import { parseUrlsInMessage } from './parseUrlsInMessage';
 
 // TODO: most of the types here are wrong, but I don't want to change them now
 
diff --git a/apps/meteor/app/lib/server/functions/setRoomAvatar.ts b/apps/meteor/app/lib/server/functions/setRoomAvatar.ts
index 42fc615f09db..8a3467bdc4dc 100644
--- a/apps/meteor/app/lib/server/functions/setRoomAvatar.ts
+++ b/apps/meteor/app/lib/server/functions/setRoomAvatar.ts
@@ -4,8 +4,8 @@ import { isRegisterUser } from '@rocket.chat/core-typings';
 import { Avatars, Rooms } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
 
-import { FileUpload } from '../../../file-upload/server';
 import { RocketChatFile } from '../../../file/server';
+import { FileUpload } from '../../../file-upload/server';
 
 export const setRoomAvatar = async function (rid: string, dataURI: string, user: IUser): Promise<void> {
 	if (!isRegisterUser(user)) {
diff --git a/apps/meteor/app/lib/server/functions/setUserActiveStatus.ts b/apps/meteor/app/lib/server/functions/setUserActiveStatus.ts
index 929c24210d2d..466a5862853d 100644
--- a/apps/meteor/app/lib/server/functions/setUserActiveStatus.ts
+++ b/apps/meteor/app/lib/server/functions/setUserActiveStatus.ts
@@ -6,6 +6,10 @@ import { Accounts } from 'meteor/accounts-base';
 import { check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 
+import { closeOmnichannelConversations } from './closeOmnichannelConversations';
+import { shouldRemoveOrChangeOwner, getSubscribedRoomsForUserWithDetails } from './getRoomsWithSingleOwner';
+import { getUserSingleOwnedRooms } from './getUserSingleOwnedRooms';
+import { relinquishRoomOwnerships } from './relinquishRoomOwnerships';
 import { callbacks } from '../../../../lib/callbacks';
 import * as Mailer from '../../../mailer/server/api';
 import { settings } from '../../../settings/server';
@@ -15,10 +19,6 @@ import {
 	notifyOnSubscriptionChangedByNameAndRoomType,
 	notifyOnUserChange,
 } from '../lib/notifyListener';
-import { closeOmnichannelConversations } from './closeOmnichannelConversations';
-import { shouldRemoveOrChangeOwner, getSubscribedRoomsForUserWithDetails } from './getRoomsWithSingleOwner';
-import { getUserSingleOwnedRooms } from './getUserSingleOwnedRooms';
-import { relinquishRoomOwnerships } from './relinquishRoomOwnerships';
 
 async function reactivateDirectConversations(userId: string) {
 	// since both users can be deactivated at the same time, we should just reactivate rooms if both users are active
diff --git a/apps/meteor/app/lib/server/functions/setUserAvatar.ts b/apps/meteor/app/lib/server/functions/setUserAvatar.ts
index 13ccd2de6954..c678b8a07e22 100644
--- a/apps/meteor/app/lib/server/functions/setUserAvatar.ts
+++ b/apps/meteor/app/lib/server/functions/setUserAvatar.ts
@@ -5,12 +5,12 @@ import type { Response } from '@rocket.chat/server-fetch';
 import { serverFetch as fetch } from '@rocket.chat/server-fetch';
 import { Meteor } from 'meteor/meteor';
 
+import { checkUrlForSsrf } from './checkUrlForSsrf';
 import { SystemLogger } from '../../../../server/lib/logger/system';
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
-import { FileUpload } from '../../../file-upload/server';
 import { RocketChatFile } from '../../../file/server';
+import { FileUpload } from '../../../file-upload/server';
 import { settings } from '../../../settings/server';
-import { checkUrlForSsrf } from './checkUrlForSsrf';
 
 export const setAvatarFromServiceWithValidation = async (
 	userId: string,
diff --git a/apps/meteor/app/lib/server/functions/setUsername.ts b/apps/meteor/app/lib/server/functions/setUsername.ts
index c4d2c47c6d9d..57591d2ed2c9 100644
--- a/apps/meteor/app/lib/server/functions/setUsername.ts
+++ b/apps/meteor/app/lib/server/functions/setUsername.ts
@@ -5,12 +5,9 @@ import { Accounts } from 'meteor/accounts-base';
 import { Meteor } from 'meteor/meteor';
 import _ from 'underscore';
 
-import { callbacks } from '../../../../lib/callbacks';
-import { SystemLogger } from '../../../../server/lib/logger/system';
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
 import { settings } from '../../../settings/server';
 import { RateLimiter } from '../lib';
-import { notifyOnUserChange } from '../lib/notifyListener';
 import { addUserToRoom } from './addUserToRoom';
 import { checkUsernameAvailability } from './checkUsernameAvailability';
 import { getAvatarSuggestionForUser } from './getAvatarSuggestionForUser';
@@ -18,6 +15,9 @@ import { joinDefaultChannels } from './joinDefaultChannels';
 import { saveUserIdentity } from './saveUserIdentity';
 import { setUserAvatar } from './setUserAvatar';
 import { validateUsername } from './validateUsername';
+import { callbacks } from '../../../../lib/callbacks';
+import { SystemLogger } from '../../../../server/lib/logger/system';
+import { notifyOnUserChange } from '../lib/notifyListener';
 
 export const setUsernameWithValidation = async (userId: string, username: string, joinDefaultChannelsSilenced?: boolean): Promise<void> => {
 	if (!username) {
diff --git a/apps/meteor/app/lib/server/functions/updateGroupDMsName.ts b/apps/meteor/app/lib/server/functions/updateGroupDMsName.ts
index feb26ce6a1b0..ac204af51439 100644
--- a/apps/meteor/app/lib/server/functions/updateGroupDMsName.ts
+++ b/apps/meteor/app/lib/server/functions/updateGroupDMsName.ts
@@ -8,14 +8,14 @@ const getName = (members: IUser[]): string => members.map(({ username }) => user
 
 async function getUsersWhoAreInTheSameGroupDMsAs(user: IUser) {
 	// add all users to single array so we can fetch details from them all at once
-	const rooms = Rooms.findGroupDMsByUids([user._id], { projection: { uids: 1 } });
-	if ((await rooms.count()) === 0) {
+	if ((await Rooms.countGroupDMsByUids([user._id])) === 0) {
 		return;
 	}
 
 	const userIds = new Set();
 	const users = new Map();
 
+	const rooms = Rooms.findGroupDMsByUids([user._id], { projection: { uids: 1 } });
 	await rooms.forEach((room) => {
 		if (!room.uids) {
 			return;
diff --git a/apps/meteor/app/lib/server/functions/updateMessage.ts b/apps/meteor/app/lib/server/functions/updateMessage.ts
index 96683d40348f..d480a21bd713 100644
--- a/apps/meteor/app/lib/server/functions/updateMessage.ts
+++ b/apps/meteor/app/lib/server/functions/updateMessage.ts
@@ -4,11 +4,11 @@ import type { IMessage, IUser, AtLeast } from '@rocket.chat/core-typings';
 import { Messages, Rooms } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
 
+import { parseUrlsInMessage } from './parseUrlsInMessage';
 import { settings } from '../../../settings/server';
 import { afterSaveMessage } from '../lib/afterSaveMessage';
 import { notifyOnRoomChangedById, notifyOnMessageChange } from '../lib/notifyListener';
 import { validateCustomMessageFields } from '../lib/validateCustomMessageFields';
-import { parseUrlsInMessage } from './parseUrlsInMessage';
 
 export const updateMessage = async function (
 	message: AtLeast<IMessage, '_id' | 'rid' | 'msg' | 'customFields'>,
diff --git a/apps/meteor/app/lib/server/lib/interceptDirectReplyEmails.js b/apps/meteor/app/lib/server/lib/interceptDirectReplyEmails.js
index f9af0911bcc6..77aaa03887c5 100644
--- a/apps/meteor/app/lib/server/lib/interceptDirectReplyEmails.js
+++ b/apps/meteor/app/lib/server/lib/interceptDirectReplyEmails.js
@@ -1,9 +1,9 @@
 import POP3Lib from '@rocket.chat/poplib';
 import { simpleParser } from 'mailparser';
 
+import { processDirectEmail } from './processDirectEmail';
 import { IMAPInterceptor } from '../../../../server/email/IMAPInterceptor';
 import { settings } from '../../../settings/server';
-import { processDirectEmail } from './processDirectEmail';
 
 export class DirectReplyIMAPInterceptor extends IMAPInterceptor {
 	constructor(imapConfig, options = {}) {
@@ -127,10 +127,13 @@ export class POP3Helper {
 
 	start() {
 		this.log('POP3 started');
-		this.running = setInterval(() => {
-			// get new emails and process
-			this.POP3 = new POP3Intercepter();
-		}, Math.max(this.frequency * 60 * 1000, 2 * 60 * 1000));
+		this.running = setInterval(
+			() => {
+				// get new emails and process
+				this.POP3 = new POP3Intercepter();
+			},
+			Math.max(this.frequency * 60 * 1000, 2 * 60 * 1000),
+		);
 	}
 
 	log(...args) {
diff --git a/apps/meteor/app/lib/server/lib/notifyListener.ts b/apps/meteor/app/lib/server/lib/notifyListener.ts
index 778fe89dbbf4..6a28fabe5c51 100644
--- a/apps/meteor/app/lib/server/lib/notifyListener.ts
+++ b/apps/meteor/app/lib/server/lib/notifyListener.ts
@@ -21,9 +21,11 @@ import type {
 	IMessage,
 	SettingValue,
 	MessageTypesValues,
+	ILivechatContact,
 } from '@rocket.chat/core-typings';
 import {
 	Rooms,
+	LivechatRooms,
 	Permissions,
 	Settings,
 	PbxEvents,
@@ -87,6 +89,16 @@ export const notifyOnRoomChangedByUsernamesOrUids = withDbWatcherCheck(
 	},
 );
 
+export const notifyOnRoomChangedByContactId = withDbWatcherCheck(
+	async <T extends ILivechatContact>(contactId: T['_id'], clientAction: ClientAction = 'updated'): Promise<void> => {
+		const cursor = LivechatRooms.findOpenByContactId(contactId);
+
+		void cursor.forEach((room) => {
+			void api.broadcast('watch.rooms', { clientAction, room });
+		});
+	},
+);
+
 export const notifyOnRoomChangedByUserDM = withDbWatcherCheck(
 	async <T extends IRoom>(userId: T['u']['_id'], clientAction: ClientAction = 'updated'): Promise<void> => {
 		const items = Rooms.findDMsByUids([userId]);
@@ -251,6 +263,20 @@ export const notifyOnLivechatInquiryChangedById = withDbWatcherCheck(
 	},
 );
 
+export const notifyOnLivechatInquiryChangedByVisitorIds = withDbWatcherCheck(
+	async (
+		visitorIds: ILivechatInquiryRecord['v']['_id'][],
+		clientAction: Exclude<ClientAction, 'removed'> = 'updated',
+		diff?: Partial<Record<keyof ILivechatInquiryRecord, unknown> & { queuedAt: Date; takenAt: Date }>,
+	): Promise<void> => {
+		const cursor = LivechatInquiry.findByVisitorIds(visitorIds);
+
+		void cursor.forEach((inquiry) => {
+			void api.broadcast('watch.inquiries', { clientAction, inquiry, diff });
+		});
+	},
+);
+
 export const notifyOnLivechatInquiryChangedByRoom = withDbWatcherCheck(
 	async (
 		rid: ILivechatInquiryRecord['rid'],
@@ -553,6 +579,19 @@ export const notifyOnSubscriptionChangedByUserIdAndRoomType = withDbWatcherCheck
 	},
 );
 
+export const notifyOnSubscriptionChangedByVisitorIds = withDbWatcherCheck(
+	async (
+		visitorIds: Exclude<ISubscription['v'], undefined>['_id'][],
+		clientAction: Exclude<ClientAction, 'removed'> = 'updated',
+	): Promise<void> => {
+		const cursor = Subscriptions.findOpenByVisitorIds(visitorIds, { projection: subscriptionFields });
+
+		void cursor.forEach((subscription) => {
+			void api.broadcast('watch.subscriptions', { clientAction, subscription });
+		});
+	},
+);
+
 export const notifyOnSubscriptionChangedByNameAndRoomType = withDbWatcherCheck(
 	async (filter: Partial<Pick<ISubscription, 'name' | 't'>>, clientAction: Exclude<ClientAction, 'removed'> = 'updated'): Promise<void> => {
 		const cursor = Subscriptions.findByNameAndRoomType(filter, { projection: subscriptionFields });
diff --git a/apps/meteor/app/lib/server/lib/notifyUsersOnMessage.ts b/apps/meteor/app/lib/server/lib/notifyUsersOnMessage.ts
index fdb99c83207c..ac8587c0717a 100644
--- a/apps/meteor/app/lib/server/lib/notifyUsersOnMessage.ts
+++ b/apps/meteor/app/lib/server/lib/notifyUsersOnMessage.ts
@@ -2,25 +2,16 @@ import type { IMessage, IRoom, IUser, RoomType } from '@rocket.chat/core-typings
 import { isEditedMessage } from '@rocket.chat/core-typings';
 import type { Updater } from '@rocket.chat/models';
 import { Subscriptions, Rooms } from '@rocket.chat/models';
-import { escapeRegExp } from '@rocket.chat/string-helpers';
 import moment from 'moment';
 
-import { callbacks } from '../../../../lib/callbacks';
-import { settings } from '../../../settings/server';
 import {
 	notifyOnSubscriptionChanged,
 	notifyOnSubscriptionChangedByRoomIdAndUserId,
 	notifyOnSubscriptionChangedByRoomIdAndUserIds,
 } from './notifyListener';
-
-function messageContainsHighlight(message: IMessage, highlights: string[]): boolean {
-	if (!highlights || highlights.length === 0) return false;
-
-	return highlights.some((highlight: string) => {
-		const regexp = new RegExp(escapeRegExp(highlight), 'i');
-		return regexp.test(message.msg);
-	});
-}
+import { callbacks } from '../../../../lib/callbacks';
+import { settings } from '../../../settings/server';
+import { messageContainsHighlight } from '../functions/notifications/messageContainsHighlight';
 
 export async function getMentions(message: IMessage): Promise<{ toAll: boolean; toHere: boolean; mentionIds: string[] }> {
 	const {
diff --git a/apps/meteor/app/lib/server/lib/sendNotificationsOnMessage.ts b/apps/meteor/app/lib/server/lib/sendNotificationsOnMessage.ts
index 94c25f476222..25330d912aaf 100644
--- a/apps/meteor/app/lib/server/lib/sendNotificationsOnMessage.ts
+++ b/apps/meteor/app/lib/server/lib/sendNotificationsOnMessage.ts
@@ -12,16 +12,17 @@ import emojione from 'emojione';
 import moment from 'moment';
 import type { RootFilterOperators } from 'mongodb';
 
+import { getMentions } from './notifyUsersOnMessage';
 import { callbacks } from '../../../../lib/callbacks';
 import { roomCoordinator } from '../../../../server/lib/rooms/roomCoordinator';
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
 import { Notification } from '../../../notification-queue/server/NotificationQueue';
 import { settings } from '../../../settings/server';
-import { messageContainsHighlight, parseMessageTextPerUser, replaceMentionedUsernamesWithFullNames } from '../functions/notifications';
+import { parseMessageTextPerUser, replaceMentionedUsernamesWithFullNames } from '../functions/notifications';
 import { notifyDesktopUser, shouldNotifyDesktop } from '../functions/notifications/desktop';
 import { getEmailData, shouldNotifyEmail } from '../functions/notifications/email';
+import { messageContainsHighlight } from '../functions/notifications/messageContainsHighlight';
 import { getPushData, shouldNotifyMobile } from '../functions/notifications/mobile';
-import { getMentions } from './notifyUsersOnMessage';
 
 type SubscriptionAggregation = {
 	receiver: [Pick<IUser, 'active' | 'emails' | 'language' | 'status' | 'statusConnection' | 'username' | 'settings'> | null];
diff --git a/apps/meteor/app/lib/server/lib/validateEmailDomain.js b/apps/meteor/app/lib/server/lib/validateEmailDomain.js
index 3862dad83fef..898a3e6b8942 100644
--- a/apps/meteor/app/lib/server/lib/validateEmailDomain.js
+++ b/apps/meteor/app/lib/server/lib/validateEmailDomain.js
@@ -3,9 +3,9 @@ import util from 'util';
 
 import { Meteor } from 'meteor/meteor';
 
+import { emailDomainDefaultBlackList } from './defaultBlockedDomainsList';
 import { validateEmail } from '../../../../lib/emailValidator';
 import { settings } from '../../../settings/server';
-import { emailDomainDefaultBlackList } from './defaultBlockedDomainsList';
 
 const dnsResolveMx = util.promisify(dns.resolveMx);
 
diff --git a/apps/meteor/app/lib/server/methods/getChannelHistory.ts b/apps/meteor/app/lib/server/methods/getChannelHistory.ts
index 8f1f4c586141..8fe5812dd62a 100644
--- a/apps/meteor/app/lib/server/methods/getChannelHistory.ts
+++ b/apps/meteor/app/lib/server/methods/getChannelHistory.ts
@@ -3,7 +3,6 @@ import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { Messages, Subscriptions, Rooms } from '@rocket.chat/models';
 import { check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
-import _ from 'underscore';
 
 import { canAccessRoomAsync } from '../../../authorization/server';
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
@@ -64,7 +63,8 @@ Meteor.methods<ServerMethods>({
 		}
 
 		// Verify oldest is a date if it exists
-		if (oldest !== undefined && !_.isDate(oldest)) {
+
+		if (oldest !== undefined && {}.toString.call(oldest) !== '[object Date]') {
 			throw new Meteor.Error('error-invalid-date', 'Invalid date', { method: 'getChannelHistory' });
 		}
 
@@ -89,7 +89,7 @@ Meteor.methods<ServerMethods>({
 						options,
 						showThreadMessages,
 						inclusive,
-				  ).toArray()
+					).toArray()
 				: await Messages.findVisibleByRoomIdBetweenTimestampsNotContainingTypes(
 						rid,
 						oldest,
@@ -98,7 +98,7 @@ Meteor.methods<ServerMethods>({
 						options,
 						showThreadMessages,
 						inclusive,
-				  ).toArray();
+					).toArray();
 
 		const messages = await normalizeMessagesForUser(records, fromUserId);
 
diff --git a/apps/meteor/app/lib/server/methods/insertOrUpdateUser.ts b/apps/meteor/app/lib/server/methods/insertOrUpdateUser.ts
index 122b11172d57..3c5f07f624b3 100644
--- a/apps/meteor/app/lib/server/methods/insertOrUpdateUser.ts
+++ b/apps/meteor/app/lib/server/methods/insertOrUpdateUser.ts
@@ -19,12 +19,14 @@ Meteor.methods<ServerMethods>({
 
 		check(userData, Object);
 
-		if (!Meteor.userId()) {
+		const userId = Meteor.userId();
+
+		if (!userId) {
 			throw new Meteor.Error('error-invalid-user', 'Invalid user', {
 				method: 'insertOrUpdateUser',
 			});
 		}
 
-		return saveUser(Meteor.userId(), userData);
+		return saveUser(userId, userData);
 	}),
 });
diff --git a/apps/meteor/app/lib/server/methods/leaveRoom.ts b/apps/meteor/app/lib/server/methods/leaveRoom.ts
index 4fc85b35fd05..8ded8b56ce2b 100644
--- a/apps/meteor/app/lib/server/methods/leaveRoom.ts
+++ b/apps/meteor/app/lib/server/methods/leaveRoom.ts
@@ -45,8 +45,7 @@ export const leaveRoomMethod = async (user: IUser, rid: string): Promise<void> =
 
 	// If user is room owner, check if there are other owners. If there isn't anyone else, warn user to set a new owner.
 	if (await hasRoleAsync(user._id, 'owner', room._id)) {
-		const cursor = await Roles.findUsersInRole('owner', room._id);
-		const numOwners = await cursor.count();
+		const numOwners = await Roles.countUsersInRole('owner', room._id);
 		if (numOwners === 1) {
 			throw new Meteor.Error('error-you-are-last-owner', 'You are the last owner. Please set new owner before leaving the room.', {
 				method: 'leaveRoom',
diff --git a/apps/meteor/app/lib/server/methods/saveSetting.ts b/apps/meteor/app/lib/server/methods/saveSetting.ts
index 61f5fbbd34cc..ed48dc4e9f4f 100644
--- a/apps/meteor/app/lib/server/methods/saveSetting.ts
+++ b/apps/meteor/app/lib/server/methods/saveSetting.ts
@@ -4,6 +4,7 @@ import { Settings } from '@rocket.chat/models';
 import { Match, check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 
+import { updateAuditedByUser } from '../../../../server/settings/lib/auditedSettingUpdates';
 import { twoFactorRequired } from '../../../2fa/server/twoFactorRequired';
 import { getSettingPermissionId } from '../../../authorization/lib';
 import { hasPermissionAsync, hasAllPermissionAsync } from '../../../authorization/server/functions/hasPermission';
@@ -18,7 +19,7 @@ declare module '@rocket.chat/ddp-client' {
 }
 
 Meteor.methods<ServerMethods>({
-	saveSetting: twoFactorRequired(async (_id, value, editor) => {
+	saveSetting: twoFactorRequired(async function (_id, value, editor) {
 		const uid = Meteor.userId();
 		if (!uid) {
 			throw new Meteor.Error('error-action-not-allowed', 'Editing settings is not allowed', {
@@ -66,7 +67,14 @@ Meteor.methods<ServerMethods>({
 				break;
 		}
 
-		(await Settings.updateValueAndEditorById(_id, value as SettingValue, editor)).modifiedCount &&
+		const auditSettingOperation = updateAuditedByUser({
+			_id: uid,
+			username: (await Meteor.userAsync())!.username!,
+			ip: this.connection?.clientAddress || '',
+			useragent: this.connection?.httpHeaders['user-agent'] || '',
+		});
+
+		(await auditSettingOperation(Settings.updateValueAndEditorById, _id, value as SettingValue, editor)).modifiedCount &&
 			setting &&
 			void notifyOnSettingChanged({ ...setting, editor, value: value as SettingValue });
 
diff --git a/apps/meteor/app/lib/server/methods/saveSettings.ts b/apps/meteor/app/lib/server/methods/saveSettings.ts
index 7a18bbc808d4..6ba989abda0d 100644
--- a/apps/meteor/app/lib/server/methods/saveSettings.ts
+++ b/apps/meteor/app/lib/server/methods/saveSettings.ts
@@ -5,6 +5,7 @@ import { Settings } from '@rocket.chat/models';
 import { Match, check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 
+import { updateAuditedByUser } from '../../../../server/settings/lib/auditedSettingUpdates';
 import { twoFactorRequired } from '../../../2fa/server/twoFactorRequired';
 import { getSettingPermissionId } from '../../../authorization/lib';
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
@@ -34,103 +35,107 @@ const validJSON = Match.Where((value: string) => {
 });
 
 Meteor.methods<ServerMethods>({
-	saveSettings: twoFactorRequired(
-		async (
-			params: {
-				_id: ISetting['_id'];
-				value: ISetting['value'];
-			}[] = [],
-		) => {
-			const uid = Meteor.userId();
-			const settingsNotAllowed: ISetting['_id'][] = [];
-			if (uid === null) {
-				throw new Meteor.Error('error-action-not-allowed', 'Editing settings is not allowed', {
-					method: 'saveSetting',
-				});
-			}
-			const editPrivilegedSetting = await hasPermissionAsync(uid, 'edit-privileged-setting');
-			const manageSelectedSettings = await hasPermissionAsync(uid, 'manage-selected-settings');
-
-			// if the id contains Organization_Name then change the Site_Name
-			const orgName = params.find(({ _id }) => _id === 'Organization_Name');
+	saveSettings: twoFactorRequired(async function (
+		params: {
+			_id: ISetting['_id'];
+			value: ISetting['value'];
+		}[] = [],
+	) {
+		const uid = Meteor.userId();
+		const settingsNotAllowed: ISetting['_id'][] = [];
+		if (uid === null) {
+			throw new Meteor.Error('error-action-not-allowed', 'Editing settings is not allowed', {
+				method: 'saveSetting',
+			});
+		}
+		const editPrivilegedSetting = await hasPermissionAsync(uid, 'edit-privileged-setting');
+		const manageSelectedSettings = await hasPermissionAsync(uid, 'manage-selected-settings');
 
-			if (orgName) {
-				// check if the site name is still the default value or ifs the same as organization name
-				const siteName = await Settings.findOneById('Site_Name');
+		// if the id contains Organization_Name then change the Site_Name
+		const orgName = params.find(({ _id }) => _id === 'Organization_Name');
 
-				if (siteName?.value === siteName?.packageValue || siteName?.value === settings.get('Organization_Name')) {
-					params.push({
-						_id: 'Site_Name',
-						value: orgName.value,
-					});
-				}
-			}
+		if (orgName) {
+			// check if the site name is still the default value or ifs the same as organization name
+			const siteName = await Settings.findOneById('Site_Name');
 
-			await Promise.all(
-				params.map(async ({ _id, value }) => {
-					// Verify the _id passed in is a string.
-					check(_id, String);
-					if (!editPrivilegedSetting && !(manageSelectedSettings && (await hasPermissionAsync(uid, getSettingPermissionId(_id))))) {
-						return settingsNotAllowed.push(_id);
-					}
-
-					// Disable custom scripts in cloud trials to prevent phishing campaigns
-					if (disableCustomScripts() && /^Custom_Script_/.test(_id)) {
-						return settingsNotAllowed.push(_id);
-					}
-
-					const setting = await Settings.findOneById(_id);
-					// Verify the value is what it should be
-					switch (setting?.type) {
-						case 'roomPick':
-							check(value, Match.OneOf([Object], ''));
-							break;
-						case 'boolean':
-							check(value, Boolean);
-							break;
-						case 'timespan':
-						case 'int':
-							check(value, Number);
-							if (!Number.isInteger(value)) {
-								throw new Meteor.Error(`Invalid setting value ${value}`, 'Invalid setting value', {
-									method: 'saveSettings',
-								});
-							}
-
-							break;
-						case 'multiSelect':
-							check(value, Array);
-							break;
-						case 'code':
-							check(value, String);
-							if (isSettingCode(setting) && setting.code === 'application/json') {
-								check(value, validJSON);
-							}
-							break;
-						default:
-							check(value, String);
-							break;
-					}
-				}),
-			);
-
-			if (settingsNotAllowed.length) {
-				throw new Meteor.Error('error-action-not-allowed', 'Editing settings is not allowed', {
-					method: 'saveSettings',
-					settingIds: settingsNotAllowed,
+			if (siteName?.value === siteName?.packageValue || siteName?.value === settings.get('Organization_Name')) {
+				params.push({
+					_id: 'Site_Name',
+					value: orgName.value,
 				});
 			}
+		}
+
+		await Promise.all(
+			params.map(async ({ _id, value }) => {
+				// Verify the _id passed in is a string.
+				check(_id, String);
+				if (!editPrivilegedSetting && !(manageSelectedSettings && (await hasPermissionAsync(uid, getSettingPermissionId(_id))))) {
+					return settingsNotAllowed.push(_id);
+				}
+
+				// Disable custom scripts in cloud trials to prevent phishing campaigns
+				if (disableCustomScripts() && /^Custom_Script_/.test(_id)) {
+					return settingsNotAllowed.push(_id);
+				}
 
-			const promises = params.map(({ _id, value }) => Settings.updateValueById(_id, value));
+				const setting = await Settings.findOneById(_id);
+				// Verify the value is what it should be
+				switch (setting?.type) {
+					case 'roomPick':
+						check(value, Match.OneOf([Object], ''));
+						break;
+					case 'boolean':
+						check(value, Boolean);
+						break;
+					case 'timespan':
+					case 'int':
+						check(value, Number);
+						if (!Number.isInteger(value)) {
+							throw new Meteor.Error(`Invalid setting value ${value}`, 'Invalid setting value', {
+								method: 'saveSettings',
+							});
+						}
 
-			(await Promise.all(promises)).forEach((value, index) => {
-				if (value?.modifiedCount) {
-					void notifyOnSettingChangedById(params[index]._id);
+						break;
+					case 'multiSelect':
+						check(value, Array);
+						break;
+					case 'code':
+						check(value, String);
+						if (isSettingCode(setting) && setting.code === 'application/json') {
+							check(value, validJSON);
+						}
+						break;
+					default:
+						check(value, String);
+						break;
 				}
+			}),
+		);
+
+		if (settingsNotAllowed.length) {
+			throw new Meteor.Error('error-action-not-allowed', 'Editing settings is not allowed', {
+				method: 'saveSettings',
+				settingIds: settingsNotAllowed,
 			});
+		}
+
+		const auditSettingOperation = updateAuditedByUser({
+			_id: uid,
+			username: (await Meteor.userAsync())!.username!,
+			ip: this.connection!.clientAddress || '',
+			useragent: this.connection!.httpHeaders['user-agent'] || '',
+		});
 
-			return true;
-		},
-		{},
-	),
+		const promises = params.map(({ _id, value }) => auditSettingOperation(Settings.updateValueById, _id, value));
+
+		(await Promise.all(promises)).forEach((value, index) => {
+			if (value?.modifiedCount) {
+				void notifyOnSettingChangedById(params[index]._id);
+			}
+		});
+
+		return true;
+	}, {}),
 });
diff --git a/apps/meteor/app/lib/server/methods/sendMessage.ts b/apps/meteor/app/lib/server/methods/sendMessage.ts
index 76134c81d0b3..6ab03df337ef 100644
--- a/apps/meteor/app/lib/server/methods/sendMessage.ts
+++ b/apps/meteor/app/lib/server/methods/sendMessage.ts
@@ -4,7 +4,7 @@ import type { ServerMethods } from '@rocket.chat/ddp-client';
 import type { RocketchatI18nKeys } from '@rocket.chat/i18n';
 import { Messages, Users } from '@rocket.chat/models';
 import type { TOptions } from 'i18next';
-import { check } from 'meteor/check';
+import { check, Match } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 import moment from 'moment';
 
@@ -123,7 +123,24 @@ declare module '@rocket.chat/ddp-client' {
 
 Meteor.methods<ServerMethods>({
 	async sendMessage(message, previewUrls) {
-		check(message, Object);
+		check(message, {
+			_id: Match.Maybe(String),
+			rid: Match.Maybe(String),
+			msg: Match.Maybe(String),
+			tmid: Match.Maybe(String),
+			tshow: Match.Maybe(Boolean),
+			ts: Match.Maybe(Date),
+			t: Match.Maybe(String),
+			otrAck: Match.Maybe(String),
+			bot: Match.Maybe(Boolean),
+			content: Match.Maybe(Object),
+			e2e: Match.Maybe(String),
+			e2eMentions: Match.Maybe(Object),
+			customFields: Match.Maybe(Object),
+			federation: Match.Maybe(Object),
+			groupable: Match.Maybe(Boolean),
+			sentByEmail: Match.Maybe(Boolean),
+		});
 
 		const uid = Meteor.userId();
 		if (!uid) {
diff --git a/apps/meteor/app/livechat/client/collections/LivechatInquiry.js b/apps/meteor/app/livechat/client/collections/LivechatInquiry.js
deleted file mode 100644
index c43a9cb31ca5..000000000000
--- a/apps/meteor/app/livechat/client/collections/LivechatInquiry.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { Mongo } from 'meteor/mongo';
-
-export const LivechatInquiry = new Mongo.Collection(null);
diff --git a/apps/meteor/app/livechat/client/collections/LivechatInquiry.ts b/apps/meteor/app/livechat/client/collections/LivechatInquiry.ts
new file mode 100644
index 000000000000..16b9533d1649
--- /dev/null
+++ b/apps/meteor/app/livechat/client/collections/LivechatInquiry.ts
@@ -0,0 +1,4 @@
+import type { ILivechatInquiryRecord } from '@rocket.chat/core-typings';
+import { Mongo } from 'meteor/mongo';
+
+export const LivechatInquiry = new Mongo.Collection<ILivechatInquiryRecord & { alert?: boolean }>(null);
diff --git a/apps/meteor/app/livechat/client/index.ts b/apps/meteor/app/livechat/client/index.ts
index c6884923db30..8346d2ddb978 100644
--- a/apps/meteor/app/livechat/client/index.ts
+++ b/apps/meteor/app/livechat/client/index.ts
@@ -1,4 +1,3 @@
 import '../lib/messageTypes';
 import './voip';
 import './ui';
-import './stylesheets/livechat.css';
diff --git a/apps/meteor/app/livechat/client/lib/stream/queueManager.ts b/apps/meteor/app/livechat/client/lib/stream/queueManager.ts
index 5ba2cf0d9791..c6a671e2883d 100644
--- a/apps/meteor/app/livechat/client/lib/stream/queueManager.ts
+++ b/apps/meteor/app/livechat/client/lib/stream/queueManager.ts
@@ -30,12 +30,12 @@ const events = {
 
 const invalidateRoomQueries = async (rid: string) => {
 	await queryClient.invalidateQueries(['rooms', { reference: rid, type: 'l' }]);
-	await queryClient.removeQueries(['rooms', rid]);
-	await queryClient.removeQueries(['/v1/rooms.info', rid]);
+	queryClient.removeQueries(['rooms', rid]);
+	queryClient.removeQueries(['/v1/rooms.info', rid]);
 };
 
 const removeInquiry = async (inquiry: ILivechatInquiryRecord) => {
-	await LivechatInquiry.remove(inquiry._id);
+	LivechatInquiry.remove(inquiry._id);
 	return queryClient.invalidateQueries(['rooms', { reference: inquiry.rid, type: 'l' }]);
 };
 
diff --git a/apps/meteor/app/livechat/client/stylesheets/livechat.css b/apps/meteor/app/livechat/client/stylesheets/livechat.css
deleted file mode 100644
index b6e8bf366940..000000000000
--- a/apps/meteor/app/livechat/client/stylesheets/livechat.css
+++ /dev/null
@@ -1,42 +0,0 @@
-:root {
-	--header-min-height: 30px;
-	--footer-min-height: 55px;
-	--link-font-color: #008ce3;
-	--primary-font-color: #444444;
-	--secondary-font-color: #7f7f7f;
-	--info-font-color: #aaaaaa;
-	--color-gray: #9ea2a8;
-}
-
-.external-frame {
-	width: 100%;
-	height: 100%;
-}
-
-.open {
-	padding-left: 4% !important;
-}
-
-.closing-message-body-wrapper {
-	margin-top: 3%;
-}
-
-.closing-message-title {
-	color: var(--color-dark-light);
-
-	font-family: Inter;
-	font-size: 12px;
-	font-weight: bold;
-	font-style: normal;
-	line-height: 16px;
-}
-
-.closing-message-text {
-	color: var(--color-gray);
-
-	font-family: Inter;
-	font-size: 12px;
-	font-weight: 500;
-	font-style: italic;
-	line-height: 16px;
-}
diff --git a/apps/meteor/app/livechat/imports/server/rest/appearance.ts b/apps/meteor/app/livechat/imports/server/rest/appearance.ts
index 7496b6243abe..215f208c06dc 100644
--- a/apps/meteor/app/livechat/imports/server/rest/appearance.ts
+++ b/apps/meteor/app/livechat/imports/server/rest/appearance.ts
@@ -3,6 +3,7 @@ import { Settings } from '@rocket.chat/models';
 import { isPOSTLivechatAppearanceParams } from '@rocket.chat/rest-typings';
 
 import { isTruthy } from '../../../../../lib/isTruthy';
+import { updateAuditedByUser } from '../../../../../server/settings/lib/auditedSettingUpdates';
 import { API } from '../../../../api/server';
 import { notifyOnSettingChangedById } from '../../../../lib/server/lib/notifyListener';
 import { findAppearance } from '../../../server/api/lib/appearance';
@@ -92,7 +93,15 @@ API.v1.addRoute(
 				.toArray();
 
 			const eligibleSettings = dbSettings.filter(isTruthy);
-			const promises = eligibleSettings.map(({ _id, value }) => Settings.updateValueById(_id, value));
+
+			const auditSettingOperation = updateAuditedByUser({
+				_id: this.userId,
+				username: this.user.username!,
+				ip: this.requestIp,
+				useragent: this.request.headers['user-agent'] || '',
+			});
+
+			const promises = eligibleSettings.map(({ _id, value }) => auditSettingOperation(Settings.updateValueById, _id, value));
 			(await Promise.all(promises)).forEach((value, index) => {
 				if (value?.modifiedCount) {
 					void notifyOnSettingChangedById(eligibleSettings[index]._id);
diff --git a/apps/meteor/app/livechat/imports/server/rest/departments.ts b/apps/meteor/app/livechat/imports/server/rest/departments.ts
index e56feeac2fa3..966b7e6d6af4 100644
--- a/apps/meteor/app/livechat/imports/server/rest/departments.ts
+++ b/apps/meteor/app/livechat/imports/server/rest/departments.ts
@@ -14,8 +14,13 @@ import {
 	findDepartmentAgents,
 	findArchivedDepartments,
 } from '../../../server/api/lib/departments';
-import { DepartmentHelper } from '../../../server/lib/Departments';
-import { Livechat as LivechatTs } from '../../../server/lib/LivechatTyped';
+import {
+	saveDepartment,
+	archiveDepartment,
+	unarchiveDepartment,
+	saveDepartmentAgents,
+	removeDepartment,
+} from '../../../server/lib/departmentsLib';
 import { isDepartmentCreationAvailable } from '../../../server/lib/isDepartmentCreationAvailable';
 
 API.v1.addRoute(
@@ -62,7 +67,7 @@ API.v1.addRoute(
 
 			const agents = this.bodyParams.agents ? { upsert: this.bodyParams.agents } : {};
 			const { departmentUnit } = this.bodyParams;
-			const department = await LivechatTs.saveDepartment(
+			const department = await saveDepartment(
 				this.userId,
 				null,
 				this.bodyParams.department as ILivechatDepartment,
@@ -131,7 +136,7 @@ API.v1.addRoute(
 			}
 
 			const agentParam = permissionToAddAgents && agents ? { upsert: agents } : {};
-			await LivechatTs.saveDepartment(this.userId, _id, department, agentParam, departmentUnit || {});
+			await saveDepartment(this.userId, _id, department, agentParam, departmentUnit || {});
 
 			return API.v1.success({
 				department: await LivechatDepartment.findOneById(_id),
@@ -143,7 +148,7 @@ API.v1.addRoute(
 				_id: String,
 			});
 
-			await DepartmentHelper.removeDepartment(this.urlParams._id);
+			await removeDepartment(this.urlParams._id);
 
 			return API.v1.success();
 		},
@@ -191,7 +196,7 @@ API.v1.addRoute(
 	},
 	{
 		async post() {
-			await LivechatTs.archiveDepartment(this.urlParams._id);
+			await archiveDepartment(this.urlParams._id);
 
 			return API.v1.success();
 		},
@@ -206,7 +211,7 @@ API.v1.addRoute(
 	},
 	{
 		async post() {
-			await LivechatTs.unarchiveDepartment(this.urlParams._id);
+			await unarchiveDepartment(this.urlParams._id);
 			return API.v1.success();
 		},
 	},
@@ -271,7 +276,7 @@ API.v1.addRoute(
 					remove: Array,
 				}),
 			);
-			await LivechatTs.saveDepartmentAgents(this.urlParams._id, this.bodyParams);
+			await saveDepartmentAgents(this.urlParams._id, this.bodyParams);
 
 			return API.v1.success();
 		},
diff --git a/apps/meteor/app/livechat/imports/server/rest/sms.ts b/apps/meteor/app/livechat/imports/server/rest/sms.ts
index 15f08cdc1e83..2f13fd01f221 100644
--- a/apps/meteor/app/livechat/imports/server/rest/sms.ts
+++ b/apps/meteor/app/livechat/imports/server/rest/sms.ts
@@ -1,11 +1,11 @@
 import { OmnichannelIntegration } from '@rocket.chat/core-services';
 import type {
 	ILivechatVisitor,
-	IOmnichannelRoom,
 	IUpload,
 	MessageAttachment,
 	ServiceData,
 	FileAttachmentProps,
+	IOmnichannelRoomInfo,
 } from '@rocket.chat/core-typings';
 import { OmnichannelSourceType } from '@rocket.chat/core-typings';
 import { Logger } from '@rocket.chat/logger';
@@ -20,8 +20,8 @@ import { FileUpload } from '../../../../file-upload/server';
 import { checkUrlForSsrf } from '../../../../lib/server/functions/checkUrlForSsrf';
 import { settings } from '../../../../settings/server';
 import { setCustomField } from '../../../server/api/lib/customFields';
-import type { ILivechatMessage } from '../../../server/lib/LivechatTyped';
 import { Livechat as LivechatTyped } from '../../../server/lib/LivechatTyped';
+import type { ILivechatMessage } from '../../../server/lib/localTypes';
 
 const logger = new Logger('SMS');
 
@@ -122,10 +122,7 @@ API.v1.addRoute('livechat/sms-incoming/:service', {
 			return API.v1.success(SMSService.error(new Error('Invalid visitor')));
 		}
 
-		const roomInfo: {
-			source?: IOmnichannelRoom['source'];
-			[key: string]: unknown;
-		} = {
+		const roomInfo: IOmnichannelRoomInfo = {
 			sms: {
 				from: sms.to,
 			},
@@ -244,10 +241,7 @@ API.v1.addRoute('livechat/sms-incoming/:service', {
 		const sendMessage: {
 			guest: ILivechatVisitor;
 			message: ILivechatMessage;
-			roomInfo: {
-				source?: IOmnichannelRoom['source'];
-				[key: string]: unknown;
-			};
+			roomInfo: IOmnichannelRoomInfo;
 		} = {
 			guest: visitor,
 			roomInfo,
diff --git a/apps/meteor/app/livechat/lib/isSameChannel.ts b/apps/meteor/app/livechat/lib/isSameChannel.ts
new file mode 100644
index 000000000000..bdc6516aa813
--- /dev/null
+++ b/apps/meteor/app/livechat/lib/isSameChannel.ts
@@ -0,0 +1,20 @@
+import type { ILivechatContactVisitorAssociation } from '@rocket.chat/core-typings';
+
+export function isSameChannel(channel1: ILivechatContactVisitorAssociation, channel2: ILivechatContactVisitorAssociation): boolean {
+	if (!channel1 || !channel2) {
+		return false;
+	}
+
+	if (channel1.visitorId !== channel2.visitorId) {
+		return false;
+	}
+	if (channel1.source.type !== channel2.source.type) {
+		return false;
+	}
+
+	if ((channel1.source.id || channel2.source.id) && channel1.source.id !== channel2.source.id) {
+		return false;
+	}
+
+	return true;
+}
diff --git a/apps/meteor/app/livechat/server/api/lib/livechat.ts b/apps/meteor/app/livechat/server/api/lib/livechat.ts
index 01c4d9736c66..c3c22c327731 100644
--- a/apps/meteor/app/livechat/server/api/lib/livechat.ts
+++ b/apps/meteor/app/livechat/server/api/lib/livechat.ts
@@ -49,17 +49,7 @@ async function findDepartments(
 }
 
 export function findGuest(token: string): Promise<ILivechatVisitor | null> {
-	return LivechatVisitors.getVisitorByToken(token, {
-		projection: {
-			name: 1,
-			username: 1,
-			token: 1,
-			visitorEmails: 1,
-			department: 1,
-			activity: 1,
-			contactId: 1,
-		},
-	});
+	return LivechatVisitors.getVisitorByToken(token);
 }
 
 export function findGuestWithoutActivity(token: string): Promise<ILivechatVisitor | null> {
diff --git a/apps/meteor/app/livechat/server/api/v1/agent.ts b/apps/meteor/app/livechat/server/api/v1/agent.ts
index abc6163fe9c9..6c583e1b24db 100644
--- a/apps/meteor/app/livechat/server/api/v1/agent.ts
+++ b/apps/meteor/app/livechat/server/api/v1/agent.ts
@@ -7,6 +7,7 @@ import { API } from '../../../../api/server';
 import { hasPermissionAsync } from '../../../../authorization/server/functions/hasPermission';
 import { Livechat as LivechatTyped } from '../../lib/LivechatTyped';
 import { RoutingManager } from '../../lib/RoutingManager';
+import { getRequiredDepartment } from '../../lib/departmentsLib';
 import { findRoom, findGuest, findAgent, findOpenRoom } from '../lib/livechat';
 
 API.v1.addRoute('livechat/agent.info/:rid/:token', {
@@ -43,7 +44,7 @@ API.v1.addRoute(
 
 			let { department } = this.queryParams;
 			if (!department) {
-				const requireDepartment = await LivechatTyped.getRequiredDepartment();
+				const requireDepartment = await getRequiredDepartment();
 				if (requireDepartment) {
 					department = requireDepartment._id;
 				}
diff --git a/apps/meteor/app/livechat/server/api/v1/contact.ts b/apps/meteor/app/livechat/server/api/v1/contact.ts
index 5c68a475a952..019ea07252dc 100644
--- a/apps/meteor/app/livechat/server/api/v1/contact.ts
+++ b/apps/meteor/app/livechat/server/api/v1/contact.ts
@@ -4,6 +4,7 @@ import {
 	isPOSTUpdateOmnichannelContactsProps,
 	isGETOmnichannelContactsProps,
 	isGETOmnichannelContactHistoryProps,
+	isGETOmnichannelContactsChannelsProps,
 	isGETOmnichannelContactsSearchProps,
 } from '@rocket.chat/rest-typings';
 import { escapeRegExp } from '@rocket.chat/string-helpers';
@@ -12,7 +13,12 @@ import { Meteor } from 'meteor/meteor';
 
 import { API } from '../../../../api/server';
 import { getPaginationItems } from '../../../../api/server/helpers/getPaginationItems';
-import { getContactHistory, Contacts, createContact, updateContact, getContacts, isSingleContactEnabled } from '../../lib/Contacts';
+import { createContact } from '../../lib/contacts/createContact';
+import { getContactChannelsGrouped } from '../../lib/contacts/getContactChannelsGrouped';
+import { getContactHistory } from '../../lib/contacts/getContactHistory';
+import { getContacts } from '../../lib/contacts/getContacts';
+import { registerContact } from '../../lib/contacts/registerContact';
+import { updateContact } from '../../lib/contacts/updateContact';
 
 API.v1.addRoute(
 	'omnichannel/contact',
@@ -35,7 +41,7 @@ API.v1.addRoute(
 				}),
 			});
 
-			const contact = await Contacts.registerContact(this.bodyParams);
+			const contact = await registerContact(this.bodyParams);
 
 			return API.v1.success({ contact });
 		},
@@ -102,9 +108,6 @@ API.v1.addRoute(
 	{ authRequired: true, permissionsRequired: ['create-livechat-contact'], validateParams: isPOSTOmnichannelContactsProps },
 	{
 		async post() {
-			if (!isSingleContactEnabled()) {
-				return API.v1.unauthorized();
-			}
 			const contactId = await createContact({ ...this.bodyParams, unknown: false });
 
 			return API.v1.success({ contactId });
@@ -117,10 +120,6 @@ API.v1.addRoute(
 	{ authRequired: true, permissionsRequired: ['update-livechat-contact'], validateParams: isPOSTUpdateOmnichannelContactsProps },
 	{
 		async post() {
-			if (!isSingleContactEnabled()) {
-				return API.v1.unauthorized();
-			}
-
 			const contact = await updateContact({ ...this.bodyParams });
 
 			return API.v1.success({ contact });
@@ -133,10 +132,17 @@ API.v1.addRoute(
 	{ authRequired: true, permissionsRequired: ['view-livechat-contact'], validateParams: isGETOmnichannelContactsProps },
 	{
 		async get() {
-			if (!isSingleContactEnabled()) {
-				return API.v1.unauthorized();
+			const { contactId } = this.queryParams;
+
+			if (!contactId) {
+				return API.v1.notFound();
+			}
+
+			const contact = await LivechatContacts.findOneById(contactId);
+
+			if (!contact) {
+				return API.v1.notFound();
 			}
-			const contact = await LivechatContacts.findOneById(this.queryParams.contactId);
 
 			return API.v1.success({ contact });
 		},
@@ -148,15 +154,11 @@ API.v1.addRoute(
 	{ authRequired: true, permissionsRequired: ['view-livechat-contact'], validateParams: isGETOmnichannelContactsSearchProps },
 	{
 		async get() {
-			if (!isSingleContactEnabled()) {
-				return API.v1.unauthorized();
-			}
-
-			const { searchText } = this.queryParams;
+			const query = this.queryParams;
 			const { offset, count } = await getPaginationItems(this.queryParams);
 			const { sort } = await this.parseJsonQuery();
 
-			const result = await getContacts({ searchText, offset, count, sort });
+			const result = await getContacts({ ...query, offset, count, sort });
 
 			return API.v1.success(result);
 		},
@@ -168,10 +170,6 @@ API.v1.addRoute(
 	{ authRequired: true, permissionsRequired: ['view-livechat-contact-history'], validateParams: isGETOmnichannelContactHistoryProps },
 	{
 		async get() {
-			if (!isSingleContactEnabled()) {
-				return API.v1.unauthorized();
-			}
-
 			const { contactId, source } = this.queryParams;
 			const { offset, count } = await getPaginationItems(this.queryParams);
 			const { sort } = await this.parseJsonQuery();
@@ -182,3 +180,17 @@ API.v1.addRoute(
 		},
 	},
 );
+
+API.v1.addRoute(
+	'omnichannel/contacts.channels',
+	{ authRequired: true, permissionsRequired: ['view-livechat-contact'], validateParams: isGETOmnichannelContactsChannelsProps },
+	{
+		async get() {
+			const { contactId } = this.queryParams;
+
+			const channels = await getContactChannelsGrouped(contactId);
+
+			return API.v1.success({ channels });
+		},
+	},
+);
diff --git a/apps/meteor/app/livechat/server/api/v1/integration.ts b/apps/meteor/app/livechat/server/api/v1/integration.ts
index a1f9c59ffb87..7e56c8ca8e59 100644
--- a/apps/meteor/app/livechat/server/api/v1/integration.ts
+++ b/apps/meteor/app/livechat/server/api/v1/integration.ts
@@ -2,6 +2,7 @@ import { Settings } from '@rocket.chat/models';
 import { isPOSTomnichannelIntegrations } from '@rocket.chat/rest-typings';
 
 import { trim } from '../../../../../lib/utils/stringUtils';
+import { updateAuditedByUser } from '../../../../../server/settings/lib/auditedSettingUpdates';
 import { API } from '../../../../api/server';
 import { notifyOnSettingChangedById } from '../../../../lib/server/lib/notifyListener';
 
@@ -50,7 +51,14 @@ API.v1.addRoute(
 				},
 			].filter(Boolean) as unknown as { _id: string; value: any }[];
 
-			const promises = settingsIds.map((setting) => Settings.updateValueById(setting._id, setting.value));
+			const auditSettingOperation = updateAuditedByUser({
+				_id: this.userId,
+				username: this.user.username!,
+				ip: this.requestIp,
+				useragent: this.request.headers['user-agent'] || '',
+			});
+
+			const promises = settingsIds.map((setting) => auditSettingOperation(Settings.updateValueById, setting._id, setting.value));
 
 			(await Promise.all(promises)).forEach((value, index) => {
 				if (value?.modifiedCount) {
diff --git a/apps/meteor/app/livechat/server/api/v1/offlineMessage.ts b/apps/meteor/app/livechat/server/api/v1/offlineMessage.ts
index a367df7a04ad..f6fb29d17442 100644
--- a/apps/meteor/app/livechat/server/api/v1/offlineMessage.ts
+++ b/apps/meteor/app/livechat/server/api/v1/offlineMessage.ts
@@ -2,7 +2,7 @@ import { isPOSTLivechatOfflineMessageParams } from '@rocket.chat/rest-typings';
 
 import { i18n } from '../../../../../server/lib/i18n';
 import { API } from '../../../../api/server';
-import { Livechat } from '../../lib/LivechatTyped';
+import { sendOfflineMessage } from '../../lib/messages';
 
 API.v1.addRoute(
 	'livechat/offline.message',
@@ -14,7 +14,7 @@ API.v1.addRoute(
 		async post() {
 			const { name, email, message, department, host } = this.bodyParams;
 			try {
-				await Livechat.sendOfflineMessage({ name, email, message, department, host });
+				await sendOfflineMessage({ name, email, message, department, host });
 				return API.v1.success({ message: i18n.t('Livechat_offline_message_sent') });
 			} catch (e) {
 				return API.v1.failure(i18n.t('Error_sending_livechat_offline_message'));
diff --git a/apps/meteor/app/livechat/server/api/v1/pageVisited.ts b/apps/meteor/app/livechat/server/api/v1/pageVisited.ts
index 2688ad673af0..a97b5278462d 100644
--- a/apps/meteor/app/livechat/server/api/v1/pageVisited.ts
+++ b/apps/meteor/app/livechat/server/api/v1/pageVisited.ts
@@ -2,7 +2,7 @@ import type { IOmnichannelSystemMessage } from '@rocket.chat/core-typings';
 import { isPOSTLivechatPageVisitedParams } from '@rocket.chat/rest-typings';
 
 import { API } from '../../../../api/server';
-import { Livechat } from '../../lib/LivechatTyped';
+import { savePageHistory } from '../../lib/tracking';
 
 API.v1.addRoute(
 	'livechat/page.visited',
@@ -11,7 +11,7 @@ API.v1.addRoute(
 		async post() {
 			const { token, rid, pageInfo } = this.bodyParams;
 
-			const message = await Livechat.savePageHistory(token, rid, pageInfo);
+			const message = await savePageHistory(token, rid, pageInfo);
 			if (!message) {
 				return API.v1.success();
 			}
diff --git a/apps/meteor/app/livechat/server/api/v1/room.ts b/apps/meteor/app/livechat/server/api/v1/room.ts
index 7d52617e074a..b46a8c3e0663 100644
--- a/apps/meteor/app/livechat/server/api/v1/room.ts
+++ b/apps/meteor/app/livechat/server/api/v1/room.ts
@@ -1,5 +1,5 @@
 import { Omnichannel } from '@rocket.chat/core-services';
-import type { ILivechatAgent, IUser, SelectedAgent, TransferByData } from '@rocket.chat/core-typings';
+import type { ILivechatAgent, IOmnichannelInquiryExtraData, IUser, SelectedAgent, TransferByData } from '@rocket.chat/core-typings';
 import { isOmnichannelRoom, OmnichannelSourceType } from '@rocket.chat/core-typings';
 import { LivechatVisitors, Users, LivechatRooms, Messages } from '@rocket.chat/models';
 import {
@@ -23,8 +23,8 @@ import { addUserToRoom } from '../../../../lib/server/functions/addUserToRoom';
 import { closeLivechatRoom } from '../../../../lib/server/functions/closeLivechatRoom';
 import { settings as rcSettings } from '../../../../settings/server';
 import { normalizeTransferredByData } from '../../lib/Helper';
-import type { CloseRoomParams } from '../../lib/LivechatTyped';
 import { Livechat as LivechatTyped } from '../../lib/LivechatTyped';
+import type { CloseRoomParams } from '../../lib/localTypes';
 import { findGuest, findRoom, settings, findAgent, onCheckRoomParams } from '../lib/livechat';
 
 const isAgentWithInfo = (agentObj: ILivechatAgent | { hiddenInfo: boolean }): agentObj is ILivechatAgent => !('hiddenInfo' in agentObj);
@@ -80,7 +80,12 @@ API.v1.addRoute(
 					},
 				};
 
-				const newRoom = await LivechatTyped.createRoom({ visitor: guest, roomInfo, agent, extraData: extraParams });
+				const newRoom = await LivechatTyped.createRoom({
+					visitor: guest,
+					roomInfo,
+					agent,
+					extraData: extraParams as IOmnichannelInquiryExtraData,
+				});
 
 				return API.v1.success({
 					room: newRoom,
diff --git a/apps/meteor/app/livechat/server/business-hour/BusinessHourManager.ts b/apps/meteor/app/livechat/server/business-hour/BusinessHourManager.ts
index ec21ff2de067..0f125910b9a4 100644
--- a/apps/meteor/app/livechat/server/business-hour/BusinessHourManager.ts
+++ b/apps/meteor/app/livechat/server/business-hour/BusinessHourManager.ts
@@ -4,12 +4,12 @@ import type { AgendaCronJobs } from '@rocket.chat/cron';
 import { LivechatBusinessHours, LivechatDepartment, Users } from '@rocket.chat/models';
 import moment from 'moment';
 
+import type { IBusinessHourBehavior, IBusinessHourType } from './AbstractBusinessHour';
+import { closeBusinessHour } from './closeBusinessHour';
 import { callbacks } from '../../../../lib/callbacks';
 import { notifyOnUserChange } from '../../../lib/server/lib/notifyListener';
 import { settings } from '../../../settings/server';
 import { businessHourLogger } from '../lib/logger';
-import type { IBusinessHourBehavior, IBusinessHourType } from './AbstractBusinessHour';
-import { closeBusinessHour } from './closeBusinessHour';
 
 const CRON_EVERY_MIDNIGHT_EXPRESSION = '0 0 * * *';
 const CRON_DAYLIGHT_JOB_NAME = 'livechat-business-hour-daylight-saving-time-verifier';
diff --git a/apps/meteor/app/livechat/server/business-hour/Helper.ts b/apps/meteor/app/livechat/server/business-hour/Helper.ts
index e19300691660..2f535ad190af 100644
--- a/apps/meteor/app/livechat/server/business-hour/Helper.ts
+++ b/apps/meteor/app/livechat/server/business-hour/Helper.ts
@@ -3,10 +3,10 @@ import { ILivechatAgentStatus, LivechatBusinessHourTypes } from '@rocket.chat/co
 import { LivechatBusinessHours, Users } from '@rocket.chat/models';
 import moment from 'moment';
 
-import { notifyOnUserChangeAsync } from '../../../lib/server/lib/notifyListener';
-import { businessHourLogger } from '../lib/logger';
 import { createDefaultBusinessHourRow } from './LivechatBusinessHours';
 import { filterBusinessHoursThatMustBeOpened } from './filterBusinessHoursThatMustBeOpened';
+import { notifyOnUserChangeAsync } from '../../../lib/server/lib/notifyListener';
+import { businessHourLogger } from '../lib/logger';
 
 export { filterBusinessHoursThatMustBeOpened };
 
diff --git a/apps/meteor/app/livechat/server/business-hour/Single.ts b/apps/meteor/app/livechat/server/business-hour/Single.ts
index ea8166c75fa9..13a8673ad7fa 100644
--- a/apps/meteor/app/livechat/server/business-hour/Single.ts
+++ b/apps/meteor/app/livechat/server/business-hour/Single.ts
@@ -1,11 +1,11 @@
 import { ILivechatAgentStatus, LivechatBusinessHourTypes } from '@rocket.chat/core-typings';
 import { LivechatBusinessHours, Users } from '@rocket.chat/models';
 
-import { notifyOnUserChange } from '../../../lib/server/lib/notifyListener';
-import { businessHourLogger } from '../lib/logger';
 import type { IBusinessHourBehavior } from './AbstractBusinessHour';
 import { AbstractBusinessHourBehavior } from './AbstractBusinessHour';
 import { filterBusinessHoursThatMustBeOpened, makeAgentsUnavailableBasedOnBusinessHour, openBusinessHourDefault } from './Helper';
+import { notifyOnUserChange } from '../../../lib/server/lib/notifyListener';
+import { businessHourLogger } from '../lib/logger';
 
 export class SingleBusinessHourBehavior extends AbstractBusinessHourBehavior implements IBusinessHourBehavior {
 	async openBusinessHoursByDayAndHour(): Promise<void> {
diff --git a/apps/meteor/app/livechat/server/business-hour/closeBusinessHour.ts b/apps/meteor/app/livechat/server/business-hour/closeBusinessHour.ts
index 976d8ec1705e..c18784adb5ea 100644
--- a/apps/meteor/app/livechat/server/business-hour/closeBusinessHour.ts
+++ b/apps/meteor/app/livechat/server/business-hour/closeBusinessHour.ts
@@ -2,9 +2,9 @@ import type { ILivechatBusinessHour, IUser } from '@rocket.chat/core-typings';
 import { Users } from '@rocket.chat/models';
 import { makeFunction } from '@rocket.chat/patch-injection';
 
-import { businessHourLogger } from '../lib/logger';
 import { makeAgentsUnavailableBasedOnBusinessHour } from './Helper';
 import { getAgentIdsForBusinessHour } from './getAgentIdsForBusinessHour';
+import { businessHourLogger } from '../lib/logger';
 
 export const closeBusinessHourByAgentIds = async (
 	businessHourId: ILivechatBusinessHour['_id'],
diff --git a/apps/meteor/app/livechat/server/business-hour/index.ts b/apps/meteor/app/livechat/server/business-hour/index.ts
index 8b5f10b938ff..8df93c5cbaee 100644
--- a/apps/meteor/app/livechat/server/business-hour/index.ts
+++ b/apps/meteor/app/livechat/server/business-hour/index.ts
@@ -3,10 +3,10 @@ import { cronJobs } from '@rocket.chat/cron';
 import { Accounts } from 'meteor/accounts-base';
 import { Meteor } from 'meteor/meteor';
 
-import { callbacks } from '../../../../lib/callbacks';
 import { BusinessHourManager } from './BusinessHourManager';
 import { DefaultBusinessHour } from './Default';
 import { SingleBusinessHourBehavior } from './Single';
+import { callbacks } from '../../../../lib/callbacks';
 
 export const businessHourManager = new BusinessHourManager(cronJobs);
 
diff --git a/apps/meteor/app/livechat/server/hooks/processRoomAbandonment.ts b/apps/meteor/app/livechat/server/hooks/processRoomAbandonment.ts
index 2c718c058b00..752bce901d31 100644
--- a/apps/meteor/app/livechat/server/hooks/processRoomAbandonment.ts
+++ b/apps/meteor/app/livechat/server/hooks/processRoomAbandonment.ts
@@ -31,7 +31,7 @@ export const getSecondsSinceLastAgentResponse = async (room: IOmnichannelRoom, a
 	const department = room.departmentId
 		? await LivechatDepartment.findOneById<Pick<ILivechatDepartment, 'businessHourId'>>(room.departmentId, {
 				projection: { businessHourId: 1 },
-		  })
+			})
 		: null;
 	if (department?.businessHourId) {
 		const businessHour = await LivechatBusinessHours.findOneById(department.businessHourId);
diff --git a/apps/meteor/app/livechat/server/hooks/saveContactLastChat.ts b/apps/meteor/app/livechat/server/hooks/saveContactLastChat.ts
index d8014dd3ecc0..6996af1664d6 100644
--- a/apps/meteor/app/livechat/server/hooks/saveContactLastChat.ts
+++ b/apps/meteor/app/livechat/server/hooks/saveContactLastChat.ts
@@ -12,7 +12,9 @@ callbacks.add(
 
 		const {
 			_id,
-			v: { _id: guestId, contactId },
+			v: { _id: guestId },
+			source,
+			contactId,
 		} = room;
 
 		const lastChat = {
@@ -21,7 +23,14 @@ callbacks.add(
 		};
 		await LivechatVisitors.setLastChatById(guestId, lastChat);
 		if (contactId) {
-			await LivechatContacts.updateLastChatById(contactId, lastChat);
+			await LivechatContacts.updateLastChatById(
+				contactId,
+				{
+					visitorId: guestId,
+					source,
+				},
+				lastChat,
+			);
 		}
 	},
 	callbacks.priority.MEDIUM,
diff --git a/apps/meteor/app/livechat/server/hooks/sendEmailTranscriptOnClose.ts b/apps/meteor/app/livechat/server/hooks/sendEmailTranscriptOnClose.ts
index f6a35f4dd7f9..f0c445a78a78 100644
--- a/apps/meteor/app/livechat/server/hooks/sendEmailTranscriptOnClose.ts
+++ b/apps/meteor/app/livechat/server/hooks/sendEmailTranscriptOnClose.ts
@@ -3,7 +3,7 @@ import { isOmnichannelRoom } from '@rocket.chat/core-typings';
 import { LivechatRooms } from '@rocket.chat/models';
 
 import { callbacks } from '../../../../lib/callbacks';
-import type { CloseRoomParams } from '../lib/LivechatTyped';
+import type { CloseRoomParams } from '../lib/localTypes';
 import { sendTranscript } from '../lib/sendTranscript';
 
 type LivechatCloseCallbackParams = {
diff --git a/apps/meteor/app/livechat/server/lib/Contacts.ts b/apps/meteor/app/livechat/server/lib/Contacts.ts
deleted file mode 100644
index dd7fb0b99848..000000000000
--- a/apps/meteor/app/livechat/server/lib/Contacts.ts
+++ /dev/null
@@ -1,405 +0,0 @@
-import type {
-	AtLeast,
-	ILivechatContact,
-	ILivechatContactChannel,
-	ILivechatCustomField,
-	ILivechatVisitor,
-	IOmnichannelRoom,
-	IUser,
-} from '@rocket.chat/core-typings';
-import type { InsertionModel } from '@rocket.chat/model-typings';
-import {
-	LivechatVisitors,
-	Users,
-	LivechatRooms,
-	LivechatCustomField,
-	LivechatInquiry,
-	Rooms,
-	Subscriptions,
-	LivechatContacts,
-} from '@rocket.chat/models';
-import type { PaginatedResult, VisitorSearchChatsResult } from '@rocket.chat/rest-typings';
-import { check } from 'meteor/check';
-import { Meteor } from 'meteor/meteor';
-import type { MatchKeysAndValues, OnlyFieldsOfType, FindOptions, Sort } from 'mongodb';
-
-import { callbacks } from '../../../../lib/callbacks';
-import { trim } from '../../../../lib/utils/stringUtils';
-import {
-	notifyOnRoomChangedById,
-	notifyOnSubscriptionChangedByRoomId,
-	notifyOnLivechatInquiryChangedByRoom,
-} from '../../../lib/server/lib/notifyListener';
-import { i18n } from '../../../utils/lib/i18n';
-
-type RegisterContactProps = {
-	_id?: string;
-	token: string;
-	name: string;
-	username?: string;
-	email?: string;
-	phone?: string;
-	customFields?: Record<string, unknown | string>;
-	contactManager?: {
-		username: string;
-	};
-};
-
-type CreateContactParams = {
-	name: string;
-	emails?: string[];
-	phones?: string[];
-	unknown: boolean;
-	customFields?: Record<string, string | unknown>;
-	contactManager?: string;
-	channels?: ILivechatContactChannel[];
-};
-
-type UpdateContactParams = {
-	contactId: string;
-	name?: string;
-	emails?: string[];
-	phones?: string[];
-	customFields?: Record<string, unknown>;
-	contactManager?: string;
-	channels?: ILivechatContactChannel[];
-};
-
-type GetContactsParams = {
-	searchText?: string;
-	count: number;
-	offset: number;
-	sort: Sort;
-};
-
-type GetContactHistoryParams = {
-	contactId: string;
-	source?: string;
-	count: number;
-	offset: number;
-	sort: Sort;
-};
-
-export const Contacts = {
-	async registerContact({
-		token,
-		name,
-		email = '',
-		phone,
-		username,
-		customFields = {},
-		contactManager,
-	}: RegisterContactProps): Promise<string> {
-		check(token, String);
-
-		const visitorEmail = email.trim().toLowerCase();
-
-		if (contactManager?.username) {
-			// verify if the user exists with this username and has a livechat-agent role
-			const user = await Users.findOneByUsername(contactManager.username, { projection: { roles: 1 } });
-			if (!user) {
-				throw new Meteor.Error('error-contact-manager-not-found', `No user found with username ${contactManager.username}`);
-			}
-			if (!user.roles || !Array.isArray(user.roles) || !user.roles.includes('livechat-agent')) {
-				throw new Meteor.Error('error-invalid-contact-manager', 'The contact manager must have the role "livechat-agent"');
-			}
-		}
-
-		let contactId;
-
-		const user = await LivechatVisitors.getVisitorByToken(token, { projection: { _id: 1 } });
-
-		if (user) {
-			contactId = user._id;
-		} else {
-			if (!username) {
-				username = await LivechatVisitors.getNextVisitorUsername();
-			}
-
-			let existingUser = null;
-
-			if (visitorEmail !== '' && (existingUser = await LivechatVisitors.findOneGuestByEmailAddress(visitorEmail))) {
-				contactId = existingUser._id;
-			} else {
-				const userData = {
-					username,
-					ts: new Date(),
-					token,
-				};
-
-				contactId = (await LivechatVisitors.insertOne(userData)).insertedId;
-			}
-		}
-
-		const allowedCF = await getAllowedCustomFields();
-		const livechatData: Record<string, string> = validateCustomFields(allowedCF, customFields, { ignoreAdditionalFields: true });
-
-		const fieldsToRemove = {
-			// if field is explicitely set to empty string, remove
-			...(phone === '' && { phone: 1 }),
-			...(visitorEmail === '' && { visitorEmails: 1 }),
-			...(!contactManager?.username && { contactManager: 1 }),
-		};
-
-		const updateUser: { $set: MatchKeysAndValues<ILivechatVisitor>; $unset?: OnlyFieldsOfType<ILivechatVisitor> } = {
-			$set: {
-				token,
-				name,
-				livechatData,
-				// if phone has some value, set
-				...(phone && { phone: [{ phoneNumber: phone }] }),
-				...(visitorEmail && { visitorEmails: [{ address: visitorEmail }] }),
-				...(contactManager?.username && { contactManager: { username: contactManager.username } }),
-			},
-			...(Object.keys(fieldsToRemove).length && { $unset: fieldsToRemove }),
-		};
-
-		await LivechatVisitors.updateOne({ _id: contactId }, updateUser);
-
-		const extraQuery = await callbacks.run('livechat.applyRoomRestrictions', {});
-		const rooms: IOmnichannelRoom[] = await LivechatRooms.findByVisitorId(contactId, {}, extraQuery).toArray();
-
-		if (rooms?.length) {
-			for await (const room of rooms) {
-				const { _id: rid } = room;
-
-				const responses = await Promise.all([
-					Rooms.setFnameById(rid, name),
-					LivechatInquiry.setNameByRoomId(rid, name),
-					Subscriptions.updateDisplayNameByRoomId(rid, name),
-				]);
-
-				if (responses[0]?.modifiedCount) {
-					void notifyOnRoomChangedById(rid);
-				}
-
-				if (responses[1]?.modifiedCount) {
-					void notifyOnLivechatInquiryChangedByRoom(rid, 'updated', { name });
-				}
-
-				if (responses[2]?.modifiedCount) {
-					void notifyOnSubscriptionChangedByRoomId(rid);
-				}
-			}
-		}
-
-		return contactId;
-	},
-};
-
-export function isSingleContactEnabled(): boolean {
-	// The Single Contact feature is not yet available in production, but can already be partially used in test environments.
-	return process.env.TEST_MODE?.toUpperCase() === 'TRUE';
-}
-
-export async function createContactFromVisitor(visitor: ILivechatVisitor): Promise<string> {
-	if (visitor.contactId) {
-		throw new Error('error-contact-already-exists');
-	}
-
-	const contactData: InsertionModel<ILivechatContact> = {
-		name: visitor.name || visitor.username,
-		emails: visitor.visitorEmails,
-		phones: visitor.phone || undefined,
-		unknown: true,
-		channels: [],
-		customFields: visitor.livechatData,
-		createdAt: new Date(),
-	};
-
-	if (visitor.contactManager) {
-		const contactManagerId = await Users.findOneByUsername<Pick<IUser, '_id'>>(visitor.contactManager.username, { projection: { _id: 1 } });
-		if (contactManagerId) {
-			contactData.contactManager = contactManagerId._id;
-		}
-	}
-
-	const { insertedId: contactId } = await LivechatContacts.insertOne(contactData);
-
-	await LivechatVisitors.updateOne({ _id: visitor._id }, { $set: { contactId } });
-
-	return contactId;
-}
-
-export async function createContact(params: CreateContactParams): Promise<string> {
-	const { name, emails, phones, customFields: receivedCustomFields = {}, contactManager, channels, unknown } = params;
-
-	if (contactManager) {
-		await validateContactManager(contactManager);
-	}
-
-	const allowedCustomFields = await getAllowedCustomFields();
-	const customFields = validateCustomFields(allowedCustomFields, receivedCustomFields);
-
-	const { insertedId } = await LivechatContacts.insertOne({
-		name,
-		emails: emails?.map((address) => ({ address })),
-		phones: phones?.map((phoneNumber) => ({ phoneNumber })),
-		contactManager,
-		channels,
-		customFields,
-		unknown,
-		createdAt: new Date(),
-	});
-
-	return insertedId;
-}
-
-export async function updateContact(params: UpdateContactParams): Promise<ILivechatContact> {
-	const { contactId, name, emails, phones, customFields: receivedCustomFields, contactManager, channels } = params;
-
-	const contact = await LivechatContacts.findOneById<Pick<ILivechatContact, '_id'>>(contactId, { projection: { _id: 1 } });
-
-	if (!contact) {
-		throw new Error('error-contact-not-found');
-	}
-
-	if (contactManager) {
-		await validateContactManager(contactManager);
-	}
-
-	const customFields = receivedCustomFields && validateCustomFields(await getAllowedCustomFields(), receivedCustomFields);
-
-	const updatedContact = await LivechatContacts.updateContact(contactId, {
-		name,
-		emails: emails?.map((address) => ({ address })),
-		phones: phones?.map((phoneNumber) => ({ phoneNumber })),
-		contactManager,
-		channels,
-		customFields,
-	});
-
-	return updatedContact;
-}
-
-export async function getContacts(params: GetContactsParams): Promise<PaginatedResult<{ contacts: ILivechatContact[] }>> {
-	const { searchText, count, offset, sort } = params;
-
-	const { cursor, totalCount } = LivechatContacts.findPaginatedContacts(searchText, {
-		limit: count,
-		skip: offset,
-		sort: sort ?? { name: 1 },
-	});
-
-	const [contacts, total] = await Promise.all([cursor.toArray(), totalCount]);
-
-	return {
-		contacts,
-		count,
-		offset,
-		total,
-	};
-}
-
-export async function getContactHistory(
-	params: GetContactHistoryParams,
-): Promise<PaginatedResult<{ history: VisitorSearchChatsResult[] }>> {
-	const { contactId, source, count, offset, sort } = params;
-
-	const contact = await LivechatContacts.findOneById<Pick<ILivechatContact, 'channels'>>(contactId, { projection: { channels: 1 } });
-
-	if (!contact) {
-		throw new Error('error-contact-not-found');
-	}
-
-	const visitorsIds = new Set(contact.channels?.map((channel: ILivechatContactChannel) => channel.visitorId));
-
-	if (!visitorsIds?.size) {
-		return { history: [], count: 0, offset, total: 0 };
-	}
-
-	const options: FindOptions<IOmnichannelRoom> = {
-		sort: sort || { ts: -1 },
-		skip: offset,
-		limit: count,
-		projection: {
-			fname: 1,
-			ts: 1,
-			v: 1,
-			msgs: 1,
-			servedBy: 1,
-			closedAt: 1,
-			closedBy: 1,
-			closer: 1,
-			tags: 1,
-			source: 1,
-		},
-	};
-
-	const { totalCount, cursor } = LivechatRooms.findPaginatedRoomsByVisitorsIdsAndSource({
-		visitorsIds: Array.from(visitorsIds),
-		source,
-		options,
-	});
-
-	const [total, history] = await Promise.all([totalCount, cursor.toArray()]);
-
-	return {
-		history,
-		count: history.length,
-		offset,
-		total,
-	};
-}
-
-async function getAllowedCustomFields(): Promise<Pick<ILivechatCustomField, '_id' | 'label' | 'regexp' | 'required'>[]> {
-	return LivechatCustomField.findByScope(
-		'visitor',
-		{
-			projection: { _id: 1, label: 1, regexp: 1, required: 1 },
-		},
-		false,
-	).toArray();
-}
-
-export function validateCustomFields(
-	allowedCustomFields: AtLeast<ILivechatCustomField, '_id' | 'label' | 'regexp' | 'required'>[],
-	customFields: Record<string, string | unknown>,
-	options?: { ignoreAdditionalFields?: boolean },
-): Record<string, string> {
-	const validValues: Record<string, string> = {};
-
-	for (const cf of allowedCustomFields) {
-		if (!customFields.hasOwnProperty(cf._id)) {
-			if (cf.required) {
-				throw new Error(i18n.t('error-invalid-custom-field-value', { field: cf.label }));
-			}
-			continue;
-		}
-		const cfValue: string = trim(customFields[cf._id]);
-
-		if (!cfValue || typeof cfValue !== 'string') {
-			if (cf.required) {
-				throw new Error(i18n.t('error-invalid-custom-field-value', { field: cf.label }));
-			}
-			continue;
-		}
-
-		if (cf.regexp) {
-			const regex = new RegExp(cf.regexp);
-			if (!regex.test(cfValue)) {
-				throw new Error(i18n.t('error-invalid-custom-field-value', { field: cf.label }));
-			}
-		}
-
-		validValues[cf._id] = cfValue;
-	}
-
-	if (!options?.ignoreAdditionalFields) {
-		const allowedCustomFieldIds = new Set(allowedCustomFields.map((cf) => cf._id));
-		for (const key in customFields) {
-			if (!allowedCustomFieldIds.has(key)) {
-				throw new Error(i18n.t('error-custom-field-not-allowed', { key }));
-			}
-		}
-	}
-
-	return validValues;
-}
-
-export async function validateContactManager(contactManagerUserId: string) {
-	const contactManagerUser = await Users.findOneAgentById<Pick<IUser, '_id'>>(contactManagerUserId, { projection: { _id: 1 } });
-	if (!contactManagerUser) {
-		throw new Error('error-contact-manager-not-found');
-	}
-}
diff --git a/apps/meteor/app/livechat/server/lib/Departments.ts b/apps/meteor/app/livechat/server/lib/Departments.ts
deleted file mode 100644
index 3dfa01e4f6b6..000000000000
--- a/apps/meteor/app/livechat/server/lib/Departments.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-import type { ILivechatDepartment } from '@rocket.chat/core-typings';
-import { Logger } from '@rocket.chat/logger';
-import { LivechatDepartment, LivechatDepartmentAgents, LivechatRooms } from '@rocket.chat/models';
-
-import { callbacks } from '../../../../lib/callbacks';
-import { notifyOnLivechatDepartmentAgentChanged } from '../../../lib/server/lib/notifyListener';
-
-class DepartmentHelperClass {
-	logger = new Logger('Omnichannel:DepartmentHelper');
-
-	async removeDepartment(departmentId: string) {
-		this.logger.debug(`Removing department: ${departmentId}`);
-
-		const department = await LivechatDepartment.findOneById<Pick<ILivechatDepartment, '_id' | 'businessHourId'>>(departmentId, {
-			projection: { _id: 1, businessHourId: 1 },
-		});
-		if (!department) {
-			throw new Error('error-department-not-found');
-		}
-
-		const { _id } = department;
-
-		const ret = await LivechatDepartment.removeById(_id);
-		if (ret.acknowledged !== true) {
-			throw new Error('error-failed-to-delete-department');
-		}
-
-		const removedAgents = await LivechatDepartmentAgents.findByDepartmentId(department._id, { projection: { agentId: 1 } }).toArray();
-
-		this.logger.debug(
-			`Performing post-department-removal actions: ${_id}. Removing department agents, unsetting fallback department and removing department from rooms`,
-		);
-
-		const removeByDept = LivechatDepartmentAgents.removeByDepartmentId(_id);
-
-		const promiseResponses = await Promise.allSettled([
-			removeByDept,
-			LivechatDepartment.unsetFallbackDepartmentByDepartmentId(_id),
-			LivechatRooms.bulkRemoveDepartmentAndUnitsFromRooms(_id),
-		]);
-
-		promiseResponses.forEach((response, index) => {
-			if (response.status === 'rejected') {
-				this.logger.error(`Error while performing post-department-removal actions: ${_id}. Action No: ${index}. Error:`, response.reason);
-			}
-		});
-
-		const { deletedCount } = await removeByDept;
-
-		if (deletedCount > 0) {
-			removedAgents.forEach(({ _id: docId, agentId }) => {
-				void notifyOnLivechatDepartmentAgentChanged(
-					{
-						_id: docId,
-						agentId,
-						departmentId: _id,
-					},
-					'removed',
-				);
-			});
-		}
-
-		await callbacks.run('livechat.afterRemoveDepartment', { department, agentsIds: removedAgents.map(({ agentId }) => agentId) });
-
-		return ret;
-	}
-}
-
-export const DepartmentHelper = new DepartmentHelperClass();
diff --git a/apps/meteor/app/livechat/server/lib/Helper.ts b/apps/meteor/app/livechat/server/lib/Helper.ts
index a050e06c1943..c4d131c9740f 100644
--- a/apps/meteor/app/livechat/server/lib/Helper.ts
+++ b/apps/meteor/app/livechat/server/lib/Helper.ts
@@ -13,6 +13,10 @@ import type {
 	TransferByData,
 	ILivechatAgent,
 	ILivechatDepartment,
+	IOmnichannelRoomInfo,
+	IOmnichannelInquiryExtraData,
+	IOmnichannelRoomExtraData,
+	ILivechatContact,
 } from '@rocket.chat/core-typings';
 import { LivechatInquiryStatus, OmnichannelSourceType, DEFAULT_SLA_CONFIG, UserStatus } from '@rocket.chat/core-typings';
 import { LivechatPriorityWeight } from '@rocket.chat/core-typings/src/ILivechatPriority';
@@ -26,11 +30,18 @@ import {
 	Subscriptions,
 	Rooms,
 	Users,
+	LivechatContacts,
 } from '@rocket.chat/models';
 import { Match, check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 import { ObjectId } from 'mongodb';
 
+import { Livechat as LivechatTyped } from './LivechatTyped';
+import { queueInquiry, saveQueueInquiry } from './QueueManager';
+import { RoutingManager } from './RoutingManager';
+import { isVerifiedChannelInSource } from './contacts/isVerifiedChannelInSource';
+import { migrateVisitorIfMissingContact } from './contacts/migrateVisitorIfMissingContact';
+import { getOnlineAgents } from './getOnlineAgents';
 import { callbacks } from '../../../../lib/callbacks';
 import { validateEmail as validatorFunc } from '../../../../lib/emailValidator';
 import { i18n } from '../../../../server/lib/i18n';
@@ -44,9 +55,6 @@ import {
 	notifyOnSubscriptionChanged,
 } from '../../../lib/server/lib/notifyListener';
 import { settings } from '../../../settings/server';
-import { Livechat as LivechatTyped } from './LivechatTyped';
-import { queueInquiry, saveQueueInquiry } from './QueueManager';
-import { RoutingManager } from './RoutingManager';
 
 const logger = new Logger('LivechatHelper');
 export const allowAgentSkipQueue = (agent: SelectedAgent) => {
@@ -59,21 +67,13 @@ export const allowAgentSkipQueue = (agent: SelectedAgent) => {
 
 	return hasRoleAsync(agent.agentId, 'bot');
 };
-export const createLivechatRoom = async <
-	E extends Record<string, unknown> & {
-		sla?: string;
-		customFields?: Record<string, unknown>;
-		source?: OmnichannelSourceType;
-	},
->(
+export const createLivechatRoom = async (
 	rid: string,
-	name: string,
 	guest: ILivechatVisitor,
-	roomInfo: Partial<IOmnichannelRoom> = {},
-	extraData?: E,
+	roomInfo: IOmnichannelRoomInfo = { source: { type: OmnichannelSourceType.OTHER } },
+	extraData?: IOmnichannelRoomExtraData,
 ) => {
 	check(rid, String);
-	check(name, String);
 	check(
 		guest,
 		Match.ObjectIncluding({
@@ -85,7 +85,7 @@ export const createLivechatRoom = async <
 	);
 
 	const extraRoomInfo = await callbacks.run('livechat.beforeRoom', roomInfo, extraData);
-	const { _id, username, token, department: departmentId, status = 'online', contactId } = guest;
+	const { _id, username, token, department: departmentId, status = 'online' } = guest;
 	const newRoomAt = new Date();
 
 	const { activity } = guest;
@@ -94,13 +94,30 @@ export const createLivechatRoom = async <
 		visitor: { _id, username, departmentId, status, activity },
 	});
 
+	const source = extraRoomInfo.source || roomInfo.source;
+
+	if (settings.get<string>('Livechat_Require_Contact_Verification') === 'always') {
+		await LivechatContacts.updateContactChannel({ visitorId: _id, source }, { verified: false });
+	}
+
+	const contactId = await migrateVisitorIfMissingContact(_id, source);
+	const contact =
+		contactId &&
+		(await LivechatContacts.findOneById<Pick<ILivechatContact, '_id' | 'name' | 'channels'>>(contactId, {
+			projection: { name: 1, channels: 1 },
+		}));
+	if (!contact) {
+		throw new Error('error-invalid-contact');
+	}
+	const verified = Boolean(contact.channels.some((channel) => isVerifiedChannelInSource(channel, _id, source)));
+
 	// TODO: Solve `u` missing issue
 	const room: InsertionModel<IOmnichannelRoom> = {
 		_id: rid,
 		msgs: 0,
 		usersCount: 1,
 		lm: newRoomAt,
-		fname: name,
+		fname: contact.name,
 		t: 'l' as const,
 		ts: newRoomAt,
 		departmentId,
@@ -109,12 +126,13 @@ export const createLivechatRoom = async <
 			username,
 			token,
 			status,
-			contactId,
 			...(activity?.length && { activity }),
 		},
+		contactId,
 		cl: false,
 		open: true,
 		waitingResponse: true,
+		verified,
 		// this should be overridden by extraRoomInfo when provided
 		// in case it's not provided, we'll use this "default" type
 		source: {
@@ -162,7 +180,7 @@ export const createLivechatInquiry = async ({
 	guest?: Pick<ILivechatVisitor, '_id' | 'username' | 'status' | 'department' | 'name' | 'token' | 'activity'>;
 	message?: string;
 	initialStatus?: LivechatInquiryStatus;
-	extraData?: Pick<ILivechatInquiryRecord, 'source'>;
+	extraData?: IOmnichannelInquiryExtraData;
 }) => {
 	check(rid, String);
 	check(name, String);
@@ -403,13 +421,12 @@ export const dispatchInquiryQueued = async (inquiry: ILivechatInquiryRecord, age
 	await saveQueueInquiry(inquiry);
 
 	// Alert only the online agents of the queued request
-	const onlineAgents = await LivechatTyped.getOnlineAgents(department, agent);
+	const onlineAgents = await getOnlineAgents(department, agent);
 	if (!onlineAgents) {
 		logger.debug('Cannot notify agents of queued inquiry. No online agents found');
 		return;
 	}
 
-	logger.debug(`Notifying ${await onlineAgents.count()} agents of new inquiry`);
 	const notificationUserName = v && (v.name || v.username);
 
 	for await (const agent of onlineAgents) {
diff --git a/apps/meteor/app/livechat/server/lib/LivechatTyped.ts b/apps/meteor/app/livechat/server/lib/LivechatTyped.ts
index e521ac98fe71..b94b070537ea 100644
--- a/apps/meteor/app/livechat/server/lib/LivechatTyped.ts
+++ b/apps/meteor/app/livechat/server/lib/LivechatTyped.ts
@@ -1,13 +1,9 @@
-import dns from 'dns';
-import * as util from 'util';
-
 import { Apps, AppEvents } from '@rocket.chat/apps';
 import { Message, VideoConf, api, Omnichannel } from '@rocket.chat/core-services';
 import type {
 	IOmnichannelRoom,
 	IOmnichannelRoomClosingInfo,
 	IUser,
-	MessageTypesValues,
 	ILivechatVisitor,
 	SelectedAgent,
 	ILivechatAgent,
@@ -15,16 +11,15 @@ import type {
 	ILivechatDepartment,
 	AtLeast,
 	TransferData,
-	MessageAttachment,
-	IMessageInbox,
 	IOmnichannelAgent,
-	ILivechatDepartmentAgents,
-	LivechatDepartmentDTO,
 	ILivechatInquiryRecord,
-	ILivechatContact,
-	ILivechatContactChannel,
+	UserStatus,
+	IOmnichannelRoomInfo,
+	IOmnichannelRoomExtraData,
+	IOmnichannelSource,
+	ILivechatContactVisitorAssociation,
 } from '@rocket.chat/core-typings';
-import { OmnichannelSourceType, ILivechatAgentStatus, UserStatus, isOmnichannelRoom } from '@rocket.chat/core-typings';
+import { ILivechatAgentStatus, isOmnichannelRoom } from '@rocket.chat/core-typings';
 import { Logger, type MainLogger } from '@rocket.chat/logger';
 import {
 	LivechatDepartment,
@@ -43,12 +38,12 @@ import {
 import { serverFetch as fetch } from '@rocket.chat/server-fetch';
 import { Match, check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
-import type { Filter, FindCursor, ClientSession, MongoError } from 'mongodb';
+import type { Filter, ClientSession } from 'mongodb';
 import UAParser from 'ua-parser-js';
 
 import { callbacks } from '../../../../lib/callbacks';
 import { trim } from '../../../../lib/utils/stringUtils';
-import { client } from '../../../../server/database/utils';
+import { client, shouldRetryTransaction } from '../../../../server/database/utils';
 import { i18n } from '../../../../server/lib/i18n';
 import { addUserRolesAsync } from '../../../../server/lib/roles/addUserRoles';
 import { removeUserFromRolesAsync } from '../../../../server/lib/roles/removeUserFromRoles';
@@ -65,67 +60,25 @@ import {
 	notifyOnRoomChangedById,
 	notifyOnLivechatInquiryChangedByToken,
 	notifyOnUserChange,
-	notifyOnLivechatDepartmentAgentChangedByDepartmentId,
 	notifyOnSubscriptionChangedByRoomId,
 	notifyOnSubscriptionChanged,
 } from '../../../lib/server/lib/notifyListener';
-import * as Mailer from '../../../mailer/server/api';
 import { metrics } from '../../../metrics/server';
 import { settings } from '../../../settings/server';
 import { businessHourManager } from '../business-hour';
-import { createContact, createContactFromVisitor, isSingleContactEnabled } from './Contacts';
-import { parseAgentCustomFields, updateDepartmentAgents, validateEmail, normalizeTransferredByData } from './Helper';
+import { parseAgentCustomFields, updateDepartmentAgents, normalizeTransferredByData } from './Helper';
 import { QueueManager } from './QueueManager';
 import { RoutingManager } from './RoutingManager';
-import { isDepartmentCreationAvailable } from './isDepartmentCreationAvailable';
-import type { CloseRoomParams, CloseRoomParamsByUser, CloseRoomParamsByVisitor } from './localTypes';
+import { Visitors, type RegisterGuestType } from './Visitors';
+import { registerGuestData } from './contacts/registerGuestData';
+import { getRequiredDepartment } from './departmentsLib';
+import type { CloseRoomParams, CloseRoomParamsByUser, CloseRoomParamsByVisitor, ILivechatMessage } from './localTypes';
 import { parseTranscriptRequest } from './parseTranscriptRequest';
 
-type RegisterGuestType = Partial<Pick<ILivechatVisitor, 'token' | 'name' | 'department' | 'status' | 'username'>> & {
-	id?: string;
-	connectionData?: any;
-	email?: string;
-	phone?: { number: string };
-};
-
-type OfflineMessageData = {
-	message: string;
-	name: string;
-	email: string;
-	department?: string;
-	host?: string;
-};
-
-type UploadedFile = {
-	_id: string;
-	name?: string;
-	type?: string;
-	size?: number;
-	description?: string;
-	identify?: { size: { width: number; height: number } };
-	format?: string;
-};
-
-export interface ILivechatMessage {
-	token: string;
-	_id: string;
-	rid: string;
-	msg: string;
-	file?: UploadedFile;
-	files?: UploadedFile[];
-	attachments?: MessageAttachment[];
-	alias?: string;
-	groupable?: boolean;
-	blocks?: IMessage['blocks'];
-	email?: IMessageInbox['email'];
-}
-
 type AKeyOf<T> = {
 	[K in keyof T]?: T[K];
 };
 
-type PageInfo = { title: string; location: { href: string }; change: string };
-
 type ICRMData = {
 	_id: string;
 	label?: string;
@@ -153,8 +106,6 @@ const isRoomClosedByUserParams = (params: CloseRoomParams): params is CloseRoomP
 const isRoomClosedByVisitorParams = (params: CloseRoomParams): params is CloseRoomParamsByVisitor =>
 	(params as CloseRoomParamsByVisitor).visitor !== undefined;
 
-const dnsResolveMx = util.promisify(dns.resolveMx);
-
 class LivechatClass {
 	logger: Logger;
 
@@ -176,7 +127,7 @@ class LivechatClass {
 			Livechat.logger.debug(`Fetching online bot agents for department ${department}`);
 			const botAgents = await Livechat.getBotAgents(department);
 			if (botAgents) {
-				const onlineBots = await botAgents.count();
+				const onlineBots = await Livechat.countBotAgents(department);
 				this.logger.debug(`Found ${onlineBots} online`);
 				if (onlineBots > 0) {
 					return true;
@@ -189,27 +140,6 @@ class LivechatClass {
 		return agentsOnline;
 	}
 
-	async getOnlineAgents(department?: string, agent?: SelectedAgent | null): Promise<FindCursor<ILivechatAgent> | undefined> {
-		if (agent?.agentId) {
-			return Users.findOnlineAgents(agent.agentId);
-		}
-
-		if (department) {
-			const departmentAgents = await LivechatDepartmentAgents.getOnlineForDepartment(department);
-			if (!departmentAgents) {
-				return;
-			}
-
-			const agentIds = await departmentAgents.map(({ agentId }) => agentId).toArray();
-			if (!agentIds.length) {
-				return;
-			}
-
-			return Users.findByIds<ILivechatAgent>([...new Set(agentIds)]);
-		}
-		return Users.findOnlineAgents();
-	}
-
 	async closeRoom(params: CloseRoomParams, attempts = 2): Promise<void> {
 		let newRoom: IOmnichannelRoom;
 		let chatCloser: ChatCloser;
@@ -228,10 +158,7 @@ class LivechatClass {
 			this.logger.error({ err: e, msg: 'Failed to close room', afterAttempts: attempts });
 			await session.abortTransaction();
 			// Dont propagate transaction errors
-			if (
-				(e as unknown as MongoError)?.errorLabels?.includes('UnknownTransactionCommitResult') ||
-				(e as unknown as MongoError)?.errorLabels?.includes('TransientTransactionError')
-			) {
+			if (shouldRetryTransaction(e)) {
 				if (attempts > 0) {
 					this.logger.debug(`Retrying close room because of transient error. Attempts left: ${attempts}`);
 					return this.closeRoom(params, attempts - 1);
@@ -397,22 +324,14 @@ class LivechatClass {
 		return { room: newRoom, closedBy: closeData.closedBy, removedInquiry: inquiry };
 	}
 
-	async getRequiredDepartment(onlineRequired = true) {
-		const departments = LivechatDepartment.findEnabledWithAgents();
-
-		for await (const dept of departments) {
-			if (!dept.showOnRegistration) {
-				continue;
-			}
-			if (!onlineRequired) {
-				return dept;
-			}
-
-			const onlineAgents = await LivechatDepartmentAgents.getOnlineForDepartment(dept._id);
-			if (onlineAgents && (await onlineAgents.count())) {
-				return dept;
-			}
-		}
+	private makeVisitorAssociation(visitorId: string, roomInfo: IOmnichannelSource): ILivechatContactVisitorAssociation {
+		return {
+			visitorId,
+			source: {
+				type: roomInfo.type,
+				id: roomInfo.id,
+			},
+		};
 	}
 
 	async createRoom({
@@ -426,21 +345,22 @@ class LivechatClass {
 		visitor: ILivechatVisitor;
 		message?: string;
 		rid?: string;
-		roomInfo: {
-			source?: IOmnichannelRoom['source'];
-			[key: string]: unknown;
-		};
+		roomInfo: IOmnichannelRoomInfo;
 		agent?: SelectedAgent;
-		extraData?: Record<string, unknown>;
+		extraData?: IOmnichannelRoomExtraData;
 	}) {
 		if (!settings.get('Livechat_enabled')) {
 			throw new Meteor.Error('error-omnichannel-is-disabled');
 		}
 
+		if (await LivechatContacts.isChannelBlocked(this.makeVisitorAssociation(visitor._id, roomInfo.source))) {
+			throw new Error('error-contact-channel-blocked');
+		}
+
 		const defaultAgent = await callbacks.run('livechat.checkDefaultAgentOnNewRoom', agent, visitor);
 		// if no department selected verify if there is at least one active and pick the first
 		if (!defaultAgent && !visitor.department) {
-			const department = await this.getRequiredDepartment();
+			const department = await getRequiredDepartment();
 			Livechat.logger.debug(`No department or default agent selected for ${visitor._id}`);
 
 			if (department) {
@@ -461,55 +381,6 @@ class LivechatClass {
 			extraData,
 		});
 
-		if (isSingleContactEnabled()) {
-			let { contactId } = visitor;
-
-			if (!contactId) {
-				const visitorContact = await LivechatVisitors.findOne<
-					Pick<ILivechatVisitor, 'name' | 'contactManager' | 'livechatData' | 'phone' | 'visitorEmails' | 'username' | 'contactId'>
-				>(visitor._id, {
-					projection: {
-						name: 1,
-						contactManager: 1,
-						livechatData: 1,
-						phone: 1,
-						visitorEmails: 1,
-						username: 1,
-						contactId: 1,
-					},
-				});
-
-				contactId = visitorContact?.contactId;
-			}
-
-			if (!contactId) {
-				// ensure that old visitors have a contact
-				contactId = await createContactFromVisitor(visitor);
-			}
-
-			const contact = await LivechatContacts.findOneById<Pick<ILivechatContact, '_id' | 'channels'>>(contactId, {
-				projection: { _id: 1, channels: 1 },
-			});
-
-			if (contact) {
-				const channel = contact.channels?.find(
-					(channel: ILivechatContactChannel) => channel.name === roomInfo.source?.type && channel.visitorId === visitor._id,
-				);
-
-				if (!channel) {
-					Livechat.logger.debug(`Adding channel for contact ${contact._id}`);
-
-					await LivechatContacts.addChannel(contact._id, {
-						name: roomInfo.source?.label || roomInfo.source?.type.toString() || OmnichannelSourceType.OTHER,
-						visitorId: visitor._id,
-						blocked: false,
-						verified: false,
-						details: roomInfo.source,
-					});
-				}
-			}
-		}
-
 		Livechat.logger.debug(`Room obtained for visitor ${visitor._id} -> ${room._id}`);
 
 		await Messages.setRoomIdByToken(visitor.token, room._id);
@@ -517,21 +388,12 @@ class LivechatClass {
 		return room;
 	}
 
-	async getRoom<
-		E extends Record<string, unknown> & {
-			sla?: string;
-			customFields?: Record<string, unknown>;
-			source?: OmnichannelSourceType;
-		},
-	>(
+	async getRoom(
 		guest: ILivechatVisitor,
 		message: Pick<IMessage, 'rid' | 'msg' | 'token'>,
-		roomInfo: {
-			source?: IOmnichannelRoom['source'];
-			[key: string]: unknown;
-		},
+		roomInfo: IOmnichannelRoomInfo,
 		agent?: SelectedAgent,
-		extraData?: E,
+		extraData?: IOmnichannelRoomExtraData,
 	) {
 		if (!settings.get('Livechat_enabled')) {
 			throw new Meteor.Error('error-omnichannel-is-disabled');
@@ -539,6 +401,10 @@ class LivechatClass {
 		Livechat.logger.debug(`Attempting to find or create a room for visitor ${guest._id}`);
 		const room = await LivechatRooms.findOneById(message.rid);
 
+		if (room?.v._id && (await LivechatContacts.isChannelBlocked(this.makeVisitorAssociation(room.v._id, room.source)))) {
+			throw new Error('error-contact-channel-blocked');
+		}
+
 		if (room && !room.open) {
 			Livechat.logger.debug(`Last room for visitor ${guest._id} closed. Creating new one`);
 		}
@@ -582,30 +448,6 @@ class LivechatClass {
 		return Users.checkOnlineAgents();
 	}
 
-	async setDepartmentForGuest({ token, department }: { token: string; department: string }) {
-		check(token, String);
-		check(department, String);
-
-		Livechat.logger.debug(`Switching departments for user with token ${token} (to ${department})`);
-
-		const updateUser = {
-			$set: {
-				department,
-			},
-		};
-
-		const dep = await LivechatDepartment.findOneById<Pick<ILivechatDepartment, '_id'>>(department, { projection: { _id: 1 } });
-		if (!dep) {
-			throw new Meteor.Error('invalid-department', 'Provided department does not exists');
-		}
-
-		const visitor = await LivechatVisitors.getVisitorByToken(token, { projection: { _id: 1 } });
-		if (!visitor) {
-			throw new Meteor.Error('invalid-token', 'Provided token is invalid');
-		}
-		await LivechatVisitors.updateById(visitor._id, updateUser);
-	}
-
 	async removeRoom(rid: string) {
 		Livechat.logger.debug(`Deleting room ${rid}`);
 		check(rid, String);
@@ -640,107 +482,14 @@ class LivechatClass {
 		}
 	}
 
-	isValidObject(obj: unknown): obj is Record<string, any> {
-		return typeof obj === 'object' && obj !== null;
-	}
-
-	async registerGuest({
-		id,
-		token,
-		name,
-		phone,
-		email,
-		department,
-		username,
-		connectionData,
-		status = UserStatus.ONLINE,
-	}: RegisterGuestType): Promise<ILivechatVisitor | null> {
-		check(token, String);
-		check(id, Match.Maybe(String));
-
-		Livechat.logger.debug(`New incoming conversation: id: ${id} | token: ${token}`);
-
-		const visitorDataToUpdate: Partial<ILivechatVisitor> & { userAgent?: string; ip?: string; host?: string } = {
-			token,
-			status,
-			...(phone?.number ? { phone: [{ phoneNumber: phone.number }] } : {}),
-			...(name ? { name } : {}),
-		};
-
-		if (email) {
-			const visitorEmail = email.trim().toLowerCase();
-			validateEmail(visitorEmail);
-			visitorDataToUpdate.visitorEmails = [{ address: visitorEmail }];
-		}
-
-		const livechatVisitor = await LivechatVisitors.getVisitorByToken(token, { projection: { _id: 1 } });
-
-		if (livechatVisitor?.department !== department && department) {
-			Livechat.logger.debug(`Attempt to find a department with id/name ${department}`);
-			const dep = await LivechatDepartment.findOneByIdOrName(department, { projection: { _id: 1 } });
-			if (!dep) {
-				Livechat.logger.debug(`Invalid department provided: ${department}`);
-				throw new Meteor.Error('error-invalid-department', 'The provided department is invalid');
-			}
-			Livechat.logger.debug(`Assigning visitor ${token} to department ${dep._id}`);
-			visitorDataToUpdate.department = dep._id;
-		}
-
-		visitorDataToUpdate.token = livechatVisitor?.token || token;
-
-		let existingUser = null;
-
-		if (livechatVisitor) {
-			Livechat.logger.debug('Found matching user by token');
-			visitorDataToUpdate._id = livechatVisitor._id;
-		} else if (phone?.number && (existingUser = await LivechatVisitors.findOneVisitorByPhone(phone.number))) {
-			Livechat.logger.debug('Found matching user by phone number');
-			visitorDataToUpdate._id = existingUser._id;
-			// Don't change token when matching by phone number, use current visitor token
-			visitorDataToUpdate.token = existingUser.token;
-		} else if (email && (existingUser = await LivechatVisitors.findOneGuestByEmailAddress(email))) {
-			Livechat.logger.debug('Found matching user by email');
-			visitorDataToUpdate._id = existingUser._id;
-		} else if (!livechatVisitor) {
-			Livechat.logger.debug(`No matches found. Attempting to create new user with token ${token}`);
-
-			visitorDataToUpdate._id = id || undefined;
-			visitorDataToUpdate.username = username || (await LivechatVisitors.getNextVisitorUsername());
-			visitorDataToUpdate.status = status;
-			visitorDataToUpdate.ts = new Date();
-
-			if (settings.get('Livechat_Allow_collect_and_store_HTTP_header_informations') && Livechat.isValidObject(connectionData)) {
-				Livechat.logger.debug(`Saving connection data for visitor ${token}`);
-				const { httpHeaders, clientAddress } = connectionData;
-				if (Livechat.isValidObject(httpHeaders)) {
-					visitorDataToUpdate.userAgent = httpHeaders['user-agent'];
-					visitorDataToUpdate.ip = httpHeaders['x-real-ip'] || httpHeaders['x-forwarded-for'] || clientAddress;
-					visitorDataToUpdate.host = httpHeaders?.host;
-				}
-			}
-		}
-
-		if (isSingleContactEnabled()) {
-			const contactId = await createContact({
-				name: name ?? (visitorDataToUpdate.username as string),
-				emails: email ? [email] : [],
-				phones: phone ? [phone.number] : [],
-				unknown: true,
-			});
-			visitorDataToUpdate.contactId = contactId;
-		}
-
-		const upsertedLivechatVisitor = await LivechatVisitors.updateOneByIdOrToken(visitorDataToUpdate, {
-			upsert: true,
-			returnDocument: 'after',
-		});
+	async registerGuest(newData: RegisterGuestType): Promise<ILivechatVisitor | null> {
+		const result = await Visitors.registerGuest(newData);
 
-		if (!upsertedLivechatVisitor.value) {
-			Livechat.logger.debug(`No visitor found after upsert`);
-			return null;
+		if (result) {
+			await registerGuestData(newData, result);
 		}
 
-		return upsertedLivechatVisitor.value;
+		return result;
 	}
 
 	private async getBotAgents(department?: string) {
@@ -751,6 +500,14 @@ class LivechatClass {
 		return Users.findBotAgents();
 	}
 
+	private async countBotAgents(department?: string) {
+		if (department) {
+			return LivechatDepartmentAgents.countBotsForDepartment(department);
+		}
+
+		return Users.countBotAgents();
+	}
+
 	private async resolveChatTags(
 		room: IOmnichannelRoom,
 		options: CloseRoomParams['options'] = {},
@@ -815,16 +572,6 @@ class LivechatClass {
 		};
 	}
 
-	private async sendEmail(from: string, to: string, replyTo: string, subject: string, html: string): Promise<void> {
-		await Mailer.send({
-			to,
-			from,
-			replyTo,
-			subject,
-			html,
-		});
-	}
-
 	async sendRequest(
 		postData: {
 			type: string;
@@ -963,57 +710,6 @@ class LivechatClass {
 		});
 	}
 
-	async getRoomMessages({ rid }: { rid: string }) {
-		const room = await Rooms.findOneById(rid, { projection: { t: 1 } });
-		if (room?.t !== 'l') {
-			throw new Meteor.Error('invalid-room');
-		}
-
-		const ignoredMessageTypes: MessageTypesValues[] = [
-			'livechat_navigation_history',
-			'livechat_transcript_history',
-			'command',
-			'livechat-close',
-			'livechat-started',
-			'livechat_video_call',
-		];
-
-		return Messages.findVisibleByRoomIdNotContainingTypes(rid, ignoredMessageTypes, {
-			sort: { ts: 1 },
-		});
-	}
-
-	async archiveDepartment(_id: string) {
-		const department = await LivechatDepartment.findOneById<Pick<ILivechatDepartment, '_id' | 'businessHourId'>>(_id, {
-			projection: { _id: 1, businessHourId: 1 },
-		});
-
-		if (!department) {
-			throw new Error('department-not-found');
-		}
-
-		await Promise.all([LivechatDepartmentAgents.disableAgentsByDepartmentId(_id), LivechatDepartment.archiveDepartment(_id)]);
-
-		void notifyOnLivechatDepartmentAgentChangedByDepartmentId(_id);
-
-		await callbacks.run('livechat.afterDepartmentArchived', department);
-	}
-
-	async unarchiveDepartment(_id: string) {
-		const department = await LivechatDepartment.findOneById(_id, { projection: { _id: 1 } });
-
-		if (!department) {
-			throw new Meteor.Error('department-not-found');
-		}
-
-		// TODO: these kind of actions should be on events instead of here
-		await Promise.all([LivechatDepartmentAgents.enableAgentsByDepartmentId(_id), LivechatDepartment.unarchiveDepartment(_id)]);
-
-		void notifyOnLivechatDepartmentAgentChangedByDepartmentId(_id);
-
-		return true;
-	}
-
 	async updateMessage({ guest, message }: { guest: ILivechatVisitor; message: AtLeast<IMessage, '_id' | 'msg' | 'rid'> }) {
 		check(message, Match.ObjectIncluding({ _id: String }));
 
@@ -1149,69 +845,6 @@ class LivechatClass {
 		return rcSettings;
 	}
 
-	async sendOfflineMessage(data: OfflineMessageData) {
-		if (!settings.get('Livechat_display_offline_form')) {
-			throw new Error('error-offline-form-disabled');
-		}
-
-		const { message, name, email, department, host } = data;
-
-		if (!email) {
-			throw new Error('error-invalid-email');
-		}
-
-		const emailMessage = `${message}`.replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1<br>$2');
-
-		let html = '<h1>New livechat message</h1>';
-		if (host && host !== '') {
-			html = html.concat(`<p><strong>Sent from:</strong><a href='${host}'> ${host}</a></p>`);
-		}
-		html = html.concat(`
-			<p><strong>Visitor name:</strong> ${name}</p>
-			<p><strong>Visitor email:</strong> ${email}</p>
-			<p><strong>Message:</strong><br>${emailMessage}</p>`);
-
-		const fromEmail = settings.get<string>('From_Email').match(/\b[A-Z0-9._%+-]+@(?:[A-Z0-9-]+\.)+[A-Z]{2,4}\b/i);
-
-		let from: string;
-		if (fromEmail) {
-			from = fromEmail[0];
-		} else {
-			from = settings.get<string>('From_Email');
-		}
-
-		if (settings.get('Livechat_validate_offline_email')) {
-			const emailDomain = email.substr(email.lastIndexOf('@') + 1);
-
-			try {
-				await dnsResolveMx(emailDomain);
-			} catch (e) {
-				throw new Meteor.Error('error-invalid-email-address');
-			}
-		}
-
-		// TODO Block offline form if Livechat_offline_email is undefined
-		// (it does not make sense to have an offline form that does nothing)
-		// `this.sendEmail` will throw an error if the email is invalid
-		// thus this breaks livechat, since the "to" email is invalid, and that returns an [invalid email] error to the livechat client
-		let emailTo = settings.get<string>('Livechat_offline_email');
-		if (department && department !== '') {
-			const dep = await LivechatDepartment.findOneByIdOrName(department, { projection: { email: 1 } });
-			if (dep) {
-				emailTo = dep.email || emailTo;
-			}
-		}
-
-		const fromText = `${name} - ${email} <${from}>`;
-		const replyTo = `${name} <${email}>`;
-		const subject = `Livechat offline message from ${name}: ${`${emailMessage}`.substring(0, 20)}`;
-		await this.sendEmail(fromText, emailTo, replyTo, subject, html);
-
-		setImmediate(() => {
-			void callbacks.run('livechat.offlineMessage', data);
-		});
-	}
-
 	async sendMessage({
 		guest,
 		message,
@@ -1220,10 +853,7 @@ class LivechatClass {
 	}: {
 		guest: ILivechatVisitor;
 		message: ILivechatMessage;
-		roomInfo: {
-			source?: IOmnichannelRoom['source'];
-			[key: string]: unknown;
-		};
+		roomInfo: IOmnichannelRoomInfo;
 		agent?: SelectedAgent;
 	}) {
 		const { room, newRoom } = await this.getRoom(guest, message, roomInfo, agent);
@@ -1508,53 +1138,6 @@ class LivechatClass {
 		return true;
 	}
 
-	async savePageHistory(token: string, roomId: string | undefined, pageInfo: PageInfo) {
-		this.logger.debug({
-			msg: `Saving page movement history for visitor with token ${token}`,
-			pageInfo,
-			roomId,
-		});
-
-		if (pageInfo.change !== settings.get<string>('Livechat_history_monitor_type')) {
-			return;
-		}
-		const user = await Users.findOneById('rocket.cat');
-
-		if (!user) {
-			throw new Error('error-invalid-user');
-		}
-
-		const pageTitle = pageInfo.title;
-		const pageUrl = pageInfo.location.href;
-		const extraData: {
-			navigation: {
-				page: PageInfo;
-				token: string;
-			};
-			expireAt?: number;
-			_hidden?: boolean;
-		} = {
-			navigation: {
-				page: pageInfo,
-				token,
-			},
-		};
-
-		if (!roomId) {
-			this.logger.warn(`Saving page history without room id for visitor with token ${token}`);
-			// keep history of unregistered visitors for 1 month
-			const keepHistoryMiliseconds = 2592000000;
-			extraData.expireAt = new Date().getTime() + keepHistoryMiliseconds;
-		}
-
-		if (!settings.get('Livechat_Visitor_navigation_as_a_message')) {
-			extraData._hidden = true;
-		}
-
-		// @ts-expect-error: Investigating on which case we won't receive a roomId and where that history is supposed to be stored
-		return Message.saveSystemMessage('livechat_navigation_history', roomId, `${pageTitle} - ${pageUrl}`, user, extraData);
-	}
-
 	async afterRemoveAgent(user: AtLeast<IUser, '_id' | 'username'>) {
 		await callbacks.run('livechat.afterAgentRemoved', { agent: user });
 		return true;
@@ -1733,41 +1316,6 @@ class LivechatClass {
 		return false;
 	}
 
-	async saveDepartmentAgents(
-		_id: string,
-		departmentAgents: {
-			upsert?: Pick<ILivechatDepartmentAgents, 'agentId' | 'count' | 'order' | 'username'>[];
-			remove?: Pick<ILivechatDepartmentAgents, 'agentId'>[];
-		},
-	) {
-		check(_id, String);
-		check(departmentAgents, {
-			upsert: Match.Maybe([
-				Match.ObjectIncluding({
-					agentId: String,
-					username: String,
-					count: Match.Maybe(Match.Integer),
-					order: Match.Maybe(Match.Integer),
-				}),
-			]),
-			remove: Match.Maybe([
-				Match.ObjectIncluding({
-					agentId: String,
-					username: Match.Maybe(String),
-					count: Match.Maybe(Match.Integer),
-					order: Match.Maybe(Match.Integer),
-				}),
-			]),
-		});
-
-		const department = await LivechatDepartment.findOneById<Pick<ILivechatDepartment, 'enabled'>>(_id, { projection: { enabled: 1 } });
-		if (!department) {
-			throw new Meteor.Error('error-department-not-found', 'Department not found');
-		}
-
-		return updateDepartmentAgents(_id, departmentAgents, department.enabled);
-	}
-
 	async saveRoomInfo(
 		roomData: {
 			_id: string;
@@ -1839,135 +1387,6 @@ class LivechatClass {
 
 		return true;
 	}
-
-	/**
-	 * @param {string|null} _id - The department id
-	 * @param {Partial<import('@rocket.chat/core-typings').ILivechatDepartment>} departmentData
-	 * @param {{upsert?: { agentId: string; count?: number; order?: number; }[], remove?: { agentId: string; count?: number; order?: number; }}} [departmentAgents] - The department agents
-	 * @param {{_id?: string}} [departmentUnit] - The department's unit id
-	 */
-	async saveDepartment(
-		userId: string,
-		_id: string | null,
-		departmentData: LivechatDepartmentDTO,
-		departmentAgents?: {
-			upsert?: { agentId: string; count?: number; order?: number }[];
-			remove?: { agentId: string; count?: number; order?: number };
-		},
-		departmentUnit?: { _id?: string },
-	) {
-		check(_id, Match.Maybe(String));
-		if (departmentUnit?._id !== undefined && typeof departmentUnit._id !== 'string') {
-			throw new Meteor.Error('error-invalid-department-unit', 'Invalid department unit id provided', {
-				method: 'livechat:saveDepartment',
-			});
-		}
-
-		const department = _id
-			? await LivechatDepartment.findOneById(_id, { projection: { _id: 1, archived: 1, enabled: 1, parentId: 1 } })
-			: null;
-
-		if (departmentUnit && !departmentUnit._id && department && department.parentId) {
-			const isLastDepartmentInUnit = (await LivechatDepartment.countDepartmentsInUnit(department.parentId)) === 1;
-			if (isLastDepartmentInUnit) {
-				throw new Meteor.Error('error-unit-cant-be-empty', "The last department in a unit can't be removed", {
-					method: 'livechat:saveDepartment',
-				});
-			}
-		}
-
-		if (!department && !(await isDepartmentCreationAvailable())) {
-			throw new Meteor.Error('error-max-departments-number-reached', 'Maximum number of departments reached', {
-				method: 'livechat:saveDepartment',
-			});
-		}
-
-		if (department?.archived && departmentData.enabled) {
-			throw new Meteor.Error('error-archived-department-cant-be-enabled', 'Archived departments cant be enabled', {
-				method: 'livechat:saveDepartment',
-			});
-		}
-
-		const defaultValidations: Record<string, Match.Matcher<any> | BooleanConstructor | StringConstructor> = {
-			enabled: Boolean,
-			name: String,
-			description: Match.Optional(String),
-			showOnRegistration: Boolean,
-			email: String,
-			showOnOfflineForm: Boolean,
-			requestTagBeforeClosingChat: Match.Optional(Boolean),
-			chatClosingTags: Match.Optional([String]),
-			fallbackForwardDepartment: Match.Optional(String),
-			departmentsAllowedToForward: Match.Optional([String]),
-			allowReceiveForwardOffline: Match.Optional(Boolean),
-		};
-
-		// The Livechat Form department support addition/custom fields, so those fields need to be added before validating
-		Object.keys(departmentData).forEach((field) => {
-			if (!defaultValidations.hasOwnProperty(field)) {
-				defaultValidations[field] = Match.OneOf(String, Match.Integer, Boolean);
-			}
-		});
-
-		check(departmentData, defaultValidations);
-		check(
-			departmentAgents,
-			Match.Maybe({
-				upsert: Match.Maybe(Array),
-				remove: Match.Maybe(Array),
-			}),
-		);
-
-		const { requestTagBeforeClosingChat, chatClosingTags, fallbackForwardDepartment } = departmentData;
-		if (requestTagBeforeClosingChat && (!chatClosingTags || chatClosingTags.length === 0)) {
-			throw new Meteor.Error(
-				'error-validating-department-chat-closing-tags',
-				'At least one closing tag is required when the department requires tag(s) on closing conversations.',
-				{ method: 'livechat:saveDepartment' },
-			);
-		}
-
-		if (_id && !department) {
-			throw new Meteor.Error('error-department-not-found', 'Department not found', {
-				method: 'livechat:saveDepartment',
-			});
-		}
-
-		if (fallbackForwardDepartment === _id) {
-			throw new Meteor.Error(
-				'error-fallback-department-circular',
-				'Cannot save department. Circular reference between fallback department and department',
-			);
-		}
-
-		if (fallbackForwardDepartment) {
-			const fallbackDep = await LivechatDepartment.findOneById(fallbackForwardDepartment, {
-				projection: { _id: 1, fallbackForwardDepartment: 1 },
-			});
-			if (!fallbackDep) {
-				throw new Meteor.Error('error-fallback-department-not-found', 'Fallback department not found', {
-					method: 'livechat:saveDepartment',
-				});
-			}
-		}
-
-		const departmentDB = await LivechatDepartment.createOrUpdateDepartment(_id, departmentData);
-		if (departmentDB && departmentAgents) {
-			await updateDepartmentAgents(departmentDB._id, departmentAgents, departmentDB.enabled);
-		}
-
-		// Disable event
-		if (department?.enabled && !departmentDB?.enabled) {
-			await callbacks.run('livechat.afterDepartmentDisabled', departmentDB);
-		}
-
-		if (departmentUnit) {
-			await callbacks.run('livechat.manageDepartmentUnit', { userId, departmentId: departmentDB._id, unitId: departmentUnit._id });
-		}
-
-		return departmentDB;
-	}
 }
 
 export const Livechat = new LivechatClass();
-export * from './localTypes';
diff --git a/apps/meteor/app/livechat/server/lib/QueueManager.ts b/apps/meteor/app/livechat/server/lib/QueueManager.ts
index c6728d470870..fb1469bcde8b 100644
--- a/apps/meteor/app/livechat/server/lib/QueueManager.ts
+++ b/apps/meteor/app/livechat/server/lib/QueueManager.ts
@@ -1,20 +1,28 @@
 import { Apps, AppEvents } from '@rocket.chat/apps';
 import { Omnichannel } from '@rocket.chat/core-services';
-import type { ILivechatDepartment } from '@rocket.chat/core-typings';
-import {
-	LivechatInquiryStatus,
-	type ILivechatInquiryRecord,
-	type ILivechatVisitor,
-	type IOmnichannelRoom,
-	type SelectedAgent,
-	type OmnichannelSourceType,
+import type {
+	ILivechatDepartment,
+	IOmnichannelRoomInfo,
+	IOmnichannelRoomExtraData,
+	AtLeast,
+	ILivechatInquiryRecord,
+	ILivechatVisitor,
+	IOmnichannelRoom,
+	SelectedAgent,
 } from '@rocket.chat/core-typings';
+import { LivechatInquiryStatus } from '@rocket.chat/core-typings';
 import { Logger } from '@rocket.chat/logger';
-import { LivechatDepartment, LivechatDepartmentAgents, LivechatInquiry, LivechatRooms, Users } from '@rocket.chat/models';
+import { LivechatContacts, LivechatDepartment, LivechatDepartmentAgents, LivechatInquiry, LivechatRooms, Users } from '@rocket.chat/models';
 import { Random } from '@rocket.chat/random';
 import { Match, check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 
+import { createLivechatRoom, createLivechatInquiry, allowAgentSkipQueue } from './Helper';
+import { Livechat } from './LivechatTyped';
+import { RoutingManager } from './RoutingManager';
+import { isVerifiedChannelInSource } from './contacts/isVerifiedChannelInSource';
+import { getOnlineAgents } from './getOnlineAgents';
+import { getInquirySortMechanismSetting } from './settings';
 import { dispatchInquiryPosition } from '../../../../ee/app/livechat-enterprise/server/lib/Helper';
 import { callbacks } from '../../../../lib/callbacks';
 import { sendNotification } from '../../../lib/server';
@@ -25,10 +33,6 @@ import {
 } from '../../../lib/server/lib/notifyListener';
 import { settings } from '../../../settings/server';
 import { i18n } from '../../../utils/lib/i18n';
-import { createLivechatRoom, createLivechatInquiry, allowAgentSkipQueue } from './Helper';
-import { Livechat } from './LivechatTyped';
-import { RoutingManager } from './RoutingManager';
-import { getInquirySortMechanismSetting } from './settings';
 
 const logger = new Logger('QueueManager');
 
@@ -94,8 +98,7 @@ export class QueueManager {
 
 		const inquiryAgent = await RoutingManager.delegateAgent(defaultAgent, inquiry);
 		logger.debug(`Delegating inquiry with id ${inquiry._id} to agent ${defaultAgent?.username}`);
-		await callbacks.run('livechat.beforeRouteChat', inquiry, inquiryAgent);
-		const dbInquiry = await LivechatInquiry.findOneById(inquiry._id);
+		const dbInquiry = await callbacks.run('livechat.beforeRouteChat', inquiry, inquiryAgent);
 
 		if (!dbInquiry) {
 			throw new Error('inquiry-not-found');
@@ -118,10 +121,20 @@ export class QueueManager {
 			return this.fnQueueInquiryStatus({ room, agent });
 		}
 
+		const needVerification = ['once', 'always'].includes(settings.get<string>('Livechat_Require_Contact_Verification'));
+
+		if (needVerification && !(await this.isRoomContactVerified(room))) {
+			return LivechatInquiryStatus.VERIFYING;
+		}
+
 		if (!(await Omnichannel.isWithinMACLimit(room))) {
 			return LivechatInquiryStatus.QUEUED;
 		}
 
+		if (settings.get('Livechat_waiting_queue')) {
+			return LivechatInquiryStatus.QUEUED;
+		}
+
 		if (RoutingManager.getConfig()?.autoAssignAgent) {
 			return LivechatInquiryStatus.READY;
 		}
@@ -133,41 +146,86 @@ export class QueueManager {
 		return LivechatInquiryStatus.READY;
 	}
 
-	static async queueInquiry(inquiry: ILivechatInquiryRecord, room: IOmnichannelRoom, defaultAgent?: SelectedAgent | null) {
-		if (inquiry.status === 'ready') {
+	static async processNewInquiry(inquiry: ILivechatInquiryRecord, room: IOmnichannelRoom, defaultAgent?: SelectedAgent | null) {
+		if (inquiry.status === LivechatInquiryStatus.VERIFYING) {
+			logger.debug({ msg: 'Inquiry is waiting for contact verification. Ignoring it', inquiry, defaultAgent });
+
+			if (defaultAgent) {
+				await LivechatInquiry.setDefaultAgentById(inquiry._id, defaultAgent);
+			}
+			return;
+		}
+
+		if (inquiry.status === LivechatInquiryStatus.READY) {
+			logger.debug({ msg: 'Inquiry is ready. Delegating', inquiry, defaultAgent });
 			return RoutingManager.delegateInquiry(inquiry, defaultAgent, undefined, room);
 		}
 
-		await callbacks.run('livechat.afterInquiryQueued', inquiry);
+		if (inquiry.status === LivechatInquiryStatus.QUEUED) {
+			await callbacks.run('livechat.afterInquiryQueued', inquiry);
 
-		void callbacks.run('livechat.chatQueued', room);
+			void callbacks.run('livechat.chatQueued', room);
 
-		await this.dispatchInquiryQueued(inquiry, room, defaultAgent);
+			return this.dispatchInquiryQueued(inquiry, room, defaultAgent);
+		}
 	}
 
-	static async requestRoom<
-		E extends Record<string, unknown> & {
-			sla?: string;
-			customFields?: Record<string, unknown>;
-			source?: OmnichannelSourceType;
-		},
-	>({
+	static async verifyInquiry(inquiry: ILivechatInquiryRecord, room: IOmnichannelRoom) {
+		if (inquiry.status !== LivechatInquiryStatus.VERIFYING) {
+			return;
+		}
+
+		const { defaultAgent: agent } = inquiry;
+
+		const newStatus = await QueueManager.getInquiryStatus({ room, agent });
+
+		if (newStatus === inquiry.status) {
+			throw new Error('error-failed-to-verify-inquiry');
+		}
+
+		const newInquiry = await LivechatInquiry.setStatusById(inquiry._id, newStatus);
+
+		await this.processNewInquiry(newInquiry, room, agent);
+
+		const newRoom = await LivechatRooms.findOneById<Pick<IOmnichannelRoom, '_id' | 'servedBy' | 'departmentId'>>(room._id, {
+			projection: { servedBy: 1, departmentId: 1 },
+		});
+
+		if (!newRoom) {
+			logger.error(`Room with id ${room._id} not found after inquiry verification.`);
+			throw new Error('room-not-found');
+		}
+
+		await this.dispatchInquiryPosition(inquiry, newRoom);
+	}
+
+	static async isRoomContactVerified(room: IOmnichannelRoom): Promise<boolean> {
+		if (!room.contactId) {
+			return false;
+		}
+
+		const contact = await LivechatContacts.findOneById(room.contactId, { projection: { channels: 1 } });
+		if (!contact) {
+			return false;
+		}
+
+		return Boolean(contact.channels.some((channel) => isVerifiedChannelInSource(channel, room.v._id, room.source)));
+	}
+
+	static async requestRoom({
 		guest,
 		rid = Random.id(),
 		message,
 		roomInfo,
 		agent,
-		extraData: { customFields, ...extraData } = {} as E,
+		extraData: { customFields, ...extraData } = {},
 	}: {
 		guest: ILivechatVisitor;
 		rid?: string;
 		message?: string;
-		roomInfo: {
-			source?: IOmnichannelRoom['source'];
-			[key: string]: unknown;
-		};
+		roomInfo: IOmnichannelRoomInfo;
 		agent?: SelectedAgent;
-		extraData?: E;
+		extraData?: IOmnichannelRoomExtraData;
 	}) {
 		logger.debug(`Requesting a room for guest ${guest._id}`);
 		check(
@@ -221,9 +279,7 @@ export class QueueManager {
 			}
 		}
 
-		const name = (roomInfo?.fname as string) || guest.name || guest.username;
-
-		const room = await createLivechatRoom(rid, name, { ...guest, ...(department && { department }) }, roomInfo, {
+		const room = await createLivechatRoom(rid, { ...guest, ...(department && { department }) }, roomInfo, {
 			...extraData,
 			...(Boolean(customFields) && { customFields }),
 		});
@@ -236,7 +292,7 @@ export class QueueManager {
 
 		const inquiry = await createLivechatInquiry({
 			rid,
-			name,
+			name: room.fname,
 			initialStatus: await this.getInquiryStatus({ room, agent: defaultAgent }),
 			guest,
 			message,
@@ -255,16 +311,31 @@ export class QueueManager {
 			void notifyOnSettingChanged(livechatSetting);
 		}
 
-		const newRoom = (await this.queueInquiry(inquiry, room, defaultAgent)) ?? (await LivechatRooms.findOneById(rid));
+		await this.processNewInquiry(inquiry, room, defaultAgent);
+		const newRoom = await LivechatRooms.findOneById(rid);
+
 		if (!newRoom) {
 			logger.error(`Room with id ${rid} not found`);
 			throw new Error('room-not-found');
 		}
 
-		if (!newRoom.servedBy && settings.get('Omnichannel_calculate_dispatch_service_queue_statistics')) {
+		await this.dispatchInquiryPosition(inquiry, newRoom);
+		return newRoom;
+	}
+
+	static async dispatchInquiryPosition(
+		inquiry: ILivechatInquiryRecord,
+		room: AtLeast<IOmnichannelRoom, 'servedBy' | 'departmentId'>,
+	): Promise<void> {
+		if (
+			!room.servedBy &&
+			inquiry.status !== LivechatInquiryStatus.VERIFYING &&
+			settings.get('Livechat_waiting_queue') &&
+			settings.get('Omnichannel_calculate_dispatch_service_queue_statistics')
+		) {
 			const [inq] = await LivechatInquiry.getCurrentSortedQueueAsync({
 				inquiryId: inquiry._id,
-				department,
+				department: room.departmentId,
 				queueSortBy: getInquirySortMechanismSetting(),
 			});
 
@@ -272,8 +343,6 @@ export class QueueManager {
 				void dispatchInquiryPosition(inq);
 			}
 		}
-
-		return newRoom;
 	}
 
 	static async unarchiveRoom(archivedRoom: IOmnichannelRoom) {
@@ -329,18 +398,21 @@ export class QueueManager {
 	}
 
 	private static dispatchInquiryQueued = async (inquiry: ILivechatInquiryRecord, room: IOmnichannelRoom, agent?: SelectedAgent | null) => {
+		if (RoutingManager.getConfig()?.autoAssignAgent) {
+			return;
+		}
+
 		logger.debug(`Notifying agents of new inquiry ${inquiry._id} queued`);
 
 		const { department, rid, v } = inquiry;
 		// Alert only the online agents of the queued request
-		const onlineAgents = await Livechat.getOnlineAgents(department, agent);
+		const onlineAgents = await getOnlineAgents(department, agent);
 
 		if (!onlineAgents) {
 			logger.debug('Cannot notify agents of queued inquiry. No online agents found');
 			return;
 		}
 
-		logger.debug(`Notifying ${await onlineAgents.count()} agents of new inquiry`);
 		const notificationUserName = v && (v.name || v.username);
 
 		for await (const agent of onlineAgents) {
diff --git a/apps/meteor/app/livechat/server/lib/RoutingManager.ts b/apps/meteor/app/livechat/server/lib/RoutingManager.ts
index 28e5c72efc16..123c56f4d31f 100644
--- a/apps/meteor/app/livechat/server/lib/RoutingManager.ts
+++ b/apps/meteor/app/livechat/server/lib/RoutingManager.ts
@@ -1,5 +1,5 @@
 import { Apps, AppEvents } from '@rocket.chat/apps';
-import { Message, Omnichannel } from '@rocket.chat/core-services';
+import { Message } from '@rocket.chat/core-services';
 import type {
 	ILivechatInquiryRecord,
 	ILivechatVisitor,
@@ -12,15 +12,11 @@ import type {
 	TransferData,
 } from '@rocket.chat/core-typings';
 import { LivechatInquiryStatus } from '@rocket.chat/core-typings';
-import { License } from '@rocket.chat/license';
 import { Logger } from '@rocket.chat/logger';
 import { LivechatInquiry, LivechatRooms, Subscriptions, Rooms, Users } from '@rocket.chat/models';
 import { Match, check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 
-import { callbacks } from '../../../../lib/callbacks';
-import { notifyOnLivechatInquiryChangedById, notifyOnLivechatInquiryChanged } from '../../../lib/server/lib/notifyListener';
-import { settings } from '../../../settings/server';
 import {
 	createLivechatSubscription,
 	dispatchAgentDelegated,
@@ -31,12 +27,14 @@ import {
 	updateChatDepartment,
 	allowAgentSkipQueue,
 } from './Helper';
+import { callbacks } from '../../../../lib/callbacks';
+import { notifyOnLivechatInquiryChangedById, notifyOnLivechatInquiryChanged } from '../../../lib/server/lib/notifyListener';
+import { settings } from '../../../settings/server';
 
 const logger = new Logger('RoutingManager');
 
 type Routing = {
 	methods: Record<string, IRoutingMethod>;
-	startQueue(): Promise<void>;
 	isMethodSet(): boolean;
 	registerMethod(name: string, Method: IRoutingMethodConstructor): void;
 	getMethod(): IRoutingMethod;
@@ -68,16 +66,6 @@ type Routing = {
 export const RoutingManager: Routing = {
 	methods: {},
 
-	async startQueue() {
-		const shouldPreventQueueStart = await License.shouldPreventAction('monthlyActiveContacts');
-
-		if (shouldPreventQueueStart) {
-			logger.error('Monthly Active Contacts limit reached. Queue will not start');
-			return;
-		}
-		void (await Omnichannel.getQueueWorker()).shouldStart();
-	},
-
 	isMethodSet() {
 		return settings.get<string>('Livechat_Routing_Method') !== '';
 	},
diff --git a/apps/meteor/app/livechat/server/lib/Visitors.ts b/apps/meteor/app/livechat/server/lib/Visitors.ts
new file mode 100644
index 000000000000..c7b4430df363
--- /dev/null
+++ b/apps/meteor/app/livechat/server/lib/Visitors.ts
@@ -0,0 +1,110 @@
+import { UserStatus, type ILivechatVisitor } from '@rocket.chat/core-typings';
+import { Logger } from '@rocket.chat/logger';
+import { LivechatDepartment, LivechatVisitors } from '@rocket.chat/models';
+
+import { validateEmail } from './Helper';
+import { settings } from '../../../settings/server';
+
+const logger = new Logger('Livechat - Visitor');
+
+export type RegisterGuestType = Partial<Pick<ILivechatVisitor, 'token' | 'name' | 'department' | 'status' | 'username'>> & {
+	id?: string;
+	connectionData?: any;
+	email?: string;
+	phone?: { number: string };
+};
+
+export const Visitors = {
+	isValidObject(obj: unknown): obj is Record<string, any> {
+		return typeof obj === 'object' && obj !== null;
+	},
+
+	async registerGuest({
+		id,
+		token,
+		name,
+		phone,
+		email,
+		department,
+		username,
+		connectionData,
+		status = UserStatus.ONLINE,
+	}: RegisterGuestType): Promise<ILivechatVisitor | null> {
+		check(token, String);
+		check(id, Match.Maybe(String));
+
+		logger.debug(`New incoming conversation: id: ${id} | token: ${token}`);
+
+		const visitorDataToUpdate: Partial<ILivechatVisitor> & { userAgent?: string; ip?: string; host?: string } = {
+			token,
+			status,
+			...(phone?.number && { phone: [{ phoneNumber: phone.number }] }),
+			...(name && { name }),
+		};
+
+		if (email) {
+			const visitorEmail = email.trim().toLowerCase();
+			validateEmail(visitorEmail);
+			visitorDataToUpdate.visitorEmails = [{ address: visitorEmail }];
+		}
+
+		const livechatVisitor = await LivechatVisitors.getVisitorByToken(token, { projection: { _id: 1 } });
+
+		if (department && livechatVisitor?.department !== department) {
+			logger.debug(`Attempt to find a department with id/name ${department}`);
+			const dep = await LivechatDepartment.findOneByIdOrName(department, { projection: { _id: 1 } });
+			if (!dep) {
+				logger.debug(`Invalid department provided: ${department}`);
+				throw new Meteor.Error('error-invalid-department', 'The provided department is invalid');
+			}
+			logger.debug(`Assigning visitor ${token} to department ${dep._id}`);
+			visitorDataToUpdate.department = dep._id;
+		}
+
+		visitorDataToUpdate.token = livechatVisitor?.token || token;
+
+		let existingUser = null;
+
+		if (livechatVisitor) {
+			logger.debug('Found matching user by token');
+			visitorDataToUpdate._id = livechatVisitor._id;
+		} else if (phone?.number && (existingUser = await LivechatVisitors.findOneVisitorByPhone(phone.number))) {
+			logger.debug('Found matching user by phone number');
+			visitorDataToUpdate._id = existingUser._id;
+			// Don't change token when matching by phone number, use current visitor token
+			visitorDataToUpdate.token = existingUser.token;
+		} else if (email && (existingUser = await LivechatVisitors.findOneGuestByEmailAddress(email))) {
+			logger.debug('Found matching user by email');
+			visitorDataToUpdate._id = existingUser._id;
+		} else if (!livechatVisitor) {
+			logger.debug(`No matches found. Attempting to create new user with token ${token}`);
+
+			visitorDataToUpdate._id = id || undefined;
+			visitorDataToUpdate.username = username || (await LivechatVisitors.getNextVisitorUsername());
+			visitorDataToUpdate.status = status;
+			visitorDataToUpdate.ts = new Date();
+
+			if (settings.get('Livechat_Allow_collect_and_store_HTTP_header_informations') && this.isValidObject(connectionData)) {
+				logger.debug(`Saving connection data for visitor ${token}`);
+				const { httpHeaders, clientAddress } = connectionData;
+				if (this.isValidObject(httpHeaders)) {
+					visitorDataToUpdate.userAgent = httpHeaders['user-agent'];
+					visitorDataToUpdate.ip = httpHeaders['x-real-ip'] || httpHeaders['x-forwarded-for'] || clientAddress;
+					visitorDataToUpdate.host = httpHeaders?.host;
+				}
+			}
+		}
+
+		const upsertedLivechatVisitor = await LivechatVisitors.updateOneByIdOrToken(visitorDataToUpdate, {
+			upsert: true,
+			returnDocument: 'after',
+		});
+
+		if (!upsertedLivechatVisitor.value) {
+			logger.debug(`No visitor found after upsert`);
+			return null;
+		}
+
+		return upsertedLivechatVisitor.value;
+	},
+};
diff --git a/apps/meteor/app/livechat/server/lib/analytics/dashboards.ts b/apps/meteor/app/livechat/server/lib/analytics/dashboards.ts
index dd0d54970065..cf5a0abd5d54 100644
--- a/apps/meteor/app/livechat/server/lib/analytics/dashboards.ts
+++ b/apps/meteor/app/livechat/server/lib/analytics/dashboards.ts
@@ -247,11 +247,11 @@ const getConversationsMetricsAsync = async ({
 			language: user.language || settings.get('Language') || 'en',
 		})) || [];
 	const metrics = ['Total_conversations', 'Open_conversations', 'On_Hold_conversations', 'Total_messages'];
-	const visitorsCount = await LivechatVisitors.getVisitorsBetweenDate({
+	const visitorsCount = await LivechatVisitors.countVisitorsBetweenDate({
 		start: new Date(start),
 		end: new Date(end),
 		department: departmentId,
-	}).count();
+	});
 	return {
 		totalizers: [
 			...totalizers.filter((metric: { title: string }) => metrics.includes(metric.title)),
diff --git a/apps/meteor/app/livechat/server/lib/contacts/ContactMerger.ts b/apps/meteor/app/livechat/server/lib/contacts/ContactMerger.ts
new file mode 100644
index 000000000000..48b6dcc41f9a
--- /dev/null
+++ b/apps/meteor/app/livechat/server/lib/contacts/ContactMerger.ts
@@ -0,0 +1,320 @@
+import type {
+	ILivechatContact,
+	ILivechatVisitor,
+	ILivechatContactChannel,
+	ILivechatContactConflictingField,
+	IUser,
+	DeepWritable,
+	IOmnichannelSource,
+} from '@rocket.chat/core-typings';
+import { LivechatContacts } from '@rocket.chat/models';
+import type { ClientSession, UpdateFilter } from 'mongodb';
+
+import { getContactManagerIdByUsername } from './getContactManagerIdByUsername';
+import { isSameChannel } from '../../../lib/isSameChannel';
+
+type ManagerValue = { id: string } | { username: string };
+type ContactFields = {
+	email: string;
+	phone: string;
+	name: string;
+	username: string;
+	manager: ManagerValue;
+	channel: ILivechatContactChannel;
+};
+
+type CustomFieldAndValue = { type: `customFields.${string}`; value: string };
+
+export type FieldAndValue =
+	| { type: keyof Omit<ContactFields, 'manager' | 'channel'>; value: string }
+	| { type: 'manager'; value: ManagerValue }
+	| { type: 'channel'; value: ILivechatContactChannel }
+	| CustomFieldAndValue;
+
+type ConflictHandlingMode = 'conflict' | 'overwrite' | 'ignore';
+
+type MergeFieldsIntoContactParams = {
+	fields: FieldAndValue[];
+	contact: ILivechatContact;
+	conflictHandlingMode?: ConflictHandlingMode;
+	session?: ClientSession;
+};
+
+export class ContactMerger {
+	private managerList = new Map<Required<IUser>['username'], IUser['_id'] | undefined>();
+
+	private getManagerId(manager: ManagerValue): IUser['_id'] | undefined {
+		if ('id' in manager) {
+			return manager.id;
+		}
+
+		return this.managerList.get(manager.username);
+	}
+
+	private isSameManager(manager1: ManagerValue, manager2: ManagerValue): boolean {
+		if ('id' in manager1 && 'id' in manager2) {
+			return manager1.id === manager2.id;
+		}
+		if ('username' in manager1 && 'username' in manager2) {
+			return manager1.username === manager2.username;
+		}
+
+		const id1 = this.getManagerId(manager1);
+		const id2 = this.getManagerId(manager2);
+
+		if (!id1 || !id2) {
+			return false;
+		}
+
+		return id1 === id2;
+	}
+
+	private isSameField(field1: FieldAndValue, field2: FieldAndValue): boolean {
+		if (field1.type === 'manager' && field2.type === 'manager') {
+			return this.isSameManager(field1.value, field2.value);
+		}
+
+		if (field1.type === 'channel' && field2.type === 'channel') {
+			return isSameChannel(field1.value.visitor, field2.value.visitor);
+		}
+
+		if (field1.type !== field2.type) {
+			return false;
+		}
+
+		if (field1.value === field2.value) {
+			return true;
+		}
+
+		return false;
+	}
+
+	private async loadDataForFields(session: ClientSession | undefined, ...fieldLists: FieldAndValue[][]): Promise<void> {
+		for await (const fieldList of fieldLists) {
+			for await (const field of fieldList) {
+				if (field.type !== 'manager' || 'id' in field.value) {
+					continue;
+				}
+
+				if (!field.value.username) {
+					continue;
+				}
+
+				if (this.managerList.has(field.value.username)) {
+					continue;
+				}
+
+				const id = await getContactManagerIdByUsername(field.value.username, session);
+				this.managerList.set(field.value.username, id);
+			}
+		}
+	}
+
+	static async createWithFields(session: ClientSession | undefined, ...fieldLists: FieldAndValue[][]): Promise<ContactMerger> {
+		const merger = new ContactMerger();
+		await merger.loadDataForFields(session, ...fieldLists);
+
+		return merger;
+	}
+
+	static getAllFieldsFromContact(contact: ILivechatContact): FieldAndValue[] {
+		const { customFields = {}, name, contactManager } = contact;
+
+		const fields = new Set<FieldAndValue>();
+
+		contact.emails?.forEach(({ address: value }) => fields.add({ type: 'email', value }));
+		contact.phones?.forEach(({ phoneNumber: value }) => fields.add({ type: 'phone', value }));
+		contact.channels.forEach((value) => fields.add({ type: 'channel', value }));
+
+		if (name) {
+			fields.add({ type: 'name', value: name });
+		}
+
+		if (contactManager) {
+			fields.add({ type: 'manager', value: { id: contactManager } });
+		}
+
+		Object.keys(customFields).forEach((key) =>
+			fields.add({ type: `customFields.${key}`, value: customFields[key] } as CustomFieldAndValue),
+		);
+
+		// If the contact already has conflicts, load their values as well
+		if (contact.conflictingFields) {
+			for (const conflict of contact.conflictingFields) {
+				fields.add({ type: conflict.field, value: conflict.value } as FieldAndValue);
+			}
+		}
+
+		return [...fields];
+	}
+
+	static async getAllFieldsFromVisitor(visitor: ILivechatVisitor, source?: IOmnichannelSource): Promise<FieldAndValue[]> {
+		const { livechatData: customFields = {}, contactManager, name, username } = visitor;
+
+		const fields = new Set<FieldAndValue>();
+
+		visitor.visitorEmails?.forEach(({ address: value }) => fields.add({ type: 'email', value }));
+		visitor.phone?.forEach(({ phoneNumber: value }) => fields.add({ type: 'phone', value }));
+		if (name) {
+			fields.add({ type: 'name', value: name });
+		}
+		if (username) {
+			fields.add({ type: 'username', value: username });
+		}
+		if (contactManager?.username) {
+			fields.add({ type: 'manager', value: { username: contactManager?.username } });
+		}
+		Object.keys(customFields).forEach((key) =>
+			fields.add({ type: `customFields.${key}`, value: customFields[key] } as CustomFieldAndValue),
+		);
+
+		if (source) {
+			fields.add({
+				type: 'channel',
+				value: {
+					name: source.label || source.type.toString(),
+					visitor: {
+						visitorId: visitor._id,
+						source: {
+							type: source.type,
+							id: source.id,
+						},
+					},
+					blocked: false,
+					verified: false,
+					details: source,
+				},
+			});
+		}
+
+		return [...fields];
+	}
+
+	static getFieldValuesByType<T extends keyof ContactFields>(fields: FieldAndValue[], type: T): ContactFields[T][] {
+		return fields.filter((field) => field.type === type).map(({ value }) => value) as ContactFields[T][];
+	}
+
+	static async mergeFieldsIntoContact({
+		fields,
+		contact,
+		conflictHandlingMode = 'conflict',
+		session,
+	}: MergeFieldsIntoContactParams): Promise<void> {
+		const existingFields = ContactMerger.getAllFieldsFromContact(contact);
+		const overwriteData = conflictHandlingMode === 'overwrite';
+
+		const merger = await ContactMerger.createWithFields(session, fields, existingFields);
+
+		const newFields = fields.filter((field) => {
+			// If the field already exists with the same value, ignore it
+			if (existingFields.some((existingField) => merger.isSameField(existingField, field))) {
+				return false;
+			}
+
+			// If the field is an username and the contact already has a name, ignore it as well
+			if (field.type === 'username' && existingFields.some(({ type }) => type === 'name')) {
+				return false;
+			}
+
+			return true;
+		});
+
+		const newPhones = ContactMerger.getFieldValuesByType(newFields, 'phone');
+		const newEmails = ContactMerger.getFieldValuesByType(newFields, 'email');
+		const newChannels = ContactMerger.getFieldValuesByType(newFields, 'channel');
+		const newNamesOnly = ContactMerger.getFieldValuesByType(newFields, 'name');
+		const newCustomFields = newFields.filter(({ type }) => type.startsWith('customFields.')) as CustomFieldAndValue[];
+		// Usernames are ignored unless the contact has no other name
+		const newUsernames = !contact.name && !newNamesOnly.length ? ContactMerger.getFieldValuesByType(newFields, 'username') : [];
+
+		const dataToSet: DeepWritable<UpdateFilter<ILivechatContact>['$set']> = {};
+
+		// Names, Managers and Custom Fields need are set as conflicting fields if the contact already has them
+		const newNames = [...newNamesOnly, ...newUsernames];
+		const newManagers = ContactMerger.getFieldValuesByType(newFields, 'manager')
+			.map((manager) => {
+				if ('id' in manager) {
+					return manager.id;
+				}
+				return merger.getManagerId(manager);
+			})
+			.filter((id) => Boolean(id));
+
+		if (newNames.length && (!contact.name || overwriteData)) {
+			const firstName = newNames.shift();
+			if (firstName) {
+				dataToSet.name = firstName;
+			}
+		}
+
+		if (newManagers.length && (!contact.contactManager || overwriteData)) {
+			const firstManager = newManagers.shift();
+			if (firstManager) {
+				dataToSet.contactManager = firstManager;
+			}
+		}
+
+		const customFieldsPerName = new Map<string, CustomFieldAndValue[]>();
+		for (const customField of newCustomFields) {
+			if (!customFieldsPerName.has(customField.type)) {
+				customFieldsPerName.set(customField.type, []);
+			}
+			customFieldsPerName.get(customField.type)?.push(customField);
+		}
+
+		for (const [key, customFields] of customFieldsPerName) {
+			const fieldName = key.replace('customFields.', '');
+
+			// If the contact does not have this custom field yet, save the first value directly to the contact instead of as a conflict
+			if (!contact.customFields?.[fieldName] || overwriteData) {
+				const first = customFields.shift();
+				if (first) {
+					dataToSet[key] = first.value;
+				}
+			}
+		}
+
+		const allConflicts: ILivechatContactConflictingField[] =
+			conflictHandlingMode !== 'conflict'
+				? []
+				: [
+						...newNames.map((name): ILivechatContactConflictingField => ({ field: 'name', value: name })),
+						...newManagers.map((manager): ILivechatContactConflictingField => ({ field: 'manager', value: manager as string })),
+					];
+
+		// Phones, Emails and Channels are simply added to the contact's existing list
+		const dataToAdd: UpdateFilter<ILivechatContact>['$addToSet'] = {
+			...(newPhones.length ? { phones: { $each: newPhones.map((phoneNumber) => ({ phoneNumber })) } } : {}),
+			...(newEmails.length ? { emails: { $each: newEmails.map((address) => ({ address })) } } : {}),
+			...(newChannels.length ? { channels: { $each: newChannels } } : {}),
+			...(allConflicts.length ? { conflictingFields: { $each: allConflicts } } : {}),
+		};
+
+		if (newChannels.length) {
+			dataToSet.preRegistration = false;
+		}
+
+		const updateData: UpdateFilter<ILivechatContact> = {
+			...(Object.keys(dataToSet).length ? { $set: dataToSet } : {}),
+			...(Object.keys(dataToAdd).length ? { $addToSet: dataToAdd } : {}),
+		};
+
+		if (Object.keys(updateData).length) {
+			await LivechatContacts.updateById(contact._id, updateData, { session });
+		}
+	}
+
+	public static async mergeVisitorIntoContact(
+		visitor: ILivechatVisitor,
+		contact: ILivechatContact,
+		source?: IOmnichannelSource,
+	): Promise<void> {
+		const fields = await ContactMerger.getAllFieldsFromVisitor(visitor, source);
+
+		await ContactMerger.mergeFieldsIntoContact({
+			fields,
+			contact,
+			conflictHandlingMode: contact.unknown ? 'overwrite' : 'conflict',
+		});
+	}
+}
diff --git a/apps/meteor/app/livechat/server/lib/contacts/addContactEmail.ts b/apps/meteor/app/livechat/server/lib/contacts/addContactEmail.ts
new file mode 100644
index 000000000000..e41267ff961d
--- /dev/null
+++ b/apps/meteor/app/livechat/server/lib/contacts/addContactEmail.ts
@@ -0,0 +1,20 @@
+import type { ILivechatContact } from '@rocket.chat/core-typings';
+import { LivechatContacts } from '@rocket.chat/models';
+
+/**
+ * Adds a new email into the contact's email list, if the email is already in the list it does not add anything
+ * and simply return the data, since the email was aready registered :P
+ *
+ * @param contactId the id of the contact that will be updated
+ * @param email the email that will be added to the contact
+ * @returns the updated contact
+ */
+export async function addContactEmail(contactId: ILivechatContact['_id'], email: string): Promise<ILivechatContact> {
+	const contact = await LivechatContacts.addEmail(contactId, email);
+
+	if (!contact) {
+		throw new Error('error-contact-not-found');
+	}
+
+	return contact;
+}
diff --git a/apps/meteor/app/livechat/server/lib/contacts/createContact.ts b/apps/meteor/app/livechat/server/lib/contacts/createContact.ts
new file mode 100644
index 000000000000..98cf238d9b5e
--- /dev/null
+++ b/apps/meteor/app/livechat/server/lib/contacts/createContact.ts
@@ -0,0 +1,52 @@
+import type { ILivechatContactChannel, IVisitorLastChat } from '@rocket.chat/core-typings';
+import { LivechatContacts } from '@rocket.chat/models';
+
+import { getAllowedCustomFields } from './getAllowedCustomFields';
+import { validateContactManager } from './validateContactManager';
+import { validateCustomFields } from './validateCustomFields';
+
+export type CreateContactParams = {
+	name: string;
+	emails?: string[];
+	phones?: string[];
+	unknown: boolean;
+	customFields?: Record<string, string | unknown>;
+	lastChat?: IVisitorLastChat;
+	contactManager?: string;
+	channels?: ILivechatContactChannel[];
+	importIds?: string[];
+	shouldValidateCustomFields?: boolean;
+};
+
+export async function createContact({
+	name,
+	emails,
+	phones,
+	customFields: receivedCustomFields = {},
+	lastChat,
+	contactManager,
+	channels = [],
+	unknown,
+	importIds,
+	shouldValidateCustomFields = true,
+}: CreateContactParams): Promise<string> {
+	if (contactManager) {
+		await validateContactManager(contactManager);
+	}
+
+	const customFields = shouldValidateCustomFields
+		? validateCustomFields(await getAllowedCustomFields(), receivedCustomFields)
+		: receivedCustomFields;
+
+	return LivechatContacts.insertContact({
+		name,
+		emails: emails?.map((address) => ({ address })),
+		phones: phones?.map((phoneNumber) => ({ phoneNumber })),
+		contactManager,
+		channels,
+		customFields,
+		lastChat,
+		unknown,
+		...(importIds?.length && { importIds }),
+	});
+}
diff --git a/apps/meteor/app/livechat/server/lib/contacts/createContactFromVisitor.ts b/apps/meteor/app/livechat/server/lib/contacts/createContactFromVisitor.ts
new file mode 100644
index 000000000000..c541399d3b35
--- /dev/null
+++ b/apps/meteor/app/livechat/server/lib/contacts/createContactFromVisitor.ts
@@ -0,0 +1,24 @@
+import type { ILivechatVisitor, IOmnichannelSource } from '@rocket.chat/core-typings';
+import { LivechatRooms } from '@rocket.chat/models';
+
+import { createContact } from './createContact';
+import { mapVisitorToContact } from './mapVisitorToContact';
+
+export async function createContactFromVisitor(visitor: ILivechatVisitor, source: IOmnichannelSource): Promise<string> {
+	const contactData = await mapVisitorToContact(visitor, source);
+
+	const contactId = await createContact(contactData);
+
+	await LivechatRooms.setContactByVisitorAssociation(
+		{
+			visitorId: visitor._id,
+			source: { type: source.type, ...(source.id ? { id: source.id } : {}) },
+		},
+		{
+			_id: contactId,
+			name: contactData.name,
+		},
+	);
+
+	return contactId;
+}
diff --git a/apps/meteor/app/livechat/server/lib/contacts/getAllowedCustomFields.ts b/apps/meteor/app/livechat/server/lib/contacts/getAllowedCustomFields.ts
new file mode 100644
index 000000000000..d71f902c1122
--- /dev/null
+++ b/apps/meteor/app/livechat/server/lib/contacts/getAllowedCustomFields.ts
@@ -0,0 +1,12 @@
+import type { ILivechatCustomField } from '@rocket.chat/core-typings';
+import { LivechatCustomField } from '@rocket.chat/models';
+
+export async function getAllowedCustomFields(): Promise<Pick<ILivechatCustomField, '_id' | 'label' | 'regexp' | 'required'>[]> {
+	return LivechatCustomField.findByScope(
+		'visitor',
+		{
+			projection: { _id: 1, label: 1, regexp: 1, required: 1 },
+		},
+		false,
+	).toArray();
+}
diff --git a/apps/meteor/app/livechat/server/lib/contacts/getContactChannelsGrouped.ts b/apps/meteor/app/livechat/server/lib/contacts/getContactChannelsGrouped.ts
new file mode 100644
index 000000000000..9cf83224708b
--- /dev/null
+++ b/apps/meteor/app/livechat/server/lib/contacts/getContactChannelsGrouped.ts
@@ -0,0 +1,26 @@
+import type { ILivechatContact, ILivechatContactChannel } from '@rocket.chat/core-typings';
+import { LivechatContacts } from '@rocket.chat/models';
+
+export async function getContactChannelsGrouped(contactId: string): Promise<ILivechatContactChannel[]> {
+	const contact = await LivechatContacts.findOneById<Pick<ILivechatContact, 'channels'>>(contactId, { projection: { channels: 1 } });
+
+	if (!contact?.channels) {
+		return [];
+	}
+
+	const groupedChannels = new Map<string, ILivechatContactChannel>();
+
+	contact.channels.forEach((channel: ILivechatContactChannel) => {
+		const existingChannel = groupedChannels.get(channel.name);
+
+		if (!existingChannel) {
+			return groupedChannels.set(channel.name, channel);
+		}
+
+		if ((channel.lastChat?.ts?.valueOf() || 0) > (existingChannel?.lastChat?.ts?.valueOf() || 0)) {
+			groupedChannels.set(channel.name, channel);
+		}
+	});
+
+	return [...groupedChannels.values()];
+}
diff --git a/apps/meteor/app/livechat/server/lib/contacts/getContactHistory.ts b/apps/meteor/app/livechat/server/lib/contacts/getContactHistory.ts
new file mode 100644
index 000000000000..e569ece4bd8c
--- /dev/null
+++ b/apps/meteor/app/livechat/server/lib/contacts/getContactHistory.ts
@@ -0,0 +1,76 @@
+import type { ILivechatContact, IOmnichannelRoom } from '@rocket.chat/core-typings';
+import type { FindPaginated } from '@rocket.chat/model-typings';
+import { LivechatContacts, LivechatRooms } from '@rocket.chat/models';
+import { makeFunction } from '@rocket.chat/patch-injection';
+import type { PaginatedResult, VisitorSearchChatsResult } from '@rocket.chat/rest-typings';
+import type { FindOptions, Sort, FindCursor } from 'mongodb';
+
+export type GetContactHistoryParams = {
+	contactId: string;
+	source?: string;
+	count: number;
+	offset: number;
+	sort: Sort;
+};
+
+export const fetchContactHistory = makeFunction(
+	async ({
+		contactId,
+		options,
+	}: {
+		contactId: string;
+		options?: FindOptions<IOmnichannelRoom>;
+		extraParams?: Record<string, any>;
+	}): Promise<FindPaginated<FindCursor<IOmnichannelRoom>>> =>
+		LivechatRooms.findClosedRoomsByContactPaginated({
+			contactId,
+			options,
+		}),
+);
+
+export const getContactHistory = makeFunction(
+	async (params: GetContactHistoryParams): Promise<PaginatedResult<{ history: VisitorSearchChatsResult[] }>> => {
+		const { contactId, count, offset, sort } = params;
+
+		const contact = await LivechatContacts.findOneById<Pick<ILivechatContact, '_id'>>(contactId, { projection: { _id: 1 } });
+
+		if (!contact) {
+			throw new Error('error-contact-not-found');
+		}
+
+		const options: FindOptions<IOmnichannelRoom> = {
+			sort: sort || { closedAt: -1 },
+			skip: offset,
+			limit: count,
+			projection: {
+				fname: 1,
+				ts: 1,
+				v: 1,
+				msgs: 1,
+				servedBy: 1,
+				closedAt: 1,
+				closedBy: 1,
+				closer: 1,
+				tags: 1,
+				source: 1,
+				lastMessage: 1,
+				verified: 1,
+			},
+		};
+
+		const { totalCount, cursor } = await fetchContactHistory({
+			contactId: contact._id,
+			options,
+			extraParams: params,
+		});
+
+		const [total, history] = await Promise.all([totalCount, cursor.toArray()]);
+
+		return {
+			history,
+			count: history.length,
+			offset,
+			total,
+		};
+	},
+);
diff --git a/apps/meteor/app/livechat/server/lib/contacts/getContactIdByVisitor.ts b/apps/meteor/app/livechat/server/lib/contacts/getContactIdByVisitor.ts
new file mode 100644
index 000000000000..922b05a7472f
--- /dev/null
+++ b/apps/meteor/app/livechat/server/lib/contacts/getContactIdByVisitor.ts
@@ -0,0 +1,8 @@
+import type { ILivechatContact, ILivechatContactVisitorAssociation } from '@rocket.chat/core-typings';
+import { LivechatContacts } from '@rocket.chat/models';
+
+export async function getContactIdByVisitor(visitor: ILivechatContactVisitorAssociation): Promise<ILivechatContact['_id'] | undefined> {
+	const contact = await LivechatContacts.findOneByVisitor<Pick<ILivechatContact, '_id'>>(visitor, { projection: { _id: 1 } });
+
+	return contact?._id;
+}
diff --git a/apps/meteor/app/livechat/server/lib/contacts/getContactManagerIdByUsername.ts b/apps/meteor/app/livechat/server/lib/contacts/getContactManagerIdByUsername.ts
new file mode 100644
index 000000000000..c43776a08879
--- /dev/null
+++ b/apps/meteor/app/livechat/server/lib/contacts/getContactManagerIdByUsername.ts
@@ -0,0 +1,12 @@
+import type { IUser } from '@rocket.chat/core-typings';
+import { Users } from '@rocket.chat/models';
+import type { ClientSession } from 'mongodb';
+
+export async function getContactManagerIdByUsername(
+	username: Required<IUser>['username'],
+	session?: ClientSession,
+): Promise<IUser['_id'] | undefined> {
+	const user = await Users.findOneByUsername<Pick<IUser, '_id'>>(username, { projection: { _id: 1 }, session });
+
+	return user?._id;
+}
diff --git a/apps/meteor/app/livechat/server/lib/contacts/getContacts.ts b/apps/meteor/app/livechat/server/lib/contacts/getContacts.ts
new file mode 100644
index 000000000000..09b7a2545a1c
--- /dev/null
+++ b/apps/meteor/app/livechat/server/lib/contacts/getContacts.ts
@@ -0,0 +1,50 @@
+import type { IUser } from '@rocket.chat/core-typings';
+import { LivechatContacts, Users } from '@rocket.chat/models';
+import type { PaginatedResult, ILivechatContactWithManagerData } from '@rocket.chat/rest-typings';
+import type { FindCursor, Sort } from 'mongodb';
+
+export type GetContactsParams = {
+	searchText?: string;
+	count: number;
+	offset: number;
+	sort: Sort;
+	unknown?: boolean;
+};
+
+export async function getContacts(params: GetContactsParams): Promise<PaginatedResult<{ contacts: ILivechatContactWithManagerData[] }>> {
+	const { searchText, count, offset, sort, unknown } = params;
+
+	const { cursor, totalCount } = LivechatContacts.findPaginatedContacts(
+		{ searchText, unknown },
+		{
+			limit: count,
+			skip: offset,
+			sort: sort ?? { name: 1 },
+		},
+	);
+
+	const [rawContacts, total] = await Promise.all([cursor.toArray(), totalCount]);
+
+	const managerIds = [...new Set(rawContacts.map(({ contactManager }) => contactManager))];
+	const managersCursor: FindCursor<[string, Pick<IUser, '_id' | 'name' | 'username'>]> = Users.findByIds(managerIds, {
+		projection: { name: 1, username: 1 },
+	}).map((manager) => [manager._id, manager]);
+	const managersData = await managersCursor.toArray();
+	const mappedManagers = Object.fromEntries(managersData);
+
+	const contacts: ILivechatContactWithManagerData[] = rawContacts.map((contact) => {
+		const { contactManager, ...data } = contact;
+
+		return {
+			...data,
+			...(contactManager ? { contactManager: mappedManagers[contactManager] } : {}),
+		};
+	});
+
+	return {
+		contacts,
+		count,
+		offset,
+		total,
+	};
+}
diff --git a/apps/meteor/app/livechat/server/lib/contacts/isAgentAvailableToTakeContactInquiry.ts b/apps/meteor/app/livechat/server/lib/contacts/isAgentAvailableToTakeContactInquiry.ts
new file mode 100644
index 000000000000..a0daa07ac2f0
--- /dev/null
+++ b/apps/meteor/app/livechat/server/lib/contacts/isAgentAvailableToTakeContactInquiry.ts
@@ -0,0 +1,12 @@
+import type { ILivechatContact, ILivechatVisitor, IOmnichannelSource } from '@rocket.chat/core-typings';
+import { makeFunction } from '@rocket.chat/patch-injection';
+
+export const isAgentAvailableToTakeContactInquiry = makeFunction(
+	async (
+		_visitorId: ILivechatVisitor['_id'],
+		_source: IOmnichannelSource,
+		_contactId: ILivechatContact['_id'],
+	): Promise<{ error: string; value: false } | { value: true }> => ({
+		value: true,
+	}),
+);
diff --git a/apps/meteor/app/livechat/server/lib/contacts/isVerifiedChannelInSource.spec.ts b/apps/meteor/app/livechat/server/lib/contacts/isVerifiedChannelInSource.spec.ts
new file mode 100644
index 000000000000..a49d94a0f5fc
--- /dev/null
+++ b/apps/meteor/app/livechat/server/lib/contacts/isVerifiedChannelInSource.spec.ts
@@ -0,0 +1,110 @@
+import { expect } from 'chai';
+import proxyquire from 'proxyquire';
+
+const { isVerifiedChannelInSource } = proxyquire.noCallThru().load('./isVerifiedChannelInSource', {});
+
+describe('isVerifiedChannelInSource', () => {
+	it('should return false if channel is not verified', () => {
+		const channel = {
+			verified: false,
+		};
+		const visitorId = 'visitor1';
+		const source = {
+			type: 'widget',
+		};
+
+		expect(isVerifiedChannelInSource(channel, visitorId, source)).to.be.false;
+	});
+
+	it('should return false if channel visitorId is different from visitorId', () => {
+		const channel = {
+			verified: true,
+			visitor: {
+				visitorId: 'visitor2',
+			},
+		};
+		const visitorId = 'visitor1';
+		const source = {
+			type: 'widget',
+		};
+
+		expect(isVerifiedChannelInSource(channel, visitorId, source)).to.be.false;
+	});
+
+	it('should return false if channel visitor source type is different from source type', () => {
+		const channel = {
+			verified: true,
+			visitor: {
+				visitorId: 'visitor1',
+				source: {
+					type: 'web',
+				},
+			},
+		};
+		const visitorId = 'visitor1';
+		const source = {
+			type: 'widget',
+		};
+
+		expect(isVerifiedChannelInSource(channel, visitorId, source)).to.be.false;
+	});
+
+	it('should return false if channel visitor source id is different from source id', () => {
+		const channel = {
+			verified: true,
+			visitor: {
+				visitorId: 'visitor1',
+				source: {
+					type: 'widget',
+					id: 'source1',
+				},
+			},
+		};
+		const visitorId = 'visitor1';
+		const source = {
+			type: 'widget',
+			id: 'source2',
+		};
+
+		expect(isVerifiedChannelInSource(channel, visitorId, source)).to.be.false;
+	});
+
+	it('should return false if source id is not defined and channel visitor source id is defined', () => {
+		const channel = {
+			verified: true,
+			visitor: {
+				visitorId: 'visitor1',
+				source: {
+					type: 'widget',
+					id: 'source1',
+				},
+			},
+		};
+		const visitorId = 'visitor1';
+		const source = {
+			type: 'widget',
+		};
+
+		expect(isVerifiedChannelInSource(channel, visitorId, source)).to.be.false;
+	});
+
+	it('should return true if all conditions are met', () => {
+		const channel = {
+			verified: true,
+			visitor: {
+				visitorId: 'visitor1',
+				source: {
+					type: 'widget',
+					id: 'source1',
+				},
+			},
+		};
+		const visitorId = 'visitor1';
+		const source = {
+			type: 'widget',
+			id: 'source1',
+		};
+
+		expect(isVerifiedChannelInSource(channel, visitorId, source)).to.be.true;
+	});
+});
diff --git a/apps/meteor/app/livechat/server/lib/contacts/isVerifiedChannelInSource.ts b/apps/meteor/app/livechat/server/lib/contacts/isVerifiedChannelInSource.ts
new file mode 100644
index 000000000000..14074e81a3d3
--- /dev/null
+++ b/apps/meteor/app/livechat/server/lib/contacts/isVerifiedChannelInSource.ts
@@ -0,0 +1,25 @@
+import type { ILivechatContactChannel, ILivechatVisitor, IOmnichannelSource } from '@rocket.chat/core-typings';
+
+export const isVerifiedChannelInSource = (
+	channel: ILivechatContactChannel,
+	visitorId: ILivechatVisitor['_id'],
+	source: IOmnichannelSource,
+) => {
+	if (!channel.verified) {
+		return false;
+	}
+
+	if (channel.visitor.visitorId !== visitorId) {
+		return false;
+	}
+
+	if (channel.visitor.source.type !== source.type) {
+		return false;
+	}
+
+	if ((source.id || channel.visitor.source.id) && channel.visitor.source.id !== source.id) {
+		return false;
+	}
+
+	return true;
+};
diff --git a/apps/meteor/app/livechat/server/lib/contacts/mapVisitorToContact.spec.ts b/apps/meteor/app/livechat/server/lib/contacts/mapVisitorToContact.spec.ts
new file mode 100644
index 000000000000..c8c15fe0d0d9
--- /dev/null
+++ b/apps/meteor/app/livechat/server/lib/contacts/mapVisitorToContact.spec.ts
@@ -0,0 +1,206 @@
+import { OmnichannelSourceType, type ILivechatVisitor, type IOmnichannelSource } from '@rocket.chat/core-typings';
+import { expect } from 'chai';
+import proxyquire from 'proxyquire';
+import sinon from 'sinon';
+
+import type { CreateContactParams } from './createContact';
+
+const getContactManagerIdByUsername = sinon.stub();
+const getAllowedCustomFields = sinon.stub();
+
+const { mapVisitorToContact } = proxyquire.noCallThru().load('./mapVisitorToContact', {
+	'./getContactManagerIdByUsername': {
+		getContactManagerIdByUsername,
+	},
+	'./getAllowedCustomFields': { getAllowedCustomFields },
+});
+
+const testDate = new Date();
+const dataMap: [Partial<ILivechatVisitor>, IOmnichannelSource, CreateContactParams][] = [
+	[
+		{
+			_id: 'visitor1',
+			username: 'Username',
+			name: 'Name',
+			visitorEmails: [{ address: 'email1@domain.com' }, { address: 'email2@domain.com' }],
+			phone: [{ phoneNumber: '10' }, { phoneNumber: '20' }],
+			contactManager: {
+				username: 'user1',
+			},
+		},
+		{
+			type: OmnichannelSourceType.WIDGET,
+		},
+		{
+			name: 'Name',
+			emails: ['email1@domain.com', 'email2@domain.com'],
+			phones: ['10', '20'],
+			unknown: true,
+			channels: [
+				{
+					name: 'widget',
+					visitor: {
+						visitorId: 'visitor1',
+						source: {
+							type: OmnichannelSourceType.WIDGET,
+						},
+					},
+					blocked: false,
+					verified: false,
+					details: {
+						type: OmnichannelSourceType.WIDGET,
+					},
+				},
+			],
+			customFields: undefined,
+			shouldValidateCustomFields: false,
+			contactManager: 'manager1',
+		},
+	],
+
+	[
+		{
+			_id: 'visitor1',
+			username: 'Username',
+		},
+		{
+			type: OmnichannelSourceType.SMS,
+		},
+		{
+			name: 'Username',
+			emails: undefined,
+			phones: undefined,
+			unknown: true,
+			channels: [
+				{
+					name: 'sms',
+					visitor: {
+						visitorId: 'visitor1',
+						source: {
+							type: OmnichannelSourceType.SMS,
+						},
+					},
+					blocked: false,
+					verified: false,
+					details: {
+						type: OmnichannelSourceType.SMS,
+					},
+				},
+			],
+			customFields: undefined,
+			shouldValidateCustomFields: false,
+			contactManager: undefined,
+		},
+	],
+
+	[
+		{
+			_id: 'visitor1',
+			username: 'Username',
+			activity: ['2024-11'],
+			lastChat: {
+				_id: 'last-chat-id',
+				ts: testDate,
+			},
+		},
+		{
+			type: OmnichannelSourceType.WIDGET,
+		},
+		{
+			name: 'Username',
+			emails: undefined,
+			phones: undefined,
+			unknown: false,
+			channels: [
+				{
+					name: 'sms',
+					visitor: {
+						visitorId: 'visitor1',
+						source: {
+							type: OmnichannelSourceType.WIDGET,
+						},
+					},
+					blocked: false,
+					verified: false,
+					details: {
+						type: OmnichannelSourceType.WIDGET,
+					},
+					lastChat: {
+						_id: 'last-chat-id',
+						ts: testDate,
+					},
+				},
+			],
+			customFields: undefined,
+			shouldValidateCustomFields: false,
+			lastChat: {
+				_id: 'last-chat-id',
+				ts: testDate,
+			},
+			contactManager: undefined,
+		},
+	],
+
+	[
+		{
+			_id: 'visitor1',
+			username: 'Username',
+			livechatData: {
+				customFieldId: 'customFieldValue',
+				invalidCustomFieldId: 'invalidCustomFieldValue',
+			},
+			activity: [],
+		},
+		{
+			type: OmnichannelSourceType.WIDGET,
+		},
+		{
+			name: 'Username',
+			emails: undefined,
+			phones: undefined,
+			unknown: true,
+			channels: [
+				{
+					name: 'sms',
+					visitor: {
+						visitorId: 'visitor1',
+						source: {
+							type: OmnichannelSourceType.WIDGET,
+						},
+					},
+					blocked: false,
+					verified: false,
+					details: {
+						type: OmnichannelSourceType.WIDGET,
+					},
+				},
+			],
+			customFields: {
+				customFieldId: 'customFieldValue',
+			},
+			shouldValidateCustomFields: false,
+			contactManager: undefined,
+		},
+	],
+];
+
+describe('mapVisitorToContact', () => {
+	beforeEach(() => {
+		getContactManagerIdByUsername.reset();
+		getContactManagerIdByUsername.callsFake((username) => {
+			if (username === 'user1') {
+				return 'manager1';
+			}
+
+			return undefined;
+		});
+		getAllowedCustomFields.resolves([{ _id: 'customFieldId', label: 'custom-field-label' }]);
+	});
+
+	const index = 0;
+	for (const [visitor, source, contact] of dataMap) {
+		it(`should map an ILivechatVisitor + IOmnichannelSource to an ILivechatContact [${index}]`, async () => {
+			expect(await mapVisitorToContact(visitor, source)).to.be.deep.equal(contact);
+		});
+	}
+});
diff --git a/apps/meteor/app/livechat/server/lib/contacts/mapVisitorToContact.ts b/apps/meteor/app/livechat/server/lib/contacts/mapVisitorToContact.ts
new file mode 100644
index 000000000000..6478fd1911f8
--- /dev/null
+++ b/apps/meteor/app/livechat/server/lib/contacts/mapVisitorToContact.ts
@@ -0,0 +1,40 @@
+import type { ILivechatVisitor, IOmnichannelSource } from '@rocket.chat/core-typings';
+
+import type { CreateContactParams } from './createContact';
+import { getAllowedCustomFields } from './getAllowedCustomFields';
+import { getContactManagerIdByUsername } from './getContactManagerIdByUsername';
+import { validateCustomFields } from './validateCustomFields';
+
+export async function mapVisitorToContact(visitor: ILivechatVisitor, source: IOmnichannelSource): Promise<CreateContactParams> {
+	return {
+		name: visitor.name || visitor.username,
+		emails: visitor.visitorEmails?.map(({ address }) => address),
+		phones: visitor.phone?.map(({ phoneNumber }) => phoneNumber),
+		unknown: !visitor.activity || visitor.activity.length === 0,
+		channels: [
+			{
+				name: source.label || source.type.toString(),
+				visitor: {
+					visitorId: visitor._id,
+					source: {
+						type: source.type,
+						...(source.id ? { id: source.id } : {}),
+					},
+				},
+				blocked: false,
+				verified: false,
+				details: source,
+				lastChat: visitor.lastChat,
+			},
+		],
+		customFields:
+			visitor.livechatData &&
+			validateCustomFields(await getAllowedCustomFields(), visitor.livechatData, {
+				ignoreAdditionalFields: true,
+				ignoreValidationErrors: true,
+			}),
+		shouldValidateCustomFields: false,
+		lastChat: visitor.lastChat,
+		contactManager: visitor.contactManager?.username && (await getContactManagerIdByUsername(visitor.contactManager.username)),
+	};
+}
diff --git a/apps/meteor/app/livechat/server/lib/contacts/mergeContacts.ts b/apps/meteor/app/livechat/server/lib/contacts/mergeContacts.ts
new file mode 100644
index 000000000000..123f3f7dd15b
--- /dev/null
+++ b/apps/meteor/app/livechat/server/lib/contacts/mergeContacts.ts
@@ -0,0 +1,8 @@
+import type { ILivechatContact, ILivechatContactVisitorAssociation } from '@rocket.chat/core-typings';
+import { makeFunction } from '@rocket.chat/patch-injection';
+import type { ClientSession } from 'mongodb';
+
+export const mergeContacts = makeFunction(
+	async (_contactId: string, _visitor: ILivechatContactVisitorAssociation, _session?: ClientSession): Promise<ILivechatContact | null> =>
+		null,
+);
diff --git a/apps/meteor/app/livechat/server/lib/contacts/migrateVisitorIfMissingContact.ts b/apps/meteor/app/livechat/server/lib/contacts/migrateVisitorIfMissingContact.ts
new file mode 100644
index 000000000000..852effa66370
--- /dev/null
+++ b/apps/meteor/app/livechat/server/lib/contacts/migrateVisitorIfMissingContact.ts
@@ -0,0 +1,25 @@
+import type { ILivechatVisitor, IOmnichannelSource, ILivechatContact } from '@rocket.chat/core-typings';
+import { LivechatVisitors } from '@rocket.chat/models';
+
+import { livechatContactsLogger as logger } from '../logger';
+import { getContactIdByVisitor } from './getContactIdByVisitor';
+import { migrateVisitorToContactId } from './migrateVisitorToContactId';
+
+export async function migrateVisitorIfMissingContact(
+	visitorId: ILivechatVisitor['_id'],
+	source: IOmnichannelSource,
+): Promise<ILivechatContact['_id'] | null> {
+	logger.debug(`Detecting visitor's contact ID`);
+	// Check if there is any contact already linking to this visitorId and source
+	const contactId = await getContactIdByVisitor({ visitorId, source });
+	if (contactId) {
+		return contactId;
+	}
+
+	const visitor = await LivechatVisitors.findOneById(visitorId);
+	if (!visitor) {
+		throw new Error('Failed to migrate visitor data into Contact information: visitor not found.');
+	}
+
+	return migrateVisitorToContactId({ visitor, source, requireRoom: false });
+}
diff --git a/apps/meteor/app/livechat/server/lib/contacts/migrateVisitorToContactId.spec.ts b/apps/meteor/app/livechat/server/lib/contacts/migrateVisitorToContactId.spec.ts
new file mode 100644
index 000000000000..47dd3bdde974
--- /dev/null
+++ b/apps/meteor/app/livechat/server/lib/contacts/migrateVisitorToContactId.spec.ts
@@ -0,0 +1,69 @@
+import { expect } from 'chai';
+import proxyquire from 'proxyquire';
+import sinon from 'sinon';
+
+const modelsMock = {
+	LivechatContacts: {
+		findContactMatchingVisitor: sinon.stub(),
+	},
+	LivechatRooms: {
+		setContactByVisitorAssociation: sinon.stub(),
+		findNewestByContactVisitorAssociation: sinon.stub(),
+	},
+};
+
+const createContactFromVisitor = sinon.stub();
+const mergeVisitorIntoContact = sinon.stub();
+
+const { migrateVisitorToContactId } = proxyquire.noCallThru().load('./migrateVisitorToContactId', {
+	'./createContactFromVisitor': {
+		createContactFromVisitor,
+	},
+	'./ContactMerger': {
+		ContactMerger: {
+			mergeVisitorIntoContact,
+		},
+	},
+	'@rocket.chat/models': modelsMock,
+	'../logger': {
+		livechatContactsLogger: {
+			debug: sinon.stub(),
+		},
+	},
+});
+
+describe('migrateVisitorToContactId', () => {
+	beforeEach(() => {
+		modelsMock.LivechatContacts.findContactMatchingVisitor.reset();
+		modelsMock.LivechatRooms.setContactByVisitorAssociation.reset();
+		modelsMock.LivechatRooms.findNewestByContactVisitorAssociation.reset();
+		createContactFromVisitor.reset();
+		mergeVisitorIntoContact.reset();
+	});
+
+	it('should not create a contact if there is no source for the visitor', async () => {
+		expect(await migrateVisitorToContactId({ visitor: { _id: 'visitor1' } })).to.be.null;
+	});
+
+	it('should attempt to create a new contact if there is no free existing contact matching the visitor data', async () => {
+		modelsMock.LivechatContacts.findContactMatchingVisitor.resolves(undefined);
+		const visitor = { _id: 'visitor1' };
+		const source = { type: 'other' };
+		modelsMock.LivechatRooms.findNewestByContactVisitorAssociation.resolves({ _id: 'room1', v: { _id: visitor._id }, source });
+		createContactFromVisitor.resolves('contactCreated');
+
+		expect(await migrateVisitorToContactId({ visitor: { _id: 'visitor1' }, source })).to.be.equal('contactCreated');
+	});
+
+	it('should not attempt to create a new contact if one is found for the visitor', async () => {
+		const visitor = { _id: 'visitor1' };
+		const contact = { _id: 'contact1' };
+		const source = { type: 'sms' };
+		modelsMock.LivechatRooms.findNewestByContactVisitorAssociation.resolves({ _id: 'room1', v: { _id: visitor._id }, source });
+		modelsMock.LivechatContacts.findContactMatchingVisitor.resolves(contact);
+		createContactFromVisitor.resolves('contactCreated');
+
+		expect(await migrateVisitorToContactId({ visitor, source })).to.be.equal('contact1');
+		expect(mergeVisitorIntoContact.calledOnceWith(visitor, contact, source)).to.be.true;
+	});
+});
diff --git a/apps/meteor/app/livechat/server/lib/contacts/migrateVisitorToContactId.ts b/apps/meteor/app/livechat/server/lib/contacts/migrateVisitorToContactId.ts
new file mode 100644
index 000000000000..c0f8ad917d6f
--- /dev/null
+++ b/apps/meteor/app/livechat/server/lib/contacts/migrateVisitorToContactId.ts
@@ -0,0 +1,55 @@
+import type { ILivechatVisitor, IOmnichannelSource, ILivechatContact, IOmnichannelRoom } from '@rocket.chat/core-typings';
+import { LivechatContacts, LivechatRooms } from '@rocket.chat/models';
+
+import { livechatContactsLogger as logger } from '../logger';
+import { ContactMerger } from './ContactMerger';
+import { createContactFromVisitor } from './createContactFromVisitor';
+
+/**
+	This function assumes you already ensured that the visitor is not yet linked to any contact
+**/
+export async function migrateVisitorToContactId({
+	visitor,
+	source,
+	requireRoom = true,
+}: {
+	visitor: ILivechatVisitor;
+	source: IOmnichannelSource;
+	requireRoom?: boolean;
+}): Promise<ILivechatContact['_id'] | null> {
+	if (requireRoom) {
+		// Do not migrate the visitor with this source if they have no rooms matching it
+		const anyRoom = await LivechatRooms.findNewestByContactVisitorAssociation<Pick<IOmnichannelRoom, '_id'>>(
+			{ visitorId: visitor._id, source },
+			{
+				projection: { _id: 1 },
+			},
+		);
+
+		if (!anyRoom) {
+			return null;
+		}
+	}
+
+	// Search for any contact that is not yet associated with any visitor and that have the same email or phone number as this visitor.
+	const existingContact = await LivechatContacts.findContactMatchingVisitor(visitor);
+	if (!existingContact) {
+		logger.debug(`Creating a new contact for existing visitor ${visitor._id}`);
+		return createContactFromVisitor(visitor, source);
+	}
+
+	// There is already an existing contact with no linked visitors and matching this visitor's phone or email, so let's use it
+	logger.debug(`Adding channel to existing contact ${existingContact._id}`);
+	await ContactMerger.mergeVisitorIntoContact(visitor, existingContact, source);
+
+	// Update all existing rooms matching the visitor id and source to set the contactId to them
+	await LivechatRooms.setContactByVisitorAssociation(
+		{
+			visitorId: visitor._id,
+			source,
+		},
+		existingContact,
+	);
+
+	return existingContact._id;
+}
diff --git a/apps/meteor/app/livechat/server/lib/contacts/registerContact.spec.ts b/apps/meteor/app/livechat/server/lib/contacts/registerContact.spec.ts
new file mode 100644
index 000000000000..b3afb1403a38
--- /dev/null
+++ b/apps/meteor/app/livechat/server/lib/contacts/registerContact.spec.ts
@@ -0,0 +1,138 @@
+import { expect } from 'chai';
+import proxyquire from 'proxyquire';
+import sinon from 'sinon';
+
+const modelsMock = {
+	'Users': {
+		findOneAgentById: sinon.stub(),
+		findOneByUsername: sinon.stub(),
+	},
+	'LivechatContacts': {
+		findOneById: sinon.stub(),
+		insertOne: sinon.stub(),
+		upsertContact: sinon.stub(),
+		updateContact: sinon.stub(),
+		findContactMatchingVisitor: sinon.stub(),
+		findOneByVisitorId: sinon.stub(),
+	},
+	'LivechatRooms': {
+		findNewestByVisitorIdOrToken: sinon.stub(),
+		setContactIdByVisitorIdOrToken: sinon.stub(),
+		findByVisitorId: sinon.stub(),
+	},
+	'LivechatVisitors': {
+		findOneById: sinon.stub(),
+		updateById: sinon.stub(),
+		updateOne: sinon.stub(),
+		getVisitorByToken: sinon.stub(),
+		findOneGuestByEmailAddress: sinon.stub(),
+	},
+	'LivechatCustomField': {
+		findByScope: sinon.stub(),
+	},
+	'@global': true,
+};
+
+const { registerContact } = proxyquire.noCallThru().load('./registerContact', {
+	'meteor/meteor': sinon.stub(),
+	'@rocket.chat/models': modelsMock,
+	'@rocket.chat/tools': { wrapExceptions: sinon.stub() },
+	'./Helper': { validateEmail: sinon.stub() },
+	'./LivechatTyped': {
+		Livechat: {
+			logger: {
+				debug: sinon.stub(),
+			},
+		},
+	},
+});
+
+describe('registerContact', () => {
+	beforeEach(() => {
+		modelsMock.Users.findOneByUsername.reset();
+		modelsMock.LivechatVisitors.getVisitorByToken.reset();
+		modelsMock.LivechatVisitors.updateOne.reset();
+		modelsMock.LivechatVisitors.findOneGuestByEmailAddress.reset();
+		modelsMock.LivechatCustomField.findByScope.reset();
+		modelsMock.LivechatRooms.findByVisitorId.reset();
+	});
+
+	it(`should throw an error if there's no token`, async () => {
+		modelsMock.Users.findOneByUsername.returns(undefined);
+
+		await expect(
+			registerContact({
+				email: 'test@test.com',
+				username: 'username',
+				name: 'Name',
+				contactManager: {
+					username: 'unknown',
+				},
+			}),
+		).to.eventually.be.rejectedWith('error-invalid-contact-data');
+	});
+
+	it(`should throw an error if the token is not a string`, async () => {
+		modelsMock.Users.findOneByUsername.returns(undefined);
+
+		await expect(
+			registerContact({
+				token: 15,
+				email: 'test@test.com',
+				username: 'username',
+				name: 'Name',
+				contactManager: {
+					username: 'unknown',
+				},
+			}),
+		).to.eventually.be.rejectedWith('error-invalid-contact-data');
+	});
+
+	it(`should throw an error if there's an invalid manager username`, async () => {
+		modelsMock.Users.findOneByUsername.returns(undefined);
+
+		await expect(
+			registerContact({
+				token: 'token',
+				email: 'test@test.com',
+				username: 'username',
+				name: 'Name',
+				contactManager: {
+					username: 'unknown',
+				},
+			}),
+		).to.eventually.be.rejectedWith('error-contact-manager-not-found');
+	});
+
+	it(`should throw an error if the manager username does not belong to a livechat agent`, async () => {
+		modelsMock.Users.findOneByUsername.returns({ roles: ['user'] });
+
+		await expect(
+			registerContact({
+				token: 'token',
+				email: 'test@test.com',
+				username: 'username',
+				name: 'Name',
+				contactManager: {
+					username: 'username',
+				},
+			}),
+		).to.eventually.be.rejectedWith('error-invalid-contact-manager');
+	});
+
+	it('should register a contact when passing valid data', async () => {
+		modelsMock.LivechatVisitors.getVisitorByToken.returns({ _id: 'visitor1' });
+		modelsMock.LivechatCustomField.findByScope.returns({ toArray: () => [] });
+		modelsMock.LivechatRooms.findByVisitorId.returns({ toArray: () => [] });
+		modelsMock.LivechatVisitors.updateOne.returns(undefined);
+
+		await expect(
+			registerContact({
+				token: 'token',
+				email: 'test@test.com',
+				username: 'username',
+				name: 'Name',
+			}),
+		).to.eventually.be.equal('visitor1');
+	});
+});
diff --git a/apps/meteor/app/livechat/server/lib/contacts/registerContact.ts b/apps/meteor/app/livechat/server/lib/contacts/registerContact.ts
new file mode 100644
index 000000000000..cdc029801c3d
--- /dev/null
+++ b/apps/meteor/app/livechat/server/lib/contacts/registerContact.ts
@@ -0,0 +1,129 @@
+import { MeteorError } from '@rocket.chat/core-services';
+import type { ILivechatVisitor, IOmnichannelRoom } from '@rocket.chat/core-typings';
+import { LivechatVisitors, Users, LivechatRooms, LivechatInquiry, Rooms, Subscriptions } from '@rocket.chat/models';
+import type { MatchKeysAndValues, OnlyFieldsOfType } from 'mongodb';
+
+import { getAllowedCustomFields } from './getAllowedCustomFields';
+import { validateCustomFields } from './validateCustomFields';
+import { callbacks } from '../../../../../lib/callbacks';
+import {
+	notifyOnRoomChangedById,
+	notifyOnSubscriptionChangedByRoomId,
+	notifyOnLivechatInquiryChangedByRoom,
+} from '../../../../lib/server/lib/notifyListener';
+
+type RegisterContactProps = {
+	_id?: string;
+	token: string;
+	name: string;
+	username?: string;
+	email?: string;
+	phone?: string;
+	customFields?: Record<string, unknown | string>;
+	contactManager?: {
+		username: string;
+	};
+};
+
+export async function registerContact({
+	token,
+	name,
+	email = '',
+	phone,
+	username,
+	customFields = {},
+	contactManager,
+}: RegisterContactProps): Promise<string> {
+	if (!token || typeof token !== 'string') {
+		throw new MeteorError('error-invalid-contact-data', 'Invalid visitor token');
+	}
+
+	const visitorEmail = email.trim().toLowerCase();
+
+	if (contactManager?.username) {
+		// verify if the user exists with this username and has a livechat-agent role
+		const manager = await Users.findOneByUsername(contactManager.username, { projection: { roles: 1 } });
+		if (!manager) {
+			throw new MeteorError('error-contact-manager-not-found', `No user found with username ${contactManager.username}`);
+		}
+		if (!manager.roles || !Array.isArray(manager.roles) || !manager.roles.includes('livechat-agent')) {
+			throw new MeteorError('error-invalid-contact-manager', 'The contact manager must have the role "livechat-agent"');
+		}
+	}
+
+	const existingUserByToken = await LivechatVisitors.getVisitorByToken(token, { projection: { _id: 1 } });
+	let visitorId = existingUserByToken?._id;
+
+	if (!existingUserByToken) {
+		if (!username) {
+			username = await LivechatVisitors.getNextVisitorUsername();
+		}
+
+		const existingUserByEmail = await LivechatVisitors.findOneGuestByEmailAddress(visitorEmail);
+		visitorId = existingUserByEmail?._id;
+
+		if (!existingUserByEmail) {
+			const userData = {
+				username,
+				ts: new Date(),
+				token,
+			};
+
+			visitorId = (await LivechatVisitors.insertOne(userData)).insertedId;
+		}
+	}
+
+	const allowedCF = await getAllowedCustomFields();
+	const livechatData: Record<string, string> = validateCustomFields(allowedCF, customFields, { ignoreAdditionalFields: true });
+
+	const fieldsToRemove = {
+		// if field is explicitely set to empty string, remove
+		...(phone === '' && { phone: 1 }),
+		...(visitorEmail === '' && { visitorEmails: 1 }),
+		...(!contactManager?.username && { contactManager: 1 }),
+	};
+
+	const updateUser: { $set: MatchKeysAndValues<ILivechatVisitor>; $unset?: OnlyFieldsOfType<ILivechatVisitor> } = {
+		$set: {
+			token,
+			name,
+			livechatData,
+			// if phone has some value, set
+			...(phone && { phone: [{ phoneNumber: phone }] }),
+			...(visitorEmail && { visitorEmails: [{ address: visitorEmail }] }),
+			...(contactManager?.username && { contactManager: { username: contactManager.username } }),
+		},
+		...(Object.keys(fieldsToRemove).length && { $unset: fieldsToRemove }),
+	};
+
+	await LivechatVisitors.updateOne({ _id: visitorId }, updateUser);
+
+	const extraQuery = await callbacks.run('livechat.applyRoomRestrictions', {});
+	const rooms: IOmnichannelRoom[] = await LivechatRooms.findByVisitorId(visitorId, {}, extraQuery).toArray();
+
+	if (rooms?.length) {
+		for await (const room of rooms) {
+			const { _id: rid } = room;
+
+			const responses = await Promise.all([
+				Rooms.setFnameById(rid, name),
+				LivechatInquiry.setNameByRoomId(rid, name),
+				Subscriptions.updateDisplayNameByRoomId(rid, name),
+			]);
+
+			if (responses[0]?.modifiedCount) {
+				void notifyOnRoomChangedById(rid);
+			}
+
+			if (responses[1]?.modifiedCount) {
+				void notifyOnLivechatInquiryChangedByRoom(rid, 'updated', { name });
+			}
+
+			if (responses[2]?.modifiedCount) {
+				void notifyOnSubscriptionChangedByRoomId(rid);
+			}
+		}
+	}
+
+	return visitorId as string;
+}
diff --git a/apps/meteor/app/livechat/server/lib/contacts/registerGuestData.ts b/apps/meteor/app/livechat/server/lib/contacts/registerGuestData.ts
new file mode 100644
index 000000000000..471104aecae9
--- /dev/null
+++ b/apps/meteor/app/livechat/server/lib/contacts/registerGuestData.ts
@@ -0,0 +1,41 @@
+import type { AtLeast, ILivechatVisitor } from '@rocket.chat/core-typings';
+import { LivechatContacts } from '@rocket.chat/models';
+import { wrapExceptions } from '@rocket.chat/tools';
+
+import { validateEmail } from '../Helper';
+import type { RegisterGuestType } from '../Visitors';
+import { ContactMerger, type FieldAndValue } from './ContactMerger';
+
+export async function registerGuestData(
+	{ name, phone, email, username }: Pick<RegisterGuestType, 'name' | 'phone' | 'email' | 'username'>,
+	visitor: AtLeast<ILivechatVisitor, '_id'>,
+): Promise<void> {
+	const validatedEmail =
+		email &&
+		wrapExceptions(() => {
+			const trimmedEmail = email.trim().toLowerCase();
+			validateEmail(trimmedEmail);
+			return trimmedEmail;
+		}).suppress();
+
+	const fields = [
+		{ type: 'name', value: name },
+		{ type: 'phone', value: phone?.number },
+		{ type: 'email', value: validatedEmail },
+		{ type: 'username', value: username || visitor.username },
+	].filter((field) => Boolean(field.value)) as FieldAndValue[];
+
+	if (!fields.length) {
+		return;
+	}
+
+	// If a visitor was updated who already had contacts, load up the contacts and update that information as well
+	const contacts = await LivechatContacts.findAllByVisitorId(visitor._id).toArray();
+	for await (const contact of contacts) {
+		await ContactMerger.mergeFieldsIntoContact({
+			fields,
+			contact,
+			conflictHandlingMode: contact.unknown ? 'overwrite' : 'conflict',
+		});
+	}
+}
diff --git a/apps/meteor/app/livechat/server/lib/contacts/updateContact.spec.ts b/apps/meteor/app/livechat/server/lib/contacts/updateContact.spec.ts
new file mode 100644
index 000000000000..b6e4bf929a6e
--- /dev/null
+++ b/apps/meteor/app/livechat/server/lib/contacts/updateContact.spec.ts
@@ -0,0 +1,52 @@
+import { expect } from 'chai';
+import proxyquire from 'proxyquire';
+import sinon from 'sinon';
+
+const modelsMock = {
+	LivechatContacts: {
+		findOneById: sinon.stub(),
+		updateContact: sinon.stub(),
+	},
+	LivechatRooms: {
+		updateContactDataByContactId: sinon.stub(),
+	},
+};
+
+const { updateContact } = proxyquire.noCallThru().load('./updateContact', {
+	'./getAllowedCustomFields': {
+		getAllowedCustomFields: sinon.stub(),
+	},
+	'./validateContactManager': {
+		validateContactManager: sinon.stub(),
+	},
+	'./validateCustomFields': {
+		validateCustomFields: sinon.stub(),
+	},
+
+	'@rocket.chat/models': modelsMock,
+});
+
+describe('updateContact', () => {
+	beforeEach(() => {
+		modelsMock.LivechatContacts.findOneById.reset();
+		modelsMock.LivechatContacts.updateContact.reset();
+		modelsMock.LivechatRooms.updateContactDataByContactId.reset();
+	});
+
+	it('should throw an error if the contact does not exist', async () => {
+		modelsMock.LivechatContacts.findOneById.resolves(undefined);
+		await expect(updateContact('any_id')).to.be.rejectedWith('error-contact-not-found');
+		expect(modelsMock.LivechatContacts.updateContact.getCall(0)).to.be.null;
+	});
+
+	it('should update the contact with correct params', async () => {
+		modelsMock.LivechatContacts.findOneById.resolves({ _id: 'contactId' });
+		modelsMock.LivechatContacts.updateContact.resolves({ _id: 'contactId', name: 'John Doe' } as any);
+
+		const updatedContact = await updateContact({ contactId: 'contactId', name: 'John Doe' });
+
+		expect(modelsMock.LivechatContacts.updateContact.getCall(0).args[0]).to.be.equal('contactId');
+		expect(modelsMock.LivechatContacts.updateContact.getCall(0).args[1]).to.be.deep.contain({ name: 'John Doe' });
+		expect(updatedContact).to.be.deep.equal({ _id: 'contactId', name: 'John Doe' });
+	});
+});
diff --git a/apps/meteor/app/livechat/server/lib/contacts/updateContact.ts b/apps/meteor/app/livechat/server/lib/contacts/updateContact.ts
new file mode 100644
index 000000000000..8ec929ae4b34
--- /dev/null
+++ b/apps/meteor/app/livechat/server/lib/contacts/updateContact.ts
@@ -0,0 +1,67 @@
+import type { ILivechatContact, ILivechatContactChannel } from '@rocket.chat/core-typings';
+import { LivechatContacts, LivechatInquiry, LivechatRooms, Subscriptions } from '@rocket.chat/models';
+
+import { getAllowedCustomFields } from './getAllowedCustomFields';
+import { validateContactManager } from './validateContactManager';
+import { validateCustomFields } from './validateCustomFields';
+import {
+	notifyOnSubscriptionChangedByVisitorIds,
+	notifyOnRoomChangedByContactId,
+	notifyOnLivechatInquiryChangedByVisitorIds,
+} from '../../../../lib/server/lib/notifyListener';
+
+export type UpdateContactParams = {
+	contactId: string;
+	name?: string;
+	emails?: string[];
+	phones?: string[];
+	customFields?: Record<string, unknown>;
+	contactManager?: string;
+	channels?: ILivechatContactChannel[];
+	wipeConflicts?: boolean;
+};
+
+export async function updateContact(params: UpdateContactParams): Promise<ILivechatContact> {
+	const { contactId, name, emails, phones, customFields: receivedCustomFields, contactManager, channels, wipeConflicts } = params;
+
+	const contact = await LivechatContacts.findOneById<Pick<ILivechatContact, '_id' | 'name'>>(contactId, {
+		projection: { _id: 1, name: 1 },
+	});
+
+	if (!contact) {
+		throw new Error('error-contact-not-found');
+	}
+
+	if (contactManager) {
+		await validateContactManager(contactManager);
+	}
+
+	const customFields = receivedCustomFields && validateCustomFields(await getAllowedCustomFields(), receivedCustomFields);
+
+	const updatedContact = await LivechatContacts.updateContact(contactId, {
+		name,
+		emails: emails?.map((address) => ({ address })),
+		phones: phones?.map((phoneNumber) => ({ phoneNumber })),
+		contactManager,
+		channels,
+		customFields,
+		...(wipeConflicts && { conflictingFields: [] }),
+	});
+
+	// If the contact name changed, update the name of its existing rooms and subscriptions
+	if (name !== undefined && name !== contact.name) {
+		await LivechatRooms.updateContactDataByContactId(contactId, { name });
+		void notifyOnRoomChangedByContactId(contactId);
+
+		const visitorIds = updatedContact.channels?.map((channel) => channel.visitor.visitorId);
+		if (visitorIds?.length) {
+			await Subscriptions.updateNameAndFnameByVisitorIds(visitorIds, name);
+			void notifyOnSubscriptionChangedByVisitorIds(visitorIds);
+
+			await LivechatInquiry.updateNameByVisitorIds(visitorIds, name);
+			void notifyOnLivechatInquiryChangedByVisitorIds(visitorIds, 'updated', { name });
+		}
+	}
+
+	return updatedContact;
+}
diff --git a/apps/meteor/app/livechat/server/lib/contacts/validateContactManager.spec.ts b/apps/meteor/app/livechat/server/lib/contacts/validateContactManager.spec.ts
new file mode 100644
index 000000000000..b3268ff8660d
--- /dev/null
+++ b/apps/meteor/app/livechat/server/lib/contacts/validateContactManager.spec.ts
@@ -0,0 +1,32 @@
+import { expect } from 'chai';
+import proxyquire from 'proxyquire';
+import sinon from 'sinon';
+
+const modelsMock = {
+	Users: {
+		findOneAgentById: sinon.stub(),
+	},
+};
+
+const { validateContactManager } = proxyquire.noCallThru().load('./validateContactManager', {
+	'@rocket.chat/models': modelsMock,
+});
+
+describe('validateContactManager', () => {
+	beforeEach(() => {
+		modelsMock.Users.findOneAgentById.reset();
+	});
+
+	it('should throw an error if the user does not exist', async () => {
+		modelsMock.Users.findOneAgentById.resolves(undefined);
+		await expect(validateContactManager('any_id')).to.be.rejectedWith('error-contact-manager-not-found');
+	});
+
+	it('should not throw an error if the user has the "livechat-agent" role', async () => {
+		const user = { _id: 'userId' };
+		modelsMock.Users.findOneAgentById.resolves(user);
+
+		await expect(validateContactManager('userId')).to.not.be.rejected;
+		expect(modelsMock.Users.findOneAgentById.getCall(0).firstArg).to.be.equal('userId');
+	});
+});
diff --git a/apps/meteor/app/livechat/server/lib/contacts/validateContactManager.ts b/apps/meteor/app/livechat/server/lib/contacts/validateContactManager.ts
new file mode 100644
index 000000000000..cea2c0fe0c37
--- /dev/null
+++ b/apps/meteor/app/livechat/server/lib/contacts/validateContactManager.ts
@@ -0,0 +1,9 @@
+import type { IUser } from '@rocket.chat/core-typings';
+import { Users } from '@rocket.chat/models';
+
+export async function validateContactManager(contactManagerUserId: string) {
+	const contactManagerUser = await Users.findOneAgentById<Pick<IUser, '_id'>>(contactManagerUserId, { projection: { _id: 1 } });
+	if (!contactManagerUser) {
+		throw new Error('error-contact-manager-not-found');
+	}
+}
diff --git a/apps/meteor/app/livechat/server/lib/contacts/validateCustomFields.spec.ts b/apps/meteor/app/livechat/server/lib/contacts/validateCustomFields.spec.ts
new file mode 100644
index 000000000000..39684a62fd91
--- /dev/null
+++ b/apps/meteor/app/livechat/server/lib/contacts/validateCustomFields.spec.ts
@@ -0,0 +1,62 @@
+import { expect } from 'chai';
+import proxyquire from 'proxyquire';
+
+const { validateCustomFields } = proxyquire.noCallThru().load('./validateCustomFields', {});
+
+describe('validateCustomFields', () => {
+	const mockCustomFields = [{ _id: 'cf1', label: 'Custom Field 1', regexp: '^[0-9]+$', required: true }];
+
+	it('should validate custom fields correctly', () => {
+		expect(() => validateCustomFields(mockCustomFields, { cf1: '123' })).to.not.throw();
+	});
+
+	it('should throw an error if a required custom field is missing', () => {
+		expect(() => validateCustomFields(mockCustomFields, {})).to.throw();
+	});
+
+	it('should not throw an error if a required custom field is missing, but the ignoreValidationErrors option is provided', () => {
+		expect(() => validateCustomFields(mockCustomFields, {}, { ignoreValidationErrors: true }))
+			.not.to.throw()
+			.and.to.equal({});
+	});
+
+	it('should NOT throw an error when a non-required custom field is missing', () => {
+		const allowedCustomFields = [{ _id: 'field1', label: 'Field 1', required: false }];
+		const customFields = {};
+
+		expect(() => validateCustomFields(allowedCustomFields, customFields)).not.to.throw();
+	});
+
+	it('should throw an error if a custom field value does not match the regexp', () => {
+		expect(() => validateCustomFields(mockCustomFields, { cf1: 'invalid' })).to.throw();
+	});
+
+	it('should not throw an error if a custom field value does not match the regexp, but the ignoreValidationErrors option is provided', () => {
+		expect(() => validateCustomFields(mockCustomFields, { cf1: 'invalid' }, { ignoreValidationErrors: true }))
+			.not.to.throw()
+			.and.to.equal({});
+	});
+
+	it('should handle an empty customFields input without throwing an error', () => {
+		const allowedCustomFields = [{ _id: 'field1', label: 'Field 1', required: false }];
+		const customFields = {};
+
+		expect(() => validateCustomFields(allowedCustomFields, customFields)).not.to.throw();
+	});
+
+	it('should throw an error if a extra custom field is passed', () => {
+		const allowedCustomFields = [{ _id: 'field1', label: 'Field 1', required: false }];
+		const customFields = { field2: 'value' };
+
+		expect(() => validateCustomFields(allowedCustomFields, customFields)).to.throw();
+	});
+
+	it('should not throw an error if a extra custom field is passed, but the ignoreValidationErrors option is provided', () => {
+		const allowedCustomFields = [{ _id: 'field1', label: 'Field 1', required: false }];
+		const customFields = { field2: 'value' };
+
+		expect(() => validateCustomFields(allowedCustomFields, customFields, { ignoreValidationErrors: true }))
+			.not.to.throw()
+			.and.to.equal({});
+	});
+});
diff --git a/apps/meteor/app/livechat/server/lib/contacts/validateCustomFields.ts b/apps/meteor/app/livechat/server/lib/contacts/validateCustomFields.ts
new file mode 100644
index 000000000000..4efede65b266
--- /dev/null
+++ b/apps/meteor/app/livechat/server/lib/contacts/validateCustomFields.ts
@@ -0,0 +1,56 @@
+import type { AtLeast, ILivechatCustomField } from '@rocket.chat/core-typings';
+
+import { trim } from '../../../../../lib/utils/stringUtils';
+import { i18n } from '../../../../utils/lib/i18n';
+
+export function validateCustomFields(
+	allowedCustomFields: AtLeast<ILivechatCustomField, '_id' | 'label' | 'regexp' | 'required'>[],
+	customFields: Record<string, string | unknown>,
+	{
+		ignoreAdditionalFields = false,
+		ignoreValidationErrors = false,
+	}: { ignoreAdditionalFields?: boolean; ignoreValidationErrors?: boolean } = {},
+): Record<string, string> {
+	const validValues: Record<string, string> = {};
+
+	for (const cf of allowedCustomFields) {
+		if (!customFields.hasOwnProperty(cf._id)) {
+			if (cf.required && !ignoreValidationErrors) {
+				throw new Error(i18n.t('error-invalid-custom-field-value', { field: cf.label }));
+			}
+			continue;
+		}
+		const cfValue: string = trim(customFields[cf._id]);
+
+		if (!cfValue || typeof cfValue !== 'string') {
+			if (cf.required && !ignoreValidationErrors) {
+				throw new Error(i18n.t('error-invalid-custom-field-value', { field: cf.label }));
+			}
+			continue;
+		}
+
+		if (cf.regexp) {
+			const regex = new RegExp(cf.regexp);
+			if (!regex.test(cfValue)) {
+				if (ignoreValidationErrors) {
+					continue;
+				}
+
+				throw new Error(i18n.t('error-invalid-custom-field-value', { field: cf.label }));
+			}
+		}
+
+		validValues[cf._id] = cfValue;
+	}
+
+	if (!ignoreAdditionalFields) {
+		const allowedCustomFieldIds = new Set(allowedCustomFields.map((cf) => cf._id));
+		for (const key in customFields) {
+			if (!allowedCustomFieldIds.has(key)) {
+				throw new Error(i18n.t('error-custom-field-not-allowed', { key }));
+			}
+		}
+	}
+
+	return validValues;
+}
diff --git a/apps/meteor/app/livechat/server/lib/contacts/verifyContactChannel.ts b/apps/meteor/app/livechat/server/lib/contacts/verifyContactChannel.ts
new file mode 100644
index 000000000000..77bc1e4653d2
--- /dev/null
+++ b/apps/meteor/app/livechat/server/lib/contacts/verifyContactChannel.ts
@@ -0,0 +1,12 @@
+import type { ILivechatContact } from '@rocket.chat/core-typings';
+import { makeFunction } from '@rocket.chat/patch-injection';
+
+export type VerifyContactChannelParams = {
+	contactId: string;
+	field: string;
+	value: string;
+	visitorId: string;
+	roomId: string;
+};
+
+export const verifyContactChannel = makeFunction(async (_params: VerifyContactChannelParams): Promise<ILivechatContact | null> => null);
diff --git a/apps/meteor/app/livechat/server/lib/departmentsLib.ts b/apps/meteor/app/livechat/server/lib/departmentsLib.ts
new file mode 100644
index 000000000000..76c70cba49ba
--- /dev/null
+++ b/apps/meteor/app/livechat/server/lib/departmentsLib.ts
@@ -0,0 +1,304 @@
+import type { LivechatDepartmentDTO, ILivechatDepartment, ILivechatDepartmentAgents } from '@rocket.chat/core-typings';
+import { LivechatDepartment, LivechatDepartmentAgents, LivechatVisitors, LivechatRooms } from '@rocket.chat/models';
+import { Meteor } from 'meteor/meteor';
+
+import { updateDepartmentAgents } from './Helper';
+import { isDepartmentCreationAvailable } from './isDepartmentCreationAvailable';
+import { livechatLogger } from './logger';
+import { callbacks } from '../../../../lib/callbacks';
+import {
+	notifyOnLivechatDepartmentAgentChangedByDepartmentId,
+	notifyOnLivechatDepartmentAgentChanged,
+} from '../../../lib/server/lib/notifyListener';
+/**
+ * @param {string|null} _id - The department id
+ * @param {Partial<import('@rocket.chat/core-typings').ILivechatDepartment>} departmentData
+ * @param {{upsert?: { agentId: string; count?: number; order?: number; }[], remove?: { agentId: string; count?: number; order?: number; }}} [departmentAgents] - The department agents
+ * @param {{_id?: string}} [departmentUnit] - The department's unit id
+ */
+export async function saveDepartment(
+	userId: string,
+	_id: string | null,
+	departmentData: LivechatDepartmentDTO,
+	departmentAgents?: {
+		upsert?: { agentId: string; count?: number; order?: number }[];
+		remove?: { agentId: string; count?: number; order?: number };
+	},
+	departmentUnit?: { _id?: string },
+) {
+	check(_id, Match.Maybe(String));
+	if (departmentUnit?._id !== undefined && typeof departmentUnit._id !== 'string') {
+		throw new Meteor.Error('error-invalid-department-unit', 'Invalid department unit id provided', {
+			method: 'livechat:saveDepartment',
+		});
+	}
+
+	const department = _id
+		? await LivechatDepartment.findOneById(_id, { projection: { _id: 1, archived: 1, enabled: 1, parentId: 1 } })
+		: null;
+
+	if (departmentUnit && !departmentUnit._id && department && department.parentId) {
+		const isLastDepartmentInUnit = (await LivechatDepartment.countDepartmentsInUnit(department.parentId)) === 1;
+		if (isLastDepartmentInUnit) {
+			throw new Meteor.Error('error-unit-cant-be-empty', "The last department in a unit can't be removed", {
+				method: 'livechat:saveDepartment',
+			});
+		}
+	}
+
+	if (!department && !(await isDepartmentCreationAvailable())) {
+		throw new Meteor.Error('error-max-departments-number-reached', 'Maximum number of departments reached', {
+			method: 'livechat:saveDepartment',
+		});
+	}
+
+	if (department?.archived && departmentData.enabled) {
+		throw new Meteor.Error('error-archived-department-cant-be-enabled', 'Archived departments cant be enabled', {
+			method: 'livechat:saveDepartment',
+		});
+	}
+
+	const defaultValidations: Record<string, Match.Matcher<any> | BooleanConstructor | StringConstructor> = {
+		enabled: Boolean,
+		name: String,
+		description: Match.Optional(String),
+		showOnRegistration: Boolean,
+		email: String,
+		showOnOfflineForm: Boolean,
+		requestTagBeforeClosingChat: Match.Optional(Boolean),
+		chatClosingTags: Match.Optional([String]),
+		fallbackForwardDepartment: Match.Optional(String),
+		departmentsAllowedToForward: Match.Optional([String]),
+		allowReceiveForwardOffline: Match.Optional(Boolean),
+	};
+
+	// The Livechat Form department support addition/custom fields, so those fields need to be added before validating
+	Object.keys(departmentData).forEach((field) => {
+		if (!defaultValidations.hasOwnProperty(field)) {
+			defaultValidations[field] = Match.OneOf(String, Match.Integer, Boolean);
+		}
+	});
+
+	check(departmentData, defaultValidations);
+	check(
+		departmentAgents,
+		Match.Maybe({
+			upsert: Match.Maybe(Array),
+			remove: Match.Maybe(Array),
+		}),
+	);
+
+	const { requestTagBeforeClosingChat, chatClosingTags, fallbackForwardDepartment } = departmentData;
+	if (requestTagBeforeClosingChat && (!chatClosingTags || chatClosingTags.length === 0)) {
+		throw new Meteor.Error(
+			'error-validating-department-chat-closing-tags',
+			'At least one closing tag is required when the department requires tag(s) on closing conversations.',
+			{ method: 'livechat:saveDepartment' },
+		);
+	}
+
+	if (_id && !department) {
+		throw new Meteor.Error('error-department-not-found', 'Department not found', {
+			method: 'livechat:saveDepartment',
+		});
+	}
+
+	if (fallbackForwardDepartment === _id) {
+		throw new Meteor.Error(
+			'error-fallback-department-circular',
+			'Cannot save department. Circular reference between fallback department and department',
+		);
+	}
+
+	if (fallbackForwardDepartment) {
+		const fallbackDep = await LivechatDepartment.findOneById(fallbackForwardDepartment, {
+			projection: { _id: 1, fallbackForwardDepartment: 1 },
+		});
+		if (!fallbackDep) {
+			throw new Meteor.Error('error-fallback-department-not-found', 'Fallback department not found', {
+				method: 'livechat:saveDepartment',
+			});
+		}
+	}
+
+	const departmentDB = await LivechatDepartment.createOrUpdateDepartment(_id, departmentData);
+	if (departmentDB && departmentAgents) {
+		await updateDepartmentAgents(departmentDB._id, departmentAgents, departmentDB.enabled);
+	}
+
+	// Disable event
+	if (department?.enabled && !departmentDB?.enabled) {
+		await callbacks.run('livechat.afterDepartmentDisabled', departmentDB);
+	}
+
+	if (departmentUnit) {
+		await callbacks.run('livechat.manageDepartmentUnit', { userId, departmentId: departmentDB._id, unitId: departmentUnit._id });
+	}
+
+	return departmentDB;
+}
+
+export async function archiveDepartment(_id: string) {
+	const department = await LivechatDepartment.findOneById<Pick<ILivechatDepartment, '_id' | 'businessHourId'>>(_id, {
+		projection: { _id: 1, businessHourId: 1 },
+	});
+
+	if (!department) {
+		throw new Error('department-not-found');
+	}
+
+	await Promise.all([LivechatDepartmentAgents.disableAgentsByDepartmentId(_id), LivechatDepartment.archiveDepartment(_id)]);
+
+	void notifyOnLivechatDepartmentAgentChangedByDepartmentId(_id);
+
+	await callbacks.run('livechat.afterDepartmentArchived', department);
+}
+
+export async function unarchiveDepartment(_id: string) {
+	const department = await LivechatDepartment.findOneById(_id, { projection: { _id: 1 } });
+
+	if (!department) {
+		throw new Meteor.Error('department-not-found');
+	}
+
+	// TODO: these kind of actions should be on events instead of here
+	await Promise.all([LivechatDepartmentAgents.enableAgentsByDepartmentId(_id), LivechatDepartment.unarchiveDepartment(_id)]);
+
+	void notifyOnLivechatDepartmentAgentChangedByDepartmentId(_id);
+
+	return true;
+}
+
+export async function saveDepartmentAgents(
+	_id: string,
+	departmentAgents: {
+		upsert?: Pick<ILivechatDepartmentAgents, 'agentId' | 'count' | 'order' | 'username'>[];
+		remove?: Pick<ILivechatDepartmentAgents, 'agentId'>[];
+	},
+) {
+	check(_id, String);
+	check(departmentAgents, {
+		upsert: Match.Maybe([
+			Match.ObjectIncluding({
+				agentId: String,
+				username: String,
+				count: Match.Maybe(Match.Integer),
+				order: Match.Maybe(Match.Integer),
+			}),
+		]),
+		remove: Match.Maybe([
+			Match.ObjectIncluding({
+				agentId: String,
+				username: Match.Maybe(String),
+				count: Match.Maybe(Match.Integer),
+				order: Match.Maybe(Match.Integer),
+			}),
+		]),
+	});
+
+	const department = await LivechatDepartment.findOneById<Pick<ILivechatDepartment, 'enabled'>>(_id, { projection: { enabled: 1 } });
+	if (!department) {
+		throw new Meteor.Error('error-department-not-found', 'Department not found');
+	}
+
+	return updateDepartmentAgents(_id, departmentAgents, department.enabled);
+}
+
+export async function setDepartmentForGuest({ token, department }: { token: string; department: string }) {
+	check(token, String);
+	check(department, String);
+
+	livechatLogger.debug(`Switching departments for user with token ${token} (to ${department})`);
+
+	const updateUser = {
+		$set: {
+			department,
+		},
+	};
+
+	const dep = await LivechatDepartment.findOneById<Pick<ILivechatDepartment, '_id'>>(department, { projection: { _id: 1 } });
+	if (!dep) {
+		throw new Meteor.Error('invalid-department', 'Provided department does not exists');
+	}
+
+	const visitor = await LivechatVisitors.getVisitorByToken(token, { projection: { _id: 1 } });
+	if (!visitor) {
+		throw new Meteor.Error('invalid-token', 'Provided token is invalid');
+	}
+	await LivechatVisitors.updateById(visitor._id, updateUser);
+}
+
+export async function removeDepartment(departmentId: string) {
+	livechatLogger.debug(`Removing department: ${departmentId}`);
+
+	const department = await LivechatDepartment.findOneById<Pick<ILivechatDepartment, '_id' | 'businessHourId'>>(departmentId, {
+		projection: { _id: 1, businessHourId: 1 },
+	});
+	if (!department) {
+		throw new Error('error-department-not-found');
+	}
+
+	const { _id } = department;
+
+	const ret = await LivechatDepartment.removeById(_id);
+	if (ret.acknowledged !== true) {
+		throw new Error('error-failed-to-delete-department');
+	}
+
+	const removedAgents = await LivechatDepartmentAgents.findByDepartmentId(department._id, { projection: { agentId: 1 } }).toArray();
+
+	livechatLogger.debug(
+		`Performing post-department-removal actions: ${_id}. Removing department agents, unsetting fallback department and removing department from rooms`,
+	);
+
+	const removeByDept = LivechatDepartmentAgents.removeByDepartmentId(_id);
+
+	const promiseResponses = await Promise.allSettled([
+		removeByDept,
+		LivechatDepartment.unsetFallbackDepartmentByDepartmentId(_id),
+		LivechatRooms.bulkRemoveDepartmentAndUnitsFromRooms(_id),
+	]);
+
+	promiseResponses.forEach((response, index) => {
+		if (response.status === 'rejected') {
+			livechatLogger.error(`Error while performing post-department-removal actions: ${_id}. Action No: ${index}. Error:`, response.reason);
+		}
+	});
+
+	const { deletedCount } = await removeByDept;
+
+	if (deletedCount > 0) {
+		removedAgents.forEach(({ _id: docId, agentId }) => {
+			void notifyOnLivechatDepartmentAgentChanged(
+				{
+					_id: docId,
+					agentId,
+					departmentId: _id,
+				},
+				'removed',
+			);
+		});
+	}
+
+	await callbacks.run('livechat.afterRemoveDepartment', { department, agentsIds: removedAgents.map(({ agentId }) => agentId) });
+
+	return ret;
+}
+
+export async function getRequiredDepartment(onlineRequired = true) {
+	const departments = LivechatDepartment.findEnabledWithAgents();
+
+	for await (const dept of departments) {
+		if (!dept.showOnRegistration) {
+			continue;
+		}
+		if (!onlineRequired) {
+			return dept;
+		}
+
+		const onlineAgents = await LivechatDepartmentAgents.countOnlineForDepartment(dept._id);
+		if (onlineAgents) {
+			return dept;
+		}
+	}
+}
diff --git a/apps/meteor/app/livechat/server/lib/getOnlineAgents.ts b/apps/meteor/app/livechat/server/lib/getOnlineAgents.ts
new file mode 100644
index 000000000000..be92a7cfcc54
--- /dev/null
+++ b/apps/meteor/app/livechat/server/lib/getOnlineAgents.ts
@@ -0,0 +1,24 @@
+import type { ILivechatAgent, SelectedAgent } from '@rocket.chat/core-typings';
+import { Users, LivechatDepartmentAgents } from '@rocket.chat/models';
+import type { FindCursor } from 'mongodb';
+
+export async function getOnlineAgents(department?: string, agent?: SelectedAgent | null): Promise<FindCursor<ILivechatAgent> | undefined> {
+	if (agent?.agentId) {
+		return Users.findOnlineAgents(agent.agentId);
+	}
+
+	if (department) {
+		const departmentAgents = await LivechatDepartmentAgents.getOnlineForDepartment(department);
+		if (!departmentAgents) {
+			return;
+		}
+
+		const agentIds = await departmentAgents.map(({ agentId }) => agentId).toArray();
+		if (!agentIds.length) {
+			return;
+		}
+
+		return Users.findByIds<ILivechatAgent>([...new Set(agentIds)]);
+	}
+	return Users.findOnlineAgents();
+}
diff --git a/apps/meteor/app/livechat/server/lib/getRoomMessages.ts b/apps/meteor/app/livechat/server/lib/getRoomMessages.ts
new file mode 100644
index 000000000000..8a9af72b7e23
--- /dev/null
+++ b/apps/meteor/app/livechat/server/lib/getRoomMessages.ts
@@ -0,0 +1,23 @@
+import type { MessageTypesValues, IRoom } from '@rocket.chat/core-typings';
+import { Rooms, Messages } from '@rocket.chat/models';
+import { Meteor } from 'meteor/meteor';
+
+export async function getRoomMessages({ rid }: { rid: string }) {
+	const room = await Rooms.findOneById<Pick<IRoom, 't'>>(rid, { projection: { t: 1 } });
+	if (room?.t !== 'l') {
+		throw new Meteor.Error('invalid-room');
+	}
+
+	const ignoredMessageTypes: MessageTypesValues[] = [
+		'livechat_navigation_history',
+		'livechat_transcript_history',
+		'command',
+		'livechat-close',
+		'livechat-started',
+		'livechat_video_call',
+	];
+
+	return Messages.findVisibleByRoomIdNotContainingTypes(rid, ignoredMessageTypes, {
+		sort: { ts: 1 },
+	});
+}
diff --git a/apps/meteor/app/livechat/server/lib/localTypes.ts b/apps/meteor/app/livechat/server/lib/localTypes.ts
index c6acbbc5bcbd..d58cad8f50bc 100644
--- a/apps/meteor/app/livechat/server/lib/localTypes.ts
+++ b/apps/meteor/app/livechat/server/lib/localTypes.ts
@@ -1,4 +1,4 @@
-import type { IOmnichannelRoom, IUser, ILivechatVisitor } from '@rocket.chat/core-typings';
+import type { IOmnichannelRoom, IUser, ILivechatVisitor, IMessage, MessageAttachment, IMessageInbox } from '@rocket.chat/core-typings';
 
 export type GenericCloseRoomParams = {
 	room: IOmnichannelRoom;
@@ -29,3 +29,27 @@ export type CloseRoomParamsByVisitor = {
 } & GenericCloseRoomParams;
 
 export type CloseRoomParams = CloseRoomParamsByUser | CloseRoomParamsByVisitor;
+
+type UploadedFile = {
+	_id: string;
+	name?: string;
+	type?: string;
+	size?: number;
+	description?: string;
+	identify?: { size: { width: number; height: number } };
+	format?: string;
+};
+
+export interface ILivechatMessage {
+	token: string;
+	_id: string;
+	rid: string;
+	msg: string;
+	file?: UploadedFile;
+	files?: UploadedFile[];
+	attachments?: MessageAttachment[];
+	alias?: string;
+	groupable?: boolean;
+	blocks?: IMessage['blocks'];
+	email?: IMessageInbox['email'];
+}
diff --git a/apps/meteor/app/livechat/server/lib/logger.ts b/apps/meteor/app/livechat/server/lib/logger.ts
index bb452cd4db04..a468818cfd10 100644
--- a/apps/meteor/app/livechat/server/lib/logger.ts
+++ b/apps/meteor/app/livechat/server/lib/logger.ts
@@ -2,3 +2,5 @@ import { Logger } from '@rocket.chat/logger';
 
 export const callbackLogger = new Logger('[Omnichannel] Callback');
 export const businessHourLogger = new Logger('Business Hour');
+export const livechatLogger = new Logger('Livechat');
+export const livechatContactsLogger = new Logger('Livechat Contacts');
diff --git a/apps/meteor/app/livechat/server/lib/messages.ts b/apps/meteor/app/livechat/server/lib/messages.ts
new file mode 100644
index 000000000000..0f5c460e3c28
--- /dev/null
+++ b/apps/meteor/app/livechat/server/lib/messages.ts
@@ -0,0 +1,91 @@
+import dns from 'dns';
+import * as util from 'util';
+
+import { LivechatDepartment } from '@rocket.chat/models';
+
+import { callbacks } from '../../../../lib/callbacks';
+import * as Mailer from '../../../mailer/server/api';
+import { settings } from '../../../settings/server';
+
+const dnsResolveMx = util.promisify(dns.resolveMx);
+
+type OfflineMessageData = {
+	message: string;
+	name: string;
+	email: string;
+	department?: string;
+	host?: string;
+};
+
+export async function sendOfflineMessage(data: OfflineMessageData) {
+	if (!settings.get('Livechat_display_offline_form')) {
+		throw new Error('error-offline-form-disabled');
+	}
+
+	const { message, name, email, department, host } = data;
+
+	if (!email) {
+		throw new Error('error-invalid-email');
+	}
+
+	const emailMessage = `${message}`.replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1<br>$2');
+
+	let html = '<h1>New livechat message</h1>';
+	if (host && host !== '') {
+		html = html.concat(`<p><strong>Sent from:</strong><a href='${host}'> ${host}</a></p>`);
+	}
+	html = html.concat(`
+			<p><strong>Visitor name:</strong> ${name}</p>
+			<p><strong>Visitor email:</strong> ${email}</p>
+			<p><strong>Message:</strong><br>${emailMessage}</p>`);
+
+	const fromEmail = settings.get<string>('From_Email').match(/\b[A-Z0-9._%+-]+@(?:[A-Z0-9-]+\.)+[A-Z]{2,4}\b/i);
+
+	let from: string;
+	if (fromEmail) {
+		from = fromEmail[0];
+	} else {
+		from = settings.get<string>('From_Email');
+	}
+
+	if (settings.get('Livechat_validate_offline_email')) {
+		const emailDomain = email.substr(email.lastIndexOf('@') + 1);
+
+		try {
+			await dnsResolveMx(emailDomain);
+		} catch (e) {
+			throw new Meteor.Error('error-invalid-email-address');
+		}
+	}
+
+	// TODO Block offline form if Livechat_offline_email is undefined
+	// (it does not make sense to have an offline form that does nothing)
+	// `this.sendEmail` will throw an error if the email is invalid
+	// thus this breaks livechat, since the "to" email is invalid, and that returns an [invalid email] error to the livechat client
+	let emailTo = settings.get<string>('Livechat_offline_email');
+	if (department && department !== '') {
+		const dep = await LivechatDepartment.findOneByIdOrName(department, { projection: { email: 1 } });
+		if (dep) {
+			emailTo = dep.email || emailTo;
+		}
+	}
+
+	const fromText = `${name} - ${email} <${from}>`;
+	const replyTo = `${name} <${email}>`;
+	const subject = `Livechat offline message from ${name}: ${`${emailMessage}`.substring(0, 20)}`;
+	await sendEmail(fromText, emailTo, replyTo, subject, html);
+
+	setImmediate(() => {
+		void callbacks.run('livechat.offlineMessage', data);
+	});
+}
+
+async function sendEmail(from: string, to: string, replyTo: string, subject: string, html: string): Promise<void> {
+	await Mailer.send({
+		to,
+		from,
+		replyTo,
+		subject,
+		html,
+	});
+}
diff --git a/apps/meteor/app/livechat/server/lib/parseTranscriptRequest.ts b/apps/meteor/app/livechat/server/lib/parseTranscriptRequest.ts
index 76595a7ff640..1a9b27b50151 100644
--- a/apps/meteor/app/livechat/server/lib/parseTranscriptRequest.ts
+++ b/apps/meteor/app/livechat/server/lib/parseTranscriptRequest.ts
@@ -1,8 +1,8 @@
 import type { ILivechatVisitor, IOmnichannelRoom, IUser } from '@rocket.chat/core-typings';
 import { LivechatVisitors, Users } from '@rocket.chat/models';
 
-import { settings } from '../../../settings/server';
 import type { CloseRoomParams } from './localTypes';
+import { settings } from '../../../settings/server';
 
 export const parseTranscriptRequest = async (
 	room: IOmnichannelRoom,
diff --git a/apps/meteor/app/livechat/server/lib/sendTranscript.ts b/apps/meteor/app/livechat/server/lib/sendTranscript.ts
index bc7c06e0eaae..e701e8f5b863 100644
--- a/apps/meteor/app/livechat/server/lib/sendTranscript.ts
+++ b/apps/meteor/app/livechat/server/lib/sendTranscript.ts
@@ -108,7 +108,7 @@ export async function sendTranscript({
 					messageType.data
 						? { ...messageType.data(message), interpolation: { escapeValue: false } }
 						: { interpolation: { escapeValue: false } },
-			  )}</i>`
+				)}</i>`
 			: message.msg;
 
 		let filesHTML = '';
diff --git a/apps/meteor/app/livechat/server/lib/tracking.ts b/apps/meteor/app/livechat/server/lib/tracking.ts
new file mode 100644
index 000000000000..bfbcf9912212
--- /dev/null
+++ b/apps/meteor/app/livechat/server/lib/tracking.ts
@@ -0,0 +1,54 @@
+import { Message } from '@rocket.chat/core-services';
+import { Users } from '@rocket.chat/models';
+
+import { livechatLogger } from './logger';
+import { settings } from '../../../settings/server';
+
+type PageInfo = { title: string; location: { href: string }; change: string };
+
+export async function savePageHistory(token: string, roomId: string | undefined, pageInfo: PageInfo) {
+	livechatLogger.debug({
+		msg: `Saving page movement history for visitor with token ${token}`,
+		pageInfo,
+		roomId,
+	});
+
+	if (pageInfo.change !== settings.get<string>('Livechat_history_monitor_type')) {
+		return;
+	}
+	const user = await Users.findOneById('rocket.cat');
+
+	if (!user) {
+		throw new Error('error-invalid-user');
+	}
+
+	const pageTitle = pageInfo.title;
+	const pageUrl = pageInfo.location.href;
+	const extraData: {
+		navigation: {
+			page: PageInfo;
+			token: string;
+		};
+		expireAt?: number;
+		_hidden?: boolean;
+	} = {
+		navigation: {
+			page: pageInfo,
+			token,
+		},
+	};
+
+	if (!roomId) {
+		livechatLogger.warn(`Saving page history without room id for visitor with token ${token}`);
+		// keep history of unregistered visitors for 1 month
+		const keepHistoryMiliseconds = 2592000000;
+		extraData.expireAt = new Date().getTime() + keepHistoryMiliseconds;
+	}
+
+	if (!settings.get('Livechat_Visitor_navigation_as_a_message')) {
+		extraData._hidden = true;
+	}
+
+	// @ts-expect-error: Investigating on which case we won't receive a roomId and where that history is supposed to be stored
+	return Message.saveSystemMessage('livechat_navigation_history', roomId, `${pageTitle} - ${pageUrl}`, user, extraData);
+}
diff --git a/apps/meteor/app/livechat/server/methods/saveDepartment.ts b/apps/meteor/app/livechat/server/methods/saveDepartment.ts
index 659f85f49945..484cf275088d 100644
--- a/apps/meteor/app/livechat/server/methods/saveDepartment.ts
+++ b/apps/meteor/app/livechat/server/methods/saveDepartment.ts
@@ -3,7 +3,7 @@ import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { Meteor } from 'meteor/meteor';
 
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
-import { Livechat } from '../lib/LivechatTyped';
+import { saveDepartment } from '../lib/departmentsLib';
 
 declare module '@rocket.chat/ddp-client' {
 	// eslint-disable-next-line @typescript-eslint/naming-convention
@@ -44,6 +44,6 @@ Meteor.methods<ServerMethods>({
 			});
 		}
 
-		return Livechat.saveDepartment(uid, _id, departmentData, { upsert: departmentAgents }, departmentUnit);
+		return saveDepartment(uid, _id, departmentData, { upsert: departmentAgents }, departmentUnit);
 	},
 });
diff --git a/apps/meteor/app/livechat/server/methods/sendFileLivechatMessage.ts b/apps/meteor/app/livechat/server/methods/sendFileLivechatMessage.ts
index 0268207b2f6c..ef12cf728c73 100644
--- a/apps/meteor/app/livechat/server/methods/sendFileLivechatMessage.ts
+++ b/apps/meteor/app/livechat/server/methods/sendFileLivechatMessage.ts
@@ -11,8 +11,8 @@ import { Random } from '@rocket.chat/random';
 import { Match, check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 
-import { FileUpload } from '../../../file-upload/server';
 import { sendMessageLivechat } from './sendMessageLivechat';
+import { FileUpload } from '../../../file-upload/server';
 
 interface ISendFileLivechatMessage {
 	roomId: string;
diff --git a/apps/meteor/app/livechat/server/methods/sendMessageLivechat.ts b/apps/meteor/app/livechat/server/methods/sendMessageLivechat.ts
index 6fac80397906..742631dcea90 100644
--- a/apps/meteor/app/livechat/server/methods/sendMessageLivechat.ts
+++ b/apps/meteor/app/livechat/server/methods/sendMessageLivechat.ts
@@ -6,7 +6,7 @@ import { Meteor } from 'meteor/meteor';
 
 import { settings } from '../../../settings/server';
 import { Livechat } from '../lib/LivechatTyped';
-import type { ILivechatMessage } from '../lib/LivechatTyped';
+import type { ILivechatMessage } from '../lib/localTypes';
 
 interface ILivechatMessageAgent {
 	agentId: string;
diff --git a/apps/meteor/app/livechat/server/methods/takeInquiry.ts b/apps/meteor/app/livechat/server/methods/takeInquiry.ts
index 733cbd995208..19a08761c614 100644
--- a/apps/meteor/app/livechat/server/methods/takeInquiry.ts
+++ b/apps/meteor/app/livechat/server/methods/takeInquiry.ts
@@ -6,6 +6,8 @@ import { Meteor } from 'meteor/meteor';
 import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
 import { settings } from '../../../settings/server';
 import { RoutingManager } from '../lib/RoutingManager';
+import { isAgentAvailableToTakeContactInquiry } from '../lib/contacts/isAgentAvailableToTakeContactInquiry';
+import { migrateVisitorIfMissingContact } from '../lib/contacts/migrateVisitorIfMissingContact';
 
 declare module '@rocket.chat/ddp-client' {
 	// eslint-disable-next-line @typescript-eslint/naming-convention
@@ -51,7 +53,15 @@ export const takeInquiry = async (
 
 	const room = await LivechatRooms.findOneById(inquiry.rid);
 	if (!room || !(await Omnichannel.isWithinMACLimit(room))) {
-		throw new Error('error-mac-limit-reached');
+		throw new Meteor.Error('error-mac-limit-reached');
+	}
+
+	const contactId = room.contactId ?? (await migrateVisitorIfMissingContact(room.v._id, room.source));
+	if (contactId) {
+		const isAgentAvailableToTakeContactInquiryResult = await isAgentAvailableToTakeContactInquiry(inquiry.v._id, room.source, contactId);
+		if (!isAgentAvailableToTakeContactInquiryResult.value) {
+			throw new Meteor.Error(isAgentAvailableToTakeContactInquiryResult.error);
+		}
 	}
 
 	const agent = {
diff --git a/apps/meteor/app/livechat/server/roomAccessValidator.compatibility.ts b/apps/meteor/app/livechat/server/roomAccessValidator.compatibility.ts
index d5ef83272550..d772b0cb7f21 100644
--- a/apps/meteor/app/livechat/server/roomAccessValidator.compatibility.ts
+++ b/apps/meteor/app/livechat/server/roomAccessValidator.compatibility.ts
@@ -1,9 +1,9 @@
 import type { IUser, IOmnichannelRoom } from '@rocket.chat/core-typings';
 import { LivechatDepartmentAgents, LivechatInquiry, LivechatRooms, LivechatDepartment } from '@rocket.chat/models';
 
+import { RoutingManager } from './lib/RoutingManager';
 import { hasPermissionAsync } from '../../authorization/server/functions/hasPermission';
 import { hasRoleAsync } from '../../authorization/server/functions/hasRole';
-import { RoutingManager } from './lib/RoutingManager';
 
 type OmnichannelRoomAccessValidator = (
 	room: IOmnichannelRoom,
diff --git a/apps/meteor/app/livechat/server/sendMessageBySMS.ts b/apps/meteor/app/livechat/server/sendMessageBySMS.ts
index c7f88646158b..5454474f09d9 100644
--- a/apps/meteor/app/livechat/server/sendMessageBySMS.ts
+++ b/apps/meteor/app/livechat/server/sendMessageBySMS.ts
@@ -2,10 +2,10 @@ import { OmnichannelIntegration } from '@rocket.chat/core-services';
 import { isEditedMessage } from '@rocket.chat/core-typings';
 import { LivechatVisitors } from '@rocket.chat/models';
 
+import { callbackLogger } from './lib/logger';
 import { callbacks } from '../../../lib/callbacks';
 import { settings } from '../../settings/server';
 import { normalizeMessageFileUpload } from '../../utils/server/functions/normalizeMessageFileUpload';
-import { callbackLogger } from './lib/logger';
 
 callbacks.add(
 	'afterOmnichannelSaveMessage',
@@ -55,7 +55,7 @@ callbacks.add(
 			return message;
 		}
 
-		const visitor = await LivechatVisitors.getVisitorByToken(room.v.token, { projection: { phone: 1 } });
+		const visitor = await LivechatVisitors.getVisitorByToken(room.v.token, { projection: { phone: 1, source: 1 } });
 
 		if (!visitor?.phone || visitor.phone.length === 0) {
 			return message;
diff --git a/apps/meteor/app/livechat/server/startup.ts b/apps/meteor/app/livechat/server/startup.ts
index 32cf01d2e640..b41fc425bf06 100644
--- a/apps/meteor/app/livechat/server/startup.ts
+++ b/apps/meteor/app/livechat/server/startup.ts
@@ -5,24 +5,24 @@ import { LivechatRooms } from '@rocket.chat/models';
 import { Accounts } from 'meteor/accounts-base';
 import { Meteor } from 'meteor/meteor';
 
+import { businessHourManager } from './business-hour';
+import { createDefaultBusinessHourIfNotExists } from './business-hour/Helper';
+import { Livechat as LivechatTyped } from './lib/LivechatTyped';
+import { LivechatAgentActivityMonitor } from './statistics/LivechatAgentActivityMonitor';
 import { callbacks } from '../../../lib/callbacks';
 import { beforeLeaveRoomCallback } from '../../../lib/callbacks/beforeLeaveRoomCallback';
 import { i18n } from '../../../server/lib/i18n';
 import { roomCoordinator } from '../../../server/lib/rooms/roomCoordinator';
+import { maybeMigrateLivechatRoom } from '../../api/server/lib/maybeMigrateLivechatRoom';
 import { hasPermissionAsync } from '../../authorization/server/functions/hasPermission';
 import { notifyOnUserChange } from '../../lib/server/lib/notifyListener';
 import { settings } from '../../settings/server';
-import { businessHourManager } from './business-hour';
-import { createDefaultBusinessHourIfNotExists } from './business-hour/Helper';
-import { Livechat as LivechatTyped } from './lib/LivechatTyped';
-import { RoutingManager } from './lib/RoutingManager';
-import { LivechatAgentActivityMonitor } from './statistics/LivechatAgentActivityMonitor';
 import './roomAccessValidator.internalService';
 
 const logger = new Logger('LivechatStartup');
 
 Meteor.startup(async () => {
-	roomCoordinator.setRoomFind('l', (_id) => LivechatRooms.findOneById(_id));
+	roomCoordinator.setRoomFind('l', async (id) => maybeMigrateLivechatRoom(await LivechatRooms.findOneById(id)));
 
 	beforeLeaveRoomCallback.add(
 		(user, room) => {
@@ -78,14 +78,10 @@ Meteor.startup(async () => {
 		process.env.TEST_MODE === 'true'
 			? {
 					debounce: 10,
-			  }
+				}
 			: undefined,
 	);
 
-	settings.watch<string>('Livechat_Routing_Method', () => {
-		void RoutingManager.startQueue();
-	});
-
 	// Remove when accounts.onLogout is async
 	Accounts.onLogout(({ user }: { user?: IUser }) => {
 		if (!user?.roles?.includes('livechat-agent') || user?.roles?.includes('bot')) {
diff --git a/apps/meteor/app/mailer/server/api.ts b/apps/meteor/app/mailer/server/api.ts
index 7e0ad0380b11..a32461d16a92 100644
--- a/apps/meteor/app/mailer/server/api.ts
+++ b/apps/meteor/app/mailer/server/api.ts
@@ -8,12 +8,12 @@ import { Meteor } from 'meteor/meteor';
 import stripHtml from 'string-strip-html';
 import _ from 'underscore';
 
+import { replaceVariables } from './replaceVariables';
 import { validateEmail } from '../../../lib/emailValidator';
 import { strLeft, strRightBack } from '../../../lib/utils/stringUtils';
 import { i18n } from '../../../server/lib/i18n';
 import { notifyOnSettingChanged } from '../../lib/server/lib/notifyListener';
 import { settings } from '../../settings/server';
-import { replaceVariables } from './replaceVariables';
 
 let contentHeader: string | undefined;
 let contentFooter: string | undefined;
@@ -44,7 +44,7 @@ export const replace = (str: string, data: { [key: string]: unknown } = {}): str
 			? {
 					fname: strLeft(String(data.name), ' '),
 					lname: strRightBack(String(data.name), ' '),
-			  }
+				}
 			: {}),
 		...data,
 	};
diff --git a/apps/meteor/app/markdown/lib/parser/original/code.js b/apps/meteor/app/markdown/lib/parser/original/code.js
index 61059d24a06d..2bb2ef603b96 100644
--- a/apps/meteor/app/markdown/lib/parser/original/code.js
+++ b/apps/meteor/app/markdown/lib/parser/original/code.js
@@ -4,8 +4,8 @@
  */
 import { unescapeHTML } from '@rocket.chat/string-helpers';
 
-import hljs, { register } from '../../hljs';
 import { addAsToken } from './token';
+import hljs, { register } from '../../hljs';
 
 const inlinecode = (message) => {
 	// Support `text`
diff --git a/apps/meteor/app/message-mark-as-unread/client/actionButton.ts b/apps/meteor/app/message-mark-as-unread/client/actionButton.ts
index e1e35d216029..fc052eaf63d3 100644
--- a/apps/meteor/app/message-mark-as-unread/client/actionButton.ts
+++ b/apps/meteor/app/message-mark-as-unread/client/actionButton.ts
@@ -2,9 +2,8 @@ import { Meteor } from 'meteor/meteor';
 
 import { roomCoordinator } from '../../../client/lib/rooms/roomCoordinator';
 import { dispatchToastMessage } from '../../../client/lib/toast';
-import { messageArgs } from '../../../client/lib/utils/messageArgs';
 import { router } from '../../../client/providers/RouterProvider';
-import { ChatSubscription } from '../../models/client';
+import { Subscriptions } from '../../models/client';
 import { LegacyRoomManager, MessageAction } from '../../ui-utils/client';
 import { sdk } from '../../utils/client/lib/SDKClient';
 
@@ -15,11 +14,9 @@ Meteor.startup(() => {
 		label: 'Mark_unread',
 		context: ['message', 'message-mobile', 'threads'],
 		type: 'interaction',
-		async action(_, props) {
-			const { message = messageArgs(this).msg } = props;
-
+		async action(_, { message }) {
 			try {
-				const subscription = ChatSubscription.findOne({
+				const subscription = Subscriptions.findOne({
 					rid: message.rid,
 				});
 
diff --git a/apps/meteor/app/message-mark-as-unread/server/unreadMessages.ts b/apps/meteor/app/message-mark-as-unread/server/unreadMessages.ts
index f213ae4b7243..69a4444e8394 100644
--- a/apps/meteor/app/message-mark-as-unread/server/unreadMessages.ts
+++ b/apps/meteor/app/message-mark-as-unread/server/unreadMessages.ts
@@ -3,8 +3,8 @@ import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { Messages, Subscriptions } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
 
-import { notifyOnSubscriptionChangedByRoomIdAndUserId } from '../../lib/server/lib/notifyListener';
 import logger from './logger';
+import { notifyOnSubscriptionChangedByRoomIdAndUserId } from '../../lib/server/lib/notifyListener';
 
 declare module '@rocket.chat/ddp-client' {
 	// eslint-disable-next-line @typescript-eslint/naming-convention
diff --git a/apps/meteor/app/message-pin/server/pinMessage.ts b/apps/meteor/app/message-pin/server/pinMessage.ts
index 9f3dd44cc16d..f3622ff7bcad 100644
--- a/apps/meteor/app/message-pin/server/pinMessage.ts
+++ b/apps/meteor/app/message-pin/server/pinMessage.ts
@@ -43,108 +43,101 @@ declare module '@rocket.chat/ddp-client' {
 	}
 }
 
-Meteor.methods<ServerMethods>({
-	async pinMessage(message, pinnedAt) {
-		check(message._id, String);
-
-		const userId = Meteor.userId();
-		if (!userId) {
-			throw new Meteor.Error('error-invalid-user', 'Invalid user', {
-				method: 'pinMessage',
-			});
-		}
+export async function pinMessage(originalMessage: IMessage, userId: string, pinnedAt?: Date) {
+	if (!settings.get('Message_AllowPinning')) {
+		throw new Meteor.Error('error-action-not-allowed', 'Message pinning not allowed', {
+			method: 'pinMessage',
+			action: 'Message_pinning',
+		});
+	}
 
-		if (!settings.get('Message_AllowPinning')) {
-			throw new Meteor.Error('error-action-not-allowed', 'Message pinning not allowed', {
-				method: 'pinMessage',
-				action: 'Message_pinning',
-			});
-		}
+	if (!(await hasPermissionAsync(userId, 'pin-message', originalMessage.rid))) {
+		throw new Meteor.Error('not-authorized', 'Not Authorized', { method: 'pinMessage' });
+	}
 
-		let originalMessage = await Messages.findOneById(message._id);
-		if (originalMessage == null || originalMessage._id == null) {
-			throw new Meteor.Error('error-invalid-message', 'Message you are pinning was not found', {
-				method: 'pinMessage',
-				action: 'Message_pinning',
-			});
-		}
+	const room = await Rooms.findOneById(originalMessage.rid);
+	if (!room) {
+		throw new Meteor.Error('not-authorized', 'Not Authorized', { method: 'pinMessage' });
+	}
 
-		const subscription = await Subscriptions.findOneByRoomIdAndUserId(originalMessage.rid, userId, { projection: { _id: 1 } });
-		if (!subscription) {
-			// If it's a valid message but on a room that the user is not subscribed to, report that the message was not found.
-			throw new Meteor.Error('error-invalid-message', 'Message you are pinning was not found', {
-				method: 'pinMessage',
-				action: 'Message_pinning',
-			});
-		}
+	if (!(await canAccessRoomAsync(room, { _id: userId }))) {
+		throw new Meteor.Error('not-authorized', 'Not Authorized', { method: 'pinMessage' });
+	}
 
-		if (!(await hasPermissionAsync(userId, 'pin-message', originalMessage.rid))) {
-			throw new Meteor.Error('not-authorized', 'Not Authorized', { method: 'pinMessage' });
-		}
+	if (originalMessage.pinned) {
+		return originalMessage;
+	}
 
-		const me = await Users.findOneById(userId);
-		if (!me) {
-			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'pinMessage' });
-		}
+	const me = await Users.findOneById(userId);
+	if (!me) {
+		throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'pinMessage' });
+	}
 
-		// If we keep history of edits, insert a new message to store history information
-		if (settings.get('Message_KeepHistory') && isRegisterUser(me)) {
-			await Messages.cloneAndSaveAsHistoryById(message._id, me);
-		}
+	originalMessage.pinned = true;
+	originalMessage.pinnedAt = pinnedAt || new Date();
+	originalMessage.pinnedBy = {
+		_id: userId,
+		username: me.username,
+	};
 
-		const room = await Rooms.findOneById(originalMessage.rid);
-		if (!room) {
-			throw new Meteor.Error('not-authorized', 'Not Authorized', { method: 'pinMessage' });
-		}
+	originalMessage = await Message.beforeSave({ message: originalMessage, room, user: me });
 
-		if (!(await canAccessRoomAsync(room, { _id: userId }))) {
-			throw new Meteor.Error('not-authorized', 'Not Authorized', { method: 'pinMessage' });
-		}
+	await Messages.setPinnedByIdAndUserId(originalMessage._id, originalMessage.pinnedBy, originalMessage.pinned);
+	if (settings.get('Message_Read_Receipt_Store_Users')) {
+		await ReadReceipts.setPinnedByMessageId(originalMessage._id, originalMessage.pinned);
+	}
+	if (isTheLastMessage(room, originalMessage)) {
+		await Rooms.setLastMessagePinned(room._id, originalMessage.pinnedBy, originalMessage.pinned);
+	}
 
-		originalMessage.pinned = true;
-		originalMessage.pinnedAt = pinnedAt || new Date();
-		originalMessage.pinnedBy = {
-			_id: userId,
-			username: me.username,
-		};
+	const attachments: MessageAttachment[] = [];
 
-		originalMessage = await Message.beforeSave({ message: originalMessage, room, user: me });
+	if (Array.isArray(originalMessage.attachments)) {
+		originalMessage.attachments.forEach((attachment) => {
+			if (!isQuoteAttachment(attachment) || shouldAdd(attachments, attachment)) {
+				attachments.push(attachment);
+			}
+		});
+	}
 
-		await Messages.setPinnedByIdAndUserId(originalMessage._id, originalMessage.pinnedBy, originalMessage.pinned);
-		if (settings.get('Message_Read_Receipt_Store_Users')) {
-			await ReadReceipts.setPinnedByMessageId(message._id, originalMessage.pinned);
-		}
-		if (isTheLastMessage(room, message)) {
-			await Rooms.setLastMessagePinned(room._id, originalMessage.pinnedBy, originalMessage.pinned);
-			void notifyOnRoomChangedById(room._id);
-		}
+	// App IPostMessagePinned event hook
+	await Apps.self?.triggerEvent(AppEvents.IPostMessagePinned, originalMessage, await Meteor.userAsync(), originalMessage.pinned);
+
+	const pinMessageType = originalMessage.t === 'e2e' ? 'message_pinned_e2e' : 'message_pinned';
+
+	return Message.saveSystemMessage(pinMessageType, originalMessage.rid, '', me, {
+		attachments: [
+			{
+				text: originalMessage.msg,
+				author_name: originalMessage.u.username,
+				author_icon: getUserAvatarURL(originalMessage.u.username),
+				ts: originalMessage.ts,
+				attachments: attachments.map(recursiveRemove),
+			},
+		],
+	});
+}
 
-		const attachments: MessageAttachment[] = [];
+Meteor.methods<ServerMethods>({
+	async pinMessage(message, pinnedAt) {
+		check(message._id, String);
 
-		if (Array.isArray(originalMessage.attachments)) {
-			originalMessage.attachments.forEach((attachment) => {
-				if (!isQuoteAttachment(attachment) || shouldAdd(attachments, attachment)) {
-					attachments.push(attachment);
-				}
+		const userId = Meteor.userId();
+		if (!userId) {
+			throw new Meteor.Error('error-invalid-user', 'Invalid user', {
+				method: 'pinMessage',
 			});
 		}
 
-		// App IPostMessagePinned event hook
-		await Apps.self?.triggerEvent(AppEvents.IPostMessagePinned, originalMessage, await Meteor.userAsync(), originalMessage.pinned);
+		const originalMessage = await Messages.findOneById(message._id);
+		if (!originalMessage?.rid) {
+			throw new Meteor.Error('error-invalid-message', 'Message you are pinning was not found', {
+				method: 'pinMessage',
+				action: 'Message_pinning',
+			});
+		}
 
-		const pinMessageType = originalMessage.t === 'e2e' ? 'message_pinned_e2e' : 'message_pinned';
-
-		return Message.saveSystemMessage(pinMessageType, originalMessage.rid, '', me, {
-			attachments: [
-				{
-					text: originalMessage.msg,
-					author_name: originalMessage.u.username,
-					author_icon: getUserAvatarURL(originalMessage.u.username),
-					ts: originalMessage.ts,
-					attachments: attachments.map(recursiveRemove),
-				},
-			],
-		});
+		return pinMessage(originalMessage, userId, pinnedAt);
 	},
 	async unpinMessage(message) {
 		check(message._id, String);
diff --git a/apps/meteor/app/meteor-accounts-saml/server/lib/SAML.ts b/apps/meteor/app/meteor-accounts-saml/server/lib/SAML.ts
index 03642cab1eda..e3b12ca15aa7 100644
--- a/apps/meteor/app/meteor-accounts-saml/server/lib/SAML.ts
+++ b/apps/meteor/app/meteor-accounts-saml/server/lib/SAML.ts
@@ -7,6 +7,8 @@ import { escapeRegExp, escapeHTML } from '@rocket.chat/string-helpers';
 import { Accounts } from 'meteor/accounts-base';
 import { Meteor } from 'meteor/meteor';
 
+import { SAMLServiceProvider } from './ServiceProvider';
+import { SAMLUtils } from './Utils';
 import { ensureArray } from '../../../../lib/utils/arrayUtils';
 import { SystemLogger } from '../../../../server/lib/logger/system';
 import { addUserToRoom } from '../../../lib/server/functions/addUserToRoom';
@@ -18,8 +20,6 @@ import { i18n } from '../../../utils/lib/i18n';
 import type { ISAMLAction } from '../definition/ISAMLAction';
 import type { ISAMLUser } from '../definition/ISAMLUser';
 import type { IServiceProviderOptions } from '../definition/IServiceProviderOptions';
-import { SAMLServiceProvider } from './ServiceProvider';
-import { SAMLUtils } from './Utils';
 
 const showErrorMessage = function (res: ServerResponse, err: string): void {
 	res.writeHead(200, {
diff --git a/apps/meteor/app/meteor-accounts-saml/server/lib/ServiceProvider.ts b/apps/meteor/app/meteor-accounts-saml/server/lib/ServiceProvider.ts
index bf3d2151ce0d..0ffb5fe50fdf 100644
--- a/apps/meteor/app/meteor-accounts-saml/server/lib/ServiceProvider.ts
+++ b/apps/meteor/app/meteor-accounts-saml/server/lib/ServiceProvider.ts
@@ -5,11 +5,11 @@ import zlib from 'zlib';
 
 import { Meteor } from 'meteor/meteor';
 
+import { SAMLUtils } from './Utils';
 import type { ILogoutResponse } from '../definition/ILogoutResponse';
 import type { ISAMLRequest } from '../definition/ISAMLRequest';
 import type { IServiceProviderOptions } from '../definition/IServiceProviderOptions';
 import type { ILogoutRequestValidateCallback, ILogoutResponseValidateCallback, IResponseValidateCallback } from '../definition/callbacks';
-import { SAMLUtils } from './Utils';
 import { AuthorizeRequest } from './generators/AuthorizeRequest';
 import { LogoutRequest } from './generators/LogoutRequest';
 import { LogoutResponse } from './generators/LogoutResponse';
diff --git a/apps/meteor/app/meteor-accounts-saml/server/lib/Utils.ts b/apps/meteor/app/meteor-accounts-saml/server/lib/Utils.ts
index 984c7bc458a3..c2e8e8b00050 100644
--- a/apps/meteor/app/meteor-accounts-saml/server/lib/Utils.ts
+++ b/apps/meteor/app/meteor-accounts-saml/server/lib/Utils.ts
@@ -3,12 +3,12 @@ import zlib from 'zlib';
 
 import type { Logger } from '@rocket.chat/logger';
 
+import { StatusCode } from './constants';
 import { ensureArray } from '../../../../lib/utils/arrayUtils';
 import type { IUserDataMap, IAttributeMapping } from '../definition/IAttributeMapping';
 import type { ISAMLGlobalSettings } from '../definition/ISAMLGlobalSettings';
 import type { ISAMLUser } from '../definition/ISAMLUser';
 import type { IServiceProviderOptions } from '../definition/IServiceProviderOptions';
-import { StatusCode } from './constants';
 
 let providerList: Array<IServiceProviderOptions> = [];
 let debug = false;
diff --git a/apps/meteor/app/meteor-accounts-saml/server/lib/settings.ts b/apps/meteor/app/meteor-accounts-saml/server/lib/settings.ts
index 5c16716720b0..f2b15c9af16e 100644
--- a/apps/meteor/app/meteor-accounts-saml/server/lib/settings.ts
+++ b/apps/meteor/app/meteor-accounts-saml/server/lib/settings.ts
@@ -2,13 +2,6 @@ import type { SAMLConfiguration } from '@rocket.chat/core-typings';
 import { LoginServiceConfiguration } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
 
-import { SystemLogger } from '../../../../server/lib/logger/system';
-import {
-	notifyOnLoginServiceConfigurationChanged,
-	notifyOnLoginServiceConfigurationChangedByService,
-} from '../../../lib/server/lib/notifyListener';
-import { settings, settingsRegistry } from '../../../settings/server';
-import type { IServiceProviderOptions } from '../definition/IServiceProviderOptions';
 import { SAMLUtils } from './Utils';
 import {
 	defaultAuthnContextTemplate,
@@ -21,6 +14,13 @@ import {
 	defaultMetadataTemplate,
 	defaultMetadataCertificateTemplate,
 } from './constants';
+import { SystemLogger } from '../../../../server/lib/logger/system';
+import {
+	notifyOnLoginServiceConfigurationChanged,
+	notifyOnLoginServiceConfigurationChangedByService,
+} from '../../../lib/server/lib/notifyListener';
+import { settings, settingsRegistry } from '../../../settings/server';
+import type { IServiceProviderOptions } from '../definition/IServiceProviderOptions';
 
 const getSamlConfigs = function (service: string): SAMLConfiguration {
 	const configs: SAMLConfiguration = {
diff --git a/apps/meteor/app/meteor-accounts-saml/server/listener.ts b/apps/meteor/app/meteor-accounts-saml/server/listener.ts
index 8dd449597681..92a0c520ab65 100644
--- a/apps/meteor/app/meteor-accounts-saml/server/listener.ts
+++ b/apps/meteor/app/meteor-accounts-saml/server/listener.ts
@@ -6,10 +6,10 @@ import { Meteor } from 'meteor/meteor';
 import { RoutePolicy } from 'meteor/routepolicy';
 import { WebApp } from 'meteor/webapp';
 
-import { SystemLogger } from '../../../server/lib/logger/system';
 import type { ISAMLAction } from './definition/ISAMLAction';
 import { SAML } from './lib/SAML';
 import { SAMLUtils } from './lib/Utils';
+import { SystemLogger } from '../../../server/lib/logger/system';
 
 RoutePolicy.declare('/_saml/', 'network');
 
diff --git a/apps/meteor/app/meteor-accounts-saml/server/loginHandler.ts b/apps/meteor/app/meteor-accounts-saml/server/loginHandler.ts
index 4adbfc7e0674..b95513fef036 100644
--- a/apps/meteor/app/meteor-accounts-saml/server/loginHandler.ts
+++ b/apps/meteor/app/meteor-accounts-saml/server/loginHandler.ts
@@ -1,10 +1,10 @@
 import { Accounts } from 'meteor/accounts-base';
 import { Meteor } from 'meteor/meteor';
 
-import { i18n } from '../../../server/lib/i18n';
-import { SystemLogger } from '../../../server/lib/logger/system';
 import { SAML } from './lib/SAML';
 import { SAMLUtils } from './lib/Utils';
+import { i18n } from '../../../server/lib/i18n';
+import { SystemLogger } from '../../../server/lib/logger/system';
 
 const makeError = (message: string): Record<string, any> => ({
 	type: 'saml',
diff --git a/apps/meteor/app/meteor-accounts-saml/server/startup.ts b/apps/meteor/app/meteor-accounts-saml/server/startup.ts
index 556ab7df13e7..721edce08d46 100644
--- a/apps/meteor/app/meteor-accounts-saml/server/startup.ts
+++ b/apps/meteor/app/meteor-accounts-saml/server/startup.ts
@@ -2,9 +2,9 @@ import { Logger } from '@rocket.chat/logger';
 import debounce from 'lodash.debounce';
 import { Meteor } from 'meteor/meteor';
 
-import { settings } from '../../settings/server';
 import { SAMLUtils } from './lib/Utils';
 import { loadSamlServiceProviders, addSettings } from './lib/settings';
+import { settings } from '../../settings/server';
 
 const logger = new Logger('steffo:meteor-accounts-saml');
 SAMLUtils.setLoggerInstance(logger);
diff --git a/apps/meteor/app/metrics/server/lib/collectMetrics.ts b/apps/meteor/app/metrics/server/lib/collectMetrics.ts
index 8f2b256f6759..a1ad41c9a95c 100644
--- a/apps/meteor/app/metrics/server/lib/collectMetrics.ts
+++ b/apps/meteor/app/metrics/server/lib/collectMetrics.ts
@@ -10,12 +10,12 @@ import client from 'prom-client';
 import gcStats from 'prometheus-gc-stats';
 import _ from 'underscore';
 
+import { metrics } from './metrics';
 import { SystemLogger } from '../../../../server/lib/logger/system';
 import { getControl } from '../../../../server/lib/migrations';
 import { settings } from '../../../settings/server';
 import { getAppsStatistics } from '../../../statistics/server/lib/getAppsStatistics';
 import { Info } from '../../../utils/rocketchat.info';
-import { metrics } from './metrics';
 
 const { mongo } = MongoInternals.defaultRemoteCollectionDriver();
 
diff --git a/apps/meteor/app/models/client/index.ts b/apps/meteor/app/models/client/index.ts
index 397a1e45bb18..e71979106615 100644
--- a/apps/meteor/app/models/client/index.ts
+++ b/apps/meteor/app/models/client/index.ts
@@ -1,42 +1,28 @@
-import { Base } from './models/Base';
-import { CachedChannelList } from './models/CachedChannelList';
 import { CachedChatRoom } from './models/CachedChatRoom';
 import { CachedChatSubscription } from './models/CachedChatSubscription';
-import { CachedUserList } from './models/CachedUserList';
-import { ChatMessage } from './models/ChatMessage';
-import { AuthzCachedCollection, ChatPermissions } from './models/ChatPermissions';
-import { ChatRoom } from './models/ChatRoom';
-import { ChatSubscription } from './models/ChatSubscription';
-import CustomSounds from './models/CustomSounds';
-import EmojiCustom from './models/EmojiCustom';
+import { Messages } from './models/Messages';
+import { AuthzCachedCollection, Permissions } from './models/Permissions';
 import { Roles } from './models/Roles';
 import { RoomRoles } from './models/RoomRoles';
+import { Rooms } from './models/Rooms';
+import { Subscriptions } from './models/Subscriptions';
 import { UserRoles } from './models/UserRoles';
 import { Users } from './models/Users';
 
 export {
-	Base,
 	Roles,
-	CachedChannelList,
 	CachedChatRoom,
 	CachedChatSubscription,
-	CachedUserList,
 	RoomRoles,
 	UserRoles,
 	AuthzCachedCollection,
-	ChatPermissions,
-	CustomSounds,
-	EmojiCustom,
+	Permissions,
 	/** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
 	Users,
 	/** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
-	ChatRoom,
+	Rooms,
 	/** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
-	ChatSubscription,
+	Subscriptions,
 	/** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
-	ChatSubscription as Subscriptions,
-	/** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
-	ChatMessage,
-	/** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
-	ChatMessage as Messages,
+	Messages,
 };
diff --git a/apps/meteor/app/models/client/models/CachedChannelList.ts b/apps/meteor/app/models/client/models/CachedChannelList.ts
deleted file mode 100644
index 2ec0979e6c5e..000000000000
--- a/apps/meteor/app/models/client/models/CachedChannelList.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import type { IRoom } from '@rocket.chat/core-typings';
-import { Mongo } from 'meteor/mongo';
-
-export const CachedChannelList = new Mongo.Collection<IRoom>(null);
diff --git a/apps/meteor/app/models/client/models/CachedChatRoom.ts b/apps/meteor/app/models/client/models/CachedChatRoom.ts
index 248b68554583..784503a1b0af 100644
--- a/apps/meteor/app/models/client/models/CachedChatRoom.ts
+++ b/apps/meteor/app/models/client/models/CachedChatRoom.ts
@@ -1,8 +1,8 @@
 import type { IOmnichannelRoom, IRoom, IRoomWithRetentionPolicy } from '@rocket.chat/core-typings';
 import { DEFAULT_SLA_CONFIG, LivechatPriorityWeight } from '@rocket.chat/core-typings';
 
-import { CachedCollection } from '../../../ui-cached-collection/client/models/CachedCollection';
 import { CachedChatSubscription } from './CachedChatSubscription';
+import { CachedCollection } from '../../../../client/lib/cachedCollections/CachedCollection';
 
 class CachedChatRoom extends CachedCollection<IRoom> {
 	constructor() {
diff --git a/apps/meteor/app/models/client/models/CachedChatSubscription.ts b/apps/meteor/app/models/client/models/CachedChatSubscription.ts
index d17493e57f2e..6ea6ea6917e9 100644
--- a/apps/meteor/app/models/client/models/CachedChatSubscription.ts
+++ b/apps/meteor/app/models/client/models/CachedChatSubscription.ts
@@ -2,8 +2,8 @@ import type { IOmnichannelRoom, IRoomWithRetentionPolicy, ISubscription } from '
 import { DEFAULT_SLA_CONFIG, LivechatPriorityWeight } from '@rocket.chat/core-typings';
 import type { SubscriptionWithRoom } from '@rocket.chat/ui-contexts';
 
-import { CachedCollection } from '../../../ui-cached-collection/client/models/CachedCollection';
 import { CachedChatRoom } from './CachedChatRoom';
+import { CachedCollection } from '../../../../client/lib/cachedCollections/CachedCollection';
 
 declare module '@rocket.chat/core-typings' {
 	interface ISubscription {
diff --git a/apps/meteor/app/models/client/models/CachedUserList.ts b/apps/meteor/app/models/client/models/CachedUserList.ts
deleted file mode 100644
index 0233659b47d5..000000000000
--- a/apps/meteor/app/models/client/models/CachedUserList.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { Mongo } from 'meteor/mongo';
-
-export const CachedUserList = new Mongo.Collection(null);
diff --git a/apps/meteor/app/models/client/models/ChatRoom.ts b/apps/meteor/app/models/client/models/ChatRoom.ts
deleted file mode 100644
index f23f20e8048e..000000000000
--- a/apps/meteor/app/models/client/models/ChatRoom.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import type { IMessage, IRoom } from '@rocket.chat/core-typings';
-
-import { CachedChatRoom } from './CachedChatRoom';
-
-/** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
-export const ChatRoom = Object.assign(CachedChatRoom.collection, {
-	setReactionsInLastMessage(this: typeof CachedChatRoom.collection, roomId: IRoom['_id'], lastMessage: IMessage) {
-		return this.update({ _id: roomId }, { $set: { lastMessage } });
-	},
-	unsetReactionsInLastMessage(this: typeof CachedChatRoom.collection, roomId: IRoom['_id']) {
-		return this.update({ _id: roomId }, { $unset: { 'lastMessage.reactions': 1 as const } });
-	},
-});
diff --git a/apps/meteor/app/models/client/models/CustomSounds.ts b/apps/meteor/app/models/client/models/CustomSounds.ts
deleted file mode 100644
index ccbf8c4b50eb..000000000000
--- a/apps/meteor/app/models/client/models/CustomSounds.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type { ICustomSound } from '@rocket.chat/core-typings';
-
-import { Base } from './Base';
-
-class CustomSounds extends Base<ICustomSound> {
-	constructor() {
-		super();
-		this._initModel('custom_sounds');
-	}
-}
-
-export default new CustomSounds();
diff --git a/apps/meteor/app/models/client/models/EmojiCustom.ts b/apps/meteor/app/models/client/models/EmojiCustom.ts
deleted file mode 100644
index 48bf83e659b3..000000000000
--- a/apps/meteor/app/models/client/models/EmojiCustom.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import type { ICustomEmojiDescriptor } from '@rocket.chat/core-typings';
-import type { Mongo } from 'meteor/mongo';
-
-import { Base } from './Base';
-
-class EmojiCustom extends Base<ICustomEmojiDescriptor> {
-	constructor() {
-		super();
-		this._initModel('custom_emoji');
-	}
-
-	// find
-	findByNameOrAlias(name: ICustomEmojiDescriptor['name'], options?: Mongo.Options<ICustomEmojiDescriptor>) {
-		const query = {
-			$or: [{ name }, { aliases: name }],
-		};
-
-		return this.find(query, options);
-	}
-}
-
-export default new EmojiCustom();
diff --git a/apps/meteor/app/models/client/models/ChatMessage.ts b/apps/meteor/app/models/client/models/Messages.ts
similarity index 68%
rename from apps/meteor/app/models/client/models/ChatMessage.ts
rename to apps/meteor/app/models/client/models/Messages.ts
index 1e9b066bdaaa..94a9ff65f2f0 100644
--- a/apps/meteor/app/models/client/models/ChatMessage.ts
+++ b/apps/meteor/app/models/client/models/Messages.ts
@@ -1,4 +1,4 @@
-import type { IMessage, IRoom } from '@rocket.chat/core-typings';
+import type { IMessage } from '@rocket.chat/core-typings';
 import { Mongo } from 'meteor/mongo';
 
 import type { MinimongoCollection } from '../../../../client/definitions/MinimongoCollection';
@@ -11,19 +11,10 @@ class ChatMessageCollection
 		super(null);
 	}
 
-	findOneByRoomIdAndMessageId(rid: IRoom['_id'], messageId: IMessage['_id'], options?: Mongo.Options<IMessage>) {
-		const query = {
-			rid,
-			_id: messageId,
-		};
-
-		return this.findOne(query, options);
-	}
-
 	public declare _collection: MinimongoCollection<IMessage & { ignored?: boolean }>['_collection'];
 
 	public declare queries: MinimongoCollection<IMessage & { ignored?: boolean }>['queries'];
 }
 
 /** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
-export const ChatMessage = new ChatMessageCollection();
+export const Messages = new ChatMessageCollection();
diff --git a/apps/meteor/app/models/client/models/ChatPermissions.ts b/apps/meteor/app/models/client/models/Permissions.ts
similarity index 58%
rename from apps/meteor/app/models/client/models/ChatPermissions.ts
rename to apps/meteor/app/models/client/models/Permissions.ts
index e836f58ebb2e..5793ab3e897d 100644
--- a/apps/meteor/app/models/client/models/ChatPermissions.ts
+++ b/apps/meteor/app/models/client/models/Permissions.ts
@@ -1,10 +1,10 @@
 import type { IPermission } from '@rocket.chat/core-typings';
 
-import { CachedCollection } from '../../../ui-cached-collection/client';
+import { CachedCollection } from '../../../../client/lib/cachedCollections';
 
 export const AuthzCachedCollection = new CachedCollection<IPermission>({
 	name: 'permissions',
 	eventType: 'notify-logged',
 });
 
-export const ChatPermissions = AuthzCachedCollection.collection;
+export const Permissions = AuthzCachedCollection.collection;
diff --git a/apps/meteor/app/models/client/models/Roles.ts b/apps/meteor/app/models/client/models/Roles.ts
index a048905cd2b4..62dec04f3262 100644
--- a/apps/meteor/app/models/client/models/Roles.ts
+++ b/apps/meteor/app/models/client/models/Roles.ts
@@ -1,10 +1,10 @@
-import type { IRole, IRoom, IUser } from '@rocket.chat/core-typings';
+import type { IRole, IUser } from '@rocket.chat/core-typings';
 import { Mongo } from 'meteor/mongo';
 import { ReactiveVar } from 'meteor/reactive-var';
 
-import type { MinimongoCollection } from '../../../../client/definitions/MinimongoCollection';
-import { ChatSubscription } from './ChatSubscription';
+import { Subscriptions } from './Subscriptions';
 import { Users } from './Users';
+import type { MinimongoCollection } from '../../../../client/definitions/MinimongoCollection';
 
 class RolesCollection extends Mongo.Collection<IRole> implements MinimongoCollection<IRole> {
 	ready = new ReactiveVar(false);
@@ -13,22 +13,6 @@ class RolesCollection extends Mongo.Collection<IRole> implements MinimongoCollec
 		super(null);
 	}
 
-	findUsersInRole(roleId: IRole['_id'], scope: IRoom['_id'], options: any) {
-		const role = this.findOne(roleId);
-		const roleScope = role?.scope || 'Users';
-
-		switch (roleScope) {
-			case 'Subscriptions':
-				return ChatSubscription.findUsersInRoles(roleId, scope, options);
-
-			case 'Users':
-				return Users.findUsersInRoles(roleId, scope, options);
-
-			default:
-				return undefined;
-		}
-	}
-
 	isUserInRoles(userId: IUser['_id'], roles: IRole['_id'][] | IRole['_id'], scope?: string, ignoreSubscriptions = false) {
 		roles = Array.isArray(roles) ? roles : [roles];
 		return roles.some((roleId) => {
@@ -37,7 +21,7 @@ class RolesCollection extends Mongo.Collection<IRole> implements MinimongoCollec
 
 			switch (roleScope) {
 				case 'Subscriptions':
-					return ChatSubscription.isUserInRole(userId, roleId, scope);
+					return Subscriptions.isUserInRole(userId, roleId, scope);
 
 				case 'Users':
 					return Users.isUserInRole(userId, roleId);
diff --git a/apps/meteor/app/models/client/models/Rooms.ts b/apps/meteor/app/models/client/models/Rooms.ts
new file mode 100644
index 000000000000..91328881c432
--- /dev/null
+++ b/apps/meteor/app/models/client/models/Rooms.ts
@@ -0,0 +1,4 @@
+import { CachedChatRoom } from './CachedChatRoom';
+
+/** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
+export const Rooms = CachedChatRoom.collection;
diff --git a/apps/meteor/app/models/client/models/ChatSubscription.ts b/apps/meteor/app/models/client/models/Subscriptions.ts
similarity index 95%
rename from apps/meteor/app/models/client/models/ChatSubscription.ts
rename to apps/meteor/app/models/client/models/Subscriptions.ts
index aa7892fe5031..ab33f79b1050 100644
--- a/apps/meteor/app/models/client/models/ChatSubscription.ts
+++ b/apps/meteor/app/models/client/models/Subscriptions.ts
@@ -3,11 +3,11 @@ import mem from 'mem';
 import { Meteor } from 'meteor/meteor';
 import type { Filter } from 'mongodb';
 
-import { isTruthy } from '../../../../lib/isTruthy';
 import { CachedChatSubscription } from './CachedChatSubscription';
+import { isTruthy } from '../../../../lib/isTruthy';
 
 /** @deprecated new code refer to Minimongo collections like this one; prefer fetching data from the REST API, listening to changes via streamer events, and storing the state in a Tanstack Query */
-export const ChatSubscription = Object.assign(CachedChatSubscription.collection, {
+export const Subscriptions = Object.assign(CachedChatSubscription.collection, {
 	isUserInRole: mem(
 		function (this: typeof CachedChatSubscription.collection, _uid: IUser['_id'], roleId: IRole['_id'], rid?: IRoom['_id']) {
 			if (!rid) {
diff --git a/apps/meteor/app/oauth2-server-config/server/admin/functions/addOAuthApp.ts b/apps/meteor/app/oauth2-server-config/server/admin/functions/addOAuthApp.ts
index 8e828f5c11d9..43bcd0ce14bd 100644
--- a/apps/meteor/app/oauth2-server-config/server/admin/functions/addOAuthApp.ts
+++ b/apps/meteor/app/oauth2-server-config/server/admin/functions/addOAuthApp.ts
@@ -4,8 +4,8 @@ import { Random } from '@rocket.chat/random';
 import type { OauthAppsAddParams } from '@rocket.chat/rest-typings';
 import { Meteor } from 'meteor/meteor';
 
-import { hasPermissionAsync } from '../../../../authorization/server/functions/hasPermission';
 import { parseUriList } from './parseUriList';
+import { hasPermissionAsync } from '../../../../authorization/server/functions/hasPermission';
 
 export async function addOAuthApp(applicationParams: OauthAppsAddParams, uid: IUser['_id'] | undefined): Promise<IOAuthApps> {
 	if (!uid) {
diff --git a/apps/meteor/app/otr/client/OTR.ts b/apps/meteor/app/otr/client/OTR.ts
index 9f3eea155384..6237b73e2545 100644
--- a/apps/meteor/app/otr/client/OTR.ts
+++ b/apps/meteor/app/otr/client/OTR.ts
@@ -1,7 +1,7 @@
 import type { IRoom, IUser } from '@rocket.chat/core-typings';
 
-import type { IOTR } from '../lib/IOTR';
 import { OTRRoom } from './OTRRoom';
+import type { IOTR } from '../lib/IOTR';
 
 class OTR implements IOTR {
 	private instancesByRoomId: { [rid: string]: OTRRoom };
diff --git a/apps/meteor/app/otr/lib/IOTR.ts b/apps/meteor/app/otr/lib/IOTR.ts
index 9e7cd4ca6b8e..c7aeb0a3777a 100644
--- a/apps/meteor/app/otr/lib/IOTR.ts
+++ b/apps/meteor/app/otr/lib/IOTR.ts
@@ -1,7 +1,7 @@
 import type { IMessage, IRoom, IUser } from '@rocket.chat/core-typings';
 
-import type { OTRRoom } from '../client/OTRRoom';
 import type { OtrRoomState } from './OtrRoomState';
+import type { OTRRoom } from '../client/OTRRoom';
 
 export interface IOnUserStreamData {
 	roomId: IRoom['_id'];
diff --git a/apps/meteor/app/push/server/push.ts b/apps/meteor/app/push/server/push.ts
index 760fbea7c232..77092051eee2 100644
--- a/apps/meteor/app/push/server/push.ts
+++ b/apps/meteor/app/push/server/push.ts
@@ -7,12 +7,12 @@ import { JWT } from 'google-auth-library';
 import { Match, check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 
-import { settings } from '../../settings/server';
 import { initAPN, sendAPN } from './apn';
 import type { PushOptions, PendingPushNotification } from './definition';
 import { sendFCM } from './fcm';
 import { sendGCM } from './gcm';
 import { logger } from './logger';
+import { settings } from '../../settings/server';
 
 export const _matchToken = Match.OneOf({ apn: String }, { gcm: String });
 
@@ -484,14 +484,14 @@ class PushClass {
 						apn: {
 							...pick(options.apn, 'category'),
 						},
-				  }
+					}
 				: {}),
 			...(this.hasGcmOptions(options)
 				? {
 						gcm: {
 							...pick(options.gcm, 'image', 'style'),
 						},
-				  }
+					}
 				: {}),
 		};
 
diff --git a/apps/meteor/app/reactions/client/init.ts b/apps/meteor/app/reactions/client/init.ts
index 1943d7262939..d9573fbfe833 100644
--- a/apps/meteor/app/reactions/client/init.ts
+++ b/apps/meteor/app/reactions/client/init.ts
@@ -1,7 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 
 import { roomCoordinator } from '../../../client/lib/rooms/roomCoordinator';
-import { messageArgs } from '../../../client/lib/utils/messageArgs';
 import { MessageAction } from '../../ui-utils/client';
 import { sdk } from '../../utils/client/lib/SDKClient';
 
@@ -11,8 +10,7 @@ Meteor.startup(() => {
 		icon: 'add-reaction',
 		label: 'Add_Reaction',
 		context: ['message', 'message-mobile', 'threads', 'federated', 'videoconf', 'videoconf-threads'],
-		action(event, props) {
-			const { message = messageArgs(this).msg, chat } = props;
+		action(event, { message, chat }) {
 			event?.stopPropagation();
 			chat?.emojiPicker.open(event?.currentTarget as Element, (emoji) => sdk.call('setReaction', `:${emoji}:`, message._id));
 		},
diff --git a/apps/meteor/app/reactions/client/methods/setReaction.ts b/apps/meteor/app/reactions/client/methods/setReaction.ts
index 1744d49c0ceb..2e3a03b248c2 100644
--- a/apps/meteor/app/reactions/client/methods/setReaction.ts
+++ b/apps/meteor/app/reactions/client/methods/setReaction.ts
@@ -4,7 +4,7 @@ import { Meteor } from 'meteor/meteor';
 
 import { roomCoordinator } from '../../../../client/lib/rooms/roomCoordinator';
 import { emoji } from '../../../emoji/client';
-import { Messages, ChatRoom, Subscriptions } from '../../../models/client';
+import { Messages, Rooms, Subscriptions } from '../../../models/client';
 
 Meteor.methods<ServerMethods>({
 	async setReaction(reaction, messageId) {
@@ -23,7 +23,7 @@ Meteor.methods<ServerMethods>({
 			return false;
 		}
 
-		const room: IRoom | undefined = ChatRoom.findOne({ _id: message.rid });
+		const room: IRoom | undefined = Rooms.findOne({ _id: message.rid });
 		if (!room) {
 			return false;
 		}
diff --git a/apps/meteor/app/search/server/model/SearchProvider.ts b/apps/meteor/app/search/server/model/SearchProvider.ts
index 89428e4a7dc6..88388262b95d 100644
--- a/apps/meteor/app/search/server/model/SearchProvider.ts
+++ b/apps/meteor/app/search/server/model/SearchProvider.ts
@@ -1,9 +1,9 @@
 import type { IMessageSearchSuggestion, IRoom, IUser } from '@rocket.chat/core-typings';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 
-import { SearchLogger } from '../logger/logger';
 import type { IRawSearchResult } from './ISearchResult';
 import { Settings } from './Settings';
+import { SearchLogger } from '../logger/logger';
 
 export abstract class SearchProvider<TPayload = any> {
 	private _key: string;
diff --git a/apps/meteor/app/search/server/search.internalService.ts b/apps/meteor/app/search/server/search.internalService.ts
index 2fbaa2e1da31..bf4a0c484ddc 100644
--- a/apps/meteor/app/search/server/search.internalService.ts
+++ b/apps/meteor/app/search/server/search.internalService.ts
@@ -1,9 +1,9 @@
 import { api, ServiceClassInternal } from '@rocket.chat/core-services';
 import { Users } from '@rocket.chat/models';
 
-import { settings } from '../../settings/server';
 import { searchEventService } from './events';
 import { searchProviderService } from './service';
+import { settings } from '../../settings/server';
 
 class Search extends ServiceClassInternal {
 	protected name = 'search';
diff --git a/apps/meteor/app/settings/server/SettingsRegistry.ts b/apps/meteor/app/settings/server/SettingsRegistry.ts
index d7d2fa0a79f8..ec9cf6b902f5 100644
--- a/apps/meteor/app/settings/server/SettingsRegistry.ts
+++ b/apps/meteor/app/settings/server/SettingsRegistry.ts
@@ -4,12 +4,12 @@ import { Emitter } from '@rocket.chat/emitter';
 import type { ISettingsModel } from '@rocket.chat/model-typings';
 import { isEqual } from 'underscore';
 
-import { SystemLogger } from '../../../server/lib/logger/system';
 import type { ICachedSettings } from './CachedSettings';
 import { getSettingDefaults } from './functions/getSettingDefaults';
 import { overrideSetting } from './functions/overrideSetting';
 import { overwriteSetting } from './functions/overwriteSetting';
 import { validateSetting } from './functions/validateSetting';
+import { SystemLogger } from '../../../server/lib/logger/system';
 
 const blockedSettings = new Set<string>();
 const hiddenSettings = new Set<string>();
diff --git a/apps/meteor/app/settings/server/applyMiddlewares.ts b/apps/meteor/app/settings/server/applyMiddlewares.ts
index 93f6efc8a9b1..d707757f0def 100644
--- a/apps/meteor/app/settings/server/applyMiddlewares.ts
+++ b/apps/meteor/app/settings/server/applyMiddlewares.ts
@@ -1,3 +1,4 @@
+/* eslint-disable react-hooks/rules-of-hooks */
 import { use } from './Middleware';
 import { settings } from './cached';
 
diff --git a/apps/meteor/app/settings/server/index.ts b/apps/meteor/app/settings/server/index.ts
index c358a174d69c..30a8c9fd6ba2 100644
--- a/apps/meteor/app/settings/server/index.ts
+++ b/apps/meteor/app/settings/server/index.ts
@@ -1,3 +1,4 @@
+/* eslint-disable react-hooks/rules-of-hooks */
 import { Settings } from '@rocket.chat/models';
 
 import { use } from './Middleware';
diff --git a/apps/meteor/app/slackbridge/client/slackbridge_import.client.js b/apps/meteor/app/slackbridge/client/slackbridge_import.client.ts
similarity index 85%
rename from apps/meteor/app/slackbridge/client/slackbridge_import.client.js
rename to apps/meteor/app/slackbridge/client/slackbridge_import.client.ts
index eebc07ddb72d..2138fc2a35f9 100644
--- a/apps/meteor/app/slackbridge/client/slackbridge_import.client.js
+++ b/apps/meteor/app/slackbridge/client/slackbridge_import.client.ts
@@ -1,7 +1,7 @@
 import { settings } from '../../settings/client';
 import { slashCommands } from '../../utils/client/slashCommand';
 
-settings.onload('SlackBridge_Enabled', (key, value) => {
+settings.onload('SlackBridge_Enabled', (_key, value) => {
 	if (value) {
 		slashCommands.add({
 			command: 'slackbridge-import',
diff --git a/apps/meteor/app/slackbridge/server/RocketAdapter.js b/apps/meteor/app/slackbridge/server/RocketAdapter.js
index 8ba2a76dcbc2..245e28c72203 100644
--- a/apps/meteor/app/slackbridge/server/RocketAdapter.js
+++ b/apps/meteor/app/slackbridge/server/RocketAdapter.js
@@ -6,13 +6,13 @@ import { Accounts } from 'meteor/accounts-base';
 import { Meteor } from 'meteor/meteor';
 import _ from 'underscore';
 
+import { rocketLogger } from './logger';
 import { callbacks } from '../../../lib/callbacks';
 import { sleep } from '../../../lib/utils/sleep';
 import { createRoom } from '../../lib/server/functions/createRoom';
 import { sendMessage } from '../../lib/server/functions/sendMessage';
 import { setUserAvatar } from '../../lib/server/functions/setUserAvatar';
 import { settings } from '../../settings/server';
-import { rocketLogger } from './logger';
 
 export default class RocketAdapter {
 	constructor(slackBridge) {
diff --git a/apps/meteor/app/slackbridge/server/SlackAdapter.js b/apps/meteor/app/slackbridge/server/SlackAdapter.js
index 0263d5369a4c..46a5ab6d35b5 100644
--- a/apps/meteor/app/slackbridge/server/SlackAdapter.js
+++ b/apps/meteor/app/slackbridge/server/SlackAdapter.js
@@ -8,6 +8,8 @@ import { App as SlackApp } from '@slack/bolt';
 import { RTMClient } from '@slack/rtm-api';
 import { Meteor } from 'meteor/meteor';
 
+import { SlackAPI } from './SlackAPI';
+import { slackLogger } from './logger';
 import { saveRoomName, saveRoomTopic } from '../../channel-settings/server';
 import { FileUpload } from '../../file-upload/server';
 import { addUserToRoom } from '../../lib/server/functions/addUserToRoom';
@@ -20,8 +22,6 @@ import { updateMessage } from '../../lib/server/functions/updateMessage';
 import { executeSetReaction } from '../../reactions/server/setReaction';
 import { settings } from '../../settings/server';
 import { getUserAvatarURL } from '../../utils/server/getUserAvatarURL';
-import { SlackAPI } from './SlackAPI';
-import { slackLogger } from './logger';
 
 export default class SlackAdapter {
 	constructor(slackBridge) {
@@ -987,7 +987,7 @@ export default class SlackAdapter {
 				const rocketChannel = await this.rocket.getChannel(slackMessage);
 				const rocketUser = slackMessage.previous_message.user
 					? (await this.rocket.findUser(slackMessage.previous_message.user)) ||
-					  (await this.rocket.addUser(slackMessage.previous_message.user))
+						(await this.rocket.addUser(slackMessage.previous_message.user))
 					: null;
 
 				const rocketMsgObj = {
diff --git a/apps/meteor/app/slackbridge/server/slackbridge.js b/apps/meteor/app/slackbridge/server/slackbridge.js
index b5983e7fff58..89ff66a13397 100644
--- a/apps/meteor/app/slackbridge/server/slackbridge.js
+++ b/apps/meteor/app/slackbridge/server/slackbridge.js
@@ -1,9 +1,9 @@
 import { debounce } from 'lodash';
 
-import { settings } from '../../settings/server';
 import RocketAdapter from './RocketAdapter.js';
 import SlackAdapter from './SlackAdapter.js';
 import { classLogger, connLogger } from './logger';
+import { settings } from '../../settings/server';
 
 /**
  * SlackBridge interfaces between this Rocket installation and a remote Slack installation.
diff --git a/apps/meteor/app/slackbridge/server/slackbridge_import.server.js b/apps/meteor/app/slackbridge/server/slackbridge_import.server.js
index 2cac64433cb5..6e7117af976a 100644
--- a/apps/meteor/app/slackbridge/server/slackbridge_import.server.js
+++ b/apps/meteor/app/slackbridge/server/slackbridge_import.server.js
@@ -2,10 +2,10 @@ import { Rooms, Users } from '@rocket.chat/models';
 import { Random } from '@rocket.chat/random';
 import { Match } from 'meteor/check';
 
+import { SlackBridge } from './slackbridge';
 import { i18n } from '../../../server/lib/i18n';
 import { msgStream } from '../../lib/server';
 import { slashCommands } from '../../utils/server/slashCommand';
-import { SlackBridge } from './slackbridge';
 
 async function SlackBridgeImport({ command, params, message, userId }) {
 	if (command !== 'slackbridge-import' || !Match.test(params, String)) {
diff --git a/apps/meteor/app/slashcommands-hide/server/hide.ts b/apps/meteor/app/slashcommands-hide/server/hide.ts
index bc614b95e8ed..636974297914 100644
--- a/apps/meteor/app/slashcommands-hide/server/hide.ts
+++ b/apps/meteor/app/slashcommands-hide/server/hide.ts
@@ -41,7 +41,7 @@ slashCommands.add({
 					: await Rooms.findOne({
 							t: 'd',
 							usernames: { $all: [user.username, strippedRoom] },
-					  });
+						});
 			if (!roomObject) {
 				void api.broadcast('notify.ephemeralMessage', user._id, message.rid, {
 					msg: i18n.t('Channel_doesnt_exist', {
diff --git a/apps/meteor/app/slashcommands-inviteall/server/server.ts b/apps/meteor/app/slashcommands-inviteall/server/server.ts
index e74bb89899c2..436d283d4b5a 100644
--- a/apps/meteor/app/slashcommands-inviteall/server/server.ts
+++ b/apps/meteor/app/slashcommands-inviteall/server/server.ts
@@ -64,20 +64,20 @@ function inviteAll<T extends string>(type: T): SlashCommand<T>['callback'] {
 			return;
 		}
 
-		const cursor = Subscriptions.findByRoomIdWhenUsernameExists(baseChannel._id, {
-			projection: { 'u.username': 1 },
-		});
-
 		try {
 			const APIsettings = settings.get<number>('API_User_Limit');
 			if (!APIsettings) {
 				return;
 			}
-			if ((await cursor.count()) > APIsettings) {
+			if ((await Subscriptions.countByRoomIdWhenUsernameExists(baseChannel._id)) > APIsettings) {
 				throw new Meteor.Error('error-user-limit-exceeded', 'User Limit Exceeded', {
 					method: 'addAllToRoom',
 				});
 			}
+
+			const cursor = Subscriptions.findByRoomIdWhenUsernameExists(baseChannel._id, {
+				projection: { 'u.username': 1 },
+			});
 			const users = (await cursor.toArray()).map((s: ISubscription) => s.u.username).filter(isTruthy);
 
 			if (!targetChannel && ['c', 'p'].indexOf(baseChannel.t) > -1) {
diff --git a/apps/meteor/app/slashcommands-open/client/client.ts b/apps/meteor/app/slashcommands-open/client/client.ts
index 99438a24eeb0..b0d4d45c22bb 100644
--- a/apps/meteor/app/slashcommands-open/client/client.ts
+++ b/apps/meteor/app/slashcommands-open/client/client.ts
@@ -3,7 +3,7 @@ import type { Mongo } from 'meteor/mongo';
 
 import { roomCoordinator } from '../../../client/lib/rooms/roomCoordinator';
 import { router } from '../../../client/providers/RouterProvider';
-import { Subscriptions, ChatSubscription } from '../../models/client';
+import { Subscriptions } from '../../models/client';
 import { sdk } from '../../utils/client/lib/SDKClient';
 import { slashCommands } from '../../utils/client/slashCommand';
 
@@ -23,7 +23,7 @@ slashCommands.add({
 			...(type && { t: { $in: type } }),
 		};
 
-		const subscription = ChatSubscription.findOne(query);
+		const subscription = Subscriptions.findOne(query);
 
 		if (subscription) {
 			roomCoordinator.openRouteLink(subscription.t, subscription, router.getSearchParameters());
diff --git a/apps/meteor/app/slashcommands-topic/client/topic.ts b/apps/meteor/app/slashcommands-topic/client/topic.ts
index f7e47c334b5a..bc32cacd65bd 100644
--- a/apps/meteor/app/slashcommands-topic/client/topic.ts
+++ b/apps/meteor/app/slashcommands-topic/client/topic.ts
@@ -3,7 +3,7 @@ import type { SlashCommandCallbackParams } from '@rocket.chat/core-typings';
 import { dispatchToastMessage } from '../../../client/lib/toast';
 import { callbacks } from '../../../lib/callbacks';
 import { hasPermission } from '../../authorization/client';
-import { ChatRoom } from '../../models/client/models/ChatRoom';
+import { Rooms } from '../../models/client/models/Rooms';
 import { sdk } from '../../utils/client/lib/SDKClient';
 import { slashCommands } from '../../utils/client/slashCommand';
 
@@ -13,7 +13,7 @@ slashCommands.add({
 		if (hasPermission('edit-room', message.rid)) {
 			try {
 				await sdk.call('saveRoomSettings', message.rid, 'roomTopic', params);
-				await callbacks.run('roomTopicChanged', ChatRoom.findOne(message.rid));
+				await callbacks.run('roomTopicChanged', Rooms.findOne(message.rid));
 			} catch (error: unknown) {
 				dispatchToastMessage({ type: 'error', message: error });
 				throw error;
diff --git a/apps/meteor/app/smarsh-connector/server/functions/generateEml.ts b/apps/meteor/app/smarsh-connector/server/functions/generateEml.ts
index ce110cbff430..cf0b7deab5db 100644
--- a/apps/meteor/app/smarsh-connector/server/functions/generateEml.ts
+++ b/apps/meteor/app/smarsh-connector/server/functions/generateEml.ts
@@ -3,10 +3,10 @@ import { Meteor } from 'meteor/meteor';
 import moment from 'moment';
 import 'moment-timezone';
 
+import { sendEmail } from './sendEmail';
 import { i18n } from '../../../../server/lib/i18n';
 import { settings } from '../../../settings/server';
 import { MessageTypes } from '../../../ui-utils/server';
-import { sendEmail } from './sendEmail';
 
 const start =
 	'<table style="width: 100%; border: 1px solid; border-collapse: collapse; table-layout: fixed; margin-top: 10px; font-size: 12px; word-break: break-word;"><tbody>';
diff --git a/apps/meteor/app/smarsh-connector/server/startup.ts b/apps/meteor/app/smarsh-connector/server/startup.ts
index f757dea7510b..edd4be457082 100644
--- a/apps/meteor/app/smarsh-connector/server/startup.ts
+++ b/apps/meteor/app/smarsh-connector/server/startup.ts
@@ -1,8 +1,8 @@
 import { cronJobs } from '@rocket.chat/cron';
 
+import { generateEml } from './functions/generateEml';
 import { smarshIntervalValuesToCronMap } from '../../../server/settings/smarsh';
 import { settings } from '../../settings/server';
-import { generateEml } from './functions/generateEml';
 
 const smarshJobName = 'Smarsh EML Connector';
 
diff --git a/apps/meteor/app/statistics/server/functions/otrStats.ts b/apps/meteor/app/statistics/server/functions/otrStats.ts
index f936f8d213f7..6553cae42c05 100644
--- a/apps/meteor/app/statistics/server/functions/otrStats.ts
+++ b/apps/meteor/app/statistics/server/functions/otrStats.ts
@@ -1,7 +1,7 @@
 import { Rooms } from '@rocket.chat/models';
 
-import telemetryEvent from '../lib/telemetryEvents';
 import { updateCounter } from './updateStatsCounter';
+import telemetryEvent from '../lib/telemetryEvents';
 
 type otrDataType = { rid: string };
 
diff --git a/apps/meteor/app/statistics/server/functions/sendUsageReport.ts b/apps/meteor/app/statistics/server/functions/sendUsageReport.ts
index a4b1e6182c96..c39276be6f35 100644
--- a/apps/meteor/app/statistics/server/functions/sendUsageReport.ts
+++ b/apps/meteor/app/statistics/server/functions/sendUsageReport.ts
@@ -1,3 +1,4 @@
+import type { IStats } from '@rocket.chat/core-typings';
 import type { Logger } from '@rocket.chat/logger';
 import { Statistics } from '@rocket.chat/models';
 import { serverFetch as fetch } from '@rocket.chat/server-fetch';
@@ -7,32 +8,53 @@ import { Meteor } from 'meteor/meteor';
 import { statistics } from '..';
 import { getWorkspaceAccessToken } from '../../../cloud/server';
 
-export async function sendUsageReport(logger: Logger): Promise<string | undefined> {
-	return tracerSpan('generateStatistics', {}, async () => {
-		const cronStatistics = await statistics.save();
+async function sendStats(logger: Logger, cronStatistics: IStats): Promise<string | undefined> {
+	try {
+		const token = await getWorkspaceAccessToken();
+		const headers = { ...(token && { Authorization: `Bearer ${token}` }) };
 
-		try {
-			const token = await getWorkspaceAccessToken();
-			const headers = { ...(token && { Authorization: `Bearer ${token}` }) };
+		const response = await fetch('https://collector.rocket.chat/', {
+			method: 'POST',
+			body: {
+				...cronStatistics,
+				host: Meteor.absoluteUrl(),
+			},
+			headers,
+		});
+
+		const { statsToken } = await response.json();
+
+		if (statsToken != null) {
+			await Statistics.updateOne({ _id: cronStatistics._id }, { $set: { statsToken } });
+			return statsToken;
+		}
+	} catch (err) {
+		logger.error({ msg: 'Failed to send usage report', err });
+	}
+}
 
-			const response = await fetch('https://collector.rocket.chat/', {
-				method: 'POST',
-				body: {
-					...cronStatistics,
-					host: Meteor.absoluteUrl(),
-				},
-				headers,
-			});
+export async function sendUsageReport(logger: Logger): Promise<string | undefined> {
+	return tracerSpan('generateStatistics', {}, async () => {
+		const last = await Statistics.findLast();
+		if (last) {
+			const yesterday = new Date();
+			yesterday.setDate(yesterday.getDate() - 1);
 
-			const { statsToken } = await response.json();
+			// if the last data we have has less than 24h and was not sent to yet, send it
+			if (last.createdAt > yesterday) {
+				// but if it has the confirmation token, we can skip
+				if (last.statsToken) {
+					return last.statsToken;
+				}
 
-			if (statsToken != null) {
-				await Statistics.updateOne({ _id: cronStatistics._id }, { $set: { statsToken } });
-				return statsToken;
+				// if it doesn't it means the request failed, so we try sending again with the same data
+				return sendStats(logger, last);
 			}
-		} catch (error) {
-			/* error*/
-			logger.warn('Failed to send usage report');
 		}
+
+		// if our latest stats has more than 24h, it is time to generate a new one and send it
+		const cronStatistics = await statistics.save();
+
+		return sendStats(logger, cronStatistics);
 	});
 }
diff --git a/apps/meteor/app/statistics/server/functions/slashCommandsStats.ts b/apps/meteor/app/statistics/server/functions/slashCommandsStats.ts
index 6d973a64c6be..5cb9e26d6d57 100644
--- a/apps/meteor/app/statistics/server/functions/slashCommandsStats.ts
+++ b/apps/meteor/app/statistics/server/functions/slashCommandsStats.ts
@@ -1,5 +1,5 @@
-import telemetryEvent from '../lib/telemetryEvents';
 import { updateCounter } from './updateStatsCounter';
+import telemetryEvent from '../lib/telemetryEvents';
 
 type slashCommandsDataType = { command: string };
 
diff --git a/apps/meteor/app/statistics/server/lib/SAUMonitor.ts b/apps/meteor/app/statistics/server/lib/SAUMonitor.ts
index 0db63a929491..e1cdab7f0773 100644
--- a/apps/meteor/app/statistics/server/lib/SAUMonitor.ts
+++ b/apps/meteor/app/statistics/server/lib/SAUMonitor.ts
@@ -6,11 +6,11 @@ import mem from 'mem';
 import { Meteor } from 'meteor/meteor';
 import UAParser from 'ua-parser-js';
 
+import { UAParserMobile, UAParserDesktop } from './UAParserCustom';
 import { getMostImportantRole } from '../../../../lib/roles/getMostImportantRole';
 import { getClientAddress } from '../../../../server/lib/getClientAddress';
 import { aggregates } from '../../../../server/models/raw/Sessions';
 import { sauEvents } from '../../../../server/services/sauMonitor/events';
-import { UAParserMobile, UAParserDesktop } from './UAParserCustom';
 
 type DateObj = { day: number; month: number; year: number };
 
diff --git a/apps/meteor/app/statistics/server/lib/statistics.ts b/apps/meteor/app/statistics/server/lib/statistics.ts
index 84b8f23f7790..25d93a6985c3 100644
--- a/apps/meteor/app/statistics/server/lib/statistics.ts
+++ b/apps/meteor/app/statistics/server/lib/statistics.ts
@@ -2,7 +2,7 @@ import { log } from 'console';
 import os from 'os';
 
 import { Analytics, Team, VideoConf, Presence } from '@rocket.chat/core-services';
-import type { IRoom, IStats } from '@rocket.chat/core-typings';
+import type { IRoom, IStats, ISetting } from '@rocket.chat/core-typings';
 import { UserStatus } from '@rocket.chat/core-typings';
 import {
 	NotificationQueue,
@@ -29,6 +29,10 @@ import {
 import { MongoInternals } from 'meteor/mongo';
 import moment from 'moment';
 
+import { getAppsStatistics } from './getAppsStatistics';
+import { getStatistics as getEnterpriseStatistics } from './getEEStatistics';
+import { getImporterStatistics } from './getImporterStatistics';
+import { getServicesStatistics } from './getServicesStatistics';
 import { readSecondaryPreferred } from '../../../../server/database/readSecondaryPreferred';
 import { isRunningMs } from '../../../../server/lib/isRunningMs';
 import { getControl } from '../../../../server/lib/migrations';
@@ -38,10 +42,6 @@ import { getStatistics as federationGetStatistics } from '../../../federation/se
 import { settings } from '../../../settings/server';
 import { Info } from '../../../utils/rocketchat.info';
 import { getMongoInfo } from '../../../utils/server/functions/getMongoInfo';
-import { getAppsStatistics } from './getAppsStatistics';
-import { getStatistics as getEnterpriseStatistics } from './getEEStatistics';
-import { getImporterStatistics } from './getImporterStatistics';
-import { getServicesStatistics } from './getServicesStatistics';
 
 const getUserLanguages = async (totalUsers: number): Promise<{ [key: string]: number }> => {
 	const result = await Users.getUserLanguages();
@@ -92,7 +92,7 @@ export const statistics = {
 		};
 
 		// Version
-		const uniqueID = await Settings.findOne('uniqueID');
+		const uniqueID = await Settings.findOne<Pick<ISetting, 'createdAt'>>('uniqueID', { projection: { createdAt: 1 } });
 		statistics.uniqueId = settings.get('uniqueID');
 		if (uniqueID) {
 			statistics.installedAt = uniqueID.createdAt.toISOString();
@@ -126,10 +126,10 @@ export const statistics = {
 
 		// Room statistics
 		statistics.totalRooms = await Rooms.col.countDocuments({});
-		statistics.totalChannels = await Rooms.findByType('c').count();
-		statistics.totalPrivateGroups = await Rooms.findByType('p').count();
-		statistics.totalDirect = await Rooms.findByType('d').count();
-		statistics.totalLivechat = await Rooms.findByType('l').count();
+		statistics.totalChannels = await Rooms.countByType('c');
+		statistics.totalPrivateGroups = await Rooms.countByType('p');
+		statistics.totalDirect = await Rooms.countByType('d');
+		statistics.totalLivechat = await Rooms.countByType('l');
 		statistics.totalDiscussions = await Rooms.countDiscussions();
 		statistics.totalThreads = await Messages.countThreads();
 
@@ -183,7 +183,7 @@ export const statistics = {
 
 		// Number of triggers
 		statsPms.push(
-			LivechatTrigger.col.count().then((count) => {
+			LivechatTrigger.estimatedDocumentCount().then((count) => {
 				statistics.totalTriggers = count;
 			}),
 		);
@@ -205,13 +205,13 @@ export const statistics = {
 
 		// Number of Email Inboxes
 		statsPms.push(
-			EmailInbox.col.count().then((count) => {
+			EmailInbox.estimatedDocumentCount().then((count) => {
 				statistics.emailInboxes = count;
 			}),
 		);
 
 		statsPms.push(
-			LivechatBusinessHours.col.count().then((count) => {
+			LivechatBusinessHours.estimatedDocumentCount().then((count) => {
 				statistics.BusinessHours = {
 					// Number of Business Hours
 					total: count,
@@ -326,8 +326,7 @@ export const statistics = {
 			room: IRoom,
 		) {
 			return num + (room.prid ? room.msgs : 0);
-		},
-		0);
+		}, 0);
 		statistics.totalPrivateGroupMessages =
 			(await privateGroups.reduce(function _countPrivateGroupMessages(num: number, room: IRoom) {
 				return num + room.msgs;
@@ -520,7 +519,7 @@ export const statistics = {
 		);
 
 		statsPms.push(
-			NotificationQueue.col.estimatedDocumentCount().then((count) => {
+			NotificationQueue.estimatedDocumentCount().then((count) => {
 				statistics.pushQueue = count;
 			}),
 		);
@@ -546,27 +545,27 @@ export const statistics = {
 		statistics.messageAuditLoad = settings.get('Message_Auditing_Panel_Load_Count');
 		statistics.joinJitsiButton = settings.get('Jitsi_Click_To_Join_Count');
 		statistics.slashCommandsJitsi = settings.get('Jitsi_Start_SlashCommands_Count');
-		statistics.totalOTRRooms = await Rooms.findByCreatedOTR().count();
+		statistics.totalOTRRooms = await Rooms.countByCreatedOTR({ readPreference });
 		statistics.totalOTR = settings.get('OTR_Count');
-		statistics.totalBroadcastRooms = await Rooms.findByBroadcast().count();
+		statistics.totalBroadcastRooms = await Rooms.countByBroadcast({ readPreference });
 		statistics.totalTriggeredEmails = settings.get('Triggered_Emails_Count');
 		statistics.totalRoomsWithStarred = await Messages.countRoomsWithStarredMessages({ readPreference });
 		statistics.totalRoomsWithPinned = await Messages.countRoomsWithPinnedMessages({ readPreference });
 		statistics.totalUserTOTP = await Users.countActiveUsersTOTPEnable({ readPreference });
 		statistics.totalUserEmail2fa = await Users.countActiveUsersEmail2faEnable({ readPreference });
-		statistics.totalPinned = await Messages.findPinned({ readPreference }).count();
-		statistics.totalStarred = await Messages.findStarred({ readPreference }).count();
-		statistics.totalLinkInvitation = await Invites.find().count();
+		statistics.totalPinned = await Messages.countPinned({ readPreference });
+		statistics.totalStarred = await Messages.countStarred({ readPreference });
+		statistics.totalLinkInvitation = await Invites.estimatedDocumentCount();
 		statistics.totalLinkInvitationUses = await Invites.countUses();
 		statistics.totalEmailInvitation = settings.get('Invitation_Email_Count');
-		statistics.totalE2ERooms = await Rooms.findByE2E({ readPreference }).count();
+		statistics.totalE2ERooms = await Rooms.countByE2E({ readPreference });
 		statistics.logoChange = Object.keys(settings.get('Assets_logo') || {}).includes('url');
 		statistics.showHomeButton = settings.get('Layout_Show_Home_Button');
 		statistics.totalEncryptedMessages = await Messages.countByType('e2e', { readPreference });
 		statistics.totalManuallyAddedUsers = settings.get('Manual_Entry_User_Count');
-		statistics.totalSubscriptionRoles = await RolesRaw.findByScope('Subscriptions').count();
-		statistics.totalUserRoles = await RolesRaw.findByScope('Users').count();
-		statistics.totalCustomRoles = await RolesRaw.findCustomRoles({ readPreference }).count();
+		statistics.totalSubscriptionRoles = await RolesRaw.countByScope('Subscriptions', { readPreference });
+		statistics.totalUserRoles = await RolesRaw.countByScope('Users', { readPreference });
+		statistics.totalCustomRoles = await RolesRaw.countCustomRoles({ readPreference });
 		statistics.totalWebRTCCalls = settings.get('WebRTC_Calls_Count');
 		statistics.uncaughtExceptionsCount = settings.get('Uncaught_Exceptions_Count');
 
diff --git a/apps/meteor/app/theme/client/imports/components/emoji.css b/apps/meteor/app/theme/client/imports/components/emoji.css
index 5180c05c5f5c..58668075584d 100644
--- a/apps/meteor/app/theme/client/imports/components/emoji.css
+++ b/apps/meteor/app/theme/client/imports/components/emoji.css
@@ -1,21 +1,16 @@
 .emoji {
 	position: relative;
-
 	display: inline-block;
 	overflow: hidden;
-
 	width: 1.375rem;
 	height: 1.375rem;
 	margin: 0 0.15em;
-
 	vertical-align: middle;
 	white-space: nowrap;
 	text-indent: 100%;
-
 	background-repeat: no-repeat;
 	background-position: center;
 	background-size: contain;
-
 	font-size: inherit;
 	line-height: normal;
 	image-rendering: auto;
diff --git a/apps/meteor/app/theme/client/imports/components/flex-nav.css b/apps/meteor/app/theme/client/imports/components/flex-nav.css
index c521fc6a49b2..6db8bf21ee94 100644
--- a/apps/meteor/app/theme/client/imports/components/flex-nav.css
+++ b/apps/meteor/app/theme/client/imports/components/flex-nav.css
@@ -3,12 +3,9 @@
 	z-index: 3;
 	top: 0;
 	left: 0;
-
 	width: 100%;
 	height: 100%;
-
 	transition: transform 0.15s cubic-bezier(0.5, 0, 0.1, 1);
-
 	background-color: var(--flex-nav-background);
 	will-change: transform;
 
diff --git a/apps/meteor/app/theme/client/imports/components/loading.css b/apps/meteor/app/theme/client/imports/components/loading.css
index a6ff93cc4fb7..d3212475d393 100644
--- a/apps/meteor/app/theme/client/imports/components/loading.css
+++ b/apps/meteor/app/theme/client/imports/components/loading.css
@@ -1,51 +1,44 @@
-.loading__animation {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}
-
-.loading__animation__bounce {
-	display: inline-block;
-
-	width: 1rem;
-	height: 1rem;
-	margin: 2px;
-
-	animation: loading-bouncedelay 1.4s infinite ease-in-out both;
-
-	-webkit-animation-delay: -0.32s;
-	animation-delay: -0.32s;
-
-	border-radius: 100%;
-	background-color: var(--loading-bounce-color-light);
-
-	@media (prefers-color-scheme: dark) {
-		background: var(--loading-bounce-color-dark);
+.loading {
+	&__animation {
+		display: flex;
+		align-items: center;
+		justify-content: center;
 	}
-}
-
-.loading__animation__bounce--medium {
-	display: inline-block;
 
-	width: 1.25rem;
-	height: 1.25rem;
-}
+	&__animation__bounce {
+		display: inline-block;
+		width: 1rem;
+		height: 1rem;
+		margin: 2px;
+		animation: loading-bouncedelay 1.4s infinite ease-in-out both;
+		animation-delay: -0.32s;
+		border-radius: 100%;
+		background-color: var(--loading-bounce-color-light);
+
+		@media (prefers-color-scheme: dark) {
+			background: var(--loading-bounce-color-dark);
+		}
+	}
 
-.loading__animation__bounce--large {
-	display: inline-block;
+	&__animation__bounce--medium {
+		display: inline-block;
+		width: 1.25rem;
+		height: 1.25rem;
+	}
 
-	width: 1.5rem;
-	height: 1.5rem;
-}
+	&__animation__bounce--large {
+		display: inline-block;
+		width: 1.5rem;
+		height: 1.5rem;
+	}
 
-.loading__animation__bounce + .loading__animation__bounce {
-	-webkit-animation-delay: -0.16s;
-	animation-delay: -0.16s;
-}
+	&__animation__bounce + &__animation__bounce {
+		animation-delay: -0.16s;
+	}
 
-.loading__animation__bounce + .loading__animation__bounce + .loading__animation__bounce {
-	-webkit-animation-delay: 0s;
-	animation-delay: 0s;
+	&__animation__bounce + &__animation__bounce + &__animation__bounce {
+		animation-delay: 0s;
+	}
 }
 
 @keyframes loading-bouncedelay {
diff --git a/apps/meteor/app/theme/client/imports/components/main-content.css b/apps/meteor/app/theme/client/imports/components/main-content.css
index 4c01f982ee36..3fd983bff8f4 100644
--- a/apps/meteor/app/theme/client/imports/components/main-content.css
+++ b/apps/meteor/app/theme/client/imports/components/main-content.css
@@ -1,14 +1,10 @@
 .main-content {
 	position: relative;
-
 	z-index: 0;
-
 	display: flex;
 	flex-direction: column;
 	flex: 1 1 100%;
-
 	width: 1vw;
-
 	height: 100%;
 }
 
diff --git a/apps/meteor/app/theme/client/imports/components/message-box.css b/apps/meteor/app/theme/client/imports/components/message-box.css
index 877a643e114f..f55a49f4ec37 100644
--- a/apps/meteor/app/theme/client/imports/components/message-box.css
+++ b/apps/meteor/app/theme/client/imports/components/message-box.css
@@ -1,114 +1,6 @@
 .rc-message-box {
 	position: relative;
-
 	width: 100%;
 	padding: 0 24px;
-
 	font-size: var(--message-box-text-size);
-
-	&__toolbar-formatting-item {
-		display: flex;
-
-		min-width: 16px;
-		margin: 0 4px;
-
-		transition: color 0.1s;
-
-		color: var(--message-box-markdown-color);
-		align-items: center;
-		justify-content: center;
-
-		&:hover,
-		&:focus,
-		&.active {
-			color: var(--message-box-markdown-hover-color);
-		}
-	}
-
-	&__toolbar-formatting-link {
-		color: currentColor;
-
-		font-size: 0.75rem;
-	}
-
-	&__audio-message {
-		display: flex;
-
-		&-mic {
-			display: flex;
-		}
-
-		&-done,
-		&-cancel,
-		&-timer {
-			display: none;
-		}
-
-		&-done {
-			color: var(--rc-color-success);
-		}
-
-		&-cancel {
-			color: var(--rc-color-error);
-		}
-
-		&-timer {
-			margin: 0 -0.25rem;
-			align-items: center;
-			justify-content: center;
-
-			&-dot,
-			&-text {
-				margin: 0 0.25rem;
-			}
-
-			&-text {
-				min-width: 3em;
-			}
-
-			&-dot {
-				flex: 0 0 auto;
-
-				width: 0.5rem;
-				height: 0.5rem;
-
-				border-radius: 50%;
-				background-color: red;
-			}
-		}
-
-		&--recording {
-			.rc-message-box__audio-message-mic,
-			.rc-message-box__audio-message-loading {
-				display: none;
-			}
-
-			.rc-message-box__audio-message-done,
-			.rc-message-box__audio-message-cancel,
-			.rc-message-box__audio-message-timer {
-				display: flex;
-			}
-		}
-
-		&--loading {
-			.rc-message-box__audio-message-mic,
-			.rc-message-box__audio-message-done,
-			.rc-message-box__audio-message-cancel,
-			.rc-message-box__audio-message-timer {
-				display: none;
-			}
-
-			.rc-message-box__audio-message-loading {
-				display: flex;
-			}
-		}
-
-		&--busy {
-			.rc-message-box__audio-message-mic {
-				cursor: not-allowed;
-
-				opacity: 0.5;
-			}
-		}
-	}
 }
diff --git a/apps/meteor/app/theme/client/imports/components/messages.css b/apps/meteor/app/theme/client/imports/components/messages.css
deleted file mode 100644
index 34ae60609df0..000000000000
--- a/apps/meteor/app/theme/client/imports/components/messages.css
+++ /dev/null
@@ -1,67 +0,0 @@
-.messages-container-wrapper {
-	position: relative;
-}
-
-.message-actions {
-	position: absolute;
-	z-index: 2;
-	top: -28px;
-	right: 0.4rem;
-
-	display: none;
-
-	box-sizing: border-box;
-
-	padding: 2px;
-
-	user-select: none;
-
-	color: var(--color-darkest);
-
-	border: 1px solid #f2f3f7;
-	border-radius: 4px;
-
-	background: var(rcx-surface, #ffffff);
-
-	font-size: 1.25rem;
-
-	&__buttons {
-		display: flex;
-	}
-
-	&__button,
-	&__menu {
-		padding: 2px;
-
-		cursor: pointer;
-
-		&:hover {
-			border-radius: 2px;
-			background: #eeeff1;
-		}
-
-		&-icon {
-			fill: currentColor;
-		}
-	}
-}
-
-.rc-ui-kit {
-	display: inline-block;
-
-	width: 100%;
-
-	max-width: 400px;
-}
-
-.rtl .message-actions {
-	right: auto;
-	left: 2px;
-}
-
-.message-popup .rcx-message-attachment {
-	overflow-y: auto !important;
-
-	max-width: 100% !important;
-	max-height: 200px !important;
-}
diff --git a/apps/meteor/app/theme/client/imports/components/modal.css b/apps/meteor/app/theme/client/imports/components/modal.css
deleted file mode 100644
index 50cdb198b072..000000000000
--- a/apps/meteor/app/theme/client/imports/components/modal.css
+++ /dev/null
@@ -1,168 +0,0 @@
-.rc-modal {
-	display: flex;
-	flex-direction: column;
-
-	min-width: 400px;
-	max-width: 500px;
-	height: auto;
-	max-height: 90%;
-
-	padding: 1rem;
-
-	animation: dropdown-show 0.3s cubic-bezier(0.45, 0.05, 0.55, 0.95);
-
-	border: none;
-
-	background: white;
-
-	box-shadow: 0 0 2px 0 rgba(47, 52, 61, 0.08), 0 0 12px 0 rgba(47, 52, 61, 0.12);
-
-	&-wrapper {
-		position: fixed;
-		z-index: 10;
-		top: 0;
-		right: 0;
-		bottom: 0;
-		left: 0;
-
-		display: flex;
-
-		padding: 10px;
-
-		background: rgba(47, 52, 61, 0.8);
-		align-items: center;
-		justify-content: center;
-	}
-
-	&--modal {
-		width: 640px;
-		max-width: 100%;
-	}
-
-	&--modal &__title {
-		font-size: 1.375rem;
-		font-weight: 500;
-	}
-
-	&__description {
-		font-size: 0.874rem;
-		margin-block-end: 1.5rem;
-		margin-block-start: 0.5rem;
-	}
-
-	&__title {
-		flex: 1 1 auto;
-
-		font-size: 1rem;
-	}
-
-	&__close {
-		cursor: pointer;
-		transform: rotate(45deg);
-
-		font-size: 20px;
-	}
-
-	&__header {
-		display: flex;
-		flex-direction: row;
-		flex: 0 0 auto;
-
-		margin-bottom: -16px;
-		padding: 16px;
-
-		font-size: 21px;
-		justify-content: flex-end;
-	}
-
-	&__content {
-		position: relative;
-
-		display: flex;
-
-		overflow: hidden auto;
-
-		flex-direction: column;
-
-		min-height: 72px;
-		max-height: 90%;
-
-		padding: 16px;
-
-		animation: dropdown-show 0.1s cubic-bezier(0.45, 0.05, 0.55, 0.95);
-		align-items: stretch;
-	}
-
-	&__content-icon {
-		margin: 1.2rem auto;
-
-		font-size: 6rem;
-
-		&--modal-warning {
-			color: var(--rc-color-alert);
-		}
-
-		&--modal-success {
-			color: var(--rc-color-success-light);
-		}
-
-		&--modal-info {
-			color: var(--rc-color-alert);
-		}
-
-		&--modal-error {
-			color: var(--rc-color-error-light);
-		}
-	}
-
-	&__content-text {
-		text-align: center;
-		word-break: break-word;
-
-		font-size: 1rem;
-		line-height: 1.5;
-	}
-
-	&__content-error {
-		display: none;
-
-		width: 100%;
-		margin: 0.5rem 0;
-
-		text-align: center;
-		word-break: break-word;
-
-		color: var(--color-white);
-		background: var(--rc-color-error);
-
-		line-height: 2;
-	}
-
-	&__footer {
-		display: flex;
-
-		flex: 0 0 auto;
-
-		padding: 1rem;
-
-		justify-content: space-between;
-
-		& > .rc-button {
-			margin: 0;
-		}
-	}
-}
-
-@media (width <= 400px) {
-	.rc-modal {
-		top: 0 !important;
-		bottom: 0;
-		left: 0 !important;
-
-		width: 100%;
-		min-width: 100%;
-		max-width: 100%;
-
-		animation: dropup-show 0.3s cubic-bezier(0.45, 0.05, 0.55, 0.95);
-	}
-}
diff --git a/apps/meteor/app/theme/client/imports/forms/button.css b/apps/meteor/app/theme/client/imports/forms/button.css
deleted file mode 100644
index 463ed17346ca..000000000000
--- a/apps/meteor/app/theme/client/imports/forms/button.css
+++ /dev/null
@@ -1,219 +0,0 @@
-.rc-button {
-	&:not([disabled]):hover {
-		opacity: 0.6;
-	}
-
-	&--icon > svg {
-		margin: 0 5px 0 -5px;
-
-		font-size: 20px;
-		fill: currentColor;
-
-		.rtl & {
-			margin: 0 -5px 0 5px;
-		}
-	}
-
-	position: relative;
-
-	display: flex;
-
-	height: 40px;
-
-	min-height: 40px;
-
-	padding: 0 1.5rem;
-
-	cursor: pointer;
-	transition: opacity 0.3s, background-color 0.3s, color 0.3s;
-	text-align: center;
-
-	color: #000000;
-
-	border-width: var(--button-border-width);
-	border-style: solid;
-	border-color: #000000;
-
-	border-radius: var(--button-border-radius);
-	background-color: transparent;
-
-	font-size: var(--button-text-size);
-	font-weight: 600;
-
-	align-items: center;
-	justify-content: center;
-
-	&:active,
-	&:focus:hover {
-		outline: none;
-	}
-
-	&:active {
-		transform: translateY(2px);
-
-		opacity: 0.9;
-	}
-
-	&:active::before {
-		top: -2px;
-	}
-
-	&:disabled {
-		cursor: default;
-
-		color: var(--button-disabled-text-color);
-		border: 0;
-		border-color: var(--button-disabled-background);
-		background-color: var(--button-disabled-background);
-	}
-
-	&--invisible {
-		visibility: hidden;
-	}
-
-	&--primary {
-		color: var(--button-primary-text-color);
-		border: 0;
-		background-color: var(--button-primary-background);
-	}
-
-	&--nude {
-		border: none;
-		background-color: inherit;
-
-		font-weight: 400;
-	}
-
-	&--primary.rc-button--nude {
-		color: var(--button-primary-background);
-	}
-
-	&--primary.rc-button--outline {
-		color: var(--button-primary-background);
-		border-color: var(--button-primary-background);
-	}
-
-	&--secondary {
-		color: var(--button-secondary-text-color);
-		border: 0;
-		border-color: var(--button-secondary-background);
-		background-color: var(--button-secondary-background);
-	}
-
-	&--secondary.rc-button--outline {
-		color: var(--button-secondary-background);
-		border-color: var(--button-secondary-background);
-	}
-
-	&--cancel {
-		color: var(--button-primary-text-color);
-		border: 0;
-		border-color: var(--button-cancel-color);
-		background-color: var(--button-cancel-color);
-	}
-
-	&--cancel.rc-button--outline {
-		color: var(--button-cancel-color);
-		border-color: var(--button-cancel-color);
-	}
-
-	&--small {
-		height: var(--button-height-small);
-		min-height: var(--button-height-small);
-		padding: var(--button-padding-small);
-
-		font-size: var(--button-text-size-small);
-	}
-
-	&--square {
-		display: flex;
-		flex: 0 0 var(--button-square-size);
-
-		margin: 0;
-		padding: 0;
-		align-items: center;
-		justify-content: center;
-	}
-
-	&--outline {
-		border-width: 2px;
-		border-style: solid;
-		background: transparent;
-	}
-
-	&--stack {
-		width: 100%;
-	}
-
-	&--no-padding {
-		padding-right: 0;
-		padding-left: 0;
-	}
-
-	&.loading {
-		position: relative;
-
-		padding-right: calc(3 * 0.782rem);
-
-		transition: padding-right 0.3s;
-
-		&::before {
-			position: absolute;
-			top: 25%;
-			right: 0.782rem;
-
-			display: block;
-
-			width: 20px;
-			height: 20px;
-
-			content: "";
-			animation: spin 1s infinite cubic-bezier(0.14, 0.48, 0.45, 0.63);
-
-			border: 0.15rem solid rgba(127, 127, 127, 0.5);
-			border-top-color: white;
-			border-radius: 50%;
-		}
-	}
-
-	&__group {
-		display: flex;
-
-		flex-direction: row;
-
-		margin: 10px -5px;
-
-		justify-content: flex-end;
-
-		& > .rc-button {
-			margin: 0 5px;
-		}
-
-		&--wrap {
-			margin: 5px -5px;
-			flex-wrap: wrap;
-
-			& > .rc-button {
-				margin: 5px;
-			}
-		}
-
-		&--stretch {
-			justify-content: stretch;
-
-			& > .rc-button {
-				flex: 1 1;
-			}
-		}
-
-		&--vertical {
-			flex-direction: column;
-		}
-	}
-}
-
-@media (width < 780px) {
-	.rc-button--full {
-		width: 100%;
-	}
-}
diff --git a/apps/meteor/app/theme/client/imports/forms/input.css b/apps/meteor/app/theme/client/imports/forms/input.css
deleted file mode 100644
index 21ef11f574fa..000000000000
--- a/apps/meteor/app/theme/client/imports/forms/input.css
+++ /dev/null
@@ -1,245 +0,0 @@
-textarea.rc-input__element {
-	height: auto;
-	padding: 0.5rem 1rem;
-
-	font-family: inherit;
-}
-
-.rc-input {
-	position: relative;
-
-	width: 100%;
-
-	&__label {
-		display: block;
-
-		cursor: pointer;
-	}
-
-	&__title {
-		font-size: var(--input-font-size);
-	}
-
-	&__wrapper {
-		position: relative;
-
-		padding: 0.5rem 0;
-
-		color: var(--input-icon-color);
-	}
-
-	&__icon {
-		position: absolute;
-		top: 0;
-		left: 1rem;
-
-		display: flex;
-
-		width: 20px;
-		height: 100%;
-
-		cursor: default;
-		align-items: center;
-		justify-content: center;
-
-		& + .rc-input__element {
-			padding: 0 1rem 0 2.75rem;
-		}
-
-		&--right {
-			right: 1rem;
-			left: auto;
-		}
-
-		&--clickable {
-			cursor: pointer;
-		}
-
-		&--right + .rc-input__element {
-			padding: 0 2.75rem 0 1rem;
-		}
-	}
-
-	&__element {
-		width: 100%;
-		height: 2.5rem;
-		padding: 0 1rem;
-
-		text-align: start;
-
-		text-overflow: ellipsis;
-
-		color: var(--input-text-color);
-
-		border-width: var(--input-border-width);
-		border-color: var(--input-border-color);
-		border-radius: var(--input-border-radius);
-		background-color: transparent;
-
-		font-size: var(--input-font-size);
-		line-height: normal;
-
-		&--small {
-			height: 2rem;
-		}
-
-		&::placeholder {
-			text-align: start;
-			text-overflow: ellipsis;
-
-			color: var(--input-placeholder-color);
-		}
-
-		&[type=color] {
-			height: 45px;
-		}
-	}
-
-	&__description {
-		margin-bottom: 0.25rem;
-
-		color: var(--input-description-text-color);
-
-		font-size: var(--input-description-text-size);
-	}
-
-	&__error {
-		display: flex;
-
-		color: var(--input-error-color);
-		align-items: center;
-
-		&-icon {
-			width: 20px;
-
-			&--warning {
-				width: 20px;
-				height: 20px;
-				stroke: currentColor;
-			}
-		}
-
-		&-message {
-			margin-left: 0.5rem;
-		}
-	}
-
-	&--small {
-		font-size: 14px;
-
-		& .rc-input__element {
-			padding-top: 8px;
-			padding-bottom: 8px;
-		}
-	}
-
-	&--error {
-		.rc-tags {
-			border-color: var(--input-error-color);
-		}
-
-		& .rc-input {
-			&__element {
-				border-color: var(--input-error-color);
-			}
-		}
-	}
-}
-
-.rc-input-file {
-	position: relative;
-
-	width: 100%;
-
-	&__label {
-		display: block;
-
-		cursor: pointer;
-	}
-
-	&__title {
-		font-size: var(--input-font-size);
-	}
-
-	&__wrapper {
-		display: flex;
-		flex-direction: row;
-
-		width: 100%;
-		margin: 0.5rem 0;
-		padding: 0.3rem;
-
-		color: var(--input-text-color);
-
-		border-width: var(--input-border-width);
-		border-color: var(--input-border-color);
-		border-radius: var(--input-border-radius);
-		background-color: transparent;
-
-		font-size: var(--input-font-size);
-		align-items: center;
-		justify-content: flex-end;
-
-		&::placeholder {
-			color: var(--input-placeholder-color);
-		}
-
-		& > .rc-button {
-			flex: 0 0 auto;
-
-			height: 10px;
-			min-height: 31px;
-			margin: 0;
-			padding: 8px;
-
-			border-color: #e1e5e8;
-			border-radius: 2px;
-			background: #f1f1f1;
-		}
-	}
-
-	&__name {
-		overflow: hidden;
-
-		flex: 0 1 auto;
-
-		width: 100%;
-
-		padding: 0 5px;
-
-		white-space: nowrap;
-
-		text-overflow: ellipsis;
-
-		line-height: 16px;
-	}
-
-	&__element {
-		display: none;
-	}
-
-	&__description {
-		color: var(--color-gray);
-
-		font-size: 0.875rem;
-	}
-}
-
-select.rc-input {
-	width: 100%;
-	padding: 0.782rem;
-
-	color: var(--input-text-color);
-
-	border-width: var(--input-border-width);
-	border-color: var(--input-border-color);
-	border-radius: var(--input-border-radius);
-	background-color: transparent;
-
-	font-size: var(--input-font-size);
-	appearance: none;
-
-	&--small {
-		padding: 0.5rem 1rem;
-	}
-}
diff --git a/apps/meteor/app/theme/client/imports/general/base.css b/apps/meteor/app/theme/client/imports/general/base.css
index 9aa9b6c5ea9f..0f1f90c91355 100644
--- a/apps/meteor/app/theme/client/imports/general/base.css
+++ b/apps/meteor/app/theme/client/imports/general/base.css
@@ -6,7 +6,6 @@
 
 html {
 	overflow-y: auto;
-
 	height: 100%;
 
 	&.noscroll {
@@ -16,17 +15,12 @@ html {
 
 body {
 	position: relative;
-
 	display: flex;
-
 	overflow: visible;
-
 	flex-direction: column;
-
 	width: 100%;
 	height: 100%;
 	padding: 0;
-
 	font-family: var(--body-font-family);
 	font-size: var(--text-small-size);
 	-webkit-font-smoothing: antialiased;
@@ -45,43 +39,32 @@ body {
 	&::after {
 		display: table;
 		clear: both;
-
 		content: '';
 	}
 }
 
 button {
 	padding: 0;
-
 	cursor: pointer;
 	text-align: left;
 	text-transform: inherit;
-
 	color: inherit;
 	border-width: 0;
 	background: none;
-
 	font-style: inherit;
 }
 
 #rocket-chat {
 	position: relative;
-
 	display: flex;
-
 	overflow: hidden;
-
 	flex: 1 1 auto;
-
 	height: 100%;
-
 	max-height: 100%;
-
 	align-items: stretch;
 
 	&.animated-hidden {
 		visibility: hidden;
-
 		opacity: 0;
 	}
 }
@@ -96,37 +79,25 @@ button {
 
 @media print {
 	#rocket-chat.menu-nav,
-	.simplebar-content-wrapper,
-	section.rcx-box.rcx-box--full,
-	.rc-old.main-content {
+	.main-content {
 		overflow: visible !important; /* 1 */
-
 		height: auto !important; /* 1 */
 		max-height: none !important; /* 1 */
 		flex-shrink: 0 !important; /* 1 */
 	}
 
-	div.simplebar-offset,
-	.simplebar-mask,
-	.rc-old .messages-container .wrapper {
+	.messages-container .wrapper {
 		position: relative !important; /* 1 */
 	}
 
-	.simplebar-placeholder {
-		height: 0 !important; /* 1 */
-	}
-
 	body {
 		height: auto !important; /* 1 */
 	}
 
-	.rc-old .room-container,
-	.rc-old .room-container:first-child,
-	.rc-old .messages-container-main,
-	.rc-old .messages-container-wrapper,
-	.rc-old .main-content-flex {
+	.messages-container-main,
+	.messages-container-wrapper,
+	.main-content-flex {
 		flex: 1 0 auto !important; /* 1 */
-
 		height: auto !important; /* 1 */
 	}
 
@@ -134,15 +105,15 @@ button {
 		display: none !important; /* 1 */
 	}
 
-	.rcx-box.rcx-box--full {
-		overflow: visible !important /* 1 */;
-
-		height: auto !important /* 1 */;
+	.rcx-box {
+		&--full.rcx-box {
+			overflow: visible !important /* 1 */;
+			height: auto !important /* 1 */;
+		}
 	}
 
 	.rc-scrollbars-container {
 		overflow: visible !important; /* 1 */
-
 		height: auto !important; /* 1 */
 	}
 
@@ -153,6 +124,5 @@ button {
 
 .gallery-item {
 	max-width: 100%;
-
 	cursor: pointer;
 }
diff --git a/apps/meteor/app/theme/client/imports/general/base_old.css b/apps/meteor/app/theme/client/imports/general/base_old.css
index 3120d9c05ff0..5b924491b54e 100644
--- a/apps/meteor/app/theme/client/imports/general/base_old.css
+++ b/apps/meteor/app/theme/client/imports/general/base_old.css
@@ -1,730 +1,37 @@
-.rc-old .no-scroll {
-	overflow: hidden !important;
-}
-
-.rc-old code {
-	margin: 5px 0;
-	padding: 0.5em;
-
-	text-align: left;
-	vertical-align: middle;
-	white-space: pre-wrap;
-	word-wrap: break-word;
-
-	border-width: 1px;
-	border-radius: var(--border-radius);
-
-	font-family: Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New', monospace;
-	font-size: 13px;
-	font-weight: 600;
-	direction: ltr;
-	unicode-bidi: embed;
-
-	&.inline {
-		display: inline;
-
-		padding: 0.05rem 0.2rem;
-
-		line-height: 1.25rem;
-	}
-}
-
-.rc-old code.hljs {
-	overflow-y: hidden;
-}
-
-.rc-old pre {
-	display: inline-block;
-
-	width: 100%;
-}
-
-.rc-old blockquote {
-	position: relative;
-
-	display: block;
-
-	clear: both;
-
-	min-height: 20px;
-
-	padding-left: 10px;
-
-	&::after {
-		display: table;
-		clear: both;
-
-		content: '';
-	}
-
-	&:first-child::before {
-		border-radius: 2px 2px 0 0;
-	}
-
-	&:last-child::before {
-		border-radius: 0 0 2px 2px;
-	}
-
-	&::before {
-		position: absolute;
-		top: 0;
-		bottom: 0;
-		left: 0;
-
-		width: 2px;
-
-		content: ' ';
-	}
-}
-
-.rc-old .login-terms {
-	width: 520px;
-	max-width: 100%;
-	margin: auto;
-	padding: 10px;
-
-	font-size: smaller;
-
-	& a {
-		font-weight: bold !important;
-	}
-}
-
-.upload-preview {
-	& .upload-preview-file {
-		height: 200px;
-
-		background-repeat: no-repeat;
-		background-position: center center;
-		background-size: contain;
-	}
-}
-
-.upload-preview-title {
-	padding: 3px;
-
-	border-radius: 0 0 5px 5px;
-}
-
-.copyonly {
-	display: none;
-
-	width: 0;
-	height: 0;
-
-	user-select: none;
-	vertical-align: baseline;
-
-	font-size: 0;
-	-moz-box-orient: vertical;
-
-	code & {
-		float: left;
-	}
-}
-
-.rc-old .full-page .hidden {
-	display: none !important;
-	visibility: hidden !important;
-}
-
-.rc-old .hidden {
-	display: none !important;
-}
-
-.rc-old .page-container {
-	position: absolute;
-	top: 0;
-	left: 0;
-
-	display: flex;
-
-	overflow-y: hidden;
-	flex-direction: column;
-
-	width: 100%;
-	height: 100%;
-
-	padding: 1.25rem;
-
-	& .content {
-		display: flex;
-		overflow-y: auto;
-		flex-direction: column;
-		flex: 1 1 auto;
-
-		margin: 0 -1.25rem;
-		padding: 1.25rem 1.25rem 0;
-
-		line-height: 1.3em;
-		-webkit-overflow-scrolling: touch;
-
-		& fieldset {
-			margin-bottom: 1em;
-		}
-
-		& .rocket-form {
-			& fieldset {
-				display: block;
-
-				margin: 1em 0 1.5em;
-
-				& small {
-					font-size: 11px;
-				}
-			}
-
-			& legend {
-				position: relative;
-
-				display: block;
-
-				width: 100%;
-				margin: 12px 0;
-
-				font-weight: bold;
-
-				& h3 {
-					margin-bottom: 5px !important;
-				}
-			}
-
-			& .submit {
-				margin-top: 20px;
-
-				text-align: right;
-			}
-		}
-	}
-}
-
-.rc-old .input-line {
-	display: block;
-	clear: both;
-
-	margin-bottom: 12px;
-
-	&::after {
-		display: table;
-		clear: both;
-
-		content: '';
-	}
-
-	&:nth-last-child(1) {
-		margin-bottom: 0;
-	}
-
-	&.search {
-		& i {
-			position: absolute;
-			top: 10px;
-			left: 7px;
-		}
-
-		& .icon-spin {
-			right: 5px;
-			left: auto;
-
-			animation-name: spin;
-			animation-duration: 2000ms;
-			animation-timing-function: linear;
-			animation-iteration-count: infinite;
-
-			font-weight: 400;
-		}
-
-		& input {
-			padding-left: 30px;
-		}
-	}
-
-	& > label {
-		display: block;
-
-		margin-bottom: 4px;
-	}
-
-	& > div {
-		position: relative;
-
-		& .right {
-			position: absolute;
-			z-index: 10;
-			top: 10px;
-			right: 10px;
-		}
-	}
-
-	& > div.-autocomplete-container {
-		position: absolute;
-	}
-
-	& input[type='text'] {
-		display: block;
-	}
-}
-
-.rc-old form.inline {
-	& input[type='text'],
-	& input[type='number'],
-	& input[type='email'],
-	& input[type='url'],
-	& input[type='password'],
-	& select {
-		width: auto;
-	}
-}
-
-.rc-old .-autocomplete-container {
-	top: auto;
-
-	width: 100%;
-
-	border-width: 0;
-	border-radius: 0;
-	box-shadow: 1px 1px 0 rgba(0, 0, 0, 0.2);
-
-	& p {
-		padding: 8px;
-
-		font-size: 14px;
-	}
-
-	& .loading-animation {
-		position: relative;
-
-		min-height: 60px;
-	}
-}
-
-.rc-old .-autocomplete-item {
-	padding: 8px 5px;
-
-	cursor: pointer;
-
-	font-size: 12px;
-}
-
-.rc-old label.required::after {
-	content: ' *';
-}
-
-.rc-old.flex-nav {
-	position: fixed;
-	z-index: 3;
-	top: 0;
-	left: 0;
-
-	overflow-x: hidden;
-	overflow-y: auto;
-
-	width: var(--rooms-box-width);
-	height: 100%;
-
-	transition: transform 0.15s cubic-bezier(0.5, 0, 0.1, 1);
-
-	&.animated-hidden {
-		transform: translateX(-100%);
-
-		& header,
-		& footer,
-		& .content {
-			transform: translateX(-100%);
-		}
-	}
-
-	& header,
-	& footer,
-	& .content {
-		transition: transform 0.425s cubic-bezier(0, 0.8, 0.05, 1);
-	}
-
-	& > section {
-		position: absolute;
-		top: 0;
-		left: 0;
-
-		width: 100%;
-		height: 100%;
-	}
-
-	& header {
-		position: absolute;
-		z-index: 110;
-		top: 0;
-		left: 0;
-
-		display: table;
-
-		width: 100%;
-		height: var(--header-min-height);
-		min-height: var(--header-min-height);
-		padding-left: 15px;
-
-		cursor: pointer;
-
-		& > div {
-			display: table-cell;
-
-			text-align: left;
-			vertical-align: middle;
-		}
-
-		& h4 {
-			position: relative;
-
-			overflow: hidden;
-
-			margin-top: 2px;
-
-			text-overflow: ellipsis;
-
-			font-size: 20px;
-			font-weight: 300;
-			line-height: 24px;
-		}
-
-		& p {
-			margin-top: 4px;
-
-			font-size: 13px;
-			font-weight: 400;
-			line-height: 18px;
-		}
-	}
-
-	& footer {
-		position: absolute;
-		z-index: 120;
-		bottom: 0;
-		left: 0;
-
-		display: table;
-
-		width: 100%;
-		height: var(--footer-min-height);
-		padding: 0 10px;
-
-		text-align: left;
-
-		& > div {
-			display: table-cell;
-
-			text-align: left;
-			vertical-align: middle;
-		}
-	}
-
-	& .content {
-		position: absolute;
-		top: var(--header-min-height);
-
-		display: block;
-		overflow-x: hidden;
-		overflow-y: auto;
-
-		width: 100%;
-		height: calc(100% - calc(var(--header-min-height) + var(--footer-min-height)));
-		padding: 20px 10px;
-		direction: rtl;
-		-webkit-overflow-scrolling: touch;
-
-		& > .wrapper {
-			direction: ltr;
-		}
-
-		& h4 {
-			margin-bottom: 30px;
-
-			text-transform: uppercase;
-
-			font-size: 13px;
-			font-weight: 400;
-		}
-	}
-
-	& .input-line {
-		margin-bottom: 25px;
-
-		&:nth-last-child(1) {
-			margin-bottom: 0;
-		}
-
-		& label {
-			margin-bottom: 0;
-
-			font-weight: 400;
-		}
-
-		& input[type='text'],
-		& input[type='password'],
-		& select {
-			padding: 0 8px 0 30px;
-
-			border-width: 1px;
-			border-radius: var(--border-radius);
-			box-shadow: 0 0 0;
-			appearance: none;
-		}
-
-		& .inline-fields {
-			& input,
-			& label,
-			& select {
-				display: inline-block;
-			}
-		}
-
-		&.toggle {
-			font-size: 0;
-
-			& > label {
-				display: inline-block;
-
-				width: calc(100% - 40px);
-
-				vertical-align: top;
-
-				font-size: 14px;
-			}
-
-			& > div {
-				display: inline-block;
-
-				width: 40px;
-			}
-		}
-
-		&.no-icon input {
-			padding: 0 8px;
-		}
-	}
-
-	& .selected-users {
-		padding: 20px 0 0;
-
-		& li {
-			display: inline-block;
-
-			margin-right: 2px;
-			margin-bottom: 2px;
-			padding: 5px;
-		}
-
-		& i {
-			cursor: pointer;
-		}
-	}
-}
-
-.rc-old .new-room-highlight a {
-	animation: highlight 6s infinite;
-}
-
-/* MAIN CONTENT + MAIN PAGES */
-
-.rc-old .page-settings {
-	& .settings-file-preview {
-		display: flex;
-		align-items: center;
-
-		& input[type='file'] {
-			position: absolute !important;
-			z-index: 10000;
-			top: 0;
-			left: 0;
-
-			width: 100%;
-			height: 100%;
-
-			cursor: pointer;
-
-			opacity: 0;
-
-			& * {
-				cursor: pointer;
-			}
-		}
-
-		& .preview {
-			overflow: hidden;
-
-			width: 100px;
-			height: 40px;
-
-			margin-right: 0.75rem;
-
-			border-width: var(--input-border-width);
-			border-color: var(--input-border-color);
-			border-radius: var(--input-border-radius);
-
-			background-repeat: no-repeat;
-			background-position: center center;
-			background-size: contain;
-
-			&.no-file {
-				display: flex;
-
-				align-items: center;
-				justify-content: center;
-			}
-		}
-	}
-}
-
-.rc-old .room-not-found {
-	display: flex;
-	flex-direction: column;
-
-	font-size: 30px;
-	align-items: center;
-	justify-content: center;
-
-	& div {
-		text-align: center;
-
-		line-height: 40px;
-	}
-
-	& i {
-		padding-bottom: 30px;
-
-		font-size: 100px;
-	}
-}
-
-.rc-old .container-bars {
-	position: relative;
-	z-index: 2;
-
+.copyonly {
 	display: none;
-	visibility: hidden;
-	overflow: hidden;
-	flex-direction: column;
-
-	margin: 8px 10px 0;
-
-	transition: transform 0.4s ease, visibility 0.3s ease, opacity 0.3s ease;
-	transform: translateY(-10px);
-
-	opacity: 0;
-	border-radius: var(--border-radius);
-	box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.2), 0 2px 10px 0 rgba(0, 0, 0, 0.16);
-
-	font-size: 1em;
-	font-weight: bold;
-
-	&.show {
-		display: flex;
-		visibility: visible;
-
-		transform: translateY(0);
-
-		opacity: 1;
-	}
-
-	& > div {
-		padding: 0 10px;
-
-		line-height: 28px;
-	}
-
-	& .upload-progress {
-		position: relative;
-
-		display: flex;
-
-		height: 28px;
-
-		& .upload-progress-progress {
-			position: absolute;
-			z-index: 1;
-			left: 0;
-
-			width: 0%;
-			height: 100%;
-
-			transition: width, 1s, ease-out;
-		}
-
-		& .upload-progress-text {
-			z-index: 2;
-			right: 0;
-			left: 0;
-
-			overflow: hidden;
-
-			width: 50%;
-
-			height: 100%;
-			padding: 0 10px;
-
-			white-space: nowrap;
-			text-overflow: ellipsis;
-			flex-grow: 1;
-
-			& > a {
-				float: right;
-
-				cursor: pointer;
-				text-transform: uppercase;
-			}
-		}
-
-		& .upload-progress-close {
-			position: relative;
-			z-index: 3;
-
-			float: right;
-
-			height: 100%;
-
-			text-transform: uppercase;
+	width: 0;
+	height: 0;
+	user-select: none;
+	vertical-align: baseline;
+	font-size: 0;
+	-moz-box-orient: vertical;
 
-			font-weight: bold;
-		}
+	code & {
+		float: left;
 	}
 }
 
-.rc-old .flex-tab-main-content {
-	position: relative;
-	z-index: 1;
-
-	overflow: auto;
-	flex-grow: 1;
-}
-
-.rc-old .room-container {
-	height: 100%;
-}
-
 /* change to page-messages */
 
-.rc-old .messages-container {
+.messages-container {
 	position: relative;
-
 	display: flex;
 	flex-direction: column;
 	flex: 1;
-
 	width: 100%;
 
 	&-wrapper {
 		display: flex;
-
 		flex: 1 1 auto;
-
 		height: 1%;
 	}
 
 	&-main {
 		position: relative;
-
 		display: flex;
 		flex-direction: column;
 		flex: 1 1 auto;
-
 		width: 50%;
 	}
 
@@ -732,13 +39,9 @@
 		position: absolute;
 		top: 0;
 		left: 0;
-
-		overflow-x: hidden;
-		overflow-y: auto;
-
+		overflow: hidden auto;
 		width: 100%;
 		height: 100%;
-
 		word-wrap: break-word;
 		-webkit-overflow-scrolling: touch;
 	}
@@ -748,23 +51,8 @@
 	}
 }
 
-.rc-old .preview-items .popup-item {
-	margin: 2px;
-
-	padding: 0;
-
-	cursor: pointer;
-
-	user-select: none;
-
-	border: solid 1px transparent;
-
-	line-height: initial;
-}
-
 .messages-box {
 	position: relative;
-
 	overflow: hidden;
 	flex-grow: 1;
 
@@ -775,392 +63,289 @@
 	& ul.messages-list {
 		padding: 21px 0 10px;
 	}
-
-	& .editing .body {
-		border-radius: var(--border-radius);
-	}
-}
-
-.rcx-message {
-	&.highlight {
-		animation: highlight 6s;
-	}
-}
-
-.rc-old .attachment-description {
-	margin: 6px;
-
-	line-height: 1;
-}
-
-/* FLEX-TAB and FLEX-TAB views */
-.rc-old .main-content-flex {
-	display: flex;
-
-	height: 100%;
-	flex-grow: 1;
 }
 
-.page-loading {
-	position: absolute;
-	top: 0;
-	right: 0;
-	bottom: 0;
-	left: 0;
-
-	display: flex;
-
-	text-align: center;
-
-	background-color: var(--page-loading-background-light);
-
-	align-items: center;
-	justify-content: center;
-
-	@media (prefers-color-scheme: dark) {
-		background: var(--page-loading-background-dark);
-	}
+.highlight-text {
+	padding: 0 2px 2px;
+	color: var(--rcx-color-font-pure-white, #ffffff);
+	border-radius: var(--border-radius);
+	background-color: var(--rcx-color-badge-background-level-4, #f5455c);
 }
 
-.rc-old.full-page {
-	display: flex;
-	overflow: auto;
-
+.inline-video {
 	width: 100%;
-	min-height: 100%;
-	margin: auto;
-
-	text-align: center;
-
-	background-repeat: no-repeat;
-	background-attachment: fixed;
-
-	background-position: center;
-	background-size: cover;
-	align-items: flex-start;
-	flex-flow: row nowrap;
-
-	& .wrapper {
-		position: relative;
-		z-index: 10;
-
-		width: 100%;
-		margin: auto;
-		padding: 20px;
-
-		text-align: center;
-	}
-
-	& .logo {
-		display: block;
-
-		width: 100%;
-		max-width: 520px;
-		margin: 0 auto;
-		padding: 0 20px;
-
-		& > img {
-			position: relative;
-			z-index: 20;
-			top: 0;
-			right: 0;
-
-			display: inline-block;
-
-			max-width: 100%;
-			max-height: 150px;
-		}
-	}
-
-	& a:not(.rcx-box) {
-		font-weight: 300;
-	}
-
-	& .cell {
-		display: table-cell;
-
-		text-align: center;
-		vertical-align: middle;
-	}
-
-	& header:not(.rcx-box) {
-		position: relative;
-		z-index: 1;
-
-		display: block;
-
-		max-width: 520px;
-		margin: auto;
-		padding: 0 20px;
-	}
-
-	& .text {
-		position: relative;
-		z-index: 1;
-
-		max-width: 580px;
-		margin: 0 auto 25px;
-
-		font-weight: 300;
-
-		& .button {
-			margin-top: 20px;
-			padding: 16px 20px;
-
-			font-weight: 400;
-		}
-
-		& h1 {
-			display: none;
-
-			margin-bottom: 20px;
-
-			letter-spacing: -0.5px;
-			text-transform: uppercase;
-
-			font-size: 24px;
-			font-weight: 600;
-		}
-
-		& h2 {
-			margin: 18px 0;
-
-			letter-spacing: -0.5px;
-			text-transform: uppercase;
-
-			font-size: 20px;
-			font-weight: 300;
-		}
-
-		& h3 {
-			margin: 18px 0;
-
-			letter-spacing: -0.5px;
-			text-transform: uppercase;
-
-			font-size: 16px;
-			font-weight: 300;
-		}
-
-		& p {
-			margin: 18px 0;
-
-			font-size: 16px;
-			font-weight: 400;
-			line-height: 24px;
-		}
-	}
-
-	& footer {
-		position: relative;
-		z-index: 1;
-
-		padding: 20px 0 0;
-
-		& h4 {
-			margin-bottom: 8px;
-
-			text-transform: uppercase;
-
-			font-size: 12px;
-			font-weight: 300;
-		}
-	}
-
-	& .share {
-		min-height: 40px;
+	max-width: 480px;
+	height: auto;
+	max-height: 270px;
+}
 
-		border-radius: 50%;
+.load-more {
+	position: relative;
+	height: 2rem;
+}
 
-		line-height: 20px;
+.rcx-message {
+	&.highlight {
+		animation: highlight 6s;
+	}
+}
 
-		&::before {
-			border-radius: 50%;
-		}
+.page-loading {
+	position: absolute;
+	inset: 0;
+	display: flex;
+	text-align: center;
+	background-color: var(--page-loading-background-light);
+	align-items: center;
+	justify-content: center;
 
-		& span {
-			display: none;
-		}
+	@media (prefers-color-scheme: dark) {
+		background: var(--page-loading-background-dark);
 	}
 }
 
-.rc-old .highlight-text {
-	padding: 0 2px 2px;
-
-	color: var(--rcx-color-font-pure-white, #ffffff);
+/* FLEX-TAB and FLEX-TAB views */
+.main-content-flex {
+	display: flex;
+	height: 100%;
+	flex-grow: 1;
+}
 
-	border-radius: var(--border-radius);
-	background-color: var(--rcx-color-badge-background-level-4, #f5455c);
+.no-scroll {
+	overflow: hidden !important;
 }
 
-@keyframes zoomIn {
-	0% {
-		transform: scale3d(0.9, 0.9, 0.9);
+code {
+	margin: 5px 0;
+	padding: 0.5em;
+	text-align: left;
+	vertical-align: middle;
+	white-space: pre-wrap;
+	word-wrap: break-word;
+	border-width: 1px;
+	border-radius: var(--border-radius);
+	font-family: Menlo, Monaco, Consolas, 'Liberation Mono', 'Courier New', monospace;
+	font-size: 13px;
+	font-weight: 600;
+	direction: ltr;
+	unicode-bidi: embed;
 
-		opacity: 0;
+	&.inline {
+		display: inline;
+		padding: 0.05rem 0.2rem;
+		line-height: 1.25rem;
 	}
 
-	50% {
-		opacity: 1;
+	&.hljs {
+		overflow-y: hidden;
 	}
 }
 
-.rc-old .touch .footer {
-	padding-right: 10px;
-	padding-left: 10px;
+pre {
+	display: inline-block;
+	width: 100%;
 }
 
-.rc-old .alert-icon {
+blockquote {
+	position: relative;
 	display: block;
+	clear: both;
+	min-height: 20px;
+	padding-left: 10px;
+
+	&::after {
+		display: table;
+		clear: both;
+		content: '';
+	}
 
-	margin-bottom: 20px;
+	&::before {
+		position: absolute;
+		top: 0;
+		bottom: 0;
+		left: 0;
+		width: 2px;
+		content: ' ';
+	}
 
-	font-size: 80px;
+	&:first-child::before {
+		border-radius: 2px 2px 0 0;
+	}
+
+	&:last-child::before {
+		border-radius: 0 0 2px 2px;
+	}	
 }
 
-.rc-old .inline-video {
-	width: 100%;
-	max-width: 480px;
-	height: auto;
-	max-height: 270px;
+.new-room-highlight a {
+	animation: highlight 6s infinite;
 }
 
-.rc-old .attention-message {
-	padding-top: 50px;
+.page-settings {
+	& .settings-file-preview {
+		display: flex;
+		align-items: center;
 
-	font-size: 24px;
+		& input[type='file'] {
+			position: absolute !important;
+			z-index: 10000;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+			cursor: pointer;
+			opacity: 0;
 
-	& i {
-		display: block;
+			& * {
+				cursor: pointer;
+			}
+		}
+
+		& .preview {
+			overflow: hidden;
+			width: 100px;
+			height: 40px;
+			margin-right: 0.75rem;
+			border-width: var(--input-border-width);
+			border-color: var(--input-border-color);
+			border-radius: var(--input-border-radius);
+			background-repeat: no-repeat;
+			background-position: center center;
+			background-size: contain;
 
-		margin-bottom: 20px;
+			&.no-file {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+			}
+		}
+	}
+}
 
-		font-size: 40px;
+.room-not-found {
+	display: flex;
+	flex-direction: column;
+	font-size: 30px;
+	align-items: center;
+	justify-content: center;
+
+	& div {
+		text-align: center;
+		line-height: 40px;
 	}
 
-	& span {
-		display: block;
+	& i {
+		padding-bottom: 30px;
+		font-size: 100px;
 	}
 }
 
-.rc-old .load-more {
+.container-bars {
 	position: relative;
+	z-index: 2;
+	display: none;
+	visibility: hidden;
+	overflow: hidden;
+	flex-direction: column;
+	margin: 8px 10px 0;
+	transition: transform 0.4s ease, visibility 0.3s ease, opacity 0.3s ease;
+	transform: translateY(-10px);
+	opacity: 0;
+	border-radius: var(--border-radius);
+	box-shadow: 0 1px 1px 0 rgb(0 0 0 / 20%), 0 2px 10px 0 rgb(0 0 0 / 16%);
+	font-size: 1em;
+	font-weight: bold;
 
-	height: 2rem;
-}
+	&.show {
+		display: flex;
+		visibility: visible;
+		transform: translateY(0);
+		opacity: 1;
+	}
 
-.flex-tab.discussions > .flex-tab__content {
-	padding: 0;
-}
+	& > div {
+		padding: 0 10px;
+		line-height: 28px;
+	}
 
-.rc-old .flex-tab {
-	&__content {
+	& .upload-progress {
+		position: relative;
 		display: flex;
-		flex-direction: column;
+		height: 28px;
 
-		height: 100%;
-	}
+		& .upload-progress-progress {
+			position: absolute;
+			z-index: 1;
+			left: 0;
+			width: 0%;
+			height: 100%;
+			transition: width, 1s, ease-out;
+		}
 
-	&__header {
-		flex: 0 0 auto;
+		& .upload-progress-text {
+			z-index: 2;
+			right: 0;
+			left: 0;
+			overflow: hidden;
+			width: 50%;
+			height: 100%;
+			padding: 0 10px;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			flex-grow: 1;
 
-		padding-bottom: 10px;
-	}
+			& > a {
+				float: right;
+				cursor: pointer;
+				text-transform: uppercase;
+			}
+		}
 
-	&__result {
-		overflow-x: hidden;
-		overflow-y: auto;
-		flex: 1 1 auto;
+		& .upload-progress-close {
+			position: relative;
+			z-index: 3;
+			float: right;
+			height: 100%;
+			text-transform: uppercase;
+			font-weight: bold;
+		}
 	}
+}
 
-	& .no-results {
-		text-align: center;
-	}
+.flex-tab-main-content {
+	position: relative;
+	z-index: 1;
+	overflow: auto;
+	flex-grow: 1;
 }
 
-.rc-old .code-colors {
+.code-colors {
 	color: var(--rcx-color-font-default, #1f2329);
 	border-color: var(--rcx-color-stroke-extra-light, #ebecef);
 	background-color: var(--rcx-color-surface-neutral, #e4e7ea);
 }
 
-.rc-old .powered-by {
-	margin-top: 1em;
-}
-
-.rc-old .code-error-box {
-	& .title {
-		margin-top: 5px;
-		padding: 5px;
-
-		font-size: 16px;
-		font-weight: bold;
-	}
-
-	& .script-error {
-		padding: 6px;
-
-		border-left: 3px solid;
-
-		font-size: 12px;
-		font-weight: bold;
-	}
-}
-
-.rc-old .code-mirror-box {
-	& .CodeMirror {
+.code-mirror-box {
+	& .CodeMirror { /* stylelint-disable-line */
 		border-width: var(--input-border-width);
 		border-color: var(--input-border-color);
 		border-radius: var(--input-border-radius);
 	}
 
 	&.code-mirror-box-fullscreen {
-		& .CodeMirror {
+		& .CodeMirror { /* stylelint-disable-line */
 			display: flex;
 			flex-direction: column;
 			flex-grow: 1;
 
-			& .CodeMirror-scroll {
+			& .CodeMirror-scroll { /* stylelint-disable-line */
 				flex-grow: 1;
 			}
 		}
 	}
 }
 
-.rc-old .collapse-switch {
-	cursor: pointer;
-}
-
-.toggle-hidden {
-	cursor: pointer;
-
-	font-style: italic;
-}
-
-.rc-old .form-inline {
-	& input,
-	& select {
-		display: inline-block;
-
-		width: auto;
-
-		vertical-align: middle;
-	}
-
-	& label {
-		display: inline-block;
-
-		max-width: 100%;
-	}
-
-	& .form-group {
-		display: inline-block;
-
-		vertical-align: middle;
-	}
-}
-
-.rc-old .embedded-view {
+.embedded-view {
 	& .messages-container {
 		border-width: 0;
 
@@ -1183,52 +368,20 @@
 	}
 }
 
-.rc-old .user-info.deactivated {
-	text-decoration: line-through;
-
-	opacity: 0.8;
-}
-
-/* MEDIA QUERIES */
-
-@media (width <= 1100px) {
-	.rc-old .flex-tab-container.opened .flex-tab {
-		position: absolute;
-		z-index: 100;
-
-		right: 40px;
-
-		height: 100%;
-	}
-}
-
-@media (max-width: 767px) {
-	.rc-old.main-content {
+@media (width <= 767px) {
+	.main-content {
 		transition: right 0.25s cubic-bezier(0.5, 0, 0.1, 1), transform 0.1s linear;
 		will-change: transform;
 	}
 }
 
-@media (height <= 480px) {
-	.rc-old .oauth-login {
-		margin-bottom: 6px;
-	}
-}
-
-@media (width <= 440px) {
-	.rc-old .flex-tab-container.opened .flex-tab {
-		left: 0;
-
-		width: auto;
-	}
-
-	.flex-tab-container.opened {
-		left: 0;
+@keyframes zoom-in {
+	0% {
+		transform: scale3d(0.9, 0.9, 0.9);
+		opacity: 0;
 	}
-}
 
-@media (height <= 400px) {
-	.upload-preview .upload-preview-file {
-		height: 100px;
+	50% {
+		opacity: 1;
 	}
 }
diff --git a/apps/meteor/app/theme/client/imports/general/forms.css b/apps/meteor/app/theme/client/imports/general/forms.css
deleted file mode 100644
index e02c81b5b089..000000000000
--- a/apps/meteor/app/theme/client/imports/general/forms.css
+++ /dev/null
@@ -1,204 +0,0 @@
-.input {
-	&.checkbox.toggle {
-		position: relative;
-
-		min-height: 20px;
-
-		& input {
-			position: absolute;
-			z-index: -1;
-			top: 0;
-			left: 0;
-
-			width: 0;
-			height: 0;
-
-			opacity: 0;
-			outline: 0;
-
-			&:checked + label::after {
-				left: 25px;
-			}
-		}
-
-		& label {
-			display: block;
-
-			min-height: 20px;
-
-			cursor: pointer;
-			user-select: none;
-			vertical-align: top;
-
-			&::before {
-				position: absolute;
-				z-index: 0;
-				top: 0;
-				left: 0;
-
-				display: block;
-
-				width: 40px;
-				height: 16px;
-
-				content: '';
-				transition: background-color 0.2s ease-out;
-
-				border-radius: 50px;
-				box-shadow: none;
-			}
-
-			&::after {
-				position: absolute;
-				z-index: 1;
-				top: 1px;
-				left: 1px;
-
-				width: 14px;
-				height: 14px;
-
-				content: '';
-				transition: left 0.2s ease-out;
-
-				border-radius: 50%;
-			}
-		}
-	}
-}
-
-.rc-form-group {
-	margin-bottom: var(--gap-between-elements);
-
-	&--small {
-		margin-bottom: var(--default-small-padding);
-	}
-
-	&--inline {
-		display: flex;
-		flex-direction: row;
-
-		margin-right: -0.5rem;
-
-		margin-left: -0.5rem;
-
-		white-space: nowrap;
-		align-items: flex-end;
-	}
-
-	& > .rc-form-item-inline {
-		flex: 1 1 auto;
-
-		margin-right: 0.5rem;
-
-		margin-left: 0.5rem;
-
-		&--full {
-			flex: 0 0 100%;
-		}
-	}
-}
-
-.rc-form-label {
-	display: block;
-
-	margin-bottom: var(--label-margin-bottom);
-
-	cursor: pointer;
-
-	color: #2d343d;
-
-	font-size: var(--input-font-size);
-}
-
-.rc-form-fieldset {
-	padding: var(--default-padding);
-
-	border-width: var(--input-border-width);
-	border-color: var(--input-border-color);
-	border-radius: var(--input-border-radius);
-	background-color: transparent;
-
-	&--error {
-		color: var(--input-error-color);
-		border-color: var(--input-error-color);
-	}
-}
-
-.rc-form-legend {
-	margin: 0 -5px;
-
-	padding: 0 5px;
-
-	color: #2d343d;
-
-	font-size: 1rem;
-	font-weight: 500;
-}
-
-.rc-button-group {
-	display: flex;
-
-	margin: 0 calc(var(--default-small-padding) / -2);
-
-	& .rc-button {
-		margin: 0 calc(var(--default-small-padding) / 2);
-	}
-}
-
-.rc-grid {
-	display: flex;
-	align-items: flex-start;
-	flex-flow: row wrap;
-}
-
-.rc-w50 {
-	flex: 0 0 50%;
-
-	&.padded {
-		&:nth-child(odd) {
-			padding-right: 15px;
-		}
-
-		&:nth-child(even) {
-			padding-left: 15px;
-		}
-	}
-}
-
-@media (width <= 500px) {
-	.rc-grid {
-		display: flex;
-		flex-direction: column;
-		align-items: flex-start;
-	}
-
-	.rc-w50 {
-		flex: 0 0 100%;
-
-		&.padded {
-			&:nth-child(odd) {
-				padding-right: 0;
-			}
-
-			&:nth-child(even) {
-				padding-left: 0;
-			}
-		}
-	}
-}
-
-@keyframes spin {
-	0% {
-		transform: rotate(0deg);
-	}
-
-	100% {
-		transform: rotate(360deg);
-	}
-}
-
-@keyframes ellipsis {
-	to {
-		width: 1.25em;
-	}
-}
diff --git a/apps/meteor/app/theme/client/imports/general/react-root.css b/apps/meteor/app/theme/client/imports/general/react-root.css
index 8930a8bf05ed..4cca0ea5d52c 100644
--- a/apps/meteor/app/theme/client/imports/general/react-root.css
+++ b/apps/meteor/app/theme/client/imports/general/react-root.css
@@ -1,13 +1,10 @@
 #react-root {
 	position: relative;
-
 	display: flex;
 	overflow: visible;
 	flex-direction: column;
-
 	width: 100vw;
 	height: 100vh;
 	padding: 0;
-
 	block-size: -webkit-fill-available;
 }
diff --git a/apps/meteor/app/theme/client/imports/general/reset.css b/apps/meteor/app/theme/client/imports/general/reset.css
index 425d9ff98319..3ab7367d23f2 100644
--- a/apps/meteor/app/theme/client/imports/general/reset.css
+++ b/apps/meteor/app/theme/client/imports/general/reset.css
@@ -87,9 +87,7 @@ audio,
 video {
 	margin: 0;
 	padding: 0;
-
 	vertical-align: baseline;
-
 	border: 0 solid;
 
 	&::after,
@@ -134,6 +132,5 @@ q::after {
 
 table {
 	border-spacing: 0;
-
 	border-collapse: collapse;
 }
diff --git a/apps/meteor/app/theme/client/imports/general/theme_old.css b/apps/meteor/app/theme/client/imports/general/theme_old.css
index b054e601451b..9fe426b3df07 100644
--- a/apps/meteor/app/theme/client/imports/general/theme_old.css
+++ b/apps/meteor/app/theme/client/imports/general/theme_old.css
@@ -4,7 +4,6 @@
 	&::-webkit-scrollbar {
 		width: 6px;
 		height: 6px;
-
 		background: var(--transparent-dark);
 	}
 
@@ -22,15 +21,6 @@
 	background-color: var(--content-background-color);
 }
 
-:root {
-	--rcx-color-surface-light: var(--content-background-color);
-	--rcx-color-background-light: var(--content-background-color);
-}
-
-.primary-background-color {
-	background-color: var(--primary-background-color);
-}
-
 .color-primary-font-color {
 	color: var(--primary-font-color);
 }
@@ -39,127 +29,21 @@
 	color: var(--primary-action-color);
 }
 
-.secondary-background-color {
-	background-color: var(--secondary-background-color);
-}
-
-.border-secondary-background-color {
-	border-color: var(--secondary-background-color);
-}
-
 .secondary-font-color {
 	color: var(--secondary-font-color);
 }
 
-.border-component-color {
-	border-color: var(--component-color);
-}
-
 .background-component-color {
 	background-color: var(--component-color);
 }
 
-.color-component-color {
-	color: var(--component-color);
-}
-
-.filter-item {
-	&:hover {
-		border-color: var(--info-font-color);
-	}
-
-	&.active {
-		border-color: var(--primary-background-color);
-	}
-}
-
-input:-webkit-autofill {
-	color: var(--primary-font-color) !important;
-	background-color: transparent !important;
+.upload-progress-progress {
+	background-color: var(--success-background);
 }
 
 input,
 select,
 textarea {
-	color: var(--primary-font-color);
 	border-style: solid;
-	border-color: var(--input-border-color);
 	background-color: transparent;
-
-	&::placeholder {
-		color: var(--input-placeholder-color);
-	}
-
-	&[disabled]:not(.rcx-box--full) {
-		background-color: var(--button-disabled-background);
-	}
-}
-
-.disabled label,
-[disabled] label {
-	color: var(--input-placeholder-color);
-}
-
-.-autocomplete-container {
-	background-color: var(--popup-list-background);
-}
-
-.-autocomplete-item.selected {
-	background-color: var(--popup-list-selected-background);
-}
-
-.rc-old input[type='button'],
-.rc-old input[type='submit'] {
-	color: var(--button-secondary-text-color);
-	border-color: var(--button-secondary-background);
-	background: var(--button-secondary-background);
-}
-
-.flex-tab {
-	a i,
-	a[class^='icon-'] {
-		color: var(--primary-font-color);
-
-		&:hover {
-			opacity: 0.6;
-		}
-	}
-}
-
-.error {
-	border-color: var(--error-color);
-}
-
-.upload-progress-progress {
-	background-color: var(--success-background);
-}
-
-.popup-user-status-online,
-.status-online::after {
-	background-color: var(--rc-status-online);
-}
-
-label.required::after {
-	color: var(--error-color);
-}
-
-.main-content,
-.flex-tab {
-	.loading-animation > .bounce {
-		background-color: var(--primary-font-color);
-	}
-}
-
-.loading-animation.loading-animation--primary > .bounce {
-	background-color: var(--primary-font-color);
-}
-
-@keyframes blink {
-	from {
-		color: var(--selection-color);
-	}
-
-	to {
-		opacity: inherit;
-	}
 }
diff --git a/apps/meteor/app/theme/client/imports/general/variables.css b/apps/meteor/app/theme/client/imports/general/variables.css
index e8e06ac68f42..60f2a558be80 100644
--- a/apps/meteor/app/theme/client/imports/general/variables.css
+++ b/apps/meteor/app/theme/client/imports/general/variables.css
@@ -2,205 +2,45 @@
 	/*
 	* Color palette
 	*/
-	--color-dark-blue: #175cc4;
-	--color-blue: #1d74f5;
-	--color-light-blue: #4eb2f5;
-	--color-lighter-blue: #e8f2ff;
-	--color-purple: #861da8;
 	--color-red: #f5455c;
-	--color-dark-red: #e0364d;
-	--color-orange: #f38c39;
 	--color-yellow: #ffd21f;
-	--color-dark-yellow: #f6c502;
 	--color-green: #2de0a5;
 
 	/*
 	* General Colors
 	*/
-	--color-darkest: #1f2329;
-	--color-dark: #2f343d;
-	--color-dark-medium: #414852;
-	--color-dark-light: #6c727a;
 	--color-gray: #9ea2a8;
 	--color-gray-medium: #cbced1;
-	--color-gray-light: #e1e5e8;
 	--color-gray-lightest: #f2f3f5;
-	--color-black: #000000;
-	--color-white: #ffffff;
 
-	/* #region colors Colors */
+	/* Colors */
 	--rc-color-error: var(--color-red);
-	--rc-color-error-light: #e1364c;
 	--rc-color-alert: var(--color-yellow);
-	--rc-color-alert-light: var(--color-dark-yellow);
 	--rc-color-success: var(--color-green);
-	--rc-color-success-light: #25d198;
-	--rc-color-button-primary: var(--color-blue);
-	--rc-color-button-primary-light: var(--color-dark-blue);
-	--rc-color-alert-message-primary: var(--color-blue);
-	--rc-color-alert-message-primary-background: #f1f6ff;
-	--rc-color-alert-message-secondary: #7ca52b;
-	--rc-color-alert-message-secondary-background: #fafff1;
-	--rc-color-alert-message-warning: #d52d24;
-	--rc-color-alert-message-warning-background: #fff3f3;
-	--rc-color-primary: var(--color-dark);
-	--rc-color-primary-background: var(--color-dark);
-	--rc-color-primary-darkest: var(--color-darkest);
-	--rc-color-primary-dark: var(--color-dark-medium);
 	--rc-color-primary-light: var(--color-gray);
-	--rc-color-primary-light-medium: var(--color-gray-medium);
-	--rc-color-primary-lightest: var(--color-gray-lightest);
-	--rc-color-content: var(--color-white);
-	--rc-color-link-active: var(--rc-color-button-primary);
-	--rc-color-announcement-text: #095ad2;
-	--rc-color-announcement-background: #d1ebfe;
-	--rc-color-announcement-text-hover: #01336b;
-	--rc-color-announcement-background-hover: #76b7fc;
 
-	/* #endregion */
-
-	/* #region colors Old Colors */
+	/* Old Colors */
 	--content-background-color: #ffffff;
-	--primary-background-color: #04436a;
 	--primary-font-color: #444444;
 	--primary-action-color: #1d74f5;
-	--secondary-background-color: #f4f4f4;
 	--secondary-font-color: #a0a0a0;
-	--secondary-action-color: #dddddd;
 	--component-color: #f2f3f5;
-	--pending-color: #fcb316;
-	--error-color: #bc2031;
-	--success-color: #2de0a5;
-	--selection-color: #02acec;
-	--attention-color: #9c27b0;
-	--transparent-darker: rgba(0, 0, 0, 0.5);
-
-	/* #endregion */
-
-	/* #region less-colors Old Colors (minor) */
-	--tertiary-font-color: var(--transparent-lightest);
-	--link-font-color: var(--primary-action-color);
-	--info-font-color: var(--secondary-font-color);
-	--custom-scrollbar-color: var(--transparent-darker);
-
-	/* #endregion */
 
-	/* #region fonts Fonts */
-	--body-font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Helvetica Neue', 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Meiryo UI', Arial, sans-serif;
-
-	/* #endregion */
+	/* Fonts */
+	--body-font-family: -apple-system, blinkmacsystemfont, 'Segoe UI', roboto, oxygen, ubuntu, cantarell, 'Helvetica Neue', 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Meiryo UI', arial, sans-serif;
 
 	/*
 	* General
 	*/
-	--text-size: 0.875rem;
-	--header-min-height: 60px;
-	--toolbar-height: 55px;
-	--footer-min-height: 70px;
-	--rooms-box-width: 280px;
-	--flex-tab-width: 380px;
-	--flex-tab-webrtc-width: 400px;
-	--flex-tab-webrtc-2-width: 850px;
-	--border: 1px;
-	--border-radius: 4px;
 	--rc-status-online: var(--rc-color-success);
 	--rc-status-away: var(--rc-color-alert);
 	--rc-status-busy: var(--rc-color-error);
 	--rc-status-invisible: var(--color-gray-medium);
-	--rc-status-offline: var(--transparent-darker);
-	--rc-status-invisible-sidebar: var(--rc-color-primary-darkest);
-	--default-padding: 1.5rem;
-	--default-small-padding: 1rem;
-	--status-bullet-size: 10px;
-	--status-bullet-radius: 50%;
-	--account-username-weight: 700;
-	--status-name-weight: 400;
-	--default-font-weight-header: 500;
 
 	/*
 	* General Typography
 	*/
-	--text-default-size: 1rem;
-	--text-default-weight: 500;
 	--text-small-size: 0.875rem;
-	--text-small-weight: 500;
-	--text-heading-size: 1.375rem;
-	--text-heading-weight: 700;
-	--text-label-size: 075rem;
-	--text-label-weight: 600;
-	--text-tiny-size: 075rem;
-	--text-tiny-weight: 400;
-	--text-micro-size: 0.625rem;
-	--text-micro-weight: 700;
-
-	/*
-	* Forms
-	*/
-	--gap-between-elements: 2.5rem;
-	--label-margin-bottom: 1rem;
-
-	/*
-	* Forms - Button
-	*/
-	--button-square-size: 36px;
-	--button-padding: 0.782rem;
-	--button-padding-small: 0 0.5rem;
-	--button-height-small: 28px;
-	--button-text-size-small: 13px;
-	--button-text-size: var(--input-font-size);
-	--button-border-width: var(--border);
-	--button-border-radius: var(--border-radius);
-	--button-disabled-background: var(--color-gray-light);
-	--button-disabled-text-color: var(--color-white);
-	--button-primary-background: var(--rc-color-button-primary);
-	--button-primary-text-color: var(--color-white);
-	--button-cancel-color: var(--rc-color-error);
-	--button-secondary-background: var(--color-gray-medium);
-	--button-secondary-text-color: var(--color-dark-medium);
-
-	/*
-	* Forms - Input
-	*/
-	--input-font-size: 0.875rem;
-	--input-title-text-size: var(--input-font-size);
-	--input-title-color: var(--rcx-color-font-default, var(--rcx-color-neutral-800, #2f343d));
-	--input-text-color: var(--rcx-color-font-default, var(--rcx-color-neutral-800, #2f343d));
-	--input-placeholder-color: var(--rc-input-colors-placeholder-color, var(--rcx-color-font-annotation, var(--rcx-color-neutral-600, #9ea2a8)));
-	--input-icon-color: var(--rcx-color-font-default, var(--rcx-color-neutral-800, var(--color-dark)));
-	--input-border-color: var(--rcx-input-colors-border-color, var(--rcx-color-stroke-light, var(--rcx-color-neutral-500, var(--color-gray-light))));
-	--input-border-width: var(--border);
-	--input-border-radius: var(--border-radius);
-	--input-description-text-color: var(--rcx-color-font-annotation, var(--rcx-color-neutral-600, var(--color-gray)));
-	--input-description-text-size: var(--input-font-size);
-	--input-error-color: var(--rc-color-error);
-
-	/*
-	* Forms - popup list
-	*/
-	--popup-list-border-radius: var(--border-radius);
-	--popup-list-background: var(--color-white);
-	--popup-list-background-hover: var(--color-gray-lightest);
-	--popup-list-selected-background: var(--color-gray-lightest);
-	--popup-list-name-color: #2d343d;
-	--popup-list-name-size: 1rem;
-
-	/*
-	* Forms - tags
-	*/
-	--tags-border-width: var(--border);
-	--tags-border-radius: var(--border-radius);
-	--tags-border-color: var(--color-gray-light);
-	--tags-text-color: var(--rc-color-primary);
-	--tags-background: #f2f3f5;
-	--tags-avatar-size: 20px;
-
-	/*
-	* Forms - select avatar
-	*/
-	--select-avatar-size: 48px;
-	--select-avatar-preview-size: 150px;
-	--select-avatar-upload-background: var(--color-gray-light);
-	--select-avatar-upload-color: #2d343d;
 
 	/*
 	* Sidebar
@@ -208,60 +48,8 @@
 	--sidebar-width: 17.5rem;
 	--sidebar-md-width: 20rem;
 	--sidebar-lg-width: 21rem;
-	--sidebar-small-width: 90%;
-	--sidebar-background-hover: var(--rc-color-primary-dark);
-	--sidebar-background-light: var(--rc-color-primary-lightest);
-	--sidebar-background-light-hover: var(--rc-color-primary-light);
-	--sidebar-background-light-active: var(--rc-color-primary-light-medium);
 	--sidebar-default-padding: 24px;
 	--sidebar-small-default-padding: 16px;
-	--sidebar-extra-small-default-padding: 12px;
-	--sidebar-footer-height: 48px;
-	--sidebar-small-header-padding: var(--sidebar-small-default-padding);
-
-	/*
-	* Sidebar flex
-	*/
-	--sidebar-flex-search-background: var(--color-white);
-	--sidebar-flex-search-placeholder-color: var(--color-gray);
-
-	/*
-	* Sidebar Account
-	*/
-	--sidebar-account-thumb-size: 23px;
-	--sidebar-small-account-thumb-size: 40px;
-	--sidebar-account-status-bullet-size: 10px;
-	--sidebar-small-account-status-bullet-size: 8px;
-	--sidebar-account-status-bullet-radius: 50%;
-	--sidebar-account-username-size: 1rem;
-	--sidebar-account-username-weight: 700;
-	--sidebar-small-account-username-weight: 400;
-	--sidebar-account-username-color: var(--color-white);
-	--sidebar-account-username-color-darker: var(--color-dark);
-	--sidebar-account-status-font-size: 0.875rem;
-	--sidebar-account-status-color: var(--color-gray);
-
-	/*
-	* Sidebar Item
-	*/
-	--sidebar-item-radius: 2px;
-	--sidebar-item-height: 24px;
-	--sidebar-item-height-medium: 34px;
-	--sidebar-item-height-extended: 52px;
-	--sidebar-item-thumb-size: 18px;
-	--sidebar-item-thumb-size-medium: 27px;
-	--sidebar-item-thumb-size-extended: 36px;
-	--sidebar-item-text-color: var(--rc-color-primary-light);
-	--sidebar-item-background: inherit;
-	--sidebar-item-hover-background: var(--rc-color-primary-darkest);
-	--sidebar-item-active-background: var(--rc-color-primary-dark);
-	--sidebar-item-active-color: var(--sidebar-item-text-color);
-	--sidebar-item-unread-color: var(--rc-color-content);
-	--sidebar-item-unread-font-weight: 600;
-	--sidebar-item-popup-background: var(--rc-color-primary-dark);
-	--sidebar-item-user-status-size: 6px;
-	--sidebar-item-user-status-radius: 50%;
-	--sidebar-item-text-size: 0.875rem;
 
 	/*
 	* Rooms list
@@ -270,89 +58,17 @@
 	--rooms-list-title-text-size: 0.75rem;
 	--rooms-list-empty-text-color: var(--color-gray);
 	--rooms-list-empty-text-size: 0.75rem;
-	--rooms-list-padding: var(--sidebar-default-padding);
-	--rooms-list-small-padding: var(--sidebar-small-default-padding);
-
-	/*
-	* Chip
-	*/
-	--chip-background: #dddddd;
-
-	/*
-	* Avatar
-	*/
-	--avatar-radius: var(--border-radius);
-	--avatar-initials-text-size: 22px;
-	--avatar-initials-text-weight: 700;
-
-	/*
-	* Badge
-	*/
-	--badge-text-color: var(--color-white);
-	--badge-radius: 12px;
-	--badge-text-size: 0.75rem;
-	--badge-background: var(--rc-color-primary-dark);
-	--badge-unread-background: var(--color-blue);
-	--badge-user-mentions-background: var(--color-red);
-	--badge-group-mentions-background: var(--color-orange);
-
-	/*
-	* Mention link
-	*/
-	--mention-link-radius: 4px;
-	--mention-link-background: #fff6d6;
-	--mention-link-text-color: #b68d00;
-	--mention-link-me-background: #ffe9ec;
-	--mention-link-me-text-color: var(--color-red);
-	--mention-link-group-background: #fde8d7;
-	--mention-link-group-text-color: var(--color-orange);
 
 	/*
 	* Message box
 	*/
 	--message-box-text-size: var(--input-font-size);
-	--message-box-placeholder-color: var(--rc-input-colors-placeholder-color, var(--rcx-color-font-annotation, var(--rcx-color-neutral-600, #9ea2a8)));
-	--message-box-markdown-color: var(--rcx-color-font-annotation, var(--rcx-color-neutral-600, var(--color-gray)));
-	--message-box-markdown-hover-color: var(--rcx-color-font-default, var(--rcx-color-neutral-800, var(--color-dark)));
-	--message-box-user-activity-color: var(--rcx-color-font-annotation, var(--rcx-color-neutral-600, var(--color-gray)));
-	--message-box-user-activity-text-size: 0.75rem;
-	--message-box-user-activity-user-color: var(--rcx-color-font-default, var(--rcx-color-neutral-800, var(--color-dark)));
-	--message-box-container-border-color: var(--rcx-input-colors-border-color, var(--rcx-color-stroke-light, var(--rcx-color-neutral-500, var(--color-gray-medium))));
-	--message-box-container-border-width: var(--border);
-	--message-box-container-border-radius: var(--border-radius);
-	--message-box-editing-color: var(--rcx-color-status-background-warning-2, #fff6d6);
-	--message-box-popover-title-text-color: var(--rcx-color-font-annotation, var(--rcx-color-neutral-600, var(--color-gray)));
-	--message-box-popover-title-text-size: 0.75rem;
-	--message-box-color: var(--rcx-color-font-default, var(--rcx-color-neutral-800, #2f343d));
 
 	/*
 	* Flex nav
 	*/
 	--flex-nav-background: var(--color-gray-lightest);
 
-	/*
-	* Popover
-	*/
-	--popover-padding: 1rem;
-	--popover-radius: var(--border-radius);
-	--popover-background: var(--color-white);
-	--popover-column-min-width: 130px;
-	--popover-column-padding: 1rem;
-	--popover-title-color: var(--color-dark);
-	--popover-title-text-size: 0.75rem;
-	--popover-item-color: var(--color-dark);
-	--popover-item-text-size: 0.875rem;
-	--popover-divider-height: 2px;
-	--popover-divider-color: var(--color-gray-light);
-
-	/*
-	* Tooltip
-	*/
-	--tooltip-background: var(--color-darkest);
-	--tooltip-text-color: var(--color-white);
-	--tooltip-text-size: 0.75rem;
-	--tooltip-radius: var(--border-radius);
-
 	/*
 	* Loading
 	*/
@@ -362,10 +78,8 @@
 	--loading-bounce-color-dark: var(--rcx-color-font-default, #e4e7ea);
 }
 
-.rcx-sidebar--main {
-	--sidebar-background: var(--rcx-color-surface-tint, #262931);
-	--sidebar-item-text-color: var(--rcx-color-font-default, #9ea2a8);
-	--sidebar-border-color: var(--rcx-color-stroke-extra-light, #2f343d);
+.rcx-sidebar {
+	&--main {
+		--sidebar-background: var(--rcx-color-surface-tint, #262931);
+	}
 }
-
-/* #endregion */
diff --git a/apps/meteor/app/theme/client/main.css b/apps/meteor/app/theme/client/main.css
index 33b7a8f0d290..7fc8ddbfe643 100644
--- a/apps/meteor/app/theme/client/main.css
+++ b/apps/meteor/app/theme/client/main.css
@@ -1,27 +1,19 @@
 /* General */
-@import 'imports/general/variables.css';
-@import 'imports/general/reset.css';
-@import 'imports/general/base_old.css';
-@import 'imports/general/base.css';
-@import 'imports/general/react-root.css';
-
-/* Forms */
-@import 'imports/general/forms.css';
-@import 'imports/forms/button.css';
-@import 'imports/forms/input.css';
+@import url('imports/general/variables.css');
+@import url('imports/general/reset.css');
+@import url('imports/general/base_old.css');
+@import url('imports/general/base.css');
+@import url('imports/general/react-root.css');
 
 /* Main */
-@import 'imports/components/flex-nav.css';
-@import 'imports/components/main-content.css';
-@import 'imports/components/message-box.css';
-@import 'imports/components/modal.css';
-@import 'imports/components/messages.css';
-@import 'imports/components/emoji.css';
-@import 'imports/components/loading.css';
+@import url('imports/components/flex-nav.css');
+@import url('imports/components/main-content.css');
+@import url('imports/components/message-box.css');
+@import url('imports/components/emoji.css');
+@import url('imports/components/loading.css');
 
 /* Legacy theming */
-@import 'imports/general/theme_old.css';
-@import './vendor/fontello/css/fontello.css';
-@import './rocketchat.font.css';
-@import './mentionLink.css';
-@import '../../../node_modules/@rocket.chat/fuselage/dist/fuselage.css';
+@import url('imports/general/theme_old.css');
+@import url('./vendor/fontello/css/fontello.css');
+@import url('./rocketchat.font.css');
+@import url('../../../node_modules/@rocket.chat/fuselage/dist/fuselage.css');
diff --git a/apps/meteor/app/theme/client/mentionLink.css b/apps/meteor/app/theme/client/mentionLink.css
deleted file mode 100644
index 5deed00646c9..000000000000
--- a/apps/meteor/app/theme/client/mentionLink.css
+++ /dev/null
@@ -1,37 +0,0 @@
-.mention-link {
-	padding: 0 2px 2px;
-
-	cursor: pointer;
-
-	transition: opacity 0.3s, background-color 0.3s, color 0.3s;
-
-	color: var(--mention-link-text-color);
-
-	border-radius: var(--mention-link-radius);
-
-	background-color: var(--mention-link-background);
-
-	font-weight: 700;
-
-	&:hover {
-		opacity: 0.6;
-	}
-
-	&--me {
-		color: var(--mention-link-me-text-color);
-		background-color: var(--mention-link-me-background);
-
-		&:hover {
-			color: var(--mention-link-me-text-color);
-		}
-	}
-
-	&--group {
-		color: var(--mention-link-group-text-color);
-		background-color: var(--mention-link-group-background);
-
-		&:hover {
-			color: var(--mention-link-group-text-color);
-		}
-	}
-}
diff --git a/apps/meteor/app/theme/client/rocketchat.font.css b/apps/meteor/app/theme/client/rocketchat.font.css
index 571c679fa697..4db1230558f5 100644
--- a/apps/meteor/app/theme/client/rocketchat.font.css
+++ b/apps/meteor/app/theme/client/rocketchat.font.css
@@ -1,9 +1,8 @@
 @font-face {
-	font-family: 'RocketChat';
+	font-family: RocketChat;
 	font-weight: 400;
 	font-style: normal;
 	font-display: block;
-
 	src: url('/fonts/rocketchat.eot');
 	src:
 		url('/fonts/rocketchat.eot?#iefix') format('embedded-opentype'),
diff --git a/apps/meteor/app/threads/client/lib/normalizeThreadTitle.ts b/apps/meteor/app/threads/client/lib/normalizeThreadTitle.ts
index 70a2a6008e56..c3d10b531b6b 100644
--- a/apps/meteor/app/threads/client/lib/normalizeThreadTitle.ts
+++ b/apps/meteor/app/threads/client/lib/normalizeThreadTitle.ts
@@ -2,7 +2,7 @@ import type { IMessage } from '@rocket.chat/core-typings';
 import { escapeHTML } from '@rocket.chat/string-helpers';
 import { Meteor } from 'meteor/meteor';
 
-import { emojiParser } from '../../../emoji/client/emojiParser.js';
+import { emojiParser } from '../../../emoji/client/emojiParser';
 import { filterMarkdown } from '../../../markdown/lib/markdown';
 import { MentionsParser } from '../../../mentions/lib/MentionsParser';
 import { Users } from '../../../models/client';
@@ -26,7 +26,7 @@ export function normalizeThreadTitle({ ...message }: Readonly<IMessage>) {
 			userTemplate: ({ label }) => `<strong> ${label} </strong>`,
 			roomTemplate: ({ prefix, mention }) => `${prefix}<strong> ${mention} </strong>`,
 		});
-		const { html } = emojiParser({ html: filteredMessage });
+		const html = emojiParser(filteredMessage);
 		return instance.parse({ ...message, msg: filteredMessage, html }).html;
 	}
 
diff --git a/apps/meteor/app/threads/client/messageAction/replyInThread.ts b/apps/meteor/app/threads/client/messageAction/replyInThread.ts
index 01d007e0d953..9d0ab8566e04 100644
--- a/apps/meteor/app/threads/client/messageAction/replyInThread.ts
+++ b/apps/meteor/app/threads/client/messageAction/replyInThread.ts
@@ -2,7 +2,6 @@ import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 
 import { roomCoordinator } from '../../../../client/lib/rooms/roomCoordinator';
-import { messageArgs } from '../../../../client/lib/utils/messageArgs';
 import { router } from '../../../../client/providers/RouterProvider';
 import { settings } from '../../../settings/client';
 import { MessageAction } from '../../../ui-utils/client';
@@ -17,8 +16,7 @@ Meteor.startup(() => {
 			icon: 'thread',
 			label: 'Reply_in_thread',
 			context: ['message', 'message-mobile', 'federated', 'videoconf'],
-			action(e, props) {
-				const { message = messageArgs(this).msg } = props;
+			action(e, { message }) {
 				e?.stopPropagation();
 				router.navigate({
 					name: router.getRouteName()!,
diff --git a/apps/meteor/app/threads/client/threads.css b/apps/meteor/app/threads/client/threads.css
index a9a9ade825d4..9ec4365bd68b 100644
--- a/apps/meteor/app/threads/client/threads.css
+++ b/apps/meteor/app/threads/client/threads.css
@@ -1,20 +1,6 @@
-.thread-empty {
-	padding: calc(2 * var(--default-padding));
-}
-
 .thread-list {
-	overflow-x: hidden;
-	overflow-y: auto;
-
+	overflow: hidden auto;
 	word-wrap: break-word;
 	flex-grow: 1;
 	flex-shrink: 1;
 }
-
-.contextual-bar__content.thread,
-.contextual-bar__content.discussions,
-.contextual-bar__content.channel-settings,
-.contextual-bar__content.keyboard-shortcut-list,
-.contextual-bar__content.threads {
-	padding: 0;
-}
diff --git a/apps/meteor/app/ui-cached-collection/client/index.ts b/apps/meteor/app/ui-cached-collection/client/index.ts
deleted file mode 100644
index 45776cc4d22c..000000000000
--- a/apps/meteor/app/ui-cached-collection/client/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { CachedCollection } from './models/CachedCollection';
-export { CachedCollectionManager } from './models/CachedCollectionManager';
diff --git a/apps/meteor/app/ui-cached-collection/client/models/CachedCollectionManager.ts b/apps/meteor/app/ui-cached-collection/client/models/CachedCollectionManager.ts
deleted file mode 100644
index b03115105841..000000000000
--- a/apps/meteor/app/ui-cached-collection/client/models/CachedCollectionManager.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-import { Emitter } from '@rocket.chat/emitter';
-import { Accounts } from 'meteor/accounts-base';
-import { check } from 'meteor/check';
-import { Meteor } from 'meteor/meteor';
-import { Tracker } from 'meteor/tracker';
-
-import type { CachedCollection } from './CachedCollection';
-
-class CachedCollectionManager extends Emitter<{ reconnect: void; login: string | null }> {
-	private items: CachedCollection<any>[];
-
-	private _syncEnabled: boolean;
-
-	private logged: boolean;
-
-	private step: number;
-
-	constructor() {
-		super();
-		this.items = [];
-		this._syncEnabled = false;
-		this.logged = false;
-
-		const { _unstoreLoginToken } = Accounts;
-		Accounts._unstoreLoginToken = (...args) => {
-			_unstoreLoginToken.apply(Accounts, args);
-			this.clearAllCacheOnLogout();
-		};
-
-		Tracker.autorun(() => {
-			const [WAITING_FIRST_CONNECTION, WAITING_FIRST_DISCONNECTION, LISTENING_RECONNECTIONS] = [0, 1, 2];
-			this.step = this.step || WAITING_FIRST_CONNECTION;
-			const { connected } = Meteor.status();
-			switch (this.step) {
-				case WAITING_FIRST_CONNECTION:
-					return !connected || this.step++;
-				case WAITING_FIRST_DISCONNECTION:
-					return connected || this.step++;
-				case LISTENING_RECONNECTIONS:
-					return connected && this.emit('reconnect');
-			}
-		});
-
-		Accounts.onLogin(() => {
-			this.emit('login', Meteor.userId());
-		});
-		Tracker.autorun(() => {
-			const uid = Meteor.userId();
-			this.logged = uid !== null;
-		});
-	}
-
-	register(cachedCollection: CachedCollection<any>) {
-		this.items.push(cachedCollection);
-	}
-
-	clearAllCache() {
-		for (const item of this.items) {
-			void item.clearCache();
-		}
-	}
-
-	clearAllCacheOnLogout() {
-		for (const item of this.items) {
-			item.clearCacheOnLogout();
-		}
-	}
-
-	set syncEnabled(value) {
-		check(value, Boolean);
-		this._syncEnabled = value;
-	}
-
-	get syncEnabled() {
-		return this._syncEnabled;
-	}
-
-	onReconnect(cb: () => void) {
-		this.on('reconnect', cb);
-	}
-
-	onLogin(cb: () => void) {
-		this.on('login', cb);
-		if (this.logged) {
-			cb();
-		}
-	}
-}
-
-const instance = new CachedCollectionManager();
-
-export {
-	/** @deprecated */
-	instance as CachedCollectionManager,
-};
diff --git a/apps/meteor/app/ui-master/server/index.js b/apps/meteor/app/ui-master/server/index.ts
similarity index 81%
rename from apps/meteor/app/ui-master/server/index.js
rename to apps/meteor/app/ui-master/server/index.ts
index 2d4f3cc7de56..7e095b80b5f5 100644
--- a/apps/meteor/app/ui-master/server/index.js
+++ b/apps/meteor/app/ui-master/server/index.ts
@@ -1,13 +1,14 @@
+import type { ISettingColor } from '@rocket.chat/core-typings';
 import { Settings } from '@rocket.chat/models';
 import { escapeHTML } from '@rocket.chat/string-helpers';
 import { Meteor } from 'meteor/meteor';
 import { Inject } from 'meteor/meteorhacks:inject-initial';
 import { Tracker } from 'meteor/tracker';
 
+import { applyHeadInjections, headInjections, injectIntoBody, injectIntoHead } from './inject';
 import { withDebouncing } from '../../../lib/utils/highOrderFunctions';
 import { settings } from '../../settings/server';
 import { getURL } from '../../utils/server/getURL';
-import { applyHeadInjections, headInjections, injectIntoBody, injectIntoHead } from './inject';
 
 import './scripts';
 
@@ -15,11 +16,11 @@ export * from './inject';
 
 Meteor.startup(() => {
 	Tracker.autorun(() => {
-		const injections = Object.values(headInjections.all());
+		const injections = Object.values(headInjections.all()).filter((injection): injection is NonNullable<typeof injection> => !!injection);
 		Inject.rawModHtml('headInjections', applyHeadInjections(injections));
 	});
 
-	settings.watch('Default_Referrer_Policy', (value) => {
+	settings.watch<string>('Default_Referrer_Policy', (value) => {
 		if (!value) {
 			return injectIntoHead('noreferrer', '<meta name="referrer" content="same-origin" />');
 		}
@@ -40,7 +41,7 @@ Meteor.startup(() => {
 		);
 	}
 
-	settings.watch('Assets_SvgFavicon_Enable', (value) => {
+	settings.watch<boolean>('Assets_SvgFavicon_Enable', (value) => {
 		const standardFavicons = `
 			<link rel="icon" sizes="16x16" type="image/png" href=${getURL('assets/favicon_16.png')} />
 			<link rel="icon" sizes="32x32" type="image/png" href=${getURL('assets/favicon_32.png')} />`;
@@ -56,7 +57,7 @@ Meteor.startup(() => {
 		}
 	});
 
-	settings.watch('theme-color-sidebar-background', (value) => {
+	settings.watch<string>('theme-color-sidebar-background', (value) => {
 		const escapedValue = escapeHTML(value);
 		injectIntoHead(
 			'theme-color-sidebar-background',
@@ -64,7 +65,7 @@ Meteor.startup(() => {
 		);
 	});
 
-	settings.watch('Site_Name', (value = 'Rocket.Chat') => {
+	settings.watch<string>('Site_Name', (value = 'Rocket.Chat') => {
 		const escapedValue = escapeHTML(value);
 		injectIntoHead(
 			'Site_Name',
@@ -74,7 +75,7 @@ Meteor.startup(() => {
 		);
 	});
 
-	settings.watch('Meta_language', (value = '') => {
+	settings.watch<string>('Meta_language', (value = '') => {
 		const escapedValue = escapeHTML(value);
 		injectIntoHead(
 			'Meta_language',
@@ -82,27 +83,27 @@ Meteor.startup(() => {
 		);
 	});
 
-	settings.watch('Meta_robots', (value = '') => {
+	settings.watch<string>('Meta_robots', (value = '') => {
 		const escapedValue = escapeHTML(value);
 		injectIntoHead('Meta_robots', `<meta name="robots" content="${escapedValue}">`);
 	});
 
-	settings.watch('Meta_msvalidate01', (value = '') => {
+	settings.watch<string>('Meta_msvalidate01', (value = '') => {
 		const escapedValue = escapeHTML(value);
 		injectIntoHead('Meta_msvalidate01', `<meta name="msvalidate.01" content="${escapedValue}">`);
 	});
 
-	settings.watch('Meta_google-site-verification', (value = '') => {
+	settings.watch<string>('Meta_google-site-verification', (value = '') => {
 		const escapedValue = escapeHTML(value);
 		injectIntoHead('Meta_google-site-verification', `<meta name="google-site-verification" content="${escapedValue}">`);
 	});
 
-	settings.watch('Meta_fb_app_id', (value = '') => {
+	settings.watch<string>('Meta_fb_app_id', (value = '') => {
 		const escapedValue = escapeHTML(value);
 		injectIntoHead('Meta_fb_app_id', `<meta property="fb:app_id" content="${escapedValue}">`);
 	});
 
-	settings.watch('Meta_custom', (value = '') => {
+	settings.watch<string>('Meta_custom', (value = '') => {
 		injectIntoHead('Meta_custom', value);
 	});
 
@@ -127,7 +128,7 @@ const renderDynamicCssList = withDebouncing({ wait: 500 })(async () => {
 	// const variables = RocketChat.models.Settings.findOne({_id:'theme-custom-variables'}, {fields: { value: 1}});
 	const colors = await Settings.find({ _id: /theme-color-rc/i }, { projection: { value: 1, editor: 1 } }).toArray();
 	const css = colors
-		.filter((color) => color && color.value)
+		.filter((color): color is ISettingColor => !!color?.value)
 		.map(({ _id, value, editor }) => {
 			if (editor === 'expression') {
 				return `--${_id.replace('theme-color-', '')}: var(--${value});`;
@@ -138,7 +139,7 @@ const renderDynamicCssList = withDebouncing({ wait: 500 })(async () => {
 	injectIntoBody('dynamic-variables', `<style id='css-variables'> :root {${css}}</style>`);
 });
 
-renderDynamicCssList();
+await renderDynamicCssList();
 
 settings.watchByRegex(/theme-color-rc/i, renderDynamicCssList);
 
@@ -160,4 +161,4 @@ injectIntoBody(
 `,
 );
 
-injectIntoBody('icons', await Assets.getTextAsync('public/icons.svg'));
+injectIntoBody('icons', (await Assets.getTextAsync('public/icons.svg')) ?? '');
diff --git a/apps/meteor/app/ui-master/server/inject.ts b/apps/meteor/app/ui-master/server/inject.ts
index 1e00a0e47433..47b63db4bb3f 100644
--- a/apps/meteor/app/ui-master/server/inject.ts
+++ b/apps/meteor/app/ui-master/server/inject.ts
@@ -16,7 +16,7 @@ type Injection =
 			tag: string;
 	  };
 
-export const headInjections = new ReactiveDict();
+export const headInjections = new ReactiveDict<Record<string, Injection>>();
 
 const callback: NextHandleFunction = (req, res, next) => {
 	if (req.method !== 'GET' && req.method !== 'HEAD' && req.method !== 'OPTIONS') {
@@ -32,7 +32,7 @@ const callback: NextHandleFunction = (req, res, next) => {
 			return;
 		}
 
-		const injection = headInjections.get(pathname.replace(/^\//, '').split('_')[0]) as Injection | undefined;
+		const injection = headInjections.get(pathname.replace(/^\//, '').split('_')[0]);
 
 		if (!injection || typeof injection === 'string') {
 			next();
diff --git a/apps/meteor/app/ui-master/server/scripts.ts b/apps/meteor/app/ui-master/server/scripts.ts
index 3e84a6e39c90..85ebaa8ccba6 100644
--- a/apps/meteor/app/ui-master/server/scripts.ts
+++ b/apps/meteor/app/ui-master/server/scripts.ts
@@ -1,5 +1,5 @@
-import { settings } from '../../settings/server';
 import { addScript } from './inject';
+import { settings } from '../../settings/server';
 
 const getContent = (): string => `
 
diff --git a/apps/meteor/app/ui-message/client/ActionManager.ts b/apps/meteor/app/ui-message/client/ActionManager.ts
index 4c892d6d32f2..91d635bee4db 100644
--- a/apps/meteor/app/ui-message/client/ActionManager.ts
+++ b/apps/meteor/app/ui-message/client/ActionManager.ts
@@ -7,12 +7,12 @@ import { t } from 'i18next';
 import type { ContextType } from 'react';
 import { lazy } from 'react';
 
+import { UiKitTriggerTimeoutError } from './UiKitTriggerTimeoutError';
 import * as banners from '../../../client/lib/banners';
 import { imperativeModal } from '../../../client/lib/imperativeModal';
 import { dispatchToastMessage } from '../../../client/lib/toast';
 import { exhaustiveCheck } from '../../../lib/utils/exhaustiveCheck';
 import { sdk } from '../../utils/client/lib/SDKClient';
-import { UiKitTriggerTimeoutError } from './UiKitTriggerTimeoutError';
 
 const UiKitModal = lazy(() => import('../../../client/views/modal/uikit/UiKitModal'));
 
diff --git a/apps/meteor/app/ui-message/client/findParentMessage.ts b/apps/meteor/app/ui-message/client/findParentMessage.ts
index 0a3197c463a6..ca221d79812b 100644
--- a/apps/meteor/app/ui-message/client/findParentMessage.ts
+++ b/apps/meteor/app/ui-message/client/findParentMessage.ts
@@ -2,7 +2,7 @@ import type { IMessage } from '@rocket.chat/core-typings';
 
 import { callWithErrorHandling } from '../../../client/lib/utils/callWithErrorHandling';
 import { withDebouncing } from '../../../lib/utils/highOrderFunctions';
-import { ChatMessage } from '../../models/client';
+import { Messages } from '../../models/client';
 
 export const findParentMessage = (() => {
 	const waiting: string[] = [];
@@ -27,7 +27,7 @@ export const findParentMessage = (() => {
 	};
 
 	return async (tmid: IMessage['_id']) => {
-		const message = ChatMessage.findOne({ _id: tmid });
+		const message = Messages.findOne({ _id: tmid });
 
 		if (message) {
 			return message;
diff --git a/apps/meteor/app/ui-message/client/messageBox/createComposerAPI.ts b/apps/meteor/app/ui-message/client/messageBox/createComposerAPI.ts
index 741f7959fa90..eab54850f3bf 100644
--- a/apps/meteor/app/ui-message/client/messageBox/createComposerAPI.ts
+++ b/apps/meteor/app/ui-message/client/messageBox/createComposerAPI.ts
@@ -2,10 +2,10 @@ import type { IMessage } from '@rocket.chat/core-typings';
 import { Emitter } from '@rocket.chat/emitter';
 import { Accounts } from 'meteor/accounts-base';
 
-import type { ComposerAPI } from '../../../../client/lib/chats/ChatAPI';
-import { withDebouncing } from '../../../../lib/utils/highOrderFunctions';
 import type { FormattingButton } from './messageBoxFormatting';
 import { formattingButtons } from './messageBoxFormatting';
+import type { ComposerAPI } from '../../../../client/lib/chats/ChatAPI';
+import { withDebouncing } from '../../../../lib/utils/highOrderFunctions';
 
 export const createComposerAPI = (input: HTMLTextAreaElement, storageID: string): ComposerAPI => {
 	const triggerEvent = (input: HTMLTextAreaElement, evt: string): void => {
diff --git a/apps/meteor/app/ui-message/client/messageBox/messageBoxFormatting.ts b/apps/meteor/app/ui-message/client/messageBox/messageBoxFormatting.ts
index 84ca6dcc1035..3c35d0fee301 100644
--- a/apps/meteor/app/ui-message/client/messageBox/messageBoxFormatting.ts
+++ b/apps/meteor/app/ui-message/client/messageBox/messageBoxFormatting.ts
@@ -1,10 +1,10 @@
 import type { Keys as IconName } from '@rocket.chat/icons';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 
+import AddLinkComposerActionModal from './AddLinkComposerActionModal';
 import type { ComposerAPI } from '../../../../client/lib/chats/ChatAPI';
 import { imperativeModal } from '../../../../client/lib/imperativeModal';
 import { settings } from '../../../settings/client';
-import AddLinkComposerActionModal from './AddLinkComposerActionModal';
 
 type FormattingButtonDefault = { label: TranslationKey; condition?: () => boolean };
 
diff --git a/apps/meteor/app/ui-utils/client/lib/LegacyRoomManager.ts b/apps/meteor/app/ui-utils/client/lib/LegacyRoomManager.ts
index 91b848ffefde..5f82e47921f8 100644
--- a/apps/meteor/app/ui-utils/client/lib/LegacyRoomManager.ts
+++ b/apps/meteor/app/ui-utils/client/lib/LegacyRoomManager.ts
@@ -3,15 +3,15 @@ import type { Mongo } from 'meteor/mongo';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Tracker } from 'meteor/tracker';
 
+import { upsertMessage, RoomHistoryManager } from './RoomHistoryManager';
+import { mainReady } from './mainReady';
 import { RoomManager } from '../../../../client/lib/RoomManager';
 import { roomCoordinator } from '../../../../client/lib/rooms/roomCoordinator';
 import { fireGlobalEvent } from '../../../../client/lib/utils/fireGlobalEvent';
 import { getConfig } from '../../../../client/lib/utils/getConfig';
 import { callbacks } from '../../../../lib/callbacks';
-import { CachedChatRoom, ChatMessage, ChatSubscription, CachedChatSubscription } from '../../../models/client';
+import { CachedChatRoom, Messages, Subscriptions, CachedChatSubscription } from '../../../models/client';
 import { sdk } from '../../../utils/client/lib/SDKClient';
-import { upsertMessage, RoomHistoryManager } from './RoomHistoryManager';
-import { mainReady } from './mainReady';
 
 const maxRoomsOpen = parseInt(getConfig('maxRoomsOpen') ?? '5') || 5;
 
@@ -106,8 +106,8 @@ const computation = Tracker.autorun(() => {
 							// }
 							// Do not load command messages into channel
 							if (msg.t !== 'command') {
-								const subscription = ChatSubscription.findOne({ rid: record.rid }, { reactive: false });
-								const isNew = !ChatMessage.findOne({ _id: msg._id, temp: { $ne: true } });
+								const subscription = Subscriptions.findOne({ rid: record.rid }, { reactive: false });
+								const isNew = !Messages.findOne({ _id: msg._id, temp: { $ne: true } });
 								await upsertMessage({ msg, subscription });
 
 								if (isNew) {
@@ -140,10 +140,10 @@ const computation = Tracker.autorun(() => {
 					});
 
 					sdk.stream('notify-room', [`${record.rid}/deleteMessage`], (msg) => {
-						ChatMessage.remove({ _id: msg._id });
+						Messages.remove({ _id: msg._id });
 
 						// remove thread refenrece from deleted message
-						ChatMessage.update({ tmid: msg._id }, { $unset: { tmid: 1 } }, { multi: true });
+						Messages.update({ tmid: msg._id }, { $unset: { tmid: 1 } }, { multi: true });
 					});
 
 					sdk.stream(
@@ -168,19 +168,19 @@ const computation = Tracker.autorun(() => {
 							}
 
 							if (showDeletedStatus) {
-								return ChatMessage.update(
+								return Messages.update(
 									query,
 									{ $set: { t: 'rm', msg: '', urls: [], mentions: [], attachments: [], reactions: {} } },
 									{ multi: true },
 								);
 							}
-							return ChatMessage.remove(query);
+							return Messages.remove(query);
 						},
 					);
 
 					sdk.stream('notify-room', [`${record.rid}/messagesRead`], ({ tmid, until }) => {
 						if (tmid) {
-							return ChatMessage.update(
+							return Messages.update(
 								{
 									tmid,
 									unread: true,
@@ -189,7 +189,7 @@ const computation = Tracker.autorun(() => {
 								{ multi: true },
 							);
 						}
-						ChatMessage.update(
+						Messages.update(
 							{
 								rid: record.rid,
 								unread: true,
diff --git a/apps/meteor/app/ui-utils/client/lib/MessageAction.ts b/apps/meteor/app/ui-utils/client/lib/MessageAction.ts
index c1f9590b98ee..0a5483c4acaa 100644
--- a/apps/meteor/app/ui-utils/client/lib/MessageAction.ts
+++ b/apps/meteor/app/ui-utils/client/lib/MessageAction.ts
@@ -47,7 +47,6 @@ export type MessageActionConfig = {
 	group?: MessageActionGroup | MessageActionGroup[];
 	context?: MessageActionContext[];
 	action: (
-		this: any,
 		e: Pick<Event, 'preventDefault' | 'stopPropagation' | 'currentTarget'> | undefined,
 		{
 			message,
diff --git a/apps/meteor/app/ui-utils/client/lib/RoomHistoryManager.ts b/apps/meteor/app/ui-utils/client/lib/RoomHistoryManager.ts
index 4e2f0c020a12..bbe8abb515f5 100644
--- a/apps/meteor/app/ui-utils/client/lib/RoomHistoryManager.ts
+++ b/apps/meteor/app/ui-utils/client/lib/RoomHistoryManager.ts
@@ -11,7 +11,7 @@ import { onClientMessageReceived } from '../../../../client/lib/onClientMessageR
 import { callWithErrorHandling } from '../../../../client/lib/utils/callWithErrorHandling';
 import { getConfig } from '../../../../client/lib/utils/getConfig';
 import { waitForElement } from '../../../../client/lib/utils/waitForElement';
-import { ChatMessage, ChatSubscription } from '../../../models/client';
+import { Messages, Subscriptions } from '../../../models/client';
 import { getUserPreference } from '../../../utils/client';
 
 export async function upsertMessage(
@@ -22,7 +22,7 @@ export async function upsertMessage(
 		msg: IMessage & { ignored?: boolean };
 		subscription?: ISubscription;
 	},
-	collection: MinimongoCollection<IMessage> = ChatMessage,
+	collection: MinimongoCollection<IMessage> = Messages,
 ) {
 	const userId = msg.u?._id;
 
@@ -42,7 +42,7 @@ export async function upsertMessage(
 
 export function upsertMessageBulk(
 	{ msgs, subscription }: { msgs: IMessage[]; subscription?: ISubscription },
-	collection: MinimongoCollection<IMessage> = ChatMessage,
+	collection: MinimongoCollection<IMessage> = Messages,
 ) {
 	const { queries } = collection;
 	collection.queries = [];
@@ -135,7 +135,7 @@ class RoomHistoryManagerClass extends Emitter {
 
 		let ls = undefined;
 
-		const subscription = ChatSubscription.findOne({ rid });
+		const subscription = Subscriptions.findOne({ rid });
 		if (subscription) {
 			({ ls } = subscription);
 		}
@@ -214,9 +214,9 @@ class RoomHistoryManagerClass extends Emitter {
 
 		room.isLoading.set(true);
 
-		const lastMessage = ChatMessage.findOne({ rid, _hidden: { $ne: true } }, { sort: { ts: -1 } });
+		const lastMessage = Messages.findOne({ rid, _hidden: { $ne: true } }, { sort: { ts: -1 } });
 
-		const subscription = ChatSubscription.findOne({ rid });
+		const subscription = Subscriptions.findOne({ rid });
 
 		if (lastMessage?.ts) {
 			const { ts } = lastMessage;
@@ -264,7 +264,7 @@ class RoomHistoryManagerClass extends Emitter {
 
 	public async clear(rid: IRoom['_id']) {
 		const room = this.getRoom(rid);
-		ChatMessage.remove({ rid });
+		Messages.remove({ rid });
 		room.isLoading.set(true);
 		room.hasMore.set(true);
 		room.hasMoreNext.set(false);
@@ -277,7 +277,7 @@ class RoomHistoryManagerClass extends Emitter {
 			return;
 		}
 
-		const messageAlreadyLoaded = Boolean(ChatMessage.findOne({ _id: message._id, _hidden: { $ne: true } }));
+		const messageAlreadyLoaded = Boolean(Messages.findOne({ _id: message._id, _hidden: { $ne: true } }));
 
 		if (messageAlreadyLoaded) {
 			return;
@@ -286,7 +286,7 @@ class RoomHistoryManagerClass extends Emitter {
 		const room = this.getRoom(message.rid);
 		void this.clear(message.rid);
 
-		const subscription = ChatSubscription.findOne({ rid: message.rid });
+		const subscription = Subscriptions.findOne({ rid: message.rid });
 
 		const result = await callWithErrorHandling('loadSurroundingMessages', message, defaultLimit);
 
diff --git a/apps/meteor/app/ui-utils/client/lib/messageActionDefault.ts b/apps/meteor/app/ui-utils/client/lib/messageActionDefault.ts
index 2f2793f7493b..460ac2941e82 100644
--- a/apps/meteor/app/ui-utils/client/lib/messageActionDefault.ts
+++ b/apps/meteor/app/ui-utils/client/lib/messageActionDefault.ts
@@ -3,19 +3,18 @@ import { isE2EEMessage, isRoomFederated } from '@rocket.chat/core-typings';
 import { Meteor } from 'meteor/meteor';
 import moment from 'moment';
 
+import { MessageAction } from './MessageAction';
 import { getPermaLink } from '../../../../client/lib/getPermaLink';
 import { imperativeModal } from '../../../../client/lib/imperativeModal';
 import { roomCoordinator } from '../../../../client/lib/rooms/roomCoordinator';
 import { dispatchToastMessage } from '../../../../client/lib/toast';
-import { messageArgs } from '../../../../client/lib/utils/messageArgs';
 import { router } from '../../../../client/providers/RouterProvider';
 import ForwardMessageModal from '../../../../client/views/room/modals/ForwardMessageModal/ForwardMessageModal';
 import ReactionListModal from '../../../../client/views/room/modals/ReactionListModal';
 import ReportMessageModal from '../../../../client/views/room/modals/ReportMessageModal';
 import { hasAtLeastOnePermission, hasPermission } from '../../../authorization/client';
-import { ChatRoom, Subscriptions } from '../../../models/client';
+import { Rooms, Subscriptions } from '../../../models/client';
 import { t } from '../../../utils/lib/i18n';
-import { MessageAction } from './MessageAction';
 
 const getMainMessageText = (message: IMessage): IMessage => {
 	const newMessage = { ...message };
@@ -32,8 +31,7 @@ Meteor.startup(async () => {
 		context: ['message', 'message-mobile', 'threads', 'federated'],
 		role: 'link',
 		type: 'communication',
-		action(_, props) {
-			const { message = messageArgs(this).msg } = props;
+		action(_, { message }) {
 			roomCoordinator.openRouteLink(
 				'd',
 				{ name: message.u.username },
@@ -53,7 +51,7 @@ Meteor.startup(async () => {
 
 			// Check if we already have a DM started with the message user (not ourselves) or we can start one
 			if (!!user && user._id !== message.u._id && !hasPermission('create-d')) {
-				const dmRoom = ChatRoom.findOne({ _id: [user._id, message.u._id].sort().join('') });
+				const dmRoom = Rooms.findOne({ _id: [user._id, message.u._id].sort().join('') });
 				if (!dmRoom || !Subscriptions.findOne({ 'rid': dmRoom._id, 'u._id': user._id })) {
 					return false;
 				}
@@ -74,8 +72,7 @@ Meteor.startup(async () => {
 		label: 'Forward_message',
 		context: ['message', 'message-mobile', 'threads'],
 		type: 'communication',
-		async action(_, props) {
-			const { message = messageArgs(this).msg } = props;
+		async action(_, { message }) {
 			const permalink = await getPermaLink(message._id);
 			imperativeModal.open({
 				component: ForwardMessageModal,
@@ -100,9 +97,7 @@ Meteor.startup(async () => {
 		icon: 'quote',
 		label: 'Quote',
 		context: ['message', 'message-mobile', 'threads', 'federated'],
-		async action(_, props) {
-			const { message = messageArgs(this).msg, chat, autoTranslateOptions } = props;
-
+		async action(_, { message, chat, autoTranslateOptions }) {
 			if (message && autoTranslateOptions?.autoTranslateEnabled && autoTranslateOptions.showAutoTranslate(message)) {
 				message.msg =
 					message.translations && autoTranslateOptions.autoTranslateLanguage
@@ -130,9 +125,8 @@ Meteor.startup(async () => {
 		// classes: 'clipboard',
 		context: ['message', 'message-mobile', 'threads', 'federated', 'videoconf', 'videoconf-threads'],
 		type: 'duplication',
-		async action(_, props) {
+		async action(_, { message }) {
 			try {
-				const { message = messageArgs(this).msg } = props;
 				const permalink = await getPermaLink(message._id);
 				await navigator.clipboard.writeText(permalink);
 				dispatchToastMessage({ type: 'success', message: t('Copied') });
@@ -157,8 +151,7 @@ Meteor.startup(async () => {
 		// classes: 'clipboard',
 		context: ['message', 'message-mobile', 'threads', 'federated'],
 		type: 'duplication',
-		async action(_, props) {
-			const { message = messageArgs(this).msg } = props;
+		async action(_, { message }) {
 			const msgText = getMainMessageText(message).msg;
 			await navigator.clipboard.writeText(msgText);
 			dispatchToastMessage({ type: 'success', message: t('Copied') });
@@ -176,8 +169,7 @@ Meteor.startup(async () => {
 		label: 'Edit',
 		context: ['message', 'message-mobile', 'threads', 'federated'],
 		type: 'management',
-		async action(_, props) {
-			const { message = messageArgs(this).msg, chat } = props;
+		async action(_, { message, chat }) {
 			await chat?.messageEditing.editMessage(message);
 		},
 		condition({ message, subscription, settings, room, user }) {
@@ -220,7 +212,7 @@ Meteor.startup(async () => {
 		context: ['message', 'message-mobile', 'threads', 'federated', 'videoconf', 'videoconf-threads'],
 		color: 'alert',
 		type: 'management',
-		async action(this: unknown, _, { message = messageArgs(this).msg, chat }) {
+		async action(_, { message, chat }) {
 			await chat?.flows.requestMessageDeletion(message);
 		},
 		condition({ message, subscription, room, chat, user }) {
@@ -248,7 +240,7 @@ Meteor.startup(async () => {
 		context: ['message', 'message-mobile', 'threads', 'federated', 'videoconf', 'videoconf-threads'],
 		color: 'alert',
 		type: 'management',
-		action(this: unknown, _, { message = messageArgs(this).msg }) {
+		action(_, { message }) {
 			imperativeModal.open({
 				component: ReportMessageModal,
 				props: {
@@ -275,7 +267,7 @@ Meteor.startup(async () => {
 		label: 'Reactions',
 		context: ['message', 'message-mobile', 'threads', 'videoconf', 'videoconf-threads'],
 		type: 'interaction',
-		action(this: unknown, _, { message: { reactions = {} } = messageArgs(this).msg }) {
+		action(_, { message: { reactions = {} } }) {
 			imperativeModal.open({
 				component: ReactionListModal,
 				props: { reactions, onClose: imperativeModal.close },
diff --git a/apps/meteor/app/ui-utils/client/lib/messageBox.ts b/apps/meteor/app/ui-utils/client/lib/messageBox.ts
index 3418adef1c1c..9dd26f64c8e0 100644
--- a/apps/meteor/app/ui-utils/client/lib/messageBox.ts
+++ b/apps/meteor/app/ui-utils/client/lib/messageBox.ts
@@ -48,13 +48,16 @@ class MessageBoxActions {
 
 	get(group?: TranslationKey) {
 		if (!group) {
-			return [...this.actions.entries()].reduce<Record<TranslationKey, MessageBoxAction[]>>((ret, [group, actions]) => {
-				const filteredActions = actions.filter((action) => !action.condition || action.condition());
-				if (filteredActions.length) {
-					ret[group] = filteredActions;
-				}
-				return ret;
-			}, {} as Record<TranslationKey, MessageBoxAction[]>);
+			return [...this.actions.entries()].reduce<Record<TranslationKey, MessageBoxAction[]>>(
+				(ret, [group, actions]) => {
+					const filteredActions = actions.filter((action) => !action.condition || action.condition());
+					if (filteredActions.length) {
+						ret[group] = filteredActions;
+					}
+					return ret;
+				},
+				{} as Record<TranslationKey, MessageBoxAction[]>,
+			);
 		}
 
 		return this.actions.get(group)?.filter((action) => !action.condition || action.condition());
diff --git a/apps/meteor/app/ui/client/lib/ChatMessages.ts b/apps/meteor/app/ui/client/lib/ChatMessages.ts
index 5d78fd1e1d98..f7fff0b2a2aa 100644
--- a/apps/meteor/app/ui/client/lib/ChatMessages.ts
+++ b/apps/meteor/app/ui/client/lib/ChatMessages.ts
@@ -2,6 +2,7 @@ import type { IMessage, IRoom, IUser } from '@rocket.chat/core-typings';
 import { isVideoConfMessage } from '@rocket.chat/core-typings';
 import type { IActionManager } from '@rocket.chat/ui-contexts';
 
+import { UserAction } from './UserAction';
 import type { ChatAPI, ComposerAPI, DataAPI, UploadsAPI } from '../../../../client/lib/chats/ChatAPI';
 import { createDataAPI } from '../../../../client/lib/chats/data';
 import { processMessageEditing } from '../../../../client/lib/chats/flows/processMessageEditing';
@@ -18,13 +19,12 @@ import {
 	setHighlightMessage,
 	clearHighlightMessage,
 } from '../../../../client/views/room/MessageList/providers/messageHighlightSubscription';
-import { UserAction } from './UserAction';
 
 type DeepWritable<T> = T extends (...args: any) => any
 	? T
 	: {
 			-readonly [P in keyof T]: DeepWritable<T[P]>;
-	  };
+		};
 
 export class ChatMessages implements ChatAPI {
 	public uid: string | null;
diff --git a/apps/meteor/app/ui/client/lib/KonchatNotification.ts b/apps/meteor/app/ui/client/lib/KonchatNotification.ts
index dbffdf2a80a1..ff67250c000b 100644
--- a/apps/meteor/app/ui/client/lib/KonchatNotification.ts
+++ b/apps/meteor/app/ui/client/lib/KonchatNotification.ts
@@ -10,9 +10,10 @@ import { router } from '../../../../client/providers/RouterProvider';
 import { stripTags } from '../../../../lib/utils/stringUtils';
 import { CustomSounds } from '../../../custom-sounds/client/lib/CustomSounds';
 import { e2e } from '../../../e2e/client';
-import { ChatSubscription } from '../../../models/client';
+import { Subscriptions } from '../../../models/client';
 import { getUserPreference } from '../../../utils/client';
 import { getUserAvatarURL } from '../../../utils/client/getUserAvatarURL';
+import { getUserNotificationsSoundVolume } from '../../../utils/client/getUserNotificationsSoundVolume';
 import { sdk } from '../../../utils/client/lib/SDKClient';
 
 declare global {
@@ -176,13 +177,13 @@ class KonchatNotification {
 
 		const userId = Meteor.userId();
 		const newMessageNotification = getUserPreference<string>(userId, 'newMessageNotification');
-		const audioVolume = getUserPreference(userId, 'notificationsSoundVolume', 100);
+		const audioVolume = getUserNotificationsSoundVolume(userId);
 
 		if (!rid) {
 			return;
 		}
 
-		const sub = ChatSubscription.findOne({ rid }, { fields: { audioNotificationValue: 1 } });
+		const sub = Subscriptions.findOne({ rid }, { fields: { audioNotificationValue: 1 } });
 
 		if (!sub || sub.audioNotificationValue === 'none') {
 			return;
diff --git a/apps/meteor/app/ui/client/lib/recorderjs/AudioRecorder.ts b/apps/meteor/app/ui/client/lib/recorderjs/AudioRecorder.ts
index 85a7853c1ece..d8bd8cbb323c 100644
--- a/apps/meteor/app/ui/client/lib/recorderjs/AudioRecorder.ts
+++ b/apps/meteor/app/ui/client/lib/recorderjs/AudioRecorder.ts
@@ -1,5 +1,5 @@
-import { settings } from '../../../../settings/client';
 import { AudioEncoder } from './AudioEncoder';
+import { settings } from '../../../../settings/client';
 
 export class AudioRecorder {
 	private audioContext: AudioContext | undefined;
diff --git a/apps/meteor/app/utils/client/getRoomAvatarURL.ts b/apps/meteor/app/utils/client/getRoomAvatarURL.ts
index 061f62107b44..8f7dd9dec533 100644
--- a/apps/meteor/app/utils/client/getRoomAvatarURL.ts
+++ b/apps/meteor/app/utils/client/getRoomAvatarURL.ts
@@ -1,7 +1,7 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 
-import { settings } from '../../settings/client';
 import { getAvatarURL } from './getAvatarURL';
+import { settings } from '../../settings/client';
 
 export const getRoomAvatarURL = ({ roomId, cache = '' }: { roomId: IRoom['_id']; cache: IRoom['avatarETag'] }) => {
 	const externalSource = (settings.get('Accounts_RoomAvatarExternalProviderUrl') || '').trim().replace(/\/$/, '');
diff --git a/apps/meteor/app/utils/client/getURL.ts b/apps/meteor/app/utils/client/getURL.ts
index 040b6dfa9dc2..42970bc38869 100644
--- a/apps/meteor/app/utils/client/getURL.ts
+++ b/apps/meteor/app/utils/client/getURL.ts
@@ -4,7 +4,13 @@ import { Info } from '../rocketchat.info';
 
 export const getURL = function (
 	path: string, // eslint-disable-next-line @typescript-eslint/naming-convention
-	params: Record<string, any> = {},
+	params: {
+		cdn?: boolean;
+		full?: boolean;
+		cloud?: boolean;
+		cloud_route?: string;
+		cloud_params?: Record<string, string>;
+	} = {},
 	cloudDeepLinkUrl?: string,
 	cacheKey?: boolean,
 ): string {
diff --git a/apps/meteor/app/utils/client/getUserNotificationsSoundVolume.tsx b/apps/meteor/app/utils/client/getUserNotificationsSoundVolume.tsx
new file mode 100644
index 000000000000..ea89cd51d4e3
--- /dev/null
+++ b/apps/meteor/app/utils/client/getUserNotificationsSoundVolume.tsx
@@ -0,0 +1,10 @@
+import type { IUser } from '@rocket.chat/core-typings';
+
+import { getUserPreference } from './lib/getUserPreference';
+
+export const getUserNotificationsSoundVolume = (userId: IUser['_id'] | null | undefined) => {
+	const masterVolume = getUserPreference<number>(userId, 'masterVolume', 100);
+	const notificationsSoundVolume = getUserPreference<number>(userId, 'notificationsSoundVolume', 100);
+
+	return (notificationsSoundVolume * masterVolume) / 100;
+};
diff --git a/apps/meteor/app/utils/client/lib/RestApiClient.ts b/apps/meteor/app/utils/client/lib/RestApiClient.ts
index 53c95ee3e4fa..219c297406bc 100644
--- a/apps/meteor/app/utils/client/lib/RestApiClient.ts
+++ b/apps/meteor/app/utils/client/lib/RestApiClient.ts
@@ -1,3 +1,4 @@
+/* eslint-disable react-hooks/rules-of-hooks */
 import { RestClient } from '@rocket.chat/api-client';
 import { Accounts } from 'meteor/accounts-base';
 
diff --git a/apps/meteor/app/utils/lib/i18n.ts b/apps/meteor/app/utils/lib/i18n.ts
index b69fe6b30513..57cc34225d8a 100644
--- a/apps/meteor/app/utils/lib/i18n.ts
+++ b/apps/meteor/app/utils/lib/i18n.ts
@@ -1,9 +1,18 @@
 import type { RocketchatI18nKeys } from '@rocket.chat/i18n';
+import type { TOptions } from 'i18next';
 import i18next from 'i18next';
 import sprintf from 'i18next-sprintf-postprocessor';
 
 import { isObject } from '../../../lib/utils/isObject';
 
+declare module 'i18next' {
+	// eslint-disable-next-line @typescript-eslint/naming-convention
+	interface TFunction {
+		(key: RocketchatI18nKeys): string;
+		(key: RocketchatI18nKeys, options: TOptions): string;
+	}
+}
+
 export const i18n = i18next.use(sprintf);
 
 export const addSprinfToI18n = function (t: (typeof i18n)['t']) {
diff --git a/apps/meteor/app/utils/rocketchat.info b/apps/meteor/app/utils/rocketchat.info
index d56c898b14c1..0fea18c07a50 100644
--- a/apps/meteor/app/utils/rocketchat.info
+++ b/apps/meteor/app/utils/rocketchat.info
@@ -1,3 +1,3 @@
 {
-	"version": "7.0.0"
+	"version": "7.1.0-rc.3"
 }
diff --git a/apps/meteor/app/utils/server/functions/normalizeMessageFileUpload.ts b/apps/meteor/app/utils/server/functions/normalizeMessageFileUpload.ts
index 097bbc4e9eb8..173592a98276 100644
--- a/apps/meteor/app/utils/server/functions/normalizeMessageFileUpload.ts
+++ b/apps/meteor/app/utils/server/functions/normalizeMessageFileUpload.ts
@@ -20,7 +20,7 @@ export const normalizeMessageFileUpload = async (message: Omit<IMessage, '_updat
 				? getURL(`${FileUpload.getPath(`${file._id}/${encodeURI(file.name)}`).substring(1)}${jwt ? `?token=${jwt}` : ''}`, {
 						cdn: false,
 						full: true,
-				  })
+					})
 				: '',
 			type: file.type,
 			size: file.size,
diff --git a/apps/meteor/app/utils/server/lib/normalizeMessagesForUser.ts b/apps/meteor/app/utils/server/lib/normalizeMessagesForUser.ts
index 3567b0131d78..3b34fe3aacec 100644
--- a/apps/meteor/app/utils/server/lib/normalizeMessagesForUser.ts
+++ b/apps/meteor/app/utils/server/lib/normalizeMessagesForUser.ts
@@ -3,7 +3,7 @@ import { Users } from '@rocket.chat/models';
 
 import { settings } from '../../../settings/server';
 
-const filterStarred = (message: IMessage, uid?: string): IMessage => {
+const filterStarred = <T extends IMessage = IMessage>(message: T, uid?: string): T => {
 	// if Allow_anonymous_read is enabled, uid will be undefined
 	if (!uid) return message;
 
@@ -20,7 +20,7 @@ function getNameOfUsername(users: Map<string, string>, username: string): string
 	return users.get(username) || username;
 }
 
-export const normalizeMessagesForUser = async (messages: IMessage[], uid?: string): Promise<IMessage[]> => {
+export const normalizeMessagesForUser = async <T extends IMessage = IMessage>(messages: T[], uid?: string): Promise<T[]> => {
 	// if not using real names, there is nothing else to do
 	if (!settings.get('UI_Use_Real_Name')) {
 		return messages.map((message) => filterStarred(message, uid));
diff --git a/apps/meteor/app/version-check/server/functions/buildVersionUpdateMessage.ts b/apps/meteor/app/version-check/server/functions/buildVersionUpdateMessage.ts
index 4cca28f1d5a9..be53cee5959a 100644
--- a/apps/meteor/app/version-check/server/functions/buildVersionUpdateMessage.ts
+++ b/apps/meteor/app/version-check/server/functions/buildVersionUpdateMessage.ts
@@ -3,6 +3,7 @@ import semver from 'semver';
 
 import { i18n } from '../../../../server/lib/i18n';
 import { sendMessagesToAdmins } from '../../../../server/lib/sendMessagesToAdmins';
+import { updateAuditedBySystem } from '../../../../server/settings/lib/auditedSettingUpdates';
 import { notifyOnSettingChangedById } from '../../../lib/server/lib/notifyListener';
 import { settings } from '../../../settings/server';
 import { Info } from '../../../utils/rocketchat.info';
@@ -38,8 +39,11 @@ export const buildVersionUpdateMessage = async (
 			continue;
 		}
 
-		(await Settings.updateValueById('Update_LatestAvailableVersion', version.version)).modifiedCount &&
-			void notifyOnSettingChangedById('Update_LatestAvailableVersion');
+		(
+			await updateAuditedBySystem({
+				reason: 'buildVersionUpdateMessage',
+			})(Settings.updateValueById, 'Update_LatestAvailableVersion', version.version)
+		).modifiedCount && void notifyOnSettingChangedById('Update_LatestAvailableVersion');
 
 		await sendMessagesToAdmins({
 			msgs: async ({ adminUser }) => [
diff --git a/apps/meteor/app/version-check/server/index.ts b/apps/meteor/app/version-check/server/index.ts
index 6736e527f3d8..45e9c5197c30 100644
--- a/apps/meteor/app/version-check/server/index.ts
+++ b/apps/meteor/app/version-check/server/index.ts
@@ -1,8 +1,8 @@
 import { cronJobs } from '@rocket.chat/cron';
 import { Meteor } from 'meteor/meteor';
 
-import { settings } from '../../settings/server';
 import { checkVersionUpdate } from './functions/checkVersionUpdate';
+import { settings } from '../../settings/server';
 import './methods/banner_dismiss';
 
 const jobName = 'version_check';
diff --git a/apps/meteor/app/webdav/server/lib/getWebdavCredentials.ts b/apps/meteor/app/webdav/server/lib/getWebdavCredentials.ts
index 6f2c59d5660f..5c12c5b676f1 100644
--- a/apps/meteor/app/webdav/server/lib/getWebdavCredentials.ts
+++ b/apps/meteor/app/webdav/server/lib/getWebdavCredentials.ts
@@ -6,6 +6,6 @@ export function getWebdavCredentials(account: WebDAVClientOptions): WebDAVClient
 		: {
 				username: account.username,
 				password: account.password,
-		  };
+			};
 	return cred;
 }
diff --git a/apps/meteor/app/webrtc/client/WebRTCClass.js b/apps/meteor/app/webrtc/client/WebRTCClass.ts
similarity index 65%
rename from apps/meteor/app/webrtc/client/WebRTCClass.js
rename to apps/meteor/app/webrtc/client/WebRTCClass.ts
index eb9772966575..5d942c365634 100644
--- a/apps/meteor/app/webrtc/client/WebRTCClass.js
+++ b/apps/meteor/app/webrtc/client/WebRTCClass.ts
@@ -1,45 +1,142 @@
+import type { IRoom } from '@rocket.chat/core-typings';
+import type { StreamKeys, StreamNames, StreamerCallbackArgs } from '@rocket.chat/ddp-client';
 import { Emitter } from '@rocket.chat/emitter';
 import { Meteor } from 'meteor/meteor';
 import { ReactiveVar } from 'meteor/reactive-var';
 import { Tracker } from 'meteor/tracker';
 
+import { ChromeScreenShare } from './screenShare';
 import GenericModal from '../../../client/components/GenericModal';
 import { imperativeModal } from '../../../client/lib/imperativeModal';
 import { goToRoomById } from '../../../client/lib/utils/goToRoomById';
-import { ChatSubscription } from '../../models/client';
+import { Subscriptions } from '../../models/client';
 import { settings } from '../../settings/client';
 import { sdk } from '../../utils/client/lib/SDKClient';
 import { t } from '../../utils/lib/i18n';
 import { WEB_RTC_EVENTS } from '../lib/constants';
-import { ChromeScreenShare } from './screenShare';
 
-class WebRTCTransportClass extends Emitter {
-	constructor(webrtcInstance) {
+// FIXME: there is a mix of obsolete definitions and incorrect field assignments
+
+declare global {
+	// eslint-disable-next-line @typescript-eslint/naming-convention
+	interface RTCPeerConnection {
+		/** @deprecated non-standard */
+		createdAt: number;
+		/** @deprecated non-standard */
+		remoteMedia: MediaStreamConstraints;
+	}
+
+	// eslint-disable-next-line @typescript-eslint/naming-convention
+	interface RTCOfferOptions {
+		/** @deprecated non-standard */
+		mandatory?: unknown;
+	}
+
+	// eslint-disable-next-line @typescript-eslint/naming-convention
+	interface MediaStream {
+		/** @deprecated non-standard */
+		volume?: GainNode;
+	}
+
+	// eslint-disable-next-line @typescript-eslint/naming-convention
+	interface MediaStreamConstraints {
+		/** @deprecated non-standard */
+		desktop?: boolean;
+	}
+
+	/** @deprecated browser-specific global */
+	const chrome: {
+		webstore: {
+			install(url: string, onSuccess: () => void, onError: (error: any) => void): void;
+		};
+	};
+
+	// eslint-disable-next-line @typescript-eslint/naming-convention
+	interface Window {
+		rocketchatscreenshare?: unknown;
+		audioContext?: AudioContext;
+	}
+}
+
+type EventData<TStreamName extends StreamNames, TStreamKey extends StreamKeys<TStreamName>, TType> = Extract<
+	StreamerCallbackArgs<TStreamName, TStreamKey>,
+	[type: TType, data: any]
+>[1];
+
+type StatusData = EventData<'notify-room', `${string}/webrtc`, 'status'>;
+type CallData = EventData<'notify-room-users', `${string}/webrtc`, 'call'>;
+type CandidateData = EventData<'notify-user', `${string}/webrtc`, 'candidate'>;
+type DescriptionData = EventData<'notify-user', `${string}/webrtc`, 'description'>;
+type JoinData = EventData<'notify-user', `${string}/webrtc`, 'join'>;
+
+type RemoteItem = {
+	id: string;
+	url: MediaStream;
+	state: RTCIceConnectionState;
+	stateText?: string;
+	connected?: boolean;
+};
+
+type RemoteConnection = {
+	id: string;
+	media: MediaStreamConstraints;
+};
+
+class WebRTCTransportClass extends Emitter<{
+	status: StatusData;
+	call: CallData;
+	candidate: CandidateData;
+	description: DescriptionData;
+	join: JoinData;
+}> {
+	public debug = false;
+
+	constructor(public webrtcInstance: WebRTCClass) {
 		super();
-		this.debug = false;
-		this.webrtcInstance = webrtcInstance;
 		sdk.stream('notify-room', [`${this.webrtcInstance.room}/${WEB_RTC_EVENTS.WEB_RTC}`], (type, data) => {
 			this.log('WebRTCTransportClass - onRoom', type, data);
 			this.emit(type, data);
 		});
 	}
 
-	log(...args) {
+	log(...args: unknown[]) {
 		if (this.debug === true) {
 			console.log(...args);
 		}
 	}
 
-	onUserStream(type, data) {
+	onUserStream(type: 'candidate', data: CandidateData): void;
+
+	onUserStream(type: 'description', data: DescriptionData): void;
+
+	onUserStream(type: 'join', data: JoinData): void;
+
+	onUserStream(
+		...[type, data]:
+			| [type: 'candidate', data: CandidateData]
+			| [type: 'description', data: DescriptionData]
+			| [type: 'join', data: JoinData]
+	) {
 		if (data.room !== this.webrtcInstance.room) {
 			return;
 		}
 
 		this.log('WebRTCTransportClass - onUser', type, data);
-		this.emit(type, data);
+
+		switch (type) {
+			case 'candidate':
+				this.emit('candidate', data);
+				break;
+			case 'description':
+				this.emit('description', data);
+				break;
+			case 'join':
+				this.emit('join', data);
+				break;
+		}
 	}
 
-	startCall(data) {
+	startCall(data: CallData) {
 		this.log('WebRTCTransportClass - startCall', this.webrtcInstance.room, this.webrtcInstance.selfId);
 		sdk.publish('notify-room-users', [
 			`${this.webrtcInstance.room}/${WEB_RTC_EVENTS.WEB_RTC}`,
@@ -53,7 +150,7 @@ class WebRTCTransportClass extends Emitter {
 		]);
 	}
 
-	joinCall(data) {
+	joinCall(data: JoinData) {
 		this.log('WebRTCTransportClass - joinCall', this.webrtcInstance.room, this.webrtcInstance.selfId);
 		if (data.monitor === true) {
 			sdk.publish('notify-user', [
@@ -80,75 +177,109 @@ class WebRTCTransportClass extends Emitter {
 		}
 	}
 
-	sendCandidate(data) {
+	sendCandidate(data: CandidateData) {
 		data.from = this.webrtcInstance.selfId;
 		data.room = this.webrtcInstance.room;
 		this.log('WebRTCTransportClass - sendCandidate', data);
 		sdk.publish('notify-user', [`${data.to}/${WEB_RTC_EVENTS.WEB_RTC}`, WEB_RTC_EVENTS.CANDIDATE, data]);
 	}
 
-	sendDescription(data) {
+	sendDescription(data: DescriptionData) {
 		data.from = this.webrtcInstance.selfId;
 		data.room = this.webrtcInstance.room;
 		this.log('WebRTCTransportClass - sendDescription', data);
 		sdk.publish('notify-user', [`${data.to}/${WEB_RTC_EVENTS.WEB_RTC}`, WEB_RTC_EVENTS.DESCRIPTION, data]);
 	}
 
-	sendStatus(data) {
+	sendStatus(data: StatusData) {
 		this.log('WebRTCTransportClass - sendStatus', data, this.webrtcInstance.room);
 		data.from = this.webrtcInstance.selfId;
 		sdk.publish('notify-room', [`${this.webrtcInstance.room}/${WEB_RTC_EVENTS.WEB_RTC}`, WEB_RTC_EVENTS.STATUS, data]);
 	}
 
-	onRemoteCall(fn) {
+	onRemoteCall(fn: (data: CallData) => void) {
 		return this.on(WEB_RTC_EVENTS.CALL, fn);
 	}
 
-	onRemoteJoin(fn) {
+	onRemoteJoin(fn: (data: JoinData) => void) {
 		return this.on(WEB_RTC_EVENTS.JOIN, fn);
 	}
 
-	onRemoteCandidate(fn) {
+	onRemoteCandidate(fn: (data: CandidateData) => void) {
 		return this.on(WEB_RTC_EVENTS.CANDIDATE, fn);
 	}
 
-	onRemoteDescription(fn) {
+	onRemoteDescription(fn: (data: DescriptionData) => void) {
 		return this.on(WEB_RTC_EVENTS.DESCRIPTION, fn);
 	}
 
-	onRemoteStatus(fn) {
+	onRemoteStatus(fn: (data: StatusData) => void) {
 		return this.on(WEB_RTC_EVENTS.STATUS, fn);
 	}
 }
 
 class WebRTCClass {
-	/*
-  		@param seldId {String}
-  		@param room {String}
-   */
+	transport: WebRTCTransportClass;
+
+	config: { iceServers: RTCIceServer[] };
+
+	debug: boolean;
+
+	TransportClass: typeof WebRTCTransportClass;
+
+	peerConnections: Record<string, RTCPeerConnection> = {};
+
+	remoteItems: ReactiveVar<RemoteItem[]>;
+
+	remoteItemsById: ReactiveVar<Record<string, RemoteItem>>;
+
+	callInProgress: ReactiveVar<boolean>;
+
+	audioEnabled: ReactiveVar<boolean>;
+
+	videoEnabled: ReactiveVar<boolean>;
+
+	overlayEnabled: ReactiveVar<boolean>;
+
+	screenShareEnabled: ReactiveVar<boolean>;
 
-	constructor(selfId, room, autoAccept = false) {
+	localUrl: ReactiveVar<MediaStream | undefined>;
+
+	active: boolean;
+
+	remoteMonitoring: boolean;
+
+	monitor: boolean;
+
+	navigator: string | undefined;
+
+	screenShareAvailable: boolean;
+
+	media: MediaStreamConstraints;
+
+	constructor(
+		public selfId: string,
+		public room: string,
+		public autoAccept = false,
+	) {
 		this.config = {
 			iceServers: [],
 		};
 		this.debug = false;
 		this.TransportClass = WebRTCTransportClass;
-		this.selfId = selfId;
-		this.room = room;
-		let servers = settings.get('WebRTC_Servers');
+		let servers = settings.get<string>('WebRTC_Servers');
 		if (servers && servers.trim() !== '') {
 			servers = servers.replace(/\s/g, '');
-			servers = servers.split(',');
 
-			servers.forEach((server) => {
-				server = server.split('@');
-				const serverConfig = {
-					urls: server.pop(),
+			servers.split(',').forEach((server) => {
+				const parts = server.split('@');
+				const serverConfig: RTCIceServer = {
+					urls: parts.pop()!,
 				};
-				if (server.length === 1) {
-					server = server[0].split(':');
-					serverConfig.username = decodeURIComponent(server[0]);
-					serverConfig.credential = decodeURIComponent(server[1]);
+				if (parts.length === 1) {
+					const [username, credential] = parts[0].split(':');
+					serverConfig.username = decodeURIComponent(username);
+					serverConfig.credential = decodeURIComponent(credential);
 				}
 				this.config.iceServers.push(serverConfig);
 			});
@@ -161,11 +292,10 @@ class WebRTCClass {
 		this.videoEnabled = new ReactiveVar(false);
 		this.overlayEnabled = new ReactiveVar(false);
 		this.screenShareEnabled = new ReactiveVar(false);
-		this.localUrl = new ReactiveVar();
+		this.localUrl = new ReactiveVar(undefined);
 		this.active = false;
 		this.remoteMonitoring = false;
 		this.monitor = false;
-		this.autoAccept = autoAccept;
 		this.navigator = undefined;
 		const userAgent = navigator.userAgent.toLocaleLowerCase();
 
@@ -179,7 +309,7 @@ class WebRTCClass {
 			this.navigator = 'safari';
 		}
 
-		this.screenShareAvailable = ['chrome', 'firefox', 'electron'].includes(this.navigator);
+		this.screenShareAvailable = ['chrome', 'firefox', 'electron'].includes(this.navigator!);
 		this.media = {
 			video: true,
 			audio: true,
@@ -194,18 +324,41 @@ class WebRTCClass {
 		setInterval(this.checkPeerConnections.bind(this), 1000);
 	}
 
-	onUserStream(...args) {
-		return this.transport.onUserStream(...args);
+	onUserStream(type: 'candidate', data: CandidateData): void;
+
+	onUserStream(type: 'description', data: DescriptionData): void;
+
+	onUserStream(type: 'join', data: JoinData): void;
+
+	onUserStream(
+		...[type, data]:
+			| [type: 'candidate', data: CandidateData]
+			| [type: 'description', data: DescriptionData]
+			| [type: 'join', data: JoinData]
+	) {
+		switch (type) {
+			case 'candidate':
+				this.transport.onUserStream('candidate', data);
+				break;
+
+			case 'description':
+				this.transport.onUserStream('description', data);
+				break;
+
+			case 'join':
+				this.transport.onUserStream('join', data);
+				break;
+		}
 	}
 
-	log(...args) {
+	log(...args: unknown[]) {
 		if (this.debug === true) {
-			console.log.apply(console, args);
+			console.log(...args);
 		}
 	}
 
-	onError(...args) {
-		console.error.apply(console, args);
+	onError(...args: unknown[]) {
+		console.error(...args);
 	}
 
 	checkPeerConnections() {
@@ -221,13 +374,13 @@ class WebRTCClass {
 	}
 
 	updateRemoteItems() {
-		const items = [];
-		const itemsById = {};
+		const items: RemoteItem[] = [];
+		const itemsById: Record<string, RemoteItem> = {};
 		const { peerConnections } = this;
 
 		Object.entries(peerConnections).forEach(([id, peerConnection]) => {
 			peerConnection.getRemoteStreams().forEach((remoteStream) => {
-				const item = {
+				const item: RemoteItem = {
 					id,
 					url: remoteStream,
 					state: peerConnection.iceConnectionState,
@@ -266,9 +419,9 @@ class WebRTCClass {
 		if (this.active !== true || this.monitor === true || this.remoteMonitoring === true) {
 			return;
 		}
-		const remoteConnections = [];
+		const remoteConnections: RemoteConnection[] = [];
 		const { peerConnections } = this;
-		Object.keys(peerConnections).entries(([id, { remoteMedia: media }]) => {
+		Object.entries(peerConnections).forEach(([id, { remoteMedia: media }]) => {
 			remoteConnections.push({
 				id,
 				media,
@@ -281,16 +434,9 @@ class WebRTCClass {
 		});
 	}
 
-	/*
-  		@param data {Object}
-  			from {String}
-  			media {Object}
-  			remoteConnections {Array[Object]}
-  				id {String}
-  				media {Object}
-   */
+	callInProgressTimeout: ReturnType<typeof setTimeout> | undefined = undefined;
 
-	onRemoteStatus(data) {
+	onRemoteStatus(data: StatusData) {
 		// this.log(onRemoteStatus, arguments);
 		this.callInProgress.set(true);
 		clearTimeout(this.callInProgressTimeout);
@@ -300,7 +446,7 @@ class WebRTCClass {
 		}
 		const remoteConnections = [
 			{
-				id: data.from,
+				id: data.from!,
 				media: data.media,
 			},
 			...data.remoteConnections,
@@ -317,11 +463,7 @@ class WebRTCClass {
 		});
 	}
 
-	/*
-  		@param id {String}
-   */
-
-	getPeerConnection(id) {
+	getPeerConnection(id: string) {
 		if (this.peerConnections[id] != null) {
 			return this.peerConnections[id];
 		}
@@ -386,8 +528,10 @@ class WebRTCClass {
 		return peerConnection;
 	}
 
-	_getUserMedia(media, onSuccess, onError) {
-		const onSuccessLocal = (stream) => {
+	audioContext: AudioContext | undefined;
+
+	_getUserMedia(media: MediaStreamConstraints, onSuccess: (stream: MediaStream) => void, onError: (error?: any) => void) {
+		const onSuccessLocal = (stream: MediaStream) => {
 			if (AudioContext && stream.getAudioTracks().length > 0) {
 				const audioContext = new AudioContext();
 				const source = audioContext.createMediaStreamSource(stream);
@@ -403,23 +547,24 @@ class WebRTCClass {
 			}
 			onSuccess(stream);
 		};
-		if (navigator.mediaDevices && navigator.mediaDevices.getUserMedia) {
+
+		if (navigator.mediaDevices?.getUserMedia) {
 			return navigator.mediaDevices.getUserMedia(media).then(onSuccessLocal).catch(onError);
 		}
 
-		navigator.getUserMedia(media, onSuccessLocal, onError);
+		navigator.getUserMedia?.(media, onSuccessLocal, onError);
 	}
 
-	getUserMedia(media, onSuccess, onError = this.onError) {
+	getUserMedia(media: MediaStreamConstraints, onSuccess: (stream: MediaStream) => void, onError: (error: any) => void = this.onError) {
 		if (media.desktop !== true) {
-			this._getUserMedia(media, onSuccess, onError);
+			void this._getUserMedia(media, onSuccess, onError);
 			return;
 		}
 		if (this.screenShareAvailable !== true) {
 			console.log('Screen share is not avaliable');
 			return;
 		}
-		const getScreen = (audioStream) => {
+		const getScreen = (audioStream?: MediaStream) => {
 			const refresh = function () {
 				imperativeModal.open({
 					component: GenericModal,
@@ -466,7 +611,7 @@ class WebRTCClass {
 				return onError(false);
 			}
 
-			const getScreenSuccess = (stream) => {
+			const getScreenSuccess = (stream: MediaStream) => {
 				if (audioStream != null) {
 					stream.addTrack(audioStream.getAudioTracks()[0]);
 				}
@@ -480,9 +625,9 @@ class WebRTCClass {
 						mediaSource: 'window',
 					},
 				};
-				this._getUserMedia(media, getScreenSuccess, onError);
+				void this._getUserMedia(media, getScreenSuccess, onError);
 			} else {
-				ChromeScreenShare.getSourceId(this.navigator, (id) => {
+				ChromeScreenShare.getSourceId(this.navigator!, (id) => {
 					media = {
 						audio: false,
 						video: {
@@ -494,21 +639,21 @@ class WebRTCClass {
 							},
 						},
 					};
-					this._getUserMedia(media, getScreenSuccess, onError);
+					void this._getUserMedia(media, getScreenSuccess, onError);
 				});
 			}
 		};
 		if (this.navigator === 'firefox' || media.audio == null || media.audio === false) {
 			getScreen();
 		} else {
-			const getAudioSuccess = (audioStream) => {
+			const getAudioSuccess = (audioStream: MediaStream) => {
 				getScreen(audioStream);
 			};
 			const getAudioError = () => {
 				getScreen();
 			};
 
-			this._getUserMedia(
+			void this._getUserMedia(
 				{
 					audio: media.audio,
 				},
@@ -518,37 +663,29 @@ class WebRTCClass {
 		}
 	}
 
-	/*
-  		@param callback {Function}
-   */
-
-	getLocalUserMedia(callback, ...args) {
+	getLocalUserMedia(callback: (...args: any[]) => void, ...args: unknown[]) {
 		this.log('getLocalUserMedia', [callback, ...args]);
 		if (this.localStream != null) {
 			return callback(null, this.localStream);
 		}
-		const onSuccess = (stream) => {
+		const onSuccess = (stream: MediaStream) => {
 			this.localStream = stream;
 			!this.audioEnabled.get() && this.disableAudio();
 			!this.videoEnabled.get() && this.disableVideo();
 			this.localUrl.set(stream);
 			const { peerConnections } = this;
 			Object.entries(peerConnections).forEach(([, peerConnection]) => peerConnection.addStream(stream));
-			document.querySelector('video#localVideo').srcObject = stream;
+			document.querySelector<HTMLVideoElement>('video#localVideo')!.srcObject = stream;
 			callback(null, this.localStream);
 		};
-		const onError = (error) => {
+		const onError = (error: any) => {
 			callback(false);
 			this.onError(error);
 		};
 		this.getUserMedia(this.media, onSuccess, onError);
 	}
 
-	/*
-  		@param id {String}
-   */
-
-	stopPeerConnection = (id) => {
+	stopPeerConnection = (id: string) => {
 		const peerConnection = this.peerConnections[id];
 		if (peerConnection == null) {
 			return;
@@ -563,7 +700,7 @@ class WebRTCClass {
 
 		Object.keys(peerConnections).forEach(this.stopPeerConnection);
 
-		window.audioContext && window.audioContext.close();
+		void window.audioContext?.close(); // FIXME: probably should be `this.audioContext`
 	}
 
 	setAudioEnabled(enabled = true) {
@@ -590,6 +727,8 @@ class WebRTCClass {
 		return this.enableAudio();
 	}
 
+	localStream: MediaStream | undefined;
+
 	setVideoEnabled(enabled = true) {
 		if (this.localStream != null) {
 			this.localStream.getVideoTracks().forEach((video) => {
@@ -649,13 +788,7 @@ class WebRTCClass {
 		this.stopAllPeerConnections();
 	}
 
-	/*
-  		@param media {Object}
-  			audio {Boolean}
-  			video {Boolean}
-   */
-
-	startCall(media = {}, ...args) {
+	startCall(media: MediaStreamConstraints = {}, ...args: unknown[]) {
 		this.log('startCall', [media, ...args]);
 		this.media = media;
 		this.getLocalUserMedia(() => {
@@ -666,7 +799,7 @@ class WebRTCClass {
 		});
 	}
 
-	startCallAsMonitor(media = {}, ...args) {
+	startCallAsMonitor(media: MediaStreamConstraints = {}, ...args: unknown[]) {
 		this.log('startCallAsMonitor', [media, ...args]);
 		this.media = media;
 		this.active = true;
@@ -677,16 +810,7 @@ class WebRTCClass {
 		});
 	}
 
-	/*
-  		@param data {Object}
-  			from {String}
-  			monitor {Boolean}
-  			media {Object}
-  				audio {Boolean}
-  				video {Boolean}
-   */
-
-	onRemoteCall(data) {
+	onRemoteCall(data: CallData) {
 		if (this.autoAccept === true) {
 			setTimeout(() => {
 				this.joinCall({
@@ -700,31 +824,31 @@ class WebRTCClass {
 
 		const user = Meteor.users.findOne(data.from);
 		let fromUsername = undefined;
-		if (user && user.username) {
+		if (user?.username) {
 			fromUsername = user.username;
 		}
-		const subscription = ChatSubscription.findOne({
+		const subscription = Subscriptions.findOne({
 			rid: data.room,
-		});
+		})!;
 
 		let icon;
 		let title;
 		if (data.monitor === true) {
-			icon = 'eye';
+			icon = 'eye' as const;
 			title = t('WebRTC_monitor_call_from_%s', fromUsername);
 		} else if (subscription && subscription.t === 'd') {
-			if (data.media && data.media.video) {
-				icon = 'videocam';
+			if (data.media?.video) {
+				icon = 'video' as const;
 				title = t('WebRTC_direct_video_call_from_%s', fromUsername);
 			} else {
-				icon = 'phone';
+				icon = 'phone' as const;
 				title = t('WebRTC_direct_audio_call_from_%s', fromUsername);
 			}
-		} else if (data.media && data.media.video) {
-			icon = 'videocam';
+		} else if (data.media?.video) {
+			icon = 'video' as const;
 			title = t('WebRTC_group_video_call_from_%s', subscription.name);
 		} else {
-			icon = 'phone';
+			icon = 'phone' as const;
 			title = t('WebRTC_group_audio_call_from_%s', subscription.name);
 		}
 
@@ -737,7 +861,7 @@ class WebRTCClass {
 				cancelText: t('No'),
 				children: t('Do_you_want_to_accept'),
 				onConfirm: () => {
-					goToRoomById(data.room);
+					void goToRoomById(data.room!);
 					return this.joinCall({
 						to: data.from,
 						monitor: data.monitor,
@@ -750,32 +874,22 @@ class WebRTCClass {
 		});
 	}
 
-	/*
-  		@param data {Object}
-  			to {String}
-  			monitor {Boolean}
-  			media {Object}
-  				audio {Boolean}
-  				video {Boolean}
-  				desktop {Boolean}
-   */
-
-	joinCall(data = {}, ...args) {
+	joinCall(data: JoinData = {}, ...args: unknown[]) {
 		data.media = this.media;
 		this.log('joinCall', [data, ...args]);
 		this.getLocalUserMedia(() => {
-			this.remoteMonitoring = data.monitor;
+			this.remoteMonitoring = data.monitor!;
 			this.active = true;
 			this.transport.joinCall(data);
 		});
 	}
 
-	onRemoteJoin(data, ...args) {
+	onRemoteJoin(data: JoinData, ...args: unknown[]) {
 		if (this.active !== true) {
 			return;
 		}
 		this.log('onRemoteJoin', [data, ...args]);
-		let peerConnection = this.getPeerConnection(data.from);
+		let peerConnection = this.getPeerConnection(data.from!);
 
 		// needsRefresh = false
 		// if peerConnection.iceConnectionState isnt 'new'
@@ -785,18 +899,18 @@ class WebRTCClass {
 
 		// # if peerConnection.signalingState is "have-local-offer" or needsRefresh
 
-		if (peerConnection.signalingState !== 'checking') {
-			this.stopPeerConnection(data.from);
-			peerConnection = this.getPeerConnection(data.from);
+		if ((peerConnection.signalingState as RTCSignalingState | 'checking') !== 'checking') {
+			this.stopPeerConnection(data.from!);
+			peerConnection = this.getPeerConnection(data.from!);
 		}
 		if (peerConnection.iceConnectionState !== 'new') {
 			return;
 		}
-		peerConnection.remoteMedia = data.media;
+		peerConnection.remoteMedia = data.media!;
 		if (this.localStream) {
 			peerConnection.addStream(this.localStream);
 		}
-		const onOffer = (offer) => {
+		const onOffer: RTCSessionDescriptionCallback = (offer) => {
 			const onLocalDescription = () => {
 				this.transport.sendDescription({
 					to: data.from,
@@ -810,39 +924,39 @@ class WebRTCClass {
 				});
 			};
 
-			peerConnection.setLocalDescription(new RTCSessionDescription(offer), onLocalDescription, this.onError);
+			void peerConnection.setLocalDescription(new RTCSessionDescription(offer), onLocalDescription, this.onError);
 		};
 
 		if (data.monitor === true) {
-			peerConnection.createOffer(onOffer, this.onError, {
+			void peerConnection.createOffer(onOffer, this.onError, {
 				mandatory: {
-					OfferToReceiveAudio: data.media.audio,
-					OfferToReceiveVideo: data.media.video,
+					OfferToReceiveAudio: data.media?.audio,
+					OfferToReceiveVideo: data.media?.video,
 				},
 			});
 		} else {
-			peerConnection.createOffer(onOffer, this.onError);
+			void peerConnection.createOffer(onOffer, this.onError);
 		}
 	}
 
-	onRemoteOffer(data, ...args) {
+	onRemoteOffer(data: Omit<DescriptionData, 'type'>, ...args: unknown[]) {
 		if (this.active !== true) {
 			return;
 		}
 
 		this.log('onRemoteOffer', [data, ...args]);
-		let peerConnection = this.getPeerConnection(data.from);
+		let peerConnection = this.getPeerConnection(data.from!);
 
 		if (['have-local-offer', 'stable'].includes(peerConnection.signalingState) && peerConnection.createdAt < data.ts) {
-			this.stopPeerConnection(data.from);
-			peerConnection = this.getPeerConnection(data.from);
+			this.stopPeerConnection(data.from!);
+			peerConnection = this.getPeerConnection(data.from!);
 		}
 
 		if (peerConnection.iceConnectionState !== 'new') {
 			return;
 		}
 
-		peerConnection.setRemoteDescription(new RTCSessionDescription(data.description));
+		void peerConnection.setRemoteDescription(new RTCSessionDescription(data.description));
 
 		try {
 			if (this.localStream) {
@@ -852,7 +966,7 @@ class WebRTCClass {
 			console.log(error);
 		}
 
-		const onAnswer = (answer) => {
+		const onAnswer: RTCSessionDescriptionCallback = (answer) => {
 			const onLocalDescription = () => {
 				this.transport.sendDescription({
 					to: data.from,
@@ -865,20 +979,13 @@ class WebRTCClass {
 				});
 			};
 
-			peerConnection.setLocalDescription(new RTCSessionDescription(answer), onLocalDescription, this.onError);
+			void peerConnection.setLocalDescription(new RTCSessionDescription(answer), onLocalDescription, this.onError);
 		};
 
-		peerConnection.createAnswer(onAnswer, this.onError);
+		void peerConnection.createAnswer(onAnswer, this.onError);
 	}
 
-	/*
-  		@param data {Object}
-  			to {String}
-  			from {String}
-  			candidate {RTCIceCandidate JSON encoded}
-   */
-
-	onRemoteCandidate(data, ...args) {
+	onRemoteCandidate(data: CandidateData, ...args: unknown[]) {
 		if (this.active !== true) {
 			return;
 		}
@@ -886,32 +993,19 @@ class WebRTCClass {
 			return;
 		}
 		this.log('onRemoteCandidate', [data, ...args]);
-		const peerConnection = this.getPeerConnection(data.from);
+		const peerConnection = this.getPeerConnection(data.from!);
 		if (
 			peerConnection.iceConnectionState !== 'closed' &&
 			peerConnection.iceConnectionState !== 'failed' &&
 			peerConnection.iceConnectionState !== 'disconnected' &&
 			peerConnection.iceConnectionState !== 'completed'
 		) {
-			peerConnection.addIceCandidate(new RTCIceCandidate(data.candidate));
+			void peerConnection.addIceCandidate(new RTCIceCandidate(data.candidate));
 		}
-		document.querySelector('video#remoteVideo').srcObject = this.remoteItems.get()[0]?.url;
+		document.querySelector<HTMLVideoElement>('video#remoteVideo')!.srcObject = this.remoteItems.get()[0]?.url;
 	}
 
-	/*
-  		@param data {Object}
-  			to {String}
-  			from {String}
-  			type {String} [offer, answer]
-  			description {RTCSessionDescription JSON encoded}
-  			ts {Integer}
-  			media {Object}
-  				audio {Boolean}
-  				video {Boolean}
-  				desktop {Boolean}
-   */
-
-	onRemoteDescription(data, ...args) {
+	onRemoteDescription(data: DescriptionData, ...args: unknown[]) {
 		if (this.active !== true) {
 			return;
 		}
@@ -919,7 +1013,7 @@ class WebRTCClass {
 			return;
 		}
 		this.log('onRemoteDescription', [data, ...args]);
-		const peerConnection = this.getPeerConnection(data.from);
+		const peerConnection = this.getPeerConnection(data.from!);
 		if (data.type === 'offer') {
 			peerConnection.remoteMedia = data.media;
 			this.onRemoteOffer({
@@ -928,20 +1022,22 @@ class WebRTCClass {
 				description: data.description,
 			});
 		} else {
-			peerConnection.setRemoteDescription(new RTCSessionDescription(data.description));
+			void peerConnection.setRemoteDescription(new RTCSessionDescription(data.description));
 		}
 	}
 }
 
 const WebRTC = new (class {
+	instancesByRoomId: Record<string, WebRTCClass> = {};
+
 	constructor() {
 		this.instancesByRoomId = {};
 	}
 
-	getInstanceByRoomId(rid, visitorId = null) {
+	getInstanceByRoomId(rid: IRoom['_id'], visitorId: string | null = null) {
 		let enabled = false;
 		if (!visitorId) {
-			const subscription = ChatSubscription.findOne({ rid });
+			const subscription = Subscriptions.findOne({ rid });
 			if (!subscription) {
 				return;
 			}
@@ -956,17 +1052,17 @@ const WebRTC = new (class {
 					enabled = settings.get('WebRTC_Enable_Channel');
 					break;
 				case 'l':
-					enabled = settings.get('Omnichannel_call_provider') === 'WebRTC';
+					enabled = settings.get<string>('Omnichannel_call_provider') === 'WebRTC';
 			}
 		} else {
-			enabled = settings.get('Omnichannel_call_provider') === 'WebRTC';
+			enabled = settings.get<string>('Omnichannel_call_provider') === 'WebRTC';
 		}
 		enabled = enabled && settings.get('WebRTC_Enabled');
 		if (enabled === false) {
 			return;
 		}
 		if (this.instancesByRoomId[rid] == null) {
-			let uid = Meteor.userId();
+			let uid = Meteor.userId()!;
 			let autoAccept = false;
 			if (visitorId) {
 				uid = visitorId;
@@ -980,13 +1076,26 @@ const WebRTC = new (class {
 
 Meteor.startup(() => {
 	Tracker.autorun(() => {
-		if (Meteor.userId()) {
-			sdk.stream('notify-user', [`${Meteor.userId()}/${WEB_RTC_EVENTS.WEB_RTC}`], (type, data) => {
+		const uid = Meteor.userId();
+
+		if (uid) {
+			sdk.stream('notify-user', [`${uid}/${WEB_RTC_EVENTS.WEB_RTC}`], (type, data) => {
 				if (data.room == null) {
 					return;
 				}
 				const webrtc = WebRTC.getInstanceByRoomId(data.room);
-				webrtc.onUserStream(type, data);
+
+				switch (type) {
+					case 'candidate':
+						webrtc?.onUserStream('candidate', data);
+						break;
+					case 'description':
+						webrtc?.onUserStream('description', data);
+						break;
+					case 'join':
+						webrtc?.onUserStream('join', data);
+						break;
+				}
 			});
 		}
 	});
diff --git a/apps/meteor/app/webrtc/client/actionLink.tsx b/apps/meteor/app/webrtc/client/actionLink.tsx
index d4575f2dd60f..90258eeedce8 100644
--- a/apps/meteor/app/webrtc/client/actionLink.tsx
+++ b/apps/meteor/app/webrtc/client/actionLink.tsx
@@ -2,12 +2,12 @@ import type { IMessage } from '@rocket.chat/core-typings';
 
 import { actionLinks } from '../../../client/lib/actionLinks';
 import { dispatchToastMessage } from '../../../client/lib/toast';
-import { ChatRoom } from '../../models/client';
+import { Rooms } from '../../models/client';
 import { sdk } from '../../utils/client/lib/SDKClient';
 import { t } from '../../utils/lib/i18n';
 
 actionLinks.register('joinLivechatWebRTCCall', (message: IMessage) => {
-	const room = ChatRoom.findOne({ _id: message.rid });
+	const room = Rooms.findOne({ _id: message.rid });
 	if (!room) {
 		throw new Error('Room not found');
 	}
@@ -20,7 +20,7 @@ actionLinks.register('joinLivechatWebRTCCall', (message: IMessage) => {
 });
 
 actionLinks.register('endLivechatWebRTCCall', async (message: IMessage) => {
-	const room = ChatRoom.findOne({ _id: message.rid });
+	const room = Rooms.findOne({ _id: message.rid });
 	if (!room) {
 		throw new Error('Room not found');
 	}
diff --git a/apps/meteor/app/webrtc/client/adapter.js b/apps/meteor/app/webrtc/client/adapter.js
deleted file mode 100644
index 972e68e09f3c..000000000000
--- a/apps/meteor/app/webrtc/client/adapter.js
+++ /dev/null
@@ -1,6 +0,0 @@
-window.RTCPeerConnection = window.RTCPeerConnection || window.mozRTCPeerConnection || window.webkitRTCPeerConnection;
-window.RTCSessionDescription = window.RTCSessionDescription || window.mozRTCSessionDescription || window.webkitRTCSessionDescription;
-window.RTCIceCandidate = window.RTCIceCandidate || window.mozRTCIceCandidate || window.webkitRTCIceCandidate;
-window.RTCSessionDescription = window.RTCSessionDescription || window.mozRTCSessionDescription || window.webkitRTCSessionDescription;
-window.AudioContext = window.AudioContext || window.mozAudioContext || window.webkitAudioContext;
-navigator.getUserMedia = navigator.getUserMedia || navigator.mozGetUserMedia || navigator.webkitGetUserMedia;
diff --git a/apps/meteor/app/webrtc/client/adapter.ts b/apps/meteor/app/webrtc/client/adapter.ts
new file mode 100644
index 000000000000..f98ae7815c05
--- /dev/null
+++ b/apps/meteor/app/webrtc/client/adapter.ts
@@ -0,0 +1,7 @@
+// FIXME: probably outdated
+window.RTCPeerConnection = window.RTCPeerConnection ?? window.mozRTCPeerConnection ?? window.webkitRTCPeerConnection;
+window.RTCSessionDescription = window.RTCSessionDescription ?? window.mozRTCSessionDescription ?? window.webkitRTCSessionDescription;
+window.RTCIceCandidate = window.RTCIceCandidate ?? window.mozRTCIceCandidate ?? window.webkitRTCIceCandidate;
+window.RTCSessionDescription = window.RTCSessionDescription ?? window.mozRTCSessionDescription ?? window.webkitRTCSessionDescription;
+window.AudioContext = window.AudioContext ?? window.mozAudioContext ?? window.webkitAudioContext;
+navigator.getUserMedia = navigator.getUserMedia ?? navigator.mozGetUserMedia ?? navigator.webkitGetUserMedia;
diff --git a/apps/meteor/app/webrtc/client/screenShare.js b/apps/meteor/app/webrtc/client/screenShare.ts
similarity index 77%
rename from apps/meteor/app/webrtc/client/screenShare.js
rename to apps/meteor/app/webrtc/client/screenShare.ts
index ecb6f93a51d0..3fac4a05bfea 100644
--- a/apps/meteor/app/webrtc/client/screenShare.js
+++ b/apps/meteor/app/webrtc/client/screenShare.ts
@@ -1,18 +1,20 @@
 import { fireGlobalEvent } from '../../../client/lib/utils/fireGlobalEvent';
 
 export const ChromeScreenShare = {
-	callbacks: {},
-	installed: false,
-	init() {
-		this.callbacks['get-RocketChatScreenSharingExtensionVersion'] = (version) => {
+	callbacks: {
+		'get-RocketChatScreenSharingExtensionVersion': (version: unknown) => {
 			if (version) {
-				this.installed = true;
+				ChromeScreenShare.installed = true;
 			}
-		};
+		},
+		'getSourceId': (_sourceId: string): void => undefined,
+	},
+	installed: false,
+	init() {
 		window.postMessage('get-RocketChatScreenSharingExtensionVersion', '*');
 	},
-	getSourceId(navigator, callback) {
-		if (callback == null) {
+	getSourceId(navigator: string, callback: (sourceId: string) => void) {
+		if (!callback) {
 			throw new Error('"callback" parameter is mandatory.');
 		}
 		this.callbacks.getSourceId = callback;
@@ -36,8 +38,7 @@ window.addEventListener('message', (e) => {
 		throw new Error('PermissionDeniedError');
 	}
 	if (e.data.version != null) {
-		ChromeScreenShare.callbacks['get-RocketChatScreenSharingExtensionVersion'] &&
-			ChromeScreenShare.callbacks['get-RocketChatScreenSharingExtensionVersion'](e.data.version);
+		ChromeScreenShare.callbacks['get-RocketChatScreenSharingExtensionVersion']?.(e.data.version);
 	} else if (e.data.sourceId != null) {
 		return typeof ChromeScreenShare.callbacks.getSourceId === 'function' && ChromeScreenShare.callbacks.getSourceId(e.data.sourceId);
 	}
diff --git a/apps/meteor/app/wordpress/client/wordpress-login-button.css b/apps/meteor/app/wordpress/client/wordpress-login-button.css
index edc54f247ae1..35c6d2e78eb4 100644
--- a/apps/meteor/app/wordpress/client/wordpress-login-button.css
+++ b/apps/meteor/app/wordpress/client/wordpress-login-button.css
@@ -1,3 +1,3 @@
 #login-buttons-image-wordpress {
-	background-image: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiP…A3LDI3LjUsMjUuOTQsMjMuMjE1LDI4LjQzNHoiLz4NCgk8L2c+DQo8L2c+DQo8L3N2Zz4NCg==);
+	background-image: url("data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiP…A3LDI3LjUsMjUuOTQsMjMuMjE1LDI4LjQzNHoiLz4NCgk8L2c+DQo8L2c+DQo8L3N2Zz4NCg==");
 }
diff --git a/apps/meteor/client/NavBarV2/NavBar.tsx b/apps/meteor/client/NavBarV2/NavBar.tsx
index 7e61d53e5eff..116ff00b4075 100644
--- a/apps/meteor/client/NavBarV2/NavBar.tsx
+++ b/apps/meteor/client/NavBarV2/NavBar.tsx
@@ -4,10 +4,6 @@ import { usePermission, useTranslation, useUser } from '@rocket.chat/ui-contexts
 import { useVoipState } from '@rocket.chat/ui-voip';
 import React, { useRef } from 'react';
 
-import { useIsCallEnabled, useIsCallReady } from '../contexts/CallContext';
-import { useOmnichannelEnabled } from '../hooks/omnichannel/useOmnichannelEnabled';
-import { useOmnichannelShowQueueLink } from '../hooks/omnichannel/useOmnichannelShowQueueLink';
-import { useHasLicenseModule } from '../hooks/useHasLicenseModule';
 import {
 	NavBarItemOmniChannelCallDialPad,
 	NavBarItemOmnichannelContact,
@@ -18,6 +14,10 @@ import {
 import { NavBarItemMarketPlaceMenu, NavBarItemAuditMenu, NavBarItemDirectoryPage, NavBarItemHomePage } from './NavBarPagesToolbar';
 import { NavBarItemLoginPage, NavBarItemAdministrationMenu, UserMenu } from './NavBarSettingsToolbar';
 import { NavBarItemVoipDialer } from './NavBarVoipToolbar';
+import { useIsCallEnabled, useIsCallReady } from '../contexts/CallContext';
+import { useOmnichannelEnabled } from '../hooks/omnichannel/useOmnichannelEnabled';
+import { useOmnichannelShowQueueLink } from '../hooks/omnichannel/useOmnichannelShowQueueLink';
+import { useHasLicenseModule } from '../hooks/useHasLicenseModule';
 
 const NavBar = () => {
 	const t = useTranslation();
@@ -59,7 +59,7 @@ const NavBar = () => {
 						<NavBarGroup role='toolbar' ref={omnichannelToolbarRef} {...omnichannelToolbarProps}>
 							{showOmnichannelQueueLink && <NavBarItemOmnichannelQueue title={t('Queue')} />}
 							{isCallReady && <NavBarItemOmniChannelCallDialPad />}
-							<NavBarItemOmnichannelContact title={t('Contacts')} />
+							<NavBarItemOmnichannelContact title={t('Contact_Center')} />
 							{isCallEnabled && <NavBarItemOmnichannelCallToggle />}
 							<NavBarItemOmnichannelLivechatToggle />
 						</NavBarGroup>
diff --git a/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggle.tsx b/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggle.tsx
index ce62cb51864b..0df36e6e73c3 100644
--- a/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggle.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelCallToggle.tsx
@@ -1,10 +1,10 @@
 import type { ComponentPropsWithoutRef } from 'react';
 import React from 'react';
 
-import { useIsCallReady, useIsCallError } from '../../contexts/CallContext';
 import NavBarItemOmnichannelCallToggleError from './NavBarItemOmnichannelCallToggleError';
 import NavBarItemOmnichannelCallToggleLoading from './NavBarItemOmnichannelCallToggleLoading';
 import NavBarItemOmnichannelCallToggleReady from './NavBarItemOmnichannelCallToggleReady';
+import { useIsCallReady, useIsCallError } from '../../contexts/CallContext';
 
 type NavBarItemOmnichannelCallToggleProps = ComponentPropsWithoutRef<
 	typeof NavBarItemOmnichannelCallToggleError | typeof NavBarItemOmnichannelCallToggleLoading | typeof NavBarItemOmnichannelCallToggleReady
diff --git a/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelLivechatToggle.tsx b/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelLivechatToggle.tsx
index 5bf174362e19..abf8ca432c28 100644
--- a/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelLivechatToggle.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarOmnichannelToolbar/NavBarItemOmnichannelLivechatToggle.tsx
@@ -1,15 +1,16 @@
 import { Sidebar } from '@rocket.chat/fuselage';
 import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
-import { useEndpoint, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ComponentProps } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useOmnichannelAgentAvailable } from '../../hooks/omnichannel/useOmnichannelAgentAvailable';
 
 type NavBarItemOmnichannelLivechatToggleProps = Omit<ComponentProps<typeof Sidebar.TopBar.Action>, 'icon'>;
 
 const NavBarItemOmnichannelLivechatToggle = (props: NavBarItemOmnichannelLivechatToggleProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const agentAvailable = useOmnichannelAgentAvailable();
 	const changeAgentStatus = useEndpoint('POST', '/v1/livechat/agent.status');
 	const dispatchToastMessage = useToastMessageDispatch();
diff --git a/apps/meteor/client/NavBarV2/NavBarPagesToolbar/NavBarItemAuditMenu.tsx b/apps/meteor/client/NavBarV2/NavBarPagesToolbar/NavBarItemAuditMenu.tsx
index 7c8a50338e7d..7f47611f9bdb 100644
--- a/apps/meteor/client/NavBarV2/NavBarPagesToolbar/NavBarItemAuditMenu.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarPagesToolbar/NavBarItemAuditMenu.tsx
@@ -1,15 +1,16 @@
 import { NavBarItem } from '@rocket.chat/fuselage';
 import { GenericMenu } from '@rocket.chat/ui-client';
-import { useCurrentRoutePath, useTranslation } from '@rocket.chat/ui-contexts';
+import { useCurrentRoutePath } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useAuditMenu } from './hooks/useAuditMenu';
 
 type NavBarItemAuditMenuProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
 
 const NavBarItemAuditMenu = (props: NavBarItemAuditMenuProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const sections = useAuditMenu();
 	const currentRoute = useCurrentRoutePath();
 
diff --git a/apps/meteor/client/NavBarV2/NavBarPagesToolbar/NavBarItemMarketPlaceMenu.tsx b/apps/meteor/client/NavBarV2/NavBarPagesToolbar/NavBarItemMarketPlaceMenu.tsx
index 85687bb12a2e..1e7fbdefb083 100644
--- a/apps/meteor/client/NavBarV2/NavBarPagesToolbar/NavBarItemMarketPlaceMenu.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarPagesToolbar/NavBarItemMarketPlaceMenu.tsx
@@ -1,15 +1,16 @@
 import { NavBarItem } from '@rocket.chat/fuselage';
 import { GenericMenu } from '@rocket.chat/ui-client';
-import { useCurrentRoutePath, useTranslation } from '@rocket.chat/ui-contexts';
+import { useCurrentRoutePath } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useMarketPlaceMenu } from './hooks/useMarketPlaceMenu';
 
 type NavBarItemMarketPlaceMenuProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
 
 const NavBarItemMarketPlaceMenu = (props: NavBarItemMarketPlaceMenuProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const sections = useMarketPlaceMenu();
 
 	const currentRoute = useCurrentRoutePath();
diff --git a/apps/meteor/client/NavBarV2/NavBarPagesToolbar/hooks/useAuditMenu.tsx b/apps/meteor/client/NavBarV2/NavBarPagesToolbar/hooks/useAuditMenu.tsx
index 97c8d7299497..7c0c36dc9f24 100644
--- a/apps/meteor/client/NavBarV2/NavBarPagesToolbar/hooks/useAuditMenu.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarPagesToolbar/hooks/useAuditMenu.tsx
@@ -1,11 +1,12 @@
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
-import { usePermission, useRouter, useTranslation } from '@rocket.chat/ui-contexts';
+import { usePermission, useRouter } from '@rocket.chat/ui-contexts';
+import { useTranslation } from 'react-i18next';
 
 import { useHasLicenseModule } from '../../../hooks/useHasLicenseModule';
 
 export const useAuditMenu = () => {
 	const router = useRouter();
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const hasAuditLicense = useHasLicenseModule('auditing') === true;
 
diff --git a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/NavBarItemAdministrationMenu.tsx b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/NavBarItemAdministrationMenu.tsx
index 8236eec030e8..a17061050ce9 100644
--- a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/NavBarItemAdministrationMenu.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/NavBarItemAdministrationMenu.tsx
@@ -1,15 +1,16 @@
 import { NavBarItem } from '@rocket.chat/fuselage';
 import { GenericMenu } from '@rocket.chat/ui-client';
-import { useCurrentRoutePath, useTranslation } from '@rocket.chat/ui-contexts';
+import { useCurrentRoutePath } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useAdministrationMenu } from './hooks/useAdministrationMenu';
 
 type NavBarItemAdministrationMenuProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
 
 const NavBarItemAdministrationMenu = (props: NavBarItemAdministrationMenuProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const currentRoute = useCurrentRoutePath();
 
 	const sections = useAdministrationMenu();
diff --git a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/NavBarItemLoginPage.tsx b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/NavBarItemLoginPage.tsx
index a02c17db0b9b..1ef6f298fccd 100644
--- a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/NavBarItemLoginPage.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/NavBarItemLoginPage.tsx
@@ -1,13 +1,14 @@
 import { Button } from '@rocket.chat/fuselage';
-import { useSessionDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSessionDispatch } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 type NavBarItemLoginPageProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
 
 const NavBarItemLoginPage = (props: NavBarItemLoginPageProps) => {
 	const setForceLogin = useSessionDispatch('forceLogin');
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Button primary small icon='login' onClick={(): void => setForceLogin(true)} {...props}>
diff --git a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/UserMenuButton.tsx b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/UserMenuButton.tsx
index 9120678c7581..4ff16cf37be8 100644
--- a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/UserMenuButton.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/UserMenuButton.tsx
@@ -20,7 +20,7 @@ const UserMenuButton = forwardRef(function UserMenuButton(props: UserMenuButtonP
 	const user = useUser();
 
 	const { status = !user ? 'online' : 'offline', username, avatarETag } = user || anon;
-	const presenceDisabled = useSetting<boolean>('Presence_broadcast_disabled');
+	const presenceDisabled = useSetting('Presence_broadcast_disabled', false);
 
 	return (
 		<IconButton
diff --git a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/UserMenuHeader.tsx b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/UserMenuHeader.tsx
index 974af6be8ed8..6c6a2e9acf85 100644
--- a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/UserMenuHeader.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/UserMenuHeader.tsx
@@ -1,8 +1,9 @@
 import type { IUser } from '@rocket.chat/core-typings';
 import { Box, Margins } from '@rocket.chat/fuselage';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
-import { useSetting, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetting } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import MarkdownText from '../../../components/MarkdownText';
 import { UserStatus } from '../../../components/UserStatus';
@@ -11,8 +12,8 @@ import { useUserDisplayName } from '../../../hooks/useUserDisplayName';
 type UserMenuHeaderProps = { user: IUser };
 
 const UserMenuHeader = ({ user }: UserMenuHeaderProps) => {
-	const t = useTranslation();
-	const presenceDisabled = useSetting<boolean>('Presence_broadcast_disabled');
+	const { t } = useTranslation();
+	const presenceDisabled = useSetting('Presence_broadcast_disabled', false);
 	const displayName = useUserDisplayName(user);
 
 	return (
diff --git a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useAccountItems.tsx b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useAccountItems.tsx
index e54e2b72d675..b29228c4d73f 100644
--- a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useAccountItems.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useAccountItems.tsx
@@ -2,11 +2,12 @@ import { Badge } from '@rocket.chat/fuselage';
 import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { defaultFeaturesPreview, usePreferenceFeaturePreviewList } from '@rocket.chat/ui-client';
-import { useRouter, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRouter } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 export const useAccountItems = (): GenericMenuItemProps[] => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const router = useRouter();
 
 	const { unseenFeatures, featurePreviewEnabled } = usePreferenceFeaturePreviewList();
diff --git a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useStatusItems.tsx b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useStatusItems.tsx
index 1c9cf09e4610..910aa228902a 100644
--- a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useStatusItems.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useStatusItems.tsx
@@ -5,13 +5,13 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import React, { useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import { useCustomStatusModalHandler } from './useCustomStatusModalHandler';
 import { callbacks } from '../../../../../lib/callbacks';
 import MarkdownText from '../../../../components/MarkdownText';
 import { UserStatus } from '../../../../components/UserStatus';
 import { userStatuses } from '../../../../lib/userStatuses';
 import type { UserStatusDescriptor } from '../../../../lib/userStatuses';
 import { useStatusDisabledModal } from '../../../../views/admin/customUserStatus/hooks/useStatusDisabledModal';
-import { useCustomStatusModalHandler } from './useCustomStatusModalHandler';
 
 export const useStatusItems = (): GenericMenuItemProps[] => {
 	// We should lift this up to somewhere else if we want to use it in other places
@@ -79,7 +79,7 @@ export const useStatusItems = (): GenericMenuItemProps[] => {
 							</Box>
 						),
 					},
-			  ]
+				]
 			: []),
 		...(statuses ?? []),
 		{ id: 'custom-status', icon: 'emoji', content: t('Custom_Status'), onClick: handleCustomStatus, disabled: presenceDisabled },
diff --git a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useUserMenu.tsx b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useUserMenu.tsx
index e554d3c16c82..273b3cd8687e 100644
--- a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useUserMenu.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/UserMenu/hooks/useUserMenu.tsx
@@ -1,8 +1,9 @@
 import type { IUser } from '@rocket.chat/core-typings';
 import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
-import { useLogout, useTranslation } from '@rocket.chat/ui-contexts';
+import { useLogout } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import UserMenuHeader from '../UserMenuHeader';
 import { useAccountItems } from './useAccountItems';
@@ -10,7 +11,7 @@ import { useStatusItems } from './useStatusItems';
 import { useVoipItemsSection } from './useVoipItemsSection';
 
 export const useUserMenu = (user: IUser) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const statusItems = useStatusItems();
 	const accountItems = useAccountItems();
diff --git a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/hooks/useAdministrationMenu.tsx b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/hooks/useAdministrationMenu.tsx
index e3c4a358c7c1..01357109c0fe 100644
--- a/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/hooks/useAdministrationMenu.tsx
+++ b/apps/meteor/client/NavBarV2/NavBarSettingsToolbar/hooks/useAdministrationMenu.tsx
@@ -1,5 +1,6 @@
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
-import { useAtLeastOnePermission, usePermission, useRouter, useTranslation } from '@rocket.chat/ui-contexts';
+import { useAtLeastOnePermission, usePermission, useRouter } from '@rocket.chat/ui-contexts';
+import { useTranslation } from 'react-i18next';
 
 const ADMIN_PERMISSIONS = [
 	'view-statistics',
@@ -31,7 +32,7 @@ const ADMIN_PERMISSIONS = [
 
 export const useAdministrationMenu = () => {
 	const router = useRouter();
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const isAdmin = useAtLeastOnePermission(ADMIN_PERMISSIONS);
 	const isOmnichannel = usePermission('view-livechat-manager');
diff --git a/apps/meteor/client/apps/RealAppsEngineUIHost.ts b/apps/meteor/client/apps/RealAppsEngineUIHost.ts
index 2293952fe75d..7125fd04e8b4 100644
--- a/apps/meteor/client/apps/RealAppsEngineUIHost.ts
+++ b/apps/meteor/client/apps/RealAppsEngineUIHost.ts
@@ -2,7 +2,7 @@ import { AppsEngineUIHost } from '@rocket.chat/apps-engine/client/AppsEngineUIHo
 import type { IExternalComponentRoomInfo, IExternalComponentUserInfo } from '@rocket.chat/apps-engine/client/definition';
 import { Meteor } from 'meteor/meteor';
 
-import { ChatRoom } from '../../app/models/client';
+import { Rooms } from '../../app/models/client';
 import { getUserAvatarURL } from '../../app/utils/client/getUserAvatarURL';
 import { sdk } from '../../app/utils/client/lib/SDKClient';
 import { RoomManager } from '../lib/RoomManager';
@@ -30,7 +30,7 @@ export class RealAppsEngineUIHost extends AppsEngineUIHost {
 	}
 
 	async getClientRoomInfo(): Promise<IExternalComponentRoomInfo> {
-		const { name: slugifiedName, _id: id } = ChatRoom.findOne(RoomManager.opened)!;
+		const { name: slugifiedName, _id: id } = Rooms.findOne(RoomManager.opened)!;
 
 		let cachedMembers: IExternalComponentUserInfo[] = [];
 		try {
diff --git a/apps/meteor/client/apps/gameCenter/GameCenter.tsx b/apps/meteor/client/apps/gameCenter/GameCenter.tsx
index 3261d1e1c51e..6eb5c6fdeb3e 100644
--- a/apps/meteor/client/apps/gameCenter/GameCenter.tsx
+++ b/apps/meteor/client/apps/gameCenter/GameCenter.tsx
@@ -3,11 +3,11 @@ import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import React, { useState } from 'react';
 import type { ReactElement } from 'react';
 
-import { preventSyntheticEvent } from '../../lib/utils/preventSyntheticEvent';
-import { useRoomToolbox } from '../../views/room/contexts/RoomToolboxContext';
 import GameCenterContainer from './GameCenterContainer';
 import GameCenterList from './GameCenterList';
 import { useExternalComponentsQuery } from './hooks/useExternalComponentsQuery';
+import { preventSyntheticEvent } from '../../lib/utils/preventSyntheticEvent';
+import { useRoomToolbox } from '../../views/room/contexts/RoomToolboxContext';
 
 export type IGame = IExternalComponent;
 
diff --git a/apps/meteor/client/apps/gameCenter/GameCenterContainer.tsx b/apps/meteor/client/apps/gameCenter/GameCenterContainer.tsx
index dbaea02ace4a..69a73161ab1c 100644
--- a/apps/meteor/client/apps/gameCenter/GameCenterContainer.tsx
+++ b/apps/meteor/client/apps/gameCenter/GameCenterContainer.tsx
@@ -3,6 +3,7 @@ import type { ReactElement } from 'react';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
+import type { IGame } from './GameCenter';
 import {
 	ContextualbarTitle,
 	ContextualbarHeader,
@@ -10,7 +11,6 @@ import {
 	ContextualbarContent,
 	ContextualbarClose,
 } from '../../components/Contextualbar';
-import type { IGame } from './GameCenter';
 
 interface IGameCenterContainerProps {
 	handleClose: (e: any) => void;
diff --git a/apps/meteor/client/apps/gameCenter/GameCenterInvitePlayersModal.tsx b/apps/meteor/client/apps/gameCenter/GameCenterInvitePlayersModal.tsx
index 871e82f3ff56..5c20758cde3b 100644
--- a/apps/meteor/client/apps/gameCenter/GameCenterInvitePlayersModal.tsx
+++ b/apps/meteor/client/apps/gameCenter/GameCenterInvitePlayersModal.tsx
@@ -4,12 +4,12 @@ import type { ReactElement } from 'react';
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import type { IGame } from './GameCenter';
 import GenericModal from '../../components/GenericModal';
 import UserAutoCompleteMultipleFederated from '../../components/UserAutoCompleteMultiple/UserAutoCompleteMultipleFederated';
 import { useOpenedRoom } from '../../lib/RoomManager';
 import { roomCoordinator } from '../../lib/rooms/roomCoordinator';
 import { callWithErrorHandling } from '../../lib/utils/callWithErrorHandling';
-import type { IGame } from './GameCenter';
 
 type Username = Exclude<IUser['username'], undefined>;
 
diff --git a/apps/meteor/client/apps/gameCenter/GameCenterList.tsx b/apps/meteor/client/apps/gameCenter/GameCenterList.tsx
index 58a4f05f5362..03f57f0f1b6a 100644
--- a/apps/meteor/client/apps/gameCenter/GameCenterList.tsx
+++ b/apps/meteor/client/apps/gameCenter/GameCenterList.tsx
@@ -1,12 +1,13 @@
 import { Avatar, Icon, Table, TableBody, TableCell, TableHead, TableRow } from '@rocket.chat/fuselage';
-import { useSetModal, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetModal } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
-import { ContextualbarHeader, ContextualbarTitle, ContextualbarClose, ContextualbarContent } from '../../components/Contextualbar';
-import { FormSkeleton } from '../../components/Skeleton';
 import type { IGame } from './GameCenter';
 import GameCenterInvitePlayersModal from './GameCenterInvitePlayersModal';
+import { ContextualbarHeader, ContextualbarTitle, ContextualbarClose, ContextualbarContent } from '../../components/Contextualbar';
+import { FormSkeleton } from '../../components/Skeleton';
 
 interface IGameCenterListProps {
 	handleClose: (e: any) => void;
@@ -16,7 +17,7 @@ interface IGameCenterListProps {
 }
 
 const GameCenterList = ({ handleClose, handleOpenGame, games, isLoading }: IGameCenterListProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const setModal = useSetModal();
 	const handleInvitePlayer = useCallback(
 		(game) => {
diff --git a/apps/meteor/client/apps/orchestrator.ts b/apps/meteor/client/apps/orchestrator.ts
index 86d4df829aa9..aa0958b54472 100644
--- a/apps/meteor/client/apps/orchestrator.ts
+++ b/apps/meteor/client/apps/orchestrator.ts
@@ -4,12 +4,12 @@ import type { IPermission } from '@rocket.chat/apps-engine/definition/permission
 import type { ISetting } from '@rocket.chat/apps-engine/definition/settings';
 import type { Serialized } from '@rocket.chat/core-typings';
 
+import type { IAppExternalURL, ICategory } from './@types/IOrchestrator';
+import { RealAppsEngineUIHost } from './RealAppsEngineUIHost';
 import { hasAtLeastOnePermission } from '../../app/authorization/client';
 import { sdk } from '../../app/utils/client/lib/SDKClient';
 import { dispatchToastMessage } from '../lib/toast';
 import type { App } from '../views/marketplace/types';
-import type { IAppExternalURL, ICategory } from './@types/IOrchestrator';
-import { RealAppsEngineUIHost } from './RealAppsEngineUIHost';
 
 const isErrorObject = (e: unknown): e is { error: string } =>
 	typeof e === 'object' && e !== null && 'error' in e && typeof e.error === 'string';
diff --git a/apps/meteor/client/components/AutoCompleteDepartmentMultiple.tsx b/apps/meteor/client/components/AutoCompleteDepartmentMultiple.tsx
index c15d480f3900..80aa3f2a4745 100644
--- a/apps/meteor/client/components/AutoCompleteDepartmentMultiple.tsx
+++ b/apps/meteor/client/components/AutoCompleteDepartmentMultiple.tsx
@@ -63,7 +63,7 @@ const AutoCompleteDepartmentMultiple = ({
 								return;
 							}
 							return loadMoreDepartments(start, Math.min(50, departmentsTotal));
-					  }
+						}
 			}
 			renderItem={({ label, ...props }) => (
 				<CheckOption
diff --git a/apps/meteor/client/components/Contextualbar/ContextualbarContent.tsx b/apps/meteor/client/components/Contextualbar/ContextualbarContent.tsx
index 10d3d74b673b..8986969d8a1d 100644
--- a/apps/meteor/client/components/Contextualbar/ContextualbarContent.tsx
+++ b/apps/meteor/client/components/Contextualbar/ContextualbarContent.tsx
@@ -3,20 +3,19 @@ import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '@rocket.cha
 import type { ComponentProps } from 'react';
 import React, { forwardRef, memo } from 'react';
 
-const ContextualbarContent = forwardRef<HTMLElement, ComponentProps<typeof ContextualbarContentComponent>>(function ContextualbarContent(
-	props,
-	ref,
-) {
-	return (
-		<FeaturePreview feature='newNavigation'>
-			<FeaturePreviewOff>
-				<ContextualbarContentComponent ref={ref} {...props} />
-			</FeaturePreviewOff>
-			<FeaturePreviewOn>
-				<ContextualbarV2Content ref={ref} {...props} />
-			</FeaturePreviewOn>
-		</FeaturePreview>
-	);
-});
+const ContextualbarContent = forwardRef<HTMLElement, ComponentProps<typeof ContextualbarContentComponent>>(
+	function ContextualbarContent(props, ref) {
+		return (
+			<FeaturePreview feature='newNavigation'>
+				<FeaturePreviewOff>
+					<ContextualbarContentComponent ref={ref} {...props} />
+				</FeaturePreviewOff>
+				<FeaturePreviewOn>
+					<ContextualbarV2Content ref={ref} {...props} />
+				</FeaturePreviewOn>
+			</FeaturePreview>
+		);
+	},
+);
 
 export default memo(ContextualbarContent);
diff --git a/apps/meteor/client/components/Contextualbar/ContextualbarDialog.tsx b/apps/meteor/client/components/Contextualbar/ContextualbarDialog.tsx
index 4e4640270087..528b01e8854a 100644
--- a/apps/meteor/client/components/Contextualbar/ContextualbarDialog.tsx
+++ b/apps/meteor/client/components/Contextualbar/ContextualbarDialog.tsx
@@ -5,9 +5,9 @@ import React, { useCallback, useRef } from 'react';
 import type { AriaDialogProps } from 'react-aria';
 import { FocusScope, useDialog } from 'react-aria';
 
-import { useRoomToolbox } from '../../views/room/contexts/RoomToolboxContext';
 import Contextualbar from './Contextualbar';
 import ContextualbarResizable from './ContextualbarResizable';
+import { useRoomToolbox } from '../../views/room/contexts/RoomToolboxContext';
 
 type ContextualbarDialogProps = AriaDialogProps & ComponentProps<typeof Contextualbar>;
 
diff --git a/apps/meteor/client/components/Contextualbar/ContextualbarFooter.tsx b/apps/meteor/client/components/Contextualbar/ContextualbarFooter.tsx
index 481823a1a13f..c0e0d5304567 100644
--- a/apps/meteor/client/components/Contextualbar/ContextualbarFooter.tsx
+++ b/apps/meteor/client/components/Contextualbar/ContextualbarFooter.tsx
@@ -3,20 +3,19 @@ import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '@rocket.cha
 import type { ComponentProps } from 'react';
 import React, { forwardRef, memo } from 'react';
 
-const ContextualbarFooter = forwardRef<HTMLElement, ComponentProps<typeof ContextualbarFooterComponent>>(function ContextualbarFooter(
-	props,
-	ref,
-) {
-	return (
-		<FeaturePreview feature='newNavigation'>
-			<FeaturePreviewOff>
-				<ContextualbarFooterComponent ref={ref} {...props} />
-			</FeaturePreviewOff>
-			<FeaturePreviewOn>
-				<ContextualbarV2Footer ref={ref} {...props} />
-			</FeaturePreviewOn>
-		</FeaturePreview>
-	);
-});
+const ContextualbarFooter = forwardRef<HTMLElement, ComponentProps<typeof ContextualbarFooterComponent>>(
+	function ContextualbarFooter(props, ref) {
+		return (
+			<FeaturePreview feature='newNavigation'>
+				<FeaturePreviewOff>
+					<ContextualbarFooterComponent ref={ref} {...props} />
+				</FeaturePreviewOff>
+				<FeaturePreviewOn>
+					<ContextualbarV2Footer ref={ref} {...props} />
+				</FeaturePreviewOn>
+			</FeaturePreview>
+		);
+	},
+);
 
 export default memo(ContextualbarFooter);
diff --git a/apps/meteor/client/components/Contextualbar/ContextualbarResizable.tsx b/apps/meteor/client/components/Contextualbar/ContextualbarResizable.tsx
index 05dd9bf0cf2e..69adfd4bc7e1 100644
--- a/apps/meteor/client/components/Contextualbar/ContextualbarResizable.tsx
+++ b/apps/meteor/client/components/Contextualbar/ContextualbarResizable.tsx
@@ -9,6 +9,8 @@ type ContextualbarResizableProps = { defaultWidth: string } & ComponentProps<typ
 
 const ContextualbarResizable = ({ defaultWidth, children, ...props }: ContextualbarResizableProps) => {
 	const [contextualbarWidth, setContextualbarWidth] = useLocalStorage('contextualbarWidth', defaultWidth);
+	const [expanded] = useLocalStorage('expand-threads', false);
+
 	const handleStyle = css`
 		height: 100%;
 		&:hover {
@@ -29,7 +31,7 @@ const ContextualbarResizable = ({ defaultWidth, children, ...props }: Contextual
 			minWidth={defaultWidth}
 			maxWidth='50%'
 			minHeight='100%'
-			handleStyles={{ left: { width: '3px', zIndex: '5', left: 0 } }}
+			handleStyles={{ left: { width: '3px', zIndex: expanded ? 5 : 99, left: 0 } }}
 			handleComponent={{ left: <Box className={handleStyle} /> }}
 		>
 			{children}
diff --git a/apps/meteor/client/components/Contextualbar/ContextualbarSection.tsx b/apps/meteor/client/components/Contextualbar/ContextualbarSection.tsx
index 53ee192f5416..d6ab9ac12e27 100644
--- a/apps/meteor/client/components/Contextualbar/ContextualbarSection.tsx
+++ b/apps/meteor/client/components/Contextualbar/ContextualbarSection.tsx
@@ -3,20 +3,19 @@ import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '@rocket.cha
 import type { ComponentProps } from 'react';
 import React, { forwardRef, memo } from 'react';
 
-const ContextualbarSection = forwardRef<HTMLElement, ComponentProps<typeof ContextualbarSectionComponent>>(function ContextualbarSection(
-	props,
-	ref,
-) {
-	return (
-		<FeaturePreview feature='newNavigation'>
-			<FeaturePreviewOff>
-				<ContextualbarSectionComponent ref={ref} {...props} />
-			</FeaturePreviewOff>
-			<FeaturePreviewOn>
-				<ContextualbarV2Section ref={ref} {...props} />
-			</FeaturePreviewOn>
-		</FeaturePreview>
-	);
-});
+const ContextualbarSection = forwardRef<HTMLElement, ComponentProps<typeof ContextualbarSectionComponent>>(
+	function ContextualbarSection(props, ref) {
+		return (
+			<FeaturePreview feature='newNavigation'>
+				<FeaturePreviewOff>
+					<ContextualbarSectionComponent ref={ref} {...props} />
+				</FeaturePreviewOff>
+				<FeaturePreviewOn>
+					<ContextualbarV2Section ref={ref} {...props} />
+				</FeaturePreviewOn>
+			</FeaturePreview>
+		);
+	},
+);
 
 export default memo(ContextualbarSection);
diff --git a/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx b/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx
index b1dcb9d8dfbc..99bcd5db6bf7 100644
--- a/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx
+++ b/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx
@@ -46,7 +46,7 @@ const CreateDiscussion = ({ onClose, defaultParentRoom, parentMessageId, nameSug
 	const t = useTranslation();
 
 	const {
-		formState: { isSubmitting, isValidating, errors },
+		formState: { errors },
 		handleSubmit,
 		control,
 		watch,
@@ -246,7 +246,7 @@ const CreateDiscussion = ({ onClose, defaultParentRoom, parentMessageId, nameSug
 			<Modal.Footer>
 				<Modal.FooterControllers>
 					<Button onClick={onClose}>{t('Cancel')}</Button>
-					<Button type='submit' primary loading={isSubmitting || isValidating}>
+					<Button type='submit' primary loading={createDiscussionMutation.isLoading}>
 						{t('Create')}
 					</Button>
 				</Modal.FooterControllers>
diff --git a/apps/meteor/client/components/FilterByText.tsx b/apps/meteor/client/components/FilterByText.tsx
index 25d8e225e3d8..08c3cb78e21f 100644
--- a/apps/meteor/client/components/FilterByText.tsx
+++ b/apps/meteor/client/components/FilterByText.tsx
@@ -1,28 +1,23 @@
 import { Box, Icon, TextInput, Margins } from '@rocket.chat/fuselage';
 import { useAutoFocus, useMergedRefs } from '@rocket.chat/fuselage-hooks';
-import type { ChangeEvent, FormEvent, HTMLAttributes } from 'react';
-import React, { forwardRef, memo, useCallback, useState } from 'react';
+import type { ChangeEvent, ComponentPropsWithoutRef, FormEvent } from 'react';
+import React, { forwardRef, memo, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 
-type FilterByTextProps = {
-	onChange: (filter: string) => void;
+// TODO: consider changing the type of TextInput's `onChange` to (event: ChangeEvent<HTMLInputElement>) => void
+type FilterByTextProps = Omit<ComponentPropsWithoutRef<typeof TextInput>, 'onChange'> & {
 	shouldAutoFocus?: boolean;
-} & Omit<HTMLAttributes<HTMLInputElement>, 'is' | 'onChange'>;
+	onChange?: (event: ChangeEvent<HTMLInputElement>) => void;
+};
 
 const FilterByText = forwardRef<HTMLInputElement, FilterByTextProps>(function FilterByText(
-	{ placeholder, onChange: setFilter, shouldAutoFocus = false, children, ...props },
+	{ placeholder, shouldAutoFocus = false, children, ...props },
 	ref,
 ) {
 	const { t } = useTranslation();
-	const [text, setText] = useState('');
 	const autoFocusRef = useAutoFocus(shouldAutoFocus);
 	const mergedRefs = useMergedRefs(ref, autoFocusRef);
 
-	const handleInputChange = (event: ChangeEvent<HTMLInputElement>) => {
-		setText(event.currentTarget.value);
-		setFilter(event.currentTarget.value);
-	};
-
 	const handleFormSubmit = useCallback((event: FormEvent<HTMLFormElement>) => {
 		event.preventDefault();
 	}, []);
@@ -35,8 +30,6 @@ const FilterByText = forwardRef<HTMLInputElement, FilterByTextProps>(function Fi
 					placeholder={placeholder ?? t('Search')}
 					ref={mergedRefs}
 					addon={<Icon name='magnifier' size='x20' />}
-					onChange={handleInputChange}
-					value={text}
 					flexGrow={2}
 					minWidth='x220'
 					aria-label={placeholder ?? t('Search')}
diff --git a/apps/meteor/client/components/GazzodownText.tsx b/apps/meteor/client/components/GazzodownText.tsx
index 73d55495630c..05c6788062a9 100644
--- a/apps/meteor/client/components/GazzodownText.tsx
+++ b/apps/meteor/client/components/GazzodownText.tsx
@@ -10,9 +10,9 @@ import React, { useCallback, memo, useMemo } from 'react';
 
 import { detectEmoji } from '../lib/utils/detectEmoji';
 import { fireGlobalEvent } from '../lib/utils/fireGlobalEvent';
+import { useMessageListHighlights } from './message/list/MessageListContext';
 import { useUserCard } from '../views/room/contexts/UserCardContext';
 import { useGoToRoom } from '../views/room/hooks/useGoToRoom';
-import { useMessageListHighlights } from './message/list/MessageListContext';
 
 type GazzodownTextProps = {
 	children: JSX.Element;
@@ -54,7 +54,7 @@ const GazzodownText = ({ mentions, channels, searchText, children }: GazzodownTe
 
 	const convertAsciiToEmoji = useUserPreference<boolean>('convertAsciiEmoji', true);
 	const useEmoji = Boolean(useUserPreference('useEmojis'));
-	const useRealName = Boolean(useSetting('UI_Use_Real_Name'));
+	const useRealName = useSetting('UI_Use_Real_Name', false);
 	const ownUserId = useUserId();
 	const showMentionSymbol = Boolean(useUserPreference<boolean>('mentionsWithSymbol'));
 
diff --git a/apps/meteor/client/components/GenericModal/GenericModal.spec.tsx b/apps/meteor/client/components/GenericModal/GenericModal.spec.tsx
index b47b6abf7b00..aa220edcc651 100644
--- a/apps/meteor/client/components/GenericModal/GenericModal.spec.tsx
+++ b/apps/meteor/client/components/GenericModal/GenericModal.spec.tsx
@@ -4,8 +4,8 @@ import userEvent from '@testing-library/user-event';
 import type { ReactElement } from 'react';
 import React, { Suspense } from 'react';
 
-import ModalProviderWithRegion from '../../providers/ModalProvider/ModalProviderWithRegion';
 import GenericModal from './GenericModal';
+import ModalProviderWithRegion from '../../providers/ModalProvider/ModalProviderWithRegion';
 
 const renderModal = (modalElement: ReactElement) => {
 	const {
diff --git a/apps/meteor/client/components/GenericModal/GenericModal.tsx b/apps/meteor/client/components/GenericModal/GenericModal.tsx
index 409855e8c0ea..fd4df58bf63e 100644
--- a/apps/meteor/client/components/GenericModal/GenericModal.tsx
+++ b/apps/meteor/client/components/GenericModal/GenericModal.tsx
@@ -116,7 +116,7 @@ const GenericModal = ({
 				{onClose && <Modal.Close aria-label={t('Close')} onClick={handleCloseButtonClick} />}
 			</Modal.Header>
 			<Modal.Content fontScale='p2'>{children}</Modal.Content>
-			<Modal.Footer justifyContent={dontAskAgain ? 'space-between' : 'end'}>
+			<Modal.Footer justifyContent={dontAskAgain || annotation ? 'space-between' : 'end'}>
 				{dontAskAgain}
 				{annotation && !dontAskAgain && <Modal.FooterAnnotation>{annotation}</Modal.FooterAnnotation>}
 				<Modal.FooterControllers>
diff --git a/apps/meteor/client/components/GenericTable/GenericTable.tsx b/apps/meteor/client/components/GenericTable/GenericTable.tsx
index 05173fbe7004..dcefd8de12d8 100644
--- a/apps/meteor/client/components/GenericTable/GenericTable.tsx
+++ b/apps/meteor/client/components/GenericTable/GenericTable.tsx
@@ -1,6 +1,6 @@
 import { Box, Table } from '@rocket.chat/fuselage';
-import type { ComponentProps } from 'react';
-import React, { type ForwardedRef, type ReactNode, forwardRef } from 'react';
+import type { ComponentProps, ForwardedRef, ReactNode } from 'react';
+import React, { forwardRef } from 'react';
 
 import { CustomScrollbars } from '../CustomScrollbars';
 
diff --git a/apps/meteor/client/components/GenericUpsellModal/hooks/useUpsellActions.ts b/apps/meteor/client/components/GenericUpsellModal/hooks/useUpsellActions.ts
index 2a51a53b09bf..818d553e74d2 100644
--- a/apps/meteor/client/components/GenericUpsellModal/hooks/useUpsellActions.ts
+++ b/apps/meteor/client/components/GenericUpsellModal/hooks/useUpsellActions.ts
@@ -10,7 +10,7 @@ const TALK_TO_SALES_URL = 'https://go.rocket.chat/i/contact-sales';
 export const useUpsellActions = (hasLicenseModule = false) => {
 	const setModal = useSetModal();
 	const handleOpenLink = useExternalLink();
-	const cloudWorkspaceHadTrial = useSetting<boolean>('Cloud_Workspace_Had_Trial');
+	const cloudWorkspaceHadTrial = useSetting('Cloud_Workspace_Had_Trial', false);
 
 	const { data } = useIsEnterprise();
 	const shouldShowUpsell = !data?.isEnterprise || !hasLicenseModule;
diff --git a/apps/meteor/client/components/Header/HeaderToolbarAction.tsx b/apps/meteor/client/components/Header/HeaderToolbarAction.tsx
index bbf296ff23e1..720102b17574 100644
--- a/apps/meteor/client/components/Header/HeaderToolbarAction.tsx
+++ b/apps/meteor/client/components/Header/HeaderToolbarAction.tsx
@@ -8,20 +8,19 @@ import {
 import type { ComponentProps } from 'react';
 import React, { forwardRef, memo } from 'react';
 
-const HeaderToolbarAction = forwardRef<HTMLButtonElement, ComponentProps<typeof HeaderToolbarActionComponent>>(function HeaderToolbarAction(
-	props,
-	ref,
-) {
-	return (
-		<FeaturePreview feature='newNavigation'>
-			<FeaturePreviewOff>
-				<HeaderToolbarActionComponent ref={ref} {...props} />
-			</FeaturePreviewOff>
-			<FeaturePreviewOn>
-				<HeaderV2ToolbarAction ref={ref} {...props} />
-			</FeaturePreviewOn>
-		</FeaturePreview>
-	);
-});
+const HeaderToolbarAction = forwardRef<HTMLButtonElement, ComponentProps<typeof HeaderToolbarActionComponent>>(
+	function HeaderToolbarAction(props, ref) {
+		return (
+			<FeaturePreview feature='newNavigation'>
+				<FeaturePreviewOff>
+					<HeaderToolbarActionComponent ref={ref} {...props} />
+				</FeaturePreviewOff>
+				<FeaturePreviewOn>
+					<HeaderV2ToolbarAction ref={ref} {...props} />
+				</FeaturePreviewOn>
+			</FeaturePreview>
+		);
+	},
+);
 
 export default memo(HeaderToolbarAction);
diff --git a/apps/meteor/client/components/ImageGallery/ImageGallery.tsx b/apps/meteor/client/components/ImageGallery/ImageGallery.tsx
index e04bc003cf9b..214b76667b0b 100644
--- a/apps/meteor/client/components/ImageGallery/ImageGallery.tsx
+++ b/apps/meteor/client/components/ImageGallery/ImageGallery.tsx
@@ -5,15 +5,12 @@ import React, { useRef, useState } from 'react';
 import { FocusScope } from 'react-aria';
 import { createPortal } from 'react-dom';
 import { useTranslation } from 'react-i18next';
-import { Keyboard, Navigation, Zoom, A11y } from 'swiper';
-import type { SwiperClass, SwiperRef } from 'swiper/react';
-import { Swiper, SwiperSlide } from 'swiper/react';
+import { Navigation, Zoom, Keyboard, A11y } from 'swiper/modules/index.mjs';
+import type { SwiperClass, SwiperRef } from 'swiper/swiper-react';
+import { Swiper, SwiperSlide } from 'swiper/swiper-react.mjs';
 
-// Import Swiper styles
 import 'swiper/swiper.css';
-import 'swiper/modules/navigation/navigation.min.css';
-import 'swiper/modules/keyboard/keyboard.min.css';
-import 'swiper/modules/zoom/zoom.min.css';
+import 'swiper/modules/zoom.css';
 
 import { usePreventPropagation } from '../../hooks/usePreventPropagation';
 
@@ -172,10 +169,10 @@ export const ImageGallery = ({ images, onClose, loadMore }: { images: IUpload[];
 						zoom={{ toggle: false }}
 						lazyPreloaderClass='rcx-lazy-preloader'
 						runCallbacksOnInit
-						onKeyPress={(_, keyCode) => String(keyCode) === '27' && onClose()}
+						onKeyPress={(_: SwiperClass, keyCode: string) => String(keyCode) === '27' && onClose()}
 						modules={[Navigation, Zoom, Keyboard, A11y]}
-						onInit={(swiper) => setSwiperInst(swiper)}
-						onSlidesGridLengthChange={(swiper) => {
+						onInit={(swiper: SwiperClass) => setSwiperInst(swiper)}
+						onSlidesGridLengthChange={(swiper: SwiperClass) => {
 							swiper.slideTo(images.length - gridSize, 0);
 							setGridSize(images.length);
 						}}
diff --git a/apps/meteor/client/components/InfoPanel/InfoPanel.stories.tsx b/apps/meteor/client/components/InfoPanel/InfoPanel.stories.tsx
index 5727c355cc08..d40884e60ba8 100644
--- a/apps/meteor/client/components/InfoPanel/InfoPanel.stories.tsx
+++ b/apps/meteor/client/components/InfoPanel/InfoPanel.stories.tsx
@@ -13,8 +13,8 @@ import {
 	InfoPanelText,
 	InfoPanelTitle,
 } from '.';
-import { createFakeRoom } from '../../../tests/mocks/data';
 import RetentionPolicyCallout from './RetentionPolicyCallout';
+import { createFakeRoom } from '../../../tests/mocks/data';
 
 export default {
 	title: 'Info Panel/InfoPanel',
diff --git a/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.spec.tsx b/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.spec.tsx
index a9305b5f1f15..332c70f26dd4 100644
--- a/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.spec.tsx
+++ b/apps/meteor/client/components/InfoPanel/RetentionPolicyCallout.spec.tsx
@@ -1,9 +1,9 @@
 import { render, screen } from '@testing-library/react';
 import React from 'react';
 
+import RetentionPolicyCallout from './RetentionPolicyCallout';
 import { createRenteionPolicySettingsMock as createMock } from '../../../tests/mocks/client/mockRetentionPolicySettings';
 import { createFakeRoom } from '../../../tests/mocks/data';
-import RetentionPolicyCallout from './RetentionPolicyCallout';
 
 jest.useFakeTimers();
 
diff --git a/apps/meteor/client/components/MarkdownText.tsx b/apps/meteor/client/components/MarkdownText.tsx
index a116ad83ddd9..7f13c7e469c4 100644
--- a/apps/meteor/client/components/MarkdownText.tsx
+++ b/apps/meteor/client/components/MarkdownText.tsx
@@ -123,7 +123,7 @@ const MarkdownText = ({
 					// We are using the old emoji parser here. This could come
 					// with additional processing use, but is the workaround available right now.
 					// Should be replaced in the future with the new parser.
-					return renderMessageEmoji({ html: markedHtml });
+					return renderMessageEmoji(markedHtml);
 				}
 
 				return markedHtml;
@@ -132,7 +132,7 @@ const MarkdownText = ({
 
 		// Add a hook to make all external links open a new window
 		dompurify.addHook('afterSanitizeAttributes', (node) => {
-			if ('target' in node) {
+			if (isElement(node) && 'target' in node) {
 				const href = node.getAttribute('href') || '';
 
 				node.setAttribute('title', `${t('Go_to_href', { href: href.replace(getBaseURI(), '') })}`);
@@ -157,4 +157,6 @@ const MarkdownText = ({
 	) : null;
 };
 
+const isElement = (node: Node): node is Element => node.nodeType === Node.ELEMENT_NODE;
+
 export default MarkdownText;
diff --git a/apps/meteor/client/components/NotFoundState.tsx b/apps/meteor/client/components/NotFoundState.tsx
index 7140a0f67b53..7d3c0bcf9386 100644
--- a/apps/meteor/client/components/NotFoundState.tsx
+++ b/apps/meteor/client/components/NotFoundState.tsx
@@ -1,7 +1,8 @@
 import { Box, States, StatesAction, StatesActions, StatesIcon, StatesSubtitle, StatesTitle } from '@rocket.chat/fuselage';
-import { useRouter, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRouter } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 type NotFoundProps = {
 	title: string;
@@ -9,7 +10,7 @@ type NotFoundProps = {
 };
 
 const NotFoundState = ({ title, subtitle }: NotFoundProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const router = useRouter();
 
 	const handleGoHomeClick = () => {
diff --git a/apps/meteor/client/components/Omnichannel/OmnichannelSortingDisclaimer.tsx b/apps/meteor/client/components/Omnichannel/OmnichannelSortingDisclaimer.tsx
index 89e1a508b368..1d4827aedd79 100644
--- a/apps/meteor/client/components/Omnichannel/OmnichannelSortingDisclaimer.tsx
+++ b/apps/meteor/client/components/Omnichannel/OmnichannelSortingDisclaimer.tsx
@@ -1,13 +1,14 @@
 import { OmnichannelSortingMechanismSettingType as OmniSortingType } from '@rocket.chat/core-typings';
-import { useSetting, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetting } from '@rocket.chat/ui-contexts';
 import React, { useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useOmnichannelEnterpriseEnabled } from '../../hooks/omnichannel/useOmnichannelEnterpriseEnabled';
 
 export const useOmnichannelSortingDisclaimer = () => {
 	const isOmnichannelEnabled = useOmnichannelEnterpriseEnabled();
 
-	const sortingMechanism = useSetting<OmniSortingType>('Omnichannel_sorting_mechanism') || OmniSortingType.Timestamp;
+	const sortingMechanism = useSetting<OmniSortingType>('Omnichannel_sorting_mechanism', OmniSortingType.Timestamp);
 
 	const [{ [sortingMechanism]: type }] = useState({
 		[OmniSortingType.Priority]: 'Priorities',
@@ -19,7 +20,7 @@ export const useOmnichannelSortingDisclaimer = () => {
 };
 
 export const OmnichannelSortingDisclaimer = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const type = useOmnichannelSortingDisclaimer();
 
diff --git a/apps/meteor/client/components/Omnichannel/Tags.tsx b/apps/meteor/client/components/Omnichannel/Tags.tsx
index 4d7c41dda439..d96c560b9e58 100644
--- a/apps/meteor/client/components/Omnichannel/Tags.tsx
+++ b/apps/meteor/client/components/Omnichannel/Tags.tsx
@@ -1,12 +1,13 @@
 import { TextInput, Chip, Button, FieldLabel, FieldRow } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import type { ChangeEvent, ReactElement } from 'react';
 import React, { useMemo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
-import { CurrentChatTags } from '../../views/omnichannel/additionalForms';
 import { FormSkeleton } from './Skeleton';
 import { useLivechatTags } from './hooks/useLivechatTags';
+import { CurrentChatTags } from '../../views/omnichannel/additionalForms';
 
 type TagsProps = {
 	tags?: string[];
@@ -17,7 +18,7 @@ type TagsProps = {
 };
 
 const Tags = ({ tags = [], handler, error, tagRequired, department }: TagsProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const { data: tagsResult, isInitialLoading } = useLivechatTags({
 		department,
diff --git a/apps/meteor/client/components/Omnichannel/hooks/useAgentsList.ts b/apps/meteor/client/components/Omnichannel/hooks/useAgentsList.ts
index ef00a6c0b81d..630ba5f0116d 100644
--- a/apps/meteor/client/components/Omnichannel/hooks/useAgentsList.ts
+++ b/apps/meteor/client/components/Omnichannel/hooks/useAgentsList.ts
@@ -1,5 +1,6 @@
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useCallback, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useScrollableRecordList } from '../../../hooks/lists/useScrollableRecordList';
 import { useComponentDidUpdate } from '../../../hooks/useComponentDidUpdate';
@@ -24,7 +25,7 @@ export const useAgentsList = (
 	reload: () => void;
 	loadMoreItems: (start: number, end: number) => void;
 } => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [itemsList, setItemsList] = useState(() => new RecordList<AgentOption>());
 	const reload = useCallback(() => setItemsList(new RecordList<AgentOption>()), []);
 
diff --git a/apps/meteor/client/components/Omnichannel/hooks/useDepartmentsList.ts b/apps/meteor/client/components/Omnichannel/hooks/useDepartmentsList.ts
index d8e1071bf509..ac658e799ed6 100644
--- a/apps/meteor/client/components/Omnichannel/hooks/useDepartmentsList.ts
+++ b/apps/meteor/client/components/Omnichannel/hooks/useDepartmentsList.ts
@@ -1,5 +1,6 @@
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useCallback, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useScrollableRecordList } from '../../../hooks/lists/useScrollableRecordList';
 import { useComponentDidUpdate } from '../../../hooks/useComponentDidUpdate';
@@ -27,7 +28,7 @@ export const useDepartmentsList = (
 	reload: () => void;
 	loadMoreItems: (start: number, end: number) => void;
 } => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [itemsList, setItemsList] = useState(() => new RecordList<DepartmentListItem>());
 	const reload = useCallback(() => setItemsList(new RecordList<DepartmentListItem>()), []);
 
diff --git a/apps/meteor/client/components/Omnichannel/modals/CloseChatModal.tsx b/apps/meteor/client/components/Omnichannel/modals/CloseChatModal.tsx
index 489eb4a04602..887ad9355f46 100644
--- a/apps/meteor/client/components/Omnichannel/modals/CloseChatModal.tsx
+++ b/apps/meteor/client/components/Omnichannel/modals/CloseChatModal.tsx
@@ -51,9 +51,9 @@ const CloseChatModal = ({
 		watch,
 	} = useForm();
 
-	const commentRequired = useSetting('Livechat_request_comment_when_closing_conversation') as boolean;
-	const alwaysSendTranscript = useSetting<boolean>('Livechat_transcript_send_always');
-	const customSubject = useSetting<string>('Livechat_transcript_email_subject');
+	const commentRequired = useSetting('Livechat_request_comment_when_closing_conversation', true);
+	const alwaysSendTranscript = useSetting('Livechat_transcript_send_always', false);
+	const customSubject = useSetting('Livechat_transcript_email_subject', '');
 	const [tagRequired, setTagRequired] = useState(false);
 
 	const tags = watch('tags');
diff --git a/apps/meteor/client/components/Omnichannel/modals/EnterpriseDepartmentsModal.tsx b/apps/meteor/client/components/Omnichannel/modals/EnterpriseDepartmentsModal.tsx
index 713dea4a0ed6..ccf57368475e 100644
--- a/apps/meteor/client/components/Omnichannel/modals/EnterpriseDepartmentsModal.tsx
+++ b/apps/meteor/client/components/Omnichannel/modals/EnterpriseDepartmentsModal.tsx
@@ -1,14 +1,15 @@
 import { Button, Modal, Box } from '@rocket.chat/fuselage';
 import { useOutsideClick } from '@rocket.chat/fuselage-hooks';
-import { useRouter, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRouter } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useRef } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useExternalLink } from '../../../hooks/useExternalLink';
 import { useCheckoutUrl } from '../../../views/admin/subscription/hooks/useCheckoutUrl';
 
 const EnterpriseDepartmentsModal = ({ closeModal }: { closeModal: () => void }): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const router = useRouter();
 	const ref = useRef<HTMLDivElement>(null);
 
diff --git a/apps/meteor/client/components/Omnichannel/modals/ForwardChatModal.tsx b/apps/meteor/client/components/Omnichannel/modals/ForwardChatModal.tsx
index 4a937b485f36..7dbb288b1697 100644
--- a/apps/meteor/client/components/Omnichannel/modals/ForwardChatModal.tsx
+++ b/apps/meteor/client/components/Omnichannel/modals/ForwardChatModal.tsx
@@ -13,10 +13,11 @@ import {
 	Option,
 } from '@rocket.chat/fuselage';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
-import { useEndpoint, useSetting, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useSetting } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useForm } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import { useRecordList } from '../../../hooks/lists/useRecordList';
 import { AsyncStatePhase } from '../../../hooks/useAsyncState';
@@ -33,9 +34,9 @@ const ForwardChatModal = ({
 	onCancel: () => void;
 	room: IOmnichannelRoom;
 }): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const getUserData = useEndpoint('GET', '/v1/users.info');
-	const idleAgentsAllowedForForwarding = useSetting('Livechat_enabled_when_agent_idle') as boolean;
+	const idleAgentsAllowedForForwarding = useSetting('Livechat_enabled_when_agent_idle', true);
 
 	const {
 		getValues,
diff --git a/apps/meteor/client/components/Page/PageBlock.tsx b/apps/meteor/client/components/Page/PageBlock.tsx
new file mode 100644
index 000000000000..a2102b7a3708
--- /dev/null
+++ b/apps/meteor/client/components/Page/PageBlock.tsx
@@ -0,0 +1,11 @@
+import type { Box } from '@rocket.chat/fuselage';
+import type { ComponentProps } from 'react';
+import React, { forwardRef } from 'react';
+
+import PageContent from './PageContent';
+
+const PageBlock = forwardRef<HTMLElement, ComponentProps<typeof Box>>(function PageBlock(props, ref) {
+	return <PageContent borderBlockEndColor='transparent' {...props} pb={16} ref={ref} borderBlockEndWidth='default' height='auto' />;
+});
+
+export default PageBlock;
diff --git a/apps/meteor/client/components/Page/PageBlockWithBorder.tsx b/apps/meteor/client/components/Page/PageBlockWithBorder.tsx
index 8176f6734bfd..2bf0fab3068f 100644
--- a/apps/meteor/client/components/Page/PageBlockWithBorder.tsx
+++ b/apps/meteor/client/components/Page/PageBlockWithBorder.tsx
@@ -2,21 +2,12 @@ import type { Box } from '@rocket.chat/fuselage';
 import type { ComponentProps } from 'react';
 import React, { forwardRef, useContext } from 'react';
 
-import PageContent from './PageContent';
+import PageBlock from './PageBlock';
 import PageContext from './PageContext';
 
 const PageBlockWithBorder = forwardRef<HTMLElement, ComponentProps<typeof Box>>(function PageBlockWithBorder(props, ref) {
 	const [border] = useContext(PageContext);
-	return (
-		<PageContent
-			{...props}
-			pb={16}
-			ref={ref}
-			borderBlockEndColor={border ? 'extra-light' : 'transparent'}
-			borderBlockEndWidth='default'
-			height='auto'
-		/>
-	);
+	return <PageBlock ref={ref} {...props} borderBlockEndColor={border ? 'extra-light' : 'transparent'} />;
 });
 
 export default PageBlockWithBorder;
diff --git a/apps/meteor/client/components/Page/PageHeader.tsx b/apps/meteor/client/components/Page/PageHeader.tsx
index c6667e4fc5cc..8a079903884f 100644
--- a/apps/meteor/client/components/Page/PageHeader.tsx
+++ b/apps/meteor/client/components/Page/PageHeader.tsx
@@ -1,56 +1,24 @@
-import { Box, IconButton } from '@rocket.chat/fuselage';
-import { useDocumentTitle } from '@rocket.chat/ui-client';
-import { useLayout, useTranslation } from '@rocket.chat/ui-contexts';
 import type { ComponentPropsWithoutRef, ReactNode } from 'react';
 import React, { useContext } from 'react';
 
-import { HeaderToolbar } from '../Header';
-import SidebarToggler from '../SidebarToggler';
 import PageContext from './PageContext';
+import PageHeaderNoShadow from './PageHeaderNoShadow';
 
 type PageHeaderProps = {
 	title: ReactNode;
 	onClickBack?: () => void;
 	borderBlockEndColor?: string;
-} & Omit<ComponentPropsWithoutRef<typeof Box>, 'title'>;
+} & ComponentPropsWithoutRef<typeof PageHeaderNoShadow>;
 
-const PageHeader = ({ children = undefined, title, onClickBack, borderBlockEndColor, ...props }: PageHeaderProps) => {
-	const t = useTranslation();
+const PageHeader = ({ borderBlockEndColor, ...props }: PageHeaderProps) => {
 	const [border] = useContext(PageContext);
-	const { isMobile } = useLayout();
-
-	useDocumentTitle(typeof title === 'string' ? title : undefined);
 
 	return (
-		<Box
-			is='header'
+		<PageHeaderNoShadow
 			borderBlockEndWidth='default'
-			pb={8}
-			borderBlockEndColor={borderBlockEndColor ?? border ? 'extra-light' : 'transparent'}
+			borderBlockEndColor={(borderBlockEndColor ?? border) ? 'extra-light' : 'transparent'}
 			{...props}
-		>
-			<Box
-				height='100%'
-				marginInline={24}
-				minHeight='x64'
-				display='flex'
-				flexDirection='row'
-				flexWrap='wrap'
-				alignItems='center'
-				color='default'
-			>
-				{isMobile && (
-					<HeaderToolbar>
-						<SidebarToggler />
-					</HeaderToolbar>
-				)}
-				{onClickBack && <IconButton small mie={8} icon='arrow-back' onClick={onClickBack} title={t('Back')} />}
-				<Box is='h1' fontScale='h2' flexGrow={1} data-qa-type='PageHeader-title'>
-					{title}
-				</Box>
-				{children}
-			</Box>
-		</Box>
+		/>
 	);
 };
 
diff --git a/apps/meteor/client/components/Page/PageHeaderNoShadow.tsx b/apps/meteor/client/components/Page/PageHeaderNoShadow.tsx
new file mode 100644
index 000000000000..51feca504834
--- /dev/null
+++ b/apps/meteor/client/components/Page/PageHeaderNoShadow.tsx
@@ -0,0 +1,51 @@
+import { Box, IconButton } from '@rocket.chat/fuselage';
+import { useDocumentTitle } from '@rocket.chat/ui-client';
+import { useLayout } from '@rocket.chat/ui-contexts';
+import type { ComponentPropsWithoutRef, ReactNode } from 'react';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { HeaderToolbar } from '../Header';
+import SidebarToggler from '../SidebarToggler';
+
+type PageHeaderProps = {
+	title: ReactNode;
+	onClickBack?: () => void;
+	borderBlockEndColor?: string;
+} & Omit<ComponentPropsWithoutRef<typeof Box>, 'title'>;
+
+const PageHeaderNoShadow = ({ children = undefined, title, onClickBack, ...props }: PageHeaderProps) => {
+	const { t } = useTranslation();
+
+	const { isMobile } = useLayout();
+
+	useDocumentTitle(typeof title === 'string' ? title : undefined);
+
+	return (
+		<Box is='header' borderBlockEndWidth='default' borderBlockEndColor='transparent' {...props}>
+			<Box
+				height='100%'
+				marginInline={24}
+				minHeight='x64'
+				display='flex'
+				flexDirection='row'
+				flexWrap='wrap'
+				alignItems='center'
+				color='default'
+			>
+				{isMobile && (
+					<HeaderToolbar>
+						<SidebarToggler />
+					</HeaderToolbar>
+				)}
+				{onClickBack && <IconButton small mie={8} icon='arrow-back' onClick={onClickBack} title={t('Back')} />}
+				<Box is='h1' fontScale='h2' flexGrow={1} data-qa-type='PageHeader-title'>
+					{title}
+				</Box>
+				{children}
+			</Box>
+		</Box>
+	);
+};
+
+export default PageHeaderNoShadow;
diff --git a/apps/meteor/client/components/RoomAutoComplete/RoomAutoComplete.tsx b/apps/meteor/client/components/RoomAutoComplete/RoomAutoComplete.tsx
index 0da0e942b2e2..e3abc1d27219 100644
--- a/apps/meteor/client/components/RoomAutoComplete/RoomAutoComplete.tsx
+++ b/apps/meteor/client/components/RoomAutoComplete/RoomAutoComplete.tsx
@@ -51,7 +51,7 @@ const RoomAutoComplete = ({ value, onChange, scope = 'regular', renderRoomIcon,
 				? result.data.items.map(({ name, fname, _id, avatarETag, t, encrypted }) => ({
 						value: _id,
 						label: { name: fname || name, avatarETag, type: t, encrypted },
-				  }))
+					}))
 				: [],
 		[result.data?.items, result.isSuccess],
 	);
diff --git a/apps/meteor/client/components/RoomAutoCompleteMultiple/RoomAutoCompleteMultiple.tsx b/apps/meteor/client/components/RoomAutoCompleteMultiple/RoomAutoCompleteMultiple.tsx
index 49006e025111..8fb1af477df6 100644
--- a/apps/meteor/client/components/RoomAutoCompleteMultiple/RoomAutoCompleteMultiple.tsx
+++ b/apps/meteor/client/components/RoomAutoCompleteMultiple/RoomAutoCompleteMultiple.tsx
@@ -31,7 +31,7 @@ const RoomAutoCompleteMultiple = ({ value, onChange, ...props }: RoomAutoComplet
 				? result.data.items.map(({ fname, name, _id, avatarETag, t }) => ({
 						value: _id,
 						label: { name: fname || name, avatarETag, type: t },
-				  }))
+					}))
 				: [],
 		[result.data?.items, result.isSuccess],
 	);
diff --git a/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/OmnichannelAppSourceRoomIcon.tsx b/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/OmnichannelAppSourceRoomIcon.tsx
index 6a841c30491b..b6cc94007002 100644
--- a/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/OmnichannelAppSourceRoomIcon.tsx
+++ b/apps/meteor/client/components/RoomIcon/OmnichannelRoomIcon/OmnichannelAppSourceRoomIcon.tsx
@@ -3,8 +3,8 @@ import { Icon, Box } from '@rocket.chat/fuselage';
 import type { ComponentProps } from 'react';
 import React from 'react';
 
-import { AsyncStatePhase } from '../../../lib/asyncState/AsyncStatePhase';
 import { useOmnichannelRoomIcon } from './context/OmnichannelRoomIconContext';
+import { AsyncStatePhase } from '../../../lib/asyncState/AsyncStatePhase';
 
 type OmnichannelAppSourceRoomIconProps = {
 	source: IOmnichannelSourceFromApp;
diff --git a/apps/meteor/client/components/RoomIcon/RoomIcon.tsx b/apps/meteor/client/components/RoomIcon/RoomIcon.tsx
index d757071fedf5..12f4a13d1f33 100644
--- a/apps/meteor/client/components/RoomIcon/RoomIcon.tsx
+++ b/apps/meteor/client/components/RoomIcon/RoomIcon.tsx
@@ -4,8 +4,8 @@ import { Icon } from '@rocket.chat/fuselage';
 import type { ComponentProps, ReactElement } from 'react';
 import React, { isValidElement } from 'react';
 
-import { useRoomIcon } from '../../hooks/useRoomIcon';
 import { OmnichannelRoomIcon } from './OmnichannelRoomIcon';
+import { useRoomIcon } from '../../hooks/useRoomIcon';
 
 export const RoomIcon = ({
 	room,
diff --git a/apps/meteor/client/components/Sidebar/SidebarItemsAssembler.tsx b/apps/meteor/client/components/Sidebar/SidebarItemsAssembler.tsx
index b588e223d922..8507ff950dc4 100644
--- a/apps/meteor/client/components/Sidebar/SidebarItemsAssembler.tsx
+++ b/apps/meteor/client/components/Sidebar/SidebarItemsAssembler.tsx
@@ -2,9 +2,9 @@ import { Divider } from '@rocket.chat/fuselage';
 import React, { Fragment, memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import SidebarNavigationItem from './SidebarNavigationItem';
 import type { SidebarItem } from '../../lib/createSidebarItems';
 import { isSidebarItem } from '../../lib/createSidebarItems';
-import SidebarNavigationItem from './SidebarNavigationItem';
 
 type SidebarItemsAssemblerProps = {
 	items: SidebarItem[];
diff --git a/apps/meteor/client/components/SidebarToggler/SidebarToggler.tsx b/apps/meteor/client/components/SidebarToggler/SidebarToggler.tsx
index 2102621a35d7..1cdb993d433f 100644
--- a/apps/meteor/client/components/SidebarToggler/SidebarToggler.tsx
+++ b/apps/meteor/client/components/SidebarToggler/SidebarToggler.tsx
@@ -3,8 +3,8 @@ import { useLayout, useSession } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { memo } from 'react';
 
-import { useEmbeddedLayout } from '../../hooks/useEmbeddedLayout';
 import SidebarTogglerButton from './SidebarTogglerButton';
+import { useEmbeddedLayout } from '../../hooks/useEmbeddedLayout';
 
 const SideBarToggler = (): ReactElement => {
 	const { sidebar } = useLayout();
diff --git a/apps/meteor/client/components/TwoFactorModal/TwoFactorEmailModal.tsx b/apps/meteor/client/components/TwoFactorModal/TwoFactorEmailModal.tsx
index 9c7bd8191c92..1a8789bba3ee 100644
--- a/apps/meteor/client/components/TwoFactorModal/TwoFactorEmailModal.tsx
+++ b/apps/meteor/client/components/TwoFactorModal/TwoFactorEmailModal.tsx
@@ -1,8 +1,9 @@
 import { Box, FieldGroup, TextInput, Field, FieldLabel, FieldRow, FieldError, Button } from '@rocket.chat/fuselage';
 import { useAutoFocus, useUniqueId } from '@rocket.chat/fuselage-hooks';
-import { useToastMessageDispatch, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useToastMessageDispatch, useEndpoint } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ChangeEvent, SyntheticEvent } from 'react';
 import React, { useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../GenericModal';
 import type { OnConfirm } from './TwoFactorModal';
@@ -17,7 +18,7 @@ type TwoFactorEmailModalProps = {
 
 const TwoFactorEmailModal = ({ onConfirm, onClose, emailOrUsername, invalidAttempt }: TwoFactorEmailModalProps): ReactElement => {
 	const dispatchToastMessage = useToastMessageDispatch();
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [code, setCode] = useState<string>('');
 	const ref = useAutoFocus<HTMLInputElement>();
 
diff --git a/apps/meteor/client/components/UrlChangeModal.tsx b/apps/meteor/client/components/UrlChangeModal.tsx
index dbc152c7fbff..94233dfc7e18 100644
--- a/apps/meteor/client/components/UrlChangeModal.tsx
+++ b/apps/meteor/client/components/UrlChangeModal.tsx
@@ -26,7 +26,14 @@ const UrlChangeModal = ({ onConfirm, siteUrl, currentUrl, onClose }: UrlChangeMo
 					}),
 				}}
 			/>
-			<p dangerouslySetInnerHTML={{ __html: t('Do_you_want_to_change_to_s_question', currentUrl) }} />
+			<p
+				dangerouslySetInnerHTML={{
+					__html: t('Do_you_want_to_change_to_s_question', {
+						postProcess: 'sprintf',
+						sprintf: [currentUrl],
+					}),
+				}}
+			/>
 		</GenericModal>
 	);
 };
diff --git a/apps/meteor/client/components/UserInfo/UserInfoAvatar.tsx b/apps/meteor/client/components/UserInfo/UserInfoAvatar.tsx
index c15992489264..f59355cfacbd 100644
--- a/apps/meteor/client/components/UserInfo/UserInfoAvatar.tsx
+++ b/apps/meteor/client/components/UserInfo/UserInfoAvatar.tsx
@@ -2,8 +2,6 @@ import { UserAvatar } from '@rocket.chat/ui-avatar';
 import type { ComponentProps, ReactElement } from 'react';
 import React from 'react';
 
-const UserInfoAvatar = ({ username, ...props }: ComponentProps<typeof UserAvatar>): ReactElement => (
-	<UserAvatar title={username} username={username} size='x332' {...props} />
-);
+const UserInfoAvatar = (props: ComponentProps<typeof UserAvatar>): ReactElement => <UserAvatar size='x332' {...props} />;
 
 export default UserInfoAvatar;
diff --git a/apps/meteor/client/components/UserStatusMenu.tsx b/apps/meteor/client/components/UserStatusMenu.tsx
index 8f2dd24d6017..f1c9afaa9b8b 100644
--- a/apps/meteor/client/components/UserStatusMenu.tsx
+++ b/apps/meteor/client/components/UserStatusMenu.tsx
@@ -1,8 +1,9 @@
 import { UserStatus as UserStatusType } from '@rocket.chat/core-typings';
 import { Button, PositionAnimated, Options, useCursor, Box } from '@rocket.chat/fuselage';
-import { useSetting, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetting } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ComponentProps } from 'react';
 import React, { useRef, useCallback, useState, useMemo, useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { UserStatus } from './UserStatus';
 
@@ -21,9 +22,9 @@ const UserStatusMenu = ({
 	optionWidth = undefined,
 	placement = 'bottom-end',
 }: UserStatusMenuProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [status, setStatus] = useState(initialStatus);
-	const allowInvisibleStatus = useSetting('Accounts_AllowInvisibleStatusOption') as boolean;
+	const allowInvisibleStatus = useSetting('Accounts_AllowInvisibleStatusOption', true);
 
 	const options = useMemo(() => {
 		const renderOption = (status: UserStatusType, label: string): ReactElement => (
diff --git a/apps/meteor/client/components/avatar/RoomAvatarEditor.tsx b/apps/meteor/client/components/avatar/RoomAvatarEditor.tsx
index de4108d8f866..4eeb81405df3 100644
--- a/apps/meteor/client/components/avatar/RoomAvatarEditor.tsx
+++ b/apps/meteor/client/components/avatar/RoomAvatarEditor.tsx
@@ -4,9 +4,10 @@ import { css } from '@rocket.chat/css-in-js';
 import { Box, Button, ButtonGroup } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { RoomAvatar } from '@rocket.chat/ui-avatar';
-import { useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { getAvatarURL } from '../../../app/utils/client/getAvatarURL';
 import { useSingleFileInput } from '../../hooks/useSingleFileInput';
@@ -20,7 +21,7 @@ type RoomAvatarEditorProps = {
 };
 
 const RoomAvatarEditor = ({ disabled = false, room, roomAvatar, onChangeAvatar }: RoomAvatarEditorProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 
 	const handleChangeAvatar = useMutableCallback(async (file) => {
diff --git a/apps/meteor/client/components/avatar/UserAvatarEditor/UserAvatarEditor.tsx b/apps/meteor/client/components/avatar/UserAvatarEditor/UserAvatarEditor.tsx
index 05d96d9536be..95659d762d30 100644
--- a/apps/meteor/client/components/avatar/UserAvatarEditor/UserAvatarEditor.tsx
+++ b/apps/meteor/client/components/avatar/UserAvatarEditor/UserAvatarEditor.tsx
@@ -2,15 +2,16 @@ import type { IUser, AvatarObject } from '@rocket.chat/core-typings';
 import { Box, Button, Avatar, TextInput, IconButton, Label } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
-import { useToastMessageDispatch, useSetting, useTranslation } from '@rocket.chat/ui-contexts';
+import { useToastMessageDispatch, useSetting } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ChangeEvent } from 'react';
 import React, { useState, useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
-import { useSingleFileInput } from '../../../hooks/useSingleFileInput';
-import { isValidImageFormat } from '../../../lib/utils/isValidImageFormat';
 import type { UserAvatarSuggestion } from './UserAvatarSuggestion';
 import UserAvatarSuggestions from './UserAvatarSuggestions';
 import { readFileAsDataURL } from './readFileAsDataURL';
+import { useSingleFileInput } from '../../../hooks/useSingleFileInput';
+import { isValidImageFormat } from '../../../lib/utils/isValidImageFormat';
 
 type UserAvatarEditorProps = {
 	currentUsername: IUser['username'];
@@ -21,7 +22,7 @@ type UserAvatarEditorProps = {
 };
 
 function UserAvatarEditor({ currentUsername, username, setAvatarObj, disabled, etag }: UserAvatarEditorProps): ReactElement {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const rotateImages = useSetting('FileUpload_RotateImages');
 	const [avatarFromUrl, setAvatarFromUrl] = useState('');
 	const [newAvatarSource, setNewAvatarSource] = useState<string>();
diff --git a/apps/meteor/client/components/connectionStatus/ConnectionStatusBar.stories.tsx b/apps/meteor/client/components/connectionStatus/ConnectionStatusBar.stories.tsx
index 4f3da8b3f36f..3829d946784c 100644
--- a/apps/meteor/client/components/connectionStatus/ConnectionStatusBar.stories.tsx
+++ b/apps/meteor/client/components/connectionStatus/ConnectionStatusBar.stories.tsx
@@ -14,8 +14,9 @@ export default {
 	},
 } satisfies Meta<typeof ConnectionStatusBar>;
 
-const stateDecorator = (value: ContextType<typeof ConnectionStatusContext>) => (fn: () => ReactElement) =>
-	<ConnectionStatusContext.Provider value={value}>{fn()}</ConnectionStatusContext.Provider>;
+const stateDecorator = (value: ContextType<typeof ConnectionStatusContext>) => (fn: () => ReactElement) => (
+	<ConnectionStatusContext.Provider value={value}>{fn()}</ConnectionStatusContext.Provider>
+);
 
 const Template: StoryFn<typeof ConnectionStatusBar> = () => <ConnectionStatusBar />;
 
diff --git a/apps/meteor/client/components/dashboards/DownloadDataButton.tsx b/apps/meteor/client/components/dashboards/DownloadDataButton.tsx
index 2edaf80237e3..84ed48c86f01 100644
--- a/apps/meteor/client/components/dashboards/DownloadDataButton.tsx
+++ b/apps/meteor/client/components/dashboards/DownloadDataButton.tsx
@@ -1,8 +1,9 @@
 import type { Box } from '@rocket.chat/fuselage';
 import { IconButton } from '@rocket.chat/fuselage';
-import { useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { downloadCsvAs } from '../../lib/download';
 
@@ -24,7 +25,7 @@ const DownloadDataButton = <H extends readonly string[]>({
 	dataExtractor,
 	...props
 }: DownloadDataButtonProps<H>): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 
 	const handleClick = (): void => {
diff --git a/apps/meteor/client/components/dataView/Growth.stories.tsx b/apps/meteor/client/components/dataView/Growth.stories.tsx
index 11092d52f993..28f52cd01f3f 100644
--- a/apps/meteor/client/components/dataView/Growth.stories.tsx
+++ b/apps/meteor/client/components/dataView/Growth.stories.tsx
@@ -2,8 +2,8 @@ import { Box } from '@rocket.chat/fuselage';
 import type { Meta, StoryFn } from '@storybook/react';
 import React from 'react';
 
-import { useAutoSequence } from '../../stories/hooks/useAutoSequence';
 import Growth from './Growth';
+import { useAutoSequence } from '../../stories/hooks/useAutoSequence';
 
 export default {
 	title: 'Components/Data/Growth',
diff --git a/apps/meteor/client/components/dataView/NegativeGrowthSymbol.stories.tsx b/apps/meteor/client/components/dataView/NegativeGrowthSymbol.stories.tsx
index 9c5ca3f4d44d..19be0dde4af6 100644
--- a/apps/meteor/client/components/dataView/NegativeGrowthSymbol.stories.tsx
+++ b/apps/meteor/client/components/dataView/NegativeGrowthSymbol.stories.tsx
@@ -2,8 +2,8 @@ import { Box } from '@rocket.chat/fuselage';
 import type { Meta, StoryFn } from '@storybook/react';
 import React from 'react';
 
-import { useAutoSequence } from '../../stories/hooks/useAutoSequence';
 import NegativeGrowthSymbol from './NegativeGrowthSymbol';
+import { useAutoSequence } from '../../stories/hooks/useAutoSequence';
 
 export default {
 	title: 'Components/Data/NegativeGrowthSymbol',
diff --git a/apps/meteor/client/components/dataView/PositiveGrowthSymbol.stories.tsx b/apps/meteor/client/components/dataView/PositiveGrowthSymbol.stories.tsx
index 8f08dfee9c0e..603c97edf788 100644
--- a/apps/meteor/client/components/dataView/PositiveGrowthSymbol.stories.tsx
+++ b/apps/meteor/client/components/dataView/PositiveGrowthSymbol.stories.tsx
@@ -2,8 +2,8 @@ import { Box } from '@rocket.chat/fuselage';
 import type { Meta, StoryFn } from '@storybook/react';
 import React from 'react';
 
-import { useAutoSequence } from '../../stories/hooks/useAutoSequence';
 import PositiveGrowthSymbol from './PositiveGrowthSymbol';
+import { useAutoSequence } from '../../stories/hooks/useAutoSequence';
 
 export default {
 	title: 'Components/Data/PositiveGrowthSymbol',
diff --git a/apps/meteor/client/components/message/MessageHeader.tsx b/apps/meteor/client/components/message/MessageHeader.tsx
index 21a4d8484f8f..e2d7fb6f2669 100644
--- a/apps/meteor/client/components/message/MessageHeader.tsx
+++ b/apps/meteor/client/components/message/MessageHeader.tsx
@@ -11,16 +11,16 @@ import type { KeyboardEvent, ReactElement } from 'react';
 import React, { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import StatusIndicators from './StatusIndicators';
+import MessageRoles from './header/MessageRoles';
+import { useMessageListShowUsername, useMessageListShowRealName, useMessageListShowRoles } from './list/MessageListContext';
 import { getUserDisplayName } from '../../../lib/getUserDisplayName';
 import { useFormatDateAndTime } from '../../hooks/useFormatDateAndTime';
 import { useFormatTime } from '../../hooks/useFormatTime';
 import { useUserData } from '../../hooks/useUserData';
 import type { UserPresence } from '../../lib/presence';
-import { useUserCard } from '../../views/room/contexts/UserCardContext';
-import StatusIndicators from './StatusIndicators';
-import MessageRoles from './header/MessageRoles';
 import { useMessageRoles } from './header/hooks/useMessageRoles';
-import { useMessageListShowUsername, useMessageListShowRealName, useMessageListShowRoles } from './list/MessageListContext';
+import { useUserCard } from '../../views/room/contexts/UserCardContext';
 
 type MessageHeaderProps = {
 	message: IMessage;
diff --git a/apps/meteor/client/components/message/StatusIndicators.tsx b/apps/meteor/client/components/message/StatusIndicators.tsx
index eb47fb040b21..b0fd17adbd26 100644
--- a/apps/meteor/client/components/message/StatusIndicators.tsx
+++ b/apps/meteor/client/components/message/StatusIndicators.tsx
@@ -1,9 +1,10 @@
 import type { IMessage, ITranslatedMessage } from '@rocket.chat/core-typings';
 import { isEditedMessage, isE2EEMessage, isOTRMessage, isOTRAckMessage, isE2EEPinnedMessage } from '@rocket.chat/core-typings';
 import { MessageStatusIndicator, MessageStatusIndicatorItem } from '@rocket.chat/fuselage';
-import { useUserId, useTranslation } from '@rocket.chat/ui-contexts';
+import { useUserId } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useMessageDateFormatter, useShowStarred, useShowTranslated, useShowFollowing } from './list/MessageListContext';
 
@@ -12,7 +13,7 @@ type StatusIndicatorsProps = {
 };
 
 const StatusIndicators = ({ message }: StatusIndicatorsProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const translated = useShowTranslated(message);
 	const starred = useShowStarred({ message });
 	const following = useShowFollowing({ message });
@@ -41,7 +42,7 @@ const StatusIndicators = ({ message }: StatusIndicatorsProps): ReactElement => {
 							: t('Message_has_been_edited_by_at', {
 									username: message.editedBy.username || '?',
 									date: formatter(message.editedAt),
-							  })
+								})
 					}
 				/>
 			)}
diff --git a/apps/meteor/client/components/message/content/Attachments.tsx b/apps/meteor/client/components/message/content/Attachments.tsx
index ea9c03b9e7d3..365d80572c49 100644
--- a/apps/meteor/client/components/message/content/Attachments.tsx
+++ b/apps/meteor/client/components/message/content/Attachments.tsx
@@ -10,13 +10,7 @@ type AttachmentsProps = {
 };
 
 const Attachments = ({ attachments, id }: AttachmentsProps): ReactElement => {
-	return (
-		<>
-			{attachments?.map((attachment, index) => (
-				<AttachmentsItem key={index} id={id} attachment={{ ...attachment }} />
-			))}
-		</>
-	);
+	return <>{attachments?.map((attachment, index) => <AttachmentsItem key={index} id={id} attachment={{ ...attachment }} />)}</>;
 };
 
 export default Attachments;
diff --git a/apps/meteor/client/components/message/content/MessageActions.tsx b/apps/meteor/client/components/message/content/MessageActions.tsx
index d38fbb6c64df..3700067a7272 100644
--- a/apps/meteor/client/components/message/content/MessageActions.tsx
+++ b/apps/meteor/client/components/message/content/MessageActions.tsx
@@ -6,8 +6,8 @@ import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import { actionLinks } from '../../../lib/actionLinks';
 import MessageAction from './actions/MessageAction';
+import { actionLinks } from '../../../lib/actionLinks';
 
 type MessageActionOptions = {
 	icon: IconName;
diff --git a/apps/meteor/client/components/message/content/ThreadMetrics.spec.tsx b/apps/meteor/client/components/message/content/ThreadMetrics.spec.tsx
new file mode 100644
index 000000000000..22e5e382fd74
--- /dev/null
+++ b/apps/meteor/client/components/message/content/ThreadMetrics.spec.tsx
@@ -0,0 +1,326 @@
+import { mockAppRoot, MockedRouterContext } from '@rocket.chat/mock-providers';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import type { ReactNode } from 'react';
+import React from 'react';
+
+import ThreadMetrics from './ThreadMetrics';
+import ThreadMetricsFollow from './ThreadMetricsFollow';
+import ThreadMetricsParticipants from './ThreadMetricsParticipants';
+
+const toggleFollowMock =
+	(done: jest.DoneCallback | (() => undefined)) =>
+	({ mid }: { mid: string }) => {
+		expect(mid).toBe('mid');
+		done();
+		return null;
+	};
+
+global.ResizeObserver = jest.fn().mockImplementation(() => ({
+	observe: jest.fn(),
+	unobserve: jest.fn(),
+	disconnect: jest.fn(),
+}));
+
+const mockRoot = () => {
+	const AppRoot = mockAppRoot();
+	const buildWithRouter = (navigate: (...args: any[]) => void) => {
+		const Wrapper = AppRoot.build();
+		return function Mock({ children }: { children: ReactNode }) {
+			return (
+				<Wrapper>
+					<MockedRouterContext router={{ navigate, getRouteName: () => 'thread' as any }}>{children}</MockedRouterContext>
+				</Wrapper>
+			);
+		};
+	};
+
+	return Object.assign(AppRoot, { buildWithRouter });
+};
+
+const mockedTranslations = [
+	'en',
+	'core',
+	{
+		Follower_one: 'follower',
+		Follower_other: 'followers',
+		__count__replies__date__: '{{count}} replies {{date}}',
+		__count__replies: '{{count}} replies',
+	},
+] as const;
+
+let inlineSize = 400;
+jest.mock('@rocket.chat/fuselage-hooks', () => {
+	const originalModule = jest.requireActual('@rocket.chat/fuselage-hooks');
+	return {
+		...originalModule,
+		useResizeObserver: () => ({ ref: () => undefined, borderBoxSize: { inlineSize } }),
+	};
+});
+
+describe('Thread Metrics', () => {
+	describe('Main component', () => {
+		it('should render large followed with 3 participants and unread', async () => {
+			const navigateSpy = jest.fn();
+			const navigateCallback = (route: any) => {
+				navigateSpy(route.name, route.params.rid, route.params.tab, route.params.context);
+			};
+
+			render(
+				<ThreadMetrics
+					lm={new Date(2024, 6, 1, 0, 0, 0)}
+					counter={5}
+					participants={['user1', 'user2', 'user3']}
+					unread={true}
+					mention={false}
+					all={false}
+					mid='mid'
+					rid='rid'
+					following={true}
+				/>,
+				{
+					wrapper: mockRoot()
+						.withEndpoint(
+							'POST',
+							'/v1/chat.followMessage',
+							toggleFollowMock(() => undefined),
+						)
+						.withEndpoint(
+							'POST',
+							'/v1/chat.unfollowMessage',
+							toggleFollowMock(() => undefined),
+						)
+						.withUserPreference('clockMode', 1)
+						.withSetting('Message_TimeFormat', 'LT')
+						.withTranslations(...mockedTranslations)
+						.buildWithRouter(navigateCallback),
+					legacyRoot: true,
+				},
+			);
+
+			const followButton = screen.getByTitle('Following');
+			expect(followButton).toBeVisible();
+
+			const badge = screen.getByTitle('Unread');
+			expect(badge).toBeVisible();
+
+			expect(screen.getByTitle('followers')).toBeVisible();
+			expect(screen.getByText('3')).toBeVisible();
+
+			const replyButton = screen.getByText('View_thread');
+			expect(replyButton).toBeVisible();
+			await userEvent.click(replyButton);
+
+			expect(navigateSpy).toHaveBeenCalledWith('thread', 'rid', 'thread', 'mid');
+
+			const threadCount = screen.getByTitle('Last_message__date__');
+			expect(threadCount).toHaveTextContent('5 replies July 1, 2024');
+		});
+
+		it('should render small not followed with 3 participants and unread', async () => {
+			const navigateSpy = jest.fn();
+			const navigateCallback = (route: any) => {
+				navigateSpy(route.name, route.params.rid, route.params.tab, route.params.context);
+			};
+			inlineSize = 200;
+
+			render(
+				<ThreadMetrics
+					lm={new Date(2024, 6, 1, 0, 0, 0)}
+					counter={5}
+					participants={['user1', 'user2', 'user3']}
+					unread={true}
+					mention={false}
+					all={false}
+					mid='mid'
+					rid='rid'
+					following={false}
+				/>,
+				{
+					wrapper: mockRoot()
+						.withEndpoint(
+							'POST',
+							'/v1/chat.followMessage',
+							toggleFollowMock(() => undefined),
+						)
+						.withEndpoint(
+							'POST',
+							'/v1/chat.unfollowMessage',
+							toggleFollowMock(() => undefined),
+						)
+						.withUserPreference('clockMode', 1)
+						.withSetting('Message_TimeFormat', 'LT')
+						.withTranslations(...mockedTranslations)
+						.buildWithRouter(navigateCallback),
+					legacyRoot: true,
+				},
+			);
+			const followButton = screen.getByTitle('Not_following');
+			expect(followButton).toBeVisible();
+
+			const badge = screen.getByTitle('Unread');
+			expect(badge).toBeVisible();
+
+			expect(screen.getByTitle('followers')).toBeVisible();
+			expect(screen.getByText('3')).toBeVisible();
+
+			const replyButton = screen.getByText('View_thread');
+			expect(replyButton).toBeVisible();
+			await userEvent.click(replyButton);
+
+			expect(navigateSpy).toHaveBeenCalledWith('thread', 'rid', 'thread', 'mid');
+
+			const threadCount = screen.getByTitle('Last_message__date__');
+			expect(threadCount).toHaveTextContent('5 replies');
+		});
+	});
+
+	describe('ThreadMetricsFollow', () => {
+		it('should render not followed', async () => {
+			render(<ThreadMetricsFollow unread={true} mention={false} all={false} mid='mid' rid='rid' following={false} />, {
+				wrapper: mockAppRoot()
+					.withEndpoint(
+						'POST',
+						'/v1/chat.followMessage',
+						toggleFollowMock(() => undefined),
+					)
+					.build(),
+				legacyRoot: true,
+			});
+			const followButton = screen.getByTitle('Not_following');
+			expect(followButton).toBeVisible();
+			await userEvent.click(followButton);
+		});
+		it('should render followed', async () => {
+			render(<ThreadMetricsFollow unread={true} mention={false} all={false} mid='mid' rid='rid' following={true} />, {
+				wrapper: mockAppRoot()
+					.withEndpoint(
+						'POST',
+						'/v1/chat.unfollowMessage',
+						toggleFollowMock(() => undefined),
+					)
+					.build(),
+				legacyRoot: true,
+			});
+			const followButton = screen.getByTitle('Following');
+			expect(followButton).toBeVisible();
+			await userEvent.click(followButton);
+		});
+		it('should render unread badge', () => {
+			render(<ThreadMetricsFollow unread={true} mention={false} all={false} mid='mid' rid='rid' following={false} />, {
+				wrapper: mockAppRoot().build(),
+				legacyRoot: true,
+			});
+			const badge = screen.getByTitle('Unread');
+			expect(badge).toBeVisible();
+		});
+		it('should render mention-all badge', () => {
+			render(<ThreadMetricsFollow unread={true} mention={false} all={true} mid='mid' rid='rid' following={false} />, {
+				wrapper: mockAppRoot().build(),
+				legacyRoot: true,
+			});
+			const badge = screen.getByTitle('mention-all');
+			expect(badge).toBeVisible();
+		});
+		it('should render Mentions_you badge', () => {
+			render(<ThreadMetricsFollow unread={true} mention={true} all={false} mid='mid' rid='rid' following={false} />, {
+				wrapper: mockAppRoot().build(),
+				legacyRoot: true,
+			});
+			const badge = screen.getByTitle('Mentions_you');
+			expect(badge).toBeVisible();
+		});
+	});
+	describe('ThreadMetricsParticipants', () => {
+		it('should render 1 avatars', () => {
+			render(<ThreadMetricsParticipants participants={['user1']} />, {
+				wrapper: mockAppRoot()
+					.withUserPreference('displayAvatars', true)
+					.withTranslations(...mockedTranslations)
+					.build(),
+				legacyRoot: true,
+			});
+			expect(screen.getByTitle('follower')).toBeVisible();
+			const avatars = screen.getAllByRole('figure');
+			expect(avatars.length).toBe(1);
+			expect(avatars.pop()).toBeVisible();
+		});
+		it('should render 2 avatars', () => {
+			render(<ThreadMetricsParticipants participants={['user1', 'user2']} />, {
+				wrapper: mockAppRoot()
+					.withUserPreference('displayAvatars', true)
+					.withTranslations(...mockedTranslations)
+					.build(),
+				legacyRoot: true,
+			});
+			expect(screen.getByTitle('followers')).toBeVisible();
+			const avatars = screen.getAllByRole('figure');
+			expect(avatars.length).toBe(2);
+			avatars.forEach((avatar) => expect(avatar).toBeVisible());
+		});
+		it('should render 2 avatars and "+1" text', () => {
+			render(<ThreadMetricsParticipants participants={['user1', 'user2', 'user3']} />, {
+				wrapper: mockAppRoot()
+					.withUserPreference('displayAvatars', true)
+					.withTranslations(...mockedTranslations)
+					.build(),
+				legacyRoot: true,
+			});
+			expect(screen.getByTitle('followers')).toBeVisible();
+			const avatars = screen.getAllByRole('figure');
+			expect(avatars.length).toBe(2);
+			avatars.forEach((avatar) => expect(avatar).toBeVisible());
+			expect(screen.getByText('+1')).toBeVisible();
+		});
+		it('should render 2 avatars and "+5" text', () => {
+			render(<ThreadMetricsParticipants participants={['user1', 'user2', 'user3', 'user4', 'user5', 'user6', 'user7']} />, {
+				wrapper: mockAppRoot()
+					.withUserPreference('displayAvatars', true)
+					.withTranslations(...mockedTranslations)
+					.build(),
+				legacyRoot: true,
+			});
+			expect(screen.getByTitle('followers')).toBeVisible();
+
+			const avatars = screen.getAllByRole('figure');
+			expect(avatars.length).toBe(2);
+			avatars.forEach((avatar) => expect(avatar).toBeVisible());
+
+			expect(screen.getByText('+5')).toBeVisible();
+		});
+
+		it('should render user icon and 1 follower', () => {
+			render(<ThreadMetricsParticipants participants={['user1']} />, {
+				wrapper: mockAppRoot()
+					.withUserPreference('displayAvatars', false)
+					.withTranslations(...mockedTranslations)
+					.build(),
+				legacyRoot: true,
+			});
+			const follower = screen.getByTitle('follower');
+			expect(follower).toBeVisible();
+
+			// eslint-disable-next-line testing-library/no-node-access
+			expect(follower.querySelector('.rcx-icon--name-user')).toBeVisible();
+
+			expect(screen.getByText('1')).toBeVisible();
+		});
+
+		it('should render user icon and 5 followers', () => {
+			render(<ThreadMetricsParticipants participants={['user1', 'user2', 'user3', 'user4', 'user5']} />, {
+				wrapper: mockAppRoot()
+					.withUserPreference('displayAvatars', false)
+					.withTranslations(...mockedTranslations)
+					.build(),
+				legacyRoot: true,
+			});
+			const follower = screen.getByTitle('followers');
+			expect(follower).toBeVisible();
+
+			// eslint-disable-next-line testing-library/no-node-access
+			expect(follower.querySelector('.rcx-icon--name-user')).toBeVisible();
+
+			expect(screen.getByText('5')).toBeVisible();
+		});
+	});
+});
diff --git a/apps/meteor/client/components/message/content/ThreadMetrics.tsx b/apps/meteor/client/components/message/content/ThreadMetrics.tsx
index f3b6915a95dd..6d98b65650dd 100644
--- a/apps/meteor/client/components/message/content/ThreadMetrics.tsx
+++ b/apps/meteor/client/components/message/content/ThreadMetrics.tsx
@@ -1,15 +1,20 @@
-import { MessageMetricsItem, MessageBlock, MessageMetrics, MessageMetricsReply, MessageMetricsFollowing } from '@rocket.chat/fuselage';
-import { useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import {
+	MessageMetricsItem,
+	MessageBlock,
+	MessageMetrics,
+	MessageMetricsReply,
+	MessageMetricsItemIcon,
+	MessageMetricsItemLabel,
+} from '@rocket.chat/fuselage';
+import { useResizeObserver } from '@rocket.chat/fuselage-hooks';
 import type { ReactElement } from 'react';
-import React, { useCallback } from 'react';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
 
+import ThreadMetricsFollow from './ThreadMetricsFollow';
+import ThreadMetricsParticipants from './ThreadMetricsParticipants';
 import { useTimeAgo } from '../../../hooks/useTimeAgo';
-import { useToggleFollowingThreadMutation } from '../../../views/room/contextualBar/Threads/hooks/useToggleFollowingThreadMutation';
 import { useGoToThread } from '../../../views/room/hooks/useGoToThread';
-import { followStyle, anchor } from '../helpers/followSyle';
-import AllMentionNotification from '../notification/AllMentionNotification';
-import MeMentionNotification from '../notification/MeMentionNotification';
-import UnreadMessagesNotification from '../notification/UnreadMessagesNotification';
 
 type ThreadMetricsProps = {
 	unread: boolean;
@@ -19,62 +24,44 @@ type ThreadMetricsProps = {
 	mid: string;
 	rid: string;
 	counter: number;
-	participants: number;
+	participants: string[];
 	following: boolean;
 };
 
 const ThreadMetrics = ({ unread, mention, all, rid, mid, counter, participants, following, lm }: ThreadMetricsProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const format = useTimeAgo();
 
 	const goToThread = useGoToThread();
 
-	const dispatchToastMessage = useToastMessageDispatch();
-	const toggleFollowingThreadMutation = useToggleFollowingThreadMutation({
-		onError: (error) => {
-			dispatchToastMessage({ type: 'error', message: error });
-		},
-	});
+	const { ref, borderBoxSize } = useResizeObserver<HTMLDivElement>();
 
-	const handleFollow = useCallback(() => {
-		toggleFollowingThreadMutation.mutate({ rid, tmid: mid, follow: !following });
-	}, [following, rid, mid, toggleFollowingThreadMutation]);
+	const isSmall = (borderBoxSize.inlineSize || Infinity) < 320;
 
 	return (
-		<MessageBlock className={followStyle}>
+		<MessageBlock ref={ref}>
 			<MessageMetrics>
-				<MessageMetricsReply data-rid={rid} data-mid={mid} onClick={() => goToThread({ rid, tmid: mid })}>
-					{t('Reply')}
+				<MessageMetricsReply
+					data-rid={rid}
+					data-mid={mid}
+					onClick={() => goToThread({ rid, tmid: mid })}
+					primary={!!unread}
+					position='relative'
+					overflow='visible'
+				>
+					{t('View_thread')}
 				</MessageMetricsReply>
-				<MessageMetricsItem title={t('Replies')}>
-					<MessageMetricsItem.Icon name='thread' />
-					<MessageMetricsItem.Label>{counter}</MessageMetricsItem.Label>
+				<ThreadMetricsFollow unread={unread} mention={mention} all={all} mid={mid} rid={rid} following={following} />
+				{participants?.length > 0 && <ThreadMetricsParticipants participants={participants} />}
+				<MessageMetricsItem title={t('Last_message__date__', { date: format(lm) })}>
+					<MessageMetricsItemIcon name='thread' />
+					{isSmall ? (
+						<MessageMetricsItemLabel>{t('__count__replies', { count: counter })}</MessageMetricsItemLabel>
+					) : (
+						<MessageMetricsItemLabel>{t('__count__replies__date__', { count: counter, date: format(lm) })}</MessageMetricsItemLabel>
+					)}
 				</MessageMetricsItem>
-				{!!participants && (
-					<MessageMetricsItem title={t('Participants')}>
-						<MessageMetricsItem.Icon name='user' />
-						<MessageMetricsItem.Label>{participants}</MessageMetricsItem.Label>
-					</MessageMetricsItem>
-				)}
-				<MessageMetricsItem title={lm?.toLocaleString()}>
-					<MessageMetricsItem.Icon name='clock' />
-					<MessageMetricsItem.Label>{format(lm)}</MessageMetricsItem.Label>
-				</MessageMetricsItem>
-				<MessageMetricsItem className={!following ? anchor : undefined} data-rid={rid}>
-					<MessageMetricsFollowing
-						title={t(following ? 'Following' : 'Not_following')}
-						name={following ? 'bell' : 'bell-off'}
-						onClick={handleFollow}
-					/>
-				</MessageMetricsItem>
-				{(mention || all || unread) && (
-					<MessageMetricsItem>
-						<MessageMetricsItem.Label>
-							{(mention && <MeMentionNotification />) || (all && <AllMentionNotification />) || (unread && <UnreadMessagesNotification />)}
-						</MessageMetricsItem.Label>
-					</MessageMetricsItem>
-				)}
 			</MessageMetrics>
 		</MessageBlock>
 	);
diff --git a/apps/meteor/client/components/message/content/ThreadMetricsFollow.tsx b/apps/meteor/client/components/message/content/ThreadMetricsFollow.tsx
new file mode 100644
index 000000000000..351d984d74d6
--- /dev/null
+++ b/apps/meteor/client/components/message/content/ThreadMetricsFollow.tsx
@@ -0,0 +1,50 @@
+import type { IMessage } from '@rocket.chat/core-typings';
+import { MessageMetricsItem, MessageMetricsFollowing } from '@rocket.chat/fuselage';
+import { useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import type { ReactElement } from 'react';
+import React, { useCallback } from 'react';
+
+import ThreadMetricsBadge from './ThreadMetricsUnreadBadge';
+import { useToggleFollowingThreadMutation } from '../../../views/room/contextualBar/Threads/hooks/useToggleFollowingThreadMutation';
+
+type ThreadMetricsFollowProps = {
+	following: boolean;
+	mid: IMessage['_id'];
+	rid: IMessage['rid'];
+	unread: boolean;
+	mention: boolean;
+	all: boolean;
+};
+
+const ThreadMetricsFollow = ({ following, mid, rid, unread, mention, all }: ThreadMetricsFollowProps): ReactElement => {
+	const t = useTranslation();
+
+	const dispatchToastMessage = useToastMessageDispatch();
+	const toggleFollowingThreadMutation = useToggleFollowingThreadMutation({
+		onError: (error) => {
+			dispatchToastMessage({ type: 'error', message: error });
+		},
+	});
+
+	const handleFollow = useCallback(
+		(e) => {
+			e.preventDefault();
+			e.stopPropagation();
+			toggleFollowingThreadMutation.mutate({ rid, tmid: mid, follow: !following });
+		},
+		[following, rid, mid, toggleFollowingThreadMutation],
+	);
+
+	return (
+		<MessageMetricsItem data-rid={rid}>
+			<MessageMetricsFollowing
+				title={t(following ? 'Following' : 'Not_following')}
+				name={following ? 'bell' : 'bell-off'}
+				onClick={handleFollow}
+				badge={<ThreadMetricsBadge unread={unread} mention={mention} all={all} />}
+			/>
+		</MessageMetricsItem>
+	);
+};
+
+export default ThreadMetricsFollow;
diff --git a/apps/meteor/client/components/message/content/ThreadMetricsParticipants.tsx b/apps/meteor/client/components/message/content/ThreadMetricsParticipants.tsx
new file mode 100644
index 000000000000..e647fba6ad54
--- /dev/null
+++ b/apps/meteor/client/components/message/content/ThreadMetricsParticipants.tsx
@@ -0,0 +1,49 @@
+import {
+	MessageMetricsItem,
+	MessageMetricsItemLabel,
+	MessageMetricsItemAvatarRow,
+	MessageMetricsItemIcon,
+	MessageMetricsItemAvatarRowContent,
+} from '@rocket.chat/fuselage';
+import { UserAvatar } from '@rocket.chat/ui-avatar';
+import { useTranslation, useUserPreference } from '@rocket.chat/ui-contexts';
+import type { ReactElement } from 'react';
+import React from 'react';
+
+type ThreadMetricsParticipantsProps = {
+	participants: Array<string>;
+};
+
+const ThreadMetricsParticipants = ({ participants }: ThreadMetricsParticipantsProps): ReactElement => {
+	const t = useTranslation();
+
+	const hideAvatar = !useUserPreference('displayAvatars');
+
+	const participantsLengthExcludingVisibleAvatars = participants.length - 2;
+	const participantsLabel = participantsLengthExcludingVisibleAvatars > 0 ? `+${participantsLengthExcludingVisibleAvatars}` : undefined;
+
+	return (
+		<MessageMetricsItem title={t('Follower', { count: participants.length })}>
+			{hideAvatar && (
+				<>
+					<MessageMetricsItemIcon name='user' />
+					<MessageMetricsItemLabel>{participants.length}</MessageMetricsItemLabel>
+				</>
+			)}
+			{!hideAvatar && (
+				<>
+					<MessageMetricsItemAvatarRow>
+						{participants.slice(0, 2).map((uid) => (
+							<MessageMetricsItemAvatarRowContent key={uid}>
+								<UserAvatar size='x16' userId={uid} />
+							</MessageMetricsItemAvatarRowContent>
+						))}
+					</MessageMetricsItemAvatarRow>
+					{participantsLabel && <MessageMetricsItemLabel>{participantsLabel}</MessageMetricsItemLabel>}
+				</>
+			)}
+		</MessageMetricsItem>
+	);
+};
+
+export default ThreadMetricsParticipants;
diff --git a/apps/meteor/client/components/message/content/ThreadMetricsUnreadBadge.tsx b/apps/meteor/client/components/message/content/ThreadMetricsUnreadBadge.tsx
new file mode 100644
index 000000000000..9bf3bfc2bc35
--- /dev/null
+++ b/apps/meteor/client/components/message/content/ThreadMetricsUnreadBadge.tsx
@@ -0,0 +1,38 @@
+import { Badge } from '@rocket.chat/fuselage';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useTranslation } from '@rocket.chat/ui-contexts';
+import React from 'react';
+import type { ComponentProps } from 'react';
+
+const getBadgeVariantAndTitle = (
+	unread: boolean,
+	mention: boolean,
+	all: boolean,
+): false | [ComponentProps<typeof Badge>['variant'], TranslationKey] => {
+	if (!unread) {
+		return false;
+	}
+
+	if (mention) {
+		return ['danger', 'Mentions_you'];
+	}
+
+	if (all) {
+		return ['warning', 'mention-all'];
+	}
+
+	return ['primary', 'Unread'];
+};
+
+const ThreadMetricsUnreadBadge = ({ unread, mention, all }: { unread: boolean; mention: boolean; all: boolean }) => {
+	const t = useTranslation();
+	const result = getBadgeVariantAndTitle(unread, mention, all);
+
+	if (!result) return null;
+
+	const [variant, title] = result;
+
+	return <Badge small variant={variant} role='status' title={t(title)} />;
+};
+
+export default ThreadMetricsUnreadBadge;
diff --git a/apps/meteor/client/components/message/content/attachments/DefaultAttachment.tsx b/apps/meteor/client/components/message/content/attachments/DefaultAttachment.tsx
index c3f0fdcbf26d..0bb6fb37da1e 100644
--- a/apps/meteor/client/components/message/content/attachments/DefaultAttachment.tsx
+++ b/apps/meteor/client/components/message/content/attachments/DefaultAttachment.tsx
@@ -3,8 +3,6 @@ import { isActionAttachment } from '@rocket.chat/core-typings';
 import type { ReactNode, ComponentProps, ReactElement } from 'react';
 import React from 'react';
 
-import MarkdownText from '../../../MarkdownText';
-import { useCollapse } from '../../hooks/useCollapse';
 import { ActionAttachment } from './default/ActionAttachtment';
 import FieldsAttachment from './default/FieldsAttachment';
 import AttachmentAuthor from './structure/AttachmentAuthor';
@@ -17,6 +15,8 @@ import AttachmentRow from './structure/AttachmentRow';
 import AttachmentText from './structure/AttachmentText';
 import AttachmentThumb from './structure/AttachmentThumb';
 import AttachmentTitle from './structure/AttachmentTitle';
+import MarkdownText from '../../../MarkdownText';
+import { useCollapse } from '../../hooks/useCollapse';
 
 const applyMarkdownIfRequires = (
 	list: MessageAttachmentDefault['mrkdwn_in'] = ['text', 'pretext'],
diff --git a/apps/meteor/client/components/message/content/attachments/default/ActionAttachtment.tsx b/apps/meteor/client/components/message/content/attachments/default/ActionAttachtment.tsx
index 2ecd19598b3b..1ca98ca3d9b3 100644
--- a/apps/meteor/client/components/message/content/attachments/default/ActionAttachtment.tsx
+++ b/apps/meteor/client/components/message/content/attachments/default/ActionAttachtment.tsx
@@ -2,8 +2,8 @@ import type { MessageAttachmentAction } from '@rocket.chat/core-typings';
 import { Box, Button, ButtonGroup } from '@rocket.chat/fuselage';
 import React from 'react';
 
-import { useExternalLink } from '../../../../../hooks/useExternalLink';
 import ActionAttachmentButton from './ActionAttachmentButton';
+import { useExternalLink } from '../../../../../hooks/useExternalLink';
 
 type ActionAttachmentProps = MessageAttachmentAction;
 
diff --git a/apps/meteor/client/components/message/content/attachments/default/FieldsAttachment.tsx b/apps/meteor/client/components/message/content/attachments/default/FieldsAttachment.tsx
index 4e6650e5ec98..b42463131a1f 100644
--- a/apps/meteor/client/components/message/content/attachments/default/FieldsAttachment.tsx
+++ b/apps/meteor/client/components/message/content/attachments/default/FieldsAttachment.tsx
@@ -15,7 +15,7 @@ type FieldsAttachmentProps = {
 
 const FieldsAttachment = ({ fields }: FieldsAttachmentProps) => (
 	<Box flexWrap='wrap' display='flex' mb={4} mi={-4}>
-		{fields.map((field, index) => (field.short ? <ShortField {...field} key={index} /> : <Field {...field} key={index} />))}
+		{fields.map((field, index) => (field.short ? <ShortField key={index} {...field} /> : <Field key={index} {...field} />))}
 	</Box>
 );
 
diff --git a/apps/meteor/client/components/message/content/attachments/structure/AttachmentDownload.tsx b/apps/meteor/client/components/message/content/attachments/structure/AttachmentDownload.tsx
index ea81f48c034e..0ca7dce3c638 100644
--- a/apps/meteor/client/components/message/content/attachments/structure/AttachmentDownload.tsx
+++ b/apps/meteor/client/components/message/content/attachments/structure/AttachmentDownload.tsx
@@ -1,9 +1,9 @@
 import type { ComponentPropsWithoutRef } from 'react';
 import React from 'react';
 
-import type Action from '../../Action';
 import AttachmentDownloadBase from './AttachmentDownloadBase';
 import AttachmentEncryptedDownload from './AttachmentEncryptedDownload';
+import type Action from '../../Action';
 
 type AttachmentDownloadProps = Omit<ComponentPropsWithoutRef<typeof Action>, 'icon'> & { title?: string | undefined; href: string };
 
diff --git a/apps/meteor/client/components/message/content/attachments/structure/AttachmentEncryptedDownload.tsx b/apps/meteor/client/components/message/content/attachments/structure/AttachmentEncryptedDownload.tsx
index f75b044c69a5..6a2cf0f0bc74 100644
--- a/apps/meteor/client/components/message/content/attachments/structure/AttachmentEncryptedDownload.tsx
+++ b/apps/meteor/client/components/message/content/attachments/structure/AttachmentEncryptedDownload.tsx
@@ -1,8 +1,8 @@
 import type { ComponentProps } from 'react';
 import React from 'react';
 
-import { useDownloadFromServiceWorker } from '../../../../../hooks/useDownloadFromServiceWorker';
 import AttachmentDownloadBase from './AttachmentDownloadBase';
+import { useDownloadFromServiceWorker } from '../../../../../hooks/useDownloadFromServiceWorker';
 
 type AttachmentDownloadProps = ComponentProps<typeof AttachmentDownloadBase>;
 
diff --git a/apps/meteor/client/components/message/content/attachments/structure/AttachmentSize.tsx b/apps/meteor/client/components/message/content/attachments/structure/AttachmentSize.tsx
index 75a13e6cba34..2d05a7d4c670 100644
--- a/apps/meteor/client/components/message/content/attachments/structure/AttachmentSize.tsx
+++ b/apps/meteor/client/components/message/content/attachments/structure/AttachmentSize.tsx
@@ -2,8 +2,8 @@ import type { Box } from '@rocket.chat/fuselage';
 import type { ComponentPropsWithoutRef } from 'react';
 import React from 'react';
 
-import { useFormatMemorySize } from '../../../../../hooks/useFormatMemorySize';
 import Title from './AttachmentTitle';
+import { useFormatMemorySize } from '../../../../../hooks/useFormatMemorySize';
 
 type AttachmentSizeProps = ComponentPropsWithoutRef<typeof Box> & { size: number; wrapper?: boolean };
 
diff --git a/apps/meteor/client/components/message/content/location/MapView.tsx b/apps/meteor/client/components/message/content/location/MapView.tsx
index 77e404dac1a3..3d5a520f8fbb 100644
--- a/apps/meteor/client/components/message/content/location/MapView.tsx
+++ b/apps/meteor/client/components/message/content/location/MapView.tsx
@@ -11,7 +11,7 @@ type MapViewProps = {
 };
 
 const MapView = ({ latitude, longitude }: MapViewProps) => {
-	const googleMapsApiKey = useSetting<string>('MapView_GMapsAPIKey');
+	const googleMapsApiKey = useSetting('MapView_GMapsAPIKey', '');
 
 	const linkUrl = `https://maps.google.com/maps?daddr=${latitude},${longitude}`;
 
diff --git a/apps/meteor/client/components/message/content/reactions/Reaction.tsx b/apps/meteor/client/components/message/content/reactions/Reaction.tsx
index b2dea5eecfe9..46121e622012 100644
--- a/apps/meteor/client/components/message/content/reactions/Reaction.tsx
+++ b/apps/meteor/client/components/message/content/reactions/Reaction.tsx
@@ -1,11 +1,12 @@
 import { MessageReaction as MessageReactionTemplate, MessageReactionEmoji, MessageReactionCounter } from '@rocket.chat/fuselage';
-import { useTooltipClose, useTooltipOpen, useTranslation } from '@rocket.chat/ui-contexts';
+import { useTooltipClose, useTooltipOpen } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React, { useRef, useContext } from 'react';
+import { useTranslation } from 'react-i18next';
 
+import ReactionTooltip from './ReactionTooltip';
 import { getEmojiClassNameAndDataTitle } from '../../../../lib/utils/renderEmoji';
 import { MessageListContext } from '../../list/MessageListContext';
-import ReactionTooltip from './ReactionTooltip';
 
 // TODO: replace it with proper usage of i18next plurals
 type ReactionProps = {
@@ -17,7 +18,7 @@ type ReactionProps = {
 } & ComponentProps<typeof MessageReactionTemplate>;
 
 const Reaction = ({ hasReacted, counter, name, names, messageId, ...props }: ReactionProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const ref = useRef<HTMLDivElement>(null);
 	const openTooltip = useTooltipOpen();
 	const closeTooltip = useTooltipClose();
diff --git a/apps/meteor/client/components/message/content/urlPreviews/OEmbedCollapsible.tsx b/apps/meteor/client/components/message/content/urlPreviews/OEmbedCollapsible.tsx
index 8761b60cc68f..78a79cb50d44 100644
--- a/apps/meteor/client/components/message/content/urlPreviews/OEmbedCollapsible.tsx
+++ b/apps/meteor/client/components/message/content/urlPreviews/OEmbedCollapsible.tsx
@@ -3,9 +3,9 @@ import type { ReactElement, ReactNode } from 'react';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
-import MessageCollapsible from '../../MessageCollapsible';
 import OEmbedPreviewContent from './OEmbedPreviewContent';
 import type { OEmbedPreviewMetadata } from './OEmbedPreviewMetadata';
+import MessageCollapsible from '../../MessageCollapsible';
 
 type OEmbedCollapsibleProps = { children?: ReactNode } & OEmbedPreviewMetadata;
 
diff --git a/apps/meteor/client/components/message/content/urlPreviews/OEmbedPreviewContent.tsx b/apps/meteor/client/components/message/content/urlPreviews/OEmbedPreviewContent.tsx
index 550b325012ed..68d29b6440b8 100644
--- a/apps/meteor/client/components/message/content/urlPreviews/OEmbedPreviewContent.tsx
+++ b/apps/meteor/client/components/message/content/urlPreviews/OEmbedPreviewContent.tsx
@@ -8,8 +8,8 @@ import {
 import type { ReactElement, ReactNode } from 'react';
 import React from 'react';
 
-import MarkdownText from '../../../MarkdownText';
 import type { OEmbedPreviewMetadata } from './OEmbedPreviewMetadata';
+import MarkdownText from '../../../MarkdownText';
 
 type OEmbedPreviewContentProps = { thumb?: ReactElement; children?: ReactNode } & OEmbedPreviewMetadata;
 
diff --git a/apps/meteor/client/components/message/content/urlPreviews/UrlImagePreview.tsx b/apps/meteor/client/components/message/content/urlPreviews/UrlImagePreview.tsx
index 8106a01004e0..449ad1edd790 100644
--- a/apps/meteor/client/components/message/content/urlPreviews/UrlImagePreview.tsx
+++ b/apps/meteor/client/components/message/content/urlPreviews/UrlImagePreview.tsx
@@ -2,8 +2,8 @@ import { Box, MessageGenericPreviewImage } from '@rocket.chat/fuselage';
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import { useOembedLayout } from '../../hooks/useOembedLayout';
 import type { UrlPreviewMetadata } from './UrlPreviewMetadata';
+import { useOembedLayout } from '../../hooks/useOembedLayout';
 
 const UrlImagePreview = ({ url }: Pick<UrlPreviewMetadata, 'url'>): ReactElement => {
 	const { maxHeight: oembedMaxHeight } = useOembedLayout();
diff --git a/apps/meteor/client/components/message/content/urlPreviews/UrlPreview.tsx b/apps/meteor/client/components/message/content/urlPreviews/UrlPreview.tsx
index 6205c9040b6b..a302c1c32ac2 100644
--- a/apps/meteor/client/components/message/content/urlPreviews/UrlPreview.tsx
+++ b/apps/meteor/client/components/message/content/urlPreviews/UrlPreview.tsx
@@ -1,16 +1,17 @@
 import { Box } from '@rocket.chat/fuselage';
-import { useAttachmentAutoLoadEmbedMedia, useTranslation } from '@rocket.chat/ui-contexts';
+import { useAttachmentAutoLoadEmbedMedia } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
-import { useCollapse } from '../../hooks/useCollapse';
 import type { UrlPreviewMetadata } from './UrlPreviewMetadata';
 import UrlPreviewResolver from './UrlPreviewResolver';
+import { useCollapse } from '../../hooks/useCollapse';
 
 const UrlPreview = (props: UrlPreviewMetadata): ReactElement => {
 	const autoLoadMedia = useAttachmentAutoLoadEmbedMedia();
 	const [collapsed, collapse] = useCollapse(!autoLoadMedia);
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<>
diff --git a/apps/meteor/client/components/message/hooks/useNormalizedMessage.ts b/apps/meteor/client/components/message/hooks/useNormalizedMessage.ts
index 715a84a2359b..2a433abc4e2f 100644
--- a/apps/meteor/client/components/message/hooks/useNormalizedMessage.ts
+++ b/apps/meteor/client/components/message/hooks/useNormalizedMessage.ts
@@ -11,12 +11,12 @@ import type { Options } from '@rocket.chat/message-parser';
 import { useSetting } from '@rocket.chat/ui-contexts';
 import { useMemo } from 'react';
 
+import { useSubscriptionFromMessageQuery } from './useSubscriptionFromMessageQuery';
 import type { MessageWithMdEnforced } from '../../../lib/parseMessageTextToAstMarkdown';
 import { parseMessageTextToAstMarkdown } from '../../../lib/parseMessageTextToAstMarkdown';
 import { useAutoLinkDomains } from '../../../views/room/MessageList/hooks/useAutoLinkDomains';
 import { useAutoTranslate } from '../../../views/room/MessageList/hooks/useAutoTranslate';
 import { useKatex } from '../../../views/room/MessageList/hooks/useKatex';
-import { useSubscriptionFromMessageQuery } from './useSubscriptionFromMessageQuery';
 
 const normalizeAttachments = (attachments: MessageAttachment[], name?: string, type?: string): MessageAttachment[] => {
 	if (name) {
@@ -65,7 +65,7 @@ export const useNormalizedMessage = <TMessage extends IMessage>(message: TMessag
 	const customDomains = useAutoLinkDomains();
 	const subscription = useSubscriptionFromMessageQuery(message).data ?? undefined;
 	const autoTranslateOptions = useAutoTranslate(subscription);
-	const showColors = useSetting<boolean>('HexColorPreview_Enabled');
+	const showColors = useSetting('HexColorPreview_Enabled', true);
 
 	return useMemo(() => {
 		const parseOptions: Options = {
diff --git a/apps/meteor/client/components/message/hooks/useOembedLayout.ts b/apps/meteor/client/components/message/hooks/useOembedLayout.ts
index 819bed285e42..2a2a623da657 100644
--- a/apps/meteor/client/components/message/hooks/useOembedLayout.ts
+++ b/apps/meteor/client/components/message/hooks/useOembedLayout.ts
@@ -15,7 +15,7 @@ export const useOembedLayout = (): OembedLayout => {
   very often, so this hook is not going to be re-evaluated very often either;
   this is why we don't need to memoize the result or store it in a context
   */
-	const enabled = useSetting<boolean>('API_Embed', false);
+	const enabled = useSetting('API_Embed', false);
 	const { isMobile } = useLayout();
 
 	const maxWidth = isMobile ? ('100%' as const) : 368;
diff --git a/apps/meteor/client/components/message/list/MessageListContext.tsx b/apps/meteor/client/components/message/list/MessageListContext.tsx
index d525e2a4a39e..4527d03edd46 100644
--- a/apps/meteor/client/components/message/list/MessageListContext.tsx
+++ b/apps/meteor/client/components/message/list/MessageListContext.tsx
@@ -11,12 +11,11 @@ export type MessageListContextValue = {
 	showRoles: boolean;
 	showRealName: boolean;
 	showUsername: boolean;
-	highlights?:
-		| {
-				highlight: string;
-				regex: RegExp;
-				urlRegex: RegExp;
-		  }[];
+	highlights?: {
+		highlight: string;
+		regex: RegExp;
+		urlRegex: RegExp;
+	}[];
 	katex?: {
 		dollarSyntaxEnabled: boolean;
 		parenthesisSyntaxEnabled: boolean;
diff --git a/apps/meteor/client/components/message/toolbar/MessageActionMenu.tsx b/apps/meteor/client/components/message/toolbar/MessageActionMenu.tsx
index 5bf1d8846498..143c0a3fe46a 100644
--- a/apps/meteor/client/components/message/toolbar/MessageActionMenu.tsx
+++ b/apps/meteor/client/components/message/toolbar/MessageActionMenu.tsx
@@ -38,18 +38,21 @@ const MessageActionMenu = ({ options, onChangeMenuVisibility, context, isMessage
 			...(option.disabled &&
 				option?.disabled?.(context) && { tooltip: t('Action_not_available_encrypted_content', { action: t(option.label) }) }),
 		}))
-		.reduce((acc, option) => {
-			const group = option.type ? option.type : '';
-			const section = acc.find((section: { id: string }) => section.id === group);
-			if (section) {
-				section.items.push(option);
-				return acc;
-			}
-			const newSection = { id: group, title: group === 'apps' ? t('Apps') : '', items: [option] };
-			acc.push(newSection);
+		.reduce(
+			(acc, option) => {
+				const group = option.type ? option.type : '';
+				const section = acc.find((section: { id: string }) => section.id === group);
+				if (section) {
+					section.items.push(option);
+					return acc;
+				}
+				const newSection = { id: group, title: group === 'apps' ? t('Apps') : '', items: [option] };
+				acc.push(newSection);
 
-			return acc;
-		}, [] as unknown as MessageActionSection[])
+				return acc;
+			},
+			[] as unknown as MessageActionSection[],
+		)
 		.map((section) => {
 			if (section.id !== 'apps') {
 				return section;
diff --git a/apps/meteor/client/components/message/toolbar/MessageToolbar.tsx b/apps/meteor/client/components/message/toolbar/MessageToolbar.tsx
index 17357be8b6ab..2f52ebe42fa9 100644
--- a/apps/meteor/client/components/message/toolbar/MessageToolbar.tsx
+++ b/apps/meteor/client/components/message/toolbar/MessageToolbar.tsx
@@ -8,6 +8,10 @@ import { useQuery } from '@tanstack/react-query';
 import type { ComponentProps, ReactElement } from 'react';
 import React, { memo, useMemo, useRef } from 'react';
 
+import MessageActionMenu from './MessageActionMenu';
+import MessageToolbarStarsActionMenu from './MessageToolbarStarsActionMenu';
+import { useNewDiscussionMessageAction } from './useNewDiscussionMessageAction';
+import { useWebDAVMessageAction } from './useWebDAVMessageAction';
 import type { MessageActionContext } from '../../../../app/ui-utils/client/lib/MessageAction';
 import { MessageAction } from '../../../../app/ui-utils/client/lib/MessageAction';
 import { useEmojiPickerData } from '../../../contexts/EmojiPickerContext';
@@ -18,9 +22,6 @@ import { useIsSelecting } from '../../../views/room/MessageList/contexts/Selecte
 import { useAutoTranslate } from '../../../views/room/MessageList/hooks/useAutoTranslate';
 import { useChat } from '../../../views/room/contexts/ChatContext';
 import { useRoomToolbox } from '../../../views/room/contexts/RoomToolboxContext';
-import MessageActionMenu from './MessageActionMenu';
-import MessageToolbarStarsActionMenu from './MessageToolbarStarsActionMenu';
-import { useWebDAVMessageAction } from './useWebDAVMessageAction';
 
 const getMessageContext = (message: IMessage, room: IRoom, context?: MessageActionContext): MessageActionContext => {
 	if (context) {
@@ -85,6 +86,7 @@ const MessageToolbar = ({
 
 	// TODO: move this to another place
 	useWebDAVMessageAction();
+	useNewDiscussionMessageAction();
 
 	const actionsQueryResult = useQuery(['rooms', room._id, 'messages', message._id, 'actions'] as const, async () => {
 		const props = { message, room, user, subscription, settings: mapSettings, chat };
diff --git a/apps/meteor/client/components/message/toolbar/useNewDiscussionMessageAction.tsx b/apps/meteor/client/components/message/toolbar/useNewDiscussionMessageAction.tsx
new file mode 100644
index 000000000000..2812e1c06ba8
--- /dev/null
+++ b/apps/meteor/client/components/message/toolbar/useNewDiscussionMessageAction.tsx
@@ -0,0 +1,68 @@
+import { useSetModal, useSetting } from '@rocket.chat/ui-contexts';
+import React, { useEffect } from 'react';
+
+import { hasPermission } from '../../../../app/authorization/client';
+import { MessageAction } from '../../../../app/ui-utils/client/lib/MessageAction';
+import { roomCoordinator } from '../../../lib/rooms/roomCoordinator';
+import CreateDiscussion from '../../CreateDiscussion';
+
+export const useNewDiscussionMessageAction = () => {
+	const enabled = useSetting('Discussion_enabled', false);
+
+	const setModal = useSetModal();
+
+	useEffect(() => {
+		if (!enabled) {
+			return MessageAction.removeButton('start-discussion');
+		}
+		MessageAction.addButton({
+			id: 'start-discussion',
+			icon: 'discussion',
+			label: 'Discussion_start',
+			type: 'communication',
+			context: ['message', 'message-mobile', 'videoconf'],
+			async action(_, { message, room }) {
+				setModal(
+					<CreateDiscussion
+						defaultParentRoom={room?.prid || room?._id}
+						onClose={() => setModal(undefined)}
+						parentMessageId={message._id}
+						nameSuggestion={message?.msg?.substr(0, 140)}
+					/>,
+				);
+			},
+			condition({
+				message: {
+					u: { _id: uid },
+					drid,
+					dcount,
+				},
+				room,
+				subscription,
+				user,
+			}) {
+				if (drid || !Number.isNaN(Number(dcount))) {
+					return false;
+				}
+				if (!subscription) {
+					return false;
+				}
+				const isLivechatRoom = roomCoordinator.isLivechatRoom(room.t);
+				if (isLivechatRoom) {
+					return false;
+				}
+
+				if (!user) {
+					return false;
+				}
+
+				return uid !== user._id ? hasPermission('start-discussion-other-user', room._id) : hasPermission('start-discussion', room._id);
+			},
+			order: 1,
+			group: 'menu',
+		});
+		return () => {
+			MessageAction.removeButton('start-discussion');
+		};
+	}, [enabled, setModal]);
+};
diff --git a/apps/meteor/client/components/message/toolbar/useWebDAVMessageAction.tsx b/apps/meteor/client/components/message/toolbar/useWebDAVMessageAction.tsx
index a2be70077054..166872acaa42 100644
--- a/apps/meteor/client/components/message/toolbar/useWebDAVMessageAction.tsx
+++ b/apps/meteor/client/components/message/toolbar/useWebDAVMessageAction.tsx
@@ -4,11 +4,10 @@ import React, { useEffect } from 'react';
 import { MessageAction } from '../../../../app/ui-utils/client/lib/MessageAction';
 import { getURL } from '../../../../app/utils/client';
 import { useWebDAVAccountIntegrationsQuery } from '../../../hooks/webdav/useWebDAVAccountIntegrationsQuery';
-import { messageArgs } from '../../../lib/utils/messageArgs';
 import SaveToWebdavModal from '../../../views/room/webdav/SaveToWebdavModal';
 
 export const useWebDAVMessageAction = () => {
-	const enabled = useSetting<boolean>('Webdav_Integration_Enabled', false);
+	const enabled = useSetting('Webdav_Integration_Enabled', false);
 
 	const { data } = useWebDAVAccountIntegrationsQuery({ enabled });
 
@@ -26,8 +25,7 @@ export const useWebDAVMessageAction = () => {
 			condition: ({ message, subscription }) => {
 				return !!subscription && !!data?.length && !!message.file;
 			},
-			action(_, props) {
-				const { message = messageArgs(this).msg } = props;
+			action(_, { message }) {
 				const [attachment] = message.attachments || [];
 				const url = getURL(attachment.title_link as string, { full: true });
 
diff --git a/apps/meteor/client/components/message/variants/room/RoomMessageContent.tsx b/apps/meteor/client/components/message/variants/room/RoomMessageContent.tsx
index 89da3724cfbc..c23709ad37f9 100644
--- a/apps/meteor/client/components/message/variants/room/RoomMessageContent.tsx
+++ b/apps/meteor/client/components/message/variants/room/RoomMessageContent.tsx
@@ -101,7 +101,7 @@ const RoomMessageContent = ({ message, unread, all, mention, searchText }: RoomM
 					unread={unread}
 					mention={mention}
 					all={all}
-					participants={normalizedMessage?.replies?.length}
+					participants={normalizedMessage?.replies}
 				/>
 			)}
 
diff --git a/apps/meteor/client/components/message/variants/thread/ThreadMessageContent.tsx b/apps/meteor/client/components/message/variants/thread/ThreadMessageContent.tsx
index b2f9f1d019e2..8eb52f47e723 100644
--- a/apps/meteor/client/components/message/variants/thread/ThreadMessageContent.tsx
+++ b/apps/meteor/client/components/message/variants/thread/ThreadMessageContent.tsx
@@ -2,9 +2,10 @@ import type { IThreadMainMessage, IThreadMessage } from '@rocket.chat/core-typin
 import { isE2EEMessage, isQuoteAttachment } from '@rocket.chat/core-typings';
 import { MessageBody } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useSetting, useUserId, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetting, useUserId } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useUserData } from '../../../../hooks/useUserData';
 import type { UserPresence } from '../../../../lib/presence';
@@ -34,7 +35,7 @@ const ThreadMessageContent = ({ message }: ThreadMessageContentProps): ReactElem
 	const messageUser: UserPresence = { ...message.u, roles: [], ...useUserData(message.u._id) };
 	const readReceiptEnabled = useSetting('Message_Read_Receipt_Enabled', false);
 
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const normalizedMessage = useNormalizedMessage(message);
 
diff --git a/apps/meteor/client/contexts/VideoConfContext.ts b/apps/meteor/client/contexts/VideoConfContext.ts
index 2a4b2bd736fd..49a9006a1a81 100644
--- a/apps/meteor/client/contexts/VideoConfContext.ts
+++ b/apps/meteor/client/contexts/VideoConfContext.ts
@@ -1,7 +1,6 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { createContext, useContext } from 'react';
-import type { Subscription } from 'use-subscription';
-import { useSubscription } from 'use-subscription';
+import { useSyncExternalStore } from 'use-sync-external-store/shim';
 
 import type { DirectCallData, ProviderCapabilities, CallPreferences, VideoConfManager } from '../lib/VideoConfManager';
 
@@ -22,11 +21,26 @@ type VideoConfContextValue = {
 	rejectIncomingCall: (callId: string) => void;
 	abortCall: () => void;
 	setPreferences: (prefs: { mic?: boolean; cam?: boolean }) => void;
-	queryIncomingCalls: Subscription<DirectCallData[]>;
-	queryRinging: Subscription<boolean>;
-	queryCalling: Subscription<boolean>;
-	queryCapabilities: Subscription<ProviderCapabilities>;
-	queryPreferences: Subscription<CallPreferences>;
+	queryIncomingCalls: {
+		subscribe: (cb: () => void) => () => void;
+		getSnapshot: () => DirectCallData[];
+	};
+	queryRinging: {
+		subscribe: (cb: () => void) => () => void;
+		getSnapshot: () => boolean;
+	};
+	queryCalling: {
+		subscribe: (cb: () => void) => () => void;
+		getSnapshot: () => boolean;
+	};
+	queryCapabilities: {
+		subscribe: (cb: () => void) => () => void;
+		getSnapshot: () => ProviderCapabilities;
+	};
+	queryPreferences: {
+		subscribe: (cb: () => void) => () => void;
+		getSnapshot: () => CallPreferences;
+	};
 };
 
 export const VideoConfContext = createContext<VideoConfContextValue | undefined>(undefined);
@@ -49,24 +63,24 @@ export const useVideoConfAbortCall = (): VideoConfContextValue['abortCall'] => u
 export const useVideoConfRejectIncomingCall = (): VideoConfContextValue['rejectIncomingCall'] => useVideoConfContext().rejectIncomingCall;
 export const useVideoConfIncomingCalls = (): DirectCallData[] => {
 	const { queryIncomingCalls } = useVideoConfContext();
-	return useSubscription(queryIncomingCalls);
+	return useSyncExternalStore(queryIncomingCalls.subscribe, queryIncomingCalls.getSnapshot);
 };
 export const useVideoConfSetPreferences = (): VideoConfContextValue['setPreferences'] => useVideoConfContext().setPreferences;
 export const useVideoConfIsRinging = (): boolean => {
 	const { queryRinging } = useVideoConfContext();
-	return useSubscription(queryRinging);
+	return useSyncExternalStore(queryRinging.subscribe, queryRinging.getSnapshot);
 };
 export const useVideoConfIsCalling = (): boolean => {
 	const { queryCalling } = useVideoConfContext();
-	return useSubscription(queryCalling);
+	return useSyncExternalStore(queryCalling.subscribe, queryCalling.getSnapshot);
 };
 export const useVideoConfCapabilities = (): ProviderCapabilities => {
 	const { queryCapabilities } = useVideoConfContext();
-	return useSubscription(queryCapabilities);
+	return useSyncExternalStore(queryCapabilities.subscribe, queryCapabilities.getSnapshot);
 };
 export const useVideoConfPreferences = (): CallPreferences => {
 	const { queryPreferences } = useVideoConfContext();
-	return useSubscription(queryPreferences);
+	return useSyncExternalStore(queryPreferences.subscribe, queryPreferences.getSnapshot);
 };
 
 export const useVideoConfManager = (): typeof VideoConfManager | undefined => useContext(VideoConfContext)?.manager;
diff --git a/apps/meteor/client/definitions/IRocketChatDesktop.ts b/apps/meteor/client/definitions/IRocketChatDesktop.ts
index 52bc172d719b..a0707e9ba6d7 100644
--- a/apps/meteor/client/definitions/IRocketChatDesktop.ts
+++ b/apps/meteor/client/definitions/IRocketChatDesktop.ts
@@ -5,6 +5,6 @@ export interface IRocketChatDesktop {
 	getOutlookEvents?: (date: Date) => Promise<OutlookEventsResponse>;
 	setOutlookExchangeUrl?: (url: string, userId: string) => Promise<void>;
 	hasOutlookCredentials?: () => Promise<boolean>;
-	clearOutlookCredentials?: () => void;
+	clearOutlookCredentials?: () => Promise<void> | void;
 	openDocumentViewer?: (url: string, format: string, options: any) => void;
 }
diff --git a/apps/meteor/client/definitions/global.d.ts b/apps/meteor/client/definitions/global.d.ts
index 8b20108e8e48..0916ef237119 100644
--- a/apps/meteor/client/definitions/global.d.ts
+++ b/apps/meteor/client/definitions/global.d.ts
@@ -4,5 +4,80 @@ declare global {
 	// eslint-disable-next-line @typescript-eslint/naming-convention
 	interface Window {
 		RocketChatDesktop?: IRocketChatDesktop;
+
+		/** @deprecated use `window.RTCPeerConnection` */
+		mozRTCPeerConnection?: RTCPeerConnection;
+		/** @deprecated use `window.RTCPeerConnection` */
+		webkitRTCPeerConnection?: RTCPeerConnection;
+
+		/** @deprecated use `window.RTCSessionDescription` */
+		mozRTCSessionDescription?: RTCSessionDescription;
+		/** @deprecated use `window.RTCSessionDescription` */
+		webkitRTCSessionDescription?: RTCSessionDescription;
+		/** @deprecated use `window.RTCIceCandidate` */
+		mozRTCIceCandidate?: RTCIceCandidate;
+		/** @deprecated use `window.RTCIceCandidate` */
+		webkitRTCIceCandidate?: RTCIceCandidate;
+		/** @deprecated use `window.RTCSessionDescription` */
+		mozRTCSessionDescription?: RTCSessionDescription;
+		/** @deprecated use `window.RTCSessionDescription` */
+		webkitRTCSessionDescription?: RTCSessionDescription;
+		/** @deprecated use `window.AudioContext` */
+		mozAudioContext?: AudioContext;
+		/** @deprecated use `window.AudioContext` */
+		webkitAudioContext?: AudioContext;
+	}
+
+	interface Navigator {
+		/** @deprecated */
+		getUserMedia?: (
+			this: Navigator,
+			constraints?: MediaStreamConstraints | undefined,
+			onSuccess?: (stream: MediaStream) => void,
+			onError?: (error: any) => void,
+		) => void;
+		/** @deprecated */
+		webkitGetUserMedia?: (
+			this: Navigator,
+			constraints?: MediaStreamConstraints | undefined,
+			onSuccess?: (stream: MediaStream) => void,
+			onError?: (error: any) => void,
+		) => void;
+		/** @deprecated */
+		mozGetUserMedia?: (
+			this: Navigator,
+			constraints?: MediaStreamConstraints | undefined,
+			onSuccess?: (stream: MediaStream) => void,
+			onError?: (error: any) => void,
+		) => void;
+		/** @deprecated */
+		msGetUserMedia?: (
+			this: Navigator,
+			constraints?: MediaStreamConstraints | undefined,
+			onSuccess?: (stream: MediaStream) => void,
+			onError?: (error: any) => void,
+		) => void;
+	}
+
+	interface RTCPeerConnection {
+		/** @deprecated use `getReceivers() */
+		getRemoteStreams(): MediaStream[];
+		/** @deprecated */
+		addStream(stream: MediaStream): void;
+	}
+
+	// eslint-disable-next-line @typescript-eslint/naming-convention
+	interface MediaTrackConstraints {
+		/** @deprecated */
+		mozMediaSource?: string;
+		/**	@deprecated */
+		mediaSource?: string;
+		/**	@deprecated */
+		mandatory?: {
+			chromeMediaSource: string;
+			chromeMediaSourceId: string;
+			maxWidth: number;
+			maxHeight: number;
+		};
 	}
 }
diff --git a/apps/meteor/client/hooks/lists/useScrollableMessageList.ts b/apps/meteor/client/hooks/lists/useScrollableMessageList.ts
index d78b13c3030f..679ba23b5cd2 100644
--- a/apps/meteor/client/hooks/lists/useScrollableMessageList.ts
+++ b/apps/meteor/client/hooks/lists/useScrollableMessageList.ts
@@ -1,10 +1,10 @@
 import type { IMessage, Serialized } from '@rocket.chat/core-typings';
 import { useCallback } from 'react';
 
+import { useScrollableRecordList } from './useScrollableRecordList';
 import type { MessageList } from '../../lib/lists/MessageList';
 import type { RecordListBatchChanges } from '../../lib/lists/RecordList';
 import { mapMessageFromApi } from '../../lib/utils/mapMessageFromApi';
-import { useScrollableRecordList } from './useScrollableRecordList';
 
 export const useScrollableMessageList = (
 	messageList: MessageList,
diff --git a/apps/meteor/client/hooks/omnichannel/useIsRoomOverMacLimit.tsx b/apps/meteor/client/hooks/omnichannel/useIsRoomOverMacLimit.tsx
index bf4e4b1bf957..310bea690a33 100644
--- a/apps/meteor/client/hooks/omnichannel/useIsRoomOverMacLimit.tsx
+++ b/apps/meteor/client/hooks/omnichannel/useIsRoomOverMacLimit.tsx
@@ -1,5 +1,5 @@
-import type { IRoom } from '@rocket.chat/core-typings';
-import { isOmnichannelRoom, type IOmnichannelGenericRoom, isVoipRoom } from '@rocket.chat/core-typings';
+import { isOmnichannelRoom, isVoipRoom } from '@rocket.chat/core-typings';
+import type { IRoom, IOmnichannelGenericRoom } from '@rocket.chat/core-typings';
 
 import { useIsOverMacLimit } from './useIsOverMacLimit';
 
diff --git a/apps/meteor/client/hooks/roomActions/useContactChatHistoryRoomAction.ts b/apps/meteor/client/hooks/roomActions/useContactChatHistoryRoomAction.ts
deleted file mode 100644
index 38ee27b1a317..000000000000
--- a/apps/meteor/client/hooks/roomActions/useContactChatHistoryRoomAction.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { lazy, useMemo } from 'react';
-
-import type { RoomToolboxActionConfig } from '../../views/room/contexts/RoomToolboxContext';
-
-const ContactHistory = lazy(() => import('../../views/omnichannel/contactHistory/ContactHistory'));
-
-export const useContactChatHistoryRoomAction = () => {
-	return useMemo(
-		(): RoomToolboxActionConfig => ({
-			id: 'contact-chat-history',
-			groups: ['live'],
-			title: 'Contact_Chat_History',
-			icon: 'clock',
-			tabComponent: ContactHistory,
-			order: 11,
-		}),
-		[],
-	);
-};
diff --git a/apps/meteor/client/hooks/roomActions/useContactProfileRoomAction.ts b/apps/meteor/client/hooks/roomActions/useContactProfileRoomAction.ts
index 17dbc3425493..7cba545fe962 100644
--- a/apps/meteor/client/hooks/roomActions/useContactProfileRoomAction.ts
+++ b/apps/meteor/client/hooks/roomActions/useContactProfileRoomAction.ts
@@ -2,7 +2,7 @@ import { lazy, useMemo } from 'react';
 
 import type { RoomToolboxActionConfig } from '../../views/room/contexts/RoomToolboxContext';
 
-const ContactsContextualBar = lazy(() => import('../../views/omnichannel/directory/contacts/contextualBar/ContactsContextualBar'));
+const ContactInfoRouter = lazy(() => import('../../views/omnichannel/contactInfo/ContactInfoRouter'));
 
 export const useContactProfileRoomAction = () => {
 	return useMemo(
@@ -11,7 +11,7 @@ export const useContactProfileRoomAction = () => {
 			groups: ['live' /* , 'voip'*/],
 			title: 'Contact_Info',
 			icon: 'user',
-			tabComponent: ContactsContextualBar,
+			tabComponent: ContactInfoRouter,
 			order: 1,
 		}),
 		[],
diff --git a/apps/meteor/client/hooks/roomActions/useRoomInfoRoomAction.ts b/apps/meteor/client/hooks/roomActions/useRoomInfoRoomAction.ts
index 1b7608ff5212..573211b6fbd8 100644
--- a/apps/meteor/client/hooks/roomActions/useRoomInfoRoomAction.ts
+++ b/apps/meteor/client/hooks/roomActions/useRoomInfoRoomAction.ts
@@ -2,7 +2,7 @@ import { lazy, useMemo } from 'react';
 
 import type { RoomToolboxActionConfig } from '../../views/room/contexts/RoomToolboxContext';
 
-const ChatsContextualBar = lazy(() => import('../../views/omnichannel/directory/chats/contextualBar/ChatsContextualBar'));
+const ChatsContextualBar = lazy(() => import('../../views/omnichannel/directory/chats/ChatInfo/ChatInfoRouter'));
 
 export const useRoomInfoRoomAction = () => {
 	return useMemo(
diff --git a/apps/meteor/client/hooks/roomActions/useStartCallRoomAction/useStartCallRoomAction.tsx b/apps/meteor/client/hooks/roomActions/useStartCallRoomAction/useStartCallRoomAction.tsx
index 18d3efd01053..a275fe755560 100644
--- a/apps/meteor/client/hooks/roomActions/useStartCallRoomAction/useStartCallRoomAction.tsx
+++ b/apps/meteor/client/hooks/roomActions/useStartCallRoomAction/useStartCallRoomAction.tsx
@@ -1,10 +1,10 @@
 import { GenericMenu } from '@rocket.chat/ui-client';
 import React, { useMemo } from 'react';
 
-import HeaderToolbarAction from '../../../components/Header/HeaderToolbarAction';
-import type { RoomToolboxActionConfig } from '../../../views/room/contexts/RoomToolboxContext';
 import useVideoConfMenuOptions from './useVideoConfMenuOptions';
 import useVoipMenuOptions from './useVoipMenuOptions';
+import HeaderToolbarAction from '../../../components/Header/HeaderToolbarAction';
+import type { RoomToolboxActionConfig } from '../../../views/room/contexts/RoomToolboxContext';
 
 export const useStartCallRoomAction = () => {
 	const videoCall = useVideoConfMenuOptions();
diff --git a/apps/meteor/client/hooks/roomActions/useWebRTCVideoRoomAction.ts b/apps/meteor/client/hooks/roomActions/useWebRTCVideoRoomAction.ts
index 38a8488b2615..41b078429498 100644
--- a/apps/meteor/client/hooks/roomActions/useWebRTCVideoRoomAction.ts
+++ b/apps/meteor/client/hooks/roomActions/useWebRTCVideoRoomAction.ts
@@ -11,7 +11,7 @@ export const useWebRTCVideoRoomAction = () => {
 	const enabled = useSetting('WebRTC_Enabled', false);
 	const room = useRoom();
 	const federated = isRoomFederated(room);
-	const callProvider = useSetting<string>('Omnichannel_call_provider', 'default-provider');
+	const callProvider = useSetting('Omnichannel_call_provider', 'default-provider');
 
 	const allowed = enabled && callProvider === 'WebRTC' && room.servedBy;
 
diff --git a/apps/meteor/client/hooks/useAppActionButtons.ts b/apps/meteor/client/hooks/useAppActionButtons.ts
index 2a074fcc3be1..0dcb2d380d46 100644
--- a/apps/meteor/client/hooks/useAppActionButtons.ts
+++ b/apps/meteor/client/hooks/useAppActionButtons.ts
@@ -7,13 +7,13 @@ import { useQuery, useQueryClient } from '@tanstack/react-query';
 import { useEffect, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import { useApplyButtonFilters, useApplyButtonAuthFilter } from './useApplyButtonFilters';
+import { useFilterActionsByContext } from './useFilterActions';
 import { UiKitTriggerTimeoutError } from '../../app/ui-message/client/UiKitTriggerTimeoutError';
 import type { MessageActionConfig, MessageActionContext } from '../../app/ui-utils/client/lib/MessageAction';
 import type { MessageBoxAction } from '../../app/ui-utils/client/lib/messageBox';
 import { Utilities } from '../../ee/lib/misc/Utilities';
 import { useUiKitActionManager } from '../uikit/hooks/useUiKitActionManager';
-import { useApplyButtonFilters, useApplyButtonAuthFilter } from './useApplyButtonFilters';
-import { useFilterActionsByContext } from './useFilterActions';
 
 const getIdForActionButton = ({ appId, actionId }: IUIActionButton): string => `${appId}/${actionId}`;
 
diff --git a/apps/meteor/client/hooks/useClipboardWithToast.ts b/apps/meteor/client/hooks/useClipboardWithToast.ts
index ddabbcf9cf0e..fd30e5989b54 100644
--- a/apps/meteor/client/hooks/useClipboardWithToast.ts
+++ b/apps/meteor/client/hooks/useClipboardWithToast.ts
@@ -1,9 +1,10 @@
 import type { UseClipboardReturn } from '@rocket.chat/fuselage-hooks';
 import { useClipboard, useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useToastMessageDispatch } from '@rocket.chat/ui-contexts';
+import { useTranslation } from 'react-i18next';
 
 export default function useClipboardWithToast(text: string): UseClipboardReturn {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 
 	return useClipboard(text, {
diff --git a/apps/meteor/client/hooks/useContinuousSoundNotification.ts b/apps/meteor/client/hooks/useContinuousSoundNotification.ts
index 22fcabd4e6a9..80abb492363b 100644
--- a/apps/meteor/client/hooks/useContinuousSoundNotification.ts
+++ b/apps/meteor/client/hooks/useContinuousSoundNotification.ts
@@ -2,6 +2,7 @@ import type { ICustomSound } from '@rocket.chat/core-typings';
 import { useSetting, useUserPreference, useUserSubscriptions } from '@rocket.chat/ui-contexts';
 import { useEffect } from 'react';
 
+import { useUserSoundPreferences } from './useUserSoundPreferences';
 import { CustomSounds } from '../../app/custom-sounds/client/lib/CustomSounds';
 
 const query = { t: 'l', ls: { $exists: false }, open: true };
@@ -11,12 +12,10 @@ export const useContinuousSoundNotification = () => {
 	const playNewRoomSoundContinuously = useSetting('Livechat_continuous_sound_notification_new_livechat_room');
 
 	const newRoomNotification = useUserPreference<string>('newRoomNotification');
-	const audioVolume = useUserPreference<number>('notificationsSoundVolume');
+	const { notificationsSoundVolume } = useUserSoundPreferences();
 
 	const continuousCustomSoundId = newRoomNotification && `${newRoomNotification}-continuous`;
 
-	const volume = audioVolume !== undefined ? Number((audioVolume / 100).toPrecision(2)) : 1;
-
 	useEffect(() => {
 		let audio: ICustomSound;
 		if (playNewRoomSoundContinuously && continuousCustomSoundId) {
@@ -46,8 +45,8 @@ export const useContinuousSoundNotification = () => {
 		}
 
 		CustomSounds.play(continuousCustomSoundId, {
-			volume,
+			volume: notificationsSoundVolume,
 			loop: true,
 		});
-	}, [continuousCustomSoundId, playNewRoomSoundContinuously, userSubscriptions, volume]);
+	}, [continuousCustomSoundId, playNewRoomSoundContinuously, userSubscriptions, notificationsSoundVolume]);
 };
diff --git a/apps/meteor/client/hooks/useDecryptedMessage.spec.ts b/apps/meteor/client/hooks/useDecryptedMessage.spec.ts
index 62e77a77b096..404ee4b85739 100644
--- a/apps/meteor/client/hooks/useDecryptedMessage.spec.ts
+++ b/apps/meteor/client/hooks/useDecryptedMessage.spec.ts
@@ -1,8 +1,8 @@
 import { isE2EEMessage } from '@rocket.chat/core-typings';
 import { renderHook, waitFor } from '@testing-library/react';
 
-import { e2e } from '../../app/e2e/client/rocketchat.e2e';
 import { useDecryptedMessage } from './useDecryptedMessage';
+import { e2e } from '../../app/e2e/client/rocketchat.e2e';
 
 // Mock the dependencies
 jest.mock('@rocket.chat/core-typings', () => ({
diff --git a/apps/meteor/client/hooks/useDeviceLogout.tsx b/apps/meteor/client/hooks/useDeviceLogout.tsx
index c9c089aa2ce0..64cfde76b68b 100644
--- a/apps/meteor/client/hooks/useDeviceLogout.tsx
+++ b/apps/meteor/client/hooks/useDeviceLogout.tsx
@@ -1,8 +1,8 @@
 import { useSetModal, useTranslation, useToastMessageDispatch, useRoute, useRouteParameter } from '@rocket.chat/ui-contexts';
 import React, { useCallback } from 'react';
 
-import GenericModal from '../components/GenericModal';
 import { useEndpointAction } from './useEndpointAction';
+import GenericModal from '../components/GenericModal';
 
 export const useDeviceLogout = (
 	sessionId: string,
diff --git a/apps/meteor/client/hooks/useDevicesMenuOption.tsx b/apps/meteor/client/hooks/useDevicesMenuOption.tsx
index 035e5f38c8cf..e6395fcb936c 100644
--- a/apps/meteor/client/hooks/useDevicesMenuOption.tsx
+++ b/apps/meteor/client/hooks/useDevicesMenuOption.tsx
@@ -1,10 +1,11 @@
 import { Box, Icon } from '@rocket.chat/fuselage';
-import { useSetModal, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetModal } from '@rocket.chat/ui-contexts';
 import type { ReactNode } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
-import DeviceSettingsModal from '../voip/modals/DeviceSettingsModal';
 import { useHasLicenseModule } from './useHasLicenseModule';
+import DeviceSettingsModal from '../voip/modals/DeviceSettingsModal';
 
 type DevicesMenuOption = {
 	type?: 'option' | 'heading' | 'divider';
@@ -14,7 +15,7 @@ type DevicesMenuOption = {
 
 export const useDevicesMenuOption = (): DevicesMenuOption | null => {
 	const isEnterprise = useHasLicenseModule('voip-enterprise');
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const setModal = useSetModal();
 
 	const option = {
diff --git a/apps/meteor/client/hooks/useDialModal.tsx b/apps/meteor/client/hooks/useDialModal.tsx
index ef513e521283..50caa4587a79 100644
--- a/apps/meteor/client/hooks/useDialModal.tsx
+++ b/apps/meteor/client/hooks/useDialModal.tsx
@@ -1,5 +1,6 @@
-import { useSetModal, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetModal } from '@rocket.chat/ui-contexts';
 import React, { Suspense, lazy, useCallback, useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useIsVoipEnterprise } from '../contexts/CallContext';
 import { dispatchToastMessage } from '../lib/toast';
@@ -19,7 +20,7 @@ type DialModalControls = {
 export const useDialModal = (): DialModalControls => {
 	const setModal = useSetModal();
 	const isEnterprise = useIsVoipEnterprise();
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const closeDialModal = useCallback(() => setModal(null), [setModal]);
 
diff --git a/apps/meteor/client/hooks/useDownloadFromServiceWorker.ts b/apps/meteor/client/hooks/useDownloadFromServiceWorker.ts
index 199d1507e284..c6a55716df65 100644
--- a/apps/meteor/client/hooks/useDownloadFromServiceWorker.ts
+++ b/apps/meteor/client/hooks/useDownloadFromServiceWorker.ts
@@ -1,5 +1,6 @@
 import { Emitter } from '@rocket.chat/emitter';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import type { TFunction } from 'i18next';
 import { useCallback, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 
@@ -17,7 +18,7 @@ if ('serviceWorker' in navigator) {
 	});
 }
 
-export const registerDownloadForUid = (uid: string, t: ReturnType<typeof useTranslation>['t'], title?: string) => {
+export const registerDownloadForUid = (uid: string, t: TFunction, title?: string) => {
 	ee.once(uid, ({ result }) => {
 		downloadAs({ data: [new Blob([result])] }, title ?? t('Download'));
 	});
diff --git a/apps/meteor/client/hooks/useEndpointAction.ts b/apps/meteor/client/hooks/useEndpointAction.ts
index 2cfb22b18548..4baf82a20ff2 100644
--- a/apps/meteor/client/hooks/useEndpointAction.ts
+++ b/apps/meteor/client/hooks/useEndpointAction.ts
@@ -6,10 +6,10 @@ import { useMutation } from '@tanstack/react-query';
 type UseEndpointActionOptions<TPathPattern extends PathPattern> = (undefined extends UrlParams<TPathPattern>
 	? {
 			keys?: UrlParams<TPathPattern>;
-	  }
+		}
 	: {
 			keys: UrlParams<TPathPattern>;
-	  }) & {
+		}) & {
 	successMessage?: string;
 };
 export function useEndpointAction<TMethod extends Method, TPathPattern extends PathPattern>(
diff --git a/apps/meteor/client/hooks/useEndpointData.ts b/apps/meteor/client/hooks/useEndpointData.ts
index 93942946ede0..0c0615d3ffdb 100644
--- a/apps/meteor/client/hooks/useEndpointData.ts
+++ b/apps/meteor/client/hooks/useEndpointData.ts
@@ -3,9 +3,9 @@ import type { OperationParams, OperationResult, PathPattern, UrlParams } from '@
 import { useToastMessageDispatch, useEndpoint } from '@rocket.chat/ui-contexts';
 import { useCallback, useEffect } from 'react';
 
-import { getConfig } from '../lib/utils/getConfig';
 import type { AsyncState } from './useAsyncState';
 import { useAsyncState } from './useAsyncState';
+import { getConfig } from '../lib/utils/getConfig';
 
 const log = (name: string): Console['log'] =>
 	process.env.NODE_ENV !== 'production' || getConfig('debug') === 'true'
diff --git a/apps/meteor/client/hooks/useFeaturePreviewEnableQuery.ts b/apps/meteor/client/hooks/useFeaturePreviewEnableQuery.ts
index fd88f0237d29..e6c668713fab 100644
--- a/apps/meteor/client/hooks/useFeaturePreviewEnableQuery.ts
+++ b/apps/meteor/client/hooks/useFeaturePreviewEnableQuery.ts
@@ -17,10 +17,13 @@ const handleFeaturePreviewEnableQuery = (item: FeaturePreviewProps, _: any, feat
 
 const groupFeaturePreview = (features: FeaturePreviewProps[]) =>
 	Object.entries(
-		features.reduce((result, currentValue) => {
-			(result[currentValue.group] = result[currentValue.group] || []).push(currentValue);
-			return result;
-		}, {} as Record<FeaturePreviewProps['group'], FeaturePreviewProps[]>),
+		features.reduce(
+			(result, currentValue) => {
+				(result[currentValue.group] = result[currentValue.group] || []).push(currentValue);
+				return result;
+			},
+			{} as Record<FeaturePreviewProps['group'], FeaturePreviewProps[]>,
+		),
 	);
 
 export const useFeaturePreviewEnableQuery = (features: FeaturePreviewProps[]) => {
diff --git a/apps/meteor/client/hooks/useFormatDateAndTime.ts b/apps/meteor/client/hooks/useFormatDateAndTime.ts
index 2fd8ad81e6ae..f35096274e9d 100644
--- a/apps/meteor/client/hooks/useFormatDateAndTime.ts
+++ b/apps/meteor/client/hooks/useFormatDateAndTime.ts
@@ -9,7 +9,7 @@ type UseFormatDateAndTimeParams = {
 
 export const useFormatDateAndTime = ({ withSeconds }: UseFormatDateAndTimeParams = {}): ((input: MomentInput) => string) => {
 	const clockMode = useUserPreference('clockMode');
-	const format = useSetting('Message_TimeAndDateFormat') as string;
+	const format = useSetting('Message_TimeAndDateFormat', 'LLL');
 
 	return useCallback(
 		(time) => {
diff --git a/apps/meteor/client/hooks/useFormatTime.ts b/apps/meteor/client/hooks/useFormatTime.ts
index b1f7e2288ab8..430a73ee1c6d 100644
--- a/apps/meteor/client/hooks/useFormatTime.ts
+++ b/apps/meteor/client/hooks/useFormatTime.ts
@@ -6,7 +6,7 @@ const dayFormat = ['h:mm A', 'H:mm'] as const;
 
 export const useFormatTime = (): ((input: moment.MomentInput) => string) => {
 	const clockMode = useUserPreference<1 | 2>('clockMode');
-	const format = useSetting('Message_TimeFormat') as string;
+	const format = useSetting('Message_TimeFormat', 'LT');
 	const sameDay = clockMode !== undefined ? dayFormat[clockMode - 1] : format;
 
 	return useCallback(
diff --git a/apps/meteor/client/hooks/useLicenseLimitsByBehavior.ts b/apps/meteor/client/hooks/useLicenseLimitsByBehavior.ts
index 7ccea2dd4bd4..ba7e165496ea 100644
--- a/apps/meteor/client/hooks/useLicenseLimitsByBehavior.ts
+++ b/apps/meteor/client/hooks/useLicenseLimitsByBehavior.ts
@@ -25,10 +25,10 @@ export const useLicenseLimitsByBehavior = () => {
 		.map((key) => {
 			const rule = license.limits[key]
 				?.filter((limit) => validateWarnLimit(limit.max, limits[key].value ?? 0, limit.behavior))
-				.reduce<{ max: number; behavior: LicenseBehavior } | null>(
-					(maxLimit, currentLimit) => (!maxLimit || currentLimit.max > maxLimit.max ? currentLimit : maxLimit),
-					null,
-				);
+				.reduce<{
+					max: number;
+					behavior: LicenseBehavior;
+				} | null>((maxLimit, currentLimit) => (!maxLimit || currentLimit.max > maxLimit.max ? currentLimit : maxLimit), null);
 
 			if (!rule) {
 				return undefined;
diff --git a/apps/meteor/client/hooks/useLoadRoomForAllowedAnonymousRead.ts b/apps/meteor/client/hooks/useLoadRoomForAllowedAnonymousRead.ts
new file mode 100644
index 000000000000..b53ed9dde343
--- /dev/null
+++ b/apps/meteor/client/hooks/useLoadRoomForAllowedAnonymousRead.ts
@@ -0,0 +1,16 @@
+import { useSetting, useUserId } from '@rocket.chat/ui-contexts';
+import { useEffect } from 'react';
+
+import { CachedChatRoom, CachedChatSubscription } from '../../app/models/client';
+
+export const useLoadRoomForAllowedAnonymousRead = () => {
+	const userId = useUserId();
+	const accountsAllowAnonymousRead = useSetting('Accounts_AllowAnonymousRead');
+
+	useEffect(() => {
+		if (!userId && accountsAllowAnonymousRead === true) {
+			CachedChatRoom.init();
+			CachedChatSubscription.ready.set(true);
+		}
+	}, [accountsAllowAnonymousRead, userId]);
+};
diff --git a/apps/meteor/client/hooks/useNotifyUser.ts b/apps/meteor/client/hooks/useNotifyUser.ts
new file mode 100644
index 000000000000..818017d93e97
--- /dev/null
+++ b/apps/meteor/client/hooks/useNotifyUser.ts
@@ -0,0 +1,93 @@
+import type { AtLeast, ISubscription } from '@rocket.chat/core-typings';
+import { useRouter, useStream, useUser, useUserPreference } from '@rocket.chat/ui-contexts';
+import { useCallback, useEffect } from 'react';
+
+import { useEmbeddedLayout } from './useEmbeddedLayout';
+import { CachedChatSubscription } from '../../app/models/client';
+import { KonchatNotification } from '../../app/ui/client/lib/KonchatNotification';
+import { RoomManager } from '../lib/RoomManager';
+import { fireGlobalEvent } from '../lib/utils/fireGlobalEvent';
+
+export const useNotifyUser = () => {
+	const user = useUser();
+	const router = useRouter();
+	const isLayoutEmbedded = useEmbeddedLayout();
+	const notifyUserStream = useStream('notify-user');
+	const muteFocusedConversations = useUserPreference('muteFocusedConversations');
+
+	const notifyNewRoom = useCallback(
+		async (sub: AtLeast<ISubscription, 'rid'>): Promise<void> => {
+			if (!user || user.status === 'busy') {
+				return;
+			}
+
+			if ((!router.getRouteParameters().name || router.getRouteParameters().name !== sub.name) && !sub.ls && sub.alert === true) {
+				KonchatNotification.newRoom(sub.rid);
+			}
+		},
+		[router, user],
+	);
+
+	const notifyNewMessageAudio = useCallback(
+		(rid?: string) => {
+			const hasFocus = document.hasFocus();
+			const messageIsInOpenedRoom = RoomManager.opened === rid;
+
+			if (isLayoutEmbedded) {
+				if (!hasFocus && messageIsInOpenedRoom) {
+					// Play a notification sound
+					void KonchatNotification.newMessage(rid);
+				}
+			} else if (!hasFocus || !messageIsInOpenedRoom || !muteFocusedConversations) {
+				// Play a notification sound
+				void KonchatNotification.newMessage(rid);
+			}
+		},
+		[isLayoutEmbedded, muteFocusedConversations],
+	);
+
+	useEffect(() => {
+		if (!user?._id) {
+			return;
+		}
+
+		notifyUserStream(`${user?._id}/notification`, (notification) => {
+			const openedRoomId = ['channel', 'group', 'direct'].includes(router.getRouteName() || '') ? RoomManager.opened : undefined;
+
+			const hasFocus = document.hasFocus();
+			const messageIsInOpenedRoom = openedRoomId === notification.payload.rid;
+
+			fireGlobalEvent('notification', {
+				notification,
+				fromOpenedRoom: messageIsInOpenedRoom,
+				hasFocus,
+			});
+
+			if (isLayoutEmbedded) {
+				if (!hasFocus && messageIsInOpenedRoom) {
+					// Show a notification.
+					KonchatNotification.showDesktop(notification);
+				}
+			} else if (!hasFocus || !messageIsInOpenedRoom) {
+				// Show a notification.
+				KonchatNotification.showDesktop(notification);
+			}
+
+			notifyNewMessageAudio(notification.payload.rid);
+		});
+
+		notifyUserStream(`${user?._id}/subscriptions-changed`, (action, sub) => {
+			if (action === 'removed') {
+				return;
+			}
+
+			void notifyNewRoom(sub);
+		});
+
+		CachedChatSubscription.collection.find().observe({
+			changed: (sub) => {
+				void notifyNewRoom(sub);
+			},
+		});
+	}, [isLayoutEmbedded, notifyNewMessageAudio, notifyNewRoom, notifyUserStream, router, user?._id]);
+};
diff --git a/apps/meteor/client/hooks/useOTR.spec.tsx b/apps/meteor/client/hooks/useOTR.spec.tsx
index 89082c072952..dbef63f3f5c6 100644
--- a/apps/meteor/client/hooks/useOTR.spec.tsx
+++ b/apps/meteor/client/hooks/useOTR.spec.tsx
@@ -1,10 +1,10 @@
 import { useUserId } from '@rocket.chat/ui-contexts';
 import { renderHook } from '@testing-library/react';
 
+import { useOTR } from './useOTR';
 import OTR from '../../app/otr/client/OTR';
 import { OtrRoomState } from '../../app/otr/lib/OtrRoomState';
 import { useRoom } from '../views/room/contexts/RoomContext';
-import { useOTR } from './useOTR';
 
 jest.mock('@rocket.chat/ui-contexts', () => ({
 	useUserId: jest.fn(),
diff --git a/apps/meteor/client/hooks/useOTR.ts b/apps/meteor/client/hooks/useOTR.ts
index 65f9004cf323..3c6008b15bbe 100644
--- a/apps/meteor/client/hooks/useOTR.ts
+++ b/apps/meteor/client/hooks/useOTR.ts
@@ -1,11 +1,11 @@
 import { useUserId } from '@rocket.chat/ui-contexts';
 import { useMemo, useCallback } from 'react';
 
+import { useReactiveValue } from './useReactiveValue';
 import OTR from '../../app/otr/client/OTR';
 import type { OTRRoom } from '../../app/otr/client/OTRRoom';
 import { OtrRoomState } from '../../app/otr/lib/OtrRoomState';
 import { useRoom } from '../views/room/contexts/RoomContext';
-import { useReactiveValue } from './useReactiveValue';
 
 export const useOTR = (): { otr: OTRRoom | undefined; otrState: OtrRoomState } => {
 	const uid = useUserId();
diff --git a/apps/meteor/client/hooks/usePruneWarningMessage.spec.ts b/apps/meteor/client/hooks/usePruneWarningMessage.spec.ts
index 2bf4b813be12..1ca06d70308c 100644
--- a/apps/meteor/client/hooks/usePruneWarningMessage.spec.ts
+++ b/apps/meteor/client/hooks/usePruneWarningMessage.spec.ts
@@ -1,9 +1,9 @@
 import type { IRoomWithRetentionPolicy } from '@rocket.chat/core-typings';
 import { renderHook } from '@testing-library/react';
 
+import { usePruneWarningMessage } from './usePruneWarningMessage';
 import { createRenteionPolicySettingsMock as createMock } from '../../tests/mocks/client/mockRetentionPolicySettings';
 import { createFakeRoom } from '../../tests/mocks/data';
-import { usePruneWarningMessage } from './usePruneWarningMessage';
 
 jest.useFakeTimers();
 
diff --git a/apps/meteor/client/hooks/usePruneWarningMessage.ts b/apps/meteor/client/hooks/usePruneWarningMessage.ts
index bb1eec5a5989..35cdb6596bc4 100644
--- a/apps/meteor/client/hooks/usePruneWarningMessage.ts
+++ b/apps/meteor/client/hooks/usePruneWarningMessage.ts
@@ -6,9 +6,9 @@ import { sendAt } from 'cron';
 import intlFormat from 'date-fns/intlFormat';
 import { useEffect, useState } from 'react';
 
+import { useFormattedRelativeTime } from './useFormattedRelativeTime';
 import { getCronAdvancedTimerFromPrecisionSetting } from '../../lib/getCronAdvancedTimerFromPrecisionSetting';
 import { useRetentionPolicy } from '../views/room/hooks/useRetentionPolicy';
-import { useFormattedRelativeTime } from './useFormattedRelativeTime';
 
 const getMessage = ({ filesOnly, excludePinned }: { filesOnly: boolean; excludePinned: boolean }): TranslationKey => {
 	if (filesOnly) {
@@ -84,12 +84,12 @@ export const usePruneWarningMessage = (room: IRoom) => {
 
 	const { maxAge, filesOnly, excludePinned } = retention;
 
-	const cronPrecision = String(useSetting('RetentionPolicy_Precision')) as CronPrecisionSetting;
+	const cronPrecision = useSetting<CronPrecisionSetting>('RetentionPolicy_Precision', '0');
 
 	const t = useTranslation();
 
-	const enableAdvancedCronTimer = Boolean(useSetting('RetentionPolicy_Advanced_Precision'));
-	const advancedCronTimer = String(useSetting('RetentionPolicy_Advanced_Precision_Cron'));
+	const enableAdvancedCronTimer = useSetting('RetentionPolicy_Advanced_Precision', false);
+	const advancedCronTimer = useSetting('RetentionPolicy_Advanced_Precision_Cron', '*/30 * * * *');
 
 	const message = getMessage({ filesOnly, excludePinned });
 
diff --git a/apps/meteor/client/hooks/useRoomsList.ts b/apps/meteor/client/hooks/useRoomsList.ts
index f09a361c9216..66582d3b62f2 100644
--- a/apps/meteor/client/hooks/useRoomsList.ts
+++ b/apps/meteor/client/hooks/useRoomsList.ts
@@ -2,9 +2,9 @@ import type { IRoom } from '@rocket.chat/core-typings';
 import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useCallback, useState } from 'react';
 
-import { RecordList } from '../lib/lists/RecordList';
 import { useScrollableRecordList } from './lists/useScrollableRecordList';
 import { useComponentDidUpdate } from './useComponentDidUpdate';
+import { RecordList } from '../lib/lists/RecordList';
 
 type RoomListOptions = {
 	text: string;
diff --git a/apps/meteor/client/hooks/useSortQueryOptions.spec.tsx b/apps/meteor/client/hooks/useSortQueryOptions.spec.tsx
new file mode 100644
index 000000000000..63be719bf982
--- /dev/null
+++ b/apps/meteor/client/hooks/useSortQueryOptions.spec.tsx
@@ -0,0 +1,28 @@
+import { mockAppRoot } from '@rocket.chat/mock-providers';
+import { renderHook } from '@testing-library/react';
+
+import { useSortQueryOptions } from './useSortQueryOptions';
+
+it("should return query option to sort by last message when user preference is 'activity'", () => {
+	const { result } = renderHook(() => useSortQueryOptions(), {
+		legacyRoot: true,
+		wrapper: mockAppRoot().withUserPreference('sidebarSortby', 'activity').build(),
+	});
+	expect(result.current.sort).toHaveProperty('lm', -1);
+});
+
+it("should return query option to sort by name when user preference is 'name'", () => {
+	const { result } = renderHook(() => useSortQueryOptions(), {
+		legacyRoot: true,
+		wrapper: mockAppRoot().withUserPreference('sidebarSortby', 'name').build(),
+	});
+	expect(result.current.sort).toHaveProperty('lowerCaseName', 1);
+});
+
+it("should return query option to sort by fname when user preference is 'name' and showRealName is true", () => {
+	const { result } = renderHook(() => useSortQueryOptions(), {
+		legacyRoot: true,
+		wrapper: mockAppRoot().withUserPreference('sidebarSortby', 'name').withSetting('UI_Use_Real_Name', true).build(),
+	});
+	expect(result.current.sort).toHaveProperty('lowerCaseFName', 1);
+});
diff --git a/apps/meteor/client/sidebarv2/hooks/useQueryOptions.ts b/apps/meteor/client/hooks/useSortQueryOptions.ts
similarity index 94%
rename from apps/meteor/client/sidebarv2/hooks/useQueryOptions.ts
rename to apps/meteor/client/hooks/useSortQueryOptions.ts
index 55fd137759d1..e65c6f9411f9 100644
--- a/apps/meteor/client/sidebarv2/hooks/useQueryOptions.ts
+++ b/apps/meteor/client/hooks/useSortQueryOptions.ts
@@ -1,7 +1,7 @@
 import { useUserPreference, useSetting } from '@rocket.chat/ui-contexts';
 import { useMemo } from 'react';
 
-export const useQueryOptions = (): {
+export const useSortQueryOptions = (): {
 	sort:
 		| {
 				lm?: -1 | 1 | undefined;
diff --git a/apps/meteor/client/hooks/useTagsList.ts b/apps/meteor/client/hooks/useTagsList.ts
index 3aa80b4e07b3..9ca827331d42 100644
--- a/apps/meteor/client/hooks/useTagsList.ts
+++ b/apps/meteor/client/hooks/useTagsList.ts
@@ -1,9 +1,9 @@
 import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useCallback, useState } from 'react';
 
-import { RecordList } from '../lib/lists/RecordList';
 import { useScrollableRecordList } from './lists/useScrollableRecordList';
 import { useComponentDidUpdate } from './useComponentDidUpdate';
+import { RecordList } from '../lib/lists/RecordList';
 
 type TagsListOptions = {
 	filter: string;
diff --git a/apps/meteor/client/hooks/useTimeAgo.ts b/apps/meteor/client/hooks/useTimeAgo.ts
index 724f61d8c7c8..ee32e6110530 100644
--- a/apps/meteor/client/hooks/useTimeAgo.ts
+++ b/apps/meteor/client/hooks/useTimeAgo.ts
@@ -8,7 +8,7 @@ const dayFormat = ['h:mm A', 'H:mm'] as const;
 
 export const useTimeAgo = (): ((time: Date | number | string) => string) => {
 	const clockMode = useUserPreference<1 | 2>('clockMode');
-	const timeFormat = useSetting<string>('Message_TimeFormat', 'LT');
+	const timeFormat = useSetting('Message_TimeFormat', 'LT');
 	const format = clockMode !== undefined ? dayFormat[clockMode - 1] : timeFormat;
 	return useCallback(
 		(time) => {
@@ -25,7 +25,7 @@ export const useTimeAgo = (): ((time: Date | number | string) => string) => {
 
 export const useShortTimeAgo = (): ((time: Date | string | number) => string) => {
 	const clockMode = useUserPreference<1 | 2>('clockMode');
-	const timeFormat = useSetting('Message_TimeFormat') as string;
+	const timeFormat = useSetting('Message_TimeFormat', 'LT');
 	const format = clockMode !== undefined ? dayFormat[clockMode - 1] : timeFormat;
 	return useCallback(
 		(time) =>
diff --git a/apps/meteor/client/hooks/useTimeFromNow.ts b/apps/meteor/client/hooks/useTimeFromNow.ts
index 6ae2b65d2d51..3f6d9b3d0950 100644
--- a/apps/meteor/client/hooks/useTimeFromNow.ts
+++ b/apps/meteor/client/hooks/useTimeFromNow.ts
@@ -1,5 +1,5 @@
 import moment from 'moment';
 import { useCallback } from 'react';
 
-export const useTimeFromNow = (withSuffix: boolean): ((date: Date) => string) =>
+export const useTimeFromNow = (withSuffix: boolean): ((date?: Date | string) => string) =>
 	useCallback((date) => moment(date).fromNow(!withSuffix), [withSuffix]);
diff --git a/apps/meteor/client/hooks/useUpdateAvatar.ts b/apps/meteor/client/hooks/useUpdateAvatar.ts
index 556e2989804c..ac24f6d3b57d 100644
--- a/apps/meteor/client/hooks/useUpdateAvatar.ts
+++ b/apps/meteor/client/hooks/useUpdateAvatar.ts
@@ -1,6 +1,7 @@
 import type { AvatarObject, AvatarServiceObject, AvatarReset, AvatarUrlObj, IUser } from '@rocket.chat/core-typings';
-import { useToastMessageDispatch, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
+import { useToastMessageDispatch, useMethod } from '@rocket.chat/ui-contexts';
 import { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useEndpointAction } from './useEndpointAction';
 import { useEndpointUpload } from './useEndpointUpload';
@@ -15,7 +16,7 @@ export const useUpdateAvatar = (
 	avatarObj: AvatarObject,
 	userId: IUser['_id'],
 ): (() => Promise<{ success: boolean } | null | undefined>) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const avatarUrl = isAvatarUrl(avatarObj) ? avatarObj.avatarUrl : '';
 
 	const successMessage = t('Avatar_changed_successfully');
diff --git a/apps/meteor/client/hooks/useUserSoundPreferences.ts b/apps/meteor/client/hooks/useUserSoundPreferences.ts
new file mode 100644
index 000000000000..e59a55648f55
--- /dev/null
+++ b/apps/meteor/client/hooks/useUserSoundPreferences.ts
@@ -0,0 +1,17 @@
+import { useUserPreference } from '@rocket.chat/ui-contexts';
+
+const relativeVolume = (volume: number, masterVolume: number) => {
+	return (volume * masterVolume) / 100;
+};
+
+export const useUserSoundPreferences = () => {
+	const masterVolume = useUserPreference<number>('masterVolume', 100) || 100;
+	const notificationsSoundVolume = useUserPreference<number>('notificationsSoundVolume', 100) || 100;
+	const voipRingerVolume = useUserPreference<number>('voipRingerVolume', 100) || 100;
+
+	return {
+		masterVolume,
+		notificationsSoundVolume: relativeVolume(notificationsSoundVolume, masterVolume),
+		voipRingerVolume: relativeVolume(voipRingerVolume, masterVolume),
+	};
+};
diff --git a/apps/meteor/client/hooks/useVoipClient.ts b/apps/meteor/client/hooks/useVoipClient.ts
index a9a941b1a0e1..995880f73c1f 100644
--- a/apps/meteor/client/hooks/useVoipClient.ts
+++ b/apps/meteor/client/hooks/useVoipClient.ts
@@ -5,10 +5,10 @@ import { useUser, useSetting, useEndpoint, useStream } from '@rocket.chat/ui-con
 import { KJUR } from 'jsrsasign';
 import { useEffect, useState } from 'react';
 
+import { useHasLicenseModule } from './useHasLicenseModule';
 import { EEVoipClient } from '../lib/voip/EEVoipClient';
 import { VoIPUser } from '../lib/voip/VoIPUser';
 import { useWebRtcServers } from '../providers/CallProvider/hooks/useWebRtcServers';
-import { useHasLicenseModule } from './useHasLicenseModule';
 
 type UseVoipClientResult = {
 	voipClient?: VoIPUser;
@@ -23,7 +23,7 @@ const isSignedResponse = (data: any): data is { result: string } => typeof data?
 // Currently we only support the websocket connection and the SIP proxy connection being from the same host,
 // we need to add a new setting for SIP proxy if we want to support different hosts for them.
 export const useVoipClient = (): UseVoipClientResult => {
-	const settingVoipEnabled = Boolean(useSetting('VoIP_Enabled'));
+	const settingVoipEnabled = useSetting('VoIP_Enabled', false);
 
 	const [voipConnectorEnabled, setVoipConnectorEnabled] = useSafely(useState(true));
 
diff --git a/apps/meteor/client/importPackages.ts b/apps/meteor/client/importPackages.ts
index ddc173e63116..e08260b53032 100644
--- a/apps/meteor/client/importPackages.ts
+++ b/apps/meteor/client/importPackages.ts
@@ -36,12 +36,10 @@ import '../app/tokenpass/client';
 import '../app/webrtc/client';
 import '../app/wordpress/client';
 import '../app/e2e/client';
-import '../app/discussion/client';
 import '../app/threads/client';
 import '../app/utils/client';
 import '../app/settings/client';
 import '../app/models/client';
 import '../app/ui-utils/client';
-import '../app/ui-cached-collection/client';
 import '../app/reactions/client';
 import '../app/livechat/client';
diff --git a/apps/meteor/client/lib/RoomManager.ts b/apps/meteor/client/lib/RoomManager.ts
index 840493aae406..c70d2278511c 100644
--- a/apps/meteor/client/lib/RoomManager.ts
+++ b/apps/meteor/client/lib/RoomManager.ts
@@ -2,8 +2,8 @@ import type { IRoom } from '@rocket.chat/core-typings';
 import { Emitter } from '@rocket.chat/emitter';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
 
-import { RoomHistoryManager } from '../../app/ui-utils/client/lib/RoomHistoryManager';
 import { getConfig } from './utils/getConfig';
+import { RoomHistoryManager } from '../../app/ui-utils/client/lib/RoomHistoryManager';
 
 const debug = !!(getConfig('debug') || getConfig('debug-RoomStore'));
 
diff --git a/apps/meteor/client/lib/VideoConfManager.ts b/apps/meteor/client/lib/VideoConfManager.ts
index 7ae1c04db6df..a47d75179d92 100644
--- a/apps/meteor/client/lib/VideoConfManager.ts
+++ b/apps/meteor/client/lib/VideoConfManager.ts
@@ -3,8 +3,8 @@ import { Emitter } from '@rocket.chat/emitter';
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 
-import { sdk } from '../../app/utils/client/lib/SDKClient';
 import { getConfig } from './utils/getConfig';
+import { sdk } from '../../app/utils/client/lib/SDKClient';
 
 const debug = !!(getConfig('debug') || getConfig('debug-VideoConf'));
 
@@ -104,6 +104,8 @@ export const VideoConfManager = new (class VideoConfManager extends Emitter<Vide
 
 	private incomingDirectCalls: Map<string, IncomingDirectCall>;
 
+	private directCalls: DirectCallData[] = [];
+
 	private dismissedCalls: Set<string>;
 
 	private _preferences: CallPreferences;
@@ -124,6 +126,13 @@ export const VideoConfManager = new (class VideoConfManager extends Emitter<Vide
 		this.dismissedCalls = new Set<string>();
 		this._preferences = { mic: true, cam: false };
 		this._capabilities = {};
+
+		this.on('incoming/changed', () => {
+			this.directCalls = [...this.incomingDirectCalls.values()]
+				// Filter out any calls that we're in the process of accepting, so they're already hidden from the UI
+				.filter((call) => !call.acceptTimeout)
+				.map(({ timeout: _, acceptTimeout: _t, ...call }) => ({ ...call, dismissed: this.isCallDismissed(call.callId) }));
+		});
 	}
 
 	public isBusy(): boolean {
@@ -147,12 +156,7 @@ export const VideoConfManager = new (class VideoConfManager extends Emitter<Vide
 	}
 
 	public getIncomingDirectCalls(): DirectCallData[] {
-		return (
-			[...this.incomingDirectCalls.values()]
-				// Filter out any calls that we're in the process of accepting, so they're already hidden from the UI
-				.filter((call) => !call.acceptTimeout)
-				.map(({ timeout: _, acceptTimeout: _t, ...call }) => ({ ...call, dismissed: this.isCallDismissed(call.callId) }))
-		);
+		return this.directCalls;
 	}
 
 	public async startCall(roomId: IRoom['_id'], title?: string): Promise<void> {
diff --git a/apps/meteor/app/ui-cached-collection/client/models/CachedCollection.ts b/apps/meteor/client/lib/cachedCollections/CachedCollection.ts
similarity index 88%
rename from apps/meteor/app/ui-cached-collection/client/models/CachedCollection.ts
rename to apps/meteor/client/lib/cachedCollections/CachedCollection.ts
index 10ea6d9453bb..8a12e3ed677a 100644
--- a/apps/meteor/app/ui-cached-collection/client/models/CachedCollection.ts
+++ b/apps/meteor/client/lib/cachedCollections/CachedCollection.ts
@@ -1,18 +1,19 @@
 import type { StreamNames } from '@rocket.chat/ddp-client';
-import { Emitter } from '@rocket.chat/emitter';
 import localforage from 'localforage';
 import { Accounts } from 'meteor/accounts-base';
 import { Meteor } from 'meteor/meteor';
 import { Mongo } from 'meteor/mongo';
 import { ReactiveVar } from 'meteor/reactive-var';
+import { Tracker } from 'meteor/tracker';
 
-import type { MinimongoCollection } from '../../../../client/definitions/MinimongoCollection';
-import { baseURI } from '../../../../client/lib/baseURI';
-import { getConfig } from '../../../../client/lib/utils/getConfig';
-import { isTruthy } from '../../../../lib/isTruthy';
-import { withDebouncing } from '../../../../lib/utils/highOrderFunctions';
-import { sdk } from '../../../utils/client/lib/SDKClient';
+import type { MinimongoCollection } from '../../definitions/MinimongoCollection';
+import { baseURI } from '../baseURI';
+import { onLoggedIn } from '../loggedIn';
 import { CachedCollectionManager } from './CachedCollectionManager';
+import { sdk } from '../../../app/utils/client/lib/SDKClient';
+import { isTruthy } from '../../../lib/isTruthy';
+import { withDebouncing } from '../../../lib/utils/highOrderFunctions';
+import { getConfig } from '../utils/getConfig';
 
 export type EventType = 'notify-logged' | 'notify-all' | 'notify-user';
 
@@ -35,34 +36,30 @@ const hasUnserializedUpdatedAt = <T>(record: T): record is T & { _updatedAt: Con
 	'_updatedAt' in record &&
 	!((record as unknown as { _updatedAt: unknown })._updatedAt instanceof Date);
 
-localforage.config({
-	name: baseURI,
-});
+localforage.config({ name: baseURI });
 
-export class CachedCollection<T extends { _id: string }, U = T> extends Emitter<{ changed: T; removed: T }> {
+export class CachedCollection<T extends { _id: string }, U = T> {
 	private static MAX_CACHE_TIME = 60 * 60 * 24 * 30;
 
 	public collection: MinimongoCollection<T>;
 
 	public ready = new ReactiveVar(false);
 
-	public name: Name;
+	protected name: Name;
 
-	public eventType: StreamNames;
+	protected eventType: StreamNames;
 
-	public version = 18;
+	protected version = 18;
 
-	public userRelated: boolean;
+	protected userRelated: boolean;
 
-	public updatedAt = new Date(0);
+	protected updatedAt = new Date(0);
 
-	public log: (...args: any[]) => void;
+	protected log: (...args: any[]) => void;
 
-	public timer: ReturnType<typeof setTimeout>;
+	private timer: ReturnType<typeof setTimeout>;
 
 	constructor({ name, eventType = 'notify-user', userRelated = true }: { name: Name; eventType?: StreamNames; userRelated?: boolean }) {
-		super();
-
 		this.collection = new Mongo.Collection(null) as MinimongoCollection<T>;
 
 		this.name = name;
@@ -80,9 +77,14 @@ export class CachedCollection<T extends { _id: string }, U = T> extends Emitter<
 			return;
 		}
 
-		CachedCollectionManager.onLogin(() => {
+		if (process.env.NODE_ENV === 'test') {
+			return;
+		}
+
+		onLoggedIn(() => {
 			void this.init();
 		});
+
 		Accounts.onLogout(() => {
 			this.ready.set(false);
 		});
@@ -187,7 +189,6 @@ export class CachedCollection<T extends { _id: string }, U = T> extends Emitter<
 
 			const { _id } = newRecord;
 			this.collection.upsert({ _id } as Mongo.Selector<T>, newRecord);
-			this.emit('changed', newRecord as any); // TODO: investigate why this is needed
 
 			if (hasUpdatedAt(newRecord) && newRecord._updatedAt > this.updatedAt) {
 				this.updatedAt = newRecord._updatedAt;
@@ -301,7 +302,6 @@ export class CachedCollection<T extends { _id: string }, U = T> extends Emitter<
 						if (actionTime > this.updatedAt) {
 							this.updatedAt = actionTime;
 						}
-						this.emit(action, newRecord as any); // TODO: investigate why this is needed
 					},
 					timestamp: actionTime.getTime(),
 				});
@@ -326,7 +326,6 @@ export class CachedCollection<T extends { _id: string }, U = T> extends Emitter<
 						if (actionTime > this.updatedAt) {
 							this.updatedAt = actionTime;
 						}
-						this.emit(action, newRecord as any); // TODO: investigate why this is needed
 					},
 					timestamp: actionTime.getTime(),
 				});
@@ -353,10 +352,22 @@ export class CachedCollection<T extends { _id: string }, U = T> extends Emitter<
 
 		this.ready.set(true);
 
-		CachedCollectionManager.onReconnect(() => {
-			this.trySync();
+		this.reconnectionComputation?.stop();
+		let wentOffline = Tracker.nonreactive(() => Meteor.status().status === 'offline');
+		this.reconnectionComputation = Tracker.autorun(() => {
+			const { status } = Meteor.status();
+
+			if (status === 'offline') {
+				wentOffline = true;
+			}
+
+			if (status === 'connected' && wentOffline) {
+				this.trySync();
+			}
 		});
 
 		return this.setupListener();
 	}
+
+	private reconnectionComputation: Tracker.Computation | undefined;
 }
diff --git a/apps/meteor/client/lib/cachedCollections/CachedCollectionManager.ts b/apps/meteor/client/lib/cachedCollections/CachedCollectionManager.ts
new file mode 100644
index 000000000000..ca96af417930
--- /dev/null
+++ b/apps/meteor/client/lib/cachedCollections/CachedCollectionManager.ts
@@ -0,0 +1,22 @@
+import type { CachedCollection } from './CachedCollection';
+
+class CachedCollectionManager {
+	private items = new Set<CachedCollection<any>>();
+
+	register(cachedCollection: CachedCollection<any>) {
+		this.items.add(cachedCollection);
+	}
+
+	clearAllCachesOnLogout() {
+		for (const item of this.items) {
+			item.clearCacheOnLogout();
+		}
+	}
+}
+
+const instance = new CachedCollectionManager();
+
+export {
+	/** @deprecated */
+	instance as CachedCollectionManager,
+};
diff --git a/apps/meteor/client/lib/cachedCollections/index.ts b/apps/meteor/client/lib/cachedCollections/index.ts
new file mode 100644
index 000000000000..fb99c0d3feea
--- /dev/null
+++ b/apps/meteor/client/lib/cachedCollections/index.ts
@@ -0,0 +1,2 @@
+export { CachedCollection } from './CachedCollection';
+export { CachedCollectionManager } from './CachedCollectionManager';
diff --git a/apps/meteor/client/lib/chats/ChatAPI.ts b/apps/meteor/client/lib/chats/ChatAPI.ts
index 325073d43837..6a782faafa1f 100644
--- a/apps/meteor/client/lib/chats/ChatAPI.ts
+++ b/apps/meteor/client/lib/chats/ChatAPI.ts
@@ -1,10 +1,10 @@
 import type { IMessage, IRoom, ISubscription, IE2EEMessage, IUpload } from '@rocket.chat/core-typings';
 import type { IActionManager } from '@rocket.chat/ui-contexts';
 
-import type { FormattingButton } from '../../../app/ui-message/client/messageBox/messageBoxFormatting';
-import type { Subscribable } from '../../definitions/Subscribable';
 import type { Upload } from './Upload';
 import type { ReadStateManager } from './readStateManager';
+import type { FormattingButton } from '../../../app/ui-message/client/messageBox/messageBoxFormatting';
+import type { Subscribable } from '../../definitions/Subscribable';
 
 export type ComposerAPI = {
 	release(): void;
diff --git a/apps/meteor/client/lib/chats/data.ts b/apps/meteor/client/lib/chats/data.ts
index 4f6263147ba6..ffb5259983d7 100644
--- a/apps/meteor/client/lib/chats/data.ts
+++ b/apps/meteor/client/lib/chats/data.ts
@@ -2,13 +2,13 @@ import type { IEditedMessage, IMessage, IRoom, ISubscription } from '@rocket.cha
 import { Random } from '@rocket.chat/random';
 import moment from 'moment';
 
+import type { DataAPI } from './ChatAPI';
 import { hasAtLeastOnePermission, hasPermission } from '../../../app/authorization/client';
-import { Messages, ChatRoom, ChatSubscription } from '../../../app/models/client';
+import { Messages, Rooms, Subscriptions } from '../../../app/models/client';
 import { settings } from '../../../app/settings/client';
 import { MessageTypes } from '../../../app/ui-utils/client';
 import { sdk } from '../../../app/utils/client/lib/SDKClient';
 import { prependReplies } from '../utils/prependReplies';
-import type { DataAPI } from './ChatAPI';
 
 export const createDataAPI = ({ rid, tmid }: { rid: IRoom['_id']; tmid: IMessage['_id'] | undefined }): DataAPI => {
 	const composeMessage = async (
@@ -244,7 +244,7 @@ export const createDataAPI = ({ rid, tmid }: { rid: IRoom['_id']; tmid: IMessage
 		drafts.set(mid, draft);
 	};
 
-	const findRoom = async (): Promise<IRoom | undefined> => ChatRoom.findOne({ _id: rid }, { reactive: false });
+	const findRoom = async (): Promise<IRoom | undefined> => Rooms.findOne({ _id: rid }, { reactive: false });
 
 	const getRoom = async (): Promise<IRoom> => {
 		const room = await findRoom();
@@ -256,14 +256,14 @@ export const createDataAPI = ({ rid, tmid }: { rid: IRoom['_id']; tmid: IMessage
 		return room;
 	};
 
-	const isSubscribedToRoom = async (): Promise<boolean> => !!ChatSubscription.findOne({ rid }, { reactive: false });
+	const isSubscribedToRoom = async (): Promise<boolean> => !!Subscriptions.findOne({ rid }, { reactive: false });
 
 	const joinRoom = async (): Promise<void> => {
 		await sdk.call('joinRoom', rid);
 	};
 
 	const findDiscussionByID = async (drid: IRoom['_id']): Promise<IRoom | undefined> =>
-		ChatRoom.findOne({ _id: drid, prid: { $exists: true } }, { reactive: false });
+		Rooms.findOne({ _id: drid, prid: { $exists: true } }, { reactive: false });
 
 	const getDiscussionByID = async (drid: IRoom['_id']): Promise<IRoom> => {
 		const discussion = await findDiscussionByID(drid);
@@ -291,13 +291,13 @@ export const createDataAPI = ({ rid, tmid }: { rid: IRoom['_id']; tmid: IMessage
 	};
 
 	const findSubscription = async (): Promise<ISubscription | undefined> => {
-		return ChatSubscription.findOne({ rid }, { reactive: false });
+		return Subscriptions.findOne({ rid }, { reactive: false });
 	};
 
 	const getSubscription = createStrictGetter(findSubscription, 'Subscription not found');
 
 	const findSubscriptionFromMessage = async (message: IMessage): Promise<ISubscription | undefined> => {
-		return ChatSubscription.findOne({ rid: message.rid }, { reactive: false });
+		return Subscriptions.findOne({ rid: message.rid }, { reactive: false });
 	};
 
 	const getSubscriptionFromMessage = createStrictGetter(findSubscriptionFromMessage, 'Subscription not found');
diff --git a/apps/meteor/client/lib/chats/readStateManager.ts b/apps/meteor/client/lib/chats/readStateManager.ts
index 5f4aa3d7ad97..89b85c52401f 100644
--- a/apps/meteor/client/lib/chats/readStateManager.ts
+++ b/apps/meteor/client/lib/chats/readStateManager.ts
@@ -2,7 +2,7 @@ import type { IMessage, IRoom, ISubscription } from '@rocket.chat/core-typings';
 import { Emitter } from '@rocket.chat/emitter';
 import { Meteor } from 'meteor/meteor';
 
-import { ChatMessage } from '../../../app/models/client';
+import { Messages } from '../../../app/models/client';
 import { LegacyRoomManager } from '../../../app/ui-utils/client/lib/LegacyRoomManager';
 import { RoomHistoryManager } from '../../../app/ui-utils/client/lib/RoomHistoryManager';
 import { sdk } from '../../../app/utils/client/lib/SDKClient';
@@ -70,7 +70,7 @@ export class ReadStateManager extends Emitter {
 			return;
 		}
 
-		const firstUnreadRecord = ChatMessage.findOne(
+		const firstUnreadRecord = Messages.findOne(
 			{
 				'rid': this.subscription.rid,
 				'ts': {
diff --git a/apps/meteor/client/lib/createRouteGroup.tsx b/apps/meteor/client/lib/createRouteGroup.tsx
index 70eab4782dd1..7391ababd39d 100644
--- a/apps/meteor/client/lib/createRouteGroup.tsx
+++ b/apps/meteor/client/lib/createRouteGroup.tsx
@@ -1,9 +1,9 @@
 import type { IRouterPaths, RouteName, RouterPathPattern } from '@rocket.chat/ui-contexts';
 import React, { type ElementType, type ReactNode } from 'react';
 
+import { appLayout } from './appLayout';
 import { router } from '../providers/RouterProvider';
 import MainLayout from '../views/root/MainLayout';
-import { appLayout } from './appLayout';
 
 type GroupName = 'omnichannel' | 'marketplace' | 'account' | 'admin';
 
diff --git a/apps/meteor/client/lib/federation/Federation.spec.ts b/apps/meteor/client/lib/federation/Federation.spec.ts
index 1e367cbb9c6d..e4753f7e5422 100644
--- a/apps/meteor/client/lib/federation/Federation.spec.ts
+++ b/apps/meteor/client/lib/federation/Federation.spec.ts
@@ -1,8 +1,8 @@
 import type { IRoom, ISubscription, IUser, ValueOf } from '@rocket.chat/core-typings';
 
+import * as Federation from './Federation';
 import { RoomRoles } from '../../../app/models/client';
 import { RoomMemberActions, RoomSettingsEnum } from '../../../definition/IRoomTypeConfig';
-import * as Federation from './Federation';
 
 jest.mock('../../../app/models/client', () => ({
 	RoomRoles: {
diff --git a/apps/meteor/client/lib/fetchFeatures.ts b/apps/meteor/client/lib/fetchFeatures.ts
index c481e8cf2f76..e287b6bb895a 100644
--- a/apps/meteor/client/lib/fetchFeatures.ts
+++ b/apps/meteor/client/lib/fetchFeatures.ts
@@ -1,9 +1,4 @@
-import { CachedCollectionManager } from '../../app/ui-cached-collection/client';
+import { whenLoggedIn } from './loggedIn';
 import { sdk } from '../../app/utils/client/lib/SDKClient';
 
-export const fetchFeatures = (): Promise<string[]> =>
-	new Promise((resolve, reject) => {
-		CachedCollectionManager.onLogin(() => {
-			sdk.call('license:getModules').then(resolve, reject);
-		});
-	});
+export const fetchFeatures = (): Promise<string[]> => whenLoggedIn().then(() => sdk.call('license:getModules'));
diff --git a/apps/meteor/client/lib/getPermaLink.ts b/apps/meteor/client/lib/getPermaLink.ts
index 8c74bc7933a9..279786c00375 100644
--- a/apps/meteor/client/lib/getPermaLink.ts
+++ b/apps/meteor/client/lib/getPermaLink.ts
@@ -16,13 +16,13 @@ export const getPermaLink = async (msgId: string): Promise<string> => {
 		throw new Error('invalid-parameter');
 	}
 
-	const { ChatMessage, ChatRoom, ChatSubscription } = await import('../../app/models/client');
+	const { Messages, Rooms, Subscriptions } = await import('../../app/models/client');
 
-	const msg = ChatMessage.findOne(msgId) || (await getMessage(msgId));
+	const msg = Messages.findOne(msgId) || (await getMessage(msgId));
 	if (!msg) {
 		throw new Error('message-not-found');
 	}
-	const roomData = ChatRoom.findOne({
+	const roomData = Rooms.findOne({
 		_id: msg.rid,
 	});
 
@@ -30,7 +30,7 @@ export const getPermaLink = async (msgId: string): Promise<string> => {
 		throw new Error('room-not-found');
 	}
 
-	const subData = ChatSubscription.findOne({ 'rid': roomData._id, 'u._id': Meteor.userId() });
+	const subData = Subscriptions.findOne({ 'rid': roomData._id, 'u._id': Meteor.userId() });
 
 	const { roomCoordinator } = await import('./rooms/roomCoordinator');
 
diff --git a/apps/meteor/client/lib/lists/ThreadsList.ts b/apps/meteor/client/lib/lists/ThreadsList.ts
index 5e77f0254a08..0b4f0183296a 100644
--- a/apps/meteor/client/lib/lists/ThreadsList.ts
+++ b/apps/meteor/client/lib/lists/ThreadsList.ts
@@ -1,4 +1,4 @@
-import type { IMessage, ISubscription, IUser } from '@rocket.chat/core-typings';
+import type { IMessage, ISubscription, IUser, IThreadMainMessage } from '@rocket.chat/core-typings';
 import { escapeRegExp } from '@rocket.chat/string-helpers';
 
 import { MessageList } from './MessageList';
@@ -32,7 +32,7 @@ const isThreadUnread = (threadMessage: ThreadMessage, tunread: ISubscription['tu
 
 const isThreadTextMatching = (threadMessage: ThreadMessage, regex: RegExp): boolean => regex.test(threadMessage.msg);
 
-export class ThreadsList extends MessageList {
+export class ThreadsList extends MessageList<IThreadMainMessage> {
 	public constructor(private _options: ThreadsListOptions) {
 		super();
 	}
@@ -46,7 +46,7 @@ export class ThreadsList extends MessageList {
 		this.clear();
 	}
 
-	protected filter(message: IMessage): boolean {
+	protected filter(message: IThreadMainMessage): boolean {
 		const { rid } = this._options;
 
 		if (!isThreadMessageInRoom(message, rid)) {
@@ -77,7 +77,7 @@ export class ThreadsList extends MessageList {
 		return true;
 	}
 
-	protected compare(a: IMessage, b: IMessage): number {
+	protected compare(a: IThreadMainMessage, b: IThreadMainMessage): number {
 		return (b.tlm ?? b.ts).getTime() - (a.tlm ?? a.ts).getTime();
 	}
 }
diff --git a/apps/meteor/client/lib/loggedIn.ts b/apps/meteor/client/lib/loggedIn.ts
new file mode 100644
index 000000000000..033727ed9836
--- /dev/null
+++ b/apps/meteor/client/lib/loggedIn.ts
@@ -0,0 +1,40 @@
+import { Accounts } from 'meteor/accounts-base';
+import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
+
+const isLoggedIn = () => {
+	const uid = Tracker.nonreactive(() => Meteor.userId());
+	return uid !== null;
+};
+
+export const whenLoggedIn = () => {
+	if (isLoggedIn()) {
+		return Promise.resolve();
+	}
+
+	return new Promise<void>((resolve) => {
+		const subscription = Accounts.onLogin(() => {
+			subscription.stop();
+			resolve();
+		});
+	});
+};
+
+export const onLoggedIn = (cb: (() => () => void) | (() => Promise<() => void>) | (() => void)) => {
+	let cleanup: (() => void) | undefined;
+	const handler = async () => {
+		cleanup?.();
+		const ret = await cb();
+		if (typeof ret === 'function') {
+			cleanup = ret;
+		}
+	};
+
+	const subscription = Accounts.onLogin(handler);
+	if (isLoggedIn()) handler();
+
+	return () => {
+		subscription.stop();
+		cleanup?.();
+	};
+};
diff --git a/apps/meteor/client/lib/parseMessageTextToAstMarkdown.ts b/apps/meteor/client/lib/parseMessageTextToAstMarkdown.ts
index 0a1de5049e2b..969f36a6f2fc 100644
--- a/apps/meteor/client/lib/parseMessageTextToAstMarkdown.ts
+++ b/apps/meteor/client/lib/parseMessageTextToAstMarkdown.ts
@@ -49,7 +49,7 @@ export const parseMessageTextToAstMarkdown = <
 		md:
 			isE2EEMessage(message) || isOTRMessage(message) || isOTRAckMessage(message) || translated
 				? textToMessageToken(text, parseOptions)
-				: msg.md ?? textToMessageToken(text, parseOptions),
+				: (msg.md ?? textToMessageToken(text, parseOptions)),
 		...(msg.attachments && {
 			attachments: parseMessageAttachments(msg.attachments, parseOptions, { autoTranslateLanguage, translated }),
 		}),
@@ -79,12 +79,12 @@ export const parseMessageAttachment = <T extends MessageAttachment>(
 	if (isFileAttachment(attachment) && attachment.description) {
 		attachment.descriptionMd = translated
 			? textToMessageToken(text, parseOptions)
-			: attachment.descriptionMd ?? textToMessageToken(text, parseOptions);
+			: (attachment.descriptionMd ?? textToMessageToken(text, parseOptions));
 	}
 
 	return {
 		...attachment,
-		md: translated ? textToMessageToken(text, parseOptions) : attachment.md ?? textToMessageToken(text, parseOptions),
+		md: translated ? textToMessageToken(text, parseOptions) : (attachment.md ?? textToMessageToken(text, parseOptions)),
 	};
 };
 
diff --git a/apps/meteor/client/lib/rooms/roomCoordinator.tsx b/apps/meteor/client/lib/rooms/roomCoordinator.tsx
index 31eda2982a12..aa71a3a7e9df 100644
--- a/apps/meteor/client/lib/rooms/roomCoordinator.tsx
+++ b/apps/meteor/client/lib/rooms/roomCoordinator.tsx
@@ -5,7 +5,7 @@ import { Meteor } from 'meteor/meteor';
 import React from 'react';
 
 import { hasPermission } from '../../../app/authorization/client';
-import { ChatRoom, ChatSubscription } from '../../../app/models/client';
+import { Rooms, Subscriptions } from '../../../app/models/client';
 import { settings } from '../../../app/settings/client';
 import type {
 	RoomSettingsEnum,
@@ -61,7 +61,7 @@ class RoomCoordinatorClient extends RoomCoordinator {
 				return false;
 			},
 			canSendMessage(rid: string): boolean {
-				return ChatSubscription.find({ rid }).count() > 0;
+				return Subscriptions.find({ rid }).count() > 0;
 			},
 			...directives,
 			config: roomConfig,
@@ -118,7 +118,7 @@ class RoomCoordinatorClient extends RoomCoordinator {
 			t: 1,
 			...(user && { muted: 1, unmuted: 1 }),
 		};
-		const room = ChatRoom.findOne({ _id: rid }, { fields });
+		const room = Rooms.findOne({ _id: rid }, { fields });
 		if (!room) {
 			return false;
 		}
@@ -157,12 +157,12 @@ class RoomCoordinatorClient extends RoomCoordinator {
 
 	// #ToDo: Move this out of the RoomCoordinator
 	public archived(rid: string): boolean {
-		const room = ChatRoom.findOne({ _id: rid }, { fields: { archived: 1 } });
+		const room = Rooms.findOne({ _id: rid }, { fields: { archived: 1 } });
 		return Boolean(room?.archived);
 	}
 
 	public verifyCanSendMessage(rid: string): boolean {
-		const room = ChatRoom.findOne({ _id: rid }, { fields: { t: 1, federated: 1 } });
+		const room = Rooms.findOne({ _id: rid }, { fields: { t: 1, federated: 1 } });
 		if (!room?.t) {
 			return false;
 		}
diff --git a/apps/meteor/client/lib/rooms/roomTypes/direct.ts b/apps/meteor/client/lib/rooms/roomTypes/direct.ts
index 776c309c8544..d9c954ff13d4 100644
--- a/apps/meteor/client/lib/rooms/roomTypes/direct.ts
+++ b/apps/meteor/client/lib/rooms/roomTypes/direct.ts
@@ -4,7 +4,7 @@ import { Meteor } from 'meteor/meteor';
 import type { Mongo } from 'meteor/mongo';
 
 import { hasAtLeastOnePermission } from '../../../../app/authorization/client';
-import { Subscriptions, Users, ChatRoom } from '../../../../app/models/client';
+import { Subscriptions, Users, Rooms } from '../../../../app/models/client';
 import { settings } from '../../../../app/settings/client';
 import { getUserPreference } from '../../../../app/utils/client';
 import { getAvatarURL } from '../../../../app/utils/client/getAvatarURL';
@@ -153,7 +153,7 @@ roomCoordinator.add(
 
 			const subscription = Subscriptions.findOne(query);
 			if (subscription?.rid) {
-				return ChatRoom.findOne(subscription.rid);
+				return Rooms.findOne(subscription.rid);
 			}
 		},
 	} as AtLeast<IRoomTypeClientDirectives, 'isGroupChat' | 'roomName'>,
diff --git a/apps/meteor/client/lib/rooms/roomTypes/livechat.ts b/apps/meteor/client/lib/rooms/roomTypes/livechat.ts
index 26919ac83b99..23a813d6b81a 100644
--- a/apps/meteor/client/lib/rooms/roomTypes/livechat.ts
+++ b/apps/meteor/client/lib/rooms/roomTypes/livechat.ts
@@ -1,7 +1,7 @@
 import type { AtLeast, ValueOf } from '@rocket.chat/core-typings';
 
 import { hasPermission } from '../../../../app/authorization/client';
-import { ChatRoom, ChatSubscription } from '../../../../app/models/client';
+import { Rooms, Subscriptions } from '../../../../app/models/client';
 import { settings } from '../../../../app/settings/client';
 import { getAvatarURL } from '../../../../app/utils/client/getAvatarURL';
 import type { IRoomTypeClientDirectives } from '../../../../definition/IRoomTypeConfig';
@@ -54,7 +54,7 @@ roomCoordinator.add(
 		},
 
 		findRoom(identifier) {
-			return ChatRoom.findOne({ _id: identifier });
+			return Rooms.findOne({ _id: identifier });
 		},
 
 		isLivechatRoom() {
@@ -62,17 +62,17 @@ roomCoordinator.add(
 		},
 
 		canSendMessage(rid) {
-			const room = ChatRoom.findOne({ _id: rid }, { fields: { open: 1 } });
+			const room = Rooms.findOne({ _id: rid }, { fields: { open: 1 } });
 			return Boolean(room?.open);
 		},
 
 		readOnly(rid, _user) {
-			const room = ChatRoom.findOne({ _id: rid }, { fields: { open: 1, servedBy: 1 } });
+			const room = Rooms.findOne({ _id: rid }, { fields: { open: 1, servedBy: 1 } });
 			if (!room?.open) {
 				return true;
 			}
 
-			const subscription = ChatSubscription.findOne({ rid });
+			const subscription = Subscriptions.findOne({ rid });
 			return !subscription;
 		},
 
diff --git a/apps/meteor/client/lib/rooms/roomTypes/private.ts b/apps/meteor/client/lib/rooms/roomTypes/private.ts
index b99e172e8396..d25da3410c54 100644
--- a/apps/meteor/client/lib/rooms/roomTypes/private.ts
+++ b/apps/meteor/client/lib/rooms/roomTypes/private.ts
@@ -4,7 +4,7 @@ import { Meteor } from 'meteor/meteor';
 import type { Mongo } from 'meteor/mongo';
 
 import { hasPermission } from '../../../../app/authorization/client';
-import { ChatRoom } from '../../../../app/models/client';
+import { Rooms } from '../../../../app/models/client';
 import { settings } from '../../../../app/settings/client';
 import { getUserPreference } from '../../../../app/utils/client';
 import { getRoomAvatarURL } from '../../../../app/utils/client/getRoomAvatarURL';
@@ -115,7 +115,7 @@ roomCoordinator.add(
 				name: identifier,
 			};
 
-			return ChatRoom.findOne(query);
+			return Rooms.findOne(query);
 		},
 	} as AtLeast<IRoomTypeClientDirectives, 'isGroupChat' | 'roomName'>,
 );
diff --git a/apps/meteor/client/lib/rooms/roomTypes/public.ts b/apps/meteor/client/lib/rooms/roomTypes/public.ts
index cf9d4c1a978c..1da42356fee9 100644
--- a/apps/meteor/client/lib/rooms/roomTypes/public.ts
+++ b/apps/meteor/client/lib/rooms/roomTypes/public.ts
@@ -4,7 +4,7 @@ import { Meteor } from 'meteor/meteor';
 import type { Mongo } from 'meteor/mongo';
 
 import { hasAtLeastOnePermission } from '../../../../app/authorization/client';
-import { ChatRoom } from '../../../../app/models/client';
+import { Rooms } from '../../../../app/models/client';
 import { settings } from '../../../../app/settings/client';
 import { getUserPreference } from '../../../../app/utils/client';
 import { getRoomAvatarURL } from '../../../../app/utils/client/getRoomAvatarURL';
@@ -114,11 +114,11 @@ roomCoordinator.add(
 				name: identifier,
 			};
 
-			return ChatRoom.findOne(query);
+			return Rooms.findOne(query);
 		},
 
 		showJoinLink(roomId) {
-			return !!ChatRoom.findOne({ _id: roomId, t: 'c' });
+			return !!Rooms.findOne({ _id: roomId, t: 'c' });
 		},
 	} as AtLeast<IRoomTypeClientDirectives, 'isGroupChat' | 'roomName'>,
 );
diff --git a/apps/meteor/client/lib/rooms/roomTypes/voip.ts b/apps/meteor/client/lib/rooms/roomTypes/voip.ts
index 30b07aaec1ee..4777aa13f210 100644
--- a/apps/meteor/client/lib/rooms/roomTypes/voip.ts
+++ b/apps/meteor/client/lib/rooms/roomTypes/voip.ts
@@ -1,7 +1,7 @@
 import type { AtLeast } from '@rocket.chat/core-typings';
 
 import { hasPermission } from '../../../../app/authorization/client';
-import { ChatRoom } from '../../../../app/models/client';
+import { Rooms } from '../../../../app/models/client';
 import { settings } from '../../../../app/settings/client';
 import { getAvatarURL } from '../../../../app/utils/client/getAvatarURL';
 import type { IRoomTypeClientDirectives } from '../../../../definition/IRoomTypeConfig';
@@ -29,7 +29,7 @@ roomCoordinator.add(
 		},
 
 		findRoom(identifier) {
-			return ChatRoom.findOne({ _id: identifier });
+			return Rooms.findOne({ _id: identifier });
 		},
 
 		canSendMessage(_rid) {
diff --git a/apps/meteor/client/lib/settings/PrivateSettingsCachedCollection.ts b/apps/meteor/client/lib/settings/PrivateSettingsCachedCollection.ts
index 6f4e1c95a5fa..1b170c82e7d8 100644
--- a/apps/meteor/client/lib/settings/PrivateSettingsCachedCollection.ts
+++ b/apps/meteor/client/lib/settings/PrivateSettingsCachedCollection.ts
@@ -1,7 +1,7 @@
 import type { ISetting } from '@rocket.chat/core-typings';
 
-import { CachedCollection } from '../../../app/ui-cached-collection/client';
 import { sdk } from '../../../app/utils/client/lib/SDKClient';
+import { CachedCollection } from '../cachedCollections';
 
 class PrivateSettingsCachedCollection extends CachedCollection<ISetting> {
 	constructor() {
diff --git a/apps/meteor/client/lib/settings/PublicSettingsCachedCollection.ts b/apps/meteor/client/lib/settings/PublicSettingsCachedCollection.ts
index c01523252f85..6d01d13d9617 100644
--- a/apps/meteor/client/lib/settings/PublicSettingsCachedCollection.ts
+++ b/apps/meteor/client/lib/settings/PublicSettingsCachedCollection.ts
@@ -1,6 +1,6 @@
 import type { ISetting } from '@rocket.chat/core-typings';
 
-import { CachedCollection } from '../../../app/ui-cached-collection/client';
+import { CachedCollection } from '../cachedCollections';
 
 class PublicSettingsCachedCollection extends CachedCollection<ISetting> {
 	constructor() {
diff --git a/apps/meteor/client/lib/userData.ts b/apps/meteor/client/lib/userData.ts
index ee90f493a30c..15fc806be94d 100644
--- a/apps/meteor/client/lib/userData.ts
+++ b/apps/meteor/client/lib/userData.ts
@@ -111,7 +111,7 @@ export const synchronizeUserData = async (uid: IUser['_id']): Promise<RawUserDat
 										})),
 									}),
 								},
-						  }
+							}
 						: {}),
 					...(cloud
 						? {
@@ -119,7 +119,7 @@ export const synchronizeUserData = async (uid: IUser['_id']): Promise<RawUserDat
 									...cloud,
 									expiresAt: new Date(cloud.expiresAt),
 								},
-						  }
+							}
 						: {}),
 					...(emailCode ? { ...emailCode, expire: new Date(emailCode.expire) } : {}),
 					...(email2fa ? { email2fa: { ...email2fa, changedAt: new Date(email2fa.changedAt) } } : {}),
diff --git a/apps/meteor/client/lib/utils/getUidDirectMessage.ts b/apps/meteor/client/lib/utils/getUidDirectMessage.ts
index 761b849f7883..6073de5f53c5 100644
--- a/apps/meteor/client/lib/utils/getUidDirectMessage.ts
+++ b/apps/meteor/client/lib/utils/getUidDirectMessage.ts
@@ -1,10 +1,10 @@
 import type { IRoom, IUser } from '@rocket.chat/core-typings';
 import { Meteor } from 'meteor/meteor';
 
-import { ChatRoom } from '../../../app/models/client';
+import { Rooms } from '../../../app/models/client';
 
 export const getUidDirectMessage = (rid: IRoom['_id'], uid: IUser['_id'] | null = Meteor.userId()): string | undefined => {
-	const room = ChatRoom.findOne({ _id: rid }, { fields: { t: 1, uids: 1 } });
+	const room = Rooms.findOne({ _id: rid }, { fields: { t: 1, uids: 1 } });
 
 	if (!room || room.t !== 'd' || !room.uids || room.uids.length > 2) {
 		return undefined;
diff --git a/apps/meteor/client/lib/utils/goToRoomById.ts b/apps/meteor/client/lib/utils/goToRoomById.ts
index 2bb5936d5510..12c6a2a768ee 100644
--- a/apps/meteor/client/lib/utils/goToRoomById.ts
+++ b/apps/meteor/client/lib/utils/goToRoomById.ts
@@ -1,10 +1,10 @@
 import type { IRoom, ISubscription } from '@rocket.chat/core-typings';
 import { memoize } from '@rocket.chat/memo';
 
-import { ChatSubscription } from '../../../app/models/client';
+import { callWithErrorHandling } from './callWithErrorHandling';
+import { Subscriptions } from '../../../app/models/client';
 import { router } from '../../providers/RouterProvider';
 import { roomCoordinator } from '../rooms/roomCoordinator';
-import { callWithErrorHandling } from './callWithErrorHandling';
 
 const getRoomById = memoize((rid: IRoom['_id']) => callWithErrorHandling('getRoomById', rid));
 
@@ -13,7 +13,7 @@ export const goToRoomById = async (rid: IRoom['_id']): Promise<void> => {
 		return;
 	}
 
-	const subscription: ISubscription | undefined = ChatSubscription.findOne({ rid });
+	const subscription: ISubscription | undefined = Subscriptions.findOne({ rid });
 
 	if (subscription) {
 		roomCoordinator.openRouteLink(subscription.t, subscription, router.getSearchParameters());
diff --git a/apps/meteor/client/lib/utils/legacyJumpToMessage.ts b/apps/meteor/client/lib/utils/legacyJumpToMessage.ts
index c1fcbbbb8f35..9ae917e8cae9 100644
--- a/apps/meteor/client/lib/utils/legacyJumpToMessage.ts
+++ b/apps/meteor/client/lib/utils/legacyJumpToMessage.ts
@@ -1,7 +1,7 @@
 import type { IMessage } from '@rocket.chat/core-typings';
 import { isThreadMessage } from '@rocket.chat/core-typings';
 
-import { ChatRoom } from '../../../app/models/client';
+import { Rooms } from '../../../app/models/client';
 import { RoomHistoryManager } from '../../../app/ui-utils/client';
 import { router } from '../../providers/RouterProvider';
 import { RoomManager } from '../RoomManager';
@@ -23,7 +23,7 @@ export const legacyJumpToMessage = async (message: IMessage) => {
 					tab: 'thread',
 					context: message.tmid || message._id,
 					rid: message.rid,
-					name: ChatRoom.findOne({ _id: message.rid })?.name ?? '',
+					name: Rooms.findOne({ _id: message.rid })?.name ?? '',
 				},
 				search: {
 					...router.getSearchParameters(),
diff --git a/apps/meteor/client/lib/utils/messageArgs.ts b/apps/meteor/client/lib/utils/messageArgs.ts
deleted file mode 100644
index 0a92a6fa8adc..000000000000
--- a/apps/meteor/client/lib/utils/messageArgs.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-import type { IRoom, ISubscription, ITranslatedMessage, IUser, SettingValue } from '@rocket.chat/core-typings';
-
-export const messageArgs = (
-	context: any,
-): {
-	context?: 'threads' | 'mentions';
-	msg: ITranslatedMessage;
-	u: IUser;
-	room: IRoom;
-	settings: Record<string, SettingValue>;
-	groupable: boolean;
-	hideRoles: boolean;
-	subscription: ISubscription;
-	customClass: string;
-	templatePrefix: string;
-	ignored: boolean;
-	shouldCollapseReplies: boolean;
-} => context?._arguments?.[1]?.hash || context;
diff --git a/apps/meteor/client/lib/utils/renderEmoji.ts b/apps/meteor/client/lib/utils/renderEmoji.ts
index 5c7acaf88dc6..c9104af36ae2 100644
--- a/apps/meteor/client/lib/utils/renderEmoji.ts
+++ b/apps/meteor/client/lib/utils/renderEmoji.ts
@@ -43,7 +43,7 @@ const createGetEmojiClassNameAndDataTitle =
 				? emojiElement.style.backgroundImage
 				: (Object.fromEntries((emojiElement.getAttribute('style') || '')?.split(';').map((s) => s.split(':'))) as Record<string, string>)[
 						'background-image'
-				  ];
+					];
 
 		return {
 			'className': emojiElement.getAttribute('class') || '',
diff --git a/apps/meteor/client/lib/utils/renderMessageEmoji.ts b/apps/meteor/client/lib/utils/renderMessageEmoji.ts
index 7960ec1914e5..644187605ae7 100644
--- a/apps/meteor/client/lib/utils/renderMessageEmoji.ts
+++ b/apps/meteor/client/lib/utils/renderMessageEmoji.ts
@@ -1,3 +1,3 @@
 import { emojiParser } from '../../../app/emoji/client/emojiParser';
 
-export const renderMessageEmoji = ({ html }: { html: string }): string => emojiParser({ html }).html;
+export const renderMessageEmoji = (html: string) => emojiParser(html);
diff --git a/apps/meteor/client/lib/voip/VoIPUser.ts b/apps/meteor/client/lib/voip/VoIPUser.ts
index d9473c878fb2..5e74ae2cbd05 100644
--- a/apps/meteor/client/lib/voip/VoIPUser.ts
+++ b/apps/meteor/client/lib/voip/VoIPUser.ts
@@ -91,7 +91,10 @@ export class VoIPUser extends Emitter<VoipEvents> {
 		return this._userState;
 	}
 
-	constructor(private readonly config: VoIPUserConfiguration, mediaRenderer?: IMediaStreamRenderer) {
+	constructor(
+		private readonly config: VoIPUserConfiguration,
+		mediaRenderer?: IMediaStreamRenderer,
+	) {
 		super();
 		this.mediaStreamRendered = mediaRenderer;
 		this.networkEmitter = new Emitter<SignalingSocketEvents>();
diff --git a/apps/meteor/client/meteorOverrides/index.ts b/apps/meteor/client/meteorOverrides/index.ts
index b8e14d4138bd..baa6b2b06386 100644
--- a/apps/meteor/client/meteorOverrides/index.ts
+++ b/apps/meteor/client/meteorOverrides/index.ts
@@ -1,6 +1,7 @@
 import './ddpOverREST';
 import './totpOnCall';
 import './oauthRedirectUri';
+import './unstoreLoginToken';
 import './userAndUsers';
 import './login/cas';
 import './login/crowd';
diff --git a/apps/meteor/client/meteorOverrides/login/facebook.ts b/apps/meteor/client/meteorOverrides/login/facebook.ts
index 72a91775818e..c72b26be542f 100644
--- a/apps/meteor/client/meteorOverrides/login/facebook.ts
+++ b/apps/meteor/client/meteorOverrides/login/facebook.ts
@@ -4,9 +4,9 @@ import { Facebook } from 'meteor/facebook-oauth';
 import { Meteor } from 'meteor/meteor';
 import { OAuth } from 'meteor/oauth';
 
+import { createOAuthTotpLoginMethod } from './oauth';
 import { overrideLoginMethod } from '../../lib/2fa/overrideLoginMethod';
 import { wrapRequestCredentialFn } from '../../lib/wrapRequestCredentialFn';
-import { createOAuthTotpLoginMethod } from './oauth';
 
 const { loginWithFacebook } = Meteor;
 const loginWithFacebookAndTOTP = createOAuthTotpLoginMethod(Facebook);
diff --git a/apps/meteor/client/meteorOverrides/login/github.ts b/apps/meteor/client/meteorOverrides/login/github.ts
index 2a1aa3903317..8ee2a057921f 100644
--- a/apps/meteor/client/meteorOverrides/login/github.ts
+++ b/apps/meteor/client/meteorOverrides/login/github.ts
@@ -4,9 +4,9 @@ import { Github } from 'meteor/github-oauth';
 import { Meteor } from 'meteor/meteor';
 import { OAuth } from 'meteor/oauth';
 
+import { createOAuthTotpLoginMethod } from './oauth';
 import { overrideLoginMethod } from '../../lib/2fa/overrideLoginMethod';
 import { wrapRequestCredentialFn } from '../../lib/wrapRequestCredentialFn';
-import { createOAuthTotpLoginMethod } from './oauth';
 
 const { loginWithGithub } = Meteor;
 const loginWithGithubAndTOTP = createOAuthTotpLoginMethod(Github);
diff --git a/apps/meteor/client/meteorOverrides/login/google.ts b/apps/meteor/client/meteorOverrides/login/google.ts
index 4e99ac3a281b..55ca6e0c35ed 100644
--- a/apps/meteor/client/meteorOverrides/login/google.ts
+++ b/apps/meteor/client/meteorOverrides/login/google.ts
@@ -4,21 +4,20 @@ import { Google } from 'meteor/google-oauth';
 import { Meteor } from 'meteor/meteor';
 import { OAuth } from 'meteor/oauth';
 
+import { createOAuthTotpLoginMethod } from './oauth';
 import { overrideLoginMethod, type LoginCallback } from '../../lib/2fa/overrideLoginMethod';
 import { wrapRequestCredentialFn } from '../../lib/wrapRequestCredentialFn';
-import { createOAuthTotpLoginMethod } from './oauth';
 
 declare module 'meteor/meteor' {
 	// eslint-disable-next-line @typescript-eslint/no-namespace
 	namespace Meteor {
 		function loginWithGoogle(
-			options?:
-				| Meteor.LoginWithExternalServiceOptions & {
-						loginUrlParameters?: {
-							include_granted_scopes?: boolean;
-							hd?: string;
-						};
-				  },
+			options?: Meteor.LoginWithExternalServiceOptions & {
+				loginUrlParameters?: {
+					include_granted_scopes?: boolean;
+					hd?: string;
+				};
+			},
 			callback?: LoginCallback,
 		): void;
 	}
diff --git a/apps/meteor/client/meteorOverrides/login/meteorDeveloperAccount.ts b/apps/meteor/client/meteorOverrides/login/meteorDeveloperAccount.ts
index 56823fee6b6a..2550630caac1 100644
--- a/apps/meteor/client/meteorOverrides/login/meteorDeveloperAccount.ts
+++ b/apps/meteor/client/meteorOverrides/login/meteorDeveloperAccount.ts
@@ -2,9 +2,9 @@ import { Meteor } from 'meteor/meteor';
 import { MeteorDeveloperAccounts } from 'meteor/meteor-developer-oauth';
 import { OAuth } from 'meteor/oauth';
 
+import { createOAuthTotpLoginMethod } from './oauth';
 import { overrideLoginMethod } from '../../lib/2fa/overrideLoginMethod';
 import { wrapRequestCredentialFn } from '../../lib/wrapRequestCredentialFn';
-import { createOAuthTotpLoginMethod } from './oauth';
 
 const { loginWithMeteorDeveloperAccount } = Meteor;
 const loginWithMeteorDeveloperAccountAndTOTP = createOAuthTotpLoginMethod(MeteorDeveloperAccounts);
diff --git a/apps/meteor/client/meteorOverrides/login/twitter.ts b/apps/meteor/client/meteorOverrides/login/twitter.ts
index e19ce234e5e9..b74ffadfe12d 100644
--- a/apps/meteor/client/meteorOverrides/login/twitter.ts
+++ b/apps/meteor/client/meteorOverrides/login/twitter.ts
@@ -4,9 +4,9 @@ import { Meteor } from 'meteor/meteor';
 import { OAuth } from 'meteor/oauth';
 import { Twitter } from 'meteor/twitter-oauth';
 
+import { createOAuthTotpLoginMethod } from './oauth';
 import { overrideLoginMethod } from '../../lib/2fa/overrideLoginMethod';
 import { wrapRequestCredentialFn } from '../../lib/wrapRequestCredentialFn';
-import { createOAuthTotpLoginMethod } from './oauth';
 
 const { loginWithTwitter } = Meteor;
 const loginWithTwitterAndTOTP = createOAuthTotpLoginMethod(Twitter);
diff --git a/apps/meteor/client/meteorOverrides/unstoreLoginToken.ts b/apps/meteor/client/meteorOverrides/unstoreLoginToken.ts
new file mode 100644
index 000000000000..d1a6ffe9c9cd
--- /dev/null
+++ b/apps/meteor/client/meteorOverrides/unstoreLoginToken.ts
@@ -0,0 +1,9 @@
+import { Accounts } from 'meteor/accounts-base';
+
+import { CachedCollectionManager } from '../lib/cachedCollections';
+
+const { _unstoreLoginToken } = Accounts;
+Accounts._unstoreLoginToken = (...args) => {
+	_unstoreLoginToken.apply(Accounts, args);
+	CachedCollectionManager.clearAllCachesOnLogout();
+};
diff --git a/apps/meteor/client/methods/hideRoom.ts b/apps/meteor/client/methods/hideRoom.ts
index 91cf2a3de04c..0f45717fd494 100644
--- a/apps/meteor/client/methods/hideRoom.ts
+++ b/apps/meteor/client/methods/hideRoom.ts
@@ -1,7 +1,7 @@
 import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { Meteor } from 'meteor/meteor';
 
-import { ChatSubscription } from '../../app/models/client';
+import { Subscriptions } from '../../app/models/client';
 
 Meteor.methods<ServerMethods>({
 	async hideRoom(rid) {
@@ -9,7 +9,7 @@ Meteor.methods<ServerMethods>({
 			return 0;
 		}
 
-		return ChatSubscription.update(
+		return Subscriptions.update(
 			{
 				rid,
 				'u._id': Meteor.userId(),
diff --git a/apps/meteor/client/methods/index.ts b/apps/meteor/client/methods/index.ts
index 990a3a20f24c..c29f49ffb65d 100644
--- a/apps/meteor/client/methods/index.ts
+++ b/apps/meteor/client/methods/index.ts
@@ -1,7 +1,6 @@
 import './hideRoom';
 import './openRoom';
 import './pinMessage';
-import './setUserActiveStatus';
 import './starMessage';
 import './toggleFavorite';
 import './unpinMessage';
diff --git a/apps/meteor/client/methods/openRoom.ts b/apps/meteor/client/methods/openRoom.ts
index 81a40989e696..afe12060ad50 100644
--- a/apps/meteor/client/methods/openRoom.ts
+++ b/apps/meteor/client/methods/openRoom.ts
@@ -1,7 +1,7 @@
 import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { Meteor } from 'meteor/meteor';
 
-import { ChatSubscription } from '../../app/models/client';
+import { Subscriptions } from '../../app/models/client';
 
 Meteor.methods<ServerMethods>({
 	async openRoom(rid) {
@@ -11,7 +11,7 @@ Meteor.methods<ServerMethods>({
 			});
 		}
 
-		return ChatSubscription.update(
+		return Subscriptions.update(
 			{
 				rid,
 				'u._id': Meteor.userId(),
diff --git a/apps/meteor/client/methods/pinMessage.ts b/apps/meteor/client/methods/pinMessage.ts
index 2fba64be2bf9..06c58657cec9 100644
--- a/apps/meteor/client/methods/pinMessage.ts
+++ b/apps/meteor/client/methods/pinMessage.ts
@@ -2,7 +2,7 @@ import type { IMessage } from '@rocket.chat/core-typings';
 import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { Meteor } from 'meteor/meteor';
 
-import { ChatMessage, ChatSubscription } from '../../app/models/client';
+import { Messages, Subscriptions } from '../../app/models/client';
 import { settings } from '../../app/settings/client';
 
 Meteor.methods<ServerMethods>({
@@ -17,7 +17,7 @@ Meteor.methods<ServerMethods>({
 				method: 'pinMessage',
 			});
 		}
-		if (!ChatSubscription.findOne({ rid: message.rid })) {
+		if (!Subscriptions.findOne({ rid: message.rid })) {
 			throw new Meteor.Error('error-pinning-message', 'Pinning messages is not allowed', {
 				method: 'pinMessage',
 			});
@@ -28,7 +28,7 @@ Meteor.methods<ServerMethods>({
 			});
 		}
 
-		ChatMessage.update(
+		Messages.update(
 			{
 				_id: message._id,
 				rid: message.rid,
@@ -40,7 +40,7 @@ Meteor.methods<ServerMethods>({
 			},
 		);
 
-		const msg = ChatMessage.findOne({ _id: message._id });
+		const msg = Messages.findOne({ _id: message._id });
 
 		if (!msg) {
 			throw new Meteor.Error('error-pinning-message', 'Error pinning message', {
diff --git a/apps/meteor/client/methods/setUserActiveStatus.ts b/apps/meteor/client/methods/setUserActiveStatus.ts
deleted file mode 100644
index b6b9e0b778a7..000000000000
--- a/apps/meteor/client/methods/setUserActiveStatus.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import type { ServerMethods } from '@rocket.chat/ddp-client';
-import { Meteor } from 'meteor/meteor';
-
-Meteor.methods<ServerMethods>({
-	setUserActiveStatus(userId, active) {
-		Meteor.users.update(userId, { $set: { active } });
-		return true;
-	},
-});
diff --git a/apps/meteor/client/methods/starMessage.ts b/apps/meteor/client/methods/starMessage.ts
index bfa74738e283..80572549c6b6 100644
--- a/apps/meteor/client/methods/starMessage.ts
+++ b/apps/meteor/client/methods/starMessage.ts
@@ -1,7 +1,7 @@
 import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { Meteor } from 'meteor/meteor';
 
-import { ChatMessage, ChatSubscription } from '../../app/models/client';
+import { Messages, Subscriptions } from '../../app/models/client';
 import { settings } from '../../app/settings/client';
 import { t } from '../../app/utils/lib/i18n';
 import { dispatchToastMessage } from '../lib/toast';
@@ -15,12 +15,12 @@ Meteor.methods<ServerMethods>({
 			return false;
 		}
 
-		if (!ChatSubscription.findOne({ rid: message.rid })) {
+		if (!Subscriptions.findOne({ rid: message.rid })) {
 			dispatchToastMessage({ type: 'error', message: t('error-starring-message') });
 			return false;
 		}
 
-		if (!ChatMessage.findOneByRoomIdAndMessageId(message.rid, message._id)) {
+		if (!Messages.findOne({ _id: message._id, rid: message.rid })) {
 			dispatchToastMessage({ type: 'error', message: t('error-starring-message') });
 			return false;
 		}
@@ -31,7 +31,7 @@ Meteor.methods<ServerMethods>({
 		}
 
 		if (message.starred) {
-			ChatMessage.update(
+			Messages.update(
 				{ _id: message._id },
 				{
 					$addToSet: {
@@ -45,7 +45,7 @@ Meteor.methods<ServerMethods>({
 			return true;
 		}
 
-		ChatMessage.update(
+		Messages.update(
 			{ _id: message._id },
 			{
 				$pull: {
diff --git a/apps/meteor/client/methods/toggleFavorite.ts b/apps/meteor/client/methods/toggleFavorite.ts
index 5db56fa682f7..a6deb281fea5 100644
--- a/apps/meteor/client/methods/toggleFavorite.ts
+++ b/apps/meteor/client/methods/toggleFavorite.ts
@@ -1,7 +1,7 @@
 import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { Meteor } from 'meteor/meteor';
 
-import { ChatSubscription } from '../../app/models/client';
+import { Subscriptions } from '../../app/models/client';
 
 Meteor.methods<ServerMethods>({
 	async toggleFavorite(rid, f) {
@@ -9,7 +9,7 @@ Meteor.methods<ServerMethods>({
 			return 0;
 		}
 
-		return ChatSubscription.update(
+		return Subscriptions.update(
 			{
 				rid,
 				'u._id': Meteor.userId(),
diff --git a/apps/meteor/client/methods/unpinMessage.ts b/apps/meteor/client/methods/unpinMessage.ts
index f05c07e5314d..deee1f51f5fa 100644
--- a/apps/meteor/client/methods/unpinMessage.ts
+++ b/apps/meteor/client/methods/unpinMessage.ts
@@ -2,7 +2,7 @@ import type { IMessage } from '@rocket.chat/core-typings';
 import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { Meteor } from 'meteor/meteor';
 
-import { ChatMessage, ChatSubscription } from '../../app/models/client';
+import { Messages, Subscriptions } from '../../app/models/client';
 import { settings } from '../../app/settings/client';
 import { t } from '../../app/utils/lib/i18n';
 import { dispatchToastMessage } from '../lib/toast';
@@ -17,7 +17,7 @@ Meteor.methods<ServerMethods>({
 			dispatchToastMessage({ type: 'error', message: t('unpinning-not-allowed') });
 			return false;
 		}
-		if (!ChatSubscription.findOne({ rid: message.rid })) {
+		if (!Subscriptions.findOne({ rid: message.rid })) {
 			dispatchToastMessage({ type: 'error', message: t('error-unpinning-message') });
 			return false;
 		}
@@ -26,7 +26,7 @@ Meteor.methods<ServerMethods>({
 			return false;
 		}
 		dispatchToastMessage({ type: 'success', message: t('Message_has_been_unpinned') });
-		ChatMessage.update(
+		Messages.update(
 			{
 				_id: message._id,
 				rid: message.rid,
diff --git a/apps/meteor/client/methods/updateMessage.ts b/apps/meteor/client/methods/updateMessage.ts
index 8efffbe73ee6..f9638fc1629d 100644
--- a/apps/meteor/client/methods/updateMessage.ts
+++ b/apps/meteor/client/methods/updateMessage.ts
@@ -5,7 +5,7 @@ import { Tracker } from 'meteor/tracker';
 import moment from 'moment';
 
 import { hasAtLeastOnePermission, hasPermission } from '../../app/authorization/client';
-import { ChatMessage } from '../../app/models/client';
+import { Messages } from '../../app/models/client';
 import { settings } from '../../app/settings/client';
 import { t } from '../../app/utils/lib/i18n';
 import { dispatchToastMessage } from '../lib/toast';
@@ -17,7 +17,7 @@ Meteor.methods<ServerMethods>({
 			return;
 		}
 
-		const originalMessage = ChatMessage.findOne(message._id);
+		const originalMessage = Messages.findOne(message._id);
 
 		if (!originalMessage) {
 			return;
@@ -85,7 +85,7 @@ Meteor.methods<ServerMethods>({
 					originalMessage.attachments[0].description = message.msg;
 				}
 			}
-			ChatMessage.update(
+			Messages.update(
 				{
 					'_id': message._id,
 					'u._id': uid,
diff --git a/apps/meteor/client/navbar/actions/NavbarHomeAction.tsx b/apps/meteor/client/navbar/actions/NavbarHomeAction.tsx
index ec668811122e..4204a723fe7d 100644
--- a/apps/meteor/client/navbar/actions/NavbarHomeAction.tsx
+++ b/apps/meteor/client/navbar/actions/NavbarHomeAction.tsx
@@ -1,15 +1,16 @@
 import { IconButton } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useRouter, useLayout, useSetting, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRouter, useLayout, useSetting } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { NavbarAction } from '../../components/Navbar';
 
 type NavbarHomeActionProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
 
 const NavbarHomeAction = (props: NavbarHomeActionProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const router = useRouter();
 	const { sidebar } = useLayout();
 	const showHome = useSetting('Layout_Show_Home_Button');
diff --git a/apps/meteor/client/omnichannel/ContactManagerInfo.tsx b/apps/meteor/client/omnichannel/ContactManagerInfo.tsx
deleted file mode 100644
index 7be0c97a13df..000000000000
--- a/apps/meteor/client/omnichannel/ContactManagerInfo.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-import { css } from '@rocket.chat/css-in-js';
-import { UserAvatar } from '@rocket.chat/ui-avatar';
-import React, { useMemo } from 'react';
-
-import { UserStatus } from '../components/UserStatus';
-import { AsyncStatePhase } from '../hooks/useAsyncState';
-import { useEndpointData } from '../hooks/useEndpointData';
-import AgentInfoDetails from '../views/omnichannel/components/AgentInfoDetails';
-import Info from '../views/omnichannel/components/Info';
-
-const wordBreak = css`
-	word-break: break-word;
-`;
-
-type ContactManagerInfoProps = {
-	username: string;
-};
-
-function ContactManagerInfo({ username }: ContactManagerInfoProps) {
-	const { value: data, phase: state } = useEndpointData('/v1/users.info', { params: useMemo(() => ({ username }), [username]) });
-
-	if (!data && state === AsyncStatePhase.LOADING) {
-		return null;
-	}
-
-	if (state === AsyncStatePhase.REJECTED) {
-		return null;
-	}
-
-	const {
-		user: { name, status },
-	} = data;
-
-	return (
-		<>
-			<Info className={wordBreak} style={{ display: 'flex' }}>
-				<UserAvatar title={username} username={username} />
-				<AgentInfoDetails mis={10} name={name} shortName={username} status={<UserStatus status={status} />} />
-			</Info>
-		</>
-	);
-}
-
-export default ContactManagerInfo;
diff --git a/apps/meteor/client/omnichannel/additionalForms/ContactManager.tsx b/apps/meteor/client/omnichannel/additionalForms/ContactManager.tsx
deleted file mode 100644
index 7bad69c8943c..000000000000
--- a/apps/meteor/client/omnichannel/additionalForms/ContactManager.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import { Field } from '@rocket.chat/fuselage';
-import React from 'react';
-import { useTranslation } from 'react-i18next';
-
-import AutoCompleteAgent from '../../components/AutoCompleteAgent';
-import { useHasLicenseModule } from '../../hooks/useHasLicenseModule';
-
-type ContactManagerProps = {
-	value: string;
-	handler: (value: string) => void;
-};
-
-const ContactManager = ({ value: userId, handler }: ContactManagerProps) => {
-	const { t } = useTranslation();
-	const hasLicense = useHasLicenseModule('livechat-enterprise');
-
-	if (!hasLicense) {
-		return null;
-	}
-
-	return (
-		<Field>
-			<Field.Label>{t('Contact_Manager')}</Field.Label>
-			<Field.Row>
-				<AutoCompleteAgent haveNoAgentsSelectedOption value={userId} onChange={handler} />
-			</Field.Row>
-		</Field>
-	);
-};
-
-export default ContactManager;
diff --git a/apps/meteor/client/omnichannel/additionalForms/ContactManagerInput.tsx b/apps/meteor/client/omnichannel/additionalForms/ContactManagerInput.tsx
new file mode 100644
index 000000000000..edcaa5379290
--- /dev/null
+++ b/apps/meteor/client/omnichannel/additionalForms/ContactManagerInput.tsx
@@ -0,0 +1,29 @@
+import React from 'react';
+
+import AutoCompleteAgent from '../../components/AutoCompleteAgent';
+import { useHasLicenseModule } from '../../hooks/useHasLicenseModule';
+
+type ContactManagerInputProps = {
+	value: string;
+	onChange: (currentValue: string) => void;
+};
+
+const ContactManagerInput = ({ value: userId, onChange }: ContactManagerInputProps) => {
+	const hasLicense = useHasLicenseModule('livechat-enterprise');
+
+	if (!hasLicense) {
+		return null;
+	}
+
+	const handleChange = (currentValue: string) => {
+		if (currentValue === 'no-agent-selected') {
+			return onChange('');
+		}
+
+		onChange(currentValue);
+	};
+
+	return <AutoCompleteAgent haveNoAgentsSelectedOption value={userId} onChange={handleChange} />;
+};
+
+export default ContactManagerInput;
diff --git a/apps/meteor/client/omnichannel/additionalForms/DepartmentBusinessHours.tsx b/apps/meteor/client/omnichannel/additionalForms/DepartmentBusinessHours.tsx
index 03fa63ba169e..c9e9ee9e7d52 100644
--- a/apps/meteor/client/omnichannel/additionalForms/DepartmentBusinessHours.tsx
+++ b/apps/meteor/client/omnichannel/additionalForms/DepartmentBusinessHours.tsx
@@ -1,12 +1,13 @@
 import { Field, FieldLabel, FieldRow, TextInput } from '@rocket.chat/fuselage';
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useHasLicenseModule } from '../../hooks/useHasLicenseModule';
 
 export const DepartmentBusinessHours = ({ bhId }: { bhId: string | undefined }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const hasLicense = useHasLicenseModule('livechat-enterprise');
 	const getBusinessHour = useEndpoint('GET', '/v1/livechat/business-hour');
 	const { data } = useQuery(['/v1/livechat/business-hour', bhId], () => getBusinessHour({ _id: bhId, type: 'custom' }));
diff --git a/apps/meteor/client/omnichannel/additionalForms/DepartmentForwarding.tsx b/apps/meteor/client/omnichannel/additionalForms/DepartmentForwarding.tsx
index e65e4da01b96..b42261e3cc13 100644
--- a/apps/meteor/client/omnichannel/additionalForms/DepartmentForwarding.tsx
+++ b/apps/meteor/client/omnichannel/additionalForms/DepartmentForwarding.tsx
@@ -63,7 +63,7 @@ export const DepartmentForwarding = ({ departmentId, value = [], handler, label
 											return;
 										}
 										loadMoreDepartments(start, Math.min(50, departmentsTotal));
-								  }
+									}
 						}
 						renderItem={({ label, ...props }) => (
 							<CheckOption
diff --git a/apps/meteor/client/omnichannel/businessHours/BusinessHoursRow.tsx b/apps/meteor/client/omnichannel/businessHours/BusinessHoursRow.tsx
index fa6c9a40f159..30dfe1c99557 100644
--- a/apps/meteor/client/omnichannel/businessHours/BusinessHoursRow.tsx
+++ b/apps/meteor/client/omnichannel/businessHours/BusinessHoursRow.tsx
@@ -1,15 +1,16 @@
 import type { ILivechatBusinessHour, Serialized } from '@rocket.chat/core-typings';
 import { IconButton } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useRouter, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRouter } from '@rocket.chat/ui-contexts';
 import type { KeyboardEvent } from 'react';
 import React, { memo, useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
-import { GenericTableRow, GenericTableCell } from '../../components/GenericTable';
 import { useRemoveBusinessHour } from './useRemoveBusinessHour';
+import { GenericTableRow, GenericTableCell } from '../../components/GenericTable';
 
 const BusinessHoursRow = ({ _id, name, timezone, workHours, active, type }: Serialized<ILivechatBusinessHour>) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const router = useRouter();
 	const handleRemove = useRemoveBusinessHour();
 
diff --git a/apps/meteor/client/omnichannel/businessHours/BusinessHoursTable.tsx b/apps/meteor/client/omnichannel/businessHours/BusinessHoursTable.tsx
index b4220e420a9a..c98eb3e961e9 100644
--- a/apps/meteor/client/omnichannel/businessHours/BusinessHoursTable.tsx
+++ b/apps/meteor/client/omnichannel/businessHours/BusinessHoursTable.tsx
@@ -1,8 +1,10 @@
 import { Pagination, States, StatesIcon, StatesActions, StatesAction, StatesTitle } from '@rocket.chat/fuselage';
+import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
 import { useTranslation, useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import React, { useMemo, useState } from 'react';
 
+import BusinessHoursRow from './BusinessHoursRow';
 import FilterByText from '../../components/FilterByText';
 import GenericNoResults from '../../components/GenericNoResults';
 import {
@@ -13,7 +15,6 @@ import {
 	GenericTableLoadingRow,
 } from '../../components/GenericTable';
 import { usePagination } from '../../components/GenericTable/hooks/usePagination';
-import BusinessHoursRow from './BusinessHoursRow';
 
 const BusinessHoursTable = () => {
 	const t = useTranslation();
@@ -21,13 +22,16 @@ const BusinessHoursTable = () => {
 
 	const { current, itemsPerPage, setItemsPerPage: onSetItemsPerPage, setCurrent: onSetCurrent, ...paginationProps } = usePagination();
 
-	const query = useMemo(
-		() => ({
-			...(itemsPerPage && { count: itemsPerPage }),
-			...(current && { offset: current }),
-			name: text,
-		}),
-		[itemsPerPage, current, text],
+	const query = useDebouncedValue(
+		useMemo(
+			() => ({
+				name: text,
+				...(itemsPerPage && { count: itemsPerPage }),
+				...(current && { offset: current }),
+			}),
+			[text, itemsPerPage, current],
+		),
+		500,
 	);
 
 	const getBusinessHours = useEndpoint('GET', '/v1/livechat/business-hours');
@@ -47,7 +51,7 @@ const BusinessHoursTable = () => {
 
 	return (
 		<>
-			<FilterByText onChange={setText} />
+			<FilterByText value={text} onChange={(event) => setText(event.target.value)} />
 			{isLoading && (
 				<GenericTable>
 					<GenericTableHeader>{headers}</GenericTableHeader>
@@ -62,9 +66,7 @@ const BusinessHoursTable = () => {
 					<GenericTable>
 						<GenericTableHeader>{headers}</GenericTableHeader>
 						<GenericTableBody>
-							{data?.businessHours.map((businessHour) => (
-								<BusinessHoursRow key={businessHour._id} {...businessHour} />
-							))}
+							{data?.businessHours.map((businessHour) => <BusinessHoursRow key={businessHour._id} {...businessHour} />)}
 						</GenericTableBody>
 					</GenericTable>
 					<Pagination
diff --git a/apps/meteor/client/omnichannel/businessHours/useRemoveBusinessHour.tsx b/apps/meteor/client/omnichannel/businessHours/useRemoveBusinessHour.tsx
index 626c54106946..e65a152db22e 100644
--- a/apps/meteor/client/omnichannel/businessHours/useRemoveBusinessHour.tsx
+++ b/apps/meteor/client/omnichannel/businessHours/useRemoveBusinessHour.tsx
@@ -1,12 +1,13 @@
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useSetModal, useToastMessageDispatch, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetModal, useToastMessageDispatch, useMethod } from '@rocket.chat/ui-contexts';
 import { useQueryClient } from '@tanstack/react-query';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../components/GenericModal';
 
 export const useRemoveBusinessHour = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const setModal = useSetModal();
 	const dispatchToastMessage = useToastMessageDispatch();
 	const removeBusinessHour = useMethod('livechat:removeBusinessHour');
diff --git a/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEdit.tsx b/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEdit.tsx
index 28116cb26a13..f2a959a587fe 100644
--- a/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEdit.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEdit.tsx
@@ -6,9 +6,9 @@ import { useQueryClient } from '@tanstack/react-query';
 import React, { memo, useCallback } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 
-import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../components/Page';
 import CannedResponseForm from './components/cannedResponseForm';
 import { useRemoveCannedResponse } from './useRemoveCannedResponse';
+import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../components/Page';
 
 type CannedResponseEditProps = {
 	cannedResponseData?: Serialized<IOmnichannelCannedResponse>;
diff --git a/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEditWithData.tsx b/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEditWithData.tsx
index 64cbe556db9c..0d3504c02e5b 100644
--- a/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEditWithData.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEditWithData.tsx
@@ -1,15 +1,16 @@
 import type { IOmnichannelCannedResponse } from '@rocket.chat/core-typings';
 import { Callout } from '@rocket.chat/fuselage';
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
-import { FormSkeleton } from '../../components/Skeleton';
 import CannedResponseEdit from './CannedResponseEdit';
 import CannedResponseEditWithDepartmentData from './CannedResponseEditWithDepartmentData';
+import { FormSkeleton } from '../../components/Skeleton';
 
 const CannedResponseEditWithData = ({ cannedResponseId }: { cannedResponseId: IOmnichannelCannedResponse['_id'] }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const getCannedResponseById = useEndpoint('GET', '/v1/canned-responses/:_id', { _id: cannedResponseId });
 	const { data, isLoading, isError } = useQuery(['getCannedResponseById', cannedResponseId], async () => getCannedResponseById());
diff --git a/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEditWithDepartmentData.tsx b/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEditWithDepartmentData.tsx
index 6f57a29e116f..5d2ffa537fb2 100644
--- a/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEditWithDepartmentData.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/CannedResponseEditWithDepartmentData.tsx
@@ -3,10 +3,10 @@ import { Callout } from '@rocket.chat/fuselage';
 import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import CannedResponseEdit from './CannedResponseEdit';
 import { FormSkeleton } from '../../components/Skeleton';
 import { AsyncStatePhase } from '../../hooks/useAsyncState';
 import { useEndpointData } from '../../hooks/useEndpointData';
-import CannedResponseEdit from './CannedResponseEdit';
 
 const CannedResponseEditWithDepartmentData = ({ cannedResponseData }: { cannedResponseData: Serialized<IOmnichannelCannedResponse> }) => {
 	const departmentId = useMemo(() => cannedResponseData?.departmentId, [cannedResponseData]) as string;
diff --git a/apps/meteor/client/omnichannel/cannedResponses/CannedResponsesPage.tsx b/apps/meteor/client/omnichannel/cannedResponses/CannedResponsesPage.tsx
index f476868be27b..db5615626366 100644
--- a/apps/meteor/client/omnichannel/cannedResponses/CannedResponsesPage.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/CannedResponsesPage.tsx
@@ -1,14 +1,15 @@
 import { Button, ButtonGroup } from '@rocket.chat/fuselage';
-import { useRouteParameter, useRouter, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRouteParameter, useRouter } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
-import { Page, PageHeader, PageContent } from '../../components/Page';
 import CannedResponseEdit from './CannedResponseEdit';
 import CannedResponseEditWithData from './CannedResponseEditWithData';
 import CannedResponsesTable from './CannedResponsesTable';
+import { Page, PageHeader, PageContent } from '../../components/Page';
 
 const CannedResponsesPage = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const router = useRouter();
 
 	const context = useRouteParameter('context');
diff --git a/apps/meteor/client/omnichannel/cannedResponses/CannedResponsesRoute.tsx b/apps/meteor/client/omnichannel/cannedResponses/CannedResponsesRoute.tsx
index dc6a489320d1..5ae08ac73e04 100644
--- a/apps/meteor/client/omnichannel/cannedResponses/CannedResponsesRoute.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/CannedResponsesRoute.tsx
@@ -1,8 +1,8 @@
 import { usePermission } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import NotAuthorizedPage from '../../views/notAuthorized/NotAuthorizedPage';
 import CannedResponsesPage from './CannedResponsesPage';
+import NotAuthorizedPage from '../../views/notAuthorized/NotAuthorizedPage';
 
 const CannedResponsesRoute = () => {
 	const canViewCannedResponses = usePermission('manage-livechat-canned-responses');
diff --git a/apps/meteor/client/omnichannel/cannedResponses/CannedResponsesTable.tsx b/apps/meteor/client/omnichannel/cannedResponses/CannedResponsesTable.tsx
index 8bf1d52e5ca9..2b718cb539bf 100644
--- a/apps/meteor/client/omnichannel/cannedResponses/CannedResponsesTable.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/CannedResponsesTable.tsx
@@ -5,6 +5,8 @@ import { useTranslation, usePermission, useToastMessageDispatch, useEndpoint, us
 import { useQuery, hashQueryKey } from '@tanstack/react-query';
 import React, { useMemo, useState } from 'react';
 
+import CannedResponseFilter from './CannedResponseFilter';
+import { useRemoveCannedResponse } from './useRemoveCannedResponse';
 import GenericNoResults from '../../components/GenericNoResults';
 import {
 	GenericTable,
@@ -18,8 +20,6 @@ import {
 import { usePagination } from '../../components/GenericTable/hooks/usePagination';
 import { useSort } from '../../components/GenericTable/hooks/useSort';
 import { useFormatDateAndTime } from '../../hooks/useFormatDateAndTime';
-import CannedResponseFilter from './CannedResponseFilter';
-import { useRemoveCannedResponse } from './useRemoveCannedResponse';
 
 type Scope = 'global' | 'department' | 'user';
 
diff --git a/apps/meteor/client/omnichannel/cannedResponses/components/CannedResponsesComposer/CannedResponsesComposer.tsx b/apps/meteor/client/omnichannel/cannedResponses/components/CannedResponsesComposer/CannedResponsesComposer.tsx
index 0abc8d3bd203..43d2b14d0628 100644
--- a/apps/meteor/client/omnichannel/cannedResponses/components/CannedResponsesComposer/CannedResponsesComposer.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/components/CannedResponsesComposer/CannedResponsesComposer.tsx
@@ -7,16 +7,17 @@ import {
 	MessageComposerToolbar,
 	MessageComposerActionsDivider,
 } from '@rocket.chat/ui-composer';
-import { useUserPreference, useTranslation } from '@rocket.chat/ui-contexts';
+import { useUserPreference } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { memo, useCallback, useRef, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
+import InsertPlaceholderDropdown from './InsertPlaceholderDropdown';
 import { Backdrop } from '../../../../components/Backdrop';
 import { useEmojiPicker } from '../../../../contexts/EmojiPickerContext';
-import InsertPlaceholderDropdown from './InsertPlaceholderDropdown';
 
 const CannedResponsesComposer = ({ onChange, ...props }: ComponentProps<typeof MessageComposerInput>) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const useEmojisPreference = useUserPreference('useEmojis');
 
 	const textAreaRef = useRef<HTMLTextAreaElement>(null);
diff --git a/apps/meteor/client/omnichannel/cannedResponses/components/cannedResponseForm.tsx b/apps/meteor/client/omnichannel/cannedResponses/components/cannedResponseForm.tsx
index e2bc979f3f4d..620b58e33a1e 100644
--- a/apps/meteor/client/omnichannel/cannedResponses/components/cannedResponseForm.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/components/cannedResponseForm.tsx
@@ -1,18 +1,19 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Field, FieldLabel, FieldRow, FieldError, TextInput, FieldGroup, RadioButton, FieldHint, Option } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
-import { usePermission, useTranslation } from '@rocket.chat/ui-contexts';
+import { usePermission } from '@rocket.chat/ui-contexts';
 import React, { useState } from 'react';
 import { useFormContext, Controller } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
-import AutoCompleteDepartment from '../../../components/AutoCompleteDepartment';
-import Tags from '../../../components/Omnichannel/Tags';
 import CannedResponsesComposer from './CannedResponsesComposer/CannedResponsesComposer';
 import CannedResponsesComposerPreview from './CannedResponsesComposer/CannedResponsesComposerPreview';
+import AutoCompleteDepartment from '../../../components/AutoCompleteDepartment';
+import Tags from '../../../components/Omnichannel/Tags';
 
 // TODO: refactor Tags field to get proper validation
 const CannedResponseForm = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const hasManagerPermission = usePermission('view-all-canned-responses');
 	const hasMonitorPermission = usePermission('save-department-canned-responses');
 
diff --git a/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.stories.tsx b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.stories.tsx
index 27fcb651120d..312a907224ba 100644
--- a/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.stories.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.stories.tsx
@@ -3,8 +3,8 @@ import { action } from '@storybook/addon-actions';
 import type { Meta, StoryFn } from '@storybook/react';
 import React from 'react';
 
-import { Contextualbar } from '../../../../components/Contextualbar';
 import CannedResponseList from './CannedResponseList';
+import { Contextualbar } from '../../../../components/Contextualbar';
 
 export default {
 	title: 'Omnichannel/CannedResponseList',
diff --git a/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.tsx b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.tsx
index 5734cf2e93bf..0f3d642ce19c 100644
--- a/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.tsx
@@ -6,6 +6,8 @@ import React, { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Virtuoso } from 'react-virtuoso';
 
+import Item from './Item';
+import WrapCannedResponse from './WrapCannedResponse';
 import {
 	ContextualbarHeader,
 	ContextualbarTitle,
@@ -16,8 +18,6 @@ import {
 } from '../../../../components/Contextualbar';
 import { VirtuosoScrollbars } from '../../../../components/CustomScrollbars';
 import { useRoomToolbox } from '../../../../views/room/contexts/RoomToolboxContext';
-import Item from './Item';
-import WrapCannedResponse from './WrapCannedResponse';
 
 type CannedResponseListProps = {
 	loadMoreItems: (start: number, end: number) => void;
diff --git a/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/WrapCannedResponse.tsx b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/WrapCannedResponse.tsx
index eb118f50a7ef..36b5b2ea5bcb 100644
--- a/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/WrapCannedResponse.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/WrapCannedResponse.tsx
@@ -3,8 +3,8 @@ import { useSetModal, usePermission } from '@rocket.chat/ui-contexts';
 import type { MouseEvent, MouseEventHandler } from 'react';
 import React, { memo } from 'react';
 
-import CreateCannedResponse from '../../modals/CreateCannedResponse';
 import CannedResponse from './CannedResponse';
+import CreateCannedResponse from '../../modals/CreateCannedResponse';
 
 type WrapCannedResponseProps = {
 	allowUse: boolean;
diff --git a/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/WrapCannedResponseList.tsx b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/WrapCannedResponseList.tsx
index 6fd0ee420dbf..c213cf2be46b 100644
--- a/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/WrapCannedResponseList.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/contextualBar/CannedResponse/WrapCannedResponseList.tsx
@@ -3,6 +3,7 @@ import { useSetModal, useRouter } from '@rocket.chat/ui-contexts';
 import type { MouseEvent } from 'react';
 import React, { memo, useCallback, useMemo, useState } from 'react';
 
+import CannedResponseList from './CannedResponseList';
 import { useRecordList } from '../../../../hooks/lists/useRecordList';
 import { useIsRoomOverMacLimit } from '../../../../hooks/omnichannel/useIsRoomOverMacLimit';
 import { AsyncStatePhase } from '../../../../lib/asyncState';
@@ -12,7 +13,6 @@ import { useRoomToolbox } from '../../../../views/room/contexts/RoomToolboxConte
 import { useCannedResponseFilterOptions } from '../../../hooks/useCannedResponseFilterOptions';
 import { useCannedResponseList } from '../../../hooks/useCannedResponseList';
 import CreateCannedResponse from '../../modals/CreateCannedResponse';
-import CannedResponseList from './CannedResponseList';
 
 export const WrapCannedResponseList = () => {
 	const room = useRoom();
diff --git a/apps/meteor/client/omnichannel/cannedResponses/modals/CreateCannedResponse/CreateCannedResponseModal.tsx b/apps/meteor/client/omnichannel/cannedResponses/modals/CreateCannedResponse/CreateCannedResponseModal.tsx
index 9776564264cc..56a79916b64c 100644
--- a/apps/meteor/client/omnichannel/cannedResponses/modals/CreateCannedResponse/CreateCannedResponseModal.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/modals/CreateCannedResponse/CreateCannedResponseModal.tsx
@@ -1,8 +1,9 @@
 import type { ILivechatDepartment, IOmnichannelCannedResponse } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
-import { useEndpoint, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import React, { memo, useCallback } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../components/GenericModal';
 import CannedResponseForm from '../../components/cannedResponseForm';
@@ -30,7 +31,7 @@ const CreateCannedResponseModal = ({
 	onClose: () => void;
 	reloadCannedList: () => void;
 }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 
 	const methods = useForm({ defaultValues: getInitialData(cannedResponseData) });
diff --git a/apps/meteor/client/omnichannel/cannedResponses/useRemoveCannedResponse.tsx b/apps/meteor/client/omnichannel/cannedResponses/useRemoveCannedResponse.tsx
index aa23533b3e72..9713bf680538 100644
--- a/apps/meteor/client/omnichannel/cannedResponses/useRemoveCannedResponse.tsx
+++ b/apps/meteor/client/omnichannel/cannedResponses/useRemoveCannedResponse.tsx
@@ -1,12 +1,13 @@
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useSetModal, useToastMessageDispatch, useRouter, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetModal, useToastMessageDispatch, useRouter, useMethod } from '@rocket.chat/ui-contexts';
 import { useQueryClient } from '@tanstack/react-query';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../components/GenericModal';
 
 export const useRemoveCannedResponse = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const setModal = useSetModal();
 	const router = useRouter();
 	const queryClient = useQueryClient();
diff --git a/apps/meteor/client/omnichannel/hooks/useCannedResponseFilterOptions.ts b/apps/meteor/client/omnichannel/hooks/useCannedResponseFilterOptions.ts
index f3ca3b4159cf..e39e7f961e63 100644
--- a/apps/meteor/client/omnichannel/hooks/useCannedResponseFilterOptions.ts
+++ b/apps/meteor/client/omnichannel/hooks/useCannedResponseFilterOptions.ts
@@ -1,8 +1,9 @@
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useEffect, useMemo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 export const useCannedResponseFilterOptions = (): string[][] => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const getDepartments = useEndpoint('GET', '/v1/livechat/department');
 
 	const defaultOptions = useMemo(
diff --git a/apps/meteor/client/omnichannel/hooks/useOmnichannelPrioritiesMenu.tsx b/apps/meteor/client/omnichannel/hooks/useOmnichannelPrioritiesMenu.tsx
index 2a99f6f1fada..01f20a799b7b 100644
--- a/apps/meteor/client/omnichannel/hooks/useOmnichannelPrioritiesMenu.tsx
+++ b/apps/meteor/client/omnichannel/hooks/useOmnichannelPrioritiesMenu.tsx
@@ -1,17 +1,18 @@
 import { LivechatPriorityWeight } from '@rocket.chat/core-typings';
 import type { Menu } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQueryClient } from '@tanstack/react-query';
 import type { ComponentProps } from 'react';
 import React, { useCallback, useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
+import { useOmnichannelPriorities } from './useOmnichannelPriorities';
 import { dispatchToastMessage } from '../../lib/toast';
 import { PriorityIcon } from '../priorities/PriorityIcon';
-import { useOmnichannelPriorities } from './useOmnichannelPriorities';
 
 export const useOmnichannelPrioritiesMenu = (rid: string): ComponentProps<typeof Menu>['options'] | Record<string, never> => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const queryClient = useQueryClient();
 	const updateRoomPriority = useEndpoint('POST', '/v1/livechat/room/:rid/priority', { rid });
 	const removeRoomPriority = useEndpoint('DELETE', '/v1/livechat/room/:rid/priority', { rid });
diff --git a/apps/meteor/client/omnichannel/monitors/MonitorsPage.tsx b/apps/meteor/client/omnichannel/monitors/MonitorsPage.tsx
index cbf2e6ec88ff..a394b11343e5 100644
--- a/apps/meteor/client/omnichannel/monitors/MonitorsPage.tsx
+++ b/apps/meteor/client/omnichannel/monitors/MonitorsPage.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { Page, PageHeader, PageContent } from '../../components/Page';
 import MonitorsTable from './MonitorsTable';
+import { Page, PageHeader, PageContent } from '../../components/Page';
 
 const MonitorsPage = () => {
 	const { t } = useTranslation();
diff --git a/apps/meteor/client/omnichannel/monitors/MonitorsPageContainer.tsx b/apps/meteor/client/omnichannel/monitors/MonitorsPageContainer.tsx
index b86f8a1ced2c..3a803555f9af 100644
--- a/apps/meteor/client/omnichannel/monitors/MonitorsPageContainer.tsx
+++ b/apps/meteor/client/omnichannel/monitors/MonitorsPageContainer.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 
+import MonitorsPage from './MonitorsPage';
 import PageSkeleton from '../../components/PageSkeleton';
 import { useHasLicenseModule } from '../../hooks/useHasLicenseModule';
 import NotAuthorizedPage from '../../views/notAuthorized/NotAuthorizedPage';
-import MonitorsPage from './MonitorsPage';
 
 const MonitorsPageContainer = () => {
 	const license = useHasLicenseModule('livechat-enterprise');
diff --git a/apps/meteor/client/omnichannel/monitors/MonitorsTable.tsx b/apps/meteor/client/omnichannel/monitors/MonitorsTable.tsx
index 76a95cf4a0e7..3ba57d5938ae 100644
--- a/apps/meteor/client/omnichannel/monitors/MonitorsTable.tsx
+++ b/apps/meteor/client/omnichannel/monitors/MonitorsTable.tsx
@@ -40,7 +40,6 @@ const MonitorsTable = () => {
 
 	const [text, setText] = useState('');
 	const [username, setUsername] = useState('');
-	const debouncedText = useDebouncedValue(text, 500);
 
 	const dispatchToastMessage = useToastMessageDispatch();
 
@@ -56,19 +55,20 @@ const MonitorsTable = () => {
 	const { current, itemsPerPage, setItemsPerPage: onSetItemsPerPage, setCurrent: onSetCurrent, ...paginationProps } = pagination;
 	const { sortBy, sortDirection, setSort } = sort;
 
-	const query = useMemo(
-		() => ({
-			text: debouncedText,
-			sort: `{ "${sortBy}": ${sortDirection === 'asc' ? 1 : -1} }`,
-			...(itemsPerPage && { count: itemsPerPage }),
-			...(current && { offset: current }),
-		}),
-		[debouncedText, itemsPerPage, current, sortBy, sortDirection],
+	const query = useDebouncedValue(
+		useMemo(
+			() => ({
+				text,
+				sort: `{ "${sortBy}": ${sortDirection === 'asc' ? 1 : -1} }`,
+				...(itemsPerPage && { count: itemsPerPage }),
+				...(current && { offset: current }),
+			}),
+			[text, itemsPerPage, current, sortBy, sortDirection],
+		),
+		500,
 	);
 
-	const { data, refetch, isLoading, isSuccess, isError } = useQuery(['omnichannel', 'monitors', debouncedText, pagination, sort], () =>
-		getMonitors(query),
-	);
+	const { data, refetch, isLoading, isSuccess, isError } = useQuery(['omnichannel', 'monitors', query], () => getMonitors(query));
 
 	const [defaultQuery] = useState(hashQueryKey([query]));
 	const queryHasChanged = defaultQuery !== hashQueryKey([query]);
@@ -144,7 +144,9 @@ const MonitorsTable = () => {
 					</FieldRow>
 				</Field>
 			</Box>
-			{((isSuccess && data?.monitors.length > 0) || queryHasChanged) && <FilterByText onChange={setText} />}
+			{((isSuccess && data?.monitors.length > 0) || queryHasChanged) && (
+				<FilterByText value={text} onChange={(event) => setText(event.target.value)} />
+			)}
 			{isLoading && (
 				<GenericTable>
 					<GenericTableHeader>{headers}</GenericTableHeader>
@@ -165,7 +167,7 @@ const MonitorsTable = () => {
 			)}
 			{isSuccess && data.monitors.length > 0 && (
 				<>
-					<GenericTable aria-busy={text !== debouncedText} aria-live='assertive' data-qa-id='manage-monitors-table'>
+					<GenericTable aria-busy={isLoading} aria-live='assertive' data-qa-id='manage-monitors-table'>
 						<GenericTableHeader>{headers}</GenericTableHeader>
 						<GenericTableBody>
 							{data.monitors?.map((monitor) => (
diff --git a/apps/meteor/client/omnichannel/priorities/PrioritiesPage.tsx b/apps/meteor/client/omnichannel/priorities/PrioritiesPage.tsx
index fe694c1de851..d0e064e27d3f 100644
--- a/apps/meteor/client/omnichannel/priorities/PrioritiesPage.tsx
+++ b/apps/meteor/client/omnichannel/priorities/PrioritiesPage.tsx
@@ -1,16 +1,17 @@
 import { Button, ButtonGroup } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useEndpoint, useRoute, useSetModal, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useRoute, useSetModal, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import { useQueryClient } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React, { useMemo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
-import { Page, PageHeader, PageContent } from '../../components/Page';
-import { useOmnichannelPriorities } from '../hooks/useOmnichannelPriorities';
 import { PrioritiesResetModal } from './PrioritiesResetModal';
 import { PrioritiesTable } from './PrioritiesTable';
 import type { PriorityFormData } from './PriorityEditForm';
 import PriorityList from './PriorityList';
+import { Page, PageHeader, PageContent } from '../../components/Page';
+import { useOmnichannelPriorities } from '../hooks/useOmnichannelPriorities';
 
 type PrioritiesPageProps = {
 	priorityId: string;
@@ -18,7 +19,7 @@ type PrioritiesPageProps = {
 };
 
 export const PrioritiesPage = ({ priorityId, context }: PrioritiesPageProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const queryClient = useQueryClient();
 	const prioritiesRoute = useRoute('omnichannel-priorities');
 
diff --git a/apps/meteor/client/omnichannel/priorities/PrioritiesRoute.tsx b/apps/meteor/client/omnichannel/priorities/PrioritiesRoute.tsx
index fd3b73a3f4a5..d845162620e4 100644
--- a/apps/meteor/client/omnichannel/priorities/PrioritiesRoute.tsx
+++ b/apps/meteor/client/omnichannel/priorities/PrioritiesRoute.tsx
@@ -2,8 +2,8 @@ import { usePermission, useRouteParameter } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import NotAuthorizedPage from '../../views/notAuthorized/NotAuthorizedPage';
 import { PrioritiesPage } from './PrioritiesPage';
+import NotAuthorizedPage from '../../views/notAuthorized/NotAuthorizedPage';
 
 const PrioritiesRoute = (): ReactElement => {
 	const canViewPriorities = usePermission('manage-livechat-priorities');
diff --git a/apps/meteor/client/omnichannel/priorities/PrioritiesTable.tsx b/apps/meteor/client/omnichannel/priorities/PrioritiesTable.tsx
index 008147d49e1b..453705bddf1a 100644
--- a/apps/meteor/client/omnichannel/priorities/PrioritiesTable.tsx
+++ b/apps/meteor/client/omnichannel/priorities/PrioritiesTable.tsx
@@ -3,6 +3,7 @@ import type { ReactElement } from 'react';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
+import { PriorityIcon } from './PriorityIcon';
 import GenericNoResults from '../../components/GenericNoResults';
 import {
 	GenericTable,
@@ -13,7 +14,6 @@ import {
 	GenericTableBody,
 	GenericTableLoadingTable,
 } from '../../components/GenericTable';
-import { PriorityIcon } from './PriorityIcon';
 
 type PrioritiesTableProps = {
 	priorities?: Serialized<ILivechatPriority>[];
diff --git a/apps/meteor/client/omnichannel/priorities/PriorityEditForm.tsx b/apps/meteor/client/omnichannel/priorities/PriorityEditForm.tsx
index 09bfda04fe28..38b8f17d4701 100644
--- a/apps/meteor/client/omnichannel/priorities/PriorityEditForm.tsx
+++ b/apps/meteor/client/omnichannel/priorities/PriorityEditForm.tsx
@@ -2,10 +2,11 @@ import type { ILivechatPriority, Serialized } from '@rocket.chat/core-typings';
 import { Field, FieldError, Button, Box, ButtonGroup } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useState } from 'react';
 import { Controller, useForm } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import StringSettingInput from '../../views/admin/settings/Setting/inputs/StringSettingInput';
 
@@ -25,7 +26,7 @@ type PrioritySaveException = { success: false; error: TranslationKey | undefined
 
 const PriorityEditForm = ({ data, onSave, onCancel }: PriorityEditFormProps): ReactElement => {
 	const dispatchToastMessage = useToastMessageDispatch();
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [isSaving, setSaving] = useState(false);
 
 	const { name, i18n, dirty } = data;
diff --git a/apps/meteor/client/omnichannel/priorities/PriorityEditFormWithData.tsx b/apps/meteor/client/omnichannel/priorities/PriorityEditFormWithData.tsx
index b0232c6076a6..0f3eecbd0f2c 100644
--- a/apps/meteor/client/omnichannel/priorities/PriorityEditFormWithData.tsx
+++ b/apps/meteor/client/omnichannel/priorities/PriorityEditFormWithData.tsx
@@ -3,10 +3,10 @@ import type { ReactElement } from 'react';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { FormSkeleton } from '../../components/Skeleton';
-import { usePriorityInfo } from '../../views/omnichannel/directory/hooks/usePriorityInfo';
 import type { PriorityEditFormProps } from './PriorityEditForm';
 import PriorityEditForm from './PriorityEditForm';
+import { FormSkeleton } from '../../components/Skeleton';
+import { usePriorityInfo } from '../../views/omnichannel/directory/hooks/usePriorityInfo';
 
 type PriorityEditFormWithDataProps = Omit<PriorityEditFormProps, 'data'> & {
 	priorityId: string;
diff --git a/apps/meteor/client/omnichannel/priorities/PriorityList.tsx b/apps/meteor/client/omnichannel/priorities/PriorityList.tsx
index 16091476d10c..cb5e0eab576a 100644
--- a/apps/meteor/client/omnichannel/priorities/PriorityList.tsx
+++ b/apps/meteor/client/omnichannel/priorities/PriorityList.tsx
@@ -2,6 +2,8 @@ import type { ReactElement } from 'react';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
+import type { PriorityFormData } from './PriorityEditForm';
+import PriorityEditFormWithData from './PriorityEditFormWithData';
 import {
 	Contextualbar,
 	ContextualbarTitle,
@@ -10,8 +12,6 @@ import {
 	ContextualbarScrollableContent,
 	ContextualbarDialog,
 } from '../../components/Contextualbar';
-import type { PriorityFormData } from './PriorityEditForm';
-import PriorityEditFormWithData from './PriorityEditFormWithData';
 
 type PriorityListProps = {
 	context: 'edit';
diff --git a/apps/meteor/client/omnichannel/reports/ReportsPage.tsx b/apps/meteor/client/omnichannel/reports/ReportsPage.tsx
index 6356aa693d1e..ed8625304be7 100644
--- a/apps/meteor/client/omnichannel/reports/ReportsPage.tsx
+++ b/apps/meteor/client/omnichannel/reports/ReportsPage.tsx
@@ -1,16 +1,17 @@
 import { Box, Grid, GridItem } from '@rocket.chat/fuselage';
-import { usePermission, useTranslation } from '@rocket.chat/ui-contexts';
+import { usePermission } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
+import { AgentsSection, ChannelsSection, DepartmentsSection, StatusSection, TagsSection } from './sections';
 import { Page, PageHeader, PageScrollableContentWithShadow } from '../../components/Page';
 import { useHasLicenseModule } from '../../hooks/useHasLicenseModule';
 import NotAuthorizedPage from '../../views/notAuthorized/NotAuthorizedPage';
-import { AgentsSection, ChannelsSection, DepartmentsSection, StatusSection, TagsSection } from './sections';
 
 const BREAKPOINTS = { xs: 4, sm: 8, md: 8, lg: 12, xl: 6 } as const;
 
 const ReportsPage = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const hasPermission = usePermission('view-livechat-reports');
 	const isEnterprise = useHasLicenseModule('livechat-enterprise');
diff --git a/apps/meteor/client/omnichannel/reports/components/ReportCard.tsx b/apps/meteor/client/omnichannel/reports/components/ReportCard.tsx
index 76cf1758495d..8be93c9e1c21 100644
--- a/apps/meteor/client/omnichannel/reports/components/ReportCard.tsx
+++ b/apps/meteor/client/omnichannel/reports/components/ReportCard.tsx
@@ -2,9 +2,9 @@ import { Box, Card, CardTitle, CardBody, CardCol, CardRow } from '@rocket.chat/f
 import type { ReactElement, ComponentProps } from 'react';
 import React, { forwardRef } from 'react';
 
+import { ReportCardContent } from './ReportCardContent';
 import DownloadDataButton from '../../../components/dashboards/DownloadDataButton';
 import PeriodSelector from '../../../components/dashboards/PeriodSelector';
-import { ReportCardContent } from './ReportCardContent';
 
 type ReportCardProps = {
 	id: string;
diff --git a/apps/meteor/client/omnichannel/reports/hooks/useAgentsSection.tsx b/apps/meteor/client/omnichannel/reports/hooks/useAgentsSection.tsx
index 4ca7066bbc08..bf0f5f8e80bf 100644
--- a/apps/meteor/client/omnichannel/reports/hooks/useAgentsSection.tsx
+++ b/apps/meteor/client/omnichannel/reports/hooks/useAgentsSection.tsx
@@ -1,13 +1,14 @@
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
+import { useDefaultDownload } from './useDefaultDownload';
 import { useSort } from '../../../components/GenericTable/hooks/useSort';
 import { getPeriodRange } from '../../../components/dashboards/periods';
 import { usePeriodSelectorStorage } from '../../../components/dashboards/usePeriodSelectorStorage';
 import { COLORS, PERIOD_OPTIONS } from '../components/constants';
 import { formatPeriodDescription } from '../utils/formatPeriodDescription';
-import { useDefaultDownload } from './useDefaultDownload';
 
 const formatChartData = (data: { label: string; value: number }[] | undefined = []) =>
 	data.map((item) => ({
@@ -16,7 +17,7 @@ const formatChartData = (data: { label: string; value: number }[] | undefined =
 	}));
 
 export const useAgentsSection = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [period, periodSelectorProps] = usePeriodSelectorStorage('reports-agents-period', PERIOD_OPTIONS);
 	const getConversationsByAgent = useEndpoint('GET', '/v1/livechat/analytics/dashboards/conversations-by-agent');
 	const { sortBy, sortDirection, setSort } = useSort<'name' | 'total'>('total', 'desc');
diff --git a/apps/meteor/client/omnichannel/reports/hooks/useChannelsSection.tsx b/apps/meteor/client/omnichannel/reports/hooks/useChannelsSection.tsx
index ce13de2f546e..9a90fb982814 100644
--- a/apps/meteor/client/omnichannel/reports/hooks/useChannelsSection.tsx
+++ b/apps/meteor/client/omnichannel/reports/hooks/useChannelsSection.tsx
@@ -1,16 +1,18 @@
 import { capitalize } from '@rocket.chat/string-helpers';
-import type { TranslationContextValue, TranslationKey } from '@rocket.chat/ui-contexts';
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
+import type { TFunction } from 'i18next';
 import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
+import { useDefaultDownload } from './useDefaultDownload';
 import { getPeriodRange } from '../../../components/dashboards/periods';
 import { usePeriodSelectorStorage } from '../../../components/dashboards/usePeriodSelectorStorage';
 import { PERIOD_OPTIONS } from '../components/constants';
 import { formatPeriodDescription } from '../utils/formatPeriodDescription';
 import { getTop } from '../utils/getTop';
 import { round } from '../utils/round';
-import { useDefaultDownload } from './useDefaultDownload';
 
 type DataItem = { label: string; value: number; id: string; rawLabel: string };
 
@@ -21,7 +23,7 @@ const TYPE_LABEL: Record<string, TranslationKey> = {
 	'api': 'Custom_Integration',
 };
 
-const formatItem = (item: { label: string; value: number }, total: number, t: TranslationContextValue['translate']): DataItem => {
+const formatItem = (item: { label: string; value: number }, total: number, t: TFunction): DataItem => {
 	const percentage = total > 0 ? round((item.value / total) * 100) : 0;
 	const label = `${t(TYPE_LABEL[item.label]) || capitalize(item.label)}`;
 	return {
@@ -32,12 +34,12 @@ const formatItem = (item: { label: string; value: number }, total: number, t: Tr
 	};
 };
 
-const formatChartData = (data: { label: string; value: number }[] | undefined = [], total = 0, t: TranslationContextValue['translate']) => {
+const formatChartData = (data: { label: string; value: number }[] | undefined = [], total = 0, t: TFunction) => {
 	return data.map((item) => formatItem(item, total, t));
 };
 
 export const useChannelsSection = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [period, periodSelectorProps] = usePeriodSelectorStorage('reports-channels-period', PERIOD_OPTIONS);
 	const getConversationsBySource = useEndpoint('GET', '/v1/livechat/analytics/dashboards/conversations-by-source');
 
diff --git a/apps/meteor/client/omnichannel/reports/hooks/useDepartmentsSection.tsx b/apps/meteor/client/omnichannel/reports/hooks/useDepartmentsSection.tsx
index 0e207c3d113a..57f30d0d38de 100644
--- a/apps/meteor/client/omnichannel/reports/hooks/useDepartmentsSection.tsx
+++ b/apps/meteor/client/omnichannel/reports/hooks/useDepartmentsSection.tsx
@@ -1,12 +1,13 @@
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
+import { useDefaultDownload } from './useDefaultDownload';
 import { getPeriodRange } from '../../../components/dashboards/periods';
 import { usePeriodSelectorStorage } from '../../../components/dashboards/usePeriodSelectorStorage';
 import { COLORS, PERIOD_OPTIONS } from '../components/constants';
 import { formatPeriodDescription } from '../utils/formatPeriodDescription';
-import { useDefaultDownload } from './useDefaultDownload';
 
 const formatChartData = (data: { label: string; value: number }[] | undefined = []) =>
 	data.map((item) => ({
@@ -15,7 +16,7 @@ const formatChartData = (data: { label: string; value: number }[] | undefined =
 	}));
 
 export const useDepartmentsSection = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [period, periodSelectorProps] = usePeriodSelectorStorage('reports-department-period', PERIOD_OPTIONS);
 	const getConversationsByDepartment = useEndpoint('GET', '/v1/livechat/analytics/dashboards/conversations-by-department');
 
diff --git a/apps/meteor/client/omnichannel/reports/hooks/useStatusSection.tsx b/apps/meteor/client/omnichannel/reports/hooks/useStatusSection.tsx
index 3c725f9bc85b..d001a8bbeb5f 100644
--- a/apps/meteor/client/omnichannel/reports/hooks/useStatusSection.tsx
+++ b/apps/meteor/client/omnichannel/reports/hooks/useStatusSection.tsx
@@ -1,14 +1,16 @@
-import type { TranslationContextValue, TranslationKey } from '@rocket.chat/ui-contexts';
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
+import type { TFunction } from 'i18next';
 import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
+import { useDefaultDownload } from './useDefaultDownload';
 import { getPeriodRange } from '../../../components/dashboards/periods';
 import { usePeriodSelectorStorage } from '../../../components/dashboards/usePeriodSelectorStorage';
 import { COLORS, PERIOD_OPTIONS } from '../components/constants';
 import { formatPeriodDescription } from '../utils/formatPeriodDescription';
 import { round } from '../utils/round';
-import { useDefaultDownload } from './useDefaultDownload';
 
 const STATUSES: Record<string, { label: TranslationKey; color: string }> = {
 	Open: { label: 'Omnichannel_Reports_Status_Open', color: COLORS.success },
@@ -17,7 +19,7 @@ const STATUSES: Record<string, { label: TranslationKey; color: string }> = {
 	Closed: { label: 'Omnichannel_Reports_Status_Closed', color: COLORS.danger },
 };
 
-const formatChartData = (data: { label: string; value: number }[] | undefined = [], total = 0, t: TranslationContextValue['translate']) => {
+const formatChartData = (data: { label: string; value: number }[] | undefined = [], total = 0, t: TFunction) => {
 	return data.map((item) => {
 		const status = STATUSES[item.label];
 		const percentage = total > 0 ? round((item.value / total) * 100) : 0;
@@ -33,7 +35,7 @@ const formatChartData = (data: { label: string; value: number }[] | undefined =
 };
 
 export const useStatusSection = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [period, periodSelectorProps] = usePeriodSelectorStorage('reports-status-period', PERIOD_OPTIONS);
 	const getConversationsByStatus = useEndpoint('GET', '/v1/livechat/analytics/dashboards/conversations-by-status');
 	const { start, end } = getPeriodRange(period);
diff --git a/apps/meteor/client/omnichannel/reports/hooks/useTagsSection.tsx b/apps/meteor/client/omnichannel/reports/hooks/useTagsSection.tsx
index 5688fc24c6b5..5ba58a71c879 100644
--- a/apps/meteor/client/omnichannel/reports/hooks/useTagsSection.tsx
+++ b/apps/meteor/client/omnichannel/reports/hooks/useTagsSection.tsx
@@ -1,13 +1,14 @@
 import { Palette } from '@rocket.chat/fuselage';
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
+import { useDefaultDownload } from './useDefaultDownload';
 import { getPeriodRange } from '../../../components/dashboards/periods';
 import { usePeriodSelectorStorage } from '../../../components/dashboards/usePeriodSelectorStorage';
 import { PERIOD_OPTIONS } from '../components/constants';
 import { formatPeriodDescription } from '../utils/formatPeriodDescription';
-import { useDefaultDownload } from './useDefaultDownload';
 
 const colors = {
 	warning: Palette.statusColor['status-font-on-warning'].toString(),
@@ -23,7 +24,7 @@ const formatChartData = (data: { label: string; value: number }[] | undefined =
 	}));
 
 export const useTagsSection = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [period, periodSelectorProps] = usePeriodSelectorStorage('reports-tags-period', PERIOD_OPTIONS);
 	const getConversationsByTags = useEndpoint('GET', '/v1/livechat/analytics/dashboards/conversations-by-tags');
 
diff --git a/apps/meteor/client/omnichannel/reports/utils/formatPeriodDescription.tsx b/apps/meteor/client/omnichannel/reports/utils/formatPeriodDescription.tsx
index ab12af6af1cf..8a1fbef3e0e4 100644
--- a/apps/meteor/client/omnichannel/reports/utils/formatPeriodDescription.tsx
+++ b/apps/meteor/client/omnichannel/reports/utils/formatPeriodDescription.tsx
@@ -1,8 +1,8 @@
-import type { TranslationContextValue } from '@rocket.chat/ui-contexts';
+import type { TFunction } from 'i18next';
 
 import { getPeriod, type Period } from '../../../components/dashboards/periods';
 
-export const formatPeriodDescription = (periodKey: Period['key'], t: TranslationContextValue['translate']) => {
+export const formatPeriodDescription = (periodKey: Period['key'], t: TFunction) => {
 	const { label } = getPeriod(periodKey);
 	return t(...label).toLocaleLowerCase();
 };
diff --git a/apps/meteor/client/omnichannel/routes.ts b/apps/meteor/client/omnichannel/routes.ts
index ffb225c76ac8..1453c07533fd 100644
--- a/apps/meteor/client/omnichannel/routes.ts
+++ b/apps/meteor/client/omnichannel/routes.ts
@@ -24,6 +24,10 @@ declare module '@rocket.chat/ui-contexts' {
 			pattern: '/omnichannel/reports';
 			pathname: `/omnichannel/reports`;
 		};
+		'omnichannel-security-privacy': {
+			pattern: '/omnichannel/security-privacy';
+			pathname: `/omnichannel/security-privacy`;
+		};
 	}
 }
 
@@ -51,3 +55,8 @@ registerOmnichannelRoute('/reports', {
 	name: 'omnichannel-reports',
 	component: lazy(() => import('./reports/ReportsPage')),
 });
+
+registerOmnichannelRoute('/security-privacy', {
+	name: 'omnichannel-security-privacy',
+	component: lazy(() => import('./securityPrivacy/SecurityPrivacyRoute')),
+});
diff --git a/apps/meteor/client/omnichannel/securityPrivacy/SecurityPrivacyPage.tsx b/apps/meteor/client/omnichannel/securityPrivacy/SecurityPrivacyPage.tsx
new file mode 100644
index 000000000000..0ab741b3e166
--- /dev/null
+++ b/apps/meteor/client/omnichannel/securityPrivacy/SecurityPrivacyPage.tsx
@@ -0,0 +1,22 @@
+import { useIsPrivilegedSettingsContext } from '@rocket.chat/ui-contexts';
+import React from 'react';
+
+import { useEditableSettingsGroupSections } from '../../views/admin/EditableSettingsContext';
+import GenericGroupPage from '../../views/admin/settings/groups/GenericGroupPage';
+import NotAuthorizedPage from '../../views/notAuthorized/NotAuthorizedPage';
+
+const GROUP_ID = 'Omnichannel';
+const SECTION_ID = 'Contact_identification';
+
+const SecurityPrivacyPage = () => {
+	const hasPermission = useIsPrivilegedSettingsContext();
+	const sections = useEditableSettingsGroupSections(GROUP_ID).filter((id) => id === SECTION_ID);
+
+	if (!hasPermission) {
+		return <NotAuthorizedPage />;
+	}
+
+	return <GenericGroupPage i18nLabel='Security_and_privacy' sections={sections} _id={GROUP_ID} />;
+};
+
+export default SecurityPrivacyPage;
diff --git a/apps/meteor/client/omnichannel/securityPrivacy/SecurityPrivacyRoute.tsx b/apps/meteor/client/omnichannel/securityPrivacy/SecurityPrivacyRoute.tsx
new file mode 100644
index 000000000000..31512aaa6396
--- /dev/null
+++ b/apps/meteor/client/omnichannel/securityPrivacy/SecurityPrivacyRoute.tsx
@@ -0,0 +1,17 @@
+import React from 'react';
+
+import SecurityPrivacyPage from './SecurityPrivacyPage';
+import SettingsProvider from '../../providers/SettingsProvider';
+import EditableSettingsProvider from '../../views/admin/settings/EditableSettingsProvider';
+
+const SecurityPrivacyRoute = () => {
+	return (
+		<SettingsProvider privileged>
+			<EditableSettingsProvider>
+				<SecurityPrivacyPage />
+			</EditableSettingsProvider>
+		</SettingsProvider>
+	);
+};
+
+export default SecurityPrivacyRoute;
diff --git a/apps/meteor/client/omnichannel/slaPolicies/RemoveSlaButton.tsx b/apps/meteor/client/omnichannel/slaPolicies/RemoveSlaButton.tsx
index 0797fbffb984..996f50cc284c 100644
--- a/apps/meteor/client/omnichannel/slaPolicies/RemoveSlaButton.tsx
+++ b/apps/meteor/client/omnichannel/slaPolicies/RemoveSlaButton.tsx
@@ -1,13 +1,14 @@
 import { IconButton } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useRoute, useEndpoint, useSetModal, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRoute, useEndpoint, useSetModal, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../components/GenericModal';
 import { GenericTableCell } from '../../components/GenericTable';
 
 const RemoveSlaButton = ({ _id, reload }: { _id: string; reload: () => void }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const setModal = useSetModal();
 	const slaRoute = useRoute('omnichannel-sla-policies');
 	const dispatchToastMessage = useToastMessageDispatch();
diff --git a/apps/meteor/client/omnichannel/slaPolicies/SlaEditWithData.tsx b/apps/meteor/client/omnichannel/slaPolicies/SlaEditWithData.tsx
index 079e663f19c4..3136679d8678 100644
--- a/apps/meteor/client/omnichannel/slaPolicies/SlaEditWithData.tsx
+++ b/apps/meteor/client/omnichannel/slaPolicies/SlaEditWithData.tsx
@@ -1,11 +1,12 @@
 import { Callout } from '@rocket.chat/fuselage';
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
-import { FormSkeleton } from '../../components/Skeleton';
 import SlaEdit from './SlaEdit';
+import { FormSkeleton } from '../../components/Skeleton';
 
 type SlaEditProps = {
 	slaId: string;
@@ -15,7 +16,7 @@ type SlaEditProps = {
 function SlaEditWithData({ slaId, reload }: SlaEditProps): ReactElement {
 	const getSLA = useEndpoint('GET', `/v1/livechat/sla/:slaId`, { slaId });
 	const { data, isLoading, isError } = useQuery(['/v1/livechat/sla', slaId], () => getSLA());
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	if (isLoading) {
 		return <FormSkeleton />;
diff --git a/apps/meteor/client/omnichannel/slaPolicies/SlaPage.tsx b/apps/meteor/client/omnichannel/slaPolicies/SlaPage.tsx
index 7cbca605b712..f6ff34f0cd6d 100644
--- a/apps/meteor/client/omnichannel/slaPolicies/SlaPage.tsx
+++ b/apps/meteor/client/omnichannel/slaPolicies/SlaPage.tsx
@@ -1,8 +1,12 @@
 import { Button, ButtonGroup } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useRouteParameter, useRoute, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRouteParameter, useRoute } from '@rocket.chat/ui-contexts';
 import React, { useRef, useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
+import SlaEditWithData from './SlaEditWithData';
+import SlaNew from './SlaNew';
+import SlaTable from './SlaTable';
 import {
 	Contextualbar,
 	ContextualbarTitle,
@@ -11,12 +15,9 @@ import {
 	ContextualbarDialog,
 } from '../../components/Contextualbar';
 import { Page, PageHeader, PageContent } from '../../components/Page';
-import SlaEditWithData from './SlaEditWithData';
-import SlaNew from './SlaNew';
-import SlaTable from './SlaTable';
 
 const SlaPage = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const reload = useRef(() => null);
 
 	const slaPoliciesRoute = useRoute('omnichannel-sla-policies');
diff --git a/apps/meteor/client/omnichannel/slaPolicies/SlaRoute.tsx b/apps/meteor/client/omnichannel/slaPolicies/SlaRoute.tsx
index 081c33fe3260..3782763d5279 100644
--- a/apps/meteor/client/omnichannel/slaPolicies/SlaRoute.tsx
+++ b/apps/meteor/client/omnichannel/slaPolicies/SlaRoute.tsx
@@ -1,8 +1,8 @@
 import { usePermission } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import NotAuthorizedPage from '../../views/notAuthorized/NotAuthorizedPage';
 import SlaPage from './SlaPage';
+import NotAuthorizedPage from '../../views/notAuthorized/NotAuthorizedPage';
 
 const SlaRoute = () => {
 	const canViewSlas = usePermission('manage-livechat-sla');
diff --git a/apps/meteor/client/omnichannel/slaPolicies/SlaTable.tsx b/apps/meteor/client/omnichannel/slaPolicies/SlaTable.tsx
index 01b4bfe90374..a53f368ec9f3 100644
--- a/apps/meteor/client/omnichannel/slaPolicies/SlaTable.tsx
+++ b/apps/meteor/client/omnichannel/slaPolicies/SlaTable.tsx
@@ -5,6 +5,7 @@ import { useQuery, hashQueryKey } from '@tanstack/react-query';
 import type { MutableRefObject } from 'react';
 import React, { useMemo, useState, useEffect } from 'react';
 
+import RemoveSlaButton from './RemoveSlaButton';
 import FilterByText from '../../components/FilterByText';
 import GenericNoResults from '../../components/GenericNoResults/GenericNoResults';
 import {
@@ -18,26 +19,27 @@ import {
 } from '../../components/GenericTable';
 import { usePagination } from '../../components/GenericTable/hooks/usePagination';
 import { useSort } from '../../components/GenericTable/hooks/useSort';
-import RemoveSlaButton from './RemoveSlaButton';
 
 const SlaTable = ({ reload }: { reload: MutableRefObject<() => void> }) => {
 	const t = useTranslation();
 	const router = useRouter();
 
 	const [filter, setFilter] = useState('');
-	const debouncedFilter = useDebouncedValue(filter, 500);
 
 	const { current, itemsPerPage, setItemsPerPage: onSetItemsPerPage, setCurrent: onSetCurrent, ...paginationProps } = usePagination();
 	const { sortBy, sortDirection, setSort } = useSort<'name' | 'description' | 'dueTimeInMinutes'>('name');
 
-	const query = useMemo(
-		() => ({
-			text: debouncedFilter,
-			sort: JSON.stringify({ [sortBy]: sortDirection === 'asc' ? 1 : -1 }),
-			...(itemsPerPage && { count: itemsPerPage }),
-			...(current && { offset: current }),
-		}),
-		[debouncedFilter, itemsPerPage, current, sortBy, sortDirection],
+	const query = useDebouncedValue(
+		useMemo(
+			() => ({
+				text: filter,
+				sort: JSON.stringify({ [sortBy]: sortDirection === 'asc' ? 1 : -1 }),
+				...(itemsPerPage && { count: itemsPerPage }),
+				...(current && { offset: current }),
+			}),
+			[filter, itemsPerPage, current, sortBy, sortDirection],
+		),
+		500,
 	);
 
 	const getSlaData = useEndpoint('GET', '/v1/livechat/sla');
@@ -84,7 +86,9 @@ const SlaTable = ({ reload }: { reload: MutableRefObject<() => void> }) => {
 
 	return (
 		<>
-			{((isSuccess && data?.sla.length > 0) || queryHasChanged) && <FilterByText onChange={setFilter} />}
+			{((isSuccess && data?.sla.length > 0) || queryHasChanged) && (
+				<FilterByText value={filter} onChange={(event) => setFilter(event.target.value)} />
+			)}
 			{isLoading && (
 				<GenericTable>
 					<GenericTableHeader>{headers}</GenericTableHeader>
diff --git a/apps/meteor/client/omnichannel/tags/TagEdit.tsx b/apps/meteor/client/omnichannel/tags/TagEdit.tsx
index 215fe33cdbd1..8544a17f5374 100644
--- a/apps/meteor/client/omnichannel/tags/TagEdit.tsx
+++ b/apps/meteor/client/omnichannel/tags/TagEdit.tsx
@@ -1,11 +1,13 @@
 import type { ILivechatDepartment, ILivechatTag, Serialized } from '@rocket.chat/core-typings';
 import { Field, FieldLabel, FieldRow, FieldError, TextInput, Button, ButtonGroup, FieldGroup, Box } from '@rocket.chat/fuselage';
 import { useMutableCallback, useUniqueId } from '@rocket.chat/fuselage-hooks';
-import { useToastMessageDispatch, useRouter, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
+import { useToastMessageDispatch, useRouter, useMethod } from '@rocket.chat/ui-contexts';
 import { useQueryClient } from '@tanstack/react-query';
 import React from 'react';
 import { useForm, Controller } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
+import { useRemoveTag } from './useRemoveTag';
 import AutoCompleteDepartmentMultiple from '../../components/AutoCompleteDepartmentMultiple';
 import {
 	ContextualbarScrollableContent,
@@ -15,7 +17,6 @@ import {
 	ContextualbarHeader,
 	ContextualbarClose,
 } from '../../components/Contextualbar';
-import { useRemoveTag } from './useRemoveTag';
 
 type TagEditPayload = {
 	name: string;
@@ -29,7 +30,7 @@ type TagEditProps = {
 };
 
 const TagEdit = ({ tagData, currentDepartments }: TagEditProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const router = useRouter();
 	const queryClient = useQueryClient();
 	const handleDeleteTag = useRemoveTag();
diff --git a/apps/meteor/client/omnichannel/tags/TagEditWithData.tsx b/apps/meteor/client/omnichannel/tags/TagEditWithData.tsx
index ae9a3259af4a..df6aa7e08537 100644
--- a/apps/meteor/client/omnichannel/tags/TagEditWithData.tsx
+++ b/apps/meteor/client/omnichannel/tags/TagEditWithData.tsx
@@ -1,15 +1,16 @@
 import type { ILivechatTag } from '@rocket.chat/core-typings';
 import { Callout } from '@rocket.chat/fuselage';
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
-import { ContextualbarSkeleton } from '../../components/Contextualbar';
 import TagEdit from './TagEdit';
 import TagEditWithDepartmentData from './TagEditWithDepartmentData';
+import { ContextualbarSkeleton } from '../../components/Contextualbar';
 
 const TagEditWithData = ({ tagId }: { tagId: ILivechatTag['_id'] }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const getTagById = useEndpoint('GET', '/v1/livechat/tags/:tagId', { tagId });
 	const { data, isLoading, isError } = useQuery(['livechat-getTagById', tagId], async () => getTagById(), { refetchOnWindowFocus: false });
diff --git a/apps/meteor/client/omnichannel/tags/TagEditWithDepartmentData.tsx b/apps/meteor/client/omnichannel/tags/TagEditWithDepartmentData.tsx
index ce4707417d1e..a32fcee46fbf 100644
--- a/apps/meteor/client/omnichannel/tags/TagEditWithDepartmentData.tsx
+++ b/apps/meteor/client/omnichannel/tags/TagEditWithDepartmentData.tsx
@@ -4,8 +4,8 @@ import { useTranslation, useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import React from 'react';
 
-import { ContextualbarSkeleton } from '../../components/Contextualbar';
 import TagEdit from './TagEdit';
+import { ContextualbarSkeleton } from '../../components/Contextualbar';
 
 const TagEditWithDepartmentData = ({ tagData }: { tagData: ILivechatTag }) => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/omnichannel/tags/TagsPage.tsx b/apps/meteor/client/omnichannel/tags/TagsPage.tsx
index add1c64531d9..86c299cde240 100644
--- a/apps/meteor/client/omnichannel/tags/TagsPage.tsx
+++ b/apps/meteor/client/omnichannel/tags/TagsPage.tsx
@@ -2,11 +2,11 @@ import { Button, ButtonGroup } from '@rocket.chat/fuselage';
 import { useRouter, useTranslation, useRouteParameter } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import { ContextualbarDialog } from '../../components/Contextualbar';
-import { Page, PageHeader, PageContent } from '../../components/Page';
 import TagEdit from './TagEdit';
 import TagEditWithData from './TagEditWithData';
 import TagsTable from './TagsTable';
+import { ContextualbarDialog } from '../../components/Contextualbar';
+import { Page, PageHeader, PageContent } from '../../components/Page';
 
 const TagsPage = () => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/omnichannel/tags/TagsRoute.tsx b/apps/meteor/client/omnichannel/tags/TagsRoute.tsx
index 11f3e4348a0b..61d5875929e5 100644
--- a/apps/meteor/client/omnichannel/tags/TagsRoute.tsx
+++ b/apps/meteor/client/omnichannel/tags/TagsRoute.tsx
@@ -1,8 +1,8 @@
 import { usePermission } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import NotAuthorizedPage from '../../views/notAuthorized/NotAuthorizedPage';
 import TagsPage from './TagsPage';
+import NotAuthorizedPage from '../../views/notAuthorized/NotAuthorizedPage';
 
 const TagsRoute = () => {
 	const canViewTags = usePermission('manage-livechat-tags');
diff --git a/apps/meteor/client/omnichannel/tags/TagsTable.tsx b/apps/meteor/client/omnichannel/tags/TagsTable.tsx
index 9e82efdee6dc..e95121a2270b 100644
--- a/apps/meteor/client/omnichannel/tags/TagsTable.tsx
+++ b/apps/meteor/client/omnichannel/tags/TagsTable.tsx
@@ -4,6 +4,7 @@ import { useTranslation, useEndpoint, useRouter } from '@rocket.chat/ui-contexts
 import { useQuery, hashQueryKey } from '@tanstack/react-query';
 import React, { useMemo, useState } from 'react';
 
+import { useRemoveTag } from './useRemoveTag';
 import FilterByText from '../../components/FilterByText';
 import GenericNoResults from '../../components/GenericNoResults';
 import {
@@ -17,12 +18,10 @@ import {
 } from '../../components/GenericTable';
 import { usePagination } from '../../components/GenericTable/hooks/usePagination';
 import { useSort } from '../../components/GenericTable/hooks/useSort';
-import { useRemoveTag } from './useRemoveTag';
 
 const TagsTable = () => {
 	const t = useTranslation();
 	const [filter, setFilter] = useState('');
-	const debouncedFilter = useDebouncedValue(filter, 500);
 	const router = useRouter();
 
 	const { current, itemsPerPage, setItemsPerPage: onSetItemsPerPage, setCurrent: onSetCurrent, ...paginationProps } = usePagination();
@@ -32,15 +31,18 @@ const TagsTable = () => {
 	const handleAddNew = useMutableCallback(() => router.navigate('/omnichannel/tags/new'));
 	const handleDeleteTag = useRemoveTag();
 
-	const query = useMemo(
-		() => ({
-			viewAll: 'true' as const,
-			text: debouncedFilter,
-			sort: JSON.stringify({ [sortBy]: sortDirection === 'asc' ? 1 : -1 }),
-			...(itemsPerPage && { count: itemsPerPage }),
-			...(current && { offset: current }),
-		}),
-		[debouncedFilter, itemsPerPage, current, sortBy, sortDirection],
+	const query = useDebouncedValue(
+		useMemo(
+			() => ({
+				viewAll: 'true' as const,
+				text: filter,
+				sort: JSON.stringify({ [sortBy]: sortDirection === 'asc' ? 1 : -1 }),
+				...(itemsPerPage && { count: itemsPerPage }),
+				...(current && { offset: current }),
+			}),
+			[filter, itemsPerPage, current, sortBy, sortDirection],
+		),
+		500,
 	);
 
 	const getTags = useEndpoint('GET', '/v1/livechat/tags');
@@ -69,7 +71,9 @@ const TagsTable = () => {
 
 	return (
 		<>
-			{((isSuccess && data?.tags.length > 0) || queryHasChanged) && <FilterByText onChange={setFilter} />}
+			{((isSuccess && data?.tags.length > 0) || queryHasChanged) && (
+				<FilterByText value={filter} onChange={(event) => setFilter(event.target.value)} />
+			)}
 			{isLoading && (
 				<GenericTable>
 					<GenericTableHeader>{headers}</GenericTableHeader>
diff --git a/apps/meteor/client/omnichannel/tags/useRemoveTag.tsx b/apps/meteor/client/omnichannel/tags/useRemoveTag.tsx
index 31c3a910c7ea..ec19b07dbb82 100644
--- a/apps/meteor/client/omnichannel/tags/useRemoveTag.tsx
+++ b/apps/meteor/client/omnichannel/tags/useRemoveTag.tsx
@@ -1,12 +1,13 @@
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useSetModal, useToastMessageDispatch, useRouter, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetModal, useToastMessageDispatch, useRouter, useMethod } from '@rocket.chat/ui-contexts';
 import { useQueryClient } from '@tanstack/react-query';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../components/GenericModal';
 
 export const useRemoveTag = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const setModal = useSetModal();
 	const dispatchToastMessage = useToastMessageDispatch();
 	const removeTag = useMethod('livechat:removeTag');
diff --git a/apps/meteor/client/omnichannel/units/UnitEdit.tsx b/apps/meteor/client/omnichannel/units/UnitEdit.tsx
index b2feb1db8a8f..0db2c5763014 100644
--- a/apps/meteor/client/omnichannel/units/UnitEdit.tsx
+++ b/apps/meteor/client/omnichannel/units/UnitEdit.tsx
@@ -20,6 +20,7 @@ import { useQueryClient } from '@tanstack/react-query';
 import React, { useMemo, useState } from 'react';
 import { useForm, Controller } from 'react-hook-form';
 
+import { useRemoveUnit } from './useRemoveUnit';
 import {
 	ContextualbarScrollableContent,
 	ContextualbarFooter,
@@ -32,7 +33,6 @@ import { useRecordList } from '../../hooks/lists/useRecordList';
 import { AsyncStatePhase } from '../../hooks/useAsyncState';
 import { useDepartmentsByUnitsList } from '../../views/hooks/useDepartmentsByUnitsList';
 import { useMonitorsList } from '../../views/hooks/useMonitorsList';
-import { useRemoveUnit } from './useRemoveUnit';
 
 type UnitEditProps = {
 	unitData?: Serialized<IOmnichannelBusinessUnit>;
diff --git a/apps/meteor/client/omnichannel/units/UnitEditWithData.tsx b/apps/meteor/client/omnichannel/units/UnitEditWithData.tsx
index 127c81c30032..28d137f4b5ed 100644
--- a/apps/meteor/client/omnichannel/units/UnitEditWithData.tsx
+++ b/apps/meteor/client/omnichannel/units/UnitEditWithData.tsx
@@ -1,14 +1,15 @@
 import type { IOmnichannelBusinessUnit } from '@rocket.chat/core-typings';
 import { Callout } from '@rocket.chat/fuselage';
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
-import { ContextualbarSkeleton } from '../../components/Contextualbar';
 import UnitEdit from './UnitEdit';
+import { ContextualbarSkeleton } from '../../components/Contextualbar';
 
 const UnitEditWithData = ({ unitId }: { unitId: IOmnichannelBusinessUnit['_id'] }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const getUnitById = useEndpoint('GET', '/v1/livechat/units/:id', { id: unitId });
 	const getMonitorsByUnitId = useEndpoint('GET', '/v1/livechat/units/:unitId/monitors', { unitId });
diff --git a/apps/meteor/client/omnichannel/units/UnitsPage.tsx b/apps/meteor/client/omnichannel/units/UnitsPage.tsx
index 190c22991fb5..db14a907e569 100644
--- a/apps/meteor/client/omnichannel/units/UnitsPage.tsx
+++ b/apps/meteor/client/omnichannel/units/UnitsPage.tsx
@@ -2,11 +2,11 @@ import { Button, ButtonGroup } from '@rocket.chat/fuselage';
 import { useTranslation, useRouteParameter, useRouter } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import { ContextualbarDialog } from '../../components/Contextualbar';
-import { Page, PageHeader, PageContent } from '../../components/Page';
 import UnitEdit from './UnitEdit';
 import UnitEditWithData from './UnitEditWithData';
 import UnitsTable from './UnitsTable';
+import { ContextualbarDialog } from '../../components/Contextualbar';
+import { Page, PageHeader, PageContent } from '../../components/Page';
 
 const UnitsPage = () => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/omnichannel/units/UnitsRoute.tsx b/apps/meteor/client/omnichannel/units/UnitsRoute.tsx
index 9490fd2d2048..6017f1f0a978 100644
--- a/apps/meteor/client/omnichannel/units/UnitsRoute.tsx
+++ b/apps/meteor/client/omnichannel/units/UnitsRoute.tsx
@@ -1,9 +1,9 @@
 import { usePermission } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
+import UnitsPage from './UnitsPage';
 import { useHasLicenseModule } from '../../hooks/useHasLicenseModule';
 import NotAuthorizedPage from '../../views/notAuthorized/NotAuthorizedPage';
-import UnitsPage from './UnitsPage';
 
 const UnitsRoute = () => {
 	const canViewUnits = usePermission('manage-livechat-units');
diff --git a/apps/meteor/client/omnichannel/units/UnitsTable.tsx b/apps/meteor/client/omnichannel/units/UnitsTable.tsx
index 2797e9287e8b..8cfc2cbfbd8c 100644
--- a/apps/meteor/client/omnichannel/units/UnitsTable.tsx
+++ b/apps/meteor/client/omnichannel/units/UnitsTable.tsx
@@ -1,9 +1,11 @@
 import { Pagination, IconButton } from '@rocket.chat/fuselage';
 import { useDebouncedValue, useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useEndpoint, useRouter, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useRouter } from '@rocket.chat/ui-contexts';
 import { useQuery, hashQueryKey } from '@tanstack/react-query';
 import React, { useMemo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
+import { useRemoveUnit } from './useRemoveUnit';
 import FilterByText from '../../components/FilterByText';
 import GenericNoResults from '../../components/GenericNoResults/GenericNoResults';
 import {
@@ -17,25 +19,26 @@ import {
 } from '../../components/GenericTable';
 import { usePagination } from '../../components/GenericTable/hooks/usePagination';
 import { useSort } from '../../components/GenericTable/hooks/useSort';
-import { useRemoveUnit } from './useRemoveUnit';
 
 const UnitsTable = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [filter, setFilter] = useState('');
-	const debouncedFilter = useDebouncedValue(filter, 500);
 	const router = useRouter();
 
 	const { current, itemsPerPage, setItemsPerPage: onSetItemsPerPage, setCurrent: onSetCurrent, ...paginationProps } = usePagination();
 	const { sortBy, sortDirection, setSort } = useSort<'name' | 'visibility'>('name');
 
-	const query = useMemo(
-		() => ({
-			text: debouncedFilter,
-			sort: JSON.stringify({ [sortBy]: sortDirection === 'asc' ? 1 : -1 }),
-			...(itemsPerPage && { count: itemsPerPage }),
-			...(current && { offset: current }),
-		}),
-		[debouncedFilter, itemsPerPage, current, sortBy, sortDirection],
+	const query = useDebouncedValue(
+		useMemo(
+			() => ({
+				text: filter,
+				sort: JSON.stringify({ [sortBy]: sortDirection === 'asc' ? 1 : -1 }),
+				...(itemsPerPage && { count: itemsPerPage }),
+				...(current && { offset: current }),
+			}),
+			[filter, itemsPerPage, current, sortBy, sortDirection],
+		),
+		500,
 	);
 
 	const getUnits = useEndpoint('GET', '/v1/livechat/units');
@@ -68,7 +71,9 @@ const UnitsTable = () => {
 
 	return (
 		<>
-			{((isSuccess && data?.units.length > 0) || queryHasChanged) && <FilterByText onChange={setFilter} />}
+			{((isSuccess && data?.units.length > 0) || queryHasChanged) && (
+				<FilterByText value={filter} onChange={(event) => setFilter(event.target.value)} />
+			)}
 			{isLoading && (
 				<GenericTable aria-busy>
 					<GenericTableHeader>{headers}</GenericTableHeader>
@@ -91,7 +96,7 @@ const UnitsTable = () => {
 			)}
 			{isSuccess && data?.units.length > 0 && (
 				<>
-					<GenericTable aria-busy={filter !== debouncedFilter}>
+					<GenericTable aria-busy={isLoading}>
 						<GenericTableHeader>{headers}</GenericTableHeader>
 						<GenericTableBody>
 							{data.units.map(({ _id, name, visibility }) => (
diff --git a/apps/meteor/client/providers/AppsProvider/AppsProvider.spec.ts b/apps/meteor/client/providers/AppsProvider/AppsProvider.spec.ts
index 8210fe22eec5..c05ed7f1d086 100644
--- a/apps/meteor/client/providers/AppsProvider/AppsProvider.spec.ts
+++ b/apps/meteor/client/providers/AppsProvider/AppsProvider.spec.ts
@@ -1,9 +1,9 @@
 import type { App } from '@rocket.chat/core-typings';
 import type { UseQueryResult } from '@tanstack/react-query';
 
+import { storeQueryFunction } from './storeQueryFunction';
 import { createFakeApp } from '../../../tests/mocks/data';
 import { createFakeAppInstalledMarketplace, createFakeAppPrivate } from '../../../tests/mocks/data/marketplace';
-import { storeQueryFunction } from './storeQueryFunction';
 
 describe(`when an app installed from the Marketplace, but has since been unpublished`, () => {
 	it(`should still be present in the installed app data provided`, () => {
diff --git a/apps/meteor/client/providers/AppsProvider/AppsProvider.tsx b/apps/meteor/client/providers/AppsProvider/AppsProvider.tsx
index 1449c0fb685a..dee82ce691e6 100644
--- a/apps/meteor/client/providers/AppsProvider/AppsProvider.tsx
+++ b/apps/meteor/client/providers/AppsProvider/AppsProvider.tsx
@@ -4,6 +4,7 @@ import { useQuery, useQueryClient } from '@tanstack/react-query';
 import type { ReactNode } from 'react';
 import React, { useEffect } from 'react';
 
+import { storeQueryFunction } from './storeQueryFunction';
 import { AppClientOrchestratorInstance } from '../../apps/orchestrator';
 import { AppsContext } from '../../contexts/AppsContext';
 import { useInvalidateLicense, useLicense } from '../../hooks/useLicense';
@@ -11,7 +12,6 @@ import type { AsyncState } from '../../lib/asyncState';
 import { AsyncStatePhase } from '../../lib/asyncState';
 import { useInvalidateAppsCountQueryCallback } from '../../views/marketplace/hooks/useAppsCountQuery';
 import type { App } from '../../views/marketplace/types';
-import { storeQueryFunction } from './storeQueryFunction';
 
 const getAppState = (
 	loading: boolean,
@@ -102,6 +102,7 @@ const AppsProvider = ({ children }: AppsProviderProps) => {
 		},
 		{
 			staleTime: Infinity,
+			refetchOnMount: 'always',
 			onSettled: () => queryClient.invalidateQueries(['marketplace', 'apps-stored']),
 		},
 	);
diff --git a/apps/meteor/client/providers/AuthenticationProvider/AuthenticationProvider.tsx b/apps/meteor/client/providers/AuthenticationProvider/AuthenticationProvider.tsx
index c76f06bcd3b4..840d6a049ab5 100644
--- a/apps/meteor/client/providers/AuthenticationProvider/AuthenticationProvider.tsx
+++ b/apps/meteor/client/providers/AuthenticationProvider/AuthenticationProvider.tsx
@@ -5,8 +5,8 @@ import { Meteor } from 'meteor/meteor';
 import type { ContextType, ReactElement, ReactNode } from 'react';
 import React, { useMemo } from 'react';
 
-import { loginServices } from '../../lib/loginServices';
 import { useLDAPAndCrowdCollisionWarning } from './hooks/useLDAPAndCrowdCollisionWarning';
+import { loginServices } from '../../lib/loginServices';
 
 export type LoginMethods = keyof typeof Meteor extends infer T ? (T extends `loginWith${string}` ? T : never) : never;
 
@@ -15,8 +15,8 @@ type AuthenticationProviderProps = {
 };
 
 const AuthenticationProvider = ({ children }: AuthenticationProviderProps): ReactElement => {
-	const isLdapEnabled = useSetting<boolean>('LDAP_Enable');
-	const isCrowdEnabled = useSetting<boolean>('CROWD_Enable');
+	const isLdapEnabled = useSetting('LDAP_Enable', false);
+	const isCrowdEnabled = useSetting('CROWD_Enable', false);
 
 	const loginMethod: LoginMethods = (isLdapEnabled && 'loginWithLDAP') || (isCrowdEnabled && 'loginWithCrowd') || 'loginWithPassword';
 
diff --git a/apps/meteor/client/providers/AuthenticationProvider/hooks/useLDAPAndCrowdCollisionWarning.tsx b/apps/meteor/client/providers/AuthenticationProvider/hooks/useLDAPAndCrowdCollisionWarning.tsx
index afb0eea54fda..6f1928e0ba2d 100644
--- a/apps/meteor/client/providers/AuthenticationProvider/hooks/useLDAPAndCrowdCollisionWarning.tsx
+++ b/apps/meteor/client/providers/AuthenticationProvider/hooks/useLDAPAndCrowdCollisionWarning.tsx
@@ -5,8 +5,8 @@ import { useEffect } from 'react';
 import type { LoginMethods } from '../AuthenticationProvider';
 
 export function useLDAPAndCrowdCollisionWarning() {
-	const isLdapEnabled = useSetting<boolean>('LDAP_Enable');
-	const isCrowdEnabled = useSetting<boolean>('CROWD_Enable');
+	const isLdapEnabled = useSetting('LDAP_Enable', false);
+	const isCrowdEnabled = useSetting('CROWD_Enable', false);
 
 	const loginMethod: LoginMethods = (isLdapEnabled && 'loginWithLDAP') || (isCrowdEnabled && 'loginWithCrowd') || 'loginWithPassword';
 
diff --git a/apps/meteor/client/providers/AuthorizationProvider.tsx b/apps/meteor/client/providers/AuthorizationProvider.tsx
index da088c05e90b..ceda8eb681ac 100644
--- a/apps/meteor/client/providers/AuthorizationProvider.tsx
+++ b/apps/meteor/client/providers/AuthorizationProvider.tsx
@@ -37,10 +37,13 @@ const AuthorizationProvider = ({ children }: AuthorizationProviderProps) => {
 			() =>
 				Roles.find()
 					.fetch()
-					.reduce((ret, obj) => {
-						ret[obj._id] = obj;
-						return ret;
-					}, {} as Record<string, IRole>),
+					.reduce(
+						(ret, obj) => {
+							ret[obj._id] = obj;
+							return ret;
+						},
+						{} as Record<string, IRole>,
+					),
 			[],
 		),
 	);
diff --git a/apps/meteor/client/providers/AvatarUrlProvider.tsx b/apps/meteor/client/providers/AvatarUrlProvider.tsx
index 606da39360d5..056bc10e0d52 100644
--- a/apps/meteor/client/providers/AvatarUrlProvider.tsx
+++ b/apps/meteor/client/providers/AvatarUrlProvider.tsx
@@ -10,16 +10,29 @@ type AvatarUrlProviderProps = {
 };
 
 const AvatarUrlProvider = ({ children }: AvatarUrlProviderProps) => {
-	const contextValue = useMemo(
-		() => ({
-			getUserPathAvatar: ((): ((uid: string, etag?: string) => string) => {
-				return (uid: string, etag?: string): string => getURL(`/avatar/${uid}${etag ? `?etag=${etag}` : ''}`);
-			})(),
+	const contextValue = useMemo(() => {
+		function getUserPathAvatar(username: string, etag?: string): string;
+		function getUserPathAvatar({ userId, etag }: { userId: string; etag?: string }): string;
+		function getUserPathAvatar({ username, etag }: { username: string; etag?: string }): string;
+		function getUserPathAvatar(...args: any): string {
+			if (typeof args[0] === 'string') {
+				const [username, etag] = args;
+				return getURL(`/avatar/${username}${etag ? `?etag=${etag}` : ''}`);
+			}
+			const [params] = args;
+			if ('userId' in params) {
+				const { userId, etag } = params;
+				return getURL(`/avatar/uid/${userId}${etag ? `?etag=${etag}` : ''}`);
+			}
+			const { username, etag } = params;
+			return getURL(`/avatar/${username}${etag ? `?etag=${etag}` : ''}`);
+		}
+		return {
+			getUserPathAvatar,
 			getRoomPathAvatar: ({ type, ...room }: any): string =>
 				roomCoordinator.getRoomDirectives(type || room.t).getAvatarPath({ username: room._id, ...room }) || '',
-		}),
-		[],
-	);
+		};
+	}, []);
 
 	return <AvatarUrlContext.Provider children={children} value={contextValue} />;
 };
diff --git a/apps/meteor/client/providers/CallProvider/CallProvider.tsx b/apps/meteor/client/providers/CallProvider/CallProvider.tsx
index 6e728dc35eb6..2415441f0c61 100644
--- a/apps/meteor/client/providers/CallProvider/CallProvider.tsx
+++ b/apps/meteor/client/providers/CallProvider/CallProvider.tsx
@@ -28,6 +28,7 @@ import React, { useMemo, useRef, useCallback, useEffect, useState } from 'react'
 import { createPortal } from 'react-dom';
 import type { OutgoingByeRequest } from 'sip.js/lib/core';
 
+import { useVoipSounds } from './hooks/useVoipSounds';
 import type { CallContextValue } from '../../contexts/CallContext';
 import { CallContext, useIsVoipEnterprise } from '../../contexts/CallContext';
 import { useDialModal } from '../../hooks/useDialModal';
@@ -36,7 +37,6 @@ import { roomCoordinator } from '../../lib/rooms/roomCoordinator';
 import type { QueueAggregator } from '../../lib/voip/QueueAggregator';
 import { parseOutboundPhoneNumber } from '../../lib/voip/parseOutboundPhoneNumber';
 import { WrapUpCallModal } from '../../voip/components/modals/WrapUpCallModal';
-import { useVoipSounds } from './hooks/useVoipSounds';
 
 type NetworkState = 'online' | 'offline';
 
diff --git a/apps/meteor/client/providers/CallProvider/hooks/useVoipSounds.ts b/apps/meteor/client/providers/CallProvider/hooks/useVoipSounds.ts
index 5ba847cae8d2..7eea3b867f50 100644
--- a/apps/meteor/client/providers/CallProvider/hooks/useVoipSounds.ts
+++ b/apps/meteor/client/providers/CallProvider/hooks/useVoipSounds.ts
@@ -1,17 +1,19 @@
-import { useCustomSound, useUserPreference } from '@rocket.chat/ui-contexts';
+import { useCustomSound } from '@rocket.chat/ui-contexts';
 import { useMemo } from 'react';
 
+import { useUserSoundPreferences } from '../../../hooks/useUserSoundPreferences';
+
 type VoipSound = 'telephone' | 'outbound-call-ringing' | 'call-ended';
 
 export const useVoipSounds = () => {
 	const { play, pause } = useCustomSound();
-	const audioVolume = useUserPreference<number>('notificationsSoundVolume', 100) || 100;
+	const { voipRingerVolume } = useUserSoundPreferences();
 
 	return useMemo(
 		() => ({
 			play: (soundId: VoipSound, loop = true) => {
 				play(soundId, {
-					volume: Number((audioVolume / 100).toPrecision(2)),
+					volume: Number((voipRingerVolume / 100).toPrecision(2)),
 					loop,
 				});
 			},
@@ -21,6 +23,6 @@ export const useVoipSounds = () => {
 				pause('outbound-call-ringing');
 			},
 		}),
-		[play, pause, audioVolume],
+		[play, pause, voipRingerVolume],
 	);
 };
diff --git a/apps/meteor/client/providers/EmojiPickerProvider/EmojiPickerProvider.tsx b/apps/meteor/client/providers/EmojiPickerProvider/EmojiPickerProvider.tsx
index 35cb32077a84..ffc31900b046 100644
--- a/apps/meteor/client/providers/EmojiPickerProvider/EmojiPickerProvider.tsx
+++ b/apps/meteor/client/providers/EmojiPickerProvider/EmojiPickerProvider.tsx
@@ -2,11 +2,11 @@ import { useDebouncedState, useLocalStorage } from '@rocket.chat/fuselage-hooks'
 import type { ReactNode, ReactElement, ContextType } from 'react';
 import React, { useState, useCallback, useMemo, useEffect } from 'react';
 
+import { useUpdateCustomEmoji } from './useUpdateCustomEmoji';
 import type { EmojiByCategory } from '../../../app/emoji/client';
 import { emoji, getFrequentEmoji, updateRecent, createEmojiList, createPickerEmojis, CUSTOM_CATEGORY } from '../../../app/emoji/client';
 import { EmojiPickerContext } from '../../contexts/EmojiPickerContext';
 import EmojiPicker from '../../views/composer/EmojiPicker/EmojiPicker';
-import { useUpdateCustomEmoji } from './useUpdateCustomEmoji';
 
 const DEFAULT_ITEMS_LIMIT = 90;
 
@@ -57,7 +57,7 @@ const EmojiPickerProvider = ({ children }: { children: ReactNode }): ReactElemen
 										list: createEmojiList(category.key, null, recentEmojis, setRecentEmojis),
 										limit: category.key === CUSTOM_CATEGORY ? limit | customItemsLimit : null,
 									},
-							  }
+								}
 							: category,
 					),
 			);
diff --git a/apps/meteor/client/providers/LayoutProvider.tsx b/apps/meteor/client/providers/LayoutProvider.tsx
index 04b72a593673..e2da2f8231bd 100644
--- a/apps/meteor/client/providers/LayoutProvider.tsx
+++ b/apps/meteor/client/providers/LayoutProvider.tsx
@@ -15,7 +15,7 @@ type LayoutProviderProps = {
 };
 
 const LayoutProvider = ({ children }: LayoutProviderProps) => {
-	const showTopNavbarEmbeddedLayout = Boolean(useSetting('UI_Show_top_navbar_embedded_layout'));
+	const showTopNavbarEmbeddedLayout = useSetting('UI_Show_top_navbar_embedded_layout', false);
 	const [isCollapsed, setIsCollapsed] = useState(false);
 	const breakpoints = useBreakpoints(); // ["xs", "sm", "md", "lg", "xl", xxl"]
 	const [hiddenActions, setHiddenActions] = useState(hiddenActionsDefaultValue);
diff --git a/apps/meteor/client/providers/MeteorProvider.tsx b/apps/meteor/client/providers/MeteorProvider.tsx
index ad5df9503833..53dbd4b9503f 100644
--- a/apps/meteor/client/providers/MeteorProvider.tsx
+++ b/apps/meteor/client/providers/MeteorProvider.tsx
@@ -2,7 +2,6 @@ import { VoipProvider } from '@rocket.chat/ui-voip';
 import type { ReactNode } from 'react';
 import React from 'react';
 
-import { OmnichannelRoomIconProvider } from '../components/RoomIcon/OmnichannelRoomIcon/provider/OmnichannelRoomIconProvider';
 import ActionManagerProvider from './ActionManagerProvider';
 import AuthenticationProvider from './AuthenticationProvider/AuthenticationProvider';
 import AuthorizationProvider from './AuthorizationProvider';
@@ -25,6 +24,7 @@ import TranslationProvider from './TranslationProvider';
 import UserPresenceProvider from './UserPresenceProvider';
 import UserProvider from './UserProvider';
 import VideoConfProvider from './VideoConfProvider';
+import { OmnichannelRoomIconProvider } from '../components/RoomIcon/OmnichannelRoomIcon/provider/OmnichannelRoomIconProvider';
 
 type MeteorProviderProps = {
 	children?: ReactNode;
diff --git a/apps/meteor/client/providers/ModalProvider/ModalProvider.spec.tsx b/apps/meteor/client/providers/ModalProvider/ModalProvider.spec.tsx
index fd82af587760..414eeb1ad92f 100644
--- a/apps/meteor/client/providers/ModalProvider/ModalProvider.spec.tsx
+++ b/apps/meteor/client/providers/ModalProvider/ModalProvider.spec.tsx
@@ -3,11 +3,11 @@ import { act, render, screen } from '@testing-library/react';
 import type { ForwardedRef, ReactElement } from 'react';
 import React, { Suspense, createContext, createRef, forwardRef, useContext, useImperativeHandle } from 'react';
 
+import ModalProvider from './ModalProvider';
+import ModalProviderWithRegion from './ModalProviderWithRegion';
 import GenericModal from '../../components/GenericModal';
 import { imperativeModal } from '../../lib/imperativeModal';
 import ModalRegion from '../../views/modal/ModalRegion';
-import ModalProvider from './ModalProvider';
-import ModalProviderWithRegion from './ModalProviderWithRegion';
 
 const renderWithSuspense = (ui: ReactElement) =>
 	render(ui, {
diff --git a/apps/meteor/client/providers/ModalProvider/ModalProviderWithRegion.tsx b/apps/meteor/client/providers/ModalProvider/ModalProviderWithRegion.tsx
index e8d1f52bbd9a..64f739bdb586 100644
--- a/apps/meteor/client/providers/ModalProvider/ModalProviderWithRegion.tsx
+++ b/apps/meteor/client/providers/ModalProvider/ModalProviderWithRegion.tsx
@@ -1,8 +1,8 @@
 import type { ReactNode } from 'react';
 import React, { useState } from 'react';
 
-import ModalRegion from '../../views/modal/ModalRegion';
 import ModalProvider from './ModalProvider';
+import ModalRegion from '../../views/modal/ModalRegion';
 
 const ModalProviderWithRegion = ({ children }: { children?: ReactNode }) => {
 	const [region] = useState(() => Symbol());
diff --git a/apps/meteor/client/providers/OmnichannelProvider.tsx b/apps/meteor/client/providers/OmnichannelProvider.tsx
index 9517a9d3b155..9ed860c5abff 100644
--- a/apps/meteor/client/providers/OmnichannelProvider.tsx
+++ b/apps/meteor/client/providers/OmnichannelProvider.tsx
@@ -1,8 +1,9 @@
-import type {
-	IOmnichannelAgent,
-	OmichannelRoutingConfig,
+import {
+	type IOmnichannelAgent,
+	type OmichannelRoutingConfig,
 	OmnichannelSortingMechanismSettingType,
-	ILivechatInquiryRecord,
+	type ILivechatInquiryRecord,
+	LivechatInquiryStatus,
 } from '@rocket.chat/core-typings';
 import { useSafely } from '@rocket.chat/fuselage-hooks';
 import { useUser, useSetting, usePermission, useMethod, useEndpoint, useStream } from '@rocket.chat/ui-contexts';
@@ -41,11 +42,14 @@ type OmnichannelProviderProps = {
 };
 
 const OmnichannelProvider = ({ children }: OmnichannelProviderProps) => {
-	const omniChannelEnabled = useSetting('Livechat_enabled') as boolean;
-	const omnichannelRouting = useSetting('Livechat_Routing_Method');
-	const showOmnichannelQueueLink = useSetting('Livechat_show_queue_list_link') as boolean;
-	const omnichannelPoolMaxIncoming = useSetting<number>('Livechat_guest_pool_max_number_incoming_livechats_displayed') ?? 0;
-	const omnichannelSortingMechanism = useSetting('Omnichannel_sorting_mechanism') as OmnichannelSortingMechanismSettingType;
+	const omniChannelEnabled = useSetting('Livechat_enabled', true);
+	const omnichannelRouting = useSetting('Livechat_Routing_Method', 'Auto_Selection');
+	const showOmnichannelQueueLink = useSetting('Livechat_show_queue_list_link', false);
+	const omnichannelPoolMaxIncoming = useSetting('Livechat_guest_pool_max_number_incoming_livechats_displayed', 0);
+	const omnichannelSortingMechanism = useSetting<OmnichannelSortingMechanismSettingType>(
+		'Omnichannel_sorting_mechanism',
+		OmnichannelSortingMechanismSettingType.Timestamp,
+	);
 
 	const loggerRef = useRef(new ClientLogger('OmnichannelProvider'));
 	const hasAccess = usePermission('view-l-room');
@@ -137,7 +141,7 @@ const OmnichannelProvider = ({ children }: OmnichannelProviderProps) => {
 			}
 
 			return LivechatInquiry.find(
-				{ status: 'queued' },
+				{ status: LivechatInquiryStatus.QUEUED },
 				{
 					sort: getOmniChatSortQuery(omnichannelSortingMechanism),
 					limit: omnichannelPoolMaxIncoming,
@@ -190,7 +194,7 @@ const OmnichannelProvider = ({ children }: OmnichannelProviderProps) => {
 				? {
 						enabled: true,
 						queue,
-				  }
+					}
 				: { enabled: false },
 			showOmnichannelQueueLink: showOmnichannelQueueLink && !!agentAvailable,
 			livechatPriorities,
diff --git a/apps/meteor/client/providers/SettingsProvider.tsx b/apps/meteor/client/providers/SettingsProvider.tsx
index 84b315bc940f..38a4b2397c7b 100644
--- a/apps/meteor/client/providers/SettingsProvider.tsx
+++ b/apps/meteor/client/providers/SettingsProvider.tsx
@@ -74,7 +74,7 @@ const SettingsProvider = ({ children, privileged = false }: SettingsProviderProp
 									? { section: query.section }
 									: {
 											$or: [{ section: { $exists: false } }, { section: undefined }],
-									  })),
+										})),
 						},
 						{
 							sort: {
diff --git a/apps/meteor/client/providers/TranslationProvider.tsx b/apps/meteor/client/providers/TranslationProvider.tsx
index eb546c91c6bd..b918c68d5787 100644
--- a/apps/meteor/client/providers/TranslationProvider.tsx
+++ b/apps/meteor/client/providers/TranslationProvider.tsx
@@ -11,7 +11,6 @@ import type { ReactElement, ReactNode } from 'react';
 import React, { useEffect, useMemo } from 'react';
 import { I18nextProvider, initReactI18next, useTranslation } from 'react-i18next';
 
-import { CachedCollectionManager } from '../../app/ui-cached-collection/client';
 import { getURL } from '../../app/utils/client';
 import {
 	i18n,
@@ -23,6 +22,7 @@ import {
 	extractTranslationNamespaces,
 } from '../../app/utils/lib/i18n';
 import { AppClientOrchestratorInstance } from '../apps/orchestrator';
+import { onLoggedIn } from '../lib/loggedIn';
 import { isRTLScriptLanguage } from '../lib/utils/isRTLScriptLanguage';
 
 i18n.use(I18NextHttpBackend).use(initReactI18next);
@@ -121,12 +121,14 @@ const useI18next = (lng: string): typeof i18next => {
 };
 
 const useAutoLanguage = () => {
-	const serverLanguage = useSetting<string>('Language');
+	const serverLanguage = useSetting('Language', '');
 	const browserLanguage = normalizeLanguage(window.navigator.userLanguage ?? window.navigator.language);
 	const defaultUserLanguage = browserLanguage || serverLanguage || 'en';
 
 	// if the language is supported, if not remove the region
-	const suggestedLanguage = languages.includes(defaultUserLanguage) ? defaultUserLanguage : defaultUserLanguage.split('-').shift() ?? 'en';
+	const suggestedLanguage = languages.includes(defaultUserLanguage)
+		? defaultUserLanguage
+		: (defaultUserLanguage.split('-').shift() ?? 'en');
 
 	// usually that value is set based on the user's config language
 	const [language] = useLocalStorage('userLanguage', suggestedLanguage);
@@ -196,14 +198,14 @@ const TranslationProvider = ({ children }: TranslationProviderProps): ReactEleme
 			});
 	}, [language, loadLocale, availableLanguages]);
 
-	useEffect(() => {
-		const cb = () => {
-			AppClientOrchestratorInstance.getAppClientManager().initialize();
-			AppClientOrchestratorInstance.load();
-		};
-		CachedCollectionManager.onLogin(cb);
-		return () => CachedCollectionManager.off('login', cb);
-	}, []);
+	useEffect(
+		() =>
+			onLoggedIn(() => {
+				AppClientOrchestratorInstance.getAppClientManager().initialize();
+				AppClientOrchestratorInstance.load();
+			}),
+		[],
+	);
 
 	return (
 		<I18nextProvider i18n={i18nextInstance}>
diff --git a/apps/meteor/client/providers/UserPresenceProvider.tsx b/apps/meteor/client/providers/UserPresenceProvider.tsx
index 2032b5adaa53..19ee54330de0 100644
--- a/apps/meteor/client/providers/UserPresenceProvider.tsx
+++ b/apps/meteor/client/providers/UserPresenceProvider.tsx
@@ -10,7 +10,7 @@ type UserPresenceProviderProps = {
 };
 
 const UserPresenceProvider = ({ children }: UserPresenceProviderProps): ReactElement => {
-	const usePresenceDisabled = useSetting<boolean>('Presence_broadcast_disabled');
+	const usePresenceDisabled = useSetting('Presence_broadcast_disabled', false);
 
 	useEffect(() => {
 		Presence.setStatus(usePresenceDisabled ? 'disabled' : 'enabled');
diff --git a/apps/meteor/client/providers/UserProvider/UserProvider.tsx b/apps/meteor/client/providers/UserProvider/UserProvider.tsx
index 4483ae4c6891..dbca784719a9 100644
--- a/apps/meteor/client/providers/UserProvider/UserProvider.tsx
+++ b/apps/meteor/client/providers/UserProvider/UserProvider.tsx
@@ -6,7 +6,11 @@ import { Meteor } from 'meteor/meteor';
 import type { ContextType, ReactElement, ReactNode } from 'react';
 import React, { useEffect, useMemo, useRef } from 'react';
 
-import { Subscriptions, ChatRoom } from '../../../app/models/client';
+import { useClearRemovedRoomsHistory } from './hooks/useClearRemovedRoomsHistory';
+import { useDeleteUser } from './hooks/useDeleteUser';
+import { useEmailVerificationWarning } from './hooks/useEmailVerificationWarning';
+import { useUpdateAvatar } from './hooks/useUpdateAvatar';
+import { Subscriptions, Rooms } from '../../../app/models/client';
 import { getUserPreference } from '../../../app/utils/client';
 import { sdk } from '../../../app/utils/client/lib/SDKClient';
 import { afterLogoutCleanUpCallback } from '../../../lib/callbacks/afterLogoutCleanUpCallback';
@@ -14,10 +18,6 @@ import { useReactiveValue } from '../../hooks/useReactiveValue';
 import { createReactiveSubscriptionFactory } from '../../lib/createReactiveSubscriptionFactory';
 import { queryClient } from '../../lib/queryClient';
 import { useCreateFontStyleElement } from '../../views/account/accessibility/hooks/useCreateFontStyleElement';
-import { useClearRemovedRoomsHistory } from './hooks/useClearRemovedRoomsHistory';
-import { useDeleteUser } from './hooks/useDeleteUser';
-import { useEmailVerificationWarning } from './hooks/useEmailVerificationWarning';
-import { useUpdateAvatar } from './hooks/useUpdateAvatar';
 
 const getUser = (): IUser | null => Meteor.user() as IUser | null;
 
@@ -69,13 +69,13 @@ const UserProvider = ({ children }: UserProviderProps): ReactElement => {
 			querySubscription: createReactiveSubscriptionFactory<ISubscription | undefined>((query, fields, sort) =>
 				Subscriptions.findOne(query, { fields, sort }),
 			),
-			queryRoom: createReactiveSubscriptionFactory<IRoom | undefined>((query, fields) => ChatRoom.findOne(query, { fields })),
+			queryRoom: createReactiveSubscriptionFactory<IRoom | undefined>((query, fields) => Rooms.findOne(query, { fields })),
 			querySubscriptions: createReactiveSubscriptionFactory<SubscriptionWithRoom[]>((query, options) => {
 				if (userId) {
 					return Subscriptions.find(query, options).fetch();
 				}
 
-				return ChatRoom.find(query, options).fetch();
+				return Rooms.find(query, options).fetch();
 			}),
 			logout,
 		}),
diff --git a/apps/meteor/client/providers/UserProvider/hooks/useDeleteUser.ts b/apps/meteor/client/providers/UserProvider/hooks/useDeleteUser.ts
index db7a7d548f9e..d292b1a5b31f 100644
--- a/apps/meteor/client/providers/UserProvider/hooks/useDeleteUser.ts
+++ b/apps/meteor/client/providers/UserProvider/hooks/useDeleteUser.ts
@@ -1,7 +1,7 @@
 import { useStream, useUserId } from '@rocket.chat/ui-contexts';
 import { useEffect } from 'react';
 
-import { ChatMessage } from '../../../../app/models/client';
+import { Messages } from '../../../../app/models/client';
 
 export const useDeleteUser = () => {
 	const notify = useStream('notify-logged');
@@ -13,7 +13,7 @@ export const useDeleteUser = () => {
 		}
 		return notify('Users:Deleted', ({ userId, messageErasureType, replaceByUser }) => {
 			if (messageErasureType === 'Unlink' && replaceByUser) {
-				return ChatMessage.update(
+				return Messages.update(
 					{
 						'u._id': userId,
 					},
@@ -28,7 +28,7 @@ export const useDeleteUser = () => {
 					{ multi: true },
 				);
 			}
-			ChatMessage.remove({
+			Messages.remove({
 				'u._id': userId,
 			});
 		});
diff --git a/apps/meteor/client/providers/UserProvider/hooks/useEmailVerificationWarning.tsx b/apps/meteor/client/providers/UserProvider/hooks/useEmailVerificationWarning.tsx
index 44ea343fb444..b81f0435b54a 100644
--- a/apps/meteor/client/providers/UserProvider/hooks/useEmailVerificationWarning.tsx
+++ b/apps/meteor/client/providers/UserProvider/hooks/useEmailVerificationWarning.tsx
@@ -4,7 +4,7 @@ import { useRef, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 
 export function useEmailVerificationWarning(user: IUser | undefined) {
-	const emailVerificationEnabled = useSetting<boolean>('Accounts_EmailVerification') === true;
+	const emailVerificationEnabled = useSetting('Accounts_EmailVerification', false);
 	const dispatchToastMessage = useToastMessageDispatch();
 	const { t } = useTranslation();
 
diff --git a/apps/meteor/client/providers/VideoConfProvider.tsx b/apps/meteor/client/providers/VideoConfProvider.tsx
index 17cb5957ef4b..7553e4c52bfe 100644
--- a/apps/meteor/client/providers/VideoConfProvider.tsx
+++ b/apps/meteor/client/providers/VideoConfProvider.tsx
@@ -1,7 +1,6 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import type { ReactElement, ReactNode } from 'react';
 import React, { useState, useMemo, useEffect } from 'react';
-import type { Unsubscribe } from 'use-subscription';
 
 import type { VideoConfPopupPayload } from '../contexts/VideoConfContext';
 import { VideoConfContext } from '../contexts/VideoConfContext';
@@ -42,24 +41,24 @@ const VideoConfContextProvider = ({ children }: { children: ReactNode }): ReactE
 			abortCall: (): void => VideoConfManager.abortCall(),
 			setPreferences: (prefs: Partial<(typeof VideoConfManager)['preferences']>): void => VideoConfManager.setPreferences(prefs),
 			queryIncomingCalls: {
-				getCurrentValue: (): DirectCallData[] => VideoConfManager.getIncomingDirectCalls(),
-				subscribe: (cb: () => void): Unsubscribe => VideoConfManager.on('incoming/changed', cb),
+				getSnapshot: (): DirectCallData[] => VideoConfManager.getIncomingDirectCalls(),
+				subscribe: (cb: () => void) => VideoConfManager.on('incoming/changed', cb),
 			},
 			queryRinging: {
-				getCurrentValue: (): boolean => VideoConfManager.isRinging(),
-				subscribe: (cb: () => void): Unsubscribe => VideoConfManager.on('ringing/changed', cb),
+				getSnapshot: (): boolean => VideoConfManager.isRinging(),
+				subscribe: (cb: () => void) => VideoConfManager.on('ringing/changed', cb),
 			},
 			queryCalling: {
-				getCurrentValue: (): boolean => VideoConfManager.isCalling(),
-				subscribe: (cb: () => void): Unsubscribe => VideoConfManager.on('calling/changed', cb),
+				getSnapshot: (): boolean => VideoConfManager.isCalling(),
+				subscribe: (cb: () => void) => VideoConfManager.on('calling/changed', cb),
 			},
 			queryCapabilities: {
-				getCurrentValue: (): ProviderCapabilities => VideoConfManager.capabilities,
-				subscribe: (cb: () => void): Unsubscribe => VideoConfManager.on('capabilities/changed', cb),
+				getSnapshot: (): ProviderCapabilities => VideoConfManager.capabilities,
+				subscribe: (cb: () => void) => VideoConfManager.on('capabilities/changed', cb),
 			},
 			queryPreferences: {
-				getCurrentValue: (): CallPreferences => VideoConfManager.preferences,
-				subscribe: (cb: () => void): Unsubscribe => VideoConfManager.on('preference/changed', cb),
+				getSnapshot: (): CallPreferences => VideoConfManager.preferences,
+				subscribe: (cb: () => void) => VideoConfManager.on('preference/changed', cb),
 			},
 		}),
 		[],
diff --git a/apps/meteor/client/sidebar/Item/Condensed.stories.tsx b/apps/meteor/client/sidebar/Item/Condensed.stories.tsx
index b0936c3171dd..09c1af25ba4e 100644
--- a/apps/meteor/client/sidebar/Item/Condensed.stories.tsx
+++ b/apps/meteor/client/sidebar/Item/Condensed.stories.tsx
@@ -4,8 +4,8 @@ import { action } from '@storybook/addon-actions';
 import type { Meta, StoryFn } from '@storybook/react';
 import React from 'react';
 
-import * as Status from '../../components/UserStatus';
 import Condensed from './Condensed';
+import * as Status from '../../components/UserStatus';
 
 export default {
 	title: 'Sidebar/Condensed',
diff --git a/apps/meteor/client/sidebar/Item/Extended.stories.tsx b/apps/meteor/client/sidebar/Item/Extended.stories.tsx
index ce7705b0d7d4..e076370a5900 100644
--- a/apps/meteor/client/sidebar/Item/Extended.stories.tsx
+++ b/apps/meteor/client/sidebar/Item/Extended.stories.tsx
@@ -4,8 +4,8 @@ import { action } from '@storybook/addon-actions';
 import type { Meta, StoryFn } from '@storybook/react';
 import React from 'react';
 
-import * as Status from '../../components/UserStatus';
 import Extended from './Extended';
+import * as Status from '../../components/UserStatus';
 
 export default {
 	title: 'Sidebar/Extended',
diff --git a/apps/meteor/client/sidebar/Item/Medium.stories.tsx b/apps/meteor/client/sidebar/Item/Medium.stories.tsx
index 44b570662ae5..9321aa09fdd4 100644
--- a/apps/meteor/client/sidebar/Item/Medium.stories.tsx
+++ b/apps/meteor/client/sidebar/Item/Medium.stories.tsx
@@ -4,8 +4,8 @@ import { action } from '@storybook/addon-actions';
 import type { Meta, StoryFn } from '@storybook/react';
 import React from 'react';
 
-import * as Status from '../../components/UserStatus';
 import Medium from './Medium';
+import * as Status from '../../components/UserStatus';
 
 export default {
 	title: 'Sidebar/Medium',
diff --git a/apps/meteor/client/sidebar/RoomList/RoomList.tsx b/apps/meteor/client/sidebar/RoomList/RoomList.tsx
index 4bd7338f9168..04c1fd834002 100644
--- a/apps/meteor/client/sidebar/RoomList/RoomList.tsx
+++ b/apps/meteor/client/sidebar/RoomList/RoomList.tsx
@@ -2,11 +2,15 @@ import type { IRoom } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
 import { Box } from '@rocket.chat/fuselage';
 import { useResizeObserver } from '@rocket.chat/fuselage-hooks';
-import { useUserPreference, useUserId, useTranslation } from '@rocket.chat/ui-contexts';
+import { useUserPreference, useUserId } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 import { Virtuoso } from 'react-virtuoso';
 
+import RoomListRow from './RoomListRow';
+import RoomListRowWrapper from './RoomListRowWrapper';
+import RoomListWrapper from './RoomListWrapper';
 import { VirtuosoScrollbars } from '../../components/CustomScrollbars';
 import { useOpenedRoom } from '../../lib/RoomManager';
 import { useAvatarTemplate } from '../hooks/useAvatarTemplate';
@@ -14,14 +18,11 @@ import { usePreventDefault } from '../hooks/usePreventDefault';
 import { useRoomList } from '../hooks/useRoomList';
 import { useShortcutOpenMenu } from '../hooks/useShortcutOpenMenu';
 import { useTemplateByViewMode } from '../hooks/useTemplateByViewMode';
-import RoomListRow from './RoomListRow';
-import RoomListRowWrapper from './RoomListRowWrapper';
-import RoomListWrapper from './RoomListWrapper';
 
 const computeItemKey = (index: number, room: IRoom): IRoom['_id'] | number => room._id || index;
 
 const RoomList = (): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const isAnonymous = !useUserId();
 	const roomsList = useRoomList();
 	const avatarTemplate = useAvatarTemplate();
diff --git a/apps/meteor/client/sidebar/RoomList/RoomListRow.tsx b/apps/meteor/client/sidebar/RoomList/RoomListRow.tsx
index 593bd784be90..481299acdb8e 100644
--- a/apps/meteor/client/sidebar/RoomList/RoomListRow.tsx
+++ b/apps/meteor/client/sidebar/RoomList/RoomListRow.tsx
@@ -1,17 +1,17 @@
 import type { IRoom, ISubscription } from '@rocket.chat/core-typings';
 import { SidebarSection } from '@rocket.chat/fuselage';
-import type { useTranslation } from '@rocket.chat/ui-contexts';
+import type { TFunction } from 'i18next';
 import type { ReactElement } from 'react';
 import React, { memo, useMemo } from 'react';
 
+import SideBarItemTemplateWithData from './SideBarItemTemplateWithData';
 import { useVideoConfAcceptCall, useVideoConfRejectIncomingCall, useVideoConfIncomingCalls } from '../../contexts/VideoConfContext';
 import type { useAvatarTemplate } from '../hooks/useAvatarTemplate';
 import type { useTemplateByViewMode } from '../hooks/useTemplateByViewMode';
-import SideBarItemTemplateWithData from './SideBarItemTemplateWithData';
 
 type RoomListRowProps = {
 	extended: boolean;
-	t: ReturnType<typeof useTranslation>;
+	t: TFunction;
 	SideBarItemTemplate: ReturnType<typeof useTemplateByViewMode>;
 	AvatarTemplate: ReturnType<typeof useAvatarTemplate>;
 	openedRoom: string;
diff --git a/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx b/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx
index 35d098151204..b2129efc516a 100644
--- a/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx
+++ b/apps/meteor/client/sidebar/RoomList/SideBarItemTemplateWithData.tsx
@@ -1,11 +1,12 @@
 import type { IMessage, IRoom, ISubscription } from '@rocket.chat/core-typings';
 import { isDirectMessageRoom, isMultipleDirectMessageRoom, isOmnichannelRoom, isVideoConfMessage } from '@rocket.chat/core-typings';
 import { Badge, Sidebar, SidebarItemAction, SidebarItemActions, Margins } from '@rocket.chat/fuselage';
-import type { useTranslation } from '@rocket.chat/ui-contexts';
 import { useLayout } from '@rocket.chat/ui-contexts';
+import type { TFunction } from 'i18next';
 import type { AllHTMLAttributes, ComponentType, ReactElement, ReactNode } from 'react';
 import React, { memo, useMemo } from 'react';
 
+import { normalizeSidebarMessage } from './normalizeSidebarMessage';
 import { RoomIcon } from '../../components/RoomIcon';
 import { roomCoordinator } from '../../lib/rooms/roomCoordinator';
 import { isIOsDevice } from '../../lib/utils/isIOsDevice';
@@ -13,9 +14,8 @@ import { useOmnichannelPriorities } from '../../omnichannel/hooks/useOmnichannel
 import RoomMenu from '../RoomMenu';
 import { OmnichannelBadges } from '../badges/OmnichannelBadges';
 import type { useAvatarTemplate } from '../hooks/useAvatarTemplate';
-import { normalizeSidebarMessage } from './normalizeSidebarMessage';
 
-const getMessage = (room: IRoom, lastMessage: IMessage | undefined, t: ReturnType<typeof useTranslation>): string | undefined => {
+const getMessage = (room: IRoom, lastMessage: IMessage | undefined, t: TFunction): string | undefined => {
 	if (!lastMessage) {
 		return t('No_messages_yet');
 	}
@@ -34,13 +34,7 @@ const getMessage = (room: IRoom, lastMessage: IMessage | undefined, t: ReturnTyp
 	return `${lastMessage.u.name || lastMessage.u.username}: ${normalizeSidebarMessage(lastMessage, t)}`;
 };
 
-const getBadgeTitle = (
-	userMentions: number,
-	threadUnread: number,
-	groupMentions: number,
-	unread: number,
-	t: ReturnType<typeof useTranslation>,
-) => {
+const getBadgeTitle = (userMentions: number, threadUnread: number, groupMentions: number, unread: number, t: TFunction) => {
 	const title = [] as string[];
 	if (userMentions) {
 		title.push(t('mentions_counter', { count: userMentions }));
@@ -60,7 +54,7 @@ const getBadgeTitle = (
 
 type RoomListRowProps = {
 	extended: boolean;
-	t: ReturnType<typeof useTranslation>;
+	t: TFunction;
 	SideBarItemTemplate: ComponentType<
 		{
 			icon: ReactNode;
diff --git a/apps/meteor/client/sidebar/RoomList/normalizeSidebarMessage.ts b/apps/meteor/client/sidebar/RoomList/normalizeSidebarMessage.ts
index 9a506b861e56..7de2dd9d122d 100644
--- a/apps/meteor/client/sidebar/RoomList/normalizeSidebarMessage.ts
+++ b/apps/meteor/client/sidebar/RoomList/normalizeSidebarMessage.ts
@@ -1,11 +1,11 @@
 import type { IMessage } from '@rocket.chat/core-typings';
 import { escapeHTML } from '@rocket.chat/string-helpers';
-import type { useTranslation } from '@rocket.chat/ui-contexts';
 import emojione from 'emojione';
+import type { TFunction } from 'i18next';
 
 import { filterMarkdown } from '../../../app/markdown/lib/markdown';
 
-export const normalizeSidebarMessage = (message: IMessage, t: ReturnType<typeof useTranslation>): string | undefined => {
+export const normalizeSidebarMessage = (message: IMessage, t: TFunction): string | undefined => {
 	if (message.msg) {
 		return escapeHTML(filterMarkdown(emojione.shortnameToUnicode(message.msg)));
 	}
diff --git a/apps/meteor/client/sidebar/RoomMenu.tsx b/apps/meteor/client/sidebar/RoomMenu.tsx
index 05f02220104b..4baeb3fb824d 100644
--- a/apps/meteor/client/sidebar/RoomMenu.tsx
+++ b/apps/meteor/client/sidebar/RoomMenu.tsx
@@ -215,7 +215,7 @@ const RoomMenu = ({
 								label: { label: t('Hide'), icon: 'eye-off' },
 								action: handleHide,
 							},
-					  }),
+						}),
 				toggleRead: {
 					label: { label: isUnread ? t('Mark_read') : t('Mark_unread'), icon: 'flag' },
 					action: handleToggleRead,
@@ -229,7 +229,7 @@ const RoomMenu = ({
 								},
 								action: handleToggleFavorite,
 							},
-					  }
+						}
 					: {}),
 				...(canLeave && {
 					leaveRoom: {
diff --git a/apps/meteor/client/sidebar/Sidebar.tsx b/apps/meteor/client/sidebar/Sidebar.tsx
index 683013b38213..541afdfe0bee 100644
--- a/apps/meteor/client/sidebar/Sidebar.tsx
+++ b/apps/meteor/client/sidebar/Sidebar.tsx
@@ -3,12 +3,12 @@ import { Box } from '@rocket.chat/fuselage';
 import { useLayout, useUserPreference } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
 
-import { useOmnichannelEnabled } from '../hooks/omnichannel/useOmnichannelEnabled';
 import SidebarRoomList from './RoomList';
 import SidebarFooter from './footer';
 import SidebarHeader from './header';
 import BannerSection from './sections/BannerSection';
 import OmnichannelSection from './sections/OmnichannelSection';
+import { useOmnichannelEnabled } from '../hooks/omnichannel/useOmnichannelEnabled';
 
 // TODO unit test airgappedbanner
 const Sidebar = () => {
diff --git a/apps/meteor/client/sidebar/footer/SidebarFooter.tsx b/apps/meteor/client/sidebar/footer/SidebarFooter.tsx
index f31f1a3e6b8f..7b4da5604137 100644
--- a/apps/meteor/client/sidebar/footer/SidebarFooter.tsx
+++ b/apps/meteor/client/sidebar/footer/SidebarFooter.tsx
@@ -1,9 +1,9 @@
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import { useIsCallEnabled, useIsCallReady } from '../../contexts/CallContext';
 import SidebarFooterDefault from './SidebarFooterDefault';
 import { VoipFooter } from './voip';
+import { useIsCallEnabled, useIsCallReady } from '../../contexts/CallContext';
 
 const SidebarFooter = (): ReactElement => {
 	const isCallEnabled = useIsCallEnabled();
diff --git a/apps/meteor/client/sidebar/footer/SidebarFooterDefault.tsx b/apps/meteor/client/sidebar/footer/SidebarFooterDefault.tsx
index 3d1c17dcebbe..c40e36173428 100644
--- a/apps/meteor/client/sidebar/footer/SidebarFooterDefault.tsx
+++ b/apps/meteor/client/sidebar/footer/SidebarFooterDefault.tsx
@@ -9,7 +9,7 @@ import { SidebarFooterWatermark } from './SidebarFooterWatermark';
 
 const SidebarFooterDefault = (): ReactElement => {
 	const [, , theme] = useThemeMode();
-	const logo = String(useSetting(theme === 'dark' ? 'Layout_Sidenav_Footer_Dark' : 'Layout_Sidenav_Footer')).trim();
+	const logo = useSetting(theme === 'dark' ? 'Layout_Sidenav_Footer_Dark' : 'Layout_Sidenav_Footer', '').trim();
 
 	const sidebarFooterStyle = css`
 		& img {
diff --git a/apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx b/apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx
index ba7bbd977e03..c9145a8a1210 100644
--- a/apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx
+++ b/apps/meteor/client/sidebar/footer/voip/VoipFooter.tsx
@@ -6,9 +6,9 @@ import type { ReactElement, MouseEvent, ReactNode } from 'react';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
+import { useOmnichannelContactLabel } from './hooks/useOmnichannelContactLabel';
 import type { CallActionsType } from '../../../contexts/CallContext';
 import type { VoipFooterMenuOptions } from '../../../hooks/useVoipFooterMenu';
-import { useOmnichannelContactLabel } from './hooks/useOmnichannelContactLabel';
 
 type VoipFooterPropsType = {
 	caller: ICallerInfo;
@@ -56,7 +56,7 @@ export const VoipFooter = ({
 		callerState === 'IN_CALL' || callerState === 'ON_HOLD'
 			? css`
 					cursor: pointer;
-			  `
+				`
 			: '';
 
 	const handleHold = (e: MouseEvent<HTMLButtonElement>): void => {
diff --git a/apps/meteor/client/sidebar/footer/voip/index.tsx b/apps/meteor/client/sidebar/footer/voip/index.tsx
index 9f353628c982..b7b9755f5eb9 100644
--- a/apps/meteor/client/sidebar/footer/voip/index.tsx
+++ b/apps/meteor/client/sidebar/footer/voip/index.tsx
@@ -1,7 +1,8 @@
 import type { VoIpCallerInfo } from '@rocket.chat/core-typings';
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useCallback, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import {
 	useCallActions,
@@ -18,7 +19,7 @@ import SidebarFooterDefault from '../SidebarFooterDefault';
 import { VoipFooter as VoipFooterComponent } from './VoipFooter';
 
 export const VoipFooter = (): ReactElement | null => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const callerInfo = useCallerInfo();
 	const callActions = useCallActions();
 	const dispatchEvent = useEndpoint('POST', '/v1/voip/events');
diff --git a/apps/meteor/client/sidebar/header/CreateChannel/CreateChannelModal.tsx b/apps/meteor/client/sidebar/header/CreateChannel/CreateChannelModal.tsx
index 50b3c85ea634..995c3646888e 100644
--- a/apps/meteor/client/sidebar/header/CreateChannel/CreateChannelModal.tsx
+++ b/apps/meteor/client/sidebar/header/CreateChannel/CreateChannelModal.tsx
@@ -69,7 +69,7 @@ const CreateChannelModal = ({ teamId = '', mainRoom, onClose, reload }: CreateCh
 	const e2eEnabled = useSetting('E2E_Enable');
 	const namesValidation = useSetting('UTF8_Channel_Names_Validation');
 	const allowSpecialNames = useSetting('UI_Allow_room_names_with_special_chars');
-	const federationEnabled = useSetting<boolean>('Federation_Matrix_enabled') || false;
+	const federationEnabled = useSetting('Federation_Matrix_enabled', false);
 	const e2eEnabledForPrivateByDefault = useSetting('E2E_Enabled_Default_PrivateRooms') && e2eEnabled;
 
 	const canCreateChannel = usePermission('create-c');
diff --git a/apps/meteor/client/sidebar/header/CreateDirectMessage.tsx b/apps/meteor/client/sidebar/header/CreateDirectMessage.tsx
index 7c34f7ac01a3..29f8590692f2 100644
--- a/apps/meteor/client/sidebar/header/CreateDirectMessage.tsx
+++ b/apps/meteor/client/sidebar/header/CreateDirectMessage.tsx
@@ -11,7 +11,7 @@ import { goToRoomById } from '../../lib/utils/goToRoomById';
 
 const CreateDirectMessage = ({ onClose }: { onClose: () => void }) => {
 	const t = useTranslation();
-	const directMaxUsers = useSetting<number>('DirectMesssage_maxUsers') || 1;
+	const directMaxUsers = useSetting('DirectMesssage_maxUsers', 1);
 	const membersFieldId = useUniqueId();
 	const dispatchToastMessage = useToastMessageDispatch();
 
diff --git a/apps/meteor/client/sidebar/header/HeaderUnstable.tsx b/apps/meteor/client/sidebar/header/HeaderUnstable.tsx
index ac6929bf2fb3..058497aaccad 100644
--- a/apps/meteor/client/sidebar/header/HeaderUnstable.tsx
+++ b/apps/meteor/client/sidebar/header/HeaderUnstable.tsx
@@ -1,7 +1,8 @@
 import { Sidebar } from '@rocket.chat/fuselage';
-import { useUserId, useTranslation } from '@rocket.chat/ui-contexts';
+import { useUserId } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import SidebarHeaderToolbar from './SidebarHeaderToolbar';
 import CreateRoom from './actions/CreateRoom';
@@ -11,7 +12,7 @@ import Search from './actions/Search';
 import Sort from './actions/Sort';
 
 const HeaderUnstable = (): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const uid = useUserId();
 
 	return (
diff --git a/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomList.tsx b/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomList.tsx
index eae8a91015a8..ff0fd748c8fe 100644
--- a/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomList.tsx
+++ b/apps/meteor/client/sidebar/header/MatrixFederationSearch/FederatedRoomList.tsx
@@ -1,15 +1,16 @@
 import { Throbber, Box } from '@rocket.chat/fuselage';
 import type { IFederationPublicRooms } from '@rocket.chat/rest-typings';
-import { useSetModal, useEndpoint, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetModal, useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import { useMutation } from '@tanstack/react-query';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 import { Virtuoso } from 'react-virtuoso';
 
-import { VirtuosoScrollbars } from '../../../components/CustomScrollbars';
-import { roomCoordinator } from '../../../lib/rooms/roomCoordinator';
 import FederatedRoomListEmptyPlaceholder from './FederatedRoomListEmptyPlaceholder';
 import FederatedRoomListItem from './FederatedRoomListItem';
 import { useInfiniteFederationSearchPublicRooms } from './useInfiniteFederationSearchPublicRooms';
+import { VirtuosoScrollbars } from '../../../components/CustomScrollbars';
+import { roomCoordinator } from '../../../lib/rooms/roomCoordinator';
 
 type FederatedRoomListProps = {
 	serverName: string;
@@ -22,7 +23,7 @@ const FederatedRoomList = ({ serverName, roomName, count }: FederatedRoomListPro
 	const joinExternalPublicRoom = useEndpoint('POST', '/v1/federation/joinExternalPublicRoom');
 
 	const setModal = useSetModal();
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 	const { data, isLoading, isFetchingNextPage, fetchNextPage } = useInfiniteFederationSearchPublicRooms(serverName, roomName, count);
 
diff --git a/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationSearchModalContent.tsx b/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationSearchModalContent.tsx
index 878a019fc059..b55737974581 100644
--- a/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationSearchModalContent.tsx
+++ b/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationSearchModalContent.tsx
@@ -1,9 +1,10 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Box, SearchInput, Select } from '@rocket.chat/fuselage';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
-import { useSetModal, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetModal } from '@rocket.chat/ui-contexts';
 import type { FormEvent } from 'react';
 import React, { useCallback, useState, useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import FederatedRoomList from './FederatedRoomList';
 import FederatedRoomListErrorBoundary from './FederatedRoomListErrorBoundary';
@@ -31,7 +32,7 @@ const MatrixFederationSearchModalContent = ({ defaultSelectedServer, servers }:
 
 	const debouncedRoomName = useDebouncedValue(roomName, 400);
 
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const serverOptions = useMemo(() => servers.map((server): SelectOption => [server.name, server.name]), [servers]);
 
diff --git a/apps/meteor/client/sidebar/header/UserAvatarWithStatus.tsx b/apps/meteor/client/sidebar/header/UserAvatarWithStatus.tsx
index ce4878515781..324b569cce67 100644
--- a/apps/meteor/client/sidebar/header/UserAvatarWithStatus.tsx
+++ b/apps/meteor/client/sidebar/header/UserAvatarWithStatus.tsx
@@ -21,7 +21,7 @@ const anon = {
 
 const UserAvatarWithStatus = () => {
 	const user = useUser();
-	const presenceDisabled = useSetting<boolean>('Presence_broadcast_disabled');
+	const presenceDisabled = useSetting('Presence_broadcast_disabled', false);
 
 	const { status = !user ? 'online' : 'offline', username, avatarETag } = user || anon;
 
diff --git a/apps/meteor/client/sidebar/header/UserMenuHeader.tsx b/apps/meteor/client/sidebar/header/UserMenuHeader.tsx
index 511b2c2a1e45..75ba42925e1e 100644
--- a/apps/meteor/client/sidebar/header/UserMenuHeader.tsx
+++ b/apps/meteor/client/sidebar/header/UserMenuHeader.tsx
@@ -1,16 +1,17 @@
 import type { IUser } from '@rocket.chat/core-typings';
 import { Box, Margins } from '@rocket.chat/fuselage';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
-import { useSetting, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetting } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import MarkdownText from '../../components/MarkdownText';
 import { UserStatus } from '../../components/UserStatus';
 import { useUserDisplayName } from '../../hooks/useUserDisplayName';
 
 const UserMenuHeader = ({ user }: { user: IUser }) => {
-	const t = useTranslation();
-	const presenceDisabled = useSetting<boolean>('Presence_broadcast_disabled');
+	const { t } = useTranslation();
+	const presenceDisabled = useSetting('Presence_broadcast_disabled', false);
 	const displayName = useUserDisplayName(user);
 
 	return (
diff --git a/apps/meteor/client/sidebar/header/actions/Login.tsx b/apps/meteor/client/sidebar/header/actions/Login.tsx
index f5e97b4888c4..2de3d3ddda80 100644
--- a/apps/meteor/client/sidebar/header/actions/Login.tsx
+++ b/apps/meteor/client/sidebar/header/actions/Login.tsx
@@ -1,13 +1,14 @@
 import { Sidebar } from '@rocket.chat/fuselage';
-import { useSessionDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSessionDispatch } from '@rocket.chat/ui-contexts';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 type LoginProps = Omit<HTMLAttributes<HTMLElement>, 'is'>;
 
 const Login = (props: LoginProps) => {
 	const setForceLogin = useSessionDispatch('forceLogin');
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Sidebar.TopBar.Action
diff --git a/apps/meteor/client/sidebar/header/actions/hooks/useCreateRoomMenu.tsx b/apps/meteor/client/sidebar/header/actions/hooks/useCreateRoomMenu.tsx
index 6a0c58b36311..795944b8d819 100644
--- a/apps/meteor/client/sidebar/header/actions/hooks/useCreateRoomMenu.tsx
+++ b/apps/meteor/client/sidebar/header/actions/hooks/useCreateRoomMenu.tsx
@@ -1,13 +1,14 @@
-import { useAtLeastOnePermission, useSetting, useTranslation } from '@rocket.chat/ui-contexts';
+import { useAtLeastOnePermission, useSetting } from '@rocket.chat/ui-contexts';
+import { useTranslation } from 'react-i18next';
 
-import { useIsEnterprise } from '../../../../hooks/useIsEnterprise';
 import { useCreateRoomItems } from './useCreateRoomItems';
 import { useMatrixFederationItems } from './useMatrixFederationItems';
+import { useIsEnterprise } from '../../../../hooks/useIsEnterprise';
 
 const CREATE_ROOM_PERMISSIONS = ['create-c', 'create-p', 'create-d', 'start-discussion', 'start-discussion-other-user'];
 
 export const useCreateRoom = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const showCreate = useAtLeastOnePermission(CREATE_ROOM_PERMISSIONS);
 
 	const { data } = useIsEnterprise();
diff --git a/apps/meteor/client/sidebar/header/actions/hooks/useGroupingListItems.tsx b/apps/meteor/client/sidebar/header/actions/hooks/useGroupingListItems.tsx
index 5dcb53f2ad2f..880d6d5f7e48 100644
--- a/apps/meteor/client/sidebar/header/actions/hooks/useGroupingListItems.tsx
+++ b/apps/meteor/client/sidebar/header/actions/hooks/useGroupingListItems.tsx
@@ -1,10 +1,11 @@
 import { CheckBox } from '@rocket.chat/fuselage';
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
-import { useEndpoint, useUserPreference, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useUserPreference } from '@rocket.chat/ui-contexts';
 import React, { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
 export const useGroupingListItems = (): GenericMenuItemProps[] => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const sidebarGroupByType = useUserPreference<boolean>('sidebarGroupByType');
 	const sidebarShowFavorites = useUserPreference<boolean>('sidebarShowFavorites');
diff --git a/apps/meteor/client/sidebar/header/actions/hooks/useSortModeItems.tsx b/apps/meteor/client/sidebar/header/actions/hooks/useSortModeItems.tsx
index 0e2bf818a0bf..4e8e7566c8e6 100644
--- a/apps/meteor/client/sidebar/header/actions/hooks/useSortModeItems.tsx
+++ b/apps/meteor/client/sidebar/header/actions/hooks/useSortModeItems.tsx
@@ -1,7 +1,8 @@
 import { RadioButton } from '@rocket.chat/fuselage';
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
-import { useEndpoint, useUserPreference, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useUserPreference } from '@rocket.chat/ui-contexts';
 import React, { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import {
 	OmnichannelSortingDisclaimer,
@@ -9,7 +10,7 @@ import {
 } from '../../../../components/Omnichannel/OmnichannelSortingDisclaimer';
 
 export const useSortModeItems = (): GenericMenuItemProps[] => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const saveUserPreferences = useEndpoint('POST', '/v1/users.setPreferences');
 	const sidebarSortBy = useUserPreference<'activity' | 'alphabetical'>('sidebarSortby', 'activity');
diff --git a/apps/meteor/client/sidebar/header/actions/hooks/useViewModeItems.tsx b/apps/meteor/client/sidebar/header/actions/hooks/useViewModeItems.tsx
index a33230a15729..06fe43117d47 100644
--- a/apps/meteor/client/sidebar/header/actions/hooks/useViewModeItems.tsx
+++ b/apps/meteor/client/sidebar/header/actions/hooks/useViewModeItems.tsx
@@ -1,10 +1,11 @@
 import { RadioButton, ToggleSwitch } from '@rocket.chat/fuselage';
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
-import { useEndpoint, useUserPreference, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useUserPreference } from '@rocket.chat/ui-contexts';
 import React, { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
 export const useViewModeItems = (): GenericMenuItemProps[] => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const saveUserPreferences = useEndpoint('POST', '/v1/users.setPreferences');
 
diff --git a/apps/meteor/client/sidebar/header/hooks/useAccountItems.tsx b/apps/meteor/client/sidebar/header/hooks/useAccountItems.tsx
index 51ab7a198a67..b7dc2cfb1beb 100644
--- a/apps/meteor/client/sidebar/header/hooks/useAccountItems.tsx
+++ b/apps/meteor/client/sidebar/header/hooks/useAccountItems.tsx
@@ -2,11 +2,12 @@ import { Badge } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import { defaultFeaturesPreview, usePreferenceFeaturePreviewList } from '@rocket.chat/ui-client';
-import { useRouter, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRouter } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 export const useAccountItems = (): GenericMenuItemProps[] => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const router = useRouter();
 
 	const { unseenFeatures, featurePreviewEnabled } = usePreferenceFeaturePreviewList();
diff --git a/apps/meteor/client/sidebar/header/hooks/useEncryptedRoomDescription.tsx b/apps/meteor/client/sidebar/header/hooks/useEncryptedRoomDescription.tsx
index 09796dd7a6b7..0cef06d39173 100644
--- a/apps/meteor/client/sidebar/header/hooks/useEncryptedRoomDescription.tsx
+++ b/apps/meteor/client/sidebar/header/hooks/useEncryptedRoomDescription.tsx
@@ -1,7 +1,8 @@
-import { useSetting, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetting } from '@rocket.chat/ui-contexts';
+import { useTranslation } from 'react-i18next';
 
 export const useEncryptedRoomDescription = (roomType: 'channel' | 'team') => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const e2eEnabled = useSetting('E2E_Enable');
 	const e2eEnabledForPrivateByDefault = useSetting('E2E_Enabled_Default_PrivateRooms');
 
diff --git a/apps/meteor/client/sidebar/header/hooks/useStatusItems.tsx b/apps/meteor/client/sidebar/header/hooks/useStatusItems.tsx
index dc3fa2a3b277..bd8fa009d33f 100644
--- a/apps/meteor/client/sidebar/header/hooks/useStatusItems.tsx
+++ b/apps/meteor/client/sidebar/header/hooks/useStatusItems.tsx
@@ -5,13 +5,13 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import React, { useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import { useCustomStatusModalHandler } from './useCustomStatusModalHandler';
 import { callbacks } from '../../../../lib/callbacks';
 import MarkdownText from '../../../components/MarkdownText';
 import { UserStatus } from '../../../components/UserStatus';
 import { userStatuses } from '../../../lib/userStatuses';
 import type { UserStatusDescriptor } from '../../../lib/userStatuses';
 import { useStatusDisabledModal } from '../../../views/admin/customUserStatus/hooks/useStatusDisabledModal';
-import { useCustomStatusModalHandler } from './useCustomStatusModalHandler';
 
 export const useStatusItems = (): GenericMenuItemProps[] => {
 	// We should lift this up to somewhere else if we want to use it in other places
@@ -79,7 +79,7 @@ export const useStatusItems = (): GenericMenuItemProps[] => {
 							</Box>
 						),
 					},
-			  ]
+				]
 			: []),
 		...(statuses ?? []),
 		{ id: 'custom-status', icon: 'emoji', content: t('Custom_Status'), onClick: handleCustomStatus, disabled: presenceDisabled },
diff --git a/apps/meteor/client/sidebar/header/hooks/useUserMenu.tsx b/apps/meteor/client/sidebar/header/hooks/useUserMenu.tsx
index 030c248036a8..213013c618dc 100644
--- a/apps/meteor/client/sidebar/header/hooks/useUserMenu.tsx
+++ b/apps/meteor/client/sidebar/header/hooks/useUserMenu.tsx
@@ -1,8 +1,9 @@
 import type { IUser } from '@rocket.chat/core-typings';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
-import { useLogout, useTranslation } from '@rocket.chat/ui-contexts';
+import { useLogout } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import UserMenuHeader from '../UserMenuHeader';
 import { useAccountItems } from './useAccountItems';
@@ -10,7 +11,7 @@ import { useStatusItems } from './useStatusItems';
 import { useVoipItemsSection } from './useVoipItemsSection';
 
 export const useUserMenu = (user: IUser) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const statusItems = useStatusItems();
 	const accountItems = useAccountItems();
diff --git a/apps/meteor/client/sidebar/hooks/useRoomList.ts b/apps/meteor/client/sidebar/hooks/useRoomList.ts
index afdc57086dc4..1d387d90efe4 100644
--- a/apps/meteor/client/sidebar/hooks/useRoomList.ts
+++ b/apps/meteor/client/sidebar/hooks/useRoomList.ts
@@ -3,10 +3,10 @@ import { useDebouncedState } from '@rocket.chat/fuselage-hooks';
 import { useUserPreference, useUserSubscriptions, useSetting } from '@rocket.chat/ui-contexts';
 import { useEffect } from 'react';
 
+import { useQueryOptions } from './useQueryOptions';
 import { useVideoConfIncomingCalls } from '../../contexts/VideoConfContext';
 import { useOmnichannelEnabled } from '../../hooks/omnichannel/useOmnichannelEnabled';
 import { useQueuedInquiries } from '../../hooks/omnichannel/useQueuedInquiries';
-import { useQueryOptions } from './useQueryOptions';
 
 const query = { open: { $ne: false } };
 
diff --git a/apps/meteor/client/sidebar/search/Row.tsx b/apps/meteor/client/sidebar/search/Row.tsx
index 68ceecd2ad88..35255390da33 100644
--- a/apps/meteor/client/sidebar/search/Row.tsx
+++ b/apps/meteor/client/sidebar/search/Row.tsx
@@ -2,8 +2,8 @@ import type { IRoom, ISubscription } from '@rocket.chat/core-typings';
 import type { ReactElement } from 'react';
 import React, { memo } from 'react';
 
-import SideBarItemTemplateWithData from '../RoomList/SideBarItemTemplateWithData';
 import UserItem from './UserItem';
+import SideBarItemTemplateWithData from '../RoomList/SideBarItemTemplateWithData';
 
 type RowProps = {
 	item: ISubscription & IRoom;
diff --git a/apps/meteor/client/sidebar/search/SearchList.tsx b/apps/meteor/client/sidebar/search/SearchList.tsx
index dd97678f638a..86b8922500d7 100644
--- a/apps/meteor/client/sidebar/search/SearchList.tsx
+++ b/apps/meteor/client/sidebar/search/SearchList.tsx
@@ -12,12 +12,12 @@ import type { VirtuosoHandle } from 'react-virtuoso';
 import { Virtuoso } from 'react-virtuoso';
 import tinykeys from 'tinykeys';
 
+import Row from './Row';
 import { VirtuosoScrollbars } from '../../components/CustomScrollbars';
 import { getConfig } from '../../lib/utils/getConfig';
 import { useAvatarTemplate } from '../hooks/useAvatarTemplate';
 import { usePreventDefault } from '../hooks/usePreventDefault';
 import { useTemplateByViewMode } from '../hooks/useTemplateByViewMode';
-import Row from './Row';
 
 const mobileCheck = function () {
 	let check = false;
diff --git a/apps/meteor/client/sidebar/sections/BannerSection.tsx b/apps/meteor/client/sidebar/sections/BannerSection.tsx
index f6ce2ac835c0..a69c1b951b65 100644
--- a/apps/meteor/client/sidebar/sections/BannerSection.tsx
+++ b/apps/meteor/client/sidebar/sections/BannerSection.tsx
@@ -2,16 +2,16 @@ import { useSessionStorage } from '@rocket.chat/fuselage-hooks';
 import { useRole, useSetting } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import { useAirGappedRestriction } from '../../hooks/useAirGappedRestriction';
 import AirGappedRestrictionBanner from './AirGappedRestrictionBanner/AirGappedRestrictionBanner';
 import StatusDisabledBanner from './StatusDisabledBanner';
+import { useAirGappedRestriction } from '../../hooks/useAirGappedRestriction';
 
 const BannerSection = () => {
 	const [isRestricted, isWarning, remainingDays] = useAirGappedRestriction();
 	const isAdmin = useRole('admin');
 
 	const [bannerDismissed, setBannerDismissed] = useSessionStorage('presence_cap_notifier', false);
-	const presenceDisabled = useSetting<boolean>('Presence_broadcast_disabled');
+	const presenceDisabled = useSetting('Presence_broadcast_disabled', false);
 
 	if ((isWarning || isRestricted) && isAdmin) {
 		return <AirGappedRestrictionBanner isRestricted={isRestricted} remainingDays={remainingDays} />;
diff --git a/apps/meteor/client/sidebar/sections/OmnichannelSection.tsx b/apps/meteor/client/sidebar/sections/OmnichannelSection.tsx
index 4e001a03bd14..75d663ea1be5 100644
--- a/apps/meteor/client/sidebar/sections/OmnichannelSection.tsx
+++ b/apps/meteor/client/sidebar/sections/OmnichannelSection.tsx
@@ -1,18 +1,19 @@
 import { Sidebar, SidebarDivider, SidebarSection } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '@rocket.chat/ui-client';
-import { useLayout, useRoute, usePermission, useTranslation } from '@rocket.chat/ui-contexts';
+import { useLayout, useRoute, usePermission } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
+import { OverMacLimitSection } from './OverMacLimitSection';
+import { OmniChannelCallDialPad, OmnichannelCallToggle, OmnichannelLivechatToggle } from './actions';
 import { useIsCallEnabled, useIsCallReady } from '../../contexts/CallContext';
 import { useIsOverMacLimit } from '../../hooks/omnichannel/useIsOverMacLimit';
 import { useOmnichannelShowQueueLink } from '../../hooks/omnichannel/useOmnichannelShowQueueLink';
 import SidebarHeaderToolbar from '../header/SidebarHeaderToolbar';
-import { OverMacLimitSection } from './OverMacLimitSection';
-import { OmniChannelCallDialPad, OmnichannelCallToggle, OmnichannelLivechatToggle } from './actions';
 
 const OmnichannelSection = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const isCallEnabled = useIsCallEnabled();
 	const isCallReady = useIsCallReady();
 	const hasPermissionToSeeContactCenter = usePermission('view-omnichannel-contact-center');
diff --git a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggle.tsx b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggle.tsx
index 701286fc966b..e4e4ea3e2c48 100644
--- a/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggle.tsx
+++ b/apps/meteor/client/sidebar/sections/actions/OmnichannelCallToggle.tsx
@@ -1,10 +1,10 @@
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import { useIsCallReady, useIsCallError } from '../../../contexts/CallContext';
 import { OmnichannelCallToggleError } from './OmnichannelCallToggleError';
 import { OmnichannelCallToggleLoading } from './OmnichannelCallToggleLoading';
 import { OmnichannelCallToggleReady } from './OmnichannelCallToggleReady';
+import { useIsCallReady, useIsCallError } from '../../../contexts/CallContext';
 
 export const OmnichannelCallToggle = ({ ...props }): ReactElement => {
 	const isCallReady = useIsCallReady();
diff --git a/apps/meteor/client/sidebar/sections/actions/OmnichannelLivechatToggle.tsx b/apps/meteor/client/sidebar/sections/actions/OmnichannelLivechatToggle.tsx
index bc0e2f8d0ff8..66bf9f758e81 100644
--- a/apps/meteor/client/sidebar/sections/actions/OmnichannelLivechatToggle.tsx
+++ b/apps/meteor/client/sidebar/sections/actions/OmnichannelLivechatToggle.tsx
@@ -1,13 +1,14 @@
 import { Sidebar } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useEndpoint, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ComponentProps } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useOmnichannelAgentAvailable } from '../../../hooks/omnichannel/useOmnichannelAgentAvailable';
 
 export const OmnichannelLivechatToggle = (props: Omit<ComponentProps<typeof Sidebar.TopBar.Action>, 'icon'>): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const agentAvailable = useOmnichannelAgentAvailable();
 	const changeAgentStatus = useEndpoint('POST', '/v1/livechat/agent.status');
 	const dispatchToastMessage = useToastMessageDispatch();
diff --git a/apps/meteor/client/sidebarv2/Item/Condensed.stories.tsx b/apps/meteor/client/sidebarv2/Item/Condensed.stories.tsx
index 497f5de0ee88..7b780a0ca60a 100644
--- a/apps/meteor/client/sidebarv2/Item/Condensed.stories.tsx
+++ b/apps/meteor/client/sidebarv2/Item/Condensed.stories.tsx
@@ -4,8 +4,8 @@ import { action } from '@storybook/addon-actions';
 import type { Meta, StoryFn } from '@storybook/react';
 import React from 'react';
 
-import * as Status from '../../components/UserStatus';
 import Condensed from './Condensed';
+import * as Status from '../../components/UserStatus';
 
 export default {
 	title: 'SidebarV2/Condensed',
diff --git a/apps/meteor/client/sidebarv2/Item/Condensed.tsx b/apps/meteor/client/sidebarv2/Item/Condensed.tsx
index 6ca428fc7208..385f5a57d9b8 100644
--- a/apps/meteor/client/sidebarv2/Item/Condensed.tsx
+++ b/apps/meteor/client/sidebarv2/Item/Condensed.tsx
@@ -1,7 +1,7 @@
 import { IconButton, SidebarV2Item, SidebarV2ItemAvatarWrapper, SidebarV2ItemMenu, SidebarV2ItemTitle } from '@rocket.chat/fuselage';
 import { useEffectEvent, usePrefersReducedMotion } from '@rocket.chat/fuselage-hooks';
 import type { Keys as IconName } from '@rocket.chat/icons';
-import type { ReactElement } from 'react';
+import type { HTMLAttributes, ReactElement } from 'react';
 import React, { memo, useState } from 'react';
 
 type CondensedProps = {
@@ -17,9 +17,9 @@ type CondensedProps = {
 	selected?: boolean;
 	badges?: ReactElement;
 	clickable?: boolean;
-};
+} & Omit<HTMLAttributes<HTMLAnchorElement>, 'is'>;
 
-const Condensed = ({ icon, title, avatar, actions, href, unread, menu, badges, selected }: CondensedProps) => {
+const Condensed = ({ icon, title, avatar, actions, href, unread, menu, badges, selected, ...props }: CondensedProps) => {
 	const [menuVisibility, setMenuVisibility] = useState(!!window.DISABLE_ANIMATION);
 
 	const isReduceMotionEnabled = usePrefersReducedMotion();
@@ -32,7 +32,7 @@ const Condensed = ({ icon, title, avatar, actions, href, unread, menu, badges, s
 	};
 
 	return (
-		<SidebarV2Item href={href} selected={selected}>
+		<SidebarV2Item href={href} selected={selected} {...props}>
 			{avatar && <SidebarV2ItemAvatarWrapper>{avatar}</SidebarV2ItemAvatarWrapper>}
 			{icon && icon}
 			<SidebarV2ItemTitle unread={unread}>{title}</SidebarV2ItemTitle>
diff --git a/apps/meteor/client/sidebarv2/Item/Extended.stories.tsx b/apps/meteor/client/sidebarv2/Item/Extended.stories.tsx
index 162bd2706fd4..33632e900133 100644
--- a/apps/meteor/client/sidebarv2/Item/Extended.stories.tsx
+++ b/apps/meteor/client/sidebarv2/Item/Extended.stories.tsx
@@ -4,8 +4,8 @@ import { action } from '@storybook/addon-actions';
 import type { Meta, StoryFn } from '@storybook/react';
 import React from 'react';
 
-import * as Status from '../../components/UserStatus';
 import Extended from './Extended';
+import * as Status from '../../components/UserStatus';
 
 export default {
 	title: 'SidebarV2/Extended',
diff --git a/apps/meteor/client/sidebarv2/Item/Extended.tsx b/apps/meteor/client/sidebarv2/Item/Extended.tsx
index 13112bc96cec..d552f793adbe 100644
--- a/apps/meteor/client/sidebarv2/Item/Extended.tsx
+++ b/apps/meteor/client/sidebarv2/Item/Extended.tsx
@@ -11,6 +11,7 @@ import {
 } from '@rocket.chat/fuselage';
 import { useEffectEvent, usePrefersReducedMotion } from '@rocket.chat/fuselage-hooks';
 import type { Keys as IconName } from '@rocket.chat/icons';
+import type { HTMLAttributes } from 'react';
 import React, { memo, useState } from 'react';
 
 import { useShortTimeAgo } from '../../hooks/useTimeAgo';
@@ -30,7 +31,7 @@ type ExtendedProps = {
 	menuOptions?: any;
 	titleIcon?: React.ReactNode;
 	threadUnread?: boolean;
-};
+} & Omit<HTMLAttributes<HTMLElement>, 'is'>;
 
 const Extended = ({
 	icon,
@@ -47,6 +48,7 @@ const Extended = ({
 	threadUnread: _threadUnread,
 	unread,
 	selected,
+	...props
 }: ExtendedProps) => {
 	const formatDate = useShortTimeAgo();
 	const [menuVisibility, setMenuVisibility] = useState(!!window.DISABLE_ANIMATION);
@@ -61,7 +63,7 @@ const Extended = ({
 	};
 
 	return (
-		<SidebarV2Item href={href} selected={selected}>
+		<SidebarV2Item href={href} selected={selected} {...props}>
 			{avatar && <SidebarV2ItemAvatarWrapper>{avatar}</SidebarV2ItemAvatarWrapper>}
 
 			<SidebarV2ItemCol>
diff --git a/apps/meteor/client/sidebarv2/Item/Medium.stories.tsx b/apps/meteor/client/sidebarv2/Item/Medium.stories.tsx
index 56f22d0db4e1..939c59a631ea 100644
--- a/apps/meteor/client/sidebarv2/Item/Medium.stories.tsx
+++ b/apps/meteor/client/sidebarv2/Item/Medium.stories.tsx
@@ -4,8 +4,8 @@ import { action } from '@storybook/addon-actions';
 import type { Meta, StoryFn } from '@storybook/react';
 import React from 'react';
 
-import * as Status from '../../components/UserStatus';
 import Medium from './Medium';
+import * as Status from '../../components/UserStatus';
 
 export default {
 	title: 'SidebarV2/Medium',
diff --git a/apps/meteor/client/sidebarv2/Item/Medium.tsx b/apps/meteor/client/sidebarv2/Item/Medium.tsx
index 13d2305ad7d5..fbdb9646447a 100644
--- a/apps/meteor/client/sidebarv2/Item/Medium.tsx
+++ b/apps/meteor/client/sidebarv2/Item/Medium.tsx
@@ -1,6 +1,7 @@
 import { IconButton, SidebarV2Item, SidebarV2ItemAvatarWrapper, SidebarV2ItemMenu, SidebarV2ItemTitle } from '@rocket.chat/fuselage';
 import { useEffectEvent, usePrefersReducedMotion } from '@rocket.chat/fuselage-hooks';
 import type { Keys as IconName } from '@rocket.chat/icons';
+import type { HTMLAttributes } from 'react';
 import React, { memo, useState } from 'react';
 
 type MediumProps = {
@@ -15,9 +16,9 @@ type MediumProps = {
 	badges?: React.ReactNode;
 	selected?: boolean;
 	menuOptions?: any;
-};
+} & Omit<HTMLAttributes<HTMLElement>, 'is'>;
 
-const Medium = ({ icon, title, avatar, actions, href, badges, unread, menu, selected }: MediumProps) => {
+const Medium = ({ icon, title, avatar, actions, href, badges, unread, menu, selected, ...props }: MediumProps) => {
 	const [menuVisibility, setMenuVisibility] = useState(!!window.DISABLE_ANIMATION);
 
 	const isReduceMotionEnabled = usePrefersReducedMotion();
@@ -30,7 +31,7 @@ const Medium = ({ icon, title, avatar, actions, href, badges, unread, menu, sele
 	};
 
 	return (
-		<SidebarV2Item href={href} selected={selected}>
+		<SidebarV2Item href={href} selected={selected} {...props}>
 			<SidebarV2ItemAvatarWrapper>{avatar}</SidebarV2ItemAvatarWrapper>
 			{icon && icon}
 			<SidebarV2ItemTitle unread={unread}>{title}</SidebarV2ItemTitle>
diff --git a/apps/meteor/client/sidebarv2/RoomList/RoomList.tsx b/apps/meteor/client/sidebarv2/RoomList/RoomList.tsx
index 6afa27992fb2..828d47c6b7e6 100644
--- a/apps/meteor/client/sidebarv2/RoomList/RoomList.tsx
+++ b/apps/meteor/client/sidebarv2/RoomList/RoomList.tsx
@@ -1,10 +1,14 @@
-import { Box, SidebarV2CollapseGroup } from '@rocket.chat/fuselage';
+import { Box } from '@rocket.chat/fuselage';
 import { useResizeObserver } from '@rocket.chat/fuselage-hooks';
 import { useUserPreference, useUserId } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { GroupedVirtuoso } from 'react-virtuoso';
 
+import RoomListCollapser from './RoomListCollapser';
+import RoomListRow from './RoomListRow';
+import RoomListRowWrapper from './RoomListRowWrapper';
+import RoomListWrapper from './RoomListWrapper';
 import { VirtuosoScrollbars } from '../../components/CustomScrollbars';
 import { useOpenedRoom } from '../../lib/RoomManager';
 import { useAvatarTemplate } from '../hooks/useAvatarTemplate';
@@ -13,16 +17,13 @@ import { usePreventDefault } from '../hooks/usePreventDefault';
 import { useRoomList } from '../hooks/useRoomList';
 import { useShortcutOpenMenu } from '../hooks/useShortcutOpenMenu';
 import { useTemplateByViewMode } from '../hooks/useTemplateByViewMode';
-import RoomListRow from './RoomListRow';
-import RoomListRowWrapper from './RoomListRowWrapper';
-import RoomListWrapper from './RoomListWrapper';
 
 const RoomList = () => {
 	const { t } = useTranslation();
 	const isAnonymous = !useUserId();
 
 	const { collapsedGroups, handleClick, handleKeyDown } = useCollapsedGroups();
-	const { groupsCount, groupsList, roomList } = useRoomList({ collapsedGroups });
+	const { groupsCount, groupsList, roomList, groupedUnreadInfo } = useRoomList({ collapsedGroups });
 	const avatarTemplate = useAvatarTemplate();
 	const sideBarItemTemplate = useTemplateByViewMode();
 	const { ref } = useResizeObserver<HTMLElement>({ debounceDelay: 100 });
@@ -51,11 +52,12 @@ const RoomList = () => {
 			<GroupedVirtuoso
 				groupCounts={groupsCount}
 				groupContent={(index) => (
-					<SidebarV2CollapseGroup
-						title={t(groupsList[index])}
+					<RoomListCollapser
+						collapsedGroups={collapsedGroups}
 						onClick={() => handleClick(groupsList[index])}
 						onKeyDown={(e) => handleKeyDown(e, groupsList[index])}
-						expanded={!collapsedGroups.includes(groupsList[index])}
+						groupTitle={groupsList[index]}
+						unreadCount={groupedUnreadInfo[index]}
 					/>
 				)}
 				{...(roomList.length > 0 && {
diff --git a/apps/meteor/client/sidebarv2/RoomList/RoomListCollapser.tsx b/apps/meteor/client/sidebarv2/RoomList/RoomListCollapser.tsx
new file mode 100644
index 000000000000..3dfd17cb74dd
--- /dev/null
+++ b/apps/meteor/client/sidebarv2/RoomList/RoomListCollapser.tsx
@@ -0,0 +1,37 @@
+import type { ISubscription } from '@rocket.chat/core-typings';
+import { Badge, SidebarV2CollapseGroup } from '@rocket.chat/fuselage';
+import type { HTMLAttributes, KeyboardEvent, MouseEventHandler } from 'react';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { useUnreadDisplay } from '../hooks/useUnreadDisplay';
+
+type RoomListCollapserProps = {
+	groupTitle: string;
+	collapsedGroups: string[];
+	onClick: MouseEventHandler<HTMLElement>;
+	onKeyDown: (e: KeyboardEvent) => void;
+	unreadCount: Pick<ISubscription, 'userMentions' | 'groupMentions' | 'unread' | 'tunread' | 'tunreadUser' | 'tunreadGroup'>;
+} & Omit<HTMLAttributes<HTMLElement>, 'onClick' | 'onKeyDown'>;
+const RoomListCollapser = ({ groupTitle, unreadCount: unreadGroupCount, collapsedGroups, ...props }: RoomListCollapserProps) => {
+	const { t } = useTranslation();
+
+	const { unreadTitle, unreadVariant, showUnread, unreadCount } = useUnreadDisplay(unreadGroupCount);
+
+	return (
+		<SidebarV2CollapseGroup
+			title={t(groupTitle)}
+			expanded={!collapsedGroups.includes(groupTitle)}
+			badge={
+				showUnread ? (
+					<Badge variant={unreadVariant} title={unreadTitle} aria-label={unreadTitle} role='status'>
+						{unreadCount.total}
+					</Badge>
+				) : undefined
+			}
+			{...props}
+		/>
+	);
+};
+
+export default RoomListCollapser;
diff --git a/apps/meteor/client/sidebarv2/RoomList/RoomListRow.tsx b/apps/meteor/client/sidebarv2/RoomList/RoomListRow.tsx
index 810368220ba9..473fad9b0e42 100644
--- a/apps/meteor/client/sidebarv2/RoomList/RoomListRow.tsx
+++ b/apps/meteor/client/sidebarv2/RoomList/RoomListRow.tsx
@@ -2,10 +2,10 @@ import type { IRoom, ISubscription } from '@rocket.chat/core-typings';
 import type { TFunction } from 'i18next';
 import React, { memo, useMemo } from 'react';
 
+import SidebarItemTemplateWithData from './SidebarItemTemplateWithData';
 import { useVideoConfAcceptCall, useVideoConfRejectIncomingCall, useVideoConfIncomingCalls } from '../../contexts/VideoConfContext';
 import type { useAvatarTemplate } from '../hooks/useAvatarTemplate';
 import type { useTemplateByViewMode } from '../hooks/useTemplateByViewMode';
-import SidebarItemTemplateWithData from './SidebarItemTemplateWithData';
 
 type RoomListRowProps = {
 	data: {
diff --git a/apps/meteor/client/sidebarv2/RoomList/SidebarItemTemplateWithData.tsx b/apps/meteor/client/sidebarv2/RoomList/SidebarItemTemplateWithData.tsx
index b286a95d451d..5417d3075c1e 100644
--- a/apps/meteor/client/sidebarv2/RoomList/SidebarItemTemplateWithData.tsx
+++ b/apps/meteor/client/sidebarv2/RoomList/SidebarItemTemplateWithData.tsx
@@ -6,6 +6,7 @@ import type { TFunction } from 'i18next';
 import type { AllHTMLAttributes, ComponentType, ReactElement, ReactNode } from 'react';
 import React, { memo, useMemo } from 'react';
 
+import { normalizeSidebarMessage } from './normalizeSidebarMessage';
 import { RoomIcon } from '../../components/RoomIcon';
 import { roomCoordinator } from '../../lib/rooms/roomCoordinator';
 import { isIOsDevice } from '../../lib/utils/isIOsDevice';
@@ -13,7 +14,7 @@ import { useOmnichannelPriorities } from '../../omnichannel/hooks/useOmnichannel
 import RoomMenu from '../RoomMenu';
 import { OmnichannelBadges } from '../badges/OmnichannelBadges';
 import type { useAvatarTemplate } from '../hooks/useAvatarTemplate';
-import { normalizeSidebarMessage } from './normalizeSidebarMessage';
+import { useUnreadDisplay } from '../hooks/useUnreadDisplay';
 
 export const getMessage = (room: IRoom, lastMessage: IMessage | undefined, t: TFunction): string | undefined => {
 	if (!lastMessage) {
@@ -34,24 +35,6 @@ export const getMessage = (room: IRoom, lastMessage: IMessage | undefined, t: TF
 	return `${lastMessage.u.name || lastMessage.u.username}: ${normalizeSidebarMessage(lastMessage, t)}`;
 };
 
-export const getBadgeTitle = (userMentions: number, threadUnread: number, groupMentions: number, unread: number, t: TFunction) => {
-	const title = [] as string[];
-	if (userMentions) {
-		title.push(t('mentions_counter', { count: userMentions }));
-	}
-	if (threadUnread) {
-		title.push(t('threads_counter', { count: threadUnread }));
-	}
-	if (groupMentions) {
-		title.push(t('group_mentions_counter', { count: groupMentions }));
-	}
-	const count = unread - userMentions - groupMentions;
-	if (count > 0) {
-		title.push(t('unread_messages_counter', { count }));
-	}
-	return title.join(', ');
-};
-
 type RoomListRowProps = {
 	extended: boolean;
 	t: TFunction;
@@ -109,22 +92,10 @@ const SidebarItemTemplateWithData = ({
 	const href = roomCoordinator.getRouteLink(room.t, room) || '';
 	const title = roomCoordinator.getRoomName(room.t, room) || '';
 
-	const {
-		lastMessage,
-		hideUnreadStatus,
-		hideMentionStatus,
-		unread = 0,
-		alert,
-		userMentions,
-		groupMentions,
-		tunread = [],
-		tunreadUser = [],
-		rid,
-		t: type,
-		cl,
-	} = room;
+	const { unreadTitle, unreadVariant, showUnread, unreadCount, highlightUnread: highlighted } = useUnreadDisplay(room);
+
+	const { lastMessage, unread = 0, alert, rid, t: type, cl } = room;
 
-	const highlighted = Boolean(!hideUnreadStatus && (alert || unread));
 	const icon = (
 		<SidebarV2ItemIcon
 			highlighted={highlighted}
@@ -149,20 +120,11 @@ const SidebarItemTemplateWithData = ({
 	const message = extended && getMessage(room, lastMessage, t);
 	const subtitle = message ? <span className='message-body--unstyled' dangerouslySetInnerHTML={{ __html: message }} /> : null;
 
-	const threadUnread = tunread.length > 0;
-	const variant =
-		((userMentions || tunreadUser.length) && 'danger') || (threadUnread && 'primary') || (groupMentions && 'warning') || 'secondary';
-
-	const isUnread = unread > 0 || threadUnread;
-	const showBadge = !hideUnreadStatus || (!hideMentionStatus && (Boolean(userMentions) || tunreadUser.length > 0));
-
-	const badgeTitle = getBadgeTitle(userMentions, tunread.length, groupMentions, unread, t);
-
 	const badges = (
 		<>
-			{showBadge && isUnread && (
-				<SidebarV2ItemBadge variant={variant} title={badgeTitle}>
-					{unread + tunread?.length}
+			{showUnread && (
+				<SidebarV2ItemBadge variant={unreadVariant} title={unreadTitle} role='status'>
+					{unreadCount.total}
 				</SidebarV2ItemBadge>
 			)}
 			{isOmnichannelRoom(room) && <OmnichannelBadges room={room} />}
@@ -197,7 +159,7 @@ const SidebarItemTemplateWithData = ({
 				((): ReactElement => (
 					<RoomMenu
 						alert={alert}
-						threadUnread={threadUnread}
+						threadUnread={unreadCount.threads > 0}
 						rid={rid}
 						unread={!!unread}
 						roomOpen={selected}
diff --git a/apps/meteor/client/sidebarv2/RoomMenu.tsx b/apps/meteor/client/sidebarv2/RoomMenu.tsx
index aac68b9ef79e..8b031e8cfced 100644
--- a/apps/meteor/client/sidebarv2/RoomMenu.tsx
+++ b/apps/meteor/client/sidebarv2/RoomMenu.tsx
@@ -225,7 +225,7 @@ const RoomMenu = ({
 								},
 								action: handleToggleFavorite,
 							},
-					  }
+						}
 					: {}),
 				...(canLeave && {
 					leaveRoom: {
diff --git a/apps/meteor/client/sidebarv2/footer/SidebarFooter.tsx b/apps/meteor/client/sidebarv2/footer/SidebarFooter.tsx
index f31f1a3e6b8f..7b4da5604137 100644
--- a/apps/meteor/client/sidebarv2/footer/SidebarFooter.tsx
+++ b/apps/meteor/client/sidebarv2/footer/SidebarFooter.tsx
@@ -1,9 +1,9 @@
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import { useIsCallEnabled, useIsCallReady } from '../../contexts/CallContext';
 import SidebarFooterDefault from './SidebarFooterDefault';
 import { VoipFooter } from './voip';
+import { useIsCallEnabled, useIsCallReady } from '../../contexts/CallContext';
 
 const SidebarFooter = (): ReactElement => {
 	const isCallEnabled = useIsCallEnabled();
diff --git a/apps/meteor/client/sidebarv2/footer/SidebarFooterDefault.tsx b/apps/meteor/client/sidebarv2/footer/SidebarFooterDefault.tsx
index 3d1c17dcebbe..c40e36173428 100644
--- a/apps/meteor/client/sidebarv2/footer/SidebarFooterDefault.tsx
+++ b/apps/meteor/client/sidebarv2/footer/SidebarFooterDefault.tsx
@@ -9,7 +9,7 @@ import { SidebarFooterWatermark } from './SidebarFooterWatermark';
 
 const SidebarFooterDefault = (): ReactElement => {
 	const [, , theme] = useThemeMode();
-	const logo = String(useSetting(theme === 'dark' ? 'Layout_Sidenav_Footer_Dark' : 'Layout_Sidenav_Footer')).trim();
+	const logo = useSetting(theme === 'dark' ? 'Layout_Sidenav_Footer_Dark' : 'Layout_Sidenav_Footer', '').trim();
 
 	const sidebarFooterStyle = css`
 		& img {
diff --git a/apps/meteor/client/sidebarv2/footer/voip/VoipFooter.tsx b/apps/meteor/client/sidebarv2/footer/voip/VoipFooter.tsx
index 9344ba33c9ad..80154f307dd6 100644
--- a/apps/meteor/client/sidebarv2/footer/voip/VoipFooter.tsx
+++ b/apps/meteor/client/sidebarv2/footer/voip/VoipFooter.tsx
@@ -6,9 +6,9 @@ import type { ReactElement, MouseEvent, ReactNode } from 'react';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
+import { useOmnichannelContactLabel } from './hooks/useOmnichannelContactLabel';
 import type { CallActionsType } from '../../../contexts/CallContext';
 import type { VoipFooterMenuOptions } from '../../../hooks/useVoipFooterMenu';
-import { useOmnichannelContactLabel } from './hooks/useOmnichannelContactLabel';
 
 type VoipFooterProps = {
 	caller: ICallerInfo;
@@ -56,7 +56,7 @@ const VoipFooter = ({
 		callerState === 'IN_CALL' || callerState === 'ON_HOLD'
 			? css`
 					cursor: pointer;
-			  `
+				`
 			: '';
 
 	const handleHold = (e: MouseEvent<HTMLButtonElement>): void => {
diff --git a/apps/meteor/client/sidebarv2/footer/voip/index.tsx b/apps/meteor/client/sidebarv2/footer/voip/index.tsx
index bc6226201511..0fd0d29ee910 100644
--- a/apps/meteor/client/sidebarv2/footer/voip/index.tsx
+++ b/apps/meteor/client/sidebarv2/footer/voip/index.tsx
@@ -1,7 +1,8 @@
 import type { VoIpCallerInfo } from '@rocket.chat/core-typings';
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useCallback, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import {
 	useCallActions,
@@ -18,7 +19,7 @@ import SidebarFooterDefault from '../SidebarFooterDefault';
 import VoipFooterComponent from './VoipFooter';
 
 export const VoipFooter = (): ReactElement | null => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const callerInfo = useCallerInfo();
 	const callActions = useCallActions();
 	const dispatchEvent = useEndpoint('POST', '/v1/voip/events');
diff --git a/apps/meteor/client/sidebarv2/header/CreateChannelModal.tsx b/apps/meteor/client/sidebarv2/header/CreateChannelModal.tsx
index 2ff468f4f72b..964b808cb10f 100644
--- a/apps/meteor/client/sidebarv2/header/CreateChannelModal.tsx
+++ b/apps/meteor/client/sidebarv2/header/CreateChannelModal.tsx
@@ -29,10 +29,10 @@ import type { ComponentProps, ReactElement } from 'react';
 import React, { useEffect, useMemo } from 'react';
 import { useForm, Controller } from 'react-hook-form';
 
+import { useEncryptedRoomDescription } from './hooks/useEncryptedRoomDescription';
 import UserAutoCompleteMultipleFederated from '../../components/UserAutoCompleteMultiple/UserAutoCompleteMultipleFederated';
 import { useHasLicenseModule } from '../../hooks/useHasLicenseModule';
 import { goToRoomById } from '../../lib/utils/goToRoomById';
-import { useEncryptedRoomDescription } from './hooks/useEncryptedRoomDescription';
 
 type CreateChannelModalProps = {
 	teamId?: string;
@@ -67,7 +67,7 @@ const CreateChannelModal = ({ teamId = '', onClose, reload }: CreateChannelModal
 	const e2eEnabled = useSetting('E2E_Enable');
 	const namesValidation = useSetting('UTF8_Channel_Names_Validation');
 	const allowSpecialNames = useSetting('UI_Allow_room_names_with_special_chars');
-	const federationEnabled = useSetting<boolean>('Federation_Matrix_enabled') || false;
+	const federationEnabled = useSetting('Federation_Matrix_enabled', false);
 	const e2eEnabledForPrivateByDefault = useSetting('E2E_Enabled_Default_PrivateRooms') && e2eEnabled;
 
 	const canCreateChannel = usePermission('create-c');
diff --git a/apps/meteor/client/sidebarv2/header/CreateDirectMessage.tsx b/apps/meteor/client/sidebarv2/header/CreateDirectMessage.tsx
index 070c363a0273..8597541e485a 100644
--- a/apps/meteor/client/sidebarv2/header/CreateDirectMessage.tsx
+++ b/apps/meteor/client/sidebarv2/header/CreateDirectMessage.tsx
@@ -13,7 +13,7 @@ type CreateDirectMessageProps = { onClose: () => void };
 
 const CreateDirectMessage = ({ onClose }: CreateDirectMessageProps) => {
 	const t = useTranslation();
-	const directMaxUsers = useSetting<number>('DirectMesssage_maxUsers') || 1;
+	const directMaxUsers = useSetting('DirectMesssage_maxUsers', 1);
 	const membersFieldId = useUniqueId();
 	const dispatchToastMessage = useToastMessageDispatch();
 
diff --git a/apps/meteor/client/sidebarv2/header/CreateTeamModal.tsx b/apps/meteor/client/sidebarv2/header/CreateTeamModal.tsx
index 9de721d8bbcd..b1406b991696 100644
--- a/apps/meteor/client/sidebarv2/header/CreateTeamModal.tsx
+++ b/apps/meteor/client/sidebarv2/header/CreateTeamModal.tsx
@@ -15,6 +15,7 @@ import {
 	FieldHint,
 	Accordion,
 	AccordionItem,
+	Divider,
 } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '@rocket.chat/ui-client';
@@ -30,9 +31,9 @@ import type { ComponentProps, ReactElement } from 'react';
 import React, { memo, useEffect, useMemo } from 'react';
 import { Controller, useForm } from 'react-hook-form';
 
+import { useEncryptedRoomDescription } from './hooks/useEncryptedRoomDescription';
 import UserAutoCompleteMultiple from '../../components/UserAutoCompleteMultiple';
 import { goToRoomById } from '../../lib/utils/goToRoomById';
-import { useEncryptedRoomDescription } from './hooks/useEncryptedRoomDescription';
 
 type CreateTeamModalInputs = {
 	name: string;
@@ -296,6 +297,7 @@ const CreateTeamModal = ({ onClose }: CreateTeamModalProps) => {
 										<FieldDescription id={`${showDiscussionsId}-hint`}>{t('Show_discussions_description')}</FieldDescription>
 									</Field>
 								</FieldGroup>
+								<Divider mb={36} />
 							</FeaturePreviewOn>
 						</FeaturePreview>
 						<FieldGroup>
diff --git a/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomList.tsx b/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomList.tsx
index b4ddbf32419d..0e01cacda0ee 100644
--- a/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomList.tsx
+++ b/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/FederatedRoomList.tsx
@@ -1,15 +1,16 @@
 import { Throbber, Box } from '@rocket.chat/fuselage';
 import type { IFederationPublicRooms } from '@rocket.chat/rest-typings';
-import { useSetModal, useEndpoint, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetModal, useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import { useMutation } from '@tanstack/react-query';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 import { Virtuoso } from 'react-virtuoso';
 
-import { VirtuosoScrollbars } from '../../../components/CustomScrollbars';
-import { roomCoordinator } from '../../../lib/rooms/roomCoordinator';
 import FederatedRoomListEmptyPlaceholder from './FederatedRoomListEmptyPlaceholder';
 import FederatedRoomListItem from './FederatedRoomListItem';
 import { useInfiniteFederationSearchPublicRooms } from './useInfiniteFederationSearchPublicRooms';
+import { VirtuosoScrollbars } from '../../../components/CustomScrollbars';
+import { roomCoordinator } from '../../../lib/rooms/roomCoordinator';
 
 type FederatedRoomListProps = {
 	serverName: string;
@@ -22,7 +23,7 @@ const FederatedRoomList = ({ serverName, roomName, count }: FederatedRoomListPro
 	const joinExternalPublicRoom = useEndpoint('POST', '/v1/federation/joinExternalPublicRoom');
 
 	const setModal = useSetModal();
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 	const { data, isLoading, isFetchingNextPage, fetchNextPage } = useInfiniteFederationSearchPublicRooms(serverName, roomName, count);
 
diff --git a/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/MatrixFederationSearchModalContent.tsx b/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/MatrixFederationSearchModalContent.tsx
index ec6396a83440..6ee8e257c294 100644
--- a/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/MatrixFederationSearchModalContent.tsx
+++ b/apps/meteor/client/sidebarv2/header/MatrixFederationSearch/MatrixFederationSearchModalContent.tsx
@@ -1,9 +1,10 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Box, Select, TextInput } from '@rocket.chat/fuselage';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
-import { useSetModal, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetModal } from '@rocket.chat/ui-contexts';
 import type { FormEvent } from 'react';
 import React, { useCallback, useState, useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import FederatedRoomList from './FederatedRoomList';
 import FederatedRoomListErrorBoundary from './FederatedRoomListErrorBoundary';
@@ -31,7 +32,7 @@ const MatrixFederationSearchModalContent = ({ defaultSelectedServer, servers }:
 
 	const debouncedRoomName = useDebouncedValue(roomName, 400);
 
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const serverOptions = useMemo<Array<SelectOption>>(() => servers.map((server): SelectOption => [server.name, server.name]), [servers]);
 
diff --git a/apps/meteor/client/sidebarv2/header/actions/hooks/useCreateRoomMenu.tsx b/apps/meteor/client/sidebarv2/header/actions/hooks/useCreateRoomMenu.tsx
index 6a0c58b36311..795944b8d819 100644
--- a/apps/meteor/client/sidebarv2/header/actions/hooks/useCreateRoomMenu.tsx
+++ b/apps/meteor/client/sidebarv2/header/actions/hooks/useCreateRoomMenu.tsx
@@ -1,13 +1,14 @@
-import { useAtLeastOnePermission, useSetting, useTranslation } from '@rocket.chat/ui-contexts';
+import { useAtLeastOnePermission, useSetting } from '@rocket.chat/ui-contexts';
+import { useTranslation } from 'react-i18next';
 
-import { useIsEnterprise } from '../../../../hooks/useIsEnterprise';
 import { useCreateRoomItems } from './useCreateRoomItems';
 import { useMatrixFederationItems } from './useMatrixFederationItems';
+import { useIsEnterprise } from '../../../../hooks/useIsEnterprise';
 
 const CREATE_ROOM_PERMISSIONS = ['create-c', 'create-p', 'create-d', 'start-discussion', 'start-discussion-other-user'];
 
 export const useCreateRoom = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const showCreate = useAtLeastOnePermission(CREATE_ROOM_PERMISSIONS);
 
 	const { data } = useIsEnterprise();
diff --git a/apps/meteor/client/sidebarv2/header/actions/hooks/useGroupingListItems.tsx b/apps/meteor/client/sidebarv2/header/actions/hooks/useGroupingListItems.tsx
index 5dcb53f2ad2f..880d6d5f7e48 100644
--- a/apps/meteor/client/sidebarv2/header/actions/hooks/useGroupingListItems.tsx
+++ b/apps/meteor/client/sidebarv2/header/actions/hooks/useGroupingListItems.tsx
@@ -1,10 +1,11 @@
 import { CheckBox } from '@rocket.chat/fuselage';
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
-import { useEndpoint, useUserPreference, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useUserPreference } from '@rocket.chat/ui-contexts';
 import React, { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
 export const useGroupingListItems = (): GenericMenuItemProps[] => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const sidebarGroupByType = useUserPreference<boolean>('sidebarGroupByType');
 	const sidebarShowFavorites = useUserPreference<boolean>('sidebarShowFavorites');
diff --git a/apps/meteor/client/sidebarv2/header/actions/hooks/useSortModeItems.tsx b/apps/meteor/client/sidebarv2/header/actions/hooks/useSortModeItems.tsx
index 0e2bf818a0bf..4e8e7566c8e6 100644
--- a/apps/meteor/client/sidebarv2/header/actions/hooks/useSortModeItems.tsx
+++ b/apps/meteor/client/sidebarv2/header/actions/hooks/useSortModeItems.tsx
@@ -1,7 +1,8 @@
 import { RadioButton } from '@rocket.chat/fuselage';
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
-import { useEndpoint, useUserPreference, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useUserPreference } from '@rocket.chat/ui-contexts';
 import React, { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import {
 	OmnichannelSortingDisclaimer,
@@ -9,7 +10,7 @@ import {
 } from '../../../../components/Omnichannel/OmnichannelSortingDisclaimer';
 
 export const useSortModeItems = (): GenericMenuItemProps[] => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const saveUserPreferences = useEndpoint('POST', '/v1/users.setPreferences');
 	const sidebarSortBy = useUserPreference<'activity' | 'alphabetical'>('sidebarSortby', 'activity');
diff --git a/apps/meteor/client/sidebarv2/header/actions/hooks/useViewModeItems.tsx b/apps/meteor/client/sidebarv2/header/actions/hooks/useViewModeItems.tsx
index a33230a15729..06fe43117d47 100644
--- a/apps/meteor/client/sidebarv2/header/actions/hooks/useViewModeItems.tsx
+++ b/apps/meteor/client/sidebarv2/header/actions/hooks/useViewModeItems.tsx
@@ -1,10 +1,11 @@
 import { RadioButton, ToggleSwitch } from '@rocket.chat/fuselage';
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
-import { useEndpoint, useUserPreference, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useUserPreference } from '@rocket.chat/ui-contexts';
 import React, { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
 export const useViewModeItems = (): GenericMenuItemProps[] => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const saveUserPreferences = useEndpoint('POST', '/v1/users.setPreferences');
 
diff --git a/apps/meteor/client/sidebarv2/header/hooks/useEncryptedRoomDescription.tsx b/apps/meteor/client/sidebarv2/header/hooks/useEncryptedRoomDescription.tsx
index 09796dd7a6b7..0cef06d39173 100644
--- a/apps/meteor/client/sidebarv2/header/hooks/useEncryptedRoomDescription.tsx
+++ b/apps/meteor/client/sidebarv2/header/hooks/useEncryptedRoomDescription.tsx
@@ -1,7 +1,8 @@
-import { useSetting, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetting } from '@rocket.chat/ui-contexts';
+import { useTranslation } from 'react-i18next';
 
 export const useEncryptedRoomDescription = (roomType: 'channel' | 'team') => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const e2eEnabled = useSetting('E2E_Enable');
 	const e2eEnabledForPrivateByDefault = useSetting('E2E_Enabled_Default_PrivateRooms');
 
diff --git a/apps/meteor/client/sidebarv2/hooks/useRoomList.spec.tsx b/apps/meteor/client/sidebarv2/hooks/useRoomList.spec.tsx
new file mode 100644
index 000000000000..bf4645b25db3
--- /dev/null
+++ b/apps/meteor/client/sidebarv2/hooks/useRoomList.spec.tsx
@@ -0,0 +1,313 @@
+import { mockAppRoot } from '@rocket.chat/mock-providers';
+import type { SubscriptionWithRoom } from '@rocket.chat/ui-contexts';
+import { renderHook } from '@testing-library/react';
+import React from 'react';
+
+import { useRoomList } from './useRoomList';
+import { createFakeRoom, createFakeSubscription, createFakeUser } from '../../../tests/mocks/data';
+import { VideoConfContext } from '../../contexts/VideoConfContext';
+
+const user = createFakeUser({
+	active: true,
+	roles: ['admin'],
+	type: 'user',
+});
+
+const emptyUnread = {
+	userMentions: 0,
+	groupMentions: 0,
+	unread: 0,
+	tunread: undefined,
+	tunreadUser: undefined,
+	tunreadGroup: undefined,
+	alert: false,
+};
+
+const unreadChannels = [
+	{ ...createFakeSubscription({ t: 'c', tunread: ['1'] }), ...createFakeRoom({ t: 'c' }) },
+	{ ...createFakeSubscription({ t: 'c', tunread: ['1'] }), ...createFakeRoom({ t: 'c' }) },
+	{ ...createFakeSubscription({ t: 'c', tunreadUser: ['1'] }), ...createFakeRoom({ t: 'c' }) },
+	{ ...createFakeSubscription({ t: 'c', tunreadUser: ['1'] }), ...createFakeRoom({ t: 'c' }) },
+];
+
+const favoriteRooms = [
+	{ ...createFakeSubscription({ t: 'c', f: true, ...emptyUnread }), ...createFakeRoom({ t: 'c' }) },
+	{ ...createFakeSubscription({ t: 'c', f: true, ...emptyUnread }), ...createFakeRoom({ t: 'c' }) },
+	{ ...createFakeSubscription({ t: 'c', f: true, ...emptyUnread }), ...createFakeRoom({ t: 'c' }) },
+];
+
+const teams = [
+	{ ...createFakeSubscription({ ...emptyUnread }), ...createFakeRoom({ teamMain: true }) },
+	{ ...createFakeSubscription({ ...emptyUnread }), ...createFakeRoom({ teamMain: true }) },
+	{ ...createFakeSubscription({ ...emptyUnread }), ...createFakeRoom({ teamMain: true }) },
+	{ ...createFakeSubscription({ ...emptyUnread }), ...createFakeRoom({ teamMain: true }) },
+	{ ...createFakeSubscription({ ...emptyUnread }), ...createFakeRoom({ teamMain: true }) },
+];
+
+const discussionRooms = [
+	{ ...createFakeSubscription({ ...emptyUnread }), ...createFakeRoom({ prid: '123' }) },
+	{ ...createFakeSubscription({ ...emptyUnread }), ...createFakeRoom({ prid: '124' }) },
+	{ ...createFakeSubscription({ ...emptyUnread }), ...createFakeRoom({ prid: '125' }) },
+	{ ...createFakeSubscription({ ...emptyUnread }), ...createFakeRoom({ prid: '126' }) },
+	{ ...createFakeSubscription({ ...emptyUnread }), ...createFakeRoom({ prid: '127' }) },
+];
+
+const directRooms = [
+	{ ...createFakeSubscription({ t: 'd', ...emptyUnread }), ...createFakeRoom({ t: 'd' }) },
+	{ ...createFakeSubscription({ t: 'd', ...emptyUnread }), ...createFakeRoom({ t: 'd' }) },
+	{ ...createFakeSubscription({ t: 'd', ...emptyUnread }), ...createFakeRoom({ t: 'd' }) },
+	{ ...createFakeSubscription({ t: 'd', ...emptyUnread }), ...createFakeRoom({ t: 'd' }) },
+];
+
+const fakeRooms = [...unreadChannels, ...favoriteRooms, ...teams, ...discussionRooms, ...directRooms];
+
+const emptyArr: any[] = [];
+
+const getWrapperSettings = ({
+	sidebarGroupByType = false,
+	sidebarShowFavorites = false,
+	isDiscussionEnabled = false,
+	sidebarShowUnread = false,
+	fakeRoom = undefined,
+}: {
+	sidebarGroupByType?: boolean;
+	sidebarShowFavorites?: boolean;
+	isDiscussionEnabled?: boolean;
+	sidebarShowUnread?: boolean;
+	fakeRoom?: SubscriptionWithRoom;
+}) =>
+	mockAppRoot()
+		.wrap((children) => (
+			<VideoConfContext.Provider
+				value={
+					{
+						queryIncomingCalls: {
+							subscribe: () => () => undefined,
+							getSnapshot: () => {
+								return emptyArr;
+							},
+						},
+					} as any
+				}
+				children={children}
+			/>
+		))
+		.withUser(user)
+		.withSubscriptions([...fakeRooms, fakeRoom && fakeRoom].filter(Boolean) as unknown as SubscriptionWithRoom[])
+		.withUserPreference('sidebarGroupByType', sidebarGroupByType)
+		.withUserPreference('sidebarShowFavorites', sidebarShowFavorites)
+		.withUserPreference('sidebarShowUnread', sidebarShowUnread)
+		.withSetting('Discussion_enabled', isDiscussionEnabled);
+
+it('should return roomList, groupsCount and groupsList', async () => {
+	const {
+		result: {
+			current: { roomList, groupsList, groupsCount },
+		},
+	} = renderHook(() => useRoomList({ collapsedGroups: [] }), {
+		legacyRoot: true,
+		wrapper: getWrapperSettings({}).build(),
+	});
+
+	expect(roomList).toBeDefined();
+	expect(groupsList).toBeDefined();
+	expect(groupsCount).toBeDefined();
+});
+
+it('should return groupsCount with the correct count', async () => {
+	const {
+		result: {
+			current: { groupsCount, roomList },
+		},
+	} = renderHook(() => useRoomList({ collapsedGroups: [] }), {
+		legacyRoot: true,
+		wrapper: getWrapperSettings({}).build(),
+	});
+
+	expect(groupsCount).toContain(fakeRooms.length);
+	expect(groupsCount).not.toContain(fakeRooms.length + 5);
+	expect(groupsCount.reduce((a, b) => a + b, 0)).toBe(fakeRooms.length);
+	expect(groupsCount.reduce((a, b) => a + b, 0)).toEqual(roomList.length);
+});
+
+it('should return roomList with the subscribed rooms and the correct length', async () => {
+	const {
+		result: {
+			current: { roomList },
+		},
+	} = renderHook(() => useRoomList({ collapsedGroups: [] }), {
+		legacyRoot: true,
+		wrapper: getWrapperSettings({}).build(),
+	});
+	expect(roomList).toContain(fakeRooms[0]);
+	expect(roomList).toHaveLength(fakeRooms.length);
+});
+
+it('should return groupsList with "Conversations" if preference sidebarGroupByType is not enabled', async () => {
+	const {
+		result: {
+			current: { groupsList },
+		},
+	} = renderHook(() => useRoomList({ collapsedGroups: [] }), {
+		legacyRoot: true,
+		wrapper: getWrapperSettings({}).build(),
+	});
+	expect(groupsList).toContain('Conversations');
+	expect(groupsList).toHaveLength(1);
+});
+
+it('should return groupsList with "Teams" if sidebarGroupByType is enabled and roomList has teams', async () => {
+	const {
+		result: {
+			current: { groupsList, groupsCount },
+		},
+	} = renderHook(() => useRoomList({ collapsedGroups: [] }), {
+		legacyRoot: true,
+		wrapper: getWrapperSettings({ sidebarGroupByType: true }).build(),
+	});
+
+	const teamsIndex = groupsList.indexOf('Teams');
+	expect(groupsList).toContain('Teams');
+	expect(groupsCount[teamsIndex]).toEqual(teams.length);
+});
+
+it('should return groupsList with "Favorites" if sidebarShowFavorites is enabled', async () => {
+	const {
+		result: {
+			current: { groupsList, groupsCount },
+		},
+	} = renderHook(() => useRoomList({ collapsedGroups: [] }), {
+		legacyRoot: true,
+		wrapper: getWrapperSettings({ sidebarShowFavorites: true, sidebarGroupByType: true }).build(),
+	});
+
+	const favoritesIndex = groupsList.indexOf('Favorites');
+	expect(groupsList).toContain('Favorites');
+	expect(groupsCount[favoritesIndex]).toEqual(favoriteRooms.length);
+});
+
+it('should return groupsList with "Discussions" if isDiscussionEnabled is enabled', async () => {
+	const {
+		result: {
+			current: { groupsList, groupsCount },
+		},
+	} = renderHook(() => useRoomList({ collapsedGroups: [] }), {
+		legacyRoot: true,
+		wrapper: getWrapperSettings({ isDiscussionEnabled: true, sidebarGroupByType: true }).build(),
+	});
+
+	const discussionIndex = groupsList.indexOf('Discussions');
+	expect(groupsList).toContain('Discussions');
+	expect(groupsCount[discussionIndex]).toEqual(discussionRooms.length);
+});
+
+it('should return groupsList without "Discussions" if isDiscussionEnabled is disabled', async () => {
+	const { result } = renderHook(() => useRoomList({ collapsedGroups: [] }), {
+		legacyRoot: true,
+		wrapper: getWrapperSettings({ isDiscussionEnabled: false, sidebarGroupByType: true }).build(),
+	});
+	expect(result.current.groupsList).not.toContain('Discussions');
+});
+
+it('should remove corresponding items from roomList and return groupCount 0 when group is collapsed', async () => {
+	const {
+		result: {
+			current: { roomList, groupsCount, groupsList },
+		},
+	} = renderHook(() => useRoomList({ collapsedGroups: ['Channels'] }), {
+		legacyRoot: true,
+		wrapper: getWrapperSettings({ sidebarGroupByType: true }).build(),
+	});
+	const channelsIndex = groupsList.indexOf('Channels');
+	expect(groupsCount[channelsIndex]).toEqual(0);
+	expect(roomList.length).toEqual(groupsCount.reduce((a, b) => a + b, 0));
+});
+
+it('should always return groupsCount and groupsList with the same length', async () => {
+	const { result } = renderHook(() => useRoomList({ collapsedGroups: [] }), {
+		legacyRoot: true,
+		wrapper: getWrapperSettings({ sidebarGroupByType: true }).build(),
+	});
+	expect(result.current.groupsCount.length).toEqual(result.current.groupsList.length);
+});
+
+it('should return "Unread" group with the correct items if sidebarShowUnread is enabled', async () => {
+	const { result } = renderHook(() => useRoomList({ collapsedGroups: [] }), {
+		legacyRoot: true,
+		wrapper: getWrapperSettings({ sidebarShowUnread: true, sidebarGroupByType: true }).build(),
+	});
+	const unreadIndex = result.current.groupsList.indexOf('Unread');
+	expect(result.current.groupsList).toContain('Unread');
+	expect(result.current.groupsCount[unreadIndex]).toEqual(unreadChannels.length);
+});
+
+it('should not include unread room in unread group if hideUnreadStatus is enabled', async () => {
+	const { result } = renderHook(() => useRoomList({ collapsedGroups: [] }), {
+		legacyRoot: true,
+		wrapper: getWrapperSettings({
+			sidebarShowUnread: true,
+			sidebarGroupByType: true,
+			fakeRoom: {
+				...createFakeSubscription({ t: 'c', unread: 1, hideUnreadStatus: true }),
+				...createFakeRoom({ t: 'c' }),
+			} as unknown as SubscriptionWithRoom,
+		}).build(),
+	});
+	const unreadIndex = result.current.groupsList.indexOf('Unread');
+	const roomListUnread = result.current.roomList.filter((room) => room.unread);
+
+	expect(result.current.groupsCount[unreadIndex]).toEqual(unreadChannels.length);
+	expect(roomListUnread.length).not.toEqual(unreadChannels.length);
+});
+
+it('should accumulate unread data into `groupedUnreadInfo` when group is collapsed', async () => {
+	const { result } = renderHook(() => useRoomList({ collapsedGroups: ['Channels'] }), {
+		legacyRoot: true,
+		wrapper: getWrapperSettings({ sidebarGroupByType: true }).build(),
+	});
+
+	const channelsIndex = result.current.groupsList.indexOf('Channels');
+	const { groupMentions, unread, userMentions, tunread, tunreadUser } = result.current.groupedUnreadInfo[channelsIndex];
+
+	expect(groupMentions).toEqual(fakeRooms.reduce((acc, cv) => acc + cv.groupMentions, 0));
+	expect(unread).toEqual(fakeRooms.reduce((acc, cv) => acc + cv.unread, 0));
+	expect(userMentions).toEqual(fakeRooms.reduce((acc, cv) => acc + cv.userMentions, 0));
+	expect(tunread).toEqual(fakeRooms.reduce((acc, cv) => [...acc, ...(cv.tunread || [])], [] as string[]));
+	expect(tunreadUser).toEqual(fakeRooms.reduce((acc, cv) => [...acc, ...(cv.tunreadUser || [])], [] as string[]));
+});
+
+it('should add to unread group when has thread unread, even if alert is false', async () => {
+	const fakeRoom = {
+		...createFakeSubscription({ ...emptyUnread, tunread: ['1'], alert: false }),
+	} as unknown as SubscriptionWithRoom;
+
+	const { result } = renderHook(() => useRoomList({ collapsedGroups: [] }), {
+		legacyRoot: true,
+		wrapper: getWrapperSettings({
+			sidebarGroupByType: true,
+			sidebarShowUnread: true,
+			fakeRoom,
+		}).build(),
+	});
+
+	const unreadGroup = result.current.roomList.splice(0, result.current.groupsCount[0]);
+	expect(unreadGroup.find((room) => room.name === fakeRoom.name)).toBeDefined();
+});
+
+it('should not add room to unread group if thread unread is an empty array', async () => {
+	const fakeRoom = {
+		...createFakeSubscription({ ...emptyUnread, tunread: [] }),
+	} as unknown as SubscriptionWithRoom;
+
+	const { result } = renderHook(() => useRoomList({ collapsedGroups: [] }), {
+		legacyRoot: true,
+		wrapper: getWrapperSettings({
+			sidebarGroupByType: true,
+			sidebarShowUnread: true,
+			fakeRoom,
+		}).build(),
+	});
+
+	const unreadGroup = result.current.roomList.splice(0, result.current.groupsCount[0]);
+	expect(unreadGroup.find((room) => room.name === fakeRoom.name)).toBeUndefined();
+});
diff --git a/apps/meteor/client/sidebarv2/hooks/useRoomList.ts b/apps/meteor/client/sidebarv2/hooks/useRoomList.ts
index 5f9a1234c269..921d956147ba 100644
--- a/apps/meteor/client/sidebarv2/hooks/useRoomList.ts
+++ b/apps/meteor/client/sidebarv2/hooks/useRoomList.ts
@@ -1,13 +1,13 @@
 import type { ILivechatInquiryRecord, IRoom, ISubscription } from '@rocket.chat/core-typings';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
-import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import type { SubscriptionWithRoom, TranslationKey } from '@rocket.chat/ui-contexts';
 import { useUserPreference, useUserSubscriptions, useSetting } from '@rocket.chat/ui-contexts';
 import { useMemo } from 'react';
 
 import { useVideoConfIncomingCalls } from '../../contexts/VideoConfContext';
 import { useOmnichannelEnabled } from '../../hooks/omnichannel/useOmnichannelEnabled';
 import { useQueuedInquiries } from '../../hooks/omnichannel/useQueuedInquiries';
-import { useQueryOptions } from './useQueryOptions';
+import { useSortQueryOptions } from '../../hooks/useSortQueryOptions';
 
 const query = { open: { $ne: false } };
 
@@ -27,15 +27,16 @@ const order = [
 	'Conversations',
 ] as const;
 
-export const useRoomList = ({
-	collapsedGroups,
-}: {
-	collapsedGroups?: string[];
-}): {
+type useRoomListReturnType = {
 	roomList: Array<ISubscription & IRoom>;
 	groupsCount: number[];
 	groupsList: TranslationKey[];
-} => {
+	groupedUnreadInfo: Pick<
+		SubscriptionWithRoom,
+		'userMentions' | 'groupMentions' | 'unread' | 'tunread' | 'tunreadUser' | 'tunreadGroup' | 'alert' | 'hideUnreadStatus'
+	>[];
+};
+export const useRoomList = ({ collapsedGroups }: { collapsedGroups?: string[] }): useRoomListReturnType => {
 	const showOmnichannel = useOmnichannelEnabled();
 	const sidebarGroupByType = useUserPreference('sidebarGroupByType');
 	const favoritesEnabled = useUserPreference('sidebarShowFavorites');
@@ -43,7 +44,7 @@ export const useRoomList = ({
 	const isDiscussionEnabled = useSetting('Discussion_enabled');
 	const sidebarShowUnread = useUserPreference('sidebarShowUnread');
 
-	const options = useQueryOptions();
+	const options = useSortQueryOptions();
 
 	const rooms = useUserSubscriptions(query, options);
 
@@ -53,7 +54,7 @@ export const useRoomList = ({
 
 	const queue = inquiries.enabled ? inquiries.queue : emptyQueue;
 
-	const { groupsCount, groupsList, roomList } = useDebouncedValue(
+	const { groupsCount, groupsList, roomList, groupedUnreadInfo } = useDebouncedValue(
 		useMemo(() => {
 			const isCollapsed = (groupTitle: string) => collapsedGroups?.includes(groupTitle);
 
@@ -77,7 +78,7 @@ export const useRoomList = ({
 					return incomingCall.add(room);
 				}
 
-				if (sidebarShowUnread && (room.alert || room.unread) && !room.hideUnreadStatus) {
+				if (sidebarShowUnread && (room.alert || room.unread || room.tunread?.length) && !room.hideUnreadStatus) {
 					return unread.add(room);
 				}
 
@@ -133,7 +134,7 @@ export const useRoomList = ({
 
 			!sidebarGroupByType && groups.set('Conversations', conversation);
 
-			const { groupsCount, groupsList, roomList } = sidebarOrder.reduce(
+			const { groupsCount, groupsList, roomList, groupedUnreadInfo } = sidebarOrder.reduce(
 				(acc, key) => {
 					const value = groups.get(key);
 
@@ -142,11 +143,39 @@ export const useRoomList = ({
 					}
 
 					acc.groupsList.push(key as TranslationKey);
+
+					const groupedUnreadInfoAcc = {
+						userMentions: 0,
+						groupMentions: 0,
+						tunread: [],
+						tunreadUser: [],
+						unread: 0,
+					};
+
 					if (isCollapsed(key)) {
+						const groupedUnreadInfo = [...value].reduce(
+							(counter, { userMentions, groupMentions, tunread, tunreadUser, unread, alert, hideUnreadStatus }) => {
+								if (hideUnreadStatus) {
+									return counter;
+								}
+
+								counter.userMentions += userMentions || 0;
+								counter.groupMentions += groupMentions || 0;
+								counter.tunread = [...counter.tunread, ...(tunread || [])];
+								counter.tunreadUser = [...counter.tunreadUser, ...(tunreadUser || [])];
+								counter.unread += unread || 0;
+								!unread && !tunread?.length && alert && (counter.unread += 1);
+								return counter;
+							},
+							groupedUnreadInfoAcc,
+						);
+
+						acc.groupedUnreadInfo.push(groupedUnreadInfo);
 						acc.groupsCount.push(0);
 						return acc;
 					}
 
+					acc.groupedUnreadInfo.push(groupedUnreadInfoAcc);
 					acc.groupsCount.push(value.size);
 					acc.roomList.push(...value);
 					return acc;
@@ -155,14 +184,11 @@ export const useRoomList = ({
 					groupsCount: [],
 					groupsList: [],
 					roomList: [],
-				} as {
-					groupsCount: number[];
-					groupsList: TranslationKey[];
-					roomList: Array<ISubscription & IRoom>;
-				},
+					groupedUnreadInfo: [],
+				} as useRoomListReturnType,
 			);
 
-			return { groupsCount, groupsList, roomList };
+			return { groupsCount, groupsList, roomList, groupedUnreadInfo };
 		}, [
 			rooms,
 			showOmnichannel,
@@ -183,5 +209,6 @@ export const useRoomList = ({
 		roomList,
 		groupsCount,
 		groupsList,
+		groupedUnreadInfo,
 	};
 };
diff --git a/apps/meteor/client/sidebarv2/hooks/useUnreadDisplay.spec.tsx b/apps/meteor/client/sidebarv2/hooks/useUnreadDisplay.spec.tsx
new file mode 100644
index 000000000000..0ae7f82e391b
--- /dev/null
+++ b/apps/meteor/client/sidebarv2/hooks/useUnreadDisplay.spec.tsx
@@ -0,0 +1,237 @@
+import { mockAppRoot } from '@rocket.chat/mock-providers';
+import { renderHook } from '@testing-library/react';
+
+import { useUnreadDisplay } from './useUnreadDisplay';
+import { createFakeSubscription } from '../../../tests/mocks/data';
+
+const dmUnread = createFakeSubscription({
+	t: 'd',
+	unread: 3,
+	userMentions: 0,
+	groupMentions: 0,
+	tunread: undefined,
+	tunreadUser: undefined,
+});
+
+const dmThread = createFakeSubscription({
+	t: 'd',
+	unread: 3,
+	userMentions: 0,
+	groupMentions: 0,
+	tunread: ['1'],
+	tunreadUser: undefined,
+});
+
+const alert = createFakeSubscription({
+	t: 'p',
+	unread: 0,
+	userMentions: 0,
+	groupMentions: 0,
+	tunread: undefined,
+	tunreadUser: undefined,
+	alert: true,
+});
+
+const mentionAndGroupMention = createFakeSubscription({
+	t: 'p',
+	unread: 2,
+	userMentions: 1,
+	groupMentions: 1,
+	tunread: undefined,
+	tunreadUser: undefined,
+	alert: true,
+});
+
+const groupMention = createFakeSubscription({
+	t: 'p',
+	unread: 2,
+	userMentions: 0,
+	groupMentions: 2,
+	tunread: undefined,
+	tunreadUser: undefined,
+	alert: true,
+});
+
+const tunread = createFakeSubscription({
+	t: 'p',
+	unread: 0,
+	userMentions: 0,
+	groupMentions: 0,
+	tunread: ['1'],
+	tunreadUser: undefined,
+	alert: true,
+});
+
+const tunreadUser = createFakeSubscription({
+	t: 'p',
+	unread: 1,
+	userMentions: 0,
+	groupMentions: 0,
+	tunread: ['1'],
+	tunreadUser: ['1'],
+	alert: true,
+});
+
+const hideUnreadStatus = createFakeSubscription({
+	t: 'p',
+	hideUnreadStatus: true,
+});
+
+const hideUnreadAndMention = createFakeSubscription({
+	t: 'p',
+	hideUnreadStatus: true,
+	hideMentionStatus: true,
+});
+
+const noUnread = createFakeSubscription({
+	t: 'p',
+	unread: 0,
+	userMentions: 0,
+	groupMentions: 0,
+	tunread: undefined,
+	tunreadUser: undefined,
+});
+
+const wrapper = mockAppRoot()
+	.withTranslations('en', 'core', {
+		mentions_counter_one: '{{count}} mention',
+		mentions_counter_other: '{{count}} mentions',
+		threads_counter_one: '{{count}} unread threaded message',
+		threads_counter_other: '{{count}} unread threaded messages',
+		group_mentions_counter_one: '{{count}} group mention',
+		group_mentions_counter_other: '{{count}} group mentions',
+		unread_messages_counter_one: '{{count}} unread message',
+		unread_messages_counter_other: '{{count}} unread messages',
+	})
+	.build();
+
+it('should return correct unread data for [Direct message unread]', async () => {
+	const { result } = renderHook(() => useUnreadDisplay(dmUnread), {
+		legacyRoot: true,
+		wrapper,
+	});
+	expect(result.current.unreadVariant).toBe('secondary');
+	expect(result.current.unreadTitle).toBe('3 unread messages');
+
+	expect(result.current.unreadCount).toHaveProperty('mentions', 0);
+	expect(result.current.unreadCount).toHaveProperty('threads', 0);
+	expect(result.current.unreadCount).toHaveProperty('groupMentions', 0);
+	expect(result.current.unreadCount).toHaveProperty('total', 3);
+});
+
+it('should return correct unread data for [Direct message with thread unread]', async () => {
+	const { result } = renderHook(() => useUnreadDisplay(dmThread), {
+		legacyRoot: true,
+		wrapper,
+	});
+	expect(result.current.unreadVariant).toBe('primary');
+	expect(result.current.unreadTitle).toBe('1 unread threaded message, 3 unread messages');
+
+	expect(result.current.unreadCount).toHaveProperty('mentions', 0);
+	expect(result.current.unreadCount).toHaveProperty('threads', 1);
+	expect(result.current.unreadCount).toHaveProperty('groupMentions', 0);
+	expect(result.current.unreadCount).toHaveProperty('total', 4);
+});
+
+it('should return correct unread data for [Channel with unread messages alert only]', async () => {
+	const { result } = renderHook(() => useUnreadDisplay(alert), {
+		legacyRoot: true,
+		wrapper,
+	});
+
+	expect(result.current.highlightUnread).toBe(true);
+	expect(result.current.showUnread).toBe(false);
+
+	expect(result.current.unreadCount).toHaveProperty('mentions', 0);
+	expect(result.current.unreadCount).toHaveProperty('threads', 0);
+	expect(result.current.unreadCount).toHaveProperty('groupMentions', 0);
+	expect(result.current.unreadCount).toHaveProperty('total', 0);
+});
+
+it('should return correct unread data for [Mention and group mention]', async () => {
+	const { result } = renderHook(() => useUnreadDisplay(mentionAndGroupMention), {
+		legacyRoot: true,
+		wrapper,
+	});
+	expect(result.current.unreadVariant).toBe('danger');
+	expect(result.current.unreadTitle).toBe('1 mention, 1 group mention');
+
+	expect(result.current.unreadCount).toHaveProperty('mentions', 1);
+	expect(result.current.unreadCount).toHaveProperty('threads', 0);
+	expect(result.current.unreadCount).toHaveProperty('groupMentions', 1);
+	expect(result.current.unreadCount).toHaveProperty('total', 2);
+});
+
+it('should return correct unread data for [Group mention]', async () => {
+	const { result } = renderHook(() => useUnreadDisplay(groupMention), {
+		legacyRoot: true,
+		wrapper,
+	});
+	expect(result.current.unreadVariant).toBe('warning');
+	expect(result.current.unreadTitle).toBe('2 group mentions');
+
+	expect(result.current.unreadCount).toHaveProperty('mentions', 0);
+	expect(result.current.unreadCount).toHaveProperty('threads', 0);
+	expect(result.current.unreadCount).toHaveProperty('groupMentions', 2);
+	expect(result.current.unreadCount).toHaveProperty('total', 2);
+});
+
+it('should return correct unread data for [Thread unread]', async () => {
+	const { result } = renderHook(() => useUnreadDisplay(tunread), {
+		legacyRoot: true,
+		wrapper,
+	});
+	expect(result.current.unreadVariant).toBe('primary');
+	expect(result.current.unreadTitle).toBe('1 unread threaded message');
+
+	expect(result.current.unreadCount).toHaveProperty('mentions', 0);
+	expect(result.current.unreadCount).toHaveProperty('groupMentions', 0);
+	expect(result.current.unreadCount).toHaveProperty('threads', 1);
+	expect(result.current.unreadCount).toHaveProperty('total', 1);
+});
+
+it('should return correct unread data for [Thread and thread user mention]', async () => {
+	const { result } = renderHook(() => useUnreadDisplay(tunreadUser), {
+		legacyRoot: true,
+		wrapper,
+	});
+	expect(result.current.unreadVariant).toBe('danger');
+	expect(result.current.unreadTitle).toBe('1 mention, 1 unread threaded message');
+
+	expect(result.current.unreadCount).toHaveProperty('mentions', 1);
+	expect(result.current.unreadCount).toHaveProperty('groupMentions', 0);
+	expect(result.current.unreadCount).toHaveProperty('threads', 1);
+	expect(result.current.unreadCount).toHaveProperty('total', 2);
+});
+
+it('should not highlight unread if hideUnreadStatus is enabled', async () => {
+	const { result } = renderHook(() => useUnreadDisplay(hideUnreadStatus), {
+		legacyRoot: true,
+	});
+
+	expect(result.current.highlightUnread).toBe(false);
+	expect(result.current.showUnread).toBe(true);
+});
+
+it('should not show unread if hideUnreadStatus and hideMentionStatus is enabled', async () => {
+	const { result } = renderHook(() => useUnreadDisplay(hideUnreadAndMention), {
+		legacyRoot: true,
+	});
+
+	expect(result.current.highlightUnread).toBe(false);
+	expect(result.current.showUnread).toBe(false);
+});
+
+it("should not show unread if there isn't any unread message", async () => {
+	const { result } = renderHook(() => useUnreadDisplay(noUnread), {
+		legacyRoot: true,
+	});
+
+	expect(result.current.highlightUnread).toBe(false);
+	expect(result.current.showUnread).toBe(false);
+
+	expect(result.current.unreadCount).toHaveProperty('mentions', 0);
+	expect(result.current.unreadCount).toHaveProperty('groupMentions', 0);
+	expect(result.current.unreadCount).toHaveProperty('threads', 0);
+	expect(result.current.unreadCount).toHaveProperty('total', 0);
+});
diff --git a/apps/meteor/client/sidebarv2/hooks/useUnreadDisplay.ts b/apps/meteor/client/sidebarv2/hooks/useUnreadDisplay.ts
new file mode 100644
index 000000000000..859711ce46d5
--- /dev/null
+++ b/apps/meteor/client/sidebarv2/hooks/useUnreadDisplay.ts
@@ -0,0 +1,15 @@
+import type { SubscriptionWithRoom } from '@rocket.chat/ui-contexts';
+import { useTranslation } from 'react-i18next';
+
+import { getSubscriptionUnreadData } from '../../../lib/getSubscriptionUnreadData';
+
+export const useUnreadDisplay = (
+	unreadData: Pick<
+		SubscriptionWithRoom,
+		'alert' | 'userMentions' | 'unread' | 'tunread' | 'tunreadUser' | 'groupMentions' | 'hideMentionStatus' | 'hideUnreadStatus'
+	>,
+) => {
+	const { t } = useTranslation();
+
+	return getSubscriptionUnreadData(unreadData, t);
+};
diff --git a/apps/meteor/client/sidebarv2/search/Row.tsx b/apps/meteor/client/sidebarv2/search/Row.tsx
index f8541546ec4b..c0d332c5fa7e 100644
--- a/apps/meteor/client/sidebarv2/search/Row.tsx
+++ b/apps/meteor/client/sidebarv2/search/Row.tsx
@@ -2,8 +2,8 @@ import type { IRoom, ISubscription } from '@rocket.chat/core-typings';
 import type { ReactElement } from 'react';
 import React, { memo } from 'react';
 
-import SidebarItemTemplateWithData from '../RoomList/SidebarItemTemplateWithData';
 import UserItem from './UserItem';
+import SidebarItemTemplateWithData from '../RoomList/SidebarItemTemplateWithData';
 
 type RowProps = {
 	item: ISubscription & IRoom;
diff --git a/apps/meteor/client/sidebarv2/sections/BannerSection.tsx b/apps/meteor/client/sidebarv2/sections/BannerSection.tsx
index f6ce2ac835c0..a69c1b951b65 100644
--- a/apps/meteor/client/sidebarv2/sections/BannerSection.tsx
+++ b/apps/meteor/client/sidebarv2/sections/BannerSection.tsx
@@ -2,16 +2,16 @@ import { useSessionStorage } from '@rocket.chat/fuselage-hooks';
 import { useRole, useSetting } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import { useAirGappedRestriction } from '../../hooks/useAirGappedRestriction';
 import AirGappedRestrictionBanner from './AirGappedRestrictionBanner/AirGappedRestrictionBanner';
 import StatusDisabledBanner from './StatusDisabledBanner';
+import { useAirGappedRestriction } from '../../hooks/useAirGappedRestriction';
 
 const BannerSection = () => {
 	const [isRestricted, isWarning, remainingDays] = useAirGappedRestriction();
 	const isAdmin = useRole('admin');
 
 	const [bannerDismissed, setBannerDismissed] = useSessionStorage('presence_cap_notifier', false);
-	const presenceDisabled = useSetting<boolean>('Presence_broadcast_disabled');
+	const presenceDisabled = useSetting('Presence_broadcast_disabled', false);
 
 	if ((isWarning || isRestricted) && isAdmin) {
 		return <AirGappedRestrictionBanner isRestricted={isRestricted} remainingDays={remainingDays} />;
diff --git a/apps/meteor/client/startup/actionButtons/jumpToMessage.ts b/apps/meteor/client/startup/actionButtons/jumpToMessage.ts
index 0b50078e4d9a..9e8d7d5e07b9 100644
--- a/apps/meteor/client/startup/actionButtons/jumpToMessage.ts
+++ b/apps/meteor/client/startup/actionButtons/jumpToMessage.ts
@@ -1,7 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 
 import { MessageAction } from '../../../app/ui-utils/client';
-import { messageArgs } from '../../lib/utils/messageArgs';
 import { setMessageJumpQueryStringParameter } from '../../lib/utils/setMessageJumpQueryStringParameter';
 
 Meteor.startup(() => {
@@ -10,8 +9,7 @@ Meteor.startup(() => {
 		icon: 'jump',
 		label: 'Jump_to_message',
 		context: ['mentions', 'threads', 'videoconf-threads'],
-		action(_, props) {
-			const { message = messageArgs(this).msg } = props;
+		action(_, { message }) {
 			setMessageJumpQueryStringParameter(message._id);
 		},
 		order: 100,
diff --git a/apps/meteor/client/startup/actionButtons/jumpToPinMessage.ts b/apps/meteor/client/startup/actionButtons/jumpToPinMessage.ts
index f618c5655d85..70460d94bedf 100644
--- a/apps/meteor/client/startup/actionButtons/jumpToPinMessage.ts
+++ b/apps/meteor/client/startup/actionButtons/jumpToPinMessage.ts
@@ -1,7 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 
 import { MessageAction } from '../../../app/ui-utils/client';
-import { messageArgs } from '../../lib/utils/messageArgs';
 import { setMessageJumpQueryStringParameter } from '../../lib/utils/setMessageJumpQueryStringParameter';
 
 Meteor.startup(() => {
@@ -10,8 +9,7 @@ Meteor.startup(() => {
 		icon: 'jump',
 		label: 'Jump_to_message',
 		context: ['pinned', 'message-mobile', 'direct'],
-		action(_, props) {
-			const { message = messageArgs(this).msg } = props;
+		action(_, { message }) {
 			setMessageJumpQueryStringParameter(message._id);
 		},
 		condition({ subscription }) {
diff --git a/apps/meteor/client/startup/actionButtons/jumpToSearchMessage.ts b/apps/meteor/client/startup/actionButtons/jumpToSearchMessage.ts
index b2715cf18c9f..2dcbe7fabe6c 100644
--- a/apps/meteor/client/startup/actionButtons/jumpToSearchMessage.ts
+++ b/apps/meteor/client/startup/actionButtons/jumpToSearchMessage.ts
@@ -1,7 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 
 import { MessageAction } from '../../../app/ui-utils/client';
-import { messageArgs } from '../../lib/utils/messageArgs';
 import { setMessageJumpQueryStringParameter } from '../../lib/utils/setMessageJumpQueryStringParameter';
 
 Meteor.startup(() => {
@@ -10,8 +9,7 @@ Meteor.startup(() => {
 		icon: 'jump',
 		label: 'Jump_to_message',
 		context: ['search'],
-		async action(_, props) {
-			const { message = messageArgs(this).msg } = props;
+		async action(_, { message }) {
 			setMessageJumpQueryStringParameter(message._id);
 		},
 		order: 100,
diff --git a/apps/meteor/client/startup/actionButtons/jumpToStarMessage.ts b/apps/meteor/client/startup/actionButtons/jumpToStarMessage.ts
index 1f4b9c871e02..73ac085d9edb 100644
--- a/apps/meteor/client/startup/actionButtons/jumpToStarMessage.ts
+++ b/apps/meteor/client/startup/actionButtons/jumpToStarMessage.ts
@@ -2,7 +2,6 @@ import { Meteor } from 'meteor/meteor';
 
 import { settings } from '../../../app/settings/client';
 import { MessageAction } from '../../../app/ui-utils/client';
-import { messageArgs } from '../../lib/utils/messageArgs';
 import { setMessageJumpQueryStringParameter } from '../../lib/utils/setMessageJumpQueryStringParameter';
 
 Meteor.startup(() => {
@@ -11,8 +10,7 @@ Meteor.startup(() => {
 		icon: 'jump',
 		label: 'Jump_to_message',
 		context: ['starred', 'threads', 'message-mobile', 'videoconf-threads'],
-		action(_, props) {
-			const { message = messageArgs(this).msg } = props;
+		action(_, { message }) {
 			setMessageJumpQueryStringParameter(message._id);
 		},
 		condition({ message, subscription, user }) {
diff --git a/apps/meteor/client/startup/actionButtons/permalinkPinned.ts b/apps/meteor/client/startup/actionButtons/permalinkPinned.ts
index ddd9237c3eb8..add09ca7dcd0 100644
--- a/apps/meteor/client/startup/actionButtons/permalinkPinned.ts
+++ b/apps/meteor/client/startup/actionButtons/permalinkPinned.ts
@@ -5,7 +5,6 @@ import { MessageAction } from '../../../app/ui-utils/client';
 import { t } from '../../../app/utils/lib/i18n';
 import { getPermaLink } from '../../lib/getPermaLink';
 import { dispatchToastMessage } from '../../lib/toast';
-import { messageArgs } from '../../lib/utils/messageArgs';
 
 Meteor.startup(() => {
 	MessageAction.addButton({
@@ -13,9 +12,8 @@ Meteor.startup(() => {
 		icon: 'permalink',
 		label: 'Copy_link',
 		context: ['pinned'],
-		async action(_, props) {
+		async action(_, { message }) {
 			try {
-				const { message = messageArgs(this).msg } = props;
 				const permalink = await getPermaLink(message._id);
 				navigator.clipboard.writeText(permalink);
 				dispatchToastMessage({ type: 'success', message: t('Copied') });
diff --git a/apps/meteor/client/startup/actionButtons/permalinkStar.ts b/apps/meteor/client/startup/actionButtons/permalinkStar.ts
index a1ee8d79fc44..e4a235491cb7 100644
--- a/apps/meteor/client/startup/actionButtons/permalinkStar.ts
+++ b/apps/meteor/client/startup/actionButtons/permalinkStar.ts
@@ -5,7 +5,6 @@ import { MessageAction } from '../../../app/ui-utils/client';
 import { t } from '../../../app/utils/lib/i18n';
 import { getPermaLink } from '../../lib/getPermaLink';
 import { dispatchToastMessage } from '../../lib/toast';
-import { messageArgs } from '../../lib/utils/messageArgs';
 
 Meteor.startup(() => {
 	MessageAction.addButton({
@@ -14,9 +13,8 @@ Meteor.startup(() => {
 		label: 'Copy_link',
 		// classes: 'clipboard',
 		context: ['starred', 'threads', 'videoconf-threads'],
-		async action(_, props) {
+		async action(_, { message }) {
 			try {
-				const { message = messageArgs(this).msg } = props;
 				const permalink = await getPermaLink(message._id);
 				navigator.clipboard.writeText(permalink);
 				dispatchToastMessage({ type: 'success', message: t('Copied') });
diff --git a/apps/meteor/client/startup/actionButtons/pinMessage.tsx b/apps/meteor/client/startup/actionButtons/pinMessage.tsx
index b383b4a3c648..8f54550d02d9 100644
--- a/apps/meteor/client/startup/actionButtons/pinMessage.tsx
+++ b/apps/meteor/client/startup/actionButtons/pinMessage.tsx
@@ -8,7 +8,6 @@ import { imperativeModal } from '../../lib/imperativeModal';
 import { queryClient } from '../../lib/queryClient';
 import { roomCoordinator } from '../../lib/rooms/roomCoordinator';
 import { dispatchToastMessage } from '../../lib/toast';
-import { messageArgs } from '../../lib/utils/messageArgs';
 import PinMessageModal from '../../views/room/modals/PinMessageModal';
 
 Meteor.startup(() => {
@@ -18,8 +17,7 @@ Meteor.startup(() => {
 		label: 'Pin',
 		type: 'interaction',
 		context: ['pinned', 'message', 'message-mobile', 'threads', 'direct', 'videoconf', 'videoconf-threads'],
-		async action(_, props) {
-			const { message = messageArgs(this).msg } = props;
+		async action(_, { message }) {
 			const onConfirm = async () => {
 				message.pinned = true;
 				try {
diff --git a/apps/meteor/client/startup/actionButtons/starMessage.ts b/apps/meteor/client/startup/actionButtons/starMessage.ts
index b4696041a729..9e8fc7245191 100644
--- a/apps/meteor/client/startup/actionButtons/starMessage.ts
+++ b/apps/meteor/client/startup/actionButtons/starMessage.ts
@@ -6,7 +6,6 @@ import { sdk } from '../../../app/utils/client/lib/SDKClient';
 import { queryClient } from '../../lib/queryClient';
 import { roomCoordinator } from '../../lib/rooms/roomCoordinator';
 import { dispatchToastMessage } from '../../lib/toast';
-import { messageArgs } from '../../lib/utils/messageArgs';
 
 Meteor.startup(() => {
 	MessageAction.addButton({
@@ -15,9 +14,7 @@ Meteor.startup(() => {
 		label: 'Star',
 		type: 'interaction',
 		context: ['starred', 'message', 'message-mobile', 'threads', 'federated', 'videoconf', 'videoconf-threads'],
-		async action(_, props) {
-			const { message = messageArgs(this).msg } = props;
-
+		async action(_, { message }) {
 			try {
 				await sdk.call('starMessage', { ...message, starred: true });
 				queryClient.invalidateQueries(['rooms', message.rid, 'starred-messages']);
diff --git a/apps/meteor/client/startup/actionButtons/unpinMessage.ts b/apps/meteor/client/startup/actionButtons/unpinMessage.ts
index f5803f480a79..aa5fa49bb48e 100644
--- a/apps/meteor/client/startup/actionButtons/unpinMessage.ts
+++ b/apps/meteor/client/startup/actionButtons/unpinMessage.ts
@@ -6,7 +6,6 @@ import { MessageAction } from '../../../app/ui-utils/client';
 import { sdk } from '../../../app/utils/client/lib/SDKClient';
 import { queryClient } from '../../lib/queryClient';
 import { dispatchToastMessage } from '../../lib/toast';
-import { messageArgs } from '../../lib/utils/messageArgs';
 
 Meteor.startup(() => {
 	MessageAction.addButton({
@@ -15,8 +14,7 @@ Meteor.startup(() => {
 		label: 'Unpin',
 		type: 'interaction',
 		context: ['pinned', 'message', 'message-mobile', 'threads', 'direct', 'videoconf', 'videoconf-threads'],
-		async action(_, props) {
-			const { message = messageArgs(this).msg } = props;
+		async action(_, { message }) {
 			message.pinned = false;
 			try {
 				await sdk.call('unpinMessage', message);
diff --git a/apps/meteor/client/startup/actionButtons/unstarMessage.ts b/apps/meteor/client/startup/actionButtons/unstarMessage.ts
index e5835b61fd8f..af33492a689a 100644
--- a/apps/meteor/client/startup/actionButtons/unstarMessage.ts
+++ b/apps/meteor/client/startup/actionButtons/unstarMessage.ts
@@ -5,7 +5,6 @@ import { MessageAction } from '../../../app/ui-utils/client';
 import { sdk } from '../../../app/utils/client/lib/SDKClient';
 import { queryClient } from '../../lib/queryClient';
 import { dispatchToastMessage } from '../../lib/toast';
-import { messageArgs } from '../../lib/utils/messageArgs';
 
 Meteor.startup(() => {
 	MessageAction.addButton({
@@ -14,9 +13,7 @@ Meteor.startup(() => {
 		label: 'Unstar_Message',
 		type: 'interaction',
 		context: ['starred', 'message', 'message-mobile', 'threads', 'federated', 'videoconf', 'videoconf-threads'],
-		async action(_, props) {
-			const { message = messageArgs(this).msg } = props;
-
+		async action(_, { message }) {
 			try {
 				await sdk.call('starMessage', { ...message, starred: false });
 				queryClient.invalidateQueries(['rooms', message.rid, 'starred-messages']);
diff --git a/apps/meteor/client/startup/collections.ts b/apps/meteor/client/startup/collections.ts
deleted file mode 100644
index 304047fd9c1d..000000000000
--- a/apps/meteor/client/startup/collections.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Meteor } from 'meteor/meteor';
-import { Tracker } from 'meteor/tracker';
-
-import { CachedChatRoom, CachedChatSubscription } from '../../app/models/client';
-import { settings } from '../../app/settings/client';
-
-Meteor.startup(() => {
-	Tracker.autorun(() => {
-		if (!Meteor.userId() && settings.get('Accounts_AllowAnonymousRead') === true) {
-			CachedChatRoom.init();
-			CachedChatSubscription.ready.set(true);
-		}
-	});
-});
diff --git a/apps/meteor/client/startup/e2e.ts b/apps/meteor/client/startup/e2e.ts
index e45b62563726..3f439d99a696 100644
--- a/apps/meteor/client/startup/e2e.ts
+++ b/apps/meteor/client/startup/e2e.ts
@@ -6,7 +6,7 @@ import { Tracker } from 'meteor/tracker';
 import { E2EEState } from '../../app/e2e/client/E2EEState';
 import { e2e } from '../../app/e2e/client/rocketchat.e2e';
 import { MentionsParser } from '../../app/mentions/lib/MentionsParser';
-import { ChatRoom } from '../../app/models/client';
+import { Rooms } from '../../app/models/client';
 import { settings } from '../../app/settings/client';
 import { onClientBeforeSendMessage } from '../lib/onClientBeforeSendMessage';
 import { onClientMessageReceived } from '../lib/onClientMessageReceived';
@@ -79,7 +79,7 @@ Meteor.startup(() => {
 				return message;
 			}
 
-			const subscription = await waitUntilFind(() => ChatRoom.findOne({ _id: message.rid }));
+			const subscription = await waitUntilFind(() => Rooms.findOne({ _id: message.rid }));
 
 			subscription.encrypted ? e2eRoom.resume() : e2eRoom.pause();
 
diff --git a/apps/meteor/client/startup/iframeCommands.ts b/apps/meteor/client/startup/iframeCommands.ts
index f0db83ccdcbf..5184de9c6942 100644
--- a/apps/meteor/client/startup/iframeCommands.ts
+++ b/apps/meteor/client/startup/iframeCommands.ts
@@ -19,10 +19,13 @@ const commands = {
 		}
 		const newUrl = new URL(`${rtrim(baseURI, '/')}/${ltrim(data.path, '/')}`);
 
-		const newParams = Array.from(newUrl.searchParams.entries()).reduce((ret, [key, value]) => {
-			ret[key] = value;
-			return ret;
-		}, {} as Record<string, string>);
+		const newParams = Array.from(newUrl.searchParams.entries()).reduce(
+			(ret, [key, value]) => {
+				ret[key] = value;
+				return ret;
+			},
+			{} as Record<string, string>,
+		);
 
 		const newPath = newUrl.pathname.replace(
 			new RegExp(`^${escapeRegExp(__meteor_runtime_config__.ROOT_URL_PATH_PREFIX)}`),
diff --git a/apps/meteor/client/startup/incomingMessages.ts b/apps/meteor/client/startup/incomingMessages.ts
index e9659cc24724..8f4149e9de94 100644
--- a/apps/meteor/client/startup/incomingMessages.ts
+++ b/apps/meteor/client/startup/incomingMessages.ts
@@ -1,29 +1,25 @@
 import type { IMessage } from '@rocket.chat/core-typings';
 import { Meteor } from 'meteor/meteor';
 
-import { ChatMessage } from '../../app/models/client';
-import { CachedCollectionManager } from '../../app/ui-cached-collection/client';
+import { Messages } from '../../app/models/client';
 import { sdk } from '../../app/utils/client/lib/SDKClient';
+import { onLoggedIn } from '../lib/loggedIn';
 
 Meteor.startup(() => {
-	Tracker.autorun(() => {
-		if (!Meteor.userId()) {
-			return;
-		}
-
+	onLoggedIn(() => {
 		// Only event I found triggers this is from ephemeral messages
 		// Other types of messages come from another stream
-		sdk.stream('notify-user', [`${Meteor.userId()}/message`], (msg: IMessage) => {
+		return sdk.stream('notify-user', [`${Meteor.userId()}/message`], (msg: IMessage) => {
 			msg.u = msg.u || { username: 'rocket.cat' };
 			msg.private = true;
 
-			return ChatMessage.upsert({ _id: msg._id }, msg);
+			return Messages.upsert({ _id: msg._id }, msg);
 		});
 	});
 
-	CachedCollectionManager.onLogin(() => {
-		sdk.stream('notify-user', [`${Meteor.userId()}/subscriptions-changed`], (_action, sub) => {
-			ChatMessage.update(
+	onLoggedIn(() => {
+		return sdk.stream('notify-user', [`${Meteor.userId()}/subscriptions-changed`], (_action, sub) => {
+			Messages.update(
 				{
 					rid: sub.rid,
 					...('ignored' in sub && sub.ignored ? { 'u._id': { $nin: sub.ignored } } : { ignored: { $exists: true } }),
@@ -32,7 +28,7 @@ Meteor.startup(() => {
 				{ multi: true },
 			);
 			if ('ignored' in sub && sub.ignored) {
-				ChatMessage.update(
+				Messages.update(
 					{ 'rid': sub.rid, 't': { $ne: 'command' }, 'u._id': { $in: sub.ignored } },
 					{ $set: { ignored: true } },
 					{ multi: true },
diff --git a/apps/meteor/client/startup/index.ts b/apps/meteor/client/startup/index.ts
index e2264d795415..569b11bf1c18 100644
--- a/apps/meteor/client/startup/index.ts
+++ b/apps/meteor/client/startup/index.ts
@@ -5,7 +5,6 @@ import './afterLogoutCleanUp';
 import './appRoot';
 import './audit';
 import './callbacks';
-import './collections';
 import './customOAuth';
 import './deviceManagement';
 import './e2e';
diff --git a/apps/meteor/client/startup/loadMissedMessages.ts b/apps/meteor/client/startup/loadMissedMessages.ts
index e56dc5e83add..37bd437d8af2 100644
--- a/apps/meteor/client/startup/loadMissedMessages.ts
+++ b/apps/meteor/client/startup/loadMissedMessages.ts
@@ -2,12 +2,12 @@ import type { IRoom } from '@rocket.chat/core-typings';
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 
-import { ChatMessage, ChatSubscription } from '../../app/models/client';
+import { Messages, Subscriptions } from '../../app/models/client';
 import { LegacyRoomManager, upsertMessage } from '../../app/ui-utils/client';
 import { callWithErrorHandling } from '../lib/utils/callWithErrorHandling';
 
 const loadMissedMessages = async function (rid: IRoom['_id']): Promise<void> {
-	const lastMessage = ChatMessage.findOne({ rid, _hidden: { $ne: true }, temp: { $exists: false } }, { sort: { ts: -1 }, limit: 1 });
+	const lastMessage = Messages.findOne({ rid, _hidden: { $ne: true }, temp: { $exists: false } }, { sort: { ts: -1 }, limit: 1 });
 
 	if (!lastMessage) {
 		return;
@@ -16,7 +16,7 @@ const loadMissedMessages = async function (rid: IRoom['_id']): Promise<void> {
 	try {
 		const result = await callWithErrorHandling('loadMissedMessages', rid, lastMessage.ts);
 		if (result) {
-			const subscription = ChatSubscription.findOne({ rid });
+			const subscription = Subscriptions.findOne({ rid });
 			await Promise.all(Array.from(result).map((msg) => upsertMessage({ msg, subscription })));
 		}
 	} catch (error) {
diff --git a/apps/meteor/client/startup/messageObserve.ts b/apps/meteor/client/startup/messageObserve.ts
index 60e730c94276..760c8b76e5c6 100644
--- a/apps/meteor/client/startup/messageObserve.ts
+++ b/apps/meteor/client/startup/messageObserve.ts
@@ -1,23 +1,23 @@
 import { Meteor } from 'meteor/meteor';
 
-import { ChatMessage } from '../../app/models/client';
+import { Messages } from '../../app/models/client';
 import { LegacyRoomManager } from '../../app/ui-utils/client';
 
 Meteor.startup(() => {
-	ChatMessage.find().observe({
+	Messages.find().observe({
 		removed(record) {
 			if (!LegacyRoomManager.getOpenedRoomByRid(record.rid)) {
 				return;
 			}
 
-			const recordBefore = ChatMessage.findOne({ ts: { $lt: record.ts } }, { sort: { ts: -1 } });
+			const recordBefore = Messages.findOne({ ts: { $lt: record.ts } }, { sort: { ts: -1 } });
 			if (recordBefore) {
-				ChatMessage.update({ _id: recordBefore._id }, { $set: { tick: new Date() } });
+				Messages.update({ _id: recordBefore._id }, { $set: { tick: new Date() } });
 			}
 
-			const recordAfter = ChatMessage.findOne({ ts: { $gt: record.ts } }, { sort: { ts: 1 } });
+			const recordAfter = Messages.findOne({ ts: { $gt: record.ts } }, { sort: { ts: 1 } });
 			if (recordAfter) {
-				return ChatMessage.update({ _id: recordAfter._id }, { $set: { tick: new Date() } });
+				return Messages.update({ _id: recordAfter._id }, { $set: { tick: new Date() } });
 			}
 		},
 	});
diff --git a/apps/meteor/client/startup/notifications/konchatNotifications.ts b/apps/meteor/client/startup/notifications/konchatNotifications.ts
index 3d5f26cae547..494e6ab08d5b 100644
--- a/apps/meteor/client/startup/notifications/konchatNotifications.ts
+++ b/apps/meteor/client/startup/notifications/konchatNotifications.ts
@@ -1,49 +1,15 @@
-import type { AtLeast, ISubscription, IUser, ICalendarNotification } from '@rocket.chat/core-typings';
+import type { IUser, ICalendarNotification } from '@rocket.chat/core-typings';
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 import { lazy } from 'react';
 
-import { CachedChatSubscription } from '../../../app/models/client';
 import { settings } from '../../../app/settings/client';
-import { KonchatNotification } from '../../../app/ui/client/lib/KonchatNotification';
 import { getUserPreference } from '../../../app/utils/client';
 import { sdk } from '../../../app/utils/client/lib/SDKClient';
-import { RoomManager } from '../../lib/RoomManager';
 import { imperativeModal } from '../../lib/imperativeModal';
-import { fireGlobalEvent } from '../../lib/utils/fireGlobalEvent';
-import { isLayoutEmbedded } from '../../lib/utils/isLayoutEmbedded';
-import { router } from '../../providers/RouterProvider';
 
 const OutlookCalendarEventModal = lazy(() => import('../../views/outlookCalendar/OutlookCalendarEventModal'));
 
-const notifyNewRoom = async (sub: AtLeast<ISubscription, 'rid'>): Promise<void> => {
-	const user = Meteor.user() as IUser | null;
-	if (!user || user.status === 'busy') {
-		return;
-	}
-
-	if ((!router.getRouteParameters().name || router.getRouteParameters().name !== sub.name) && !sub.ls && sub.alert === true) {
-		KonchatNotification.newRoom(sub.rid);
-	}
-};
-
-function notifyNewMessageAudio(rid?: string): void {
-	// This logic is duplicated in /client/startup/unread.coffee.
-	const hasFocus = document.hasFocus();
-	const messageIsInOpenedRoom = RoomManager.opened === rid;
-	const muteFocusedConversations = getUserPreference(Meteor.userId(), 'muteFocusedConversations');
-
-	if (isLayoutEmbedded()) {
-		if (!hasFocus && messageIsInOpenedRoom) {
-			// Play a notification sound
-			void KonchatNotification.newMessage(rid);
-		}
-	} else if (!hasFocus || !messageIsInOpenedRoom || !muteFocusedConversations) {
-		// Play a notification sound
-		void KonchatNotification.newMessage(rid);
-	}
-}
-
 Meteor.startup(() => {
 	const notifyUserCalendar = async function (notification: ICalendarNotification): Promise<void> {
 		const user = Meteor.user() as IUser | null;
@@ -69,6 +35,7 @@ Meteor.startup(() => {
 			});
 		};
 	};
+
 	Tracker.autorun(() => {
 		if (!Meteor.userId() || !settings.get('Outlook_Calendar_Enabled')) {
 			sdk.stop('notify-user', `${Meteor.userId()}/calendar`);
@@ -77,47 +44,4 @@ Meteor.startup(() => {
 
 		sdk.stream('notify-user', [`${Meteor.userId()}/calendar`], notifyUserCalendar);
 	});
-
-	Tracker.autorun(() => {
-		if (!Meteor.userId()) {
-			return;
-		}
-
-		sdk.stream('notify-user', [`${Meteor.userId()}/notification`], (notification) => {
-			const openedRoomId = ['channel', 'group', 'direct'].includes(router.getRouteName()!) ? RoomManager.opened : undefined;
-
-			// This logic is duplicated in /client/startup/unread.coffee.
-			const hasFocus = document.hasFocus();
-			const messageIsInOpenedRoom = openedRoomId === notification.payload.rid;
-
-			fireGlobalEvent('notification', {
-				notification,
-				fromOpenedRoom: messageIsInOpenedRoom,
-				hasFocus,
-			});
-
-			if (isLayoutEmbedded()) {
-				if (!hasFocus && messageIsInOpenedRoom) {
-					// Show a notification.
-					KonchatNotification.showDesktop(notification);
-				}
-			} else if (!hasFocus || !messageIsInOpenedRoom) {
-				// Show a notification.
-				KonchatNotification.showDesktop(notification);
-			}
-
-			notifyNewMessageAudio(notification.payload.rid);
-		});
-
-		CachedChatSubscription.on('changed', (sub): void => {
-			void notifyNewRoom(sub);
-		});
-
-		sdk.stream('notify-user', [`${Meteor.userId()}/subscriptions-changed`], (action, sub) => {
-			if (action === 'removed') {
-				return;
-			}
-			void notifyNewRoom(sub);
-		});
-	});
 });
diff --git a/apps/meteor/client/startup/notifications/notification.ts b/apps/meteor/client/startup/notifications/notification.ts
index d35297bd7772..31ba20da0060 100644
--- a/apps/meteor/client/startup/notifications/notification.ts
+++ b/apps/meteor/client/startup/notifications/notification.ts
@@ -5,6 +5,7 @@ import { Tracker } from 'meteor/tracker';
 import { CustomSounds } from '../../../app/custom-sounds/client/lib/CustomSounds';
 import { Users } from '../../../app/models/client';
 import { getUserPreference } from '../../../app/utils/client';
+import { getUserNotificationsSoundVolume } from '../../../app/utils/client/getUserNotificationsSoundVolume';
 
 Meteor.startup(() => {
 	Tracker.autorun(() => {
@@ -21,7 +22,7 @@ Meteor.startup(() => {
 			},
 		});
 		const newRoomNotification = getUserPreference<string>(user, 'newRoomNotification');
-		const audioVolume = getUserPreference(user, 'notificationsSoundVolume', 100);
+		const audioVolume = getUserNotificationsSoundVolume(user?._id);
 
 		if (!newRoomNotification) {
 			return;
diff --git a/apps/meteor/client/startup/readReceipt.ts b/apps/meteor/client/startup/readReceipt.ts
index 36eb50b6bcbd..5998ea3e6c52 100644
--- a/apps/meteor/client/startup/readReceipt.ts
+++ b/apps/meteor/client/startup/readReceipt.ts
@@ -4,7 +4,6 @@ import { Tracker } from 'meteor/tracker';
 import { settings } from '../../app/settings/client';
 import { MessageAction } from '../../app/ui-utils/client';
 import { imperativeModal } from '../lib/imperativeModal';
-import { messageArgs } from '../lib/utils/messageArgs';
 import ReadReceiptsModal from '../views/room/modals/ReadReceiptsModal';
 
 Meteor.startup(() => {
@@ -21,8 +20,7 @@ Meteor.startup(() => {
 			label: 'Read_Receipts',
 			context: ['starred', 'message', 'message-mobile', 'threads', 'videoconf', 'videoconf-threads'],
 			type: 'duplication',
-			action(_, props) {
-				const { message = messageArgs(this).msg } = props;
+			action(_, { message }) {
 				imperativeModal.open({
 					component: ReadReceiptsModal,
 					props: { messageId: message._id, onClose: imperativeModal.close },
diff --git a/apps/meteor/client/startup/roles.ts b/apps/meteor/client/startup/roles.ts
index 4c54682ecded..ebccaa8d81b3 100644
--- a/apps/meteor/client/startup/roles.ts
+++ b/apps/meteor/client/startup/roles.ts
@@ -3,11 +3,11 @@ import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 
 import { Roles } from '../../app/models/client';
-import { CachedCollectionManager } from '../../app/ui-cached-collection/client';
 import { sdk } from '../../app/utils/client/lib/SDKClient';
+import { onLoggedIn } from '../lib/loggedIn';
 
 Meteor.startup(() => {
-	CachedCollectionManager.onLogin(async () => {
+	onLoggedIn(async () => {
 		const { roles } = await sdk.rest.get('/v1/roles.list');
 		// if a role is checked before this collection is populated, it will return undefined
 		Roles._collection._docs._map = new Map(roles.map((record) => [Roles._collection._docs._idStringify(record._id), record]));
diff --git a/apps/meteor/client/startup/routes.tsx b/apps/meteor/client/startup/routes.tsx
index 5b204a7cf18e..e25a6795da53 100644
--- a/apps/meteor/client/startup/routes.tsx
+++ b/apps/meteor/client/startup/routes.tsx
@@ -8,7 +8,7 @@ const IndexRoute = lazy(() => import('../views/root/IndexRoute'));
 const MeetRoute = lazy(() => import('../views/meet/MeetRoute'));
 const HomePage = lazy(() => import('../views/home/HomePage'));
 const DirectoryPage = lazy(() => import('../views/directory'));
-const OmnichannelDirectoryPage = lazy(() => import('../views/omnichannel/directory/OmnichannelDirectoryPage'));
+const OmnichannelDirectoryRouter = lazy(() => import('../views/omnichannel/directory/OmnichannelDirectoryRouter'));
 const OmnichannelQueueList = lazy(() => import('../views/omnichannel/queueList'));
 const CMSPage = lazy(() => import('@rocket.chat/web-ui-registration').then(({ CMSPage }) => ({ default: CMSPage })));
 const SecretURLPage = lazy(() => import('../views/invite/SecretURLPage'));
@@ -48,10 +48,8 @@ declare module '@rocket.chat/ui-contexts' {
 			pattern: '/directory/:tab?';
 		};
 		'omnichannel-directory': {
-			pathname: `/omnichannel-directory${`/${string}` | ''}${`/${string}` | ''}${`/${string}` | ''}${`/${string}` | ''}${
-				| `/${string}`
-				| ''}`;
-			pattern: '/omnichannel-directory/:page?/:bar?/:id?/:tab?/:context?';
+			pathname: `/omnichannel-directory${`/${string}` | ''}${`/${string}` | ''}${`/${string}` | ''}`;
+			pattern: '/omnichannel-directory/:tab?/:context?/:id?/';
 		};
 		'livechat-queue': {
 			pathname: '/livechat-queue';
@@ -153,11 +151,11 @@ router.defineRoutes([
 		),
 	},
 	{
-		path: '/omnichannel-directory/:page?/:bar?/:id?/:tab?/:context?',
+		path: '/omnichannel-directory/:tab?/:context?/:id?/',
 		id: 'omnichannel-directory',
 		element: appLayout.wrap(
 			<MainLayout>
-				<OmnichannelDirectoryPage />
+				<OmnichannelDirectoryRouter />
 			</MainLayout>,
 		),
 	},
diff --git a/apps/meteor/client/startup/unread.ts b/apps/meteor/client/startup/unread.ts
index d9c2a35efab5..edc48fbf894b 100644
--- a/apps/meteor/client/startup/unread.ts
+++ b/apps/meteor/client/startup/unread.ts
@@ -4,12 +4,12 @@ import { Meteor } from 'meteor/meteor';
 import { Session } from 'meteor/session';
 import { Tracker } from 'meteor/tracker';
 
-import { ChatSubscription, ChatRoom } from '../../app/models/client';
+import { Subscriptions, Rooms } from '../../app/models/client';
 import { getUserPreference } from '../../app/utils/client';
 import { fireGlobalEvent } from '../lib/utils/fireGlobalEvent';
 
 const fetchSubscriptions = (): ISubscription[] =>
-	ChatSubscription.find(
+	Subscriptions.find(
 		{
 			open: true,
 			hideUnreadStatus: { $ne: true },
@@ -39,7 +39,7 @@ Meteor.startup(() => {
 		const unreadCount = fetchSubscriptions().reduce(
 			(ret, subscription) =>
 				Tracker.nonreactive(() => {
-					const room = ChatRoom.findOne({ _id: subscription.rid }, { fields: { usersCount: 1 } });
+					const room = Rooms.findOne({ _id: subscription.rid }, { fields: { usersCount: 1 } });
 					fireGlobalEvent('unread-changed-by-subscription', {
 						...subscription,
 						usersCount: room?.usersCount,
diff --git a/apps/meteor/client/startup/userRoles.ts b/apps/meteor/client/startup/userRoles.ts
index 77ba6978d485..1359dfa4d423 100644
--- a/apps/meteor/client/startup/userRoles.ts
+++ b/apps/meteor/client/startup/userRoles.ts
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 
-import { UserRoles, ChatMessage } from '../../app/models/client';
+import { UserRoles, Messages } from '../../app/models/client';
 import { sdk } from '../../app/utils/client/lib/SDKClient';
 import { dispatchToastMessage } from '../lib/toast';
 
@@ -26,7 +26,7 @@ Meteor.startup(() => {
 							return;
 						}
 						UserRoles.upsert({ _id: role.u._id }, { $addToSet: { roles: role._id }, $set: { username: role.u.username } });
-						ChatMessage.update({ 'u._id': role.u._id }, { $addToSet: { roles: role._id } }, { multi: true });
+						Messages.update({ 'u._id': role.u._id }, { $addToSet: { roles: role._id } }, { multi: true });
 					}
 
 					return;
@@ -38,14 +38,14 @@ Meteor.startup(() => {
 							return;
 						}
 						UserRoles.update({ _id: role.u._id }, { $pull: { roles: role._id } });
-						ChatMessage.update({ 'u._id': role.u._id }, { $pull: { roles: role._id } }, { multi: true });
+						Messages.update({ 'u._id': role.u._id }, { $pull: { roles: role._id } }, { multi: true });
 					}
 
 					return;
 				}
 
 				if (role.type === 'changed') {
-					ChatMessage.update({ roles: role._id }, { $inc: { rerender: 1 } }, { multi: true });
+					Messages.update({ roles: role._id }, { $inc: { rerender: 1 } }, { multi: true });
 				}
 			});
 		}
diff --git a/apps/meteor/client/stories/contexts/ModalContextMock.tsx b/apps/meteor/client/stories/contexts/ModalContextMock.tsx
index ac1d303b2317..5dfa76613e8d 100644
--- a/apps/meteor/client/stories/contexts/ModalContextMock.tsx
+++ b/apps/meteor/client/stories/contexts/ModalContextMock.tsx
@@ -23,7 +23,7 @@ const ModalContextMock = ({ children }: ModalContextMockProps): ReactElement =>
 							},
 						},
 						currentModal: context.currentModal,
-				  }
+					}
 				: undefined,
 		[context],
 	);
diff --git a/apps/meteor/client/stories/contexts/ServerContextMock.tsx b/apps/meteor/client/stories/contexts/ServerContextMock.tsx
index 89ded6b19037..8ae8c0047378 100644
--- a/apps/meteor/client/stories/contexts/ServerContextMock.tsx
+++ b/apps/meteor/client/stories/contexts/ServerContextMock.tsx
@@ -45,7 +45,7 @@ type Operations = {
 							fn: (
 								params: void extends OperationParams<TMethod, TPathPattern> ? void : OperationParams<TMethod, TPathPattern>,
 							) => Promise<void extends OperationResult<TMethod, TPathPattern> ? Serialized<OperationResult<TMethod, TPathPattern>> : void>;
-					  }
+						}
 					: never
 				: never
 			: never
diff --git a/apps/meteor/client/ui.ts b/apps/meteor/client/ui.ts
index 922b605a2b40..f5e55d64833b 100644
--- a/apps/meteor/client/ui.ts
+++ b/apps/meteor/client/ui.ts
@@ -9,7 +9,6 @@ import { useCallsRoomAction } from './hooks/roomActions/useCallsRoomAction';
 import { useCannedResponsesRoomAction } from './hooks/roomActions/useCannedResponsesRoomAction';
 import { useChannelSettingsRoomAction } from './hooks/roomActions/useChannelSettingsRoomAction';
 import { useCleanHistoryRoomAction } from './hooks/roomActions/useCleanHistoryRoomAction';
-import { useContactChatHistoryRoomAction } from './hooks/roomActions/useContactChatHistoryRoomAction';
 import { useContactProfileRoomAction } from './hooks/roomActions/useContactProfileRoomAction';
 import { useDiscussionsRoomAction } from './hooks/roomActions/useDiscussionsRoomAction';
 import { useE2EERoomAction } from './hooks/roomActions/useE2EERoomAction';
@@ -48,7 +47,6 @@ export const roomActionHooks = [
 	useCallsRoomAction,
 	useCannedResponsesRoomAction,
 	useCleanHistoryRoomAction,
-	useContactChatHistoryRoomAction,
 	useContactProfileRoomAction,
 	useDiscussionsRoomAction,
 	useE2EERoomAction,
diff --git a/apps/meteor/client/uikit/hooks/useContextualBarContextValue.ts b/apps/meteor/client/uikit/hooks/useContextualBarContextValue.ts
index 1be1affad71f..10906deab703 100644
--- a/apps/meteor/client/uikit/hooks/useContextualBarContextValue.ts
+++ b/apps/meteor/client/uikit/hooks/useContextualBarContextValue.ts
@@ -1,8 +1,8 @@
 import { useDebouncedCallback } from '@rocket.chat/fuselage-hooks';
 import type { UiKitContext } from '@rocket.chat/fuselage-ui-kit';
 import type * as UiKit from '@rocket.chat/ui-kit';
-import type { Dispatch } from 'react';
-import { useMemo, type ContextType } from 'react';
+import { useMemo } from 'react';
+import type { Dispatch, ContextType } from 'react';
 
 import { useUiKitActionManager } from './useUiKitActionManager';
 
diff --git a/apps/meteor/client/uikit/hooks/useMessageBlockContextValue.ts b/apps/meteor/client/uikit/hooks/useMessageBlockContextValue.ts
index 2f8fb4933628..caf869ba39d7 100644
--- a/apps/meteor/client/uikit/hooks/useMessageBlockContextValue.ts
+++ b/apps/meteor/client/uikit/hooks/useMessageBlockContextValue.ts
@@ -3,6 +3,7 @@ import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import type { UiKitContext } from '@rocket.chat/fuselage-ui-kit';
 import type { ContextType } from 'react';
 
+import { useUiKitActionManager } from './useUiKitActionManager';
 import {
 	useVideoConfDispatchOutgoing,
 	useVideoConfIsCalling,
@@ -12,7 +13,6 @@ import {
 	useVideoConfSetPreferences,
 } from '../../contexts/VideoConfContext';
 import { useVideoConfWarning } from '../../views/room/contextualBar/VideoConference/hooks/useVideoConfWarning';
-import { useUiKitActionManager } from './useUiKitActionManager';
 
 export const useMessageBlockContextValue = (rid: IRoom['_id'], mid: IMessage['_id']): ContextType<typeof UiKitContext> => {
 	const joinCall = useVideoConfJoinCall();
diff --git a/apps/meteor/client/uikit/hooks/useModalContextValue.ts b/apps/meteor/client/uikit/hooks/useModalContextValue.ts
index 4a0932c8e1e7..8e159805c738 100644
--- a/apps/meteor/client/uikit/hooks/useModalContextValue.ts
+++ b/apps/meteor/client/uikit/hooks/useModalContextValue.ts
@@ -1,8 +1,8 @@
 import { useDebouncedCallback } from '@rocket.chat/fuselage-hooks';
 import type { UiKitContext } from '@rocket.chat/fuselage-ui-kit';
 import type * as UiKit from '@rocket.chat/ui-kit';
-import type { Dispatch } from 'react';
-import { useMemo, type ContextType } from 'react';
+import { useMemo } from 'react';
+import type { Dispatch, ContextType } from 'react';
 
 import { useUiKitActionManager } from './useUiKitActionManager';
 
diff --git a/apps/meteor/client/views/account/AccountRouter.tsx b/apps/meteor/client/views/account/AccountRouter.tsx
index 8196a877f98c..a59babe1a08d 100644
--- a/apps/meteor/client/views/account/AccountRouter.tsx
+++ b/apps/meteor/client/views/account/AccountRouter.tsx
@@ -2,9 +2,9 @@ import { useRouter } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ReactNode } from 'react';
 import React, { Suspense, useEffect } from 'react';
 
+import AccountSidebar from './AccountSidebar';
 import PageSkeleton from '../../components/PageSkeleton';
 import SidebarPortal from '../../sidebar/SidebarPortal';
-import AccountSidebar from './AccountSidebar';
 
 type AccountRouterProps = {
 	children?: ReactNode;
diff --git a/apps/meteor/client/views/account/AccountSidebar.tsx b/apps/meteor/client/views/account/AccountSidebar.tsx
index 27fa374a69d3..b1d87945ea5e 100644
--- a/apps/meteor/client/views/account/AccountSidebar.tsx
+++ b/apps/meteor/client/views/account/AccountSidebar.tsx
@@ -2,9 +2,9 @@ import { useCurrentRoutePath, useTranslation, useLayout } from '@rocket.chat/ui-
 import React, { memo } from 'react';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
 
+import { getAccountSidebarItems, subscribeToAccountSidebarItems } from './sidebarItems';
 import Sidebar from '../../components/Sidebar';
 import SettingsProvider from '../../providers/SettingsProvider';
-import { getAccountSidebarItems, subscribeToAccountSidebarItems } from './sidebarItems';
 
 const AccountSidebar = () => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/account/accessibility/AccessibilityPage.tsx b/apps/meteor/client/views/account/accessibility/AccessibilityPage.tsx
index 9bb4e57317cf..f4f67552ddc2 100644
--- a/apps/meteor/client/views/account/accessibility/AccessibilityPage.tsx
+++ b/apps/meteor/client/views/account/accessibility/AccessibilityPage.tsx
@@ -22,13 +22,13 @@ import { useMutation } from '@tanstack/react-query';
 import React, { useMemo } from 'react';
 import { Controller, useForm } from 'react-hook-form';
 
-import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../../components/Page';
-import { getDirtyFields } from '../../../lib/getDirtyFields';
 import { fontSizes } from './fontSizes';
 import type { AccessibilityPreferencesData } from './hooks/useAcessibilityPreferencesValues';
 import { useAccessiblityPreferencesValues } from './hooks/useAcessibilityPreferencesValues';
 import { useCreateFontStyleElement } from './hooks/useCreateFontStyleElement';
 import { themeItems as themes } from './themeItems';
+import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../../components/Page';
+import { getDirtyFields } from '../../../lib/getDirtyFields';
 
 const AccessibilityPage = () => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountPage.tsx b/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountPage.tsx
index d1af15f59711..f98e6608a5b7 100644
--- a/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountPage.tsx
+++ b/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountPage.tsx
@@ -2,8 +2,8 @@ import type { ReactElement } from 'react';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { Page, PageHeader, PageContent } from '../../../components/Page';
 import DeviceManagementAccountTable from './DeviceManagementAccountTable';
+import { Page, PageHeader, PageContent } from '../../../components/Page';
 
 const DeviceManagementAccountPage = (): ReactElement => {
 	const { t } = useTranslation();
diff --git a/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountTable.tsx b/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountTable.tsx
index 411f9ad02e6f..351021a9ab92 100644
--- a/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountTable.tsx
+++ b/apps/meteor/client/views/account/deviceManagement/DeviceManagementAccountTable/DeviceManagementAccountTable.tsx
@@ -3,12 +3,12 @@ import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import DeviceManagementAccountRow from './DeviceManagementAccountRow';
 import { GenericTableHeaderCell } from '../../../../components/GenericTable';
 import { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
 import { useSort } from '../../../../components/GenericTable/hooks/useSort';
 import DeviceManagementTable from '../../../../components/deviceManagement/DeviceManagementTable';
 import { useEndpointData } from '../../../../hooks/useEndpointData';
-import DeviceManagementAccountRow from './DeviceManagementAccountRow';
 
 const sortMapping = {
 	client: 'device.name',
diff --git a/apps/meteor/client/views/account/integrations/AccountIntegrationsPage.tsx b/apps/meteor/client/views/account/integrations/AccountIntegrationsPage.tsx
index ce9fad8591fa..9a13328cc6e9 100644
--- a/apps/meteor/client/views/account/integrations/AccountIntegrationsPage.tsx
+++ b/apps/meteor/client/views/account/integrations/AccountIntegrationsPage.tsx
@@ -1,14 +1,15 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { SelectLegacy, Box, Button, Field, FieldLabel, FieldRow, FieldError } from '@rocket.chat/fuselage';
 import { useEffectEvent, useUniqueId } from '@rocket.chat/fuselage-hooks';
-import { useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
 import { useForm, Controller } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
+import { useRemoveWebDAVAccountIntegrationMutation } from './hooks/useRemoveWebDAVAccountIntegrationMutation';
 import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page';
 import { useWebDAVAccountIntegrationsQuery } from '../../../hooks/webdav/useWebDAVAccountIntegrationsQuery';
 import { getWebdavServerName } from '../../../lib/getWebdavServerName';
-import { useRemoveWebDAVAccountIntegrationMutation } from './hooks/useRemoveWebDAVAccountIntegrationMutation';
 
 const AccountIntegrationsPage = () => {
 	const { data: webdavAccountIntegrations } = useWebDAVAccountIntegrationsQuery();
@@ -25,7 +26,7 @@ const AccountIntegrationsPage = () => {
 	);
 
 	const dispatchToastMessage = useToastMessageDispatch();
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const removeMutation = useRemoveWebDAVAccountIntegrationMutation({
 		onSuccess: () => {
diff --git a/apps/meteor/client/views/account/integrations/AccountIntegrationsRoute.tsx b/apps/meteor/client/views/account/integrations/AccountIntegrationsRoute.tsx
index 00121c688345..fa0161b06125 100644
--- a/apps/meteor/client/views/account/integrations/AccountIntegrationsRoute.tsx
+++ b/apps/meteor/client/views/account/integrations/AccountIntegrationsRoute.tsx
@@ -2,11 +2,11 @@ import { useSetting } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import AccountIntegrationsPage from './AccountIntegrationsPage';
+import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 
 const AccountIntegrationsRoute = (): ReactElement => {
-	const webdavEnabled = useSetting<boolean>('Webdav_Integration_Enabled', false);
+	const webdavEnabled = useSetting('Webdav_Integration_Enabled', false);
 
 	if (!webdavEnabled) {
 		return <NotAuthorizedPage />;
diff --git a/apps/meteor/client/views/account/omnichannel/OmnichannelPreferencesPage.tsx b/apps/meteor/client/views/account/omnichannel/OmnichannelPreferencesPage.tsx
index 8489b3cb4b8b..ddf549bd98c6 100644
--- a/apps/meteor/client/views/account/omnichannel/OmnichannelPreferencesPage.tsx
+++ b/apps/meteor/client/views/account/omnichannel/OmnichannelPreferencesPage.tsx
@@ -4,9 +4,9 @@ import type { ReactElement } from 'react';
 import React from 'react';
 import { useForm, FormProvider } from 'react-hook-form';
 
-import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../../components/Page';
 import PreferencesConversationTranscript from './PreferencesConversationTranscript';
 import { PreferencesGeneral } from './PreferencesGeneral';
+import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../../components/Page';
 
 type FormData = {
 	omnichannelTranscriptPDF: boolean;
@@ -17,7 +17,7 @@ const OmnichannelPreferencesPage = (): ReactElement => {
 	const t = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 
-	const alwaysSendEmailTranscript = useSetting<boolean>('Livechat_transcript_send_always');
+	const alwaysSendEmailTranscript = useSetting('Livechat_transcript_send_always', false);
 	const omnichannelTranscriptPDF = useUserPreference<boolean>('omnichannelTranscriptPDF') ?? false;
 	const omnichannelTranscriptEmail = useUserPreference<boolean>('omnichannelTranscriptEmail') ?? false;
 	const omnichannelHideConversationAfterClosing = useUserPreference<boolean>('omnichannelHideConversationAfterClosing') ?? true;
diff --git a/apps/meteor/client/views/account/preferences/AccountPreferencesPage.tsx b/apps/meteor/client/views/account/preferences/AccountPreferencesPage.tsx
index 77997422a21e..335b27d7c813 100644
--- a/apps/meteor/client/views/account/preferences/AccountPreferencesPage.tsx
+++ b/apps/meteor/client/views/account/preferences/AccountPreferencesPage.tsx
@@ -6,8 +6,6 @@ import type { ReactElement } from 'react';
 import React from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 
-import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../../components/Page';
-import { getDirtyFields } from '../../../lib/getDirtyFields';
 import PreferencesGlobalSection from './PreferencesGlobalSection';
 import PreferencesHighlightsSection from './PreferencesHighlightsSection';
 import PreferencesLocalizationSection from './PreferencesLocalizationSection';
@@ -18,6 +16,8 @@ import PreferencesSoundSection from './PreferencesSoundSection';
 import PreferencesUserPresenceSection from './PreferencesUserPresenceSection';
 import type { AccountPreferencesData } from './useAccountPreferencesValues';
 import { useAccountPreferencesValues } from './useAccountPreferencesValues';
+import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../../components/Page';
+import { getDirtyFields } from '../../../lib/getDirtyFields';
 
 const AccountPreferencesPage = (): ReactElement => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/account/preferences/PreferencesGlobalSection.tsx b/apps/meteor/client/views/account/preferences/PreferencesGlobalSection.tsx
index d09492fdc5a6..0edc83dadf23 100644
--- a/apps/meteor/client/views/account/preferences/PreferencesGlobalSection.tsx
+++ b/apps/meteor/client/views/account/preferences/PreferencesGlobalSection.tsx
@@ -1,12 +1,13 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Accordion, Field, FieldGroup, FieldLabel, FieldRow, MultiSelect } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
-import { useUserPreference, useTranslation } from '@rocket.chat/ui-contexts';
+import { useUserPreference } from '@rocket.chat/ui-contexts';
 import React from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 const PreferencesGlobalSection = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const userDontAskAgainList = useUserPreference<{ action: string; label: string }[]>('dontAskAgainList') || [];
 	const options: SelectOption[] = userDontAskAgainList.map(({ action, label }) => [action, label]);
diff --git a/apps/meteor/client/views/account/preferences/PreferencesLocalizationSection.tsx b/apps/meteor/client/views/account/preferences/PreferencesLocalizationSection.tsx
index 0dc6e25f1ac3..08723d827444 100644
--- a/apps/meteor/client/views/account/preferences/PreferencesLocalizationSection.tsx
+++ b/apps/meteor/client/views/account/preferences/PreferencesLocalizationSection.tsx
@@ -1,12 +1,13 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Accordion, Field, FieldGroup, FieldLabel, FieldRow, Select } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
-import { useLanguages, useTranslation } from '@rocket.chat/ui-contexts';
+import { useLanguages } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
 import { useFormContext, Controller } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 const PreferencesLocalizationSection = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const languages = useLanguages();
 
 	const { control } = useFormContext();
diff --git a/apps/meteor/client/views/account/preferences/PreferencesMyDataSection.tsx b/apps/meteor/client/views/account/preferences/PreferencesMyDataSection.tsx
index 5fd4540b5e57..b8db60f623ce 100644
--- a/apps/meteor/client/views/account/preferences/PreferencesMyDataSection.tsx
+++ b/apps/meteor/client/views/account/preferences/PreferencesMyDataSection.tsx
@@ -1,11 +1,12 @@
 import { Accordion, ButtonGroup, Button, Box } from '@rocket.chat/fuselage';
-import { useSetModal, useToastMessageDispatch, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetModal, useToastMessageDispatch, useMethod } from '@rocket.chat/ui-contexts';
 import React, { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import MyDataModal from './MyDataModal';
 
 const PreferencesMyDataSection = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const setModal = useSetModal();
 	const dispatchToastMessage = useToastMessageDispatch();
 
@@ -34,7 +35,7 @@ const PreferencesMyDataSection = () => {
 						const text = result.url
 							? t('UserDataDownload_CompletedRequestExistedWithLink_Text', {
 									download_link: result.url,
-							  })
+								})
 							: t('UserDataDownload_CompletedRequestExisted_Text');
 
 						setModal(
diff --git a/apps/meteor/client/views/account/preferences/PreferencesNotificationsSection.tsx b/apps/meteor/client/views/account/preferences/PreferencesNotificationsSection.tsx
index ddac7fda145b..b90d577524ba 100644
--- a/apps/meteor/client/views/account/preferences/PreferencesNotificationsSection.tsx
+++ b/apps/meteor/client/views/account/preferences/PreferencesNotificationsSection.tsx
@@ -3,9 +3,10 @@ import type { SelectOption } from '@rocket.chat/fuselage';
 import { Accordion, Field, FieldLabel, FieldRow, FieldHint, Select, FieldGroup, ToggleSwitch, Button } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useUserPreference, useSetting, useTranslation } from '@rocket.chat/ui-contexts';
+import { useUserPreference, useSetting } from '@rocket.chat/ui-contexts';
 import React, { useCallback, useEffect, useState, useMemo } from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import { KonchatNotification } from '../../../../app/ui/client/lib/KonchatNotification';
 
@@ -22,7 +23,7 @@ const emailNotificationOptionsLabelMap = {
 
 // TODO: Test Notification Button not working
 const PreferencesNotificationsSection = () => {
-	const t = useTranslation();
+	const { t, i18n } = useTranslation();
 
 	const [notificationsPermission, setNotificationsPermission] = useState<NotificationPermission>();
 
@@ -57,8 +58,8 @@ const PreferencesNotificationsSection = () => {
 	}, []);
 
 	const notificationOptions = useMemo(
-		() => Object.entries(notificationOptionsLabelMap).map(([key, val]) => t.has(val) && [key, t(val)]),
-		[t],
+		() => Object.entries(notificationOptionsLabelMap).map(([key, val]) => i18n.exists(val) && [key, t(val)]),
+		[i18n, t],
 	) as SelectOption[];
 
 	const desktopNotificationOptions = useMemo<SelectOption[]>((): SelectOption[] => {
@@ -74,10 +75,12 @@ const PreferencesNotificationsSection = () => {
 	}, [defaultMobileNotifications, notificationOptions, t]);
 
 	const emailNotificationOptions = useMemo(() => {
-		const options = Object.entries(emailNotificationOptionsLabelMap).map(([key, val]) => t.has(val) && [key, t(val)]) as SelectOption[];
+		const options = Object.entries(emailNotificationOptionsLabelMap).map(
+			([key, val]) => i18n.exists(val) && [key, t(val)],
+		) as SelectOption[];
 		options.unshift(['default', `${t('Default')} (${t(emailNotificationOptionsLabelMap[userEmailNotificationMode] as TranslationKey)})`]);
 		return options;
-	}, [t, userEmailNotificationMode]);
+	}, [i18n, t, userEmailNotificationMode]);
 
 	const { control } = useFormContext();
 
diff --git a/apps/meteor/client/views/account/preferences/PreferencesSoundSection.tsx b/apps/meteor/client/views/account/preferences/PreferencesSoundSection.tsx
index 8306e2941b00..d88ecaa99dbe 100644
--- a/apps/meteor/client/views/account/preferences/PreferencesSoundSection.tsx
+++ b/apps/meteor/client/views/account/preferences/PreferencesSoundSection.tsx
@@ -1,8 +1,7 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
-import { Accordion, Field, FieldLabel, FieldRow, Select, FieldGroup, ToggleSwitch, Tooltip, Box } from '@rocket.chat/fuselage';
+import { Accordion, Field, FieldLabel, FieldRow, Select, FieldGroup, ToggleSwitch, FieldHint, Slider } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import { useTranslation, useCustomSound } from '@rocket.chat/ui-contexts';
-import type { ChangeEvent } from 'react';
 import React from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
 
@@ -12,16 +11,92 @@ const PreferencesSoundSection = () => {
 	const customSound = useCustomSound();
 	const soundsList: SelectOption[] = customSound?.getList()?.map((value) => [value._id, value.name]) || [];
 	const { control, watch } = useFormContext();
-	const { newMessageNotification, notificationsSoundVolume } = watch();
+	const { newMessageNotification, notificationsSoundVolume = 100, masterVolume = 100, voipRingerVolume = 100 } = watch();
 
 	const newRoomNotificationId = useUniqueId();
 	const newMessageNotificationId = useUniqueId();
 	const muteFocusedConversationsId = useUniqueId();
+	const masterVolumeId = useUniqueId();
 	const notificationsSoundVolumeId = useUniqueId();
+	const voipRingerVolumeId = useUniqueId();
 
 	return (
 		<Accordion.Item title={t('Sound')}>
 			<FieldGroup>
+				<Field>
+					<FieldLabel aria-describedby={`${masterVolumeId}-hint`}>{t('Master_volume')}</FieldLabel>
+					<FieldHint id={`${masterVolumeId}-hint`} mbe={4}>
+						{t('Master_volume_hint')}
+					</FieldHint>
+					<FieldRow>
+						<Controller
+							name='masterVolume'
+							control={control}
+							render={({ field: { onChange, value } }) => (
+								<Slider
+									aria-labelledby={masterVolumeId}
+									aria-describedby={`${masterVolumeId}-hint`}
+									value={value}
+									minValue={0}
+									maxValue={100}
+									onChange={onChange}
+								/>
+							)}
+						/>
+					</FieldRow>
+				</Field>
+				<Field>
+					<FieldLabel id={notificationsSoundVolumeId}>{t('Notification_volume')}</FieldLabel>
+					<FieldHint id={`${notificationsSoundVolumeId}-hint`} mbe={4}>
+						{t('Notification_volume_hint')}
+					</FieldHint>
+					<FieldRow>
+						<Controller
+							name='notificationsSoundVolume'
+							control={control}
+							render={({ field: { onChange, value } }) => (
+								<Slider
+									aria-labelledby={notificationsSoundVolumeId}
+									aria-describedby={`${notificationsSoundVolumeId}-hint`}
+									value={value}
+									minValue={0}
+									maxValue={100}
+									onChange={(value: number) => {
+										const soundVolume = (notificationsSoundVolume * masterVolume) / 100;
+										customSound.play(newMessageNotification, { volume: soundVolume / 100 });
+										onChange(value);
+									}}
+								/>
+							)}
+						/>
+					</FieldRow>
+				</Field>
+				<Field>
+					<FieldLabel aria-describedby={`${voipRingerVolumeId}-hint`}>{t('Call_ringer_volume')}</FieldLabel>
+					<FieldHint id={`${voipRingerVolumeId}-hint`} mbe={4}>
+						{t('Call_ringer_volume_hint')}
+					</FieldHint>
+					<FieldRow>
+						<Controller
+							name='voipRingerVolume'
+							control={control}
+							render={({ field: { onChange, value } }) => (
+								<Slider
+									aria-labelledby={voipRingerVolumeId}
+									aria-describedby={`${voipRingerVolumeId}-hint`}
+									value={value}
+									minValue={0}
+									maxValue={100}
+									onChange={(value: number) => {
+										const soundVolume = (voipRingerVolume * masterVolume) / 100;
+										customSound.play('telephone', { volume: soundVolume / 100 });
+										onChange(value);
+									}}
+								/>
+							)}
+						/>
+					</FieldRow>
+				</Field>
 				<Field>
 					<FieldLabel htmlFor={newRoomNotificationId}>{t('New_Room_Notification')}</FieldLabel>
 					<FieldRow>
@@ -32,11 +107,11 @@ const PreferencesSoundSection = () => {
 								<Select
 									id={newRoomNotificationId}
 									value={value}
+									options={soundsList}
 									onChange={(value) => {
 										onChange(value);
 										customSound.play(String(value), { volume: notificationsSoundVolume / 100 });
 									}}
-									options={soundsList}
 								/>
 							)}
 						/>
@@ -52,11 +127,11 @@ const PreferencesSoundSection = () => {
 								<Select
 									id={newMessageNotificationId}
 									value={value}
+									options={soundsList}
 									onChange={(value) => {
 										onChange(value);
 										customSound.play(String(value), { volume: notificationsSoundVolume / 100 });
 									}}
-									options={soundsList}
 								/>
 							)}
 						/>
@@ -74,34 +149,6 @@ const PreferencesSoundSection = () => {
 						/>
 					</FieldRow>
 				</Field>
-				<Field>
-					<FieldLabel htmlFor={notificationsSoundVolumeId}>{t('Notifications_Sound_Volume')}</FieldLabel>
-					<FieldRow>
-						<Controller
-							name='notificationsSoundVolume'
-							control={control}
-							render={({ field: { onChange, value, ref } }) => (
-								<Box
-									id={notificationsSoundVolumeId}
-									ref={ref}
-									is='input'
-									flexGrow={1}
-									type='range'
-									min='0'
-									max='100'
-									value={value}
-									onChange={(e: ChangeEvent<HTMLInputElement>) => {
-										customSound.play(newMessageNotification, { volume: notificationsSoundVolume / 100 });
-										onChange(Math.max(0, Math.min(Number(e.currentTarget.value), 100)));
-									}}
-								/>
-							)}
-						/>
-						<Tooltip placement='right' mis={8}>
-							{notificationsSoundVolume}
-						</Tooltip>
-					</FieldRow>
-				</Field>
 			</FieldGroup>
 		</Accordion.Item>
 	);
diff --git a/apps/meteor/client/views/account/preferences/useAccountPreferencesValues.ts b/apps/meteor/client/views/account/preferences/useAccountPreferencesValues.ts
index a85ef275638e..e6520b07f34d 100644
--- a/apps/meteor/client/views/account/preferences/useAccountPreferencesValues.ts
+++ b/apps/meteor/client/views/account/preferences/useAccountPreferencesValues.ts
@@ -35,7 +35,9 @@ export type AccountPreferencesData = {
 	sidebarViewMode?: string;
 	sidebarDisplayAvatar?: boolean;
 	sidebarGroupByType?: boolean;
+	masterVolume?: number;
 	notificationsSoundVolume?: number;
+	voipRingerVolume?: number;
 };
 
 export const useAccountPreferencesValues = (): AccountPreferencesData => {
@@ -70,7 +72,10 @@ export const useAccountPreferencesValues = (): AccountPreferencesData => {
 	const newRoomNotification = useUserPreference<string>('newRoomNotification');
 	const newMessageNotification = useUserPreference<string>('newMessageNotification');
 	const muteFocusedConversations = useUserPreference<boolean>('muteFocusedConversations');
-	const notificationsSoundVolume = useUserPreference<number>('notificationsSoundVolume');
+
+	const masterVolume = useUserPreference<number>('masterVolume', 100);
+	const notificationsSoundVolume = useUserPreference<number>('notificationsSoundVolume', 100);
+	const voipRingerVolume = useUserPreference<number>('voipRingerVolume', 100);
 
 	return {
 		language,
@@ -99,6 +104,8 @@ export const useAccountPreferencesValues = (): AccountPreferencesData => {
 		newRoomNotification,
 		newMessageNotification,
 		muteFocusedConversations,
+		masterVolume,
 		notificationsSoundVolume,
+		voipRingerVolume,
 	};
 };
diff --git a/apps/meteor/client/views/account/profile/AccountProfileForm.tsx b/apps/meteor/client/views/account/profile/AccountProfileForm.tsx
index 95398b352049..54875f0686cb 100644
--- a/apps/meteor/client/views/account/profile/AccountProfileForm.tsx
+++ b/apps/meteor/client/views/account/profile/AccountProfileForm.tsx
@@ -27,14 +27,14 @@ import type { AllHTMLAttributes, ReactElement } from 'react';
 import React, { useCallback } from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
 
+import type { AccountProfileFormValues } from './getProfileInitialValues';
+import { useAccountProfileSettings } from './useAccountProfileSettings';
 import { validateEmail } from '../../../../lib/emailValidator';
 import { getUserEmailAddress } from '../../../../lib/getUserEmailAddress';
 import UserStatusMenu from '../../../components/UserStatusMenu';
 import UserAvatarEditor from '../../../components/avatar/UserAvatarEditor';
 import { useUpdateAvatar } from '../../../hooks/useUpdateAvatar';
 import { USER_STATUS_TEXT_MAX_LENGTH, BIO_TEXT_MAX_LENGTH } from '../../../lib/constants';
-import type { AccountProfileFormValues } from './getProfileInitialValues';
-import { useAccountProfileSettings } from './useAccountProfileSettings';
 
 const AccountProfileForm = (props: AllHTMLAttributes<HTMLFormElement>): ReactElement => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/account/profile/AccountProfilePage.tsx b/apps/meteor/client/views/account/profile/AccountProfilePage.tsx
index df1710b07509..0113d40a938a 100644
--- a/apps/meteor/client/views/account/profile/AccountProfilePage.tsx
+++ b/apps/meteor/client/views/account/profile/AccountProfilePage.tsx
@@ -15,12 +15,12 @@ import type { ReactElement } from 'react';
 import React, { useState, useCallback } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 
-import ConfirmOwnerChangeModal from '../../../components/ConfirmOwnerChangeModal';
-import { Page, PageFooter, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page';
-import { useAllowPasswordChange } from '../security/useAllowPasswordChange';
 import AccountProfileForm from './AccountProfileForm';
 import ActionConfirmModal from './ActionConfirmModal';
 import { getProfileInitialValues } from './getProfileInitialValues';
+import ConfirmOwnerChangeModal from '../../../components/ConfirmOwnerChangeModal';
+import { Page, PageFooter, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page';
+import { useAllowPasswordChange } from '../security/useAllowPasswordChange';
 
 // TODO: enforce useMutation
 const AccountProfilePage = (): ReactElement => {
diff --git a/apps/meteor/client/views/account/profile/AccountProfileRoute.tsx b/apps/meteor/client/views/account/profile/AccountProfileRoute.tsx
index 52d879c30537..77e184f1873c 100644
--- a/apps/meteor/client/views/account/profile/AccountProfileRoute.tsx
+++ b/apps/meteor/client/views/account/profile/AccountProfileRoute.tsx
@@ -2,8 +2,8 @@ import { useSetting } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import AccountProfilePage from './AccountProfilePage';
+import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 
 const AccountProfileRoute = (): ReactElement => {
 	const canViewProfile = useSetting('Accounts_AllowUserProfileChange');
diff --git a/apps/meteor/client/views/account/profile/useAccountProfileSettings.ts b/apps/meteor/client/views/account/profile/useAccountProfileSettings.ts
index 272559d35460..18449ec2b827 100644
--- a/apps/meteor/client/views/account/profile/useAccountProfileSettings.ts
+++ b/apps/meteor/client/views/account/profile/useAccountProfileSettings.ts
@@ -2,14 +2,14 @@ import { useSetting } from '@rocket.chat/ui-contexts';
 import { useMemo } from 'react';
 
 export const useAccountProfileSettings = () => {
-	const allowRealNameChange = useSetting('Accounts_AllowRealNameChange');
-	const allowUserStatusMessageChange = useSetting('Accounts_AllowUserStatusMessageChange');
-	const canChangeUsername = useSetting('Accounts_AllowUsernameChange');
-	const allowEmailChange = useSetting('Accounts_AllowEmailChange');
+	const allowRealNameChange = useSetting('Accounts_AllowRealNameChange', true);
+	const allowUserStatusMessageChange = useSetting('Accounts_AllowUserStatusMessageChange', true);
+	const canChangeUsername = useSetting('Accounts_AllowUsernameChange', true);
+	const allowEmailChange = useSetting('Accounts_AllowEmailChange', true);
 
-	const allowUserAvatarChange = useSetting('Accounts_AllowUserAvatarChange');
-	const requireName = useSetting<boolean>('Accounts_RequireNameForSignUp');
-	const namesRegexSetting = useSetting('UTF8_User_Names_Validation');
+	const allowUserAvatarChange = useSetting('Accounts_AllowUserAvatarChange', true);
+	const requireName = useSetting('Accounts_RequireNameForSignUp', true);
+	const namesRegexSetting = useSetting('UTF8_User_Names_Validation', '[0-9a-zA-Z-_.]+');
 
 	const namesRegex = useMemo(() => new RegExp(`^${namesRegexSetting}$`), [namesRegexSetting]);
 
diff --git a/apps/meteor/client/views/account/security/AccountSecurityPage.tsx b/apps/meteor/client/views/account/security/AccountSecurityPage.tsx
index c7d4157ddbd7..45b0e4c5eb3f 100644
--- a/apps/meteor/client/views/account/security/AccountSecurityPage.tsx
+++ b/apps/meteor/client/views/account/security/AccountSecurityPage.tsx
@@ -5,11 +5,11 @@ import type { ReactElement } from 'react';
 import React from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 
-import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../../components/Page';
 import ChangePassword from './ChangePassword';
 import EndToEnd from './EndToEnd';
 import TwoFactorEmail from './TwoFactorEmail';
 import TwoFactorTOTP from './TwoFactorTOTP';
+import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../../components/Page';
 
 const passwordDefaultValues = { password: '', confirmationPassword: '' };
 
diff --git a/apps/meteor/client/views/account/security/AccountSecurityRoute.tsx b/apps/meteor/client/views/account/security/AccountSecurityRoute.tsx
index 11a0d8b63882..ed7ed0310948 100644
--- a/apps/meteor/client/views/account/security/AccountSecurityRoute.tsx
+++ b/apps/meteor/client/views/account/security/AccountSecurityRoute.tsx
@@ -2,8 +2,8 @@ import { useSetting } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import AccountSecurityPage from './AccountSecurityPage';
+import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 
 const AccountSecurityRoute = (): ReactElement => {
 	const isTwoFactorEnabled = useSetting('Accounts_TwoFactorAuthentication_Enabled');
diff --git a/apps/meteor/client/views/account/security/ChangePassword.tsx b/apps/meteor/client/views/account/security/ChangePassword.tsx
index e5cb61e34547..efffd7d197a6 100644
--- a/apps/meteor/client/views/account/security/ChangePassword.tsx
+++ b/apps/meteor/client/views/account/security/ChangePassword.tsx
@@ -1,17 +1,18 @@
 import { Box, Field, FieldError, FieldGroup, FieldHint, FieldLabel, FieldRow, Icon, PasswordInput } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import { PasswordVerifier, useValidatePassword } from '@rocket.chat/ui-client';
-import { useMethod, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useMethod, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import type { AllHTMLAttributes } from 'react';
 import React from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import { useAllowPasswordChange } from './useAllowPasswordChange';
 
 type PasswordFieldValues = { password: string; confirmationPassword: string };
 
 const ChangePassword = (props: AllHTMLAttributes<HTMLFormElement>) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 
 	const passwordId = useUniqueId();
diff --git a/apps/meteor/client/views/account/security/TwoFactorEmail.tsx b/apps/meteor/client/views/account/security/TwoFactorEmail.tsx
index 3654d17b5dec..092fa46dadee 100644
--- a/apps/meteor/client/views/account/security/TwoFactorEmail.tsx
+++ b/apps/meteor/client/views/account/security/TwoFactorEmail.tsx
@@ -1,12 +1,13 @@
 import { Box, Button, Margins } from '@rocket.chat/fuselage';
-import { useUser, useTranslation } from '@rocket.chat/ui-contexts';
+import { useUser } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useEndpointAction } from '../../../hooks/useEndpointAction';
 
 const TwoFactorEmail = (props: ComponentProps<typeof Box>) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const user = useUser();
 
 	const isEnabled = user?.services?.email2fa?.enabled;
diff --git a/apps/meteor/client/views/account/security/TwoFactorTOTP.tsx b/apps/meteor/client/views/account/security/TwoFactorTOTP.tsx
index a00a64ee991b..bbd917a1055d 100644
--- a/apps/meteor/client/views/account/security/TwoFactorTOTP.tsx
+++ b/apps/meteor/client/views/account/security/TwoFactorTOTP.tsx
@@ -1,17 +1,18 @@
 import { Box, Button, TextInput, Margins } from '@rocket.chat/fuselage';
 import { useSafely } from '@rocket.chat/fuselage-hooks';
-import { useSetModal, useToastMessageDispatch, useUser, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetModal, useToastMessageDispatch, useUser, useMethod } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ComponentProps } from 'react';
 import React, { useState, useCallback, useEffect } from 'react';
 import { useForm } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 import qrcode from 'yaqrcode';
 
+import BackupCodesModal from './BackupCodesModal';
 import TextCopy from '../../../components/TextCopy';
 import TwoFactorTotpModal from '../../../components/TwoFactorModal/TwoFactorTotpModal';
-import BackupCodesModal from './BackupCodesModal';
 
 const TwoFactorTOTP = (props: ComponentProps<typeof Box>): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 	const user = useUser();
 	const setModal = useSetModal();
diff --git a/apps/meteor/client/views/account/tokens/AccountTokensPage.tsx b/apps/meteor/client/views/account/tokens/AccountTokensPage.tsx
index abf45ebedcb9..6850615db7a4 100644
--- a/apps/meteor/client/views/account/tokens/AccountTokensPage.tsx
+++ b/apps/meteor/client/views/account/tokens/AccountTokensPage.tsx
@@ -2,8 +2,8 @@ import type { ReactElement } from 'react';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { Page, PageHeader, PageContent } from '../../../components/Page';
 import AccountTokensTable from './AccountTokensTable';
+import { Page, PageHeader, PageContent } from '../../../components/Page';
 
 const AccountTokensPage = (): ReactElement => {
 	const { t } = useTranslation();
diff --git a/apps/meteor/client/views/account/tokens/AccountTokensRoute.tsx b/apps/meteor/client/views/account/tokens/AccountTokensRoute.tsx
index ed8964db15bb..0876bd8385a7 100644
--- a/apps/meteor/client/views/account/tokens/AccountTokensRoute.tsx
+++ b/apps/meteor/client/views/account/tokens/AccountTokensRoute.tsx
@@ -2,8 +2,8 @@ import { usePermission } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import AccountTokensPage from './AccountTokensPage';
+import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 
 const AccountTokensRoute = (): ReactElement => {
 	const canCreateTokens = usePermission('create-personal-access-tokens');
diff --git a/apps/meteor/client/views/account/tokens/AccountTokensTable/AccountTokensTable.tsx b/apps/meteor/client/views/account/tokens/AccountTokensTable/AccountTokensTable.tsx
index adfb8916af2e..78cb8414f6e7 100644
--- a/apps/meteor/client/views/account/tokens/AccountTokensTable/AccountTokensTable.tsx
+++ b/apps/meteor/client/views/account/tokens/AccountTokensTable/AccountTokensTable.tsx
@@ -1,8 +1,11 @@
 import { Box, Pagination, States, StatesAction, StatesActions, StatesIcon, StatesSubtitle, StatesTitle } from '@rocket.chat/fuselage';
-import { useSetModal, useToastMessageDispatch, useUserId, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetModal, useToastMessageDispatch, useUserId, useMethod } from '@rocket.chat/ui-contexts';
 import type { ReactElement, RefObject } from 'react';
 import React, { useMemo, useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
+import AccountTokensRow from './AccountTokensRow';
+import AddToken from './AddToken';
 import GenericModal from '../../../../components/GenericModal';
 import GenericNoResults from '../../../../components/GenericNoResults';
 import {
@@ -16,11 +19,9 @@ import { usePagination } from '../../../../components/GenericTable/hooks/usePagi
 import { useEndpointData } from '../../../../hooks/useEndpointData';
 import { useResizeInlineBreakpoint } from '../../../../hooks/useResizeInlineBreakpoint';
 import { AsyncStatePhase } from '../../../../lib/asyncState';
-import AccountTokensRow from './AccountTokensRow';
-import AddToken from './AddToken';
 
 const AccountTokensTable = (): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 	const setModal = useSetModal();
 	const userId = useUserId();
@@ -154,11 +155,11 @@ const AccountTokensTable = (): ReactElement => {
 								filteredTokens &&
 								filteredTokens.map((filteredToken) => (
 									<AccountTokensRow
-										{...filteredToken}
 										key={filteredToken.createdAt}
 										onRegenerate={handleRegenerate}
 										onRemove={handleRemove}
 										isMedium={isMedium}
+										{...filteredToken}
 									/>
 								))}
 						</GenericTableBody>
diff --git a/apps/meteor/client/views/account/tokens/AccountTokensTable/AddToken.tsx b/apps/meteor/client/views/account/tokens/AccountTokensTable/AddToken.tsx
index 71fd2933f431..b924f377e851 100644
--- a/apps/meteor/client/views/account/tokens/AccountTokensTable/AddToken.tsx
+++ b/apps/meteor/client/views/account/tokens/AccountTokensTable/AddToken.tsx
@@ -1,14 +1,15 @@
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Box, TextInput, Button, Margins, Select } from '@rocket.chat/fuselage';
-import { useSetModal, useToastMessageDispatch, useUserId, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetModal, useToastMessageDispatch, useUserId, useMethod } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useCallback, useMemo, useEffect } from 'react';
 import { Controller, useForm } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../components/GenericModal';
 
 const AddToken = ({ reload }: { reload: () => void }): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const userId = useUserId();
 	const setModal = useSetModal();
 	const createTokenFn = useMethod('personalAccessTokens:generateToken');
diff --git a/apps/meteor/client/views/admin/AdministrationLayout.tsx b/apps/meteor/client/views/admin/AdministrationLayout.tsx
index 257028e723d2..2e77f6f48d40 100644
--- a/apps/meteor/client/views/admin/AdministrationLayout.tsx
+++ b/apps/meteor/client/views/admin/AdministrationLayout.tsx
@@ -1,8 +1,8 @@
 import type { ReactNode } from 'react';
 import React from 'react';
 
-import SidebarPortal from '../../sidebar/SidebarPortal';
 import AdminSidebar from './sidebar/AdminSidebar';
+import SidebarPortal from '../../sidebar/SidebarPortal';
 
 type AdministrationLayoutProps = {
 	children?: ReactNode;
diff --git a/apps/meteor/client/views/admin/AdministrationRouter.tsx b/apps/meteor/client/views/admin/AdministrationRouter.tsx
index b210435ae267..8ae97f463416 100644
--- a/apps/meteor/client/views/admin/AdministrationRouter.tsx
+++ b/apps/meteor/client/views/admin/AdministrationRouter.tsx
@@ -2,12 +2,12 @@ import { useRouter } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ReactNode } from 'react';
 import React, { Suspense, useEffect } from 'react';
 
+import AdministrationLayout from './AdministrationLayout';
+import { getAdminSidebarItems } from './sidebarItems';
 import PageSkeleton from '../../components/PageSkeleton';
 import type { Item, SidebarDivider, SidebarItem } from '../../lib/createSidebarItems';
 import { isGoRocketChatLink } from '../../lib/createSidebarItems';
 import SettingsProvider from '../../providers/SettingsProvider';
-import AdministrationLayout from './AdministrationLayout';
-import { getAdminSidebarItems } from './sidebarItems';
 
 const isSidebarDivider = (sidebarItem: SidebarItem): sidebarItem is SidebarDivider => {
 	return (sidebarItem as SidebarDivider).divider === true;
diff --git a/apps/meteor/client/views/admin/EditableSettingsContext.ts b/apps/meteor/client/views/admin/EditableSettingsContext.ts
index 8e98adf83a88..ed149669b8c1 100644
--- a/apps/meteor/client/views/admin/EditableSettingsContext.ts
+++ b/apps/meteor/client/views/admin/EditableSettingsContext.ts
@@ -1,4 +1,4 @@
-import type { ISettingBase, SectionName, SettingId, GroupId, TabId, ISettingColor } from '@rocket.chat/core-typings';
+import type { ISettingBase, ISettingColor, ISetting } from '@rocket.chat/core-typings';
 import type { SettingsContextQuery } from '@rocket.chat/ui-contexts';
 import { createContext, useContext, useMemo } from 'react';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
@@ -15,32 +15,30 @@ type EditableSettingsContextQuery = SettingsContextQuery & {
 
 export type EditableSettingsContextValue = {
 	readonly queryEditableSetting: (
-		_id: SettingId,
+		_id: ISetting['_id'],
 	) => [subscribe: (onStoreChange: () => void) => () => void, getSnapshot: () => EditableSetting | undefined];
 	readonly queryEditableSettings: (
 		query: EditableSettingsContextQuery,
 	) => [subscribe: (onStoreChange: () => void) => () => void, getSnapshot: () => EditableSetting[]];
 	readonly queryGroupSections: (
-		_id: GroupId,
-		tab?: TabId,
-	) => [subscribe: (onStoreChange: () => void) => () => void, getSnapshot: () => SectionName[]];
-	readonly queryGroupTabs: (_id: GroupId) => [subscribe: (onStoreChange: () => void) => () => void, getSnapshot: () => TabId[]];
+		_id: ISetting['_id'],
+		tab?: ISetting['_id'],
+	) => [subscribe: (onStoreChange: () => void) => () => void, getSnapshot: () => string[]];
+	readonly queryGroupTabs: (
+		_id: ISetting['_id'],
+	) => [subscribe: (onStoreChange: () => void) => () => void, getSnapshot: () => ISetting['_id'][]];
 	readonly dispatch: (changes: Partial<EditableSetting>[]) => void;
-	readonly isEnterprise: boolean;
 };
 
 export const EditableSettingsContext = createContext<EditableSettingsContextValue>({
 	queryEditableSetting: () => [(): (() => void) => (): void => undefined, (): undefined => undefined],
 	queryEditableSettings: () => [(): (() => void) => (): void => undefined, (): EditableSetting[] => []],
-	queryGroupSections: () => [(): (() => void) => (): void => undefined, (): SectionName[] => []],
-	queryGroupTabs: () => [(): (() => void) => (): void => undefined, (): TabId[] => []],
+	queryGroupSections: () => [(): (() => void) => (): void => undefined, (): string[] => []],
+	queryGroupTabs: () => [(): (() => void) => (): void => undefined, (): ISetting['_id'][] => []],
 	dispatch: () => undefined,
-	isEnterprise: false,
 });
 
-export const useIsEnterprise = (): boolean => useContext(EditableSettingsContext).isEnterprise;
-
-export const useEditableSetting = (_id: SettingId): EditableSetting | undefined => {
+export const useEditableSetting = (_id: ISetting['_id']): EditableSetting | undefined => {
 	const { queryEditableSetting } = useContext(EditableSettingsContext);
 
 	const [subscribe, getSnapshot] = useMemo(() => queryEditableSetting(_id), [queryEditableSetting, _id]);
@@ -53,14 +51,14 @@ export const useEditableSettings = (query?: EditableSettingsContextQuery): Edita
 	return useSyncExternalStore(subscribe, getSnapshot);
 };
 
-export const useEditableSettingsGroupSections = (_id: SettingId, tab?: TabId): SectionName[] => {
+export const useEditableSettingsGroupSections = (_id: ISetting['_id'], tab?: ISetting['_id']): string[] => {
 	const { queryGroupSections } = useContext(EditableSettingsContext);
 
 	const [subscribe, getSnapshot] = useMemo(() => queryGroupSections(_id, tab), [queryGroupSections, _id, tab]);
 	return useSyncExternalStore(subscribe, getSnapshot);
 };
 
-export const useEditableSettingsGroupTabs = (_id: SettingId): TabId[] => {
+export const useEditableSettingsGroupTabs = (_id: ISetting['_id']): ISetting['_id'][] => {
 	const { queryGroupTabs } = useContext(EditableSettingsContext);
 
 	const [subscribe, getSnapshot] = useMemo(() => queryGroupTabs(_id), [queryGroupTabs, _id]);
diff --git a/apps/meteor/client/views/admin/customEmoji/CustomEmoji.spec.tsx b/apps/meteor/client/views/admin/customEmoji/CustomEmoji.spec.tsx
new file mode 100644
index 000000000000..d59a8c815150
--- /dev/null
+++ b/apps/meteor/client/views/admin/customEmoji/CustomEmoji.spec.tsx
@@ -0,0 +1,79 @@
+import { mockAppRoot } from '@rocket.chat/mock-providers';
+import { render, screen, waitFor } from '@testing-library/react';
+import React from 'react';
+
+import '@testing-library/jest-dom';
+
+import CustomEmoji from './CustomEmoji';
+
+const appRoot = mockAppRoot().withEndpoint('GET', '/v1/emoji-custom.all', () => ({
+	count: 1,
+	offset: 0,
+	total: 1,
+	success: true,
+	emojis: [
+		{
+			_id: '1',
+			name: 'smile',
+			aliases: ['happy', 'joy'],
+			extension: 'webp',
+			_updatedAt: new Date().toISOString(),
+			etag: 'abcdef',
+		},
+	],
+}));
+
+describe('CustomEmoji Component', () => {
+	const mockRef = { current: jest.fn() };
+	const mockOnClick = jest.fn();
+
+	it('renders emoji list', async () => {
+		render(<CustomEmoji onClick={mockOnClick} reload={mockRef} />, {
+			legacyRoot: true,
+			wrapper: appRoot.build(),
+		});
+
+		await waitFor(() => {
+			expect(screen.getByText('smile')).toBeInTheDocument();
+		});
+	});
+
+	it("renders emoji's aliases as comma-separated values when aliases is an array", async () => {
+		render(<CustomEmoji onClick={mockOnClick} reload={mockRef} />, {
+			legacyRoot: true,
+			wrapper: appRoot.build(),
+		});
+
+		await waitFor(() => {
+			expect(screen.getByText('happy, joy')).toBeInTheDocument();
+		});
+	});
+
+	it("renders emoji's aliases values when aliases is a string", async () => {
+		render(<CustomEmoji onClick={mockOnClick} reload={mockRef} />, {
+			legacyRoot: true,
+			wrapper: mockAppRoot()
+				.withEndpoint('GET', '/v1/emoji-custom.all', () => ({
+					count: 1,
+					offset: 0,
+					total: 1,
+					success: true,
+					emojis: [
+						{
+							_id: '1',
+							name: 'smile',
+							aliases: 'happy' as any,
+							extension: 'webp',
+							_updatedAt: new Date().toISOString(),
+							etag: 'abcdef',
+						},
+					],
+				}))
+				.build(),
+		});
+
+		await waitFor(() => {
+			expect(screen.getByText('happy')).toBeInTheDocument();
+		});
+	});
+});
diff --git a/apps/meteor/client/views/admin/customEmoji/CustomEmoji.tsx b/apps/meteor/client/views/admin/customEmoji/CustomEmoji.tsx
index 2bd795c3ccab..4c02776b80d5 100644
--- a/apps/meteor/client/views/admin/customEmoji/CustomEmoji.tsx
+++ b/apps/meteor/client/views/admin/customEmoji/CustomEmoji.tsx
@@ -66,7 +66,7 @@ const CustomEmoji = ({ onClick, reload }: CustomEmojiProps) => {
 
 	return (
 		<>
-			<FilterByText onChange={setText} />
+			<FilterByText value={text} onChange={(event) => setText(event.target.value)} />
 			{isLoading && (
 				<GenericTable>
 					<GenericTableHeader>{headers}</GenericTableHeader>
@@ -95,7 +95,7 @@ const CustomEmoji = ({ onClick, reload }: CustomEmojiProps) => {
 											<Box withTruncatedText>{emojis.name}</Box>
 										</GenericTableCell>
 										<GenericTableCell color='default'>
-											<Box withTruncatedText>{emojis.aliases}</Box>
+											<Box withTruncatedText>{Array.isArray(emojis.aliases) ? emojis.aliases.join(', ') : emojis.aliases}</Box>
 										</GenericTableCell>
 									</GenericTableRow>
 								))}
diff --git a/apps/meteor/client/views/admin/customEmoji/CustomEmojiRoute.tsx b/apps/meteor/client/views/admin/customEmoji/CustomEmojiRoute.tsx
index 7db77713b3ee..68daa83165db 100644
--- a/apps/meteor/client/views/admin/customEmoji/CustomEmojiRoute.tsx
+++ b/apps/meteor/client/views/admin/customEmoji/CustomEmojiRoute.tsx
@@ -1,8 +1,12 @@
 import { Button } from '@rocket.chat/fuselage';
-import { useRoute, useRouteParameter, usePermission, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRoute, useRouteParameter, usePermission } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useCallback, useRef } from 'react';
+import { useTranslation } from 'react-i18next';
 
+import AddCustomEmoji from './AddCustomEmoji';
+import CustomEmoji from './CustomEmoji';
+import EditCustomEmojiWithData from './EditCustomEmojiWithData';
 import {
 	Contextualbar,
 	ContextualbarHeader,
@@ -12,12 +16,9 @@ import {
 } from '../../../components/Contextualbar';
 import { Page, PageHeader, PageContent } from '../../../components/Page';
 import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
-import AddCustomEmoji from './AddCustomEmoji';
-import CustomEmoji from './CustomEmoji';
-import EditCustomEmojiWithData from './EditCustomEmojiWithData';
 
 const CustomEmojiRoute = (): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const route = useRoute('emoji-custom');
 	const context = useRouteParameter('context');
 	const id = useRouteParameter('id');
diff --git a/apps/meteor/client/views/admin/customEmoji/EditCustomEmoji.tsx b/apps/meteor/client/views/admin/customEmoji/EditCustomEmoji.tsx
index 49ee12b69dd0..285c1a98513b 100644
--- a/apps/meteor/client/views/admin/customEmoji/EditCustomEmoji.tsx
+++ b/apps/meteor/client/views/admin/customEmoji/EditCustomEmoji.tsx
@@ -11,9 +11,10 @@ import {
 	FieldError,
 	IconButton,
 } from '@rocket.chat/fuselage';
-import { useSetModal, useToastMessageDispatch, useAbsoluteUrl, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetModal, useToastMessageDispatch, useAbsoluteUrl } from '@rocket.chat/ui-contexts';
 import type { ChangeEvent } from 'react';
 import React, { useCallback, useState, useMemo, useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { ContextualbarScrollableContent, ContextualbarFooter } from '../../../components/Contextualbar';
 import GenericModal from '../../../components/GenericModal';
@@ -29,11 +30,12 @@ type EditCustomEmojiProps = {
 		name: string;
 		aliases: string[];
 		extension: string;
+		etag?: string;
 	};
 };
 
 const EditCustomEmoji = ({ close, onChange, data, ...props }: EditCustomEmojiProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 	const setModal = useSetModal();
 	const absoluteUrl = useAbsoluteUrl();
@@ -50,7 +52,7 @@ const EditCustomEmoji = ({ close, onChange, data, ...props }: EditCustomEmojiPro
 		}
 
 		if (data) {
-			return absoluteUrl(`/emoji-custom/${encodeURIComponent(data.name)}.${data.extension}`);
+			return absoluteUrl(`/emoji-custom/${encodeURIComponent(data.name)}.${data.extension}${data.etag ? `?etag=${data.etag}` : ''}`);
 		}
 
 		return null;
diff --git a/apps/meteor/client/views/admin/customEmoji/EditCustomEmojiWithData.tsx b/apps/meteor/client/views/admin/customEmoji/EditCustomEmojiWithData.tsx
index fff37214b530..161a00760902 100644
--- a/apps/meteor/client/views/admin/customEmoji/EditCustomEmojiWithData.tsx
+++ b/apps/meteor/client/views/admin/customEmoji/EditCustomEmojiWithData.tsx
@@ -1,10 +1,11 @@
 import { Callout } from '@rocket.chat/fuselage';
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
-import { FormSkeleton } from '../../../components/Skeleton';
 import EditCustomEmoji from './EditCustomEmoji';
+import { FormSkeleton } from '../../../components/Skeleton';
 
 type EditCustomEmojiWithDataProps = {
 	_id: string;
@@ -13,7 +14,7 @@ type EditCustomEmojiWithDataProps = {
 };
 
 const EditCustomEmojiWithData = ({ _id, onChange, close, ...props }: EditCustomEmojiWithDataProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const query = useMemo(() => ({ _id }), [_id]);
 
 	const getEmojis = useEndpoint('GET', '/v1/emoji-custom.list');
diff --git a/apps/meteor/client/views/admin/customSounds/AddCustomSound.tsx b/apps/meteor/client/views/admin/customSounds/AddCustomSound.tsx
index 430d05ceaa53..e9994d03ce6e 100644
--- a/apps/meteor/client/views/admin/customSounds/AddCustomSound.tsx
+++ b/apps/meteor/client/views/admin/customSounds/AddCustomSound.tsx
@@ -1,11 +1,12 @@
 import { Field, FieldLabel, FieldRow, TextInput, Box, Margins, Button, ButtonGroup, IconButton } from '@rocket.chat/fuselage';
-import { useToastMessageDispatch, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
+import { useToastMessageDispatch, useMethod } from '@rocket.chat/ui-contexts';
 import type { ReactElement, FormEvent } from 'react';
 import React, { useState, useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
+import { validate, createSoundData } from './lib';
 import { ContextualbarScrollableContent, ContextualbarFooter } from '../../../components/Contextualbar';
 import { useSingleFileInput } from '../../../hooks/useSingleFileInput';
-import { validate, createSoundData } from './lib';
 
 type AddCustomSoundProps = {
 	goToNew: (_id: string) => () => void;
@@ -14,7 +15,7 @@ type AddCustomSoundProps = {
 };
 
 const AddCustomSound = ({ goToNew, close, onChange, ...props }: AddCustomSoundProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 
 	const [name, setName] = useState('');
diff --git a/apps/meteor/client/views/admin/customSounds/CustomSoundsPage.tsx b/apps/meteor/client/views/admin/customSounds/CustomSoundsPage.tsx
index 238ee3c2ad20..cb4d9bf3e0b2 100644
--- a/apps/meteor/client/views/admin/customSounds/CustomSoundsPage.tsx
+++ b/apps/meteor/client/views/admin/customSounds/CustomSoundsPage.tsx
@@ -1,7 +1,11 @@
 import { Button } from '@rocket.chat/fuselage';
-import { useRoute, useRouteParameter, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRoute, useRouteParameter } from '@rocket.chat/ui-contexts';
 import React, { useCallback, useRef } from 'react';
+import { useTranslation } from 'react-i18next';
 
+import AddCustomSound from './AddCustomSound';
+import CustomSoundsTable from './CustomSoundsTable';
+import EditCustomSound from './EditCustomSound';
 import {
 	ContextualbarTitle,
 	Contextualbar,
@@ -10,12 +14,9 @@ import {
 	ContextualbarDialog,
 } from '../../../components/Contextualbar';
 import { Page, PageHeader, PageContent } from '../../../components/Page';
-import AddCustomSound from './AddCustomSound';
-import CustomSoundsTable from './CustomSoundsTable';
-import EditCustomSound from './EditCustomSound';
 
 const CustomSoundsPage = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const id = useRouteParameter('id');
 	const route = useRoute('custom-sounds');
 	const context = useRouteParameter('context');
diff --git a/apps/meteor/client/views/admin/customSounds/CustomSoundsRoute.tsx b/apps/meteor/client/views/admin/customSounds/CustomSoundsRoute.tsx
index 17859317917b..1b65cb9e996f 100644
--- a/apps/meteor/client/views/admin/customSounds/CustomSoundsRoute.tsx
+++ b/apps/meteor/client/views/admin/customSounds/CustomSoundsRoute.tsx
@@ -2,8 +2,8 @@ import { usePermission } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import CustomSoundsPage from './CustomSoundsPage';
+import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 
 const CustomSoundsRoute = (): ReactElement => {
 	const canManageCustomSounds = usePermission('manage-sounds');
diff --git a/apps/meteor/client/views/admin/customSounds/CustomSoundsTable/CustomSoundRow.tsx b/apps/meteor/client/views/admin/customSounds/CustomSoundsTable/CustomSoundRow.tsx
index 789f07f0c1cd..88b312e996e1 100644
--- a/apps/meteor/client/views/admin/customSounds/CustomSoundsTable/CustomSoundRow.tsx
+++ b/apps/meteor/client/views/admin/customSounds/CustomSoundsTable/CustomSoundRow.tsx
@@ -1,7 +1,8 @@
 import { Box, IconButton } from '@rocket.chat/fuselage';
-import { useCustomSound, useTranslation } from '@rocket.chat/ui-contexts';
+import { useCustomSound } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useCallback, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { GenericTableCell, GenericTableRow } from '../../../../components/GenericTable';
 
@@ -14,7 +15,7 @@ type CustomSoundRowProps = {
 };
 
 const CustomSoundRow = ({ onClick, sound }: CustomSoundRowProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [isPlay, setPlayAudio] = useState(false);
 	const customSound = useCustomSound();
 
diff --git a/apps/meteor/client/views/admin/customSounds/CustomSoundsTable/CustomSoundsTable.tsx b/apps/meteor/client/views/admin/customSounds/CustomSoundsTable/CustomSoundsTable.tsx
index f5930435e025..021bbad844b0 100644
--- a/apps/meteor/client/views/admin/customSounds/CustomSoundsTable/CustomSoundsTable.tsx
+++ b/apps/meteor/client/views/admin/customSounds/CustomSoundsTable/CustomSoundsTable.tsx
@@ -5,6 +5,7 @@ import { useQuery } from '@tanstack/react-query';
 import type { MutableRefObject } from 'react';
 import React, { useState, useMemo, useEffect } from 'react';
 
+import CustomSoundRow from './CustomSoundRow';
 import FilterByText from '../../../../components/FilterByText';
 import GenericNoResults from '../../../../components/GenericNoResults';
 import {
@@ -16,7 +17,6 @@ import {
 } from '../../../../components/GenericTable';
 import { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
 import { useSort } from '../../../../components/GenericTable/hooks/useSort';
-import CustomSoundRow from './CustomSoundRow';
 
 type CustomSoundsTableProps = {
 	onClick: (soundId: string) => () => void;
@@ -28,7 +28,7 @@ const CustomSoundsTable = ({ reload, onClick }: CustomSoundsTableProps) => {
 	const { sortBy, sortDirection, setSort } = useSort<'name'>('name');
 	const { current, itemsPerPage, setItemsPerPage: onSetItemsPerPage, setCurrent: onSetCurrent, ...paginationProps } = usePagination();
 
-	const [text, setParams] = useState('');
+	const [text, setText] = useState('');
 
 	const query = useDebouncedValue(
 		useMemo(
@@ -63,7 +63,7 @@ const CustomSoundsTable = ({ reload, onClick }: CustomSoundsTableProps) => {
 
 	return (
 		<>
-			<FilterByText onChange={setParams} />
+			<FilterByText value={text} onChange={(event) => setText(event.target.value)} />
 			{isLoading && (
 				<GenericTable>
 					<GenericTableHeader>{headers}</GenericTableHeader>
diff --git a/apps/meteor/client/views/admin/customSounds/EditCustomSound.tsx b/apps/meteor/client/views/admin/customSounds/EditCustomSound.tsx
index f21bf86fc267..c69dc9e9b0f1 100644
--- a/apps/meteor/client/views/admin/customSounds/EditCustomSound.tsx
+++ b/apps/meteor/client/views/admin/customSounds/EditCustomSound.tsx
@@ -1,10 +1,11 @@
-import { useEndpoint, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
-import { FormSkeleton } from '../../../components/Skeleton';
 import EditSound from './EditSound';
+import { FormSkeleton } from '../../../components/Skeleton';
 
 type EditCustomSoundProps = {
 	_id: string | undefined;
@@ -13,7 +14,7 @@ type EditCustomSoundProps = {
 };
 
 function EditCustomSound({ _id, onChange, ...props }: EditCustomSoundProps): ReactElement | null {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const getSounds = useEndpoint('GET', '/v1/custom-sounds.list');
 
 	const dispatchToastMessage = useToastMessageDispatch();
diff --git a/apps/meteor/client/views/admin/customSounds/EditSound.tsx b/apps/meteor/client/views/admin/customSounds/EditSound.tsx
index 1274e9deda35..b87d8df9f194 100644
--- a/apps/meteor/client/views/admin/customSounds/EditSound.tsx
+++ b/apps/meteor/client/views/admin/customSounds/EditSound.tsx
@@ -1,12 +1,13 @@
 import { Box, Button, ButtonGroup, Margins, TextInput, Field, FieldLabel, FieldRow, IconButton } from '@rocket.chat/fuselage';
-import { useSetModal, useToastMessageDispatch, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetModal, useToastMessageDispatch, useMethod } from '@rocket.chat/ui-contexts';
 import type { ReactElement, SyntheticEvent } from 'react';
 import React, { useCallback, useState, useMemo, useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 
+import { validate, createSoundData } from './lib';
 import { ContextualbarScrollableContent, ContextualbarFooter } from '../../../components/Contextualbar';
 import GenericModal from '../../../components/GenericModal';
 import { useSingleFileInput } from '../../../hooks/useSingleFileInput';
-import { validate, createSoundData } from './lib';
 
 type EditSoundProps = {
 	close?: () => void;
@@ -19,7 +20,7 @@ type EditSoundProps = {
 };
 
 function EditSound({ close, onChange, data, ...props }: EditSoundProps): ReactElement {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 	const setModal = useSetModal();
 
diff --git a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusFormWithData.tsx b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusFormWithData.tsx
index 101de668e6a1..d86d4d39e8dc 100644
--- a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusFormWithData.tsx
+++ b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusFormWithData.tsx
@@ -1,12 +1,13 @@
 import type { IUserStatus } from '@rocket.chat/core-typings';
 import { Box, Callout } from '@rocket.chat/fuselage';
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
-import { FormSkeleton } from '../../../components/Skeleton';
 import CustomUserStatusForm from './CustomUserStatusForm';
+import { FormSkeleton } from '../../../components/Skeleton';
 
 type CustomUserStatusFormWithDataProps = {
 	_id?: IUserStatus['_id'];
@@ -15,7 +16,7 @@ type CustomUserStatusFormWithDataProps = {
 };
 
 const CustomUserStatusFormWithData = ({ _id, onReload, onClose }: CustomUserStatusFormWithDataProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const query = useMemo(() => ({ _id }), [_id]);
 
 	const getCustomUserStatus = useEndpoint('GET', '/v1/custom-user-status.list');
diff --git a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusRoute.tsx b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusRoute.tsx
index f3c9d7be4b25..875f3c9e0202 100644
--- a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusRoute.tsx
+++ b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusRoute.tsx
@@ -3,6 +3,10 @@ import { useRoute, useRouteParameter, usePermission, useTranslation, useSetting
 import type { ReactElement } from 'react';
 import React, { useCallback, useRef, useEffect } from 'react';
 
+import CustomUserActiveConnections from './CustomUserActiveConnections';
+import CustomUserStatusFormWithData from './CustomUserStatusFormWithData';
+import CustomUserStatusService from './CustomUserStatusService';
+import CustomUserStatusTable from './CustomUserStatusTable';
 import {
 	Contextualbar,
 	ContextualbarHeader,
@@ -13,10 +17,6 @@ import {
 import { Page, PageHeader, PageContent } from '../../../components/Page';
 import { useIsEnterprise } from '../../../hooks/useIsEnterprise';
 import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
-import CustomUserActiveConnections from './CustomUserActiveConnections';
-import CustomUserStatusFormWithData from './CustomUserStatusFormWithData';
-import CustomUserStatusService from './CustomUserStatusService';
-import CustomUserStatusTable from './CustomUserStatusTable';
 
 const CustomUserStatusRoute = (): ReactElement => {
 	const t = useTranslation();
@@ -25,7 +25,7 @@ const CustomUserStatusRoute = (): ReactElement => {
 	const id = useRouteParameter('id');
 	const canManageUserStatus = usePermission('manage-user-status');
 	const { data: license } = useIsEnterprise();
-	const presenceDisabled = useSetting<boolean>('Presence_broadcast_disabled');
+	const presenceDisabled = useSetting('Presence_broadcast_disabled', false);
 
 	useEffect(() => {
 		presenceDisabled && route.push({ context: 'presence-service' });
diff --git a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusService.tsx b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusService.tsx
index 626529e3010a..90bbd7b9dc78 100644
--- a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusService.tsx
+++ b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusService.tsx
@@ -23,7 +23,7 @@ import { useActiveConnections } from '../../hooks/useActiveConnections';
 const CustomUserStatusService = () => {
 	const { t } = useTranslation();
 	const result = useActiveConnections();
-	const presenceDisabled = useSetting<boolean>('Presence_broadcast_disabled');
+	const presenceDisabled = useSetting('Presence_broadcast_disabled', false);
 	const togglePresenceServiceEndpoint = useEndpoint('POST', '/v1/presence.enableBroadcast');
 	const disablePresenceService = useMutation(() => togglePresenceServiceEndpoint());
 	const { data: license, isLoading: licenseIsLoading } = useIsEnterprise();
diff --git a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusTable/CustomUserStatusTable.tsx b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusTable/CustomUserStatusTable.tsx
index 0aa24542ca96..72551525cf3a 100644
--- a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusTable/CustomUserStatusTable.tsx
+++ b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusTable/CustomUserStatusTable.tsx
@@ -1,11 +1,13 @@
 import { Pagination } from '@rocket.chat/fuselage';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
 import { escapeRegExp } from '@rocket.chat/string-helpers';
-import { useEndpoint, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import type { ReactElement, MutableRefObject } from 'react';
 import React, { useState, useMemo, useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 
+import CustomUserStatusRow from './CustomUserStatusRow';
 import FilterByText from '../../../../components/FilterByText';
 import GenericNoResult from '../../../../components/GenericNoResults';
 import {
@@ -17,7 +19,6 @@ import {
 } from '../../../../components/GenericTable';
 import { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
 import { useSort } from '../../../../components/GenericTable/hooks/useSort';
-import CustomUserStatusRow from './CustomUserStatusRow';
 
 type CustomUserStatusProps = {
 	reload: MutableRefObject<() => void>;
@@ -26,7 +27,7 @@ type CustomUserStatusProps = {
 
 // TODO: Missing error state
 const CustomUserStatus = ({ reload, onClick }: CustomUserStatusProps): ReactElement | null => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [text, setText] = useState('');
 	const { current, itemsPerPage, setItemsPerPage: onSetItemsPerPage, setCurrent: onSetCurrent, ...paginationProps } = usePagination();
 	const { sortBy, sortDirection, setSort } = useSort<'name' | 'statusType'>('name');
@@ -70,7 +71,7 @@ const CustomUserStatus = ({ reload, onClick }: CustomUserStatusProps): ReactElem
 
 	return (
 		<>
-			<FilterByText onChange={setText} />
+			<FilterByText value={text} onChange={(event) => setText(event.target.value)} />
 			{data.length === 0 && <GenericNoResult />}
 			{data && data.length > 0 && (
 				<>
@@ -91,9 +92,7 @@ const CustomUserStatus = ({ reload, onClick }: CustomUserStatusProps): ReactElem
 						</GenericTableHeader>
 						<GenericTableBody>
 							{isLoading && <GenericTableLoadingTable headerCells={2} />}
-							{data?.map((status) => (
-								<CustomUserStatusRow key={status._id} status={status} onClick={onClick} />
-							))}
+							{data?.map((status) => <CustomUserStatusRow key={status._id} status={status} onClick={onClick} />)}
 						</GenericTableBody>
 					</GenericTable>
 					{isFetched && (
diff --git a/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminPage.tsx b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminPage.tsx
index 317a9f519030..5ecb0180cc2e 100644
--- a/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminPage.tsx
+++ b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminPage.tsx
@@ -1,14 +1,15 @@
-import { useRouteParameter, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRouteParameter } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useRef } from 'react';
+import { useTranslation } from 'react-i18next';
 
-import { ContextualbarDialog } from '../../../components/Contextualbar';
-import { Page, PageHeader, PageContent } from '../../../components/Page';
 import DeviceManagementAdminTable from './DeviceManagementAdminTable';
 import DeviceManagementInfo from './DeviceManagementInfo';
+import { ContextualbarDialog } from '../../../components/Contextualbar';
+import { Page, PageHeader, PageContent } from '../../../components/Page';
 
 const DeviceManagementAdminPage = (): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const context = useRouteParameter('context');
 	const deviceId = useRouteParameter('id');
 
diff --git a/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminRoute.tsx b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminRoute.tsx
index e7624ffd956e..6d7216ddf1c6 100644
--- a/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminRoute.tsx
+++ b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminRoute.tsx
@@ -1,17 +1,18 @@
-import { usePermission, useRouter, useSetModal, useCurrentModal, useTranslation } from '@rocket.chat/ui-contexts';
+import { usePermission, useRouter, useSetModal, useCurrentModal } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 
+import DeviceManagementAdminPage from './DeviceManagementAdminPage';
 import { getURL } from '../../../../app/utils/client/getURL';
 import GenericUpsellModal from '../../../components/GenericUpsellModal';
 import { useUpsellActions } from '../../../components/GenericUpsellModal/hooks';
 import PageSkeleton from '../../../components/PageSkeleton';
 import { useHasLicenseModule } from '../../../hooks/useHasLicenseModule';
 import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
-import DeviceManagementAdminPage from './DeviceManagementAdminPage';
 
 const DeviceManagementAdminRoute = (): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const router = useRouter();
 	const setModal = useSetModal();
 	const isModalOpen = !!useCurrentModal();
diff --git a/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminRow.tsx b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminRow.tsx
index 5420be953601..c10a267ea96c 100644
--- a/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminRow.tsx
+++ b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminRow.tsx
@@ -1,8 +1,9 @@
 import { Box, Menu, Option } from '@rocket.chat/fuselage';
 import { useMediaQuery, useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useRoute, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRoute } from '@rocket.chat/ui-contexts';
 import type { KeyboardEvent, ReactElement } from 'react';
 import React, { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { GenericTableRow, GenericTableCell } from '../../../../components/GenericTable';
 import DeviceIcon from '../../../../components/deviceManagement/DeviceIcon';
@@ -32,7 +33,7 @@ const DeviceManagementAdminRow = ({
 	rcVersion,
 	onReload,
 }: DeviceRowProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const deviceManagementRouter = useRoute('device-management');
 	const formatDateAndTime = useFormatDateAndTime();
 	const mediaQuery = useMediaQuery('(min-width: 1024px)');
diff --git a/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminTable.tsx b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminTable.tsx
index 84037afdcab8..e3ed1bc8e3aa 100644
--- a/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminTable.tsx
+++ b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminTable/DeviceManagementAdminTable.tsx
@@ -4,13 +4,13 @@ import type { ReactElement, MutableRefObject } from 'react';
 import React, { useState, useMemo, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import DeviceManagementAdminRow from './DeviceManagementAdminRow';
 import FilterByText from '../../../../components/FilterByText';
 import { GenericTableHeaderCell } from '../../../../components/GenericTable';
 import { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
 import { useSort } from '../../../../components/GenericTable/hooks/useSort';
 import DeviceManagementTable from '../../../../components/deviceManagement/DeviceManagementTable';
 import { useEndpointData } from '../../../../hooks/useEndpointData';
-import DeviceManagementAdminRow from './DeviceManagementAdminRow';
 
 const sortMapping = {
 	client: 'device.name',
@@ -76,7 +76,7 @@ const DeviceManagementAdminTable = ({ reloadRef }: { reloadRef: MutableRefObject
 
 	return (
 		<>
-			<FilterByText placeholder={t('Search_Devices_Users')} onChange={setText} />
+			<FilterByText placeholder={t('Search_Devices_Users')} value={text} onChange={(event) => setText(event.target.value)} />
 			<DeviceManagementTable
 				data={data}
 				phase={phase}
diff --git a/apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfo.tsx b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfo.tsx
index 39f75840b813..dec4c52599f1 100644
--- a/apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfo.tsx
+++ b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfo.tsx
@@ -1,9 +1,10 @@
 import type { DeviceManagementPopulatedSession } from '@rocket.chat/core-typings';
 import { Box, Button, ButtonGroup, StatusBullet } from '@rocket.chat/fuselage';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
-import { useRoute, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRoute } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import {
 	Contextualbar,
@@ -23,7 +24,7 @@ type DeviceManagementInfoProps = DeviceManagementPopulatedSession & {
 };
 
 const DeviceManagementInfo = ({ device, sessionId, loginAt, ip, userId, _user, onReload }: DeviceManagementInfoProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const deviceManagementRouter = useRoute('device-management');
 	const formatDateAndTime = useFormatDateAndTime();
 
diff --git a/apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfoWithData.tsx b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfoWithData.tsx
index f884b27e0cb1..97c4f16fac61 100644
--- a/apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfoWithData.tsx
+++ b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfoWithData.tsx
@@ -4,6 +4,7 @@ import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import DeviceManagementInfo from './DeviceManagementInfo';
 import {
 	Contextualbar,
 	ContextualbarSkeleton,
@@ -14,7 +15,6 @@ import {
 } from '../../../../components/Contextualbar';
 import { useEndpointData } from '../../../../hooks/useEndpointData';
 import { AsyncStatePhase } from '../../../../lib/asyncState';
-import DeviceManagementInfo from './DeviceManagementInfo';
 
 const convertSessionFromAPI = ({
 	loginAt,
diff --git a/apps/meteor/client/views/admin/emailInbox/EmailInboxForm.tsx b/apps/meteor/client/views/admin/emailInbox/EmailInboxForm.tsx
index 95da33b159c2..ab92971db5ba 100644
--- a/apps/meteor/client/views/admin/emailInbox/EmailInboxForm.tsx
+++ b/apps/meteor/client/views/admin/emailInbox/EmailInboxForm.tsx
@@ -18,10 +18,11 @@ import {
 	FieldHint,
 } from '@rocket.chat/fuselage';
 import { useMutableCallback, useUniqueId } from '@rocket.chat/fuselage-hooks';
-import { useSetModal, useToastMessageDispatch, useRoute, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetModal, useToastMessageDispatch, useRoute, useEndpoint } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useCallback } from 'react';
 import { useForm, Controller } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import { validateEmail } from '../../../../lib/emailValidator';
 import AutoCompleteDepartment from '../../../components/AutoCompleteDepartment';
@@ -29,7 +30,7 @@ import GenericModal from '../../../components/GenericModal';
 import { PageScrollableContentWithShadow } from '../../../components/Page';
 
 const EmailInboxForm = ({ inboxData }: { inboxData?: IEmailInboxPayload }): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 	const setModal = useSetModal();
 	const router = useRoute('admin-email-inboxes');
diff --git a/apps/meteor/client/views/admin/emailInbox/EmailInboxFormWithData.tsx b/apps/meteor/client/views/admin/emailInbox/EmailInboxFormWithData.tsx
index da6c601944e0..2f2f81c9c4e7 100644
--- a/apps/meteor/client/views/admin/emailInbox/EmailInboxFormWithData.tsx
+++ b/apps/meteor/client/views/admin/emailInbox/EmailInboxFormWithData.tsx
@@ -5,8 +5,8 @@ import { useQuery } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import { FormSkeleton } from '../../../components/Skeleton';
 import EmailInboxForm from './EmailInboxForm';
+import { FormSkeleton } from '../../../components/Skeleton';
 
 const EmailInboxFormWithData = ({ id }: { id: IEmailInbox['_id'] }): ReactElement => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/admin/emailInbox/EmailInboxPage.tsx b/apps/meteor/client/views/admin/emailInbox/EmailInboxPage.tsx
index 12eb42cf7894..9d953cea63a0 100644
--- a/apps/meteor/client/views/admin/emailInbox/EmailInboxPage.tsx
+++ b/apps/meteor/client/views/admin/emailInbox/EmailInboxPage.tsx
@@ -1,15 +1,16 @@
 import { Button } from '@rocket.chat/fuselage';
-import { useRouteParameter, useRouter, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRouteParameter, useRouter } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
-import { Page, PageHeader, PageContent } from '../../../components/Page';
 import EmailInboxForm from './EmailInboxForm';
 import EmailInboxFormWithData from './EmailInboxFormWithData';
 import EmailInboxTable from './EmailInboxTable';
+import { Page, PageHeader, PageContent } from '../../../components/Page';
 
 const EmailInboxPage = (): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const router = useRouter();
 
 	const id = useRouteParameter('_id');
diff --git a/apps/meteor/client/views/admin/emailInbox/EmailInboxRoute.tsx b/apps/meteor/client/views/admin/emailInbox/EmailInboxRoute.tsx
index 7361d13b10c2..76aa229f3553 100644
--- a/apps/meteor/client/views/admin/emailInbox/EmailInboxRoute.tsx
+++ b/apps/meteor/client/views/admin/emailInbox/EmailInboxRoute.tsx
@@ -2,8 +2,8 @@ import { usePermission } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import EmailInboxPage from './EmailInboxPage';
+import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 
 const EmailInboxRoute = (): ReactElement => {
 	const canViewEmailInbox = usePermission('manage-email-inbox');
diff --git a/apps/meteor/client/views/admin/emailInbox/EmailInboxTable.tsx b/apps/meteor/client/views/admin/emailInbox/EmailInboxTable.tsx
index 281eec89627f..0990b7a30e32 100644
--- a/apps/meteor/client/views/admin/emailInbox/EmailInboxTable.tsx
+++ b/apps/meteor/client/views/admin/emailInbox/EmailInboxTable.tsx
@@ -4,6 +4,7 @@ import { useQuery } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React, { useMemo, useCallback } from 'react';
 
+import SendTestButton from './SendTestButton';
 import GenericNoResults from '../../../components/GenericNoResults';
 import {
 	GenericTable,
@@ -16,7 +17,6 @@ import {
 } from '../../../components/GenericTable';
 import { usePagination } from '../../../components/GenericTable/hooks/usePagination';
 import { useSort } from '../../../components/GenericTable/hooks/useSort';
-import SendTestButton from './SendTestButton';
 
 const EmailInboxTable = (): ReactElement => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/admin/emailInbox/SendTestButton.tsx b/apps/meteor/client/views/admin/emailInbox/SendTestButton.tsx
index c844b6e6f56e..f4ad162b6093 100644
--- a/apps/meteor/client/views/admin/emailInbox/SendTestButton.tsx
+++ b/apps/meteor/client/views/admin/emailInbox/SendTestButton.tsx
@@ -1,13 +1,14 @@
 import type { IEmailInboxPayload } from '@rocket.chat/core-typings';
 import { Button } from '@rocket.chat/fuselage';
-import { useToastMessageDispatch, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useToastMessageDispatch, useEndpoint } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { GenericTableCell } from '../../../components/GenericTable';
 
 const SendTestButton = ({ id }: { id: IEmailInboxPayload['_id'] }): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 	const sendTest = useEndpoint('POST', '/v1/email-inbox.send-test/:_id', { _id: id });
 
diff --git a/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardPage.tsx b/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardPage.tsx
index 95de437462a5..c6c1864446fd 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardPage.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardPage.tsx
@@ -3,10 +3,10 @@ import type { ReactElement } from 'react';
 import React, { useCallback, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { Page, PageHeader, PageScrollableContent } from '../../../components/Page';
 import ChannelsTab from './channels/ChannelsTab';
 import MessagesTab from './messages/MessagesTab';
 import UsersTab from './users/UsersTab';
+import { Page, PageHeader, PageScrollableContent } from '../../../components/Page';
 
 type EngagementDashboardPageProps = {
 	tab: 'users' | 'messages' | 'channels';
diff --git a/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardRoute.tsx b/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardRoute.tsx
index 17f6713220f9..ea5c20ca9e5b 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardRoute.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/EngagementDashboardRoute.tsx
@@ -10,13 +10,13 @@ import {
 import type { ReactElement } from 'react';
 import React, { useEffect } from 'react';
 
+import EngagementDashboardPage from './EngagementDashboardPage';
 import { getURL } from '../../../../app/utils/client/getURL';
 import GenericUpsellModal from '../../../components/GenericUpsellModal';
 import { useUpsellActions } from '../../../components/GenericUpsellModal/hooks';
 import PageSkeleton from '../../../components/PageSkeleton';
 import { useHasLicenseModule } from '../../../hooks/useHasLicenseModule';
 import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
-import EngagementDashboardPage from './EngagementDashboardPage';
 
 const isValidTab = (tab: string | undefined): tab is 'users' | 'messages' | 'channels' =>
 	typeof tab === 'string' && ['users', 'messages', 'channels'].includes(tab);
diff --git a/apps/meteor/client/views/admin/engagementDashboard/channels/useChannelsList.ts b/apps/meteor/client/views/admin/engagementDashboard/channels/useChannelsList.ts
index f45c620c8b49..875f9c2d932d 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/channels/useChannelsList.ts
+++ b/apps/meteor/client/views/admin/engagementDashboard/channels/useChannelsList.ts
@@ -32,7 +32,7 @@ export const useChannelsList = ({ period, offset, count }: UseChannelsListOption
 						...response,
 						start,
 						end,
-				  }
+					}
 				: undefined;
 		},
 		{
diff --git a/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesPerChannelSection.tsx b/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesPerChannelSection.tsx
index 88fad25990d0..86e7836b40d3 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesPerChannelSection.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/messages/MessagesPerChannelSection.tsx
@@ -18,13 +18,13 @@ import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import { useMessageOrigins } from './useMessageOrigins';
+import { useTopFivePopularChannels } from './useTopFivePopularChannels';
 import DownloadDataButton from '../../../../components/dashboards/DownloadDataButton';
 import PeriodSelector from '../../../../components/dashboards/PeriodSelector';
 import { usePeriodSelectorState } from '../../../../components/dashboards/usePeriodSelectorState';
 import EngagementDashboardCardFilter from '../EngagementDashboardCardFilter';
 import LegendSymbol from '../dataView/LegendSymbol';
-import { useMessageOrigins } from './useMessageOrigins';
-import { useTopFivePopularChannels } from './useTopFivePopularChannels';
 
 const colors = {
 	warning: Palette.statusColor['status-font-on-warning'].toString(),
diff --git a/apps/meteor/client/views/admin/engagementDashboard/messages/useMessageOrigins.ts b/apps/meteor/client/views/admin/engagementDashboard/messages/useMessageOrigins.ts
index f44b87b4f8f8..e4e9526b571f 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/messages/useMessageOrigins.ts
+++ b/apps/meteor/client/views/admin/engagementDashboard/messages/useMessageOrigins.ts
@@ -25,7 +25,7 @@ export const useMessageOrigins = ({ period }: UseMessageOriginsOptions) => {
 						...response,
 						start,
 						end,
-				  }
+					}
 				: undefined;
 		},
 		{
diff --git a/apps/meteor/client/views/admin/engagementDashboard/messages/useMessagesSent.ts b/apps/meteor/client/views/admin/engagementDashboard/messages/useMessagesSent.ts
index 6b7f40b8ae74..daeeaa388f58 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/messages/useMessagesSent.ts
+++ b/apps/meteor/client/views/admin/engagementDashboard/messages/useMessagesSent.ts
@@ -25,7 +25,7 @@ export const useMessagesSent = ({ period }: UseMessagesSentOptions) => {
 						...response,
 						start,
 						end,
-				  }
+					}
 				: undefined;
 		},
 		{
diff --git a/apps/meteor/client/views/admin/engagementDashboard/messages/useTopFivePopularChannels.ts b/apps/meteor/client/views/admin/engagementDashboard/messages/useTopFivePopularChannels.ts
index cc6707de919d..d7566d3df6fb 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/messages/useTopFivePopularChannels.ts
+++ b/apps/meteor/client/views/admin/engagementDashboard/messages/useTopFivePopularChannels.ts
@@ -25,7 +25,7 @@ export const useTopFivePopularChannels = ({ period }: UseTopFivePopularChannelsO
 						...response,
 						start,
 						end,
-				  }
+					}
 				: undefined;
 		},
 		{
diff --git a/apps/meteor/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx b/apps/meteor/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx
index 7ac1b7c91289..02776ecb555e 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx
+++ b/apps/meteor/client/views/admin/engagementDashboard/users/ActiveUsersSection.tsx
@@ -6,12 +6,12 @@ import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import { useActiveUsers } from './useActiveUsers';
 import DownloadDataButton from '../../../../components/dashboards/DownloadDataButton';
 import CounterSet from '../../../../components/dataView/CounterSet';
 import { useFormatDate } from '../../../../hooks/useFormatDate';
 import EngagementDashboardCardFilter from '../EngagementDashboardCardFilter';
 import LegendSymbol from '../dataView/LegendSymbol';
-import { useActiveUsers } from './useActiveUsers';
 
 type ActiveUsersSectionProps = {
 	timezone: 'utc' | 'local';
diff --git a/apps/meteor/client/views/admin/engagementDashboard/users/useActiveUsers.ts b/apps/meteor/client/views/admin/engagementDashboard/users/useActiveUsers.ts
index 2de826eb69b3..345540a08e1f 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/users/useActiveUsers.ts
+++ b/apps/meteor/client/views/admin/engagementDashboard/users/useActiveUsers.ts
@@ -24,7 +24,7 @@ export const useActiveUsers = ({ utc }: UseActiveUsersOptions) => {
 						...response,
 						start,
 						end,
-				  }
+					}
 				: undefined;
 		},
 		{
diff --git a/apps/meteor/client/views/admin/engagementDashboard/users/useHourlyChatActivity.ts b/apps/meteor/client/views/admin/engagementDashboard/users/useHourlyChatActivity.ts
index 56dd4b883c83..f2a7b98ebc41 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/users/useHourlyChatActivity.ts
+++ b/apps/meteor/client/views/admin/engagementDashboard/users/useHourlyChatActivity.ts
@@ -24,7 +24,7 @@ export const useHourlyChatActivity = ({ displacement, utc }: UseHourlyChatActivi
 				? {
 						...response,
 						day,
-				  }
+					}
 				: undefined;
 		},
 		{
diff --git a/apps/meteor/client/views/admin/engagementDashboard/users/useNewUsers.ts b/apps/meteor/client/views/admin/engagementDashboard/users/useNewUsers.ts
index d43dc628c587..1d378dc77b49 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/users/useNewUsers.ts
+++ b/apps/meteor/client/views/admin/engagementDashboard/users/useNewUsers.ts
@@ -22,7 +22,7 @@ export const useNewUsers = ({ period, utc }: { period: Period['key']; utc: boole
 						...response,
 						start,
 						end,
-				  }
+					}
 				: undefined;
 		},
 		{
diff --git a/apps/meteor/client/views/admin/engagementDashboard/users/useUsersByTimeOfTheDay.ts b/apps/meteor/client/views/admin/engagementDashboard/users/useUsersByTimeOfTheDay.ts
index 0faa8a434b2f..6a9fa7897814 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/users/useUsersByTimeOfTheDay.ts
+++ b/apps/meteor/client/views/admin/engagementDashboard/users/useUsersByTimeOfTheDay.ts
@@ -25,7 +25,7 @@ export const useUsersByTimeOfTheDay = ({ period, utc }: UseUsersByTimeOfTheDayOp
 						...response,
 						start,
 						end,
-				  }
+					}
 				: undefined;
 		},
 		{
diff --git a/apps/meteor/client/views/admin/engagementDashboard/users/useWeeklyChatActivity.ts b/apps/meteor/client/views/admin/engagementDashboard/users/useWeeklyChatActivity.ts
index a04e9d5da633..50b6667d535b 100644
--- a/apps/meteor/client/views/admin/engagementDashboard/users/useWeeklyChatActivity.ts
+++ b/apps/meteor/client/views/admin/engagementDashboard/users/useWeeklyChatActivity.ts
@@ -24,7 +24,7 @@ export const useWeeklyChatActivity = ({ displacement, utc }: UseWeeklyChatActivi
 				? {
 						...response,
 						day,
-				  }
+					}
 				: undefined;
 		},
 		{
diff --git a/apps/meteor/client/views/admin/featurePreview/AdminFeaturePreviewRoute.tsx b/apps/meteor/client/views/admin/featurePreview/AdminFeaturePreviewRoute.tsx
index a7d6bd77d136..3222e37a91d9 100644
--- a/apps/meteor/client/views/admin/featurePreview/AdminFeaturePreviewRoute.tsx
+++ b/apps/meteor/client/views/admin/featurePreview/AdminFeaturePreviewRoute.tsx
@@ -2,10 +2,10 @@ import { usePermission } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { memo } from 'react';
 
+import AdminFeaturePreviewPage from './AdminFeaturePreviewPage';
 import SettingsProvider from '../../../providers/SettingsProvider';
 import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import EditableSettingsProvider from '../settings/EditableSettingsProvider';
-import AdminFeaturePreviewPage from './AdminFeaturePreviewPage';
 
 const AdminFeaturePreviewRoute = (): ReactElement => {
 	const canViewFeaturesPreview = usePermission('manage-cloud');
diff --git a/apps/meteor/client/views/admin/federationDashboard/FederationDashboardPage.tsx b/apps/meteor/client/views/admin/federationDashboard/FederationDashboardPage.tsx
index 14dc96283f86..1d3bbbcfbe42 100644
--- a/apps/meteor/client/views/admin/federationDashboard/FederationDashboardPage.tsx
+++ b/apps/meteor/client/views/admin/federationDashboard/FederationDashboardPage.tsx
@@ -3,9 +3,9 @@ import type { ReactElement } from 'react';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page';
 import OverviewSection from './OverviewSection';
 import ServersSection from './ServersSection';
+import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page';
 
 function FederationDashboardPage(): ReactElement {
 	const { t } = useTranslation();
diff --git a/apps/meteor/client/views/admin/federationDashboard/FederationDashboardRoute.tsx b/apps/meteor/client/views/admin/federationDashboard/FederationDashboardRoute.tsx
index e4a9ab4d97c3..8227a0343c72 100644
--- a/apps/meteor/client/views/admin/federationDashboard/FederationDashboardRoute.tsx
+++ b/apps/meteor/client/views/admin/federationDashboard/FederationDashboardRoute.tsx
@@ -1,8 +1,8 @@
 import { useRole } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import FederationDashboardPage from './FederationDashboardPage';
+import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 
 const FederationDashboardRoute = () => {
 	const authorized = useRole('admin');
diff --git a/apps/meteor/client/views/admin/federationDashboard/OverviewSection.tsx b/apps/meteor/client/views/admin/federationDashboard/OverviewSection.tsx
index f289d6a3dc83..7ac7395fc84c 100644
--- a/apps/meteor/client/views/admin/federationDashboard/OverviewSection.tsx
+++ b/apps/meteor/client/views/admin/federationDashboard/OverviewSection.tsx
@@ -1,8 +1,9 @@
 import { Box, Skeleton } from '@rocket.chat/fuselage';
-import { useMethod, useTranslation } from '@rocket.chat/ui-contexts';
+import { useMethod } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import type { ReactElement, ReactNode } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import CounterSet from '../../../components/dataView/CounterSet';
 
@@ -41,7 +42,7 @@ const useOverviewData = (): [eventCount: ReactNode, userCount: ReactNode, server
 };
 
 function OverviewSection(): ReactElement {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const [eventCount, userCount, serverCount] = useOverviewData();
 
diff --git a/apps/meteor/client/views/admin/import/ImportHistoryPage.tsx b/apps/meteor/client/views/admin/import/ImportHistoryPage.tsx
index 42b8cee969f5..4f9d9dfe2698 100644
--- a/apps/meteor/client/views/admin/import/ImportHistoryPage.tsx
+++ b/apps/meteor/client/views/admin/import/ImportHistoryPage.tsx
@@ -4,10 +4,10 @@ import { useToastMessageDispatch, useEndpoint, useTranslation, useRouter } from
 import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
 import React, { useMemo } from 'react';
 
-import { ProgressStep } from '../../../../app/importer/lib/ImporterProgressStep';
-import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page';
 import ImportOperationSummary from './ImportOperationSummary';
 import ImportOperationSummarySkeleton from './ImportOperationSummarySkeleton';
+import { ProgressStep } from '../../../../app/importer/lib/ImporterProgressStep';
+import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page';
 
 // TODO: review inner logic
 function ImportHistoryPage() {
@@ -151,6 +151,9 @@ function ImportHistoryPage() {
 								<TableCell is='th' align='center'>
 									{t('Users')}
 								</TableCell>
+								<TableCell is='th' align='center'>
+									{t('Contacts')}
+								</TableCell>
 								<TableCell is='th' align='center'>
 									{t('Channels')}
 								</TableCell>
@@ -180,9 +183,7 @@ function ImportHistoryPage() {
 								{latestOperations.data
 									.filter(({ _id }) => !currentOperation.data.valid || currentOperation.data._id !== _id)
 									// Forcing valid=false as the current API only accept preparation/progress over currentOperation
-									?.map((operation) => (
-										<ImportOperationSummary key={operation._id} {...operation} valid={false} small={small} />
-									))}
+									?.map((operation) => <ImportOperationSummary key={operation._id} {...operation} valid={false} small={small} />)}
 							</>
 						)}
 					</TableBody>
diff --git a/apps/meteor/client/views/admin/import/ImportOperationSummary.tsx b/apps/meteor/client/views/admin/import/ImportOperationSummary.tsx
index dc8d6bfe0ec5..e4d4378e5b69 100644
--- a/apps/meteor/client/views/admin/import/ImportOperationSummary.tsx
+++ b/apps/meteor/client/views/admin/import/ImportOperationSummary.tsx
@@ -1,8 +1,9 @@
 import type { Serialized } from '@rocket.chat/core-typings';
 import { TableRow, TableCell } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useRouter, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRouter } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import {
 	ImportWaitingStates,
@@ -24,6 +25,7 @@ type ImportOperationSummaryProps = {
 		users?: number;
 		channels?: number;
 		messages?: number;
+		contacts?: number;
 		total?: number;
 	};
 	valid?: boolean;
@@ -37,10 +39,10 @@ function ImportOperationSummary({
 	file = '',
 	user,
 	small,
-	count: { users = 0, channels = 0, messages = 0, total = 0 } = {},
+	count: { users = 0, channels = 0, messages = 0, total = 0, contacts = 0 } = {},
 	valid,
 }: ImportOperationSummaryProps) {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const formatDateAndTime = useFormatDateAndTime();
 
 	const fileName = useMemo(() => {
@@ -89,7 +91,7 @@ function ImportOperationSummary({
 				role: 'link',
 				action: true,
 				onClick: handleClick,
-		  }
+			}
 		: {};
 
 	return (
@@ -101,6 +103,7 @@ function ImportOperationSummary({
 					<TableCell>{status && t(status.replace('importer_', 'importer_status_') as TranslationKey)}</TableCell>
 					<TableCell>{fileName}</TableCell>
 					<TableCell align='center'>{users}</TableCell>
+					<TableCell align='center'>{contacts}</TableCell>
 					<TableCell align='center'>{channels}</TableCell>
 					<TableCell align='center'>{messages}</TableCell>
 					<TableCell align='center'>{total}</TableCell>
diff --git a/apps/meteor/client/views/admin/import/ImportOperationSummarySkeleton.tsx b/apps/meteor/client/views/admin/import/ImportOperationSummarySkeleton.tsx
index 8c2a465cb58b..42391a253d82 100644
--- a/apps/meteor/client/views/admin/import/ImportOperationSummarySkeleton.tsx
+++ b/apps/meteor/client/views/admin/import/ImportOperationSummarySkeleton.tsx
@@ -34,6 +34,9 @@ function ImportOperationSummarySkeleton({ small = false }: ImportOperationSummar
 					<TableCell>
 						<Skeleton />
 					</TableCell>
+					<TableCell>
+						<Skeleton />
+					</TableCell>
 				</>
 			)}
 		</TableRow>
diff --git a/apps/meteor/client/views/admin/import/ImportProgressPage.tsx b/apps/meteor/client/views/admin/import/ImportProgressPage.tsx
index a8e083543398..a5697f526aaf 100644
--- a/apps/meteor/client/views/admin/import/ImportProgressPage.tsx
+++ b/apps/meteor/client/views/admin/import/ImportProgressPage.tsx
@@ -1,20 +1,21 @@
 import type { ProgressStep } from '@rocket.chat/core-typings';
 import { Box, Margins, ProgressBar, Throbber } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useToastMessageDispatch, useEndpoint, useTranslation, useStream, useRouter } from '@rocket.chat/ui-contexts';
+import { useToastMessageDispatch, useEndpoint, useStream, useRouter } from '@rocket.chat/ui-contexts';
 import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
 import React, { useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 
+import { useErrorHandler } from './useErrorHandler';
 import { ImportingStartedStates } from '../../../../app/importer/lib/ImporterProgressStep';
 import { numberFormat } from '../../../../lib/utils/stringUtils';
 import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page';
-import { useErrorHandler } from './useErrorHandler';
 
 // TODO: review inner logic
 const ImportProgressPage = function ImportProgressPage() {
 	const queryClient = useQueryClient();
 	const streamer = useStream('importers');
-	const t = useTranslation();
+	const { t, i18n } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 	const handleError = useErrorHandler();
 
@@ -77,7 +78,7 @@ const ImportProgressPage = function ImportProgressPage() {
 
 			switch (step) {
 				case 'importer_done':
-					t.has(message) &&
+					i18n.exists(message) &&
 						dispatchToastMessage({
 							type: 'success',
 							message: t(message),
@@ -87,7 +88,7 @@ const ImportProgressPage = function ImportProgressPage() {
 
 				case 'importer_import_failed':
 				case 'importer_import_cancelled':
-					t.has(message) && handleError(message);
+					i18n.exists(message) && handleError(message);
 					router.navigate('/admin/import');
 					return;
 
diff --git a/apps/meteor/client/views/admin/import/ImportRoute.tsx b/apps/meteor/client/views/admin/import/ImportRoute.tsx
index 96b5179b9ae0..50d4cfebef31 100644
--- a/apps/meteor/client/views/admin/import/ImportRoute.tsx
+++ b/apps/meteor/client/views/admin/import/ImportRoute.tsx
@@ -1,11 +1,11 @@
 import { usePermission } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import ImportHistoryPage from './ImportHistoryPage';
 import ImportProgressPage from './ImportProgressPage';
 import NewImportPage from './NewImportPage';
 import PrepareImportPage from './PrepareImportPage';
+import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 
 type ImportHistoryRouteProps = {
 	page: 'history' | 'new' | 'prepare' | 'progress';
diff --git a/apps/meteor/client/views/admin/import/NewImportPage.tsx b/apps/meteor/client/views/admin/import/NewImportPage.tsx
index 82422c1f27ca..54de54e095dd 100644
--- a/apps/meteor/client/views/admin/import/NewImportPage.tsx
+++ b/apps/meteor/client/views/admin/import/NewImportPage.tsx
@@ -1,18 +1,19 @@
 import { Box, Button, ButtonGroup, Callout, Chip, Field, Margins, Select, InputBox, TextInput, UrlInput } from '@rocket.chat/fuselage';
 import { useUniqueId, useSafely } from '@rocket.chat/fuselage-hooks';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useToastMessageDispatch, useRouter, useRouteParameter, useSetting, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useToastMessageDispatch, useRouter, useRouteParameter, useSetting, useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import type { ChangeEvent, DragEvent, FormEvent, Key, SyntheticEvent } from 'react';
 import React, { useState, useMemo, useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 
+import { useErrorHandler } from './useErrorHandler';
 import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page';
 import { useFormatMemorySize } from '../../../hooks/useFormatMemorySize';
-import { useErrorHandler } from './useErrorHandler';
 
 // TODO: review inner logic
 function NewImportPage() {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 	const handleError = useErrorHandler();
 
@@ -29,7 +30,7 @@ function NewImportPage() {
 	const importerKey = useRouteParameter('importerKey');
 	const importer = useMemo(() => (importers || []).find(({ key }) => key === importerKey), [importerKey, importers]);
 
-	const maxFileSize = useSetting<number>('FileUpload_MaxFileSize') ?? 0;
+	const maxFileSize = useSetting('FileUpload_MaxFileSize', 0);
 
 	const router = useRouter();
 
diff --git a/apps/meteor/client/views/admin/import/PrepareContacts.tsx b/apps/meteor/client/views/admin/import/PrepareContacts.tsx
new file mode 100644
index 000000000000..f4fcd9f427e8
--- /dev/null
+++ b/apps/meteor/client/views/admin/import/PrepareContacts.tsx
@@ -0,0 +1,75 @@
+import type { IImporterSelectionContact } from '@rocket.chat/core-typings';
+import { CheckBox, Table, Pagination, TableHead, TableRow, TableCell, TableBody } from '@rocket.chat/fuselage';
+import type { Dispatch, SetStateAction, ChangeEvent } from 'react';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { usePagination } from '../../../components/GenericTable/hooks/usePagination';
+
+type PrepareContactsProps = {
+	contactsCount: number;
+	contacts: IImporterSelectionContact[];
+	setContacts: Dispatch<SetStateAction<IImporterSelectionContact[]>>;
+};
+
+const PrepareContacts = ({ contactsCount, contacts, setContacts }: PrepareContactsProps) => {
+	const { t } = useTranslation();
+	const { current, itemsPerPage, setItemsPerPage, setCurrent, ...paginationProps } = usePagination();
+
+	return (
+		<>
+			<Table>
+				<TableHead>
+					<TableRow>
+						<TableCell width='x36'>
+							<CheckBox
+								checked={contactsCount > 0}
+								indeterminate={contactsCount > 0 && contactsCount !== contacts.length}
+								onChange={(): void => {
+									setContacts((contacts) => {
+										const isChecking = contactsCount === 0;
+
+										return contacts.map((contact) => ({ ...contact, do_import: isChecking }));
+									});
+								}}
+							/>
+						</TableCell>
+						<TableCell is='th'>{t('Name')}</TableCell>
+						<TableCell is='th'>{t('Emails')}</TableCell>
+						<TableCell is='th'>{t('Phones')}</TableCell>
+					</TableRow>
+				</TableHead>
+				<TableBody>
+					{contacts.slice(current, current + itemsPerPage).map((contact) => (
+						<TableRow key={contact.id}>
+							<TableCell width='x36'>
+								<CheckBox
+									checked={contact.do_import}
+									onChange={(event: ChangeEvent<HTMLInputElement>): void => {
+										const { checked } = event.currentTarget;
+										setContacts((contacts) =>
+											contacts.map((_contact) => (_contact === contact ? { ..._contact, do_import: checked } : _contact)),
+										);
+									}}
+								/>
+							</TableCell>
+							<TableCell>{contact.name}</TableCell>
+							<TableCell>{contact.emails.join('\n')}</TableCell>
+							<TableCell>{contact.phones.join('\n')}</TableCell>
+						</TableRow>
+					))}
+				</TableBody>
+			</Table>
+			<Pagination
+				current={current}
+				itemsPerPage={itemsPerPage}
+				count={contacts.length || 0}
+				onSetItemsPerPage={setItemsPerPage}
+				onSetCurrent={setCurrent}
+				{...paginationProps}
+			/>
+		</>
+	);
+};
+
+export default PrepareContacts;
diff --git a/apps/meteor/client/views/admin/import/PrepareImportPage.tsx b/apps/meteor/client/views/admin/import/PrepareImportPage.tsx
index 5af842c4bebe..9f68a3f2c619 100644
--- a/apps/meteor/client/views/admin/import/PrepareImportPage.tsx
+++ b/apps/meteor/client/views/admin/import/PrepareImportPage.tsx
@@ -1,10 +1,16 @@
-import type { IImport, IImporterSelection, Serialized } from '@rocket.chat/core-typings';
+import type { IImport, IImporterSelection, IImporterSelectionContact, Serialized } from '@rocket.chat/core-typings';
 import { Badge, Box, Button, ButtonGroup, Margins, ProgressBar, Throbber, Tabs } from '@rocket.chat/fuselage';
 import { useDebouncedValue, useSafely } from '@rocket.chat/fuselage-hooks';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
 import { useEndpoint, useTranslation, useStream, useRouter } from '@rocket.chat/ui-contexts';
 import React, { useEffect, useState, useMemo } from 'react';
 
+import type { ChannelDescriptor } from './ChannelDescriptor';
+import PrepareChannels from './PrepareChannels';
+import PrepareContacts from './PrepareContacts';
+import PrepareUsers from './PrepareUsers';
+import type { UserDescriptor } from './UserDescriptor';
+import { useErrorHandler } from './useErrorHandler';
 import {
 	ProgressStep,
 	ImportWaitingStates,
@@ -15,11 +21,6 @@ import {
 } from '../../../../app/importer/lib/ImporterProgressStep';
 import { numberFormat } from '../../../../lib/utils/stringUtils';
 import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page';
-import type { ChannelDescriptor } from './ChannelDescriptor';
-import PrepareChannels from './PrepareChannels';
-import PrepareUsers from './PrepareUsers';
-import type { UserDescriptor } from './UserDescriptor';
-import { useErrorHandler } from './useErrorHandler';
 
 const waitFor = <T, U extends T>(fn: () => Promise<T>, predicate: (arg: T) => arg is U) =>
 	new Promise<U>((resolve, reject) => {
@@ -47,11 +48,13 @@ function PrepareImportPage() {
 	const [status, setStatus] = useSafely(useState<string | null>(null));
 	const [messageCount, setMessageCount] = useSafely(useState(0));
 	const [users, setUsers] = useState<UserDescriptor[]>([]);
+	const [contacts, setContacts] = useState<IImporterSelectionContact[]>([]);
 	const [channels, setChannels] = useState<ChannelDescriptor[]>([]);
 	const [isImporting, setImporting] = useSafely(useState(false));
 
 	const usersCount = useMemo(() => users.filter(({ do_import }) => do_import).length, [users]);
 	const channelsCount = useMemo(() => channels.filter(({ do_import }) => do_import).length, [channels]);
+	const contactsCount = useMemo(() => contacts.filter(({ do_import }) => do_import).length, [contacts]);
 
 	const router = useRouter();
 
@@ -89,6 +92,7 @@ function PrepareImportPage() {
 				setMessageCount(data.message_count);
 				setUsers(data.users.map((user) => ({ ...user, username: user.username ?? '', do_import: true })));
 				setChannels(data.channels.map((channel) => ({ ...channel, name: channel.name ?? '', do_import: true })));
+				setContacts(data.contacts?.map((contact) => ({ ...contact, name: contact.name ?? '', do_import: true })) || []);
 				setPreparing(false);
 				setProgressRate(null);
 			} catch (error) {
@@ -153,6 +157,7 @@ function PrepareImportPage() {
 		try {
 			const usersToImport = users.filter(({ do_import }) => do_import).map(({ user_id }) => user_id);
 			const channelsToImport = channels.filter(({ do_import }) => do_import).map(({ channel_id }) => channel_id);
+			const contactsToImport = contacts.filter(({ do_import }) => do_import).map(({ id }) => id);
 
 			await startImport({
 				input: {
@@ -164,6 +169,10 @@ function PrepareImportPage() {
 						all: channels.length > 0 && channelsToImport.length === channels.length,
 						list: (channelsToImport.length !== channels.length && channelsToImport) || undefined,
 					},
+					contacts: {
+						all: contacts.length > 0 && contactsToImport.length === contacts.length,
+						list: (contactsToImport.length !== contacts.length && contactsToImport) || undefined,
+					},
 				},
 			});
 			router.navigate('/admin/import/progress');
@@ -179,8 +188,8 @@ function PrepareImportPage() {
 	const statusDebounced = useDebouncedValue(status, 100);
 
 	const handleMinimumImportData = !!(
-		(!usersCount && !channelsCount && !messageCount) ||
-		(!usersCount && !channelsCount && messageCount !== 0)
+		(!usersCount && !channelsCount && !contactsCount && !messageCount) ||
+		(!usersCount && !channelsCount && !contactsCount && messageCount !== 0)
 	);
 
 	return (
@@ -202,6 +211,9 @@ function PrepareImportPage() {
 							<Tabs.Item selected={tab === 'users'} onClick={handleTabClick('users')}>
 								{t('Users')} <Badge>{usersCount}</Badge>
 							</Tabs.Item>
+							<Tabs.Item selected={tab === 'contacts'} onClick={handleTabClick('contacts')}>
+								{t('Contacts')} <Badge>{contactsCount}</Badge>
+							</Tabs.Item>
 							<Tabs.Item selected={tab === 'channels'} onClick={handleTabClick('channels')}>
 								{t('Channels')} <Badge>{channelsCount}</Badge>
 							</Tabs.Item>
@@ -227,6 +239,9 @@ function PrepareImportPage() {
 							</>
 						)}
 						{!isPreparing && tab === 'users' && <PrepareUsers usersCount={usersCount} users={users} setUsers={setUsers} />}
+						{!isPreparing && tab === 'contacts' && (
+							<PrepareContacts contactsCount={contactsCount} contacts={contacts} setContacts={setContacts} />
+						)}
 						{!isPreparing && tab === 'channels' && (
 							<PrepareChannels channels={channels} channelsCount={channelsCount} setChannels={setChannels} />
 						)}
diff --git a/apps/meteor/client/views/admin/integrations/EditIntegrationsPageWithData.tsx b/apps/meteor/client/views/admin/integrations/EditIntegrationsPageWithData.tsx
index 899ad4393290..15757a6681d3 100644
--- a/apps/meteor/client/views/admin/integrations/EditIntegrationsPageWithData.tsx
+++ b/apps/meteor/client/views/admin/integrations/EditIntegrationsPageWithData.tsx
@@ -1,14 +1,15 @@
 import type { IIncomingIntegration } from '@rocket.chat/core-typings';
 import { Box, Skeleton } from '@rocket.chat/fuselage';
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import EditIncomingWebhook from './incoming/EditIncomingWebhook';
 import EditOutgoingWebhook from './outgoing/EditOutgoingWebhook';
 
 const EditIntegrationsPageWithData = ({ integrationId }: { integrationId: IIncomingIntegration['_id'] }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const params = useMemo(() => ({ integrationId }), [integrationId]);
 	const getIntegrations = useEndpoint('GET', '/v1/integrations.get');
diff --git a/apps/meteor/client/views/admin/integrations/IntegrationsPage.tsx b/apps/meteor/client/views/admin/integrations/IntegrationsPage.tsx
index a54c83a12429..35c054109f9a 100644
--- a/apps/meteor/client/views/admin/integrations/IntegrationsPage.tsx
+++ b/apps/meteor/client/views/admin/integrations/IntegrationsPage.tsx
@@ -1,15 +1,16 @@
 import { Button, ButtonGroup, Tabs } from '@rocket.chat/fuselage';
-import { useRouteParameter, useRouter, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRouteParameter, useRouter } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
-import { Page, PageHeader, PageContent } from '../../../components/Page';
 import IntegrationsTable from './IntegrationsTable';
 import NewBot from './NewBot';
 import NewZapier from './NewZapier';
+import { Page, PageHeader, PageContent } from '../../../components/Page';
 
 const IntegrationsPage = (): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const router = useRouter();
 	const context = useRouteParameter('context');
 
diff --git a/apps/meteor/client/views/admin/integrations/IntegrationsRoute.tsx b/apps/meteor/client/views/admin/integrations/IntegrationsRoute.tsx
index b8520f7063c1..7af9bdd55d62 100644
--- a/apps/meteor/client/views/admin/integrations/IntegrationsRoute.tsx
+++ b/apps/meteor/client/views/admin/integrations/IntegrationsRoute.tsx
@@ -1,10 +1,10 @@
 import { useRouteParameter, useAtLeastOnePermission } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
 
-import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import EditIntegrationsPage from './EditIntegrationsPage';
 import EditIntegrationsPageWithData from './EditIntegrationsPageWithData';
 import IntegrationsPage from './IntegrationsPage';
+import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import OutgoingWebhookHistoryPage from './outgoing/history/OutgoingWebhookHistoryPage';
 
 const IntegrationsRoute = () => {
diff --git a/apps/meteor/client/views/admin/integrations/IntegrationsTable.tsx b/apps/meteor/client/views/admin/integrations/IntegrationsTable.tsx
index 791b5a6ad02e..6a3e4121903a 100644
--- a/apps/meteor/client/views/admin/integrations/IntegrationsTable.tsx
+++ b/apps/meteor/client/views/admin/integrations/IntegrationsTable.tsx
@@ -5,6 +5,7 @@ import { useEndpoint, useRoute, useTranslation, useLayout } from '@rocket.chat/u
 import { useQuery } from '@tanstack/react-query';
 import React, { useMemo, useCallback, useState } from 'react';
 
+import IntegrationRow from './IntegrationRow';
 import FilterByText from '../../../components/FilterByText';
 import GenericNoResults from '../../../components/GenericNoResults';
 import {
@@ -16,7 +17,6 @@ import {
 } from '../../../components/GenericTable';
 import { usePagination } from '../../../components/GenericTable/hooks/usePagination';
 import { useSort } from '../../../components/GenericTable/hooks/useSort';
-import IntegrationRow from './IntegrationRow';
 
 const IntegrationsTable = ({ type }: { type?: string }) => {
 	const t = useTranslation();
@@ -97,7 +97,7 @@ const IntegrationsTable = ({ type }: { type?: string }) => {
 
 	return (
 		<>
-			<FilterByText placeholder={t('Search_Integrations')} onChange={setText} />
+			<FilterByText placeholder={t('Search_Integrations')} value={text} onChange={(event) => setText(event.target.value)} />
 			{isLoading && (
 				<GenericTable>
 					<GenericTableHeader>{headers}</GenericTableHeader>
diff --git a/apps/meteor/client/views/admin/integrations/hooks/useCreateIntegration.ts b/apps/meteor/client/views/admin/integrations/hooks/useCreateIntegration.ts
index 7b157ec186c3..fbd1364ddcb8 100644
--- a/apps/meteor/client/views/admin/integrations/hooks/useCreateIntegration.ts
+++ b/apps/meteor/client/views/admin/integrations/hooks/useCreateIntegration.ts
@@ -1,8 +1,9 @@
-import { useEndpoint, useRouter, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useRouter, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import { useMutation } from '@tanstack/react-query';
+import { useTranslation } from 'react-i18next';
 
 export const useCreateIntegration = (integrationType: 'webhook-incoming' | 'webhook-outgoing') => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const router = useRouter();
 	const createIntegration = useEndpoint('POST', '/v1/integrations.create');
 	const dispatchToastMessage = useToastMessageDispatch();
diff --git a/apps/meteor/client/views/admin/integrations/hooks/useDeleteIntegration.ts b/apps/meteor/client/views/admin/integrations/hooks/useDeleteIntegration.ts
index a43df492a101..24e7ad3538ed 100644
--- a/apps/meteor/client/views/admin/integrations/hooks/useDeleteIntegration.ts
+++ b/apps/meteor/client/views/admin/integrations/hooks/useDeleteIntegration.ts
@@ -1,8 +1,9 @@
-import { useEndpoint, useRouter, useSetModal, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useRouter, useSetModal, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import { useMutation } from '@tanstack/react-query';
+import { useTranslation } from 'react-i18next';
 
 export const useDeleteIntegration = (integrationType: 'webhook-incoming' | 'webhook-outgoing') => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const router = useRouter();
 	const setModal = useSetModal();
 
diff --git a/apps/meteor/client/views/admin/integrations/hooks/useUpdateIntegration.ts b/apps/meteor/client/views/admin/integrations/hooks/useUpdateIntegration.ts
index 7ba61a3a8437..04a2ab0ea77f 100644
--- a/apps/meteor/client/views/admin/integrations/hooks/useUpdateIntegration.ts
+++ b/apps/meteor/client/views/admin/integrations/hooks/useUpdateIntegration.ts
@@ -1,8 +1,9 @@
-import { useEndpoint, useRouter, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useRouter, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import { useMutation } from '@tanstack/react-query';
+import { useTranslation } from 'react-i18next';
 
 export const useUpdateIntegration = (integrationType: 'webhook-incoming' | 'webhook-outgoing') => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const router = useRouter();
 	const updateIntegration = useEndpoint('PUT', '/v1/integrations.update');
 	const dispatchToastMessage = useToastMessageDispatch();
diff --git a/apps/meteor/client/views/admin/integrations/incoming/EditIncomingWebhook.tsx b/apps/meteor/client/views/admin/integrations/incoming/EditIncomingWebhook.tsx
index c14c2b19d02e..40303e51c5f3 100644
--- a/apps/meteor/client/views/admin/integrations/incoming/EditIncomingWebhook.tsx
+++ b/apps/meteor/client/views/admin/integrations/incoming/EditIncomingWebhook.tsx
@@ -5,12 +5,12 @@ import { useSetModal, useTranslation, useRouter, useRouteParameter } from '@rock
 import React, { useCallback } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 
+import IncomingWebhookForm from './IncomingWebhookForm';
 import GenericModal from '../../../../components/GenericModal';
 import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../../../components/Page';
 import { useCreateIntegration } from '../hooks/useCreateIntegration';
 import { useDeleteIntegration } from '../hooks/useDeleteIntegration';
 import { useUpdateIntegration } from '../hooks/useUpdateIntegration';
-import IncomingWebhookForm from './IncomingWebhookForm';
 
 const getInitialValue = (webhookData: Serialized<IIncomingIntegration> | undefined) => ({
 	enabled: webhookData?.enabled ?? true,
diff --git a/apps/meteor/client/views/admin/integrations/incoming/IncomingWebhookForm.tsx b/apps/meteor/client/views/admin/integrations/incoming/IncomingWebhookForm.tsx
index 13249d024816..4393d3a3ef84 100644
--- a/apps/meteor/client/views/admin/integrations/incoming/IncomingWebhookForm.tsx
+++ b/apps/meteor/client/views/admin/integrations/incoming/IncomingWebhookForm.tsx
@@ -18,16 +18,17 @@ import {
 	FieldHint,
 } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
-import { useAbsoluteUrl, useTranslation } from '@rocket.chat/ui-contexts';
+import { useAbsoluteUrl } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import useClipboardWithToast from '../../../../hooks/useClipboardWithToast';
 import { useHighlightedCode } from '../../../../hooks/useHighlightedCode';
 import { useExampleData } from '../hooks/useExampleIncomingData';
 
 const IncomingWebhookForm = ({ webhookData }: { webhookData?: Serialized<IIncomingIntegration> }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const absoluteUrl = useAbsoluteUrl();
 
 	const {
@@ -178,7 +179,10 @@ const IncomingWebhookForm = ({ webhookData }: { webhookData?: Serialized<IIncomi
 							<FieldHint
 								id={`${channelField}-hint-2`}
 								dangerouslySetInnerHTML={{
-									__html: t('Start_with_s_for_user_or_s_for_channel_Eg_s_or_s', '@', '#', '@john', '#general'),
+									__html: t('Start_with_s_for_user_or_s_for_channel_Eg_s_or_s', {
+										postProcess: 'sprintf',
+										sprintf: ['@', '#', '@john', '#general'],
+									}),
 								}}
 							/>
 							{errors?.channel && (
@@ -265,7 +269,10 @@ const IncomingWebhookForm = ({ webhookData }: { webhookData?: Serialized<IIncomi
 								/>
 							</FieldRow>
 							<FieldHint id={`${emojiField}-hint-1`}>{t('You_can_use_an_emoji_as_avatar')}</FieldHint>
-							<FieldHint id={`${emojiField}-hint-2`} dangerouslySetInnerHTML={{ __html: t('Example_s', ':ghost:') }} />
+							<FieldHint
+								id={`${emojiField}-hint-2`}
+								dangerouslySetInnerHTML={{ __html: t('Example_s', { postProcess: 'sprintf', sprintf: [':ghost:'] }) }}
+							/>
 						</Field>
 						<Field>
 							<FieldRow>
diff --git a/apps/meteor/client/views/admin/integrations/outgoing/EditOutgoingWebhook.tsx b/apps/meteor/client/views/admin/integrations/outgoing/EditOutgoingWebhook.tsx
index 1ca7d1f481cd..a9330238eee3 100644
--- a/apps/meteor/client/views/admin/integrations/outgoing/EditOutgoingWebhook.tsx
+++ b/apps/meteor/client/views/admin/integrations/outgoing/EditOutgoingWebhook.tsx
@@ -5,13 +5,13 @@ import { useSetModal, useTranslation, useRouter, useRouteParameter } from '@rock
 import React, { useCallback } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 
+import OutgoingWebhookForm from './OutgoingWebhookForm';
 import GenericModal from '../../../../components/GenericModal';
 import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../../../components/Page';
 import { triggerWordsToArray, triggerWordsToString } from '../helpers/triggerWords';
 import { useCreateIntegration } from '../hooks/useCreateIntegration';
 import { useDeleteIntegration } from '../hooks/useDeleteIntegration';
 import { useUpdateIntegration } from '../hooks/useUpdateIntegration';
-import OutgoingWebhookForm from './OutgoingWebhookForm';
 
 const getInitialValue = (webhookData: Serialized<IOutgoingIntegration> | undefined, defaultToken: string) => ({
 	enabled: webhookData?.enabled ?? true,
diff --git a/apps/meteor/client/views/admin/integrations/outgoing/OutgoingWebhookForm.tsx b/apps/meteor/client/views/admin/integrations/outgoing/OutgoingWebhookForm.tsx
index 8abd6c82356f..b331796aa340 100644
--- a/apps/meteor/client/views/admin/integrations/outgoing/OutgoingWebhookForm.tsx
+++ b/apps/meteor/client/views/admin/integrations/outgoing/OutgoingWebhookForm.tsx
@@ -357,7 +357,10 @@ const OutgoingWebhookForm = () => {
 								/>
 							</FieldRow>
 							<FieldHint id={`${emojiField}-hint-1`}>{t('You_can_use_an_emoji_as_avatar')}</FieldHint>
-							<FieldHint id={`${emojiField}-hint-2`} dangerouslySetInnerHTML={{ __html: t('Example_s', ':ghost:') }} />
+							<FieldHint
+								id={`${emojiField}-hint-2`}
+								dangerouslySetInnerHTML={{ __html: t('Example_s', { postProcess: 'sprintf', sprintf: [':ghost:'] }) }}
+							/>
 						</Field>
 						<Field>
 							<FieldLabel htmlFor={tokenField} required>
diff --git a/apps/meteor/client/views/admin/integrations/outgoing/history/HistoryItem.tsx b/apps/meteor/client/views/admin/integrations/outgoing/history/HistoryItem.tsx
index e8b3895c29ef..e823172cba8a 100644
--- a/apps/meteor/client/views/admin/integrations/outgoing/history/HistoryItem.tsx
+++ b/apps/meteor/client/views/admin/integrations/outgoing/history/HistoryItem.tsx
@@ -1,15 +1,16 @@
 import type { IIntegrationHistory, Serialized } from '@rocket.chat/core-typings';
 import { Button, Icon, Box, Accordion, Field, FieldGroup, FieldLabel, FieldRow } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useMethod, useTranslation } from '@rocket.chat/ui-contexts';
+import { useMethod } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { outgoingEvents } from '../../../../../../app/integrations/lib/outgoingEvents';
 import { useFormatDateAndTime } from '../../../../../hooks/useFormatDateAndTime';
 import { useHighlightedCode } from '../../../../../hooks/useHighlightedCode';
 
 const HistoryItem = ({ data }: { data: Serialized<IIntegrationHistory> }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const replayOutgoingIntegration = useMethod('replayOutgoingIntegration');
 
diff --git a/apps/meteor/client/views/admin/integrations/outgoing/history/OutgoingWebhookHistoryPage.tsx b/apps/meteor/client/views/admin/integrations/outgoing/history/OutgoingWebhookHistoryPage.tsx
index ac05b3bf0ddd..b5d04d9fb2d6 100644
--- a/apps/meteor/client/views/admin/integrations/outgoing/history/OutgoingWebhookHistoryPage.tsx
+++ b/apps/meteor/client/views/admin/integrations/outgoing/history/OutgoingWebhookHistoryPage.tsx
@@ -4,11 +4,11 @@ import { useQuery, useQueryClient } from '@tanstack/react-query';
 import type { ComponentProps } from 'react';
 import React, { useMemo, useState, useEffect } from 'react';
 
+import HistoryContent from './HistoryContent';
 import { sdk } from '../../../../../../app/utils/client/lib/SDKClient';
 import { CustomScrollbars } from '../../../../../components/CustomScrollbars';
 import { usePagination } from '../../../../../components/GenericTable/hooks/usePagination';
 import { Page, PageHeader, PageContent } from '../../../../../components/Page';
-import HistoryContent from './HistoryContent';
 
 const OutgoingWebhookHistoryPage = (props: ComponentProps<typeof Page>) => {
 	const dispatchToastMessage = useToastMessageDispatch();
diff --git a/apps/meteor/client/views/admin/invites/InviteRow.tsx b/apps/meteor/client/views/admin/invites/InviteRow.tsx
index 70bd553c2e7f..147aa239f9c0 100644
--- a/apps/meteor/client/views/admin/invites/InviteRow.tsx
+++ b/apps/meteor/client/views/admin/invites/InviteRow.tsx
@@ -1,9 +1,10 @@
 import type { IInvite } from '@rocket.chat/core-typings';
 import { Box, IconButton } from '@rocket.chat/fuselage';
 import { useMediaQuery } from '@rocket.chat/fuselage-hooks';
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import type { ReactElement, MouseEvent } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { GenericTableCell, GenericTableRow } from '../../../components/GenericTable';
 import { useFormatDateAndTime } from '../../../hooks/useFormatDateAndTime';
@@ -25,7 +26,7 @@ type InviteRowProps = Omit<IInvite, 'createdAt' | 'expires' | '_updatedAt'> & {
 };
 
 const InviteRow = ({ _id, createdAt, expires, uses, maxUses, onRemove }: InviteRowProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const formatDateAndTime = useFormatDateAndTime();
 	const removeInvite = useEndpoint('DELETE', '/v1/removeInvite/:_id', { _id });
 
diff --git a/apps/meteor/client/views/admin/invites/InvitesPage.tsx b/apps/meteor/client/views/admin/invites/InvitesPage.tsx
index d8b6444ffa8b..670446c196f9 100644
--- a/apps/meteor/client/views/admin/invites/InvitesPage.tsx
+++ b/apps/meteor/client/views/admin/invites/InvitesPage.tsx
@@ -5,6 +5,7 @@ import { useQuery } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
 
+import InviteRow from './InviteRow';
 import GenericModal from '../../../components/GenericModal';
 import GenericNoResults from '../../../components/GenericNoResults';
 import {
@@ -15,7 +16,6 @@ import {
 	GenericTableLoadingTable,
 } from '../../../components/GenericTable';
 import { Page, PageHeader, PageContent } from '../../../components/Page';
-import InviteRow from './InviteRow';
 
 const InvitesPage = (): ReactElement => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/admin/invites/InvitesRoute.tsx b/apps/meteor/client/views/admin/invites/InvitesRoute.tsx
index cb05b33757e3..fd04e31ec09f 100644
--- a/apps/meteor/client/views/admin/invites/InvitesRoute.tsx
+++ b/apps/meteor/client/views/admin/invites/InvitesRoute.tsx
@@ -2,8 +2,8 @@ import { usePermission } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import InvitesPage from './InvitesPage';
+import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 
 const InvitesRoute = (): ReactElement => {
 	const canCreateInviteLinks = usePermission('create-invite-links');
diff --git a/apps/meteor/client/views/admin/mailer/MailerPage.tsx b/apps/meteor/client/views/admin/mailer/MailerPage.tsx
index 19e6424ea9e9..1563f31efdb7 100644
--- a/apps/meteor/client/views/admin/mailer/MailerPage.tsx
+++ b/apps/meteor/client/views/admin/mailer/MailerPage.tsx
@@ -13,10 +13,11 @@ import {
 	Box,
 } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
-import { useEndpoint, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import { useMutation } from '@tanstack/react-query';
 import React from 'react';
 import { Controller, useForm } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import { validateEmail } from '../../../../lib/emailValidator';
 import { isJSON } from '../../../../lib/utils/isJSON';
@@ -33,7 +34,7 @@ export type SendEmailFormValue = {
 const initialData = { fromEmail: '', query: '', dryRun: false, subject: '', emailBody: '' };
 
 const MailerPage = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 
 	const {
diff --git a/apps/meteor/client/views/admin/mailer/MailerRoute.tsx b/apps/meteor/client/views/admin/mailer/MailerRoute.tsx
index ab2609258753..c549fccdbe45 100644
--- a/apps/meteor/client/views/admin/mailer/MailerRoute.tsx
+++ b/apps/meteor/client/views/admin/mailer/MailerRoute.tsx
@@ -1,8 +1,8 @@
 import { usePermission } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import MailerPage from './MailerPage';
+import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 
 const MailerRoute = () => {
 	const canAccessMailer = usePermission('access-mailer');
diff --git a/apps/meteor/client/views/admin/moderation/MessageReportInfo.tsx b/apps/meteor/client/views/admin/moderation/MessageReportInfo.tsx
index 899f33b42ba5..d5b621e3c4a5 100644
--- a/apps/meteor/client/views/admin/moderation/MessageReportInfo.tsx
+++ b/apps/meteor/client/views/admin/moderation/MessageReportInfo.tsx
@@ -1,16 +1,17 @@
 import { Box, Message } from '@rocket.chat/fuselage';
-import { useEndpoint, useSetting, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useSetting, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import ReportReason from './helpers/ReportReason';
 
 const MessageReportInfo = ({ msgId }: { msgId: string }): JSX.Element => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 	const getReportsByMessage = useEndpoint('GET', `/v1/moderation.reports`);
 
-	const useRealName = Boolean(useSetting('UI_Use_Real_Name'));
+	const useRealName = useSetting('UI_Use_Real_Name', false);
 
 	const {
 		data: reportsByMessage,
diff --git a/apps/meteor/client/views/admin/moderation/ModConsoleReportDetails.tsx b/apps/meteor/client/views/admin/moderation/ModConsoleReportDetails.tsx
index 0f4460bff63a..bde941c7719b 100644
--- a/apps/meteor/client/views/admin/moderation/ModConsoleReportDetails.tsx
+++ b/apps/meteor/client/views/admin/moderation/ModConsoleReportDetails.tsx
@@ -3,9 +3,9 @@ import { Tabs, TabsItem, ContextualbarHeader, ContextualbarTitle } from '@rocket
 import { useTranslation, useRouter, useRouteParameter } from '@rocket.chat/ui-contexts';
 import React, { useState } from 'react';
 
-import { Contextualbar, ContextualbarClose, ContextualbarDialog } from '../../../components/Contextualbar';
 import UserMessages from './UserMessages';
 import UserReportInfo from './UserReports/UserReportInfo';
+import { Contextualbar, ContextualbarClose, ContextualbarDialog } from '../../../components/Contextualbar';
 
 type ModConsoleReportDetailsProps = {
 	userId: IUser['_id'];
diff --git a/apps/meteor/client/views/admin/moderation/ModerationConsolePage.tsx b/apps/meteor/client/views/admin/moderation/ModerationConsolePage.tsx
index 56801bfe145d..782aa97f0ffd 100644
--- a/apps/meteor/client/views/admin/moderation/ModerationConsolePage.tsx
+++ b/apps/meteor/client/views/admin/moderation/ModerationConsolePage.tsx
@@ -2,11 +2,11 @@ import { Tabs, TabsItem } from '@rocket.chat/fuselage';
 import { useTranslation, useRouteParameter, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import React, { useCallback } from 'react';
 
-import { Page, PageHeader, PageContent } from '../../../components/Page';
-import { getPermaLink } from '../../../lib/getPermaLink';
 import ModConsoleReportDetails from './ModConsoleReportDetails';
 import ModerationConsoleTable from './ModerationConsoleTable';
 import ModConsoleUsersTable from './UserReports/ModConsoleUsersTable';
+import { Page, PageHeader, PageContent } from '../../../components/Page';
+import { getPermaLink } from '../../../lib/getPermaLink';
 
 type TabType = 'users' | 'messages';
 
diff --git a/apps/meteor/client/views/admin/moderation/ModerationConsoleRoute.tsx b/apps/meteor/client/views/admin/moderation/ModerationConsoleRoute.tsx
index d821c4cb90fa..77549e5bef09 100644
--- a/apps/meteor/client/views/admin/moderation/ModerationConsoleRoute.tsx
+++ b/apps/meteor/client/views/admin/moderation/ModerationConsoleRoute.tsx
@@ -1,8 +1,8 @@
 import { usePermission, useRouteParameter, useRouter } from '@rocket.chat/ui-contexts';
 import React, { useEffect } from 'react';
 
-import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import ModerationConsolePage from './ModerationConsolePage';
+import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 
 const MODERATION_VALID_TABS = ['users', 'messages'] as const;
 
diff --git a/apps/meteor/client/views/admin/moderation/ModerationConsoleTable.tsx b/apps/meteor/client/views/admin/moderation/ModerationConsoleTable.tsx
index 2a26588776aa..050cfb3efd27 100644
--- a/apps/meteor/client/views/admin/moderation/ModerationConsoleTable.tsx
+++ b/apps/meteor/client/views/admin/moderation/ModerationConsoleTable.tsx
@@ -5,6 +5,8 @@ import { useQuery } from '@tanstack/react-query';
 import React, { useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import ModerationConsoleTableRow from './ModerationConsoleTableRow';
+import ModerationFilter from './helpers/ModerationFilter';
 import GenericNoResults from '../../../components/GenericNoResults';
 import {
 	GenericTable,
@@ -15,8 +17,6 @@ import {
 } from '../../../components/GenericTable';
 import { usePagination } from '../../../components/GenericTable/hooks/usePagination';
 import { useSort } from '../../../components/GenericTable/hooks/useSort';
-import ModerationConsoleTableRow from './ModerationConsoleTableRow';
-import ModerationFilter from './helpers/ModerationFilter';
 
 // TODO: Missing error state
 const ModerationConsoleTable = () => {
@@ -100,7 +100,7 @@ const ModerationConsoleTable = () => {
 
 	return (
 		<>
-			<ModerationFilter setText={setText} setDateRange={setDateRange} />
+			<ModerationFilter text={text} setText={setText} setDateRange={setDateRange} />
 			{isLoading && (
 				<GenericTable>
 					<GenericTableHeader>{headers}</GenericTableHeader>
diff --git a/apps/meteor/client/views/admin/moderation/ModerationConsoleTableRow.tsx b/apps/meteor/client/views/admin/moderation/ModerationConsoleTableRow.tsx
index 65bf7069e074..bb661577f9d4 100644
--- a/apps/meteor/client/views/admin/moderation/ModerationConsoleTableRow.tsx
+++ b/apps/meteor/client/views/admin/moderation/ModerationConsoleTableRow.tsx
@@ -1,10 +1,10 @@
 import type { IModerationAudit, IUser } from '@rocket.chat/core-typings';
 import React from 'react';
 
-import { GenericTableCell, GenericTableRow } from '../../../components/GenericTable';
-import { useFormatDateAndTime } from '../../../hooks/useFormatDateAndTime';
 import ModerationConsoleActions from './ModerationConsoleActions';
 import UserColumn from './helpers/UserColumn';
+import { GenericTableCell, GenericTableRow } from '../../../components/GenericTable';
+import { useFormatDateAndTime } from '../../../hooks/useFormatDateAndTime';
 
 export type ModerationConsoleRowProps = {
 	report: IModerationAudit;
diff --git a/apps/meteor/client/views/admin/moderation/UserMessages.tsx b/apps/meteor/client/views/admin/moderation/UserMessages.tsx
index 3b3efa68ec5e..c7a44ed11226 100644
--- a/apps/meteor/client/views/admin/moderation/UserMessages.tsx
+++ b/apps/meteor/client/views/admin/moderation/UserMessages.tsx
@@ -1,16 +1,17 @@
 import { Box, Callout, Message, StatesAction, StatesActions, StatesIcon, StatesTitle } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useEndpoint, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import React, { Fragment } from 'react';
+import { useTranslation } from 'react-i18next';
 
-import { ContextualbarFooter } from '../../../components/Contextualbar';
-import GenericNoResults from '../../../components/GenericNoResults';
 import MessageContextFooter from './MessageContextFooter';
 import ContextMessage from './helpers/ContextMessage';
+import { ContextualbarFooter } from '../../../components/Contextualbar';
+import GenericNoResults from '../../../components/GenericNoResults';
 
 const UserMessages = ({ userId, onRedirect }: { userId: string; onRedirect: (mid: string) => void }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 	const getUserMessages = useEndpoint('GET', '/v1/moderation.user.reportedMessages');
 
diff --git a/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUserActions.tsx b/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUserActions.tsx
index 21128ff72fd3..b9f413e4edcc 100644
--- a/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUserActions.tsx
+++ b/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUserActions.tsx
@@ -2,10 +2,10 @@ import { GenericMenu } from '@rocket.chat/ui-client';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
+import type { ModConsoleUserRowProps } from './ModConsoleUserTableRow';
 import useDeactivateUserAction from '../hooks/useDeactivateUserAction';
 import useDismissUserAction from '../hooks/useDismissUserAction';
 import useResetAvatarAction from '../hooks/useResetAvatarAction';
-import type { ModConsoleUserRowProps } from './ModConsoleUserTableRow';
 
 const ModConsoleUserActions = ({ report, onClick }: Omit<ModConsoleUserRowProps, 'isDesktopOrLarger'>) => {
 	const { t } = useTranslation();
diff --git a/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUserTableRow.tsx b/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUserTableRow.tsx
index b37c5330d7e0..4a8e502ba19e 100644
--- a/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUserTableRow.tsx
+++ b/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUserTableRow.tsx
@@ -1,10 +1,10 @@
 import type { IUser, UserReport, Serialized } from '@rocket.chat/core-typings';
 import React from 'react';
 
+import ModConsoleUserActions from './ModConsoleUserActions';
 import { GenericTableCell, GenericTableRow } from '../../../../components/GenericTable';
 import { useFormatDateAndTime } from '../../../../hooks/useFormatDateAndTime';
 import UserColumn from '../helpers/UserColumn';
-import ModConsoleUserActions from './ModConsoleUserActions';
 
 export type ModConsoleUserRowProps = {
 	report: Serialized<Pick<UserReport, '_id' | 'reportedUser' | 'ts'> & { count: number }>;
diff --git a/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUsersTable.tsx b/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUsersTable.tsx
index 2f8511181a30..82f9c8b7bbc6 100644
--- a/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUsersTable.tsx
+++ b/apps/meteor/client/views/admin/moderation/UserReports/ModConsoleUsersTable.tsx
@@ -2,9 +2,10 @@ import { Pagination, States, StatesAction, StatesActions, StatesIcon, StatesTitl
 import { useDebouncedValue, useMediaQuery, useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useEndpoint, useRouter } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
-import React, { useState } from 'react';
+import React, { useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import ModConsoleUserTableRow from './ModConsoleUserTableRow';
 import GenericNoResults from '../../../../components/GenericNoResults';
 import {
 	GenericTable,
@@ -16,7 +17,6 @@ import {
 import { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
 import { useSort } from '../../../../components/GenericTable/hooks/useSort';
 import ModerationFilter from '../helpers/ModerationFilter';
-import ModConsoleUserTableRow from './ModConsoleUserTableRow';
 
 const ModConsoleUsersTable = () => {
 	const [text, setText] = useState('');
@@ -35,16 +35,20 @@ const ModConsoleUsersTable = () => {
 	});
 	const { start, end } = dateRange;
 
-	const debouncedText = useDebouncedValue(text, 500);
-
-	const query = {
-		selector: debouncedText,
-		sort: JSON.stringify({ [sortBy]: sortDirection === 'asc' ? 1 : -1 }),
-		count: itemsPerPage,
-		offset: current,
-		latest: end ? `${new Date(end).toISOString().slice(0, 10)}T23:59:59.999Z` : undefined,
-		oldest: start ? `${new Date(start).toISOString().slice(0, 10)}T00:00:00.000Z` : undefined,
-	};
+	const query = useDebouncedValue(
+		useMemo(
+			() => ({
+				selector: text,
+				sort: JSON.stringify({ [sortBy]: sortDirection === 'asc' ? 1 : -1 }),
+				count: itemsPerPage,
+				offset: current,
+				latest: end ? `${new Date(end).toISOString().slice(0, 10)}T23:59:59.999Z` : undefined,
+				oldest: start ? `${new Date(start).toISOString().slice(0, 10)}T00:00:00.000Z` : undefined,
+			}),
+			[current, end, itemsPerPage, sortBy, sortDirection, start, text],
+		),
+		500,
+	);
 
 	const getReports = useEndpoint('GET', '/v1/moderation.userReports');
 
@@ -98,8 +102,7 @@ const ModConsoleUsersTable = () => {
 
 	return (
 		<>
-			<ModerationFilter setText={setText} setDateRange={setDateRange} />
-
+			<ModerationFilter text={text} setText={setText} setDateRange={setDateRange} />
 			{isLoading && (
 				<GenericTable>
 					<GenericTableHeader>{headers}</GenericTableHeader>
diff --git a/apps/meteor/client/views/admin/moderation/UserReports/UserReportInfo.tsx b/apps/meteor/client/views/admin/moderation/UserReports/UserReportInfo.tsx
index 7b410f5e6705..625daed50359 100644
--- a/apps/meteor/client/views/admin/moderation/UserReports/UserReportInfo.tsx
+++ b/apps/meteor/client/views/admin/moderation/UserReports/UserReportInfo.tsx
@@ -12,20 +12,21 @@ import {
 	FieldRow,
 	ContextualbarSkeleton,
 } from '@rocket.chat/fuselage';
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
+import UserContextFooter from './UserContextFooter';
 import { ContextualbarScrollableContent } from '../../../../components/Contextualbar';
 import GenericNoResults from '../../../../components/GenericNoResults';
 import { UserCardRole } from '../../../../components/UserCard';
 import { useFormatDate } from '../../../../hooks/useFormatDate';
 import ReportReason from '../helpers/ReportReason';
 import UserColumn from '../helpers/UserColumn';
-import UserContextFooter from './UserContextFooter';
 
 const UserReportInfo = ({ userId }: { userId: string }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const getUserReports = useEndpoint('GET', '/v1/moderation.user.reportsByUserId');
 	const formatDateAndTime = useFormatDate();
 
diff --git a/apps/meteor/client/views/admin/moderation/helpers/ContextMessage.tsx b/apps/meteor/client/views/admin/moderation/helpers/ContextMessage.tsx
index afca74f7528c..3d478755ca54 100644
--- a/apps/meteor/client/views/admin/moderation/helpers/ContextMessage.tsx
+++ b/apps/meteor/client/views/admin/moderation/helpers/ContextMessage.tsx
@@ -2,9 +2,11 @@ import type { IMessage, MessageReport, MessageAttachment } from '@rocket.chat/co
 import { isE2EEMessage, isQuoteAttachment } from '@rocket.chat/core-typings';
 import { Message, MessageName, MessageToolbarItem, MessageToolbarWrapper, MessageUsername } from '@rocket.chat/fuselage';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
-import { useSetting, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetting } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
+import ReportReasonCollapsible from './ReportReasonCollapsible';
 import MessageContentBody from '../../../../components/message/MessageContentBody';
 import Attachments from '../../../../components/message/content/Attachments';
 import UiKitMessageBlock from '../../../../components/message/uikit/UiKitMessageBlock';
@@ -15,7 +17,6 @@ import { useUserDisplayName } from '../../../../hooks/useUserDisplayName';
 import MessageReportInfo from '../MessageReportInfo';
 import useDeleteMessage from '../hooks/useDeleteMessage';
 import { useDismissMessageAction } from '../hooks/useDismissMessageAction';
-import ReportReasonCollapsible from './ReportReasonCollapsible';
 
 const ContextMessage = ({
 	message,
@@ -30,7 +31,7 @@ const ContextMessage = ({
 	onRedirect: (id: IMessage['_id']) => void;
 	onChange: () => void;
 }): JSX.Element => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const isEncryptedMessage = isE2EEMessage(message);
 
@@ -40,7 +41,7 @@ const ContextMessage = ({
 	const formatDateAndTime = useFormatDateAndTime();
 	const formatTime = useFormatTime();
 	const formatDate = useFormatDate();
-	const useRealName = Boolean(useSetting('UI_Use_Real_Name'));
+	const useRealName = useSetting('UI_Use_Real_Name', false);
 
 	const name = message.u.name || '';
 	const username = message.u.username || '';
diff --git a/apps/meteor/client/views/admin/moderation/helpers/ModerationFilter.tsx b/apps/meteor/client/views/admin/moderation/helpers/ModerationFilter.tsx
index aaad5d0c4ebd..035ab6c16c13 100644
--- a/apps/meteor/client/views/admin/moderation/helpers/ModerationFilter.tsx
+++ b/apps/meteor/client/views/admin/moderation/helpers/ModerationFilter.tsx
@@ -1,19 +1,17 @@
 import React from 'react';
-import { useTranslation } from 'react-i18next';
 
-import FilterByText from '../../../../components/FilterByText';
 import DateRangePicker from './DateRangePicker';
+import FilterByText from '../../../../components/FilterByText';
 
 type ModerationFilterProps = {
+	text: string;
 	setText: (text: string) => void;
 	setDateRange: (dateRange: { start: string; end: string }) => void;
 };
 
-const ModerationFilter = ({ setText, setDateRange }: ModerationFilterProps) => {
-	const { t } = useTranslation();
-
+const ModerationFilter = ({ text, setText, setDateRange }: ModerationFilterProps) => {
 	return (
-		<FilterByText shouldAutoFocus placeholder={t('Search')} onChange={setText}>
+		<FilterByText shouldAutoFocus value={text} onChange={(event) => setText(event.target.value)}>
 			<DateRangePicker onChange={setDateRange} />
 		</FilterByText>
 	);
diff --git a/apps/meteor/client/views/admin/moderation/hooks/useDeleteMessage.tsx b/apps/meteor/client/views/admin/moderation/hooks/useDeleteMessage.tsx
index 21d7c3b86c73..40bdabd33ac7 100644
--- a/apps/meteor/client/views/admin/moderation/hooks/useDeleteMessage.tsx
+++ b/apps/meteor/client/views/admin/moderation/hooks/useDeleteMessage.tsx
@@ -1,11 +1,12 @@
-import { useEndpoint, useSetModal, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useSetModal, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../components/GenericModal';
 
 const useDeleteMessage = (mid: string, rid: string, onChange: () => void) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const deleteMessage = useEndpoint('POST', '/v1/chat.delete');
 	const dismissMessage = useEndpoint('POST', '/v1/moderation.dismissReports');
 	const dispatchToastMessage = useToastMessageDispatch();
diff --git a/apps/meteor/client/views/admin/moderation/hooks/useDeleteMessagesAction.tsx b/apps/meteor/client/views/admin/moderation/hooks/useDeleteMessagesAction.tsx
index 3fb22dfd0c5e..6107c946e6a1 100644
--- a/apps/meteor/client/views/admin/moderation/hooks/useDeleteMessagesAction.tsx
+++ b/apps/meteor/client/views/admin/moderation/hooks/useDeleteMessagesAction.tsx
@@ -1,12 +1,13 @@
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
-import { useEndpoint, useRouteParameter, useRouter, useSetModal, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useRouteParameter, useRouter, useSetModal, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../components/GenericModal';
 
 const useDeleteMessagesAction = (userId: string): GenericMenuItemProps => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const deleteMessages = useEndpoint('POST', '/v1/moderation.user.deleteReportedMessages');
 	const dispatchToastMessage = useToastMessageDispatch();
 	const setModal = useSetModal();
diff --git a/apps/meteor/client/views/admin/moderation/hooks/useDismissMessageAction.tsx b/apps/meteor/client/views/admin/moderation/hooks/useDismissMessageAction.tsx
index 6a7f6867ea74..2bde4ef30b00 100644
--- a/apps/meteor/client/views/admin/moderation/hooks/useDismissMessageAction.tsx
+++ b/apps/meteor/client/views/admin/moderation/hooks/useDismissMessageAction.tsx
@@ -1,11 +1,12 @@
-import { useEndpoint, useSetModal, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useSetModal, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../components/GenericModal';
 
 export const useDismissMessageAction = (msgId: string): { action: () => void } => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const setModal = useSetModal();
 	const dispatchToastMessage = useToastMessageDispatch();
 	const queryClient = useQueryClient();
diff --git a/apps/meteor/client/views/admin/moderation/hooks/useResetAvatarAction.tsx b/apps/meteor/client/views/admin/moderation/hooks/useResetAvatarAction.tsx
index 8e488234814b..7096d3f507e3 100644
--- a/apps/meteor/client/views/admin/moderation/hooks/useResetAvatarAction.tsx
+++ b/apps/meteor/client/views/admin/moderation/hooks/useResetAvatarAction.tsx
@@ -1,12 +1,13 @@
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
-import { useEndpoint, useSetModal, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useSetModal, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../components/GenericModal';
 
 const useResetAvatarAction = (userId: string): GenericMenuItemProps => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const setModal = useSetModal();
 	const dispatchToastMessage = useToastMessageDispatch();
 	const queryClient = useQueryClient();
diff --git a/apps/meteor/client/views/admin/oauthApps/EditOauthAppWithData.tsx b/apps/meteor/client/views/admin/oauthApps/EditOauthAppWithData.tsx
index f87926429e67..6803d88c0021 100644
--- a/apps/meteor/client/views/admin/oauthApps/EditOauthAppWithData.tsx
+++ b/apps/meteor/client/views/admin/oauthApps/EditOauthAppWithData.tsx
@@ -1,14 +1,15 @@
 import { Box } from '@rocket.chat/fuselage';
-import { useEndpoint, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React, { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
-import { FormSkeleton } from '../../../components/Skeleton';
 import EditOauthApp from './EditOauthApp';
+import { FormSkeleton } from '../../../components/Skeleton';
 
 const EditOauthAppWithData = ({ _id, ...props }: { _id: string }): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const getOauthApps = useEndpoint('GET', '/v1/oauth-apps.get');
 
diff --git a/apps/meteor/client/views/admin/oauthApps/OAuthAddApp.tsx b/apps/meteor/client/views/admin/oauthApps/OAuthAddApp.tsx
index 0982a99ccd92..d173e248bf50 100644
--- a/apps/meteor/client/views/admin/oauthApps/OAuthAddApp.tsx
+++ b/apps/meteor/client/views/admin/oauthApps/OAuthAddApp.tsx
@@ -11,11 +11,12 @@ import {
 	ToggleSwitch,
 	FieldGroup,
 } from '@rocket.chat/fuselage';
-import { useToastMessageDispatch, useRoute, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useToastMessageDispatch, useRoute, useEndpoint } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useCallback } from 'react';
 import type { SubmitHandler } from 'react-hook-form';
 import { useForm, Controller } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import { ContextualbarScrollableContent } from '../../../components/Contextualbar';
 
@@ -26,7 +27,7 @@ type OAuthAddAppPayload = {
 };
 
 const OAuthAddApp = (): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 
 	const {
diff --git a/apps/meteor/client/views/admin/oauthApps/OAuthAppsPage.tsx b/apps/meteor/client/views/admin/oauthApps/OAuthAppsPage.tsx
index cc9e174948e5..ae7d00ae4347 100644
--- a/apps/meteor/client/views/admin/oauthApps/OAuthAppsPage.tsx
+++ b/apps/meteor/client/views/admin/oauthApps/OAuthAppsPage.tsx
@@ -3,10 +3,10 @@ import { useRouteParameter, useTranslation, useRouter } from '@rocket.chat/ui-co
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import { Page, PageHeader, PageContent } from '../../../components/Page';
 import EditOauthAppWithData from './EditOauthAppWithData';
 import OAuthAddApp from './OAuthAddApp';
 import OAuthAppsTable from './OAuthAppsTable';
+import { Page, PageHeader, PageContent } from '../../../components/Page';
 
 const OAuthAppsPage = (): ReactElement => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/admin/oauthApps/OAuthAppsRoute.tsx b/apps/meteor/client/views/admin/oauthApps/OAuthAppsRoute.tsx
index fba79bf8664f..c9c419ba6808 100644
--- a/apps/meteor/client/views/admin/oauthApps/OAuthAppsRoute.tsx
+++ b/apps/meteor/client/views/admin/oauthApps/OAuthAppsRoute.tsx
@@ -2,8 +2,8 @@ import { usePermission } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import OAuthAppsPage from './OAuthAppsPage';
+import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 
 const OAuthAppsRoute = (): ReactElement => {
 	const canAccessOAuthApps = usePermission('manage-oauth-apps');
diff --git a/apps/meteor/client/views/admin/permissions/EditRolePage.tsx b/apps/meteor/client/views/admin/permissions/EditRolePage.tsx
index 8980d64d17e8..c37ed2f2ee57 100644
--- a/apps/meteor/client/views/admin/permissions/EditRolePage.tsx
+++ b/apps/meteor/client/views/admin/permissions/EditRolePage.tsx
@@ -1,17 +1,18 @@
 import type { IRole } from '@rocket.chat/core-typings';
 import { Box, ButtonGroup, Button, Margins } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useSetModal, useToastMessageDispatch, useRoute, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetModal, useToastMessageDispatch, useRoute, useEndpoint } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
+import RoleForm from './RoleForm';
 import { ContextualbarFooter, ContextualbarScrollableContent } from '../../../components/Contextualbar';
 import GenericModal from '../../../components/GenericModal';
-import RoleForm from './RoleForm';
 
 const EditRolePage = ({ role, isEnterprise }: { role?: IRole; isEnterprise: boolean }): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 	const setModal = useSetModal();
 	const usersInRoleRouter = useRoute('admin-permissions');
diff --git a/apps/meteor/client/views/admin/permissions/EditRolePageWithData.tsx b/apps/meteor/client/views/admin/permissions/EditRolePageWithData.tsx
index d08eab83a934..7f96aa148990 100644
--- a/apps/meteor/client/views/admin/permissions/EditRolePageWithData.tsx
+++ b/apps/meteor/client/views/admin/permissions/EditRolePageWithData.tsx
@@ -1,16 +1,17 @@
 import type { IRole } from '@rocket.chat/core-typings';
 import { Callout } from '@rocket.chat/fuselage';
-import { useRouteParameter, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRouteParameter } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
-import PageSkeleton from '../../../components/PageSkeleton';
-import { useHasLicenseModule } from '../../../hooks/useHasLicenseModule';
 import EditRolePage from './EditRolePage';
 import { useRole } from './hooks/useRole';
+import PageSkeleton from '../../../components/PageSkeleton';
+import { useHasLicenseModule } from '../../../hooks/useHasLicenseModule';
 
 const EditRolePageWithData = ({ roleId }: { roleId?: IRole['_id'] }): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const role = useRole(roleId);
 	const context = useRouteParameter('context');
 	const hasCustomRolesModule = useHasLicenseModule('custom-roles');
diff --git a/apps/meteor/client/views/admin/permissions/PermissionsContextBar.tsx b/apps/meteor/client/views/admin/permissions/PermissionsContextBar.tsx
index 3b8bea6097e4..a386fbda7fda 100644
--- a/apps/meteor/client/views/admin/permissions/PermissionsContextBar.tsx
+++ b/apps/meteor/client/views/admin/permissions/PermissionsContextBar.tsx
@@ -3,6 +3,8 @@ import { useRouteParameter, useRoute, useTranslation, useSetModal } from '@rocke
 import type { ReactElement } from 'react';
 import React, { useEffect } from 'react';
 
+import CustomRoleUpsellModal from './CustomRoleUpsellModal';
+import EditRolePageWithData from './EditRolePageWithData';
 import {
 	Contextualbar,
 	ContextualbarHeader,
@@ -11,8 +13,6 @@ import {
 	ContextualbarDialog,
 } from '../../../components/Contextualbar';
 import { useHasLicenseModule } from '../../../hooks/useHasLicenseModule';
-import CustomRoleUpsellModal from './CustomRoleUpsellModal';
-import EditRolePageWithData from './EditRolePageWithData';
 
 const PermissionsContextBar = (): ReactElement | null => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/admin/permissions/PermissionsRouter.tsx b/apps/meteor/client/views/admin/permissions/PermissionsRouter.tsx
index 31ab597df913..ddaff27eff56 100644
--- a/apps/meteor/client/views/admin/permissions/PermissionsRouter.tsx
+++ b/apps/meteor/client/views/admin/permissions/PermissionsRouter.tsx
@@ -2,11 +2,11 @@ import { useRouteParameter, usePermission } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 
+import PermissionsTable from './PermissionsTable';
+import UsersInRole from './UsersInRole';
 import PageSkeleton from '../../../components/PageSkeleton';
 import { useIsEnterprise } from '../../../hooks/useIsEnterprise';
 import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
-import PermissionsTable from './PermissionsTable';
-import UsersInRole from './UsersInRole';
 
 const PermissionsRouter = (): ReactElement => {
 	const canViewPermission = usePermission('access-permissions');
diff --git a/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionRow.tsx b/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionRow.tsx
index 7ddd6ca9ab45..72d9d2bf4134 100644
--- a/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionRow.tsx
+++ b/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionRow.tsx
@@ -6,10 +6,10 @@ import type { ReactElement } from 'react';
 import React, { useState, memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import RoleCell from './RoleCell';
 import { CONSTANTS } from '../../../../../app/authorization/lib';
 import { GenericTableRow, GenericTableCell } from '../../../../components/GenericTable';
 import { useChangeRole } from '../hooks/useChangeRole';
-import RoleCell from './RoleCell';
 
 const getName = (t: TFunction, permission: IPermission): string => {
 	if (permission.level === CONSTANTS.SETTINGS_LEVEL) {
diff --git a/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionsTable.tsx b/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionsTable.tsx
index 583f9d237252..b70867e86e8d 100644
--- a/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionsTable.tsx
+++ b/apps/meteor/client/views/admin/permissions/PermissionsTable/PermissionsTable.tsx
@@ -5,6 +5,9 @@ import { useRoute, usePermission, useMethod, useTranslation, useSetModal } from
 import type { ReactElement } from 'react';
 import React, { useState } from 'react';
 
+import PermissionRow from './PermissionRow';
+import PermissionsTableFilter from './PermissionsTableFilter';
+import RoleHeader from './RoleHeader';
 import GenericNoResults from '../../../../components/GenericNoResults';
 import { GenericTable, GenericTableHeader, GenericTableHeaderCell, GenericTableBody } from '../../../../components/GenericTable';
 import { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
@@ -12,9 +15,6 @@ import { Page, PageHeader, PageContent } from '../../../../components/Page';
 import CustomRoleUpsellModal from '../CustomRoleUpsellModal';
 import PermissionsContextBar from '../PermissionsContextBar';
 import { usePermissionsAndRoles } from '../hooks/usePermissionsAndRoles';
-import PermissionRow from './PermissionRow';
-import PermissionsTableFilter from './PermissionsTableFilter';
-import RoleHeader from './RoleHeader';
 
 const PermissionsTable = ({ isEnterprise }: { isEnterprise: boolean }): ReactElement => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePage.tsx b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePage.tsx
index 3e3c6988e6cf..5aa29e46f14d 100644
--- a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePage.tsx
+++ b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePage.tsx
@@ -7,10 +7,10 @@ import type { ReactElement } from 'react';
 import React from 'react';
 import { useForm, Controller } from 'react-hook-form';
 
+import UsersInRoleTable from './UsersInRoleTable';
 import { Page, PageHeader, PageContent } from '../../../../components/Page';
 import RoomAutoComplete from '../../../../components/RoomAutoComplete';
 import UserAutoCompleteMultiple from '../../../../components/UserAutoCompleteMultiple';
-import UsersInRoleTable from './UsersInRoleTable';
 
 type UsersInRolePayload = {
 	rid?: IRoom['_id'];
diff --git a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePageWithData.tsx b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePageWithData.tsx
index 8639c2407a6e..4cf421ac19a1 100644
--- a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePageWithData.tsx
+++ b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRolePageWithData.tsx
@@ -2,8 +2,8 @@ import { useRouteParameter } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import { useRole } from '../hooks/useRole';
 import UsersInRolePage from './UsersInRolePage';
+import { useRole } from '../hooks/useRole';
 
 const UsersInRolePageWithData = (): ReactElement | null => {
 	const _id = useRouteParameter('_id');
diff --git a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTable.tsx b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTable.tsx
index ed7fdd93d79c..e5a815747f1a 100644
--- a/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTable.tsx
+++ b/apps/meteor/client/views/admin/permissions/UsersInRole/UsersInRoleTable/UsersInRoleTable.tsx
@@ -1,11 +1,13 @@
 import type { IRole, IRoom } from '@rocket.chat/core-typings';
 import { Pagination } from '@rocket.chat/fuselage';
 import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
-import { useSetModal, useToastMessageDispatch, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetModal, useToastMessageDispatch, useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery, useQueryClient } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
+import UsersInRoleTableRow from './UsersInRoleTableRow';
 import GenericError from '../../../../../components/GenericError';
 import GenericModal from '../../../../../components/GenericModal';
 import GenericNoResults from '../../../../../components/GenericNoResults';
@@ -17,7 +19,6 @@ import {
 	GenericTableLoadingTable,
 } from '../../../../../components/GenericTable';
 import { usePagination } from '../../../../../components/GenericTable/hooks/usePagination';
-import UsersInRoleTableRow from './UsersInRoleTableRow';
 
 type UsersInRoleTableProps = {
 	roleName: IRole['name'];
@@ -27,7 +28,7 @@ type UsersInRoleTableProps = {
 };
 
 const UsersInRoleTable = ({ rid, roleId, roleName, description }: UsersInRoleTableProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const setModal = useSetModal();
 	const dispatchToastMessage = useToastMessageDispatch();
 	const queryClient = useQueryClient();
@@ -73,7 +74,7 @@ const UsersInRoleTable = ({ rid, roleId, roleName, description }: UsersInRoleTab
 
 		setModal(
 			<GenericModal variant='danger' onConfirm={remove} onCancel={() => setModal(null)} confirmText={t('Delete')}>
-				{t('The_user_s_will_be_removed_from_role_s', username, description || roleName)}
+				{t('The_user_s_will_be_removed_from_role_s', { postProcess: 'sprintf', sprintf: [username, description || roleName] })}
 			</GenericModal>,
 		);
 	});
@@ -101,9 +102,7 @@ const UsersInRoleTable = ({ rid, roleId, roleName, description }: UsersInRoleTab
 					<GenericTable>
 						<GenericTableHeader>{headers}</GenericTableHeader>
 						<GenericTableBody>
-							{users?.map((user) => (
-								<UsersInRoleTableRow onRemove={handleRemove} key={user?._id} user={user} />
-							))}
+							{users?.map((user) => <UsersInRoleTableRow onRemove={handleRemove} key={user?._id} user={user} />)}
 						</GenericTableBody>
 					</GenericTable>
 					<Pagination
diff --git a/apps/meteor/client/views/admin/permissions/hooks/usePermissionsAndRoles.ts b/apps/meteor/client/views/admin/permissions/hooks/usePermissionsAndRoles.ts
index b97863206b13..2b9ea2b8b478 100644
--- a/apps/meteor/client/views/admin/permissions/hooks/usePermissionsAndRoles.ts
+++ b/apps/meteor/client/views/admin/permissions/hooks/usePermissionsAndRoles.ts
@@ -5,7 +5,7 @@ import type { Mongo } from 'meteor/mongo';
 import { useCallback } from 'react';
 
 import { CONSTANTS } from '../../../../../app/authorization/lib';
-import { ChatPermissions, Roles } from '../../../../../app/models/client';
+import { Permissions, Roles } from '../../../../../app/models/client';
 import { useReactiveValue } from '../../../../hooks/useReactiveValue';
 
 export const usePermissionsAndRoles = (
@@ -25,7 +25,7 @@ export const usePermissionsAndRoles = (
 
 	const getPermissions = useCallback(
 		() =>
-			ChatPermissions.find(getFilter(), {
+			Permissions.find(getFilter(), {
 				sort: {
 					_id: 1,
 				},
@@ -34,7 +34,7 @@ export const usePermissionsAndRoles = (
 			}),
 		[limit, skip, getFilter],
 	);
-	const getTotalPermissions = useCallback(() => ChatPermissions.find(getFilter()).count(), [getFilter]);
+	const getTotalPermissions = useCallback(() => Permissions.find(getFilter()).count(), [getFilter]);
 
 	const permissions = useReactiveValue(getPermissions);
 	const permissionsTotal = useReactiveValue(getTotalPermissions);
diff --git a/apps/meteor/client/views/admin/rooms/EditRoom.tsx b/apps/meteor/client/views/admin/rooms/EditRoom.tsx
index fa40f74cfadb..ff28f2460be4 100644
--- a/apps/meteor/client/views/admin/rooms/EditRoom.tsx
+++ b/apps/meteor/client/views/admin/rooms/EditRoom.tsx
@@ -14,17 +14,18 @@ import {
 	FieldError,
 } from '@rocket.chat/fuselage';
 import { useEffectEvent, useUniqueId } from '@rocket.chat/fuselage-hooks';
-import { useEndpoint, useRouter, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useRouter, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import React from 'react';
 import { useForm, Controller } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
+import { useEditAdminRoomPermissions } from './useEditAdminRoomPermissions';
 import { ContextualbarScrollableContent, ContextualbarFooter } from '../../../components/Contextualbar';
 import RoomAvatarEditor from '../../../components/avatar/RoomAvatarEditor';
 import { getDirtyFields } from '../../../lib/getDirtyFields';
 import { roomCoordinator } from '../../../lib/rooms/roomCoordinator';
 import { useArchiveRoom } from '../../hooks/roomActions/useArchiveRoom';
 import { useDeleteRoom } from '../../hooks/roomActions/useDeleteRoom';
-import { useEditAdminRoomPermissions } from './useEditAdminRoomPermissions';
 
 type EditRoomProps = {
 	room: IRoom;
@@ -63,7 +64,7 @@ const getInitialValues = (room: Pick<IRoom, RoomAdminFieldsType>): EditRoomFormV
 });
 
 const EditRoom = ({ room, onChange, onDelete }: EditRoomProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const router = useRouter();
 	const dispatchToastMessage = useToastMessageDispatch();
 
diff --git a/apps/meteor/client/views/admin/rooms/EditRoomWithData.tsx b/apps/meteor/client/views/admin/rooms/EditRoomWithData.tsx
index 54245d3d55a9..9d3eb234c3aa 100644
--- a/apps/meteor/client/views/admin/rooms/EditRoomWithData.tsx
+++ b/apps/meteor/client/views/admin/rooms/EditRoomWithData.tsx
@@ -1,8 +1,10 @@
 import type { IRoom } from '@rocket.chat/core-typings';
-import { useEndpoint, useRouter, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useRouter, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
+import EditRoom from './EditRoom';
 import {
 	Contextualbar,
 	ContextualbarHeader,
@@ -10,12 +12,11 @@ import {
 	ContextualbarClose,
 	ContextualbarSkeleton,
 } from '../../../components/Contextualbar';
-import EditRoom from './EditRoom';
 
 type EditRoomWithDataProps = { rid?: IRoom['_id']; onReload: () => void };
 
 const EditRoomWithData = ({ rid, onReload }: EditRoomWithDataProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const router = useRouter();
 	const dispatchToastMessage = useToastMessageDispatch();
 
diff --git a/apps/meteor/client/views/admin/rooms/RoomRow.tsx b/apps/meteor/client/views/admin/rooms/RoomRow.tsx
index 05b1079bfbde..16614380f592 100644
--- a/apps/meteor/client/views/admin/rooms/RoomRow.tsx
+++ b/apps/meteor/client/views/admin/rooms/RoomRow.tsx
@@ -3,8 +3,9 @@ import type { IRoom, RoomAdminFieldsType, Serialized } from '@rocket.chat/core-t
 import { Box, Icon } from '@rocket.chat/fuselage';
 import { useMediaQuery } from '@rocket.chat/fuselage-hooks';
 import { RoomAvatar } from '@rocket.chat/ui-avatar';
-import { useRouter, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRouter } from '@rocket.chat/ui-contexts';
 import React, { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { GenericTableCell, GenericTableRow } from '../../../components/GenericTable';
 import { useFormatDate } from '../../../hooks/useFormatDate';
@@ -21,7 +22,7 @@ const getRoomDisplayName = (room: Pick<Serialized<IRoom>, RoomAdminFieldsType>):
 	room.t === 'd' ? room.usernames?.join(' x ') : roomCoordinator.getRoomName(room.t, room as IRoom);
 
 const RoomRow = ({ room }: { room: Pick<Serialized<IRoom>, RoomAdminFieldsType> }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const mediaQuery = useMediaQuery('(min-width: 1024px)');
 	const router = useRouter();
 	const formatDate = useFormatDate();
diff --git a/apps/meteor/client/views/admin/rooms/RoomsPage.tsx b/apps/meteor/client/views/admin/rooms/RoomsPage.tsx
index 0c8425726297..35ef4b651b5f 100644
--- a/apps/meteor/client/views/admin/rooms/RoomsPage.tsx
+++ b/apps/meteor/client/views/admin/rooms/RoomsPage.tsx
@@ -1,14 +1,15 @@
-import { useRouteParameter, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRouteParameter } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useRef } from 'react';
+import { useTranslation } from 'react-i18next';
 
-import { ContextualbarDialog } from '../../../components/Contextualbar';
-import { Page, PageHeader, PageContent } from '../../../components/Page';
 import EditRoomWithData from './EditRoomWithData';
 import RoomsTable from './RoomsTable';
+import { ContextualbarDialog } from '../../../components/Contextualbar';
+import { Page, PageHeader, PageContent } from '../../../components/Page';
 
 const RoomsPage = (): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const id = useRouteParameter('id');
 	const context = useRouteParameter('context');
diff --git a/apps/meteor/client/views/admin/rooms/RoomsRoute.tsx b/apps/meteor/client/views/admin/rooms/RoomsRoute.tsx
index bda14931282d..9140d816fd7e 100644
--- a/apps/meteor/client/views/admin/rooms/RoomsRoute.tsx
+++ b/apps/meteor/client/views/admin/rooms/RoomsRoute.tsx
@@ -2,8 +2,8 @@ import { usePermission } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import RoomsPage from './RoomsPage';
+import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 
 const RoomsRoute = (): ReactElement => {
 	const canViewRoomAdministration = usePermission('view-room-administration');
diff --git a/apps/meteor/client/views/admin/rooms/RoomsTable.tsx b/apps/meteor/client/views/admin/rooms/RoomsTable.tsx
index b4906b6970d1..8279c454f613 100644
--- a/apps/meteor/client/views/admin/rooms/RoomsTable.tsx
+++ b/apps/meteor/client/views/admin/rooms/RoomsTable.tsx
@@ -1,11 +1,14 @@
 import { Pagination, States, StatesIcon, StatesTitle, StatesActions, StatesAction } from '@rocket.chat/fuselage';
 import { useMediaQuery, useDebouncedValue } from '@rocket.chat/fuselage-hooks';
 import type { OptionProp } from '@rocket.chat/ui-client';
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import type { ReactElement, MutableRefObject } from 'react';
 import React, { useRef, useState, useEffect, useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
+import RoomRow from './RoomRow';
+import RoomsTableFilters from './RoomsTableFilters';
 import GenericNoResults from '../../../components/GenericNoResults';
 import {
 	GenericTable,
@@ -16,8 +19,6 @@ import {
 } from '../../../components/GenericTable';
 import { usePagination } from '../../../components/GenericTable/hooks/usePagination';
 import { useSort } from '../../../components/GenericTable/hooks/useSort';
-import RoomRow from './RoomRow';
-import RoomsTableFilters from './RoomsTableFilters';
 
 type RoomFilters = {
 	searchText: string;
@@ -27,7 +28,7 @@ type RoomFilters = {
 const DEFAULT_TYPES = ['d', 'p', 'c', 'l', 'discussions', 'teams'];
 
 const RoomsTable = ({ reload }: { reload: MutableRefObject<() => void> }): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const mediaQuery = useMediaQuery('(min-width: 1024px)');
 
 	const [roomFilters, setRoomFilters] = useState<RoomFilters>({ searchText: '', types: [] });
@@ -133,11 +134,7 @@ const RoomsTable = ({ reload }: { reload: MutableRefObject<() => void> }): React
 				<>
 					<GenericTable>
 						<GenericTableHeader>{headers}</GenericTableHeader>
-						<GenericTableBody>
-							{data.rooms?.map((room) => (
-								<RoomRow key={room._id} room={room} />
-							))}
-						</GenericTableBody>
+						<GenericTableBody>{data.rooms?.map((room) => <RoomRow key={room._id} room={room} />)}</GenericTableBody>
 					</GenericTable>
 					<Pagination
 						divider
diff --git a/apps/meteor/client/views/admin/settings/EditableSettingsProvider.tsx b/apps/meteor/client/views/admin/settings/EditableSettingsProvider.tsx
index 84e1c87dde59..b6ea33fa0305 100644
--- a/apps/meteor/client/views/admin/settings/EditableSettingsProvider.tsx
+++ b/apps/meteor/client/views/admin/settings/EditableSettingsProvider.tsx
@@ -1,4 +1,4 @@
-import type { SettingId, GroupId, ISetting, TabId } from '@rocket.chat/core-typings';
+import type { ISetting } from '@rocket.chat/core-typings';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import type { SettingsContextQuery } from '@rocket.chat/ui-contexts';
 import { useSettings } from '@rocket.chat/ui-contexts';
@@ -8,7 +8,6 @@ import type { FilterOperators } from 'mongodb';
 import type { MutableRefObject, ReactNode } from 'react';
 import React, { useEffect, useMemo, useRef } from 'react';
 
-import { useIsEnterprise } from '../../../hooks/useIsEnterprise';
 import { createReactiveSubscriptionFactory } from '../../../lib/createReactiveSubscriptionFactory';
 import type { EditableSetting, EditableSettingsContextValue } from '../EditableSettingsContext';
 import { EditableSettingsContext } from '../EditableSettingsContext';
@@ -62,7 +61,7 @@ const EditableSettingsProvider = ({ children, query = defaultQuery, omit = defau
 			return queries.every((query) => settingsCollection.find(query).count() > 0);
 		};
 
-		return createReactiveSubscriptionFactory((_id: SettingId): EditableSetting | undefined => {
+		return createReactiveSubscriptionFactory((_id: ISetting['_id']): EditableSetting | undefined => {
 			const settingsCollection = getSettingsCollection();
 			const editableSetting = settingsCollection.findOne(_id);
 
@@ -94,7 +93,7 @@ const EditableSettingsProvider = ({ children, query = defaultQuery, omit = defau
 											? { section: query.section }
 											: {
 													$or: [{ section: { $exists: false } }, { section: '' }],
-											  })),
+												})),
 								},
 								{
 									...('tab' in query &&
@@ -102,7 +101,7 @@ const EditableSettingsProvider = ({ children, query = defaultQuery, omit = defau
 											? { tab: query.tab }
 											: {
 													$or: [{ tab: { $exists: false } }, { tab: '' }],
-											  })),
+												})),
 								},
 							],
 						},
@@ -121,7 +120,7 @@ const EditableSettingsProvider = ({ children, query = defaultQuery, omit = defau
 
 	const queryGroupSections = useMemo(
 		() =>
-			createReactiveSubscriptionFactory((_id: GroupId, tab?: TabId) =>
+			createReactiveSubscriptionFactory((_id: ISetting['_id'], tab?: ISetting['_id']) =>
 				Array.from(
 					new Set(
 						getSettingsCollection()
@@ -132,7 +131,7 @@ const EditableSettingsProvider = ({ children, query = defaultQuery, omit = defau
 										? { tab }
 										: {
 												$or: [{ tab: { $exists: false } }, { tab: '' }],
-										  }),
+											}),
 								},
 								{
 									fields: {
@@ -155,7 +154,7 @@ const EditableSettingsProvider = ({ children, query = defaultQuery, omit = defau
 
 	const queryGroupTabs = useMemo(
 		() =>
-			createReactiveSubscriptionFactory((_id: GroupId) =>
+			createReactiveSubscriptionFactory((_id: ISetting['_id']) =>
 				Array.from(
 					new Set(
 						getSettingsCollection()
@@ -193,10 +192,6 @@ const EditableSettingsProvider = ({ children, query = defaultQuery, omit = defau
 		Tracker.flush();
 	});
 
-	const { data } = useIsEnterprise();
-
-	const isEnterprise = data?.isEnterprise ?? false;
-
 	const contextValue = useMemo<EditableSettingsContextValue>(
 		() => ({
 			queryEditableSetting,
@@ -204,9 +199,8 @@ const EditableSettingsProvider = ({ children, query = defaultQuery, omit = defau
 			queryGroupSections,
 			queryGroupTabs,
 			dispatch,
-			isEnterprise,
 		}),
-		[queryEditableSetting, queryEditableSettings, queryGroupSections, queryGroupTabs, dispatch, isEnterprise],
+		[queryEditableSetting, queryEditableSettings, queryGroupSections, queryGroupTabs, dispatch],
 	);
 
 	return <EditableSettingsContext.Provider children={children} value={contextValue} />;
diff --git a/apps/meteor/client/views/admin/settings/Setting/Setting.stories.tsx b/apps/meteor/client/views/admin/settings/Setting/Setting.stories.tsx
index 4e2534356b22..7705c223491a 100644
--- a/apps/meteor/client/views/admin/settings/Setting/Setting.stories.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/Setting.stories.tsx
@@ -17,7 +17,7 @@ export default {
 	},
 	decorators: [
 		(fn) => (
-			<div className='rc-old'>
+			<div>
 				<div className='page-settings'>{fn()}</div>
 			</div>
 		),
diff --git a/apps/meteor/client/views/admin/settings/Setting/Setting.tsx b/apps/meteor/client/views/admin/settings/Setting/Setting.tsx
index 19ed42927cfe..0fe1d6716690 100644
--- a/apps/meteor/client/views/admin/settings/Setting/Setting.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/Setting.tsx
@@ -2,13 +2,15 @@ import type { ISettingColor, SettingEditor, SettingValue } from '@rocket.chat/co
 import { isSettingColor, isSetting } from '@rocket.chat/core-typings';
 import { Box, Button, Tag } from '@rocket.chat/fuselage';
 import { useDebouncedCallback } from '@rocket.chat/fuselage-hooks';
-import { useSettingStructure, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSettingStructure } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useEffect, useMemo, useState, useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
-import MarkdownText from '../../../../components/MarkdownText';
-import { useEditableSetting, useEditableSettingsDispatch, useIsEnterprise } from '../../EditableSettingsContext';
 import MemoizedSetting from './MemoizedSetting';
+import MarkdownText from '../../../../components/MarkdownText';
+import { useEditableSetting, useEditableSettingsDispatch } from '../../EditableSettingsContext';
+import { useHasSettingModule } from '../hooks/useHasSettingModule';
 
 type SettingProps = {
 	className?: string;
@@ -19,7 +21,7 @@ type SettingProps = {
 function Setting({ className = undefined, settingId, sectionChanged }: SettingProps): ReactElement {
 	const setting = useEditableSetting(settingId);
 	const persistedSetting = useSettingStructure(settingId);
-	const isEnterprise = useIsEnterprise();
+	const hasSettingModule = useHasSettingModule(setting);
 
 	if (!setting || !persistedSetting) {
 		throw new Error(`Setting ${settingId} not found`);
@@ -53,7 +55,7 @@ function Setting({ className = undefined, settingId, sectionChanged }: SettingPr
 		[persistedSetting, dispatch],
 	);
 
-	const t = useTranslation();
+	const { t, i18n } = useTranslation();
 
 	const [value, setValue] = useState(setting.value);
 	const [editor, setEditor] = useState(isSettingColor(setting) ? setting.editor : undefined);
@@ -95,16 +97,22 @@ function Setting({ className = undefined, settingId, sectionChanged }: SettingPr
 
 	const { _id, disabled, readonly, type, packageValue, i18nLabel, i18nDescription, alert, invisible } = setting;
 
-	const labelText = (t.has(i18nLabel) && t(i18nLabel)) || (t.has(_id) && t(_id)) || i18nLabel || _id;
+	const labelText = (i18n.exists(i18nLabel) && t(i18nLabel)) || (i18n.exists(_id) && t(_id)) || i18nLabel || _id;
 
 	const hint = useMemo(
 		() =>
-			i18nDescription && t.has(i18nDescription) ? <MarkdownText variant='inline' preserveHtml content={t(i18nDescription)} /> : undefined,
-		[i18nDescription, t],
+			i18nDescription && i18n.exists(i18nDescription) ? (
+				<MarkdownText variant='inline' preserveHtml content={t(i18nDescription)} />
+			) : undefined,
+		[i18n, i18nDescription, t],
+	);
+
+	const callout = useMemo(
+		() => alert && <span dangerouslySetInnerHTML={{ __html: i18n.exists(alert) ? t(alert) : alert }} />,
+		[alert, i18n, t],
 	);
-	const callout = useMemo(() => alert && <span dangerouslySetInnerHTML={{ __html: t.has(alert) ? t(alert) : alert }} />, [alert, t]);
 
-	const shouldDisableEnterprise = setting.enterprise && !isEnterprise;
+	const shouldDisableEnterprise = setting.enterprise && !hasSettingModule;
 
 	const PRICING_URL = 'https://go.rocket.chat/i/see-paid-plan-customize-homepage';
 
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/ActionSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/ActionSettingInput.tsx
index 2f94048e3406..60cea596388a 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/ActionSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/ActionSettingInput.tsx
@@ -1,9 +1,10 @@
 import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { Button, FieldRow, FieldHint } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useMethod, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useMethod, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 type ActionSettingInputProps = {
 	_id: string;
@@ -13,7 +14,7 @@ type ActionSettingInputProps = {
 	sectionChanged: boolean;
 };
 function ActionSettingInput({ _id, actionText, value, disabled, sectionChanged }: ActionSettingInputProps): ReactElement {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const dispatchToastMessage = useToastMessageDispatch();
 	const actionMethod = useMethod(value);
@@ -23,7 +24,7 @@ function ActionSettingInput({ _id, actionText, value, disabled, sectionChanged }
 			const data: { message: TranslationKey; params?: string[] } = await actionMethod();
 
 			const params = data.params || [];
-			dispatchToastMessage({ type: 'success', message: t(data.message, ...params) });
+			dispatchToastMessage({ type: 'success', message: t(data.message, { postProcess: 'sprintf', sprintf: params }) });
 		} catch (error) {
 			dispatchToastMessage({ type: 'error', message: error });
 		}
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/AssetSettingInput.stories.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/AssetSettingInput.stories.tsx
index 3cc7d2252756..231d3d1a42b3 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/AssetSettingInput.stories.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/AssetSettingInput.stories.tsx
@@ -9,7 +9,7 @@ export default {
 	component: AssetSettingInput,
 	decorators: [
 		(fn) => (
-			<div className='rc-old'>
+			<div>
 				<div className='page-settings'>
 					<Field>{fn()}</Field>
 				</div>
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/AssetSettingInput.styles.css b/apps/meteor/client/views/admin/settings/Setting/inputs/AssetSettingInput.styles.css
index 6bbaf26e1687..7a8cd64f19f2 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/AssetSettingInput.styles.css
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/AssetSettingInput.styles.css
@@ -1,13 +1,12 @@
-.AssetSettingInput__input {
-	position: absolute !important;
-	z-index: 10000;
-	top: 0;
-	left: 0;
-
-	width: 100%;
-	height: 100%;
-
-	cursor: pointer;
-
-	opacity: 0;
+.asset-setting-input {
+	&__input {
+		position: absolute !important;
+		z-index: 10000;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		cursor: pointer;
+		opacity: 0;
+	}
 }
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/AssetSettingInput.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/AssetSettingInput.tsx
index 14ba6f27b4c5..39604cd1146e 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/AssetSettingInput.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/AssetSettingInput.tsx
@@ -82,7 +82,7 @@ function AssetSettingInput({ _id, label, value, asset, required, disabled, fileC
 							<Box position='relative' className={`rcx-button rcx-button--primary ${disabled ? 'is-disabled' : ''}`}>
 								{t('Select_file')}
 								<input
-									className='AssetSettingInput__input'
+									className='asset-setting-input__input'
 									type='file'
 									accept={`.${fileConstraints?.extensions?.join(', .')}`}
 									onChange={handleUpload}
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/CodeSettingInput.stories.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/CodeSettingInput.stories.tsx
index 0548aa6dc375..11512ef37296 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/CodeSettingInput.stories.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/CodeSettingInput.stories.tsx
@@ -14,7 +14,7 @@ export default {
 	},
 	decorators: [
 		(fn) => (
-			<div className='rc-old'>
+			<div>
 				<Field>{fn()}</Field>
 			</div>
 		),
diff --git a/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.spec.tsx b/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.spec.tsx
index e16bbd18a6aa..508b55c06242 100644
--- a/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.spec.tsx
+++ b/apps/meteor/client/views/admin/settings/Setting/inputs/TimespanSettingInput.spec.tsx
@@ -3,8 +3,8 @@ import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
-import { TIMEUNIT } from '../../../../../lib/convertTimeUnit';
 import { default as TimespanSettingInput, getHighestTimeUnit } from './TimespanSettingInput';
+import { TIMEUNIT } from '../../../../../lib/convertTimeUnit';
 
 global.ResizeObserver = jest.fn().mockImplementation(() => ({
 	observe: jest.fn(),
diff --git a/apps/meteor/client/views/admin/settings/SettingsGroupCard.tsx b/apps/meteor/client/views/admin/settings/SettingsGroupCard.tsx
index 52e5fae49ed7..c795411ebb14 100644
--- a/apps/meteor/client/views/admin/settings/SettingsGroupCard.tsx
+++ b/apps/meteor/client/views/admin/settings/SettingsGroupCard.tsx
@@ -3,9 +3,10 @@ import { css } from '@rocket.chat/css-in-js';
 import { Button, Box, Card, CardTitle, CardBody, CardControls } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useRouter, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRouter } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import MarkdownText from '../../../components/MarkdownText';
 
@@ -23,7 +24,7 @@ type SettingsGroupCardProps = {
 };
 
 const SettingsGroupCard = ({ id, title, description, ...props }: SettingsGroupCardProps): ReactElement => {
-	const t = useTranslation();
+	const { t, i18n } = useTranslation();
 	const router = useRouter();
 	const cardId = useUniqueId();
 	const descriptionId = useUniqueId();
@@ -33,7 +34,7 @@ const SettingsGroupCard = ({ id, title, description, ...props }: SettingsGroupCa
 			<CardTitle id={cardId}>{t(title)}</CardTitle>
 			<CardBody>
 				<Box className={clampStyle} id={descriptionId}>
-					{description && t.has(description) && <MarkdownText variant='inlineWithoutBreaks' content={t(description)} />}
+					{description && i18n.exists(description) && <MarkdownText variant='inlineWithoutBreaks' content={t(description)} />}
 				</Box>
 			</CardBody>
 			<CardControls>
diff --git a/apps/meteor/client/views/admin/settings/SettingsGroupPage/SettingsGroupPage.tsx b/apps/meteor/client/views/admin/settings/SettingsGroupPage/SettingsGroupPage.tsx
index 884c9f6e67e9..662dd2d52c9f 100644
--- a/apps/meteor/client/views/admin/settings/SettingsGroupPage/SettingsGroupPage.tsx
+++ b/apps/meteor/client/views/admin/settings/SettingsGroupPage/SettingsGroupPage.tsx
@@ -2,9 +2,10 @@ import type { ISetting, ISettingColor } from '@rocket.chat/core-typings';
 import { Accordion, Box, Button, ButtonGroup } from '@rocket.chat/fuselage';
 import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useToastMessageDispatch, useSettingsDispatch, useSettings, useTranslation } from '@rocket.chat/ui-contexts';
+import { useToastMessageDispatch, useSettingsDispatch, useSettings } from '@rocket.chat/ui-contexts';
 import type { ReactNode, FormEvent, MouseEvent } from 'react';
 import React, { useMemo, memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../../../components/Page';
 import type { EditableSetting } from '../../EditableSettingsContext';
@@ -31,7 +32,7 @@ const SettingsGroupPage = ({
 	tabs = undefined,
 	isCustom = false,
 }: SettingsGroupPageProps) => {
-	const t = useTranslation();
+	const { t, i18n } = useTranslation();
 	const dispatch = useSettingsDispatch();
 	const dispatchToastMessage = useToastMessageDispatch();
 
@@ -145,7 +146,7 @@ const SettingsGroupPage = ({
 			) : (
 				<PageScrollableContentWithShadow>
 					<Box marginBlock='none' marginInline='auto' width='full' maxWidth='x580'>
-						{i18nDescription && isTranslationKey(i18nDescription) && t.has(i18nDescription) && (
+						{i18nDescription && isTranslationKey(i18nDescription) && i18n.exists(i18nDescription) && (
 							<Box is='p' color='hint' fontScale='p2'>
 								{t(i18nDescription)}
 							</Box>
diff --git a/apps/meteor/client/views/admin/settings/SettingsGroupSelector/SettingsGroupSelector.tsx b/apps/meteor/client/views/admin/settings/SettingsGroupSelector/SettingsGroupSelector.tsx
index 5cce1e961bf5..316ddf01a6c7 100644
--- a/apps/meteor/client/views/admin/settings/SettingsGroupSelector/SettingsGroupSelector.tsx
+++ b/apps/meteor/client/views/admin/settings/SettingsGroupSelector/SettingsGroupSelector.tsx
@@ -1,4 +1,4 @@
-import type { GroupId } from '@rocket.chat/core-typings';
+import type { ISetting } from '@rocket.chat/core-typings';
 import { useSettingStructure } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
@@ -9,7 +9,7 @@ import OAuthGroupPage from '../groups/OAuthGroupPage';
 import VoipGroupPage from '../groups/VoipGroupPage';
 
 type SettingsGroupSelectorProps = {
-	groupId: GroupId;
+	groupId: ISetting['_id'];
 	onClickBack?: () => void;
 };
 
diff --git a/apps/meteor/client/views/admin/settings/SettingsPage.tsx b/apps/meteor/client/views/admin/settings/SettingsPage.tsx
index f82e16ce637c..c079185e7e92 100644
--- a/apps/meteor/client/views/admin/settings/SettingsPage.tsx
+++ b/apps/meteor/client/views/admin/settings/SettingsPage.tsx
@@ -1,18 +1,19 @@
 import { Icon, SearchInput, Skeleton, CardGrid } from '@rocket.chat/fuselage';
 import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useIsSettingsContextLoading, useTranslation } from '@rocket.chat/ui-contexts';
+import { useIsSettingsContextLoading } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useCallback, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
+import SettingsGroupCard from './SettingsGroupCard';
+import { useSettingsGroups } from './hooks/useSettingsGroups';
 import GenericNoResults from '../../../components/GenericNoResults';
 import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page';
 import PageBlockWithBorder from '../../../components/Page/PageBlockWithBorder';
-import SettingsGroupCard from './SettingsGroupCard';
-import { useSettingsGroups } from './hooks/useSettingsGroups';
 
 const SettingsPage = (): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [filter, setFilter] = useState('');
 	const handleChange = useCallback((e) => setFilter(e.currentTarget.value), []);
 
diff --git a/apps/meteor/client/views/admin/settings/SettingsRoute.tsx b/apps/meteor/client/views/admin/settings/SettingsRoute.tsx
index 0db9d336a02a..590276f65ba1 100644
--- a/apps/meteor/client/views/admin/settings/SettingsRoute.tsx
+++ b/apps/meteor/client/views/admin/settings/SettingsRoute.tsx
@@ -2,10 +2,10 @@ import { useRouteParameter, useIsPrivilegedSettingsContext, useRouter } from '@r
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import EditableSettingsProvider from './EditableSettingsProvider';
 import SettingsGroupSelector from './SettingsGroupSelector';
 import SettingsPage from './SettingsPage';
+import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 
 const omittedSettings = ['Cloud_Workspace_AirGapped_Restrictions_Remaining_Days'];
 
diff --git a/apps/meteor/client/views/admin/settings/groups/BaseGroupPage.tsx b/apps/meteor/client/views/admin/settings/groups/BaseGroupPage.tsx
index 2b2a35b00a63..652759da7ffb 100644
--- a/apps/meteor/client/views/admin/settings/groups/BaseGroupPage.tsx
+++ b/apps/meteor/client/views/admin/settings/groups/BaseGroupPage.tsx
@@ -1,9 +1,9 @@
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import { useEditableSettingsGroupSections, useEditableSettingsGroupTabs } from '../../EditableSettingsContext';
 import GenericGroupPage from './GenericGroupPage';
 import TabbedGroupPage from './TabbedGroupPage';
+import { useEditableSettingsGroupSections, useEditableSettingsGroupTabs } from '../../EditableSettingsContext';
 
 type BaseGroupPageProps = {
 	_id: string;
diff --git a/apps/meteor/client/views/admin/settings/groups/LDAPGroupPage.tsx b/apps/meteor/client/views/admin/settings/groups/LDAPGroupPage.tsx
index ae8fb0dabf2b..03ab25a2c2f9 100644
--- a/apps/meteor/client/views/admin/settings/groups/LDAPGroupPage.tsx
+++ b/apps/meteor/client/views/admin/settings/groups/LDAPGroupPage.tsx
@@ -1,21 +1,22 @@
 import type { ISetting } from '@rocket.chat/core-typings';
 import { Button, Box, TextInput, Field, FieldLabel, FieldRow } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useSetModal, useToastMessageDispatch, useSetting, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetModal, useToastMessageDispatch, useSetting, useEndpoint } from '@rocket.chat/ui-contexts';
 import type { FormEvent } from 'react';
 import React, { memo, useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
+import BaseGroupPage from './BaseGroupPage';
 import GenericModal from '../../../../components/GenericModal';
 import { useExternalLink } from '../../../../hooks/useExternalLink';
 import { useEditableSettings } from '../../EditableSettingsContext';
-import BaseGroupPage from './BaseGroupPage';
 
 type LDAPGroupPageProps = ISetting & {
 	onClickBack?: () => void;
 };
 
 function LDAPGroupPage({ _id, i18nLabel, onClickBack, ...group }: LDAPGroupPageProps) {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 	const testConnection = useEndpoint('POST', '/v1/ldap.testConnection');
 	const syncNow = useEndpoint('POST', '/v1/ldap.syncNow');
diff --git a/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage/CreateOAuthModal.spec.tsx b/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage/CreateOAuthModal.spec.tsx
new file mode 100644
index 000000000000..e11b9dfdbd3f
--- /dev/null
+++ b/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage/CreateOAuthModal.spec.tsx
@@ -0,0 +1,51 @@
+import { mockAppRoot } from '@rocket.chat/mock-providers';
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import CreateOAuthModal from './CreateOAuthModal';
+
+it('should call onClose when Cancel is clicked', async () => {
+	const onConfirm = jest.fn();
+	const onClose = jest.fn();
+
+	render(<CreateOAuthModal onConfirm={onConfirm} onClose={onClose} />, {
+		wrapper: mockAppRoot().build(),
+		legacyRoot: true,
+	});
+
+	await userEvent.click(screen.getByText('Cancel'));
+
+	expect(onClose).toHaveBeenCalled();
+});
+
+it('should call onClose when X is clicked', async () => {
+	const onConfirm = jest.fn();
+	const onClose = jest.fn();
+
+	render(<CreateOAuthModal onConfirm={onConfirm} onClose={onClose} />, {
+		wrapper: mockAppRoot().build(),
+		legacyRoot: true,
+	});
+
+	await userEvent.click(screen.getByLabelText('Close'));
+
+	expect(onClose).toHaveBeenCalled();
+});
+
+it('should call onConfirm when Add button is clicked', async () => {
+	const onConfirm = jest.fn();
+	const onClose = jest.fn();
+
+	render(<CreateOAuthModal onConfirm={onConfirm} onClose={onClose} />, {
+		wrapper: mockAppRoot().build(),
+		legacyRoot: true,
+	});
+
+	const custoOAuthNameInput = screen.getByLabelText('Custom_OAuth_name');
+	await userEvent.type(custoOAuthNameInput, 'Test');
+
+	await userEvent.click(screen.getByText('Add'));
+
+	await waitFor(() => expect(onConfirm).toHaveBeenCalled());
+});
diff --git a/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage/CreateOAuthModal.tsx b/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage/CreateOAuthModal.tsx
index 98357b149383..f3cd2a5dfe32 100644
--- a/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage/CreateOAuthModal.tsx
+++ b/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage/CreateOAuthModal.tsx
@@ -1,6 +1,8 @@
-import { TextInput, Field, FieldLabel, FieldRow, FieldError, Box } from '@rocket.chat/fuselage';
-import type { ReactElement, FormEvent, SyntheticEvent } from 'react';
-import React, { useState } from 'react';
+import { TextInput, Field, FieldLabel, FieldRow, FieldError, Box, FieldHint } from '@rocket.chat/fuselage';
+import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import type { ReactElement } from 'react';
+import React from 'react';
+import { useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../../components/GenericModal';
@@ -10,43 +12,50 @@ type CreateOAuthModalProps = {
 	onClose: () => void;
 };
 
+type CreateOAuthModalFields = {
+	customOAuthName: string;
+};
+
 const CreateOAuthModal = ({ onConfirm, onClose }: CreateOAuthModalProps): ReactElement => {
-	const [text, setText] = useState<string>('');
-	const [error, setError] = useState<string>('');
+	const {
+		register,
+		handleSubmit,
+		formState: { errors },
+	} = useForm<CreateOAuthModalFields>({
+		defaultValues: {
+			customOAuthName: '',
+		},
+	});
+
 	const { t } = useTranslation();
 
-	const handleConfirm = (e: SyntheticEvent): void => {
-		e.preventDefault();
-		if (!text.length) {
-			setError(t('Required_field', { field: t('Name') }));
-			return;
-		}
-		onConfirm(text);
-	};
+	const customOAuthNameId = useUniqueId();
 
 	return (
 		<GenericModal
-			wrapperFunction={(props) => <Box is='form' onSubmit={handleConfirm} {...props} />}
+			wrapperFunction={(props) => <Box is='form' onSubmit={handleSubmit(({ customOAuthName }) => onConfirm(customOAuthName))} {...props} />}
 			title={t('Add_custom_oauth')}
 			confirmText={t('Add')}
 			onCancel={onClose}
 			onClose={onClose}
-			onConfirm={handleConfirm}
 		>
 			<Field>
-				<FieldLabel>{t('Give_a_unique_name_for_the_custom_oauth')}</FieldLabel>
+				<FieldLabel htmlFor={customOAuthNameId}>{t('Custom_OAuth_name')}</FieldLabel>
 				<FieldRow>
 					<TextInput
-						error={error}
-						placeholder={t('Custom_oauth_unique_name')}
-						value={text}
-						onChange={(e: FormEvent<HTMLInputElement>): void => {
-							setText(e.currentTarget.value);
-							setError('');
-						}}
+						id={customOAuthNameId}
+						{...register('customOAuthName', { required: t('Required_field', { field: t('Custom_OAuth_name') }) })}
+						aria-required='true'
+						aria-describedby={`${customOAuthNameId}-error ${customOAuthNameId}-hint`}
+						aria-label={t('Custom_OAuth_name')}
 					/>
 				</FieldRow>
-				{error && <FieldError>{error}</FieldError>}
+				<FieldHint id={`${customOAuthNameId}-hint`}>{t('Custom_OAuth_name_hint')}</FieldHint>
+				{errors.customOAuthName && (
+					<FieldError aria-live='assertive' id={`${customOAuthNameId}-error`}>
+						{errors.customOAuthName.message}
+					</FieldError>
+				)}
 			</Field>
 		</GenericModal>
 	);
diff --git a/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage/OAuthGroupPage.tsx b/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage/OAuthGroupPage.tsx
index a858555e46d3..ce5c54d36d7e 100644
--- a/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage/OAuthGroupPage.tsx
+++ b/apps/meteor/client/views/admin/settings/groups/OAuthGroupPage/OAuthGroupPage.tsx
@@ -5,12 +5,12 @@ import { useToastMessageDispatch, useAbsoluteUrl, useMethod, useTranslation, use
 import type { ReactElement } from 'react';
 import React, { memo, useEffect, useState } from 'react';
 
+import CreateOAuthModal from './CreateOAuthModal';
 import { strRight } from '../../../../../../lib/utils/stringUtils';
 import GenericModal from '../../../../../components/GenericModal';
 import { useEditableSettingsGroupSections } from '../../../EditableSettingsContext';
 import SettingsGroupPage from '../../SettingsGroupPage';
 import SettingsSection from '../../SettingsSection';
-import CreateOAuthModal from './CreateOAuthModal';
 
 type OAuthGroupPageProps = ISetting & {
 	onClickBack?: () => void;
diff --git a/apps/meteor/client/views/admin/settings/groups/TabbedGroupPage.tsx b/apps/meteor/client/views/admin/settings/groups/TabbedGroupPage.tsx
index 1a3c122502cf..a4917c158816 100644
--- a/apps/meteor/client/views/admin/settings/groups/TabbedGroupPage.tsx
+++ b/apps/meteor/client/views/admin/settings/groups/TabbedGroupPage.tsx
@@ -4,8 +4,8 @@ import type { ReactElement } from 'react';
 import React, { memo, useState, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { useEditableSettingsGroupSections } from '../../EditableSettingsContext';
 import GenericGroupPage from './GenericGroupPage';
+import { useEditableSettingsGroupSections } from '../../EditableSettingsContext';
 
 type TabbedGroupPageProps = {
 	headerButtons?: ReactElement;
diff --git a/apps/meteor/client/views/admin/settings/groups/VoipGroupPage/AssignAgentButton.tsx b/apps/meteor/client/views/admin/settings/groups/VoipGroupPage/AssignAgentButton.tsx
index 8f0727260bf8..fe357b31cdb0 100644
--- a/apps/meteor/client/views/admin/settings/groups/VoipGroupPage/AssignAgentButton.tsx
+++ b/apps/meteor/client/views/admin/settings/groups/VoipGroupPage/AssignAgentButton.tsx
@@ -1,15 +1,16 @@
 import { IconButton } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useSetModal, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetModal } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
-import { GenericTableCell } from '../../../../../components/GenericTable';
 import AssignAgentModal from './AssignAgentModal';
+import { GenericTableCell } from '../../../../../components/GenericTable';
 
 type AssignAgentButtonProps = { extension: string; reload: () => void };
 
 const AssignAgentButton = ({ extension, reload }: AssignAgentButtonProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const setModal = useSetModal();
 
 	const handleAssociation = useMutableCallback((e) => {
diff --git a/apps/meteor/client/views/admin/settings/groups/VoipGroupPage/AssignAgentModal.tsx b/apps/meteor/client/views/admin/settings/groups/VoipGroupPage/AssignAgentModal.tsx
index e6b0ddbb0c84..518ac64b35d0 100644
--- a/apps/meteor/client/views/admin/settings/groups/VoipGroupPage/AssignAgentModal.tsx
+++ b/apps/meteor/client/views/admin/settings/groups/VoipGroupPage/AssignAgentModal.tsx
@@ -1,7 +1,8 @@
 import { Button, Modal, Select, Field, FieldGroup, FieldLabel, FieldRow, Box } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useToastMessageDispatch, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useToastMessageDispatch, useEndpoint } from '@rocket.chat/ui-contexts';
 import React, { useState, useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import AutoCompleteAgentWithoutExtension from '../../../../../components/AutoCompleteAgentWithoutExtension';
 import { AsyncStatePhase } from '../../../../../hooks/useAsyncState';
@@ -14,7 +15,7 @@ type AssignAgentModalProps = {
 };
 
 const AssignAgentModal = ({ existingExtension, closeModal, reload }: AssignAgentModalProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 	const [agent, setAgent] = useState('');
 	const [extension, setExtension] = useState(existingExtension || '');
@@ -51,7 +52,7 @@ const AssignAgentModal = ({ existingExtension, closeModal, reload }: AssignAgent
 						</FieldRow>
 					</Field>
 					<Field>
-						<FieldLabel>{t('Free_Extension_Numbers')}</FieldLabel>
+						<FieldLabel>{t('Available_extensions')}</FieldLabel>
 						<FieldRow>
 							<Select
 								disabled={state === AsyncStatePhase.LOADING || agent === ''}
diff --git a/apps/meteor/client/views/admin/settings/groups/VoipGroupPage/RemoveAgentButton.tsx b/apps/meteor/client/views/admin/settings/groups/VoipGroupPage/RemoveAgentButton.tsx
index 20ac7fd1fea3..29cad0960a49 100644
--- a/apps/meteor/client/views/admin/settings/groups/VoipGroupPage/RemoveAgentButton.tsx
+++ b/apps/meteor/client/views/admin/settings/groups/VoipGroupPage/RemoveAgentButton.tsx
@@ -1,7 +1,8 @@
 import { IconButton } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useSetModal, useToastMessageDispatch, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetModal, useToastMessageDispatch, useEndpoint } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../../components/GenericModal';
 import { GenericTableCell } from '../../../../../components/GenericTable';
@@ -12,7 +13,7 @@ const RemoveAgentButton = ({ username, reload }: RemoveAgentButtonProps) => {
 	const removeAgent = useEndpoint('DELETE', '/v1/omnichannel/agent/extension/:username', { username });
 	const setModal = useSetModal();
 	const dispatchToastMessage = useToastMessageDispatch();
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const handleRemoveClick = useMutableCallback(async () => {
 		try {
diff --git a/apps/meteor/client/views/admin/settings/groups/VoipGroupPage/VoipExtensionsPage.tsx b/apps/meteor/client/views/admin/settings/groups/VoipGroupPage/VoipExtensionsPage.tsx
index 7494a249818c..c7b3a4cff387 100644
--- a/apps/meteor/client/views/admin/settings/groups/VoipGroupPage/VoipExtensionsPage.tsx
+++ b/apps/meteor/client/views/admin/settings/groups/VoipGroupPage/VoipExtensionsPage.tsx
@@ -4,6 +4,9 @@ import { useSetModal, useTranslation, useEndpoint } from '@rocket.chat/ui-contex
 import { useQuery } from '@tanstack/react-query';
 import React, { useMemo } from 'react';
 
+import AssignAgentButton from './AssignAgentButton';
+import AssignAgentModal from './AssignAgentModal';
+import RemoveAgentButton from './RemoveAgentButton';
 import GenericNoResults from '../../../../../components/GenericNoResults';
 import {
 	GenericTable,
@@ -16,9 +19,6 @@ import {
 } from '../../../../../components/GenericTable';
 import { usePagination } from '../../../../../components/GenericTable/hooks/usePagination';
 import { PageContent } from '../../../../../components/Page';
-import AssignAgentButton from './AssignAgentButton';
-import AssignAgentModal from './AssignAgentModal';
-import RemoveAgentButton from './RemoveAgentButton';
 
 const VoipExtensionsPage = () => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/admin/settings/groups/VoipGroupPage/VoipGroupPage.tsx b/apps/meteor/client/views/admin/settings/groups/VoipGroupPage/VoipGroupPage.tsx
index 4172a01e79cf..249bdab99616 100644
--- a/apps/meteor/client/views/admin/settings/groups/VoipGroupPage/VoipGroupPage.tsx
+++ b/apps/meteor/client/views/admin/settings/groups/VoipGroupPage/VoipGroupPage.tsx
@@ -1,22 +1,23 @@
 import type { ISetting } from '@rocket.chat/core-typings';
 import { Tabs, Box, Accordion } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useSetting, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetting } from '@rocket.chat/ui-contexts';
 import React, { memo, useMemo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
+import VoipExtensionsPage from './VoipExtensionsPage';
 import GenericNoResults from '../../../../../components/GenericNoResults';
 import { PageScrollableContentWithShadow } from '../../../../../components/Page';
 import { useEditableSettingsGroupSections } from '../../../EditableSettingsContext';
 import SettingsGroupPage from '../../SettingsGroupPage';
 import SettingsSection from '../../SettingsSection';
-import VoipExtensionsPage from './VoipExtensionsPage';
 
 type VoipGroupPageProps = ISetting & {
 	onClickBack?: () => void;
 };
 
 function VoipGroupPage({ _id, onClickBack, ...group }: VoipGroupPageProps) {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const voipEnabled = useSetting('VoIP_Enabled');
 
 	const tabs = ['Settings', 'Extensions'];
diff --git a/apps/meteor/client/views/admin/settings/hooks/useHasSettingModule.ts b/apps/meteor/client/views/admin/settings/hooks/useHasSettingModule.ts
new file mode 100644
index 000000000000..589c26cb13ad
--- /dev/null
+++ b/apps/meteor/client/views/admin/settings/hooks/useHasSettingModule.ts
@@ -0,0 +1,26 @@
+import type { ISetting, LicenseModule } from '@rocket.chat/core-typings';
+import { useMemo } from 'react';
+
+import { useLicenseBase } from '../../../../hooks/useLicense';
+
+export const useHasSettingModule = (setting?: ISetting) => {
+	const { data } = useLicenseBase({
+		select: (data) => ({ isEnterprise: Boolean(data?.license.license), activeModules: data?.license.activeModules }),
+	});
+
+	const isEnterprise = data?.isEnterprise ?? false;
+
+	const hasSettingModule = useMemo(() => {
+		if (!setting?.modules || setting?.modules.length === 0) {
+			return false;
+		}
+
+		return setting.modules.every((module) => data?.activeModules.includes(module as LicenseModule));
+	}, [data?.activeModules, setting?.modules]);
+
+	if (!setting) {
+		throw new Error('No setting provided');
+	}
+
+	return isEnterprise && hasSettingModule;
+};
diff --git a/apps/meteor/client/views/admin/settings/hooks/useSettingsGroups.ts b/apps/meteor/client/views/admin/settings/hooks/useSettingsGroups.ts
index 211d22058a4d..26f4794b17cb 100644
--- a/apps/meteor/client/views/admin/settings/hooks/useSettingsGroups.ts
+++ b/apps/meteor/client/views/admin/settings/hooks/useSettingsGroups.ts
@@ -1,11 +1,12 @@
 import type { ISetting } from '@rocket.chat/core-typings';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useSettings, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSettings } from '@rocket.chat/ui-contexts';
 import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 export const useSettingsGroups = (filter: string): ISetting[] => {
 	const settings = useSettings();
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const filterPredicate = useMemo(() => {
 		if (!filter) {
diff --git a/apps/meteor/client/views/admin/sidebar/AdminSidebar.tsx b/apps/meteor/client/views/admin/sidebar/AdminSidebar.tsx
index c0c4aa08cfb4..820033c6c53a 100644
--- a/apps/meteor/client/views/admin/sidebar/AdminSidebar.tsx
+++ b/apps/meteor/client/views/admin/sidebar/AdminSidebar.tsx
@@ -1,10 +1,10 @@
 import { useTranslation, useLayout, useCurrentRoutePath } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
 
+import AdminSidebarPages from './AdminSidebarPages';
 import PlanTag from '../../../components/PlanTag';
 import Sidebar from '../../../components/Sidebar';
 import SettingsProvider from '../../../providers/SettingsProvider';
-import AdminSidebarPages from './AdminSidebarPages';
 
 const AdminSidebar = () => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/admin/subscription/SubscriptionCalloutLimits.tsx b/apps/meteor/client/views/admin/subscription/SubscriptionCalloutLimits.tsx
index c5de629e5582..98413c837720 100644
--- a/apps/meteor/client/views/admin/subscription/SubscriptionCalloutLimits.tsx
+++ b/apps/meteor/client/views/admin/subscription/SubscriptionCalloutLimits.tsx
@@ -4,8 +4,8 @@ import { ExternalLink } from '@rocket.chat/ui-client';
 import React from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 
-import { useLicenseLimitsByBehavior } from '../../../hooks/useLicenseLimitsByBehavior';
 import { useCheckoutUrl } from './hooks/useCheckoutUrl';
+import { useLicenseLimitsByBehavior } from '../../../hooks/useLicenseLimitsByBehavior';
 
 export const SubscriptionCalloutLimits = () => {
 	const manageSubscriptionUrl = useCheckoutUrl();
diff --git a/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx b/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx
index 93792b517dcf..e6f5beffe7ba 100644
--- a/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx
+++ b/apps/meteor/client/views/admin/subscription/SubscriptionPage.tsx
@@ -5,10 +5,6 @@ import { t } from 'i18next';
 import React, { memo, useCallback, useEffect } from 'react';
 import tinykeys from 'tinykeys';
 
-import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page';
-import { useIsEnterprise } from '../../../hooks/useIsEnterprise';
-import { useInvalidateLicense, useLicense } from '../../../hooks/useLicense';
-import { useRegistrationStatus } from '../../../hooks/useRegistrationStatus';
 import { SubscriptionCalloutLimits } from './SubscriptionCalloutLimits';
 import SubscriptionPageSkeleton from './SubscriptionPageSkeleton';
 import UpgradeButton from './components/UpgradeButton';
@@ -23,8 +19,12 @@ import MACCard from './components/cards/MACCard';
 import PlanCard from './components/cards/PlanCard';
 import PlanCardCommunity from './components/cards/PlanCard/PlanCardCommunity';
 import SeatsCard from './components/cards/SeatsCard';
-import { useRemoveLicense } from './hooks/useRemoveLicense';
+import { useCancelSubscriptionModal } from './hooks/useCancelSubscriptionModal';
 import { useWorkspaceSync } from './hooks/useWorkspaceSync';
+import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page';
+import { useIsEnterprise } from '../../../hooks/useIsEnterprise';
+import { useInvalidateLicense, useLicense } from '../../../hooks/useLicense';
+import { useRegistrationStatus } from '../../../hooks/useRegistrationStatus';
 
 function useShowLicense() {
 	const [showLicenseTab, setShowLicenseTab] = useSessionStorage('admin:showLicenseTab', false);
@@ -70,6 +70,8 @@ const SubscriptionPage = () => {
 	const macLimit = getKeyLimit('monthlyActiveContacts');
 	const seatsLimit = getKeyLimit('activeUsers');
 
+	const { isLoading: isCancelSubscriptionLoading, open: openCancelSubscriptionModal } = useCancelSubscriptionModal();
+
 	const handleSyncLicenseUpdate = useCallback(() => {
 		syncLicenseUpdate.mutate(undefined, {
 			onSuccess: () => invalidateLicenseQuery(100),
@@ -95,8 +97,6 @@ const SubscriptionPage = () => {
 		}
 	}, [handleSyncLicenseUpdate, router, subscriptionSuccess, syncLicenseUpdate.isIdle]);
 
-	const removeLicense = useRemoveLicense();
-
 	return (
 		<Page bg='tint'>
 			<PageHeader title={t('Subscription')}>
@@ -177,7 +177,7 @@ const SubscriptionPage = () => {
 							</Grid>
 							<UpgradeToGetMore activeModules={activeModules} isEnterprise={isEnterprise}>
 								{Boolean(licensesData?.license?.information.cancellable) && (
-									<Button loading={removeLicense.isLoading} secondary danger onClick={() => removeLicense.mutate()}>
+									<Button loading={isCancelSubscriptionLoading} secondary danger onClick={openCancelSubscriptionModal}>
 										{t('Cancel_subscription')}
 									</Button>
 								)}
diff --git a/apps/meteor/client/views/admin/subscription/SubscriptionRoute.tsx b/apps/meteor/client/views/admin/subscription/SubscriptionRoute.tsx
index 99fb216c01ce..acda752117aa 100644
--- a/apps/meteor/client/views/admin/subscription/SubscriptionRoute.tsx
+++ b/apps/meteor/client/views/admin/subscription/SubscriptionRoute.tsx
@@ -2,8 +2,8 @@ import { usePermission } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { memo } from 'react';
 
-import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import SubscriptionPage from './SubscriptionPage';
+import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 
 const SubscriptionRoute = (): ReactElement => {
 	const canViewSubscription = usePermission('manage-cloud');
diff --git a/apps/meteor/client/views/admin/subscription/components/CancelSubscriptionModal.spec.tsx b/apps/meteor/client/views/admin/subscription/components/CancelSubscriptionModal.spec.tsx
new file mode 100644
index 000000000000..f35abc841b18
--- /dev/null
+++ b/apps/meteor/client/views/admin/subscription/components/CancelSubscriptionModal.spec.tsx
@@ -0,0 +1,69 @@
+import { mockAppRoot } from '@rocket.chat/mock-providers';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import { CancelSubscriptionModal } from './CancelSubscriptionModal';
+import { DOWNGRADE_LINK } from '../utils/links';
+
+it('should display plan name in the title', async () => {
+	const confirmFn = jest.fn();
+	render(<CancelSubscriptionModal planName='Starter' onConfirm={confirmFn} onCancel={jest.fn()} />, {
+		wrapper: mockAppRoot()
+			.withTranslations('en', 'core', {
+				Cancel__planName__subscription: 'Cancel {{planName}} subscription',
+			})
+			.build(),
+		legacyRoot: true,
+	});
+
+	expect(screen.getByText('Cancel Starter subscription')).toBeInTheDocument();
+});
+
+it('should have link to downgrade docs', async () => {
+	render(<CancelSubscriptionModal planName='Starter' onConfirm={jest.fn()} onCancel={jest.fn()} />, {
+		wrapper: mockAppRoot()
+			.withTranslations('en', 'core', {
+				Cancel__planName__subscription: 'Cancel {{planName}} subscription',
+				Cancel_subscription_message:
+					'<strong>This workspace will downgrage to Community and lose free access to premium capabilities.</strong><br/><br/> While you can keep using Rocket.Chat, your team will lose access to unlimited mobile push notifications, read receipts, marketplace apps <4>and other capabilities</4>.',
+			})
+			.build(),
+		legacyRoot: true,
+	});
+
+	expect(screen.getByRole('link', { name: 'and other capabilities' })).toHaveAttribute('href', DOWNGRADE_LINK);
+});
+
+it('should call onConfirm when confirm button is clicked', async () => {
+	const confirmFn = jest.fn();
+	render(<CancelSubscriptionModal planName='Starter' onConfirm={confirmFn} onCancel={jest.fn()} />, {
+		wrapper: mockAppRoot().build(),
+		legacyRoot: true,
+	});
+
+	await userEvent.click(screen.getByRole('button', { name: 'Cancel_subscription' }));
+	expect(confirmFn).toHaveBeenCalled();
+});
+
+it('should call onCancel when "Dont cancel" button is clicked', async () => {
+	const cancelFn = jest.fn();
+	render(<CancelSubscriptionModal planName='Starter' onConfirm={jest.fn()} onCancel={cancelFn} />, {
+		wrapper: mockAppRoot().build(),
+		legacyRoot: true,
+	});
+
+	await userEvent.click(screen.getByRole('button', { name: 'Dont_cancel' }));
+	expect(cancelFn).toHaveBeenCalled();
+});
+
+it('should call onCancel when close button is clicked', async () => {
+	const cancelFn = jest.fn();
+	render(<CancelSubscriptionModal planName='Starter' onConfirm={jest.fn()} onCancel={cancelFn} />, {
+		wrapper: mockAppRoot().build(),
+		legacyRoot: true,
+	});
+
+	await userEvent.click(screen.getByRole('button', { name: 'Close' }));
+	expect(cancelFn).toHaveBeenCalled();
+});
diff --git a/apps/meteor/client/views/admin/subscription/components/CancelSubscriptionModal.tsx b/apps/meteor/client/views/admin/subscription/components/CancelSubscriptionModal.tsx
new file mode 100644
index 000000000000..b717d5b370a6
--- /dev/null
+++ b/apps/meteor/client/views/admin/subscription/components/CancelSubscriptionModal.tsx
@@ -0,0 +1,36 @@
+import { ExternalLink } from '@rocket.chat/ui-client';
+import React from 'react';
+import { Trans, useTranslation } from 'react-i18next';
+
+import GenericModal from '../../../../components/GenericModal';
+import { DOWNGRADE_LINK } from '../utils/links';
+
+type CancelSubscriptionModalProps = {
+	planName: string;
+	onConfirm(): void;
+	onCancel(): void;
+};
+
+export const CancelSubscriptionModal = ({ planName, onCancel, onConfirm }: CancelSubscriptionModalProps) => {
+	const { t } = useTranslation();
+
+	return (
+		<GenericModal
+			variant='danger'
+			title={t('Cancel__planName__subscription', { planName })}
+			icon={null}
+			confirmText={t('Cancel_subscription')}
+			cancelText={t('Dont_cancel')}
+			onConfirm={onConfirm}
+			onCancel={onCancel}
+		>
+			<Trans i18nKey='Cancel_subscription_message' t={t}>
+				<strong>This workspace will downgrade to Community and lose free access to premium capabilities.</strong>
+				<br />
+				<br />
+				While you can keep using Rocket.Chat, your team will lose access to unlimited mobile push notifications, read receipts, marketplace
+				apps and <ExternalLink to={DOWNGRADE_LINK}>other capabilities</ExternalLink>.
+			</Trans>
+		</GenericModal>
+	);
+};
diff --git a/apps/meteor/client/views/admin/subscription/components/UsagePieGraph.stories.tsx b/apps/meteor/client/views/admin/subscription/components/UsagePieGraph.stories.tsx
index 37985291df16..a85262ff3eeb 100644
--- a/apps/meteor/client/views/admin/subscription/components/UsagePieGraph.stories.tsx
+++ b/apps/meteor/client/views/admin/subscription/components/UsagePieGraph.stories.tsx
@@ -3,8 +3,8 @@ import type { Meta, StoryFn } from '@storybook/react';
 import type { ComponentProps } from 'react';
 import React from 'react';
 
-import { useAutoSequence } from '../../../../stories/hooks/useAutoSequence';
 import UsagePieGraph from './UsagePieGraph';
+import { useAutoSequence } from '../../../../stories/hooks/useAutoSequence';
 
 export default {
 	title: 'Admin/Info/UsagePieGraph',
diff --git a/apps/meteor/client/views/admin/subscription/components/cards/AppsUsageCard/AppsUsageCard.spec.tsx b/apps/meteor/client/views/admin/subscription/components/cards/AppsUsageCard/AppsUsageCard.spec.tsx
index 480759dc53f4..b8f71b61d6ad 100644
--- a/apps/meteor/client/views/admin/subscription/components/cards/AppsUsageCard/AppsUsageCard.spec.tsx
+++ b/apps/meteor/client/views/admin/subscription/components/cards/AppsUsageCard/AppsUsageCard.spec.tsx
@@ -3,8 +3,8 @@ import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
-import { PRICING_LINK } from '../../../utils/links';
 import AppsUsageCard from './AppsUsageCard';
+import { PRICING_LINK } from '../../../utils/links';
 
 const appRoot = mockAppRoot().withTranslations('en', 'core', {
 	Apps_InfoText_limited:
diff --git a/apps/meteor/client/views/admin/subscription/components/cards/AppsUsageCard/AppsUsageCard.tsx b/apps/meteor/client/views/admin/subscription/components/cards/AppsUsageCard/AppsUsageCard.tsx
index 8b962e093a37..a87ef914aba0 100644
--- a/apps/meteor/client/views/admin/subscription/components/cards/AppsUsageCard/AppsUsageCard.tsx
+++ b/apps/meteor/client/views/admin/subscription/components/cards/AppsUsageCard/AppsUsageCard.tsx
@@ -4,11 +4,11 @@ import type { ReactElement } from 'react';
 import React from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 
+import AppsUsageCardSection from './AppsUsageCardSection';
 import { PRICING_LINK } from '../../../utils/links';
 import type { CardProps } from '../../FeatureUsageCard';
 import FeatureUsageCard from '../../FeatureUsageCard';
 import UpgradeButton from '../../UpgradeButton';
-import AppsUsageCardSection from './AppsUsageCardSection';
 
 // Magic numbers
 const marketplaceAppsMaxCountFallback = 5;
diff --git a/apps/meteor/client/views/admin/subscription/components/cards/PlanCard/PlanCardPremium.tsx b/apps/meteor/client/views/admin/subscription/components/cards/PlanCard/PlanCardPremium.tsx
index ea96adf32a38..8da910abe20c 100644
--- a/apps/meteor/client/views/admin/subscription/components/cards/PlanCard/PlanCardPremium.tsx
+++ b/apps/meteor/client/views/admin/subscription/components/cards/PlanCard/PlanCardPremium.tsx
@@ -5,11 +5,11 @@ import type { ReactElement } from 'react';
 import React from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 
+import PlanCardHeader from './PlanCardHeader';
 import { useFormatDate } from '../../../../../../hooks/useFormatDate';
 import { useIsSelfHosted } from '../../../../../../hooks/useIsSelfHosted';
 import { useLicenseName } from '../../../../../../hooks/useLicense';
 import { CONTACT_SALES_LINK } from '../../../utils/links';
-import PlanCardHeader from './PlanCardHeader';
 
 type LicenseLimits = {
 	activeUsers: { max: number; value?: number };
diff --git a/apps/meteor/client/views/admin/subscription/components/cards/PlanCard/PlanCardTrial.tsx b/apps/meteor/client/views/admin/subscription/components/cards/PlanCard/PlanCardTrial.tsx
index eb6a020894ec..99a52d04f5c5 100644
--- a/apps/meteor/client/views/admin/subscription/components/cards/PlanCard/PlanCardTrial.tsx
+++ b/apps/meteor/client/views/admin/subscription/components/cards/PlanCard/PlanCardTrial.tsx
@@ -6,10 +6,10 @@ import type { ReactElement } from 'react';
 import React from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 
+import PlanCardHeader from './PlanCardHeader';
 import { useLicenseName } from '../../../../../../hooks/useLicense';
 import { DOWNGRADE_LINK, TRIAL_LINK } from '../../../utils/links';
 import UpgradeButton from '../../UpgradeButton';
-import PlanCardHeader from './PlanCardHeader';
 
 type PlanCardProps = {
 	licenseInformation: ILicenseV3['information'];
diff --git a/apps/meteor/client/views/admin/subscription/hooks/useCancelSubscriptionModal.spec.tsx b/apps/meteor/client/views/admin/subscription/hooks/useCancelSubscriptionModal.spec.tsx
new file mode 100644
index 000000000000..f97234398a6d
--- /dev/null
+++ b/apps/meteor/client/views/admin/subscription/hooks/useCancelSubscriptionModal.spec.tsx
@@ -0,0 +1,72 @@
+import { mockAppRoot } from '@rocket.chat/mock-providers';
+import { act, renderHook, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+
+import { useCancelSubscriptionModal } from './useCancelSubscriptionModal';
+import createDeferredMockFn from '../../../../../tests/mocks/utils/createDeferredMockFn';
+
+jest.mock('../../../../hooks/useLicense', () => ({
+	...jest.requireActual('../../../../hooks/useLicense'),
+	useLicenseName: () => ({ data: 'Starter' }),
+}));
+
+it('should open modal when open method is called', () => {
+	const { result } = renderHook(() => useCancelSubscriptionModal(), {
+		wrapper: mockAppRoot()
+			.withTranslations('en', 'core', {
+				Cancel__planName__subscription: 'Cancel {{planName}} subscription',
+			})
+			.build(),
+		legacyRoot: true,
+	});
+
+	expect(screen.queryByText('Cancel Starter subscription')).not.toBeInTheDocument();
+
+	act(() => result.current.open());
+
+	expect(screen.getByText('Cancel Starter subscription')).toBeInTheDocument();
+});
+
+it('should close modal cancel is clicked', async () => {
+	const { result } = renderHook(() => useCancelSubscriptionModal(), {
+		wrapper: mockAppRoot()
+			.withTranslations('en', 'core', {
+				Cancel__planName__subscription: 'Cancel {{planName}} subscription',
+			})
+			.build(),
+		legacyRoot: true,
+	});
+
+	act(() => result.current.open());
+	expect(screen.getByText('Cancel Starter subscription')).toBeInTheDocument();
+
+	await userEvent.click(screen.getByRole('button', { name: 'Dont_cancel' }));
+
+	expect(screen.queryByText('Cancel Starter subscription')).not.toBeInTheDocument();
+});
+
+it('should call remove license endpoint when confirm is clicked', async () => {
+	const { fn: removeLicenseEndpoint, resolve } = createDeferredMockFn<{ success: boolean }>();
+
+	const { result } = renderHook(() => useCancelSubscriptionModal(), {
+		wrapper: mockAppRoot()
+			.withEndpoint('POST', '/v1/cloud.removeLicense', removeLicenseEndpoint)
+			.withTranslations('en', 'core', {
+				Cancel__planName__subscription: 'Cancel {{planName}} subscription',
+			})
+			.build(),
+		legacyRoot: true,
+	});
+
+	act(() => result.current.open());
+	expect(result.current.isLoading).toBeFalsy();
+	expect(screen.getByText('Cancel Starter subscription')).toBeInTheDocument();
+
+	await userEvent.click(screen.getByRole('button', { name: 'Cancel_subscription' }));
+	expect(result.current.isLoading).toBeTruthy();
+	await act(() => resolve({ success: true }));
+	await waitFor(() => expect(result.current.isLoading).toBeFalsy());
+
+	expect(removeLicenseEndpoint).toHaveBeenCalled();
+	expect(screen.queryByText('Cancel Starter subscription')).not.toBeInTheDocument();
+});
diff --git a/apps/meteor/client/views/admin/subscription/hooks/useCancelSubscriptionModal.tsx b/apps/meteor/client/views/admin/subscription/hooks/useCancelSubscriptionModal.tsx
new file mode 100644
index 000000000000..3e810cab45e5
--- /dev/null
+++ b/apps/meteor/client/views/admin/subscription/hooks/useCancelSubscriptionModal.tsx
@@ -0,0 +1,28 @@
+import { useSetModal } from '@rocket.chat/ui-contexts';
+import React, { useCallback } from 'react';
+
+import { useRemoveLicense } from './useRemoveLicense';
+import { useLicenseName } from '../../../../hooks/useLicense';
+import { CancelSubscriptionModal } from '../components/CancelSubscriptionModal';
+
+export const useCancelSubscriptionModal = () => {
+	const { data: planName = '' } = useLicenseName();
+	const removeLicense = useRemoveLicense();
+	const setModal = useSetModal();
+
+	const open = useCallback(() => {
+		const closeModal = () => setModal(null);
+
+		const handleConfirm = () => {
+			removeLicense.mutateAsync();
+			closeModal();
+		};
+
+		setModal(<CancelSubscriptionModal planName={planName} onConfirm={handleConfirm} onCancel={closeModal} />);
+	}, [removeLicense, planName, setModal]);
+
+	return {
+		open,
+		isLoading: removeLicense.isLoading,
+	};
+};
diff --git a/apps/meteor/client/views/admin/subscription/hooks/useRemoveLicense.ts b/apps/meteor/client/views/admin/subscription/hooks/useRemoveLicense.ts
index ac3d64647536..62f5d14aa0ac 100644
--- a/apps/meteor/client/views/admin/subscription/hooks/useRemoveLicense.ts
+++ b/apps/meteor/client/views/admin/subscription/hooks/useRemoveLicense.ts
@@ -1,10 +1,11 @@
-import { useEndpoint, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import { useMutation } from '@tanstack/react-query';
+import { useTranslation } from 'react-i18next';
 
 import { useInvalidateLicense } from '../../../../hooks/useLicense';
 
 export const useRemoveLicense = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 
 	const invalidateLicense = useInvalidateLicense();
diff --git a/apps/meteor/client/views/admin/users/AdminInviteUsers.tsx b/apps/meteor/client/views/admin/users/AdminInviteUsers.tsx
index 8976864f3430..f322eb6e762e 100644
--- a/apps/meteor/client/views/admin/users/AdminInviteUsers.tsx
+++ b/apps/meteor/client/views/admin/users/AdminInviteUsers.tsx
@@ -13,11 +13,11 @@ import { useTranslation, useRoute } from '@rocket.chat/ui-contexts';
 import type { ChangeEvent } from 'react';
 import React, { useCallback, useState } from 'react';
 
+import { useSendInvitationEmailMutation } from './hooks/useSendInvitationEmailMutation';
+import { useSmtpQuery } from './hooks/useSmtpQuery';
 import { validateEmail } from '../../../../lib/emailValidator';
 import { ContextualbarScrollableContent, ContextualbarFooter, ContextualbarContent } from '../../../components/Contextualbar';
 import { FormSkeleton } from '../../../components/Skeleton';
-import { useSendInvitationEmailMutation } from './hooks/useSendInvitationEmailMutation';
-import { useSmtpQuery } from './hooks/useSmtpQuery';
 
 // TODO: Replace using RHF
 const AdminInviteUsers = () => {
diff --git a/apps/meteor/client/views/admin/users/AdminUserForm.tsx b/apps/meteor/client/views/admin/users/AdminUserForm.tsx
index a0ee877af551..ca6e07110a81 100644
--- a/apps/meteor/client/views/admin/users/AdminUserForm.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserForm.tsx
@@ -33,6 +33,10 @@ import { useMutation, useQueryClient } from '@tanstack/react-query';
 import React, { useMemo, useState } from 'react';
 import { Controller, useForm } from 'react-hook-form';
 
+import AdminUserSetRandomPasswordContent from './AdminUserSetRandomPasswordContent';
+import AdminUserSetRandomPasswordRadios from './AdminUserSetRandomPasswordRadios';
+import PasswordFieldSkeleton from './PasswordFieldSkeleton';
+import { useSmtpQuery } from './hooks/useSmtpQuery';
 import { validateEmail } from '../../../../lib/emailValidator';
 import { parseCSV } from '../../../../lib/utils/parseCSV';
 import { ContextualbarScrollableContent } from '../../../components/Contextualbar';
@@ -40,10 +44,6 @@ import UserAvatarEditor from '../../../components/avatar/UserAvatarEditor';
 import { useEndpointAction } from '../../../hooks/useEndpointAction';
 import { useUpdateAvatar } from '../../../hooks/useUpdateAvatar';
 import { USER_STATUS_TEXT_MAX_LENGTH, BIO_TEXT_MAX_LENGTH } from '../../../lib/constants';
-import AdminUserSetRandomPasswordContent from './AdminUserSetRandomPasswordContent';
-import AdminUserSetRandomPasswordRadios from './AdminUserSetRandomPasswordRadios';
-import PasswordFieldSkeleton from './PasswordFieldSkeleton';
-import { useSmtpQuery } from './hooks/useSmtpQuery';
 
 type AdminUserFormProps = {
 	userData?: Serialized<IUser>;
@@ -94,7 +94,7 @@ const AdminUserForm = ({ userData, onReload, context, refetchUserFormData, roleD
 	const queryClient = useQueryClient();
 
 	const customFieldsMetadata = useAccountsCustomFields();
-	const defaultRoles = useSetting<string>('Accounts_Registration_Users_Default_Roles') || '';
+	const defaultRoles = useSetting('Accounts_Registration_Users_Default_Roles', '');
 	const isVerificationNeeded = useSetting('Accounts_EmailVerification');
 	const defaultUserRoles = parseCSV(defaultRoles);
 
diff --git a/apps/meteor/client/views/admin/users/AdminUserFormWithData.tsx b/apps/meteor/client/views/admin/users/AdminUserFormWithData.tsx
index 749b75903827..5c4998b816be 100644
--- a/apps/meteor/client/views/admin/users/AdminUserFormWithData.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserFormWithData.tsx
@@ -5,9 +5,9 @@ import type { ReactElement } from 'react';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
+import AdminUserForm from './AdminUserForm';
 import { FormSkeleton } from '../../../components/Skeleton';
 import { useUserInfoQuery } from '../../../hooks/useUserInfoQuery';
-import AdminUserForm from './AdminUserForm';
 
 type AdminUserFormWithDataProps = {
 	uid: IUser['_id'];
diff --git a/apps/meteor/client/views/admin/users/AdminUserInfoActions.tsx b/apps/meteor/client/views/admin/users/AdminUserInfoActions.tsx
index 31ff9a96f842..c6c594dcc8bc 100644
--- a/apps/meteor/client/views/admin/users/AdminUserInfoActions.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserInfoActions.tsx
@@ -1,17 +1,18 @@
 import type { IUser } from '@rocket.chat/core-typings';
 import { ButtonGroup, Menu, Option } from '@rocket.chat/fuselage';
-import { useRoute, usePermission, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRoute, usePermission } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useCallback, useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
-import { UserInfoAction } from '../../../components/UserInfo';
-import { useActionSpread } from '../../hooks/useActionSpread';
 import type { AdminUsersTab } from './AdminUsersPage';
 import { useChangeAdminStatusAction } from './hooks/useChangeAdminStatusAction';
 import { useChangeUserStatusAction } from './hooks/useChangeUserStatusAction';
 import { useDeleteUserAction } from './hooks/useDeleteUserAction';
 import { useResetE2EEKeyAction } from './hooks/useResetE2EEKeyAction';
 import { useResetTOTPAction } from './hooks/useResetTOTPAction';
+import { UserInfoAction } from '../../../components/UserInfo';
+import { useActionSpread } from '../../hooks/useActionSpread';
 
 type AdminUserInfoActionsProps = {
 	username: IUser['username'];
@@ -35,7 +36,7 @@ const AdminUserInfoActions = ({
 	onChange,
 	onReload,
 }: AdminUserInfoActionsProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const directRoute = useRoute('direct');
 	const userRoute = useRoute('admin-users');
 	const canDirectMessage = usePermission('create-d');
diff --git a/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx b/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx
index 59d91ce5ada6..18c4710d4213 100644
--- a/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx
@@ -6,6 +6,8 @@ import { useQuery } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
 
+import AdminUserInfoActions from './AdminUserInfoActions';
+import type { AdminUsersTab } from './AdminUsersPage';
 import { getUserEmailAddress } from '../../../../lib/getUserEmailAddress';
 import { ContextualbarContent } from '../../../components/Contextualbar';
 import { FormSkeleton } from '../../../components/Skeleton';
@@ -13,8 +15,6 @@ import { UserCardRole } from '../../../components/UserCard';
 import { UserInfo } from '../../../components/UserInfo';
 import { UserStatus } from '../../../components/UserStatus';
 import { getUserEmailVerified } from '../../../lib/utils/getUserEmailVerified';
-import AdminUserInfoActions from './AdminUserInfoActions';
-import type { AdminUsersTab } from './AdminUsersPage';
 
 type AdminUserInfoWithDataProps = {
 	uid: IUser['_id'];
diff --git a/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordContent.tsx b/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordContent.tsx
index 034d7d2efb0f..de2757f4f8cf 100644
--- a/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordContent.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserSetRandomPasswordContent.tsx
@@ -1,10 +1,11 @@
 import { Box, FieldError, FieldLabel, FieldRow, PasswordInput, ToggleSwitch } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import { PasswordVerifier, useValidatePassword } from '@rocket.chat/ui-client';
-import { useSetting, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetting } from '@rocket.chat/ui-contexts';
 import React from 'react';
 import type { Control, FieldErrors } from 'react-hook-form';
 import { Controller } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import type { UserFormProps } from './AdminUserForm';
 
@@ -25,15 +26,15 @@ const AdminUserSetRandomPasswordContent = ({
 	errors,
 	password,
 }: AdminUserSetRandomPasswordContentProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const passwordConfirmationId = useUniqueId();
 	const requirePasswordChangeId = useUniqueId();
 	const passwordVerifierId = useUniqueId();
 
-	const requiresPasswordConfirmation = useSetting('Accounts_RequirePasswordConfirmation');
-	const passwordPlaceholder = String(useSetting('Accounts_PasswordPlaceholder'));
-	const passwordConfirmationPlaceholder = String(useSetting('Accounts_ConfirmPasswordPlaceholder'));
+	const requiresPasswordConfirmation = useSetting('Accounts_RequirePasswordConfirmation', true);
+	const passwordPlaceholder = useSetting('Accounts_PasswordPlaceholder', '');
+	const passwordConfirmationPlaceholder = useSetting('Accounts_ConfirmPasswordPlaceholder', '');
 
 	const passwordIsValid = useValidatePassword(password);
 
diff --git a/apps/meteor/client/views/admin/users/AdminUserUpgrade.tsx b/apps/meteor/client/views/admin/users/AdminUserUpgrade.tsx
index 6b2baa1e2b9c..f074bb9a4e87 100644
--- a/apps/meteor/client/views/admin/users/AdminUserUpgrade.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUserUpgrade.tsx
@@ -1,13 +1,14 @@
 import { Button, ButtonGroup, ContextualbarEmptyContent, ContextualbarFooter } from '@rocket.chat/fuselage';
-import { useRouter, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRouter } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { ContextualbarScrollableContent } from '../../../components/Contextualbar';
 import { useExternalLink } from '../../../hooks/useExternalLink';
 import { useCheckoutUrl } from '../subscription/hooks/useCheckoutUrl';
 
 const AdminUserUpgrade = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const router = useRouter();
 	const manageSubscriptionUrl = useCheckoutUrl()({ target: 'user-page', action: 'buy_more' });
 	const openExternalLink = useExternalLink();
diff --git a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
index afe881f64cc9..36a1f4b8ad13 100644
--- a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx
@@ -9,6 +9,17 @@ import type { ReactElement } from 'react';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { Trans } from 'react-i18next';
 
+import AdminInviteUsers from './AdminInviteUsers';
+import AdminUserCreated from './AdminUserCreated';
+import AdminUserForm from './AdminUserForm';
+import AdminUserFormWithData from './AdminUserFormWithData';
+import AdminUserInfoWithData from './AdminUserInfoWithData';
+import AdminUserUpgrade from './AdminUserUpgrade';
+import UsersPageHeaderContent from './UsersPageHeaderContent';
+import UsersTable from './UsersTable';
+import useFilteredUsers from './hooks/useFilteredUsers';
+import usePendingUsersCount from './hooks/usePendingUsersCount';
+import { useSeatsCap } from './useSeatsCap';
 import {
 	Contextualbar,
 	ContextualbarHeader,
@@ -22,17 +33,6 @@ import { Page, PageHeader, PageContent } from '../../../components/Page';
 import { useLicenseLimitsByBehavior } from '../../../hooks/useLicenseLimitsByBehavior';
 import { useShouldPreventAction } from '../../../hooks/useShouldPreventAction';
 import { useCheckoutUrl } from '../subscription/hooks/useCheckoutUrl';
-import AdminInviteUsers from './AdminInviteUsers';
-import AdminUserCreated from './AdminUserCreated';
-import AdminUserForm from './AdminUserForm';
-import AdminUserFormWithData from './AdminUserFormWithData';
-import AdminUserInfoWithData from './AdminUserInfoWithData';
-import AdminUserUpgrade from './AdminUserUpgrade';
-import UsersPageHeaderContent from './UsersPageHeaderContent';
-import UsersTable from './UsersTable';
-import useFilteredUsers from './hooks/useFilteredUsers';
-import usePendingUsersCount from './hooks/usePendingUsersCount';
-import { useSeatsCap } from './useSeatsCap';
 
 export type UsersFilters = {
 	text: string;
diff --git a/apps/meteor/client/views/admin/users/AdminUsersRoute.tsx b/apps/meteor/client/views/admin/users/AdminUsersRoute.tsx
index 03f095d3f411..3e86ad5597b9 100644
--- a/apps/meteor/client/views/admin/users/AdminUsersRoute.tsx
+++ b/apps/meteor/client/views/admin/users/AdminUsersRoute.tsx
@@ -2,8 +2,8 @@ import { usePermission } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import AdminUsersPage from './AdminUsersPage';
+import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 
 const AdminUsersRoute = (): ReactElement => {
 	const canViewUserAdministration = usePermission('view-user-administration');
diff --git a/apps/meteor/client/views/admin/users/UsersPageHeaderContent.tsx b/apps/meteor/client/views/admin/users/UsersPageHeaderContent.tsx
index 89916c3e6f2e..0b6d34f23596 100644
--- a/apps/meteor/client/views/admin/users/UsersPageHeaderContent.tsx
+++ b/apps/meteor/client/views/admin/users/UsersPageHeaderContent.tsx
@@ -3,11 +3,11 @@ import { usePermission, useRouter } from '@rocket.chat/ui-contexts';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { useExternalLink } from '../../../hooks/useExternalLink';
-import { useCheckoutUrl } from '../subscription/hooks/useCheckoutUrl';
 import SeatsCapUsage from './SeatsCapUsage';
 import type { SeatCapProps } from './useSeatsCap';
 import AssignExtensionButton from './voip/AssignExtensionButton';
+import { useExternalLink } from '../../../hooks/useExternalLink';
+import { useCheckoutUrl } from '../subscription/hooks/useCheckoutUrl';
 import { useVoipExtensionPermission } from './voip/hooks/useVoipExtensionPermission';
 
 type UsersPageHeaderContentProps = {
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.spec.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.spec.tsx
index 6660461f4ac0..7473d61654c3 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.spec.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.spec.tsx
@@ -2,8 +2,8 @@ import { mockAppRoot } from '@rocket.chat/mock-providers';
 import { render, screen } from '@testing-library/react';
 import React from 'react';
 
-import { createFakeUser } from '../../../../../tests/mocks/data';
 import UsersTable from './UsersTable';
+import { createFakeUser } from '../../../../../tests/mocks/data';
 
 const createFakeAdminUser = (freeSwitchExtension?: string) =>
 	createFakeUser({
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
index 1aca59dcd68d..7cd36ed56a53 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTable.tsx
@@ -3,11 +3,14 @@ import { Pagination } from '@rocket.chat/fuselage';
 import { useEffectEvent, useBreakpoints } from '@rocket.chat/fuselage-hooks';
 import type { PaginatedResult, DefaultUserInfo } from '@rocket.chat/rest-typings';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useRouter, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRouter } from '@rocket.chat/ui-contexts';
 import type { UseQueryResult } from '@tanstack/react-query';
 import type { ReactElement, Dispatch, SetStateAction } from 'react';
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
+import UsersTableFilters from './UsersTableFilters';
+import UsersTableRow from './UsersTableRow';
 import GenericNoResults from '../../../../components/GenericNoResults';
 import {
 	GenericTable,
@@ -20,8 +23,6 @@ import type { usePagination } from '../../../../components/GenericTable/hooks/us
 import type { useSort } from '../../../../components/GenericTable/hooks/useSort';
 import type { AdminUsersTab, UsersFilters, UsersTableSortingOption } from '../AdminUsersPage';
 import { useVoipExtensionPermission } from '../voip/hooks/useVoipExtensionPermission';
-import UsersTableFilters from './UsersTableFilters';
-import UsersTableRow from './UsersTableRow';
 
 type UsersTableProps = {
 	tab: AdminUsersTab;
@@ -44,7 +45,7 @@ const UsersTable = ({
 	sortData,
 	isSeatsCapExceeded,
 }: UsersTableProps): ReactElement | null => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const router = useRouter();
 	const breakpoints = useBreakpoints();
 
@@ -151,7 +152,10 @@ const UsersTable = ({
 			{isSuccess && data.users.length === 0 && (
 				<GenericNoResults
 					icon='user'
-					title={t('Users_Table_Generic_No_users', t((tab !== 'all' ? tab : '') as TranslationKey))}
+					title={t('Users_Table_Generic_No_users', {
+						postProcess: 'sprintf',
+						sprintf: [tab !== 'all' ? t(tab as TranslationKey) : ''],
+					})}
 					description={t(`Users_Table_no_${tab}_users_description`)}
 				/>
 			)}
diff --git a/apps/meteor/client/views/admin/users/UsersTable/UsersTableFilters.tsx b/apps/meteor/client/views/admin/users/UsersTable/UsersTableFilters.tsx
index bffbdd2f7a18..27c0587c7072 100644
--- a/apps/meteor/client/views/admin/users/UsersTable/UsersTableFilters.tsx
+++ b/apps/meteor/client/views/admin/users/UsersTable/UsersTableFilters.tsx
@@ -52,7 +52,7 @@ const UsersTableFilters = ({ roleData, setUsersFilters }: UsersTableFiltersProps
 						id: role._id,
 						text: role.description || role.name || role._id,
 						checked: false,
-				  }))
+					}))
 				: []),
 		],
 		[roleData],
diff --git a/apps/meteor/client/views/admin/users/hooks/useChangeAdminStatusAction.ts b/apps/meteor/client/views/admin/users/hooks/useChangeAdminStatusAction.ts
index 4e179dfb3273..405dbc599115 100644
--- a/apps/meteor/client/views/admin/users/hooks/useChangeAdminStatusAction.ts
+++ b/apps/meteor/client/views/admin/users/hooks/useChangeAdminStatusAction.ts
@@ -26,6 +26,6 @@ export const useChangeAdminStatusAction = (userId: IUser['_id'], isAdmin: boolea
 				icon: 'key',
 				label: isAdmin ? t('Remove_Admin') : t('Make_Admin'),
 				action: changeAdminStatus,
-		  }
+			}
 		: undefined;
 };
diff --git a/apps/meteor/client/views/admin/users/hooks/useChangeUserStatusAction.ts b/apps/meteor/client/views/admin/users/hooks/useChangeUserStatusAction.ts
index 523c8d36a8f3..bd680216c12d 100644
--- a/apps/meteor/client/views/admin/users/hooks/useChangeUserStatusAction.ts
+++ b/apps/meteor/client/views/admin/users/hooks/useChangeUserStatusAction.ts
@@ -2,8 +2,8 @@ import type { IUser } from '@rocket.chat/core-typings';
 import { useToastMessageDispatch, useTranslation, useEndpoint, usePermission } from '@rocket.chat/ui-contexts';
 import { useMemo } from 'react';
 
-import type { Action } from '../../../hooks/useActionSpread';
 import { useConfirmOwnerChanges } from './useConfirmOwnerChanges';
+import type { Action } from '../../../hooks/useActionSpread';
 
 export const useChangeUserStatusAction = (userId: IUser['_id'], isActive: boolean, onChange: () => void): Action | undefined => {
 	const t = useTranslation();
@@ -48,6 +48,6 @@ export const useChangeUserStatusAction = (userId: IUser['_id'], isActive: boolea
 				icon: 'user',
 				label: isActive ? t('Deactivate') : t('Activate'),
 				action: changeActiveStatus,
-		  }
+			}
 		: undefined;
 };
diff --git a/apps/meteor/client/views/admin/users/hooks/useDeleteUserAction.tsx b/apps/meteor/client/views/admin/users/hooks/useDeleteUserAction.tsx
index 90d7bec28ed2..807a92af6e9f 100644
--- a/apps/meteor/client/views/admin/users/hooks/useDeleteUserAction.tsx
+++ b/apps/meteor/client/views/admin/users/hooks/useDeleteUserAction.tsx
@@ -12,9 +12,9 @@ import {
 } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
 
+import { useConfirmOwnerChanges } from './useConfirmOwnerChanges';
 import GenericModal from '../../../../components/GenericModal';
 import type { Action } from '../../../hooks/useActionSpread';
-import { useConfirmOwnerChanges } from './useConfirmOwnerChanges';
 
 export const useDeleteUserAction = (userId: IUser['_id'], onChange: () => void, onReload: () => void): Action | undefined => {
 	const t = useTranslation();
@@ -69,6 +69,6 @@ export const useDeleteUserAction = (userId: IUser['_id'], onChange: () => void,
 				icon: 'trash',
 				label: t('Delete'),
 				action: confirmDeleteUser,
-		  }
+			}
 		: undefined;
 };
diff --git a/apps/meteor/client/views/admin/users/hooks/useResetE2EEKeyAction.tsx b/apps/meteor/client/views/admin/users/hooks/useResetE2EEKeyAction.tsx
index fecb0eb65f6a..78f777f83027 100644
--- a/apps/meteor/client/views/admin/users/hooks/useResetE2EEKeyAction.tsx
+++ b/apps/meteor/client/views/admin/users/hooks/useResetE2EEKeyAction.tsx
@@ -36,6 +36,6 @@ export const useResetE2EEKeyAction = (userId: IUser['_id']): Action | undefined
 				icon: 'key',
 				label: t('Reset_E2E_Key'),
 				action: confirmResetE2EEKey,
-		  }
+			}
 		: undefined;
 };
diff --git a/apps/meteor/client/views/admin/users/hooks/useResetTOTPAction.tsx b/apps/meteor/client/views/admin/users/hooks/useResetTOTPAction.tsx
index 1af5f628f959..a096b2e50d88 100644
--- a/apps/meteor/client/views/admin/users/hooks/useResetTOTPAction.tsx
+++ b/apps/meteor/client/views/admin/users/hooks/useResetTOTPAction.tsx
@@ -37,6 +37,6 @@ export const useResetTOTPAction = (userId: IUser['_id']): Action | undefined =>
 				icon: 'key',
 				label: t('Reset_TOTP'),
 				action: confirmResetTOTP,
-		  }
+			}
 		: undefined;
 };
diff --git a/apps/meteor/client/views/admin/users/hooks/useSendInvitationEmailMutation.ts b/apps/meteor/client/views/admin/users/hooks/useSendInvitationEmailMutation.ts
index ac27fcbdcc05..0fe83f5c4f3f 100644
--- a/apps/meteor/client/views/admin/users/hooks/useSendInvitationEmailMutation.ts
+++ b/apps/meteor/client/views/admin/users/hooks/useSendInvitationEmailMutation.ts
@@ -1,6 +1,7 @@
-import { useEndpoint, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import type { UseMutationResult } from '@tanstack/react-query';
 import { useMutation } from '@tanstack/react-query';
+import { useTranslation } from 'react-i18next';
 
 type UseSendInvitationEmailMutationVariables = {
 	emails: string[];
@@ -11,7 +12,7 @@ export const useSendInvitationEmailMutation = (): UseMutationResult<
 	Error,
 	UseSendInvitationEmailMutationVariables
 > => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 
 	const sendInvites = useEndpoint('POST', '/v1/sendInvitationEmail');
diff --git a/apps/meteor/client/views/admin/users/hooks/useSendWelcomeEmailMutation.ts b/apps/meteor/client/views/admin/users/hooks/useSendWelcomeEmailMutation.ts
index 99077cbd0eb1..7aaf3fb26171 100644
--- a/apps/meteor/client/views/admin/users/hooks/useSendWelcomeEmailMutation.ts
+++ b/apps/meteor/client/views/admin/users/hooks/useSendWelcomeEmailMutation.ts
@@ -1,13 +1,14 @@
-import { useEndpoint, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import type { UseMutationResult } from '@tanstack/react-query';
 import { useMutation } from '@tanstack/react-query';
+import { useTranslation } from 'react-i18next';
 
 type useSendWelcomeEmailMutationProps = {
 	email: string | undefined;
 };
 
 export const useSendWelcomeEmailMutation = (): UseMutationResult<null, Error, useSendWelcomeEmailMutationProps> => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 
 	const sendWelcomeEmail = useEndpoint('POST', '/v1/users.sendWelcomeEmail');
diff --git a/apps/meteor/client/views/admin/users/hooks/useVoipExtensionAction.tsx b/apps/meteor/client/views/admin/users/hooks/useVoipExtensionAction.tsx
index 3254209891c6..63bda3b0b64c 100644
--- a/apps/meteor/client/views/admin/users/hooks/useVoipExtensionAction.tsx
+++ b/apps/meteor/client/views/admin/users/hooks/useVoipExtensionAction.tsx
@@ -33,6 +33,6 @@ export const useVoipExtensionAction = ({ name, username, extension }: VoipExtens
 				icon: extension ? 'phone-disabled' : 'phone',
 				label: extension ? t('Unassign_extension') : t('Assign_extension'),
 				action: handleExtensionAssignment,
-		  }
+			}
 		: undefined;
 };
diff --git a/apps/meteor/client/views/admin/users/voip/AssignExtensionModal.spec.tsx b/apps/meteor/client/views/admin/users/voip/AssignExtensionModal.spec.tsx
index a1ed4b4d4376..54c587e3c00f 100644
--- a/apps/meteor/client/views/admin/users/voip/AssignExtensionModal.spec.tsx
+++ b/apps/meteor/client/views/admin/users/voip/AssignExtensionModal.spec.tsx
@@ -45,7 +45,7 @@ it.todo('should load with default user');
 
 it.todo('should load with default extension');
 
-it('should only enable "Free Extension Numbers" field if username is informed', async () => {
+it('should only enable "Available extensions" field if username is informed', async () => {
 	render(<AssignExtensionModal onClose={() => undefined} />, {
 		legacyRoot: true,
 		wrapper: appRoot.build(),
diff --git a/apps/meteor/client/views/admin/users/voip/AssignExtensionModal.tsx b/apps/meteor/client/views/admin/users/voip/AssignExtensionModal.tsx
index 8e13731028d1..1707a0fd15da 100644
--- a/apps/meteor/client/views/admin/users/voip/AssignExtensionModal.tsx
+++ b/apps/meteor/client/views/admin/users/voip/AssignExtensionModal.tsx
@@ -113,7 +113,7 @@ const AssignExtensionModal = ({ defaultExtension, defaultUsername, onClose }: As
 					</Field>
 
 					<Field>
-						<FieldLabel htmlFor={freeExtensionNumberId}>{t('Free_Extension_Numbers')}</FieldLabel>
+						<FieldLabel htmlFor={freeExtensionNumberId}>{t('Available_extensions')}</FieldLabel>
 						<FieldRow>
 							<Controller
 								control={control}
diff --git a/apps/meteor/client/views/admin/users/voip/hooks/useVoipExtensionAction.tsx b/apps/meteor/client/views/admin/users/voip/hooks/useVoipExtensionAction.tsx
index e5f25683586a..c8bbe3bfb316 100644
--- a/apps/meteor/client/views/admin/users/voip/hooks/useVoipExtensionAction.tsx
+++ b/apps/meteor/client/views/admin/users/voip/hooks/useVoipExtensionAction.tsx
@@ -32,6 +32,6 @@ export const useVoipExtensionAction = ({ name, username, extension, enabled }: V
 				icon: extension ? 'phone-disabled' : 'phone',
 				label: extension ? t('Unassign_extension') : t('Assign_extension'),
 				action: handleExtensionAssignment,
-		  }
+			}
 		: undefined;
 };
diff --git a/apps/meteor/client/views/admin/users/voip/hooks/useVoipExtensionPermission.tsx b/apps/meteor/client/views/admin/users/voip/hooks/useVoipExtensionPermission.tsx
index 70e9e2ce91af..f29e8f04585c 100644
--- a/apps/meteor/client/views/admin/users/voip/hooks/useVoipExtensionPermission.tsx
+++ b/apps/meteor/client/views/admin/users/voip/hooks/useVoipExtensionPermission.tsx
@@ -1,7 +1,7 @@
 import { useSetting, usePermission } from '@rocket.chat/ui-contexts';
 
 export const useVoipExtensionPermission = () => {
-	const isVoipSettingEnabled = useSetting<boolean>('VoIP_TeamCollab_Enabled', false);
+	const isVoipSettingEnabled = useSetting('VoIP_TeamCollab_Enabled', false);
 	const canManageVoipExtensions = usePermission('manage-voip-extensions');
 
 	return isVoipSettingEnabled && canManageVoipExtensions;
diff --git a/apps/meteor/client/views/admin/viewLogs/ServerLogs.tsx b/apps/meteor/client/views/admin/viewLogs/ServerLogs.tsx
index aa496de024fa..38d592601dda 100644
--- a/apps/meteor/client/views/admin/viewLogs/ServerLogs.tsx
+++ b/apps/meteor/client/views/admin/viewLogs/ServerLogs.tsx
@@ -1,8 +1,9 @@
 import type { Serialized } from '@rocket.chat/core-typings';
 import { Box, Icon, Scrollable } from '@rocket.chat/fuselage';
-import { useToastMessageDispatch, useEndpoint, useStream, useTranslation } from '@rocket.chat/ui-contexts';
+import { useToastMessageDispatch, useEndpoint, useStream } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useEffect, useRef, useState, useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { ansispan } from './ansispan';
 
@@ -48,7 +49,7 @@ const ServerLogs = (): ReactElement => {
 		[subscribeToStdout],
 	);
 
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const wrapperRef = useRef<HTMLElement>();
 	const atBottomRef = useRef<boolean>(false);
diff --git a/apps/meteor/client/views/admin/viewLogs/ViewLogsPage.stories.tsx b/apps/meteor/client/views/admin/viewLogs/ViewLogsPage.stories.tsx
index a013c2eaf886..29dbe6525e13 100644
--- a/apps/meteor/client/views/admin/viewLogs/ViewLogsPage.stories.tsx
+++ b/apps/meteor/client/views/admin/viewLogs/ViewLogsPage.stories.tsx
@@ -12,11 +12,7 @@ export default {
 		controls: { hideNoControlsWarning: true },
 	},
 	decorators: [
-		(fn: () => ReactNode): ReactElement => (
-			<div className='rc-old' style={{ display: 'flex', flexDirection: 'column', height: '100vh' }}>
-				{fn()}
-			</div>
-		),
+		(fn: () => ReactNode): ReactElement => <div style={{ display: 'flex', flexDirection: 'column', height: '100vh' }}>{fn()}</div>,
 	],
 } satisfies Meta<typeof ViewLogsPage>;
 
diff --git a/apps/meteor/client/views/admin/viewLogs/ViewLogsPage.tsx b/apps/meteor/client/views/admin/viewLogs/ViewLogsPage.tsx
index 818713898b20..b6400e906ce3 100644
--- a/apps/meteor/client/views/admin/viewLogs/ViewLogsPage.tsx
+++ b/apps/meteor/client/views/admin/viewLogs/ViewLogsPage.tsx
@@ -3,9 +3,9 @@ import type { ReactElement } from 'react';
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { Page, PageHeader, PageContent } from '../../../components/Page';
 import AnalyticsReports from './AnalyticsReports';
 import ServerLogs from './ServerLogs';
+import { Page, PageHeader, PageContent } from '../../../components/Page';
 
 const ViewLogsPage = (): ReactElement => {
 	const { t } = useTranslation();
diff --git a/apps/meteor/client/views/admin/viewLogs/ViewLogsRoute.tsx b/apps/meteor/client/views/admin/viewLogs/ViewLogsRoute.tsx
index 130ddf067f5d..7578ed49fbc9 100644
--- a/apps/meteor/client/views/admin/viewLogs/ViewLogsRoute.tsx
+++ b/apps/meteor/client/views/admin/viewLogs/ViewLogsRoute.tsx
@@ -2,8 +2,8 @@ import { usePermission } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import ViewLogsPage from './ViewLogsPage';
+import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 
 const ViewLogsRoute = (): ReactElement => {
 	const canViewLogs = usePermission('view-logs');
diff --git a/apps/meteor/client/views/admin/workspace/DeploymentCard/DeploymentCard.tsx b/apps/meteor/client/views/admin/workspace/DeploymentCard/DeploymentCard.tsx
index a300a792f45c..5cf225771745 100644
--- a/apps/meteor/client/views/admin/workspace/DeploymentCard/DeploymentCard.tsx
+++ b/apps/meteor/client/views/admin/workspace/DeploymentCard/DeploymentCard.tsx
@@ -2,9 +2,10 @@ import type { IWorkspaceInfo, IStats } from '@rocket.chat/core-typings';
 import { Button, Card, CardControls } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import type { IInstance } from '@rocket.chat/rest-typings';
-import { useSetModal, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetModal } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useFormatDateAndTime } from '../../../../hooks/useFormatDateAndTime';
 import WorkspaceCardSection from '../components/WorkspaceCardSection';
@@ -17,7 +18,7 @@ type DeploymentCardProps = {
 };
 
 const DeploymentCard = ({ serverInfo: { info, cloudWorkspaceId }, statistics, instances }: DeploymentCardProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const formatDateAndTime = useFormatDateAndTime();
 	const setModal = useSetModal();
 
diff --git a/apps/meteor/client/views/admin/workspace/DeploymentCard/components/InstancesModal/DescriptionList.stories.tsx b/apps/meteor/client/views/admin/workspace/DeploymentCard/components/InstancesModal/DescriptionList.stories.tsx
index 2626a2fb9f01..6f4e4544c1f5 100644
--- a/apps/meteor/client/views/admin/workspace/DeploymentCard/components/InstancesModal/DescriptionList.stories.tsx
+++ b/apps/meteor/client/views/admin/workspace/DeploymentCard/components/InstancesModal/DescriptionList.stories.tsx
@@ -10,7 +10,7 @@ export default {
 	parameters: {
 		layout: 'centered',
 	},
-	decorators: [(fn) => <div className='rc-old'>{fn()}</div>],
+	decorators: [(fn) => <div>{fn()}</div>],
 } satisfies Meta<typeof DescriptionList>;
 
 export const Default: StoryFn<typeof DescriptionList> = (args) => (
diff --git a/apps/meteor/client/views/admin/workspace/DeploymentCard/components/InstancesModal/InstancesModal.tsx b/apps/meteor/client/views/admin/workspace/DeploymentCard/components/InstancesModal/InstancesModal.tsx
index 1394d7497ebd..69644eda53f9 100644
--- a/apps/meteor/client/views/admin/workspace/DeploymentCard/components/InstancesModal/InstancesModal.tsx
+++ b/apps/meteor/client/views/admin/workspace/DeploymentCard/components/InstancesModal/InstancesModal.tsx
@@ -3,10 +3,10 @@ import type { IInstance } from '@rocket.chat/rest-typings';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
-import GenericModal from '../../../../../../components/GenericModal';
-import { useFormatDateAndTime } from '../../../../../../hooks/useFormatDateAndTime';
 import DescriptionList from './DescriptionList';
 import DescriptionListEntry from './DescriptionListEntry';
+import GenericModal from '../../../../../../components/GenericModal';
+import { useFormatDateAndTime } from '../../../../../../hooks/useFormatDateAndTime';
 
 type InstancesModalProps = {
 	instances: IInstance[];
diff --git a/apps/meteor/client/views/admin/workspace/UsersUploadsCard/UsersUploadsCard.tsx b/apps/meteor/client/views/admin/workspace/UsersUploadsCard/UsersUploadsCard.tsx
index 90b6be2dbc5c..bbf3a27d47b6 100644
--- a/apps/meteor/client/views/admin/workspace/UsersUploadsCard/UsersUploadsCard.tsx
+++ b/apps/meteor/client/views/admin/workspace/UsersUploadsCard/UsersUploadsCard.tsx
@@ -1,9 +1,10 @@
 import type { IStats } from '@rocket.chat/core-typings';
 import { Button, Card, CardBody, CardControls } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useRouter, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRouter } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useFormatMemorySize } from '../../../../hooks/useFormatMemorySize';
 import { useHasLicenseModule } from '../../../../hooks/useHasLicenseModule';
@@ -15,7 +16,7 @@ type UsersUploadsCardProps = {
 };
 
 const UsersUploadsCard = ({ statistics }: UsersUploadsCardProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const formatMemorySize = useFormatMemorySize();
 
 	const router = useRouter();
diff --git a/apps/meteor/client/views/admin/workspace/VersionCard/VersionCard.tsx b/apps/meteor/client/views/admin/workspace/VersionCard/VersionCard.tsx
index 4291cd02d47a..93c05ab2e9a0 100644
--- a/apps/meteor/client/views/admin/workspace/VersionCard/VersionCard.tsx
+++ b/apps/meteor/client/views/admin/workspace/VersionCard/VersionCard.tsx
@@ -9,10 +9,6 @@ import type { ReactElement, ReactNode } from 'react';
 import React, { useMemo } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 
-import { useFormatDate } from '../../../../hooks/useFormatDate';
-import { useLicense, useLicenseName } from '../../../../hooks/useLicense';
-import { useRegistrationStatus } from '../../../../hooks/useRegistrationStatus';
-import { isOverLicenseLimits } from '../../../../lib/utils/isOverLicenseLimits';
 import VersionCardActionButton from './components/VersionCardActionButton';
 import type { VersionActionItem } from './components/VersionCardActionItem';
 import VersionCardActionItem from './components/VersionCardActionItem';
@@ -20,6 +16,10 @@ import { VersionCardSkeleton } from './components/VersionCardSkeleton';
 import { VersionTag } from './components/VersionTag';
 import { getVersionStatus } from './getVersionStatus';
 import RegisterWorkspaceModal from './modals/RegisterWorkspaceModal';
+import { useFormatDate } from '../../../../hooks/useFormatDate';
+import { useLicense, useLicenseName } from '../../../../hooks/useLicense';
+import { useRegistrationStatus } from '../../../../hooks/useRegistrationStatus';
+import { isOverLicenseLimits } from '../../../../lib/utils/isOverLicenseLimits';
 
 const SUPPORT_EXTERNAL_LINK = 'https://go.rocket.chat/i/version-support';
 const RELEASES_EXTERNAL_LINK = 'https://go.rocket.chat/i/update-product';
@@ -116,11 +116,11 @@ const VersionCard = ({ serverInfo }: VersionCardProps): ReactElement => {
 							danger: true,
 							icon: 'warning',
 							label: t('Plan_limits_reached'),
-					  }
+						}
 					: {
 							icon: 'check',
 							label: t('Operating_withing_plan_limits'),
-					  },
+						},
 				(isAirgapped || !versions) && {
 					icon: 'warning',
 					label: (
@@ -157,12 +157,12 @@ const VersionCard = ({ serverInfo }: VersionCardProps): ReactElement => {
 					? {
 							icon: 'check',
 							label: t('Workspace_registered'),
-					  }
+						}
 					: {
 							danger: true,
 							icon: 'warning',
 							label: t('Workspace_not_registered'),
-					  },
+						},
 			].filter(Boolean) as VersionActionItem[]
 		).sort((a) => (a.danger ? -1 : 1));
 	}, [isOverLimits, t, isAirgapped, versions, versionStatus?.label, versionStatus?.expiration, formatDate, isRegistered]);
diff --git a/apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisterWorkspaceModal.tsx b/apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisterWorkspaceModal.tsx
index 0e61141a2885..0f3891f4e42d 100644
--- a/apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisterWorkspaceModal.tsx
+++ b/apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisterWorkspaceModal.tsx
@@ -1,11 +1,12 @@
 import { Box, Button, ButtonGroup, Modal } from '@rocket.chat/fuselage';
 import { ExternalLink } from '@rocket.chat/ui-client';
-import { useSetModal, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetModal } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
-import useFeatureBullets from '../hooks/useFeatureBullets';
 import RegisterWorkspaceSetupModal from './RegisterWorkspaceSetupModal';
 import RegisterWorkspaceTokenModal from './RegisterWorkspaceTokenModal';
+import useFeatureBullets from '../hooks/useFeatureBullets';
 
 type RegisterWorkspaceModalProps = {
 	onClose: () => void;
@@ -17,7 +18,7 @@ const documentationLink = 'https://go.rocket.chat/i/register-info-collected';
 const RegisterWorkspaceModal = ({ onClose, onStatusChange, ...props }: RegisterWorkspaceModalProps) => {
 	const setModal = useSetModal();
 	const bulletFeatures = useFeatureBullets();
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const handleTokenModal = (): void => {
 		const handleModalClose = (): void => setModal(null);
diff --git a/apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisterWorkspaceSetupModal/RegisterWorkspaceSetupStepOneModal.tsx b/apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisterWorkspaceSetupModal/RegisterWorkspaceSetupStepOneModal.tsx
index 68d66657fad6..18ca396d3bc8 100644
--- a/apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisterWorkspaceSetupModal/RegisterWorkspaceSetupStepOneModal.tsx
+++ b/apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisterWorkspaceSetupModal/RegisterWorkspaceSetupStepOneModal.tsx
@@ -1,9 +1,9 @@
 import { Modal, Box, Field, FieldLabel, FieldRow, TextInput, CheckBox, ButtonGroup, Button } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import { ExternalLink } from '@rocket.chat/ui-client';
-import { useEndpoint, useSetModal, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useSetModal, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import React from 'react';
-import { Trans } from 'react-i18next';
+import { useTranslation, Trans } from 'react-i18next';
 
 import WorkspaceRegistrationModal from '../RegisterWorkspaceModal';
 
@@ -32,7 +32,7 @@ const RegisterWorkspaceSetupStepOneModal = ({
 	...props
 }: Props) => {
 	const setModal = useSetModal();
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 
 	const createRegistrationIntent = useEndpoint('POST', '/v1/cloud.createRegistrationIntent');
diff --git a/apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisterWorkspaceSetupModal/RegisterWorkspaceSetupStepTwoModal.tsx b/apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisterWorkspaceSetupModal/RegisterWorkspaceSetupStepTwoModal.tsx
index 734f07442f11..ddb946c2dc55 100644
--- a/apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisterWorkspaceSetupModal/RegisterWorkspaceSetupStepTwoModal.tsx
+++ b/apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisterWorkspaceSetupModal/RegisterWorkspaceSetupStepTwoModal.tsx
@@ -1,7 +1,7 @@
 import { Modal, Box, Field, FieldLabel, FieldRow, TextInput } from '@rocket.chat/fuselage';
-import { useEndpoint, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import React, { useCallback, useEffect } from 'react';
-import { Trans } from 'react-i18next';
+import { useTranslation, Trans } from 'react-i18next';
 
 type Props = {
 	email: string;
@@ -19,7 +19,7 @@ type Props = {
 const setIntervalTime = (interval?: number): number => (interval ? interval * 1000 : 0);
 
 const RegisterWorkspaceSetupStepTwoModal = ({ email, step, setStep, onClose, intentData, onSuccess, ...props }: Props) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 
 	const cloudConfirmationPoll = useEndpoint('GET', '/v1/cloud.confirmationPoll');
@@ -49,7 +49,7 @@ const RegisterWorkspaceSetupStepTwoModal = ({ email, step, setStep, onClose, int
 		} catch (error: any) {
 			console.log(error);
 		}
-	}, [cloudConfirmationPoll, intentData.device_code, dispatchToastMessage, t]);
+	}, [cloudConfirmationPoll, intentData.device_code, dispatchToastMessage, t, onSuccess]);
 
 	useEffect(() => {
 		const pollInterval = setInterval(() => getConfirmation(), setIntervalTime(intentData.interval));
@@ -89,6 +89,7 @@ const RegisterWorkspaceSetupStepTwoModal = ({ email, step, setStep, onClose, int
 				</Box>
 			</Modal.Content>
 			<Modal.Footer>
+				{/* FIXME: missing translation */}
 				<Box is='div' display='flex' justifyContent='start' fontSize='c1' w='full'>
 					Didn’t receive email?{' '}
 					<Box is='a' pi={4} onClick={handleResendRegistrationEmail}>
diff --git a/apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisterWorkspaceTokenModal.tsx b/apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisterWorkspaceTokenModal.tsx
index b0290d614c92..85989d731fff 100644
--- a/apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisterWorkspaceTokenModal.tsx
+++ b/apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisterWorkspaceTokenModal.tsx
@@ -1,8 +1,8 @@
 import { Box, Button, ButtonGroup, Field, FieldLabel, FieldRow, FieldError, Modal, TextInput } from '@rocket.chat/fuselage';
-import { useMethod, useSetModal, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useMethod, useSetModal, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import type { ChangeEvent } from 'react';
 import React, { useState } from 'react';
-import { Trans } from 'react-i18next';
+import { useTranslation, Trans } from 'react-i18next';
 
 import WorkspaceRegistrationModal from './RegisterWorkspaceModal';
 
@@ -13,7 +13,7 @@ type RegisterWorkspaceTokenModalProps = {
 
 const RegisterWorkspaceTokenModal = ({ onClose, onStatusChange, ...props }: RegisterWorkspaceTokenModalProps) => {
 	const setModal = useSetModal();
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 	const connectWorkspace = useMethod('cloud:connectWorkspace');
 
@@ -50,7 +50,7 @@ const RegisterWorkspaceTokenModal = ({ onClose, onStatusChange, ...props }: Regi
 			dispatchToastMessage({ type: 'error', message: error });
 			setError(true);
 		} finally {
-			await (onStatusChange && onStatusChange());
+			await onStatusChange?.();
 			setProcessing(false);
 		}
 	};
diff --git a/apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisteredWorkspaceModal.tsx b/apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisteredWorkspaceModal.tsx
index 9c5dd0159290..48d77368e5e1 100644
--- a/apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisteredWorkspaceModal.tsx
+++ b/apps/meteor/client/views/admin/workspace/VersionCard/modals/RegisteredWorkspaceModal.tsx
@@ -1,7 +1,8 @@
 import { Box, Button, ButtonGroup, Modal } from '@rocket.chat/fuselage';
 import { useSafely } from '@rocket.chat/fuselage-hooks';
-import { useMethod, useSetModal, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useMethod, useSetModal, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import React, { useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import useFeatureBullets from '../hooks/useFeatureBullets';
 
@@ -11,7 +12,7 @@ type RegisteredWorkspaceModalProps = {
 };
 
 const RegisteredWorkspaceModal = ({ onClose, onStatusChange, ...props }: RegisteredWorkspaceModalProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const setModal = useSetModal();
 	const dispatchToastMessage = useToastMessageDispatch();
 	const bulletFeatures = useFeatureBullets();
diff --git a/apps/meteor/client/views/admin/workspace/WorkspacePage.tsx b/apps/meteor/client/views/admin/workspace/WorkspacePage.tsx
index b3288c1b99c5..1ae00a9e6667 100644
--- a/apps/meteor/client/views/admin/workspace/WorkspacePage.tsx
+++ b/apps/meteor/client/views/admin/workspace/WorkspacePage.tsx
@@ -4,12 +4,12 @@ import type { IInstance } from '@rocket.chat/rest-typings';
 import React, { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page';
-import { useIsEnterprise } from '../../../hooks/useIsEnterprise';
 import DeploymentCard from './DeploymentCard/DeploymentCard';
 import MessagesRoomsCard from './MessagesRoomsCard/MessagesRoomsCard';
 import UsersUploadsCard from './UsersUploadsCard/UsersUploadsCard';
 import VersionCard from './VersionCard/VersionCard';
+import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page';
+import { useIsEnterprise } from '../../../hooks/useIsEnterprise';
 
 type WorkspaceStatusPageProps = {
 	canViewStatistics: boolean;
diff --git a/apps/meteor/client/views/admin/workspace/WorkspaceRoute.tsx b/apps/meteor/client/views/admin/workspace/WorkspaceRoute.tsx
index 7cadf4b7ce1a..31d723a24e78 100644
--- a/apps/meteor/client/views/admin/workspace/WorkspaceRoute.tsx
+++ b/apps/meteor/client/views/admin/workspace/WorkspaceRoute.tsx
@@ -1,17 +1,18 @@
 import { Callout, ButtonGroup, Button } from '@rocket.chat/fuselage';
-import { usePermission, useTranslation } from '@rocket.chat/ui-contexts';
+import { usePermission } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { memo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
+import WorkspacePage from './WorkspacePage';
 import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page';
 import PageSkeleton from '../../../components/PageSkeleton';
 import { useWorkspaceInfo } from '../../../hooks/useWorkspaceInfo';
 import { downloadJsonAs } from '../../../lib/download';
 import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
-import WorkspacePage from './WorkspacePage';
 
 const WorkspaceRoute = (): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const canViewStatistics = usePermission('view-statistics');
 
 	const [refreshStatistics, setRefreshStatistics] = useState(false);
diff --git a/apps/meteor/client/views/audit/AuditLogPage.tsx b/apps/meteor/client/views/audit/AuditLogPage.tsx
index 95fbc39abca8..76b6cbd0d8ff 100644
--- a/apps/meteor/client/views/audit/AuditLogPage.tsx
+++ b/apps/meteor/client/views/audit/AuditLogPage.tsx
@@ -2,8 +2,8 @@ import type { ReactElement } from 'react';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { Page, PageHeader, PageContent } from '../../components/Page';
 import AuditLogTable from './components/AuditLogTable';
+import { Page, PageHeader, PageContent } from '../../components/Page';
 
 const AuditLogPage = (): ReactElement => {
 	const { t } = useTranslation();
diff --git a/apps/meteor/client/views/audit/AuditPage.tsx b/apps/meteor/client/views/audit/AuditPage.tsx
index 3dce9be56a8e..90f72a6e90c3 100644
--- a/apps/meteor/client/views/audit/AuditPage.tsx
+++ b/apps/meteor/client/views/audit/AuditPage.tsx
@@ -3,13 +3,13 @@ import { Box, Callout, Margins, States, StatesIcon, StatesSubtitle, StatesTitle,
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { Page, PageHeader, PageScrollableContentWithShadow } from '../../components/Page';
-import MessageListSkeleton from '../../components/message/list/MessageListSkeleton';
-import { getErrorMessage } from '../../lib/errorHandling';
 import AuditForm from './components/AuditForm';
 import AuditResult from './components/AuditResult';
 import { useAuditMutation } from './hooks/useAuditMutation';
 import { useAuditTab } from './hooks/useAuditTab';
+import { Page, PageHeader, PageScrollableContentWithShadow } from '../../components/Page';
+import MessageListSkeleton from '../../components/message/list/MessageListSkeleton';
+import { getErrorMessage } from '../../lib/errorHandling';
 
 const AuditPage = () => {
 	const [type, setType] = useAuditTab();
diff --git a/apps/meteor/client/views/audit/components/AuditLogEntry.tsx b/apps/meteor/client/views/audit/components/AuditLogEntry.tsx
index c6c4e204a682..5cb1100cad32 100644
--- a/apps/meteor/client/views/audit/components/AuditLogEntry.tsx
+++ b/apps/meteor/client/views/audit/components/AuditLogEntry.tsx
@@ -6,9 +6,9 @@ import type { ReactElement } from 'react';
 import React, { memo, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import AuditFiltersDisplay from './AuditFiltersDisplay';
 import { GenericTableRow, GenericTableCell } from '../../../components/GenericTable';
 import { useFormatDateAndTime } from '../../../hooks/useFormatDateAndTime';
-import AuditFiltersDisplay from './AuditFiltersDisplay';
 
 type AuditLogEntryProps = { value: IAuditLog };
 
diff --git a/apps/meteor/client/views/audit/components/AuditLogTable.tsx b/apps/meteor/client/views/audit/components/AuditLogTable.tsx
index faf650e903de..a2bff0b37514 100644
--- a/apps/meteor/client/views/audit/components/AuditLogTable.tsx
+++ b/apps/meteor/client/views/audit/components/AuditLogTable.tsx
@@ -4,6 +4,7 @@ import { useQuery } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React, { useState } from 'react';
 
+import AuditLogEntry from './AuditLogEntry';
 import GenericNoResults from '../../../components/GenericNoResults';
 import {
 	GenericTable,
@@ -14,7 +15,6 @@ import {
 } from '../../../components/GenericTable';
 import { createEndOfToday, createStartOfToday } from '../utils/dateRange';
 import type { DateRange } from '../utils/dateRange';
-import AuditLogEntry from './AuditLogEntry';
 import DateRangePicker from './forms/DateRangePicker';
 
 const AuditLogTable = (): ReactElement => {
diff --git a/apps/meteor/client/views/audit/components/AuditResult.tsx b/apps/meteor/client/views/audit/components/AuditResult.tsx
index 79b904d38f97..8a98f63aaea0 100644
--- a/apps/meteor/client/views/audit/components/AuditResult.tsx
+++ b/apps/meteor/client/views/audit/components/AuditResult.tsx
@@ -2,8 +2,8 @@ import type { IMessage } from '@rocket.chat/core-typings';
 import type { ReactElement } from 'react';
 import React, { memo } from 'react';
 
-import GenericNoResults from '../../../components/GenericNoResults';
 import AuditMessageList from './AuditMessageList';
+import GenericNoResults from '../../../components/GenericNoResults';
 
 type AuditResultProps = {
 	className?: string;
diff --git a/apps/meteor/client/views/audit/components/forms/DateRangePicker.tsx b/apps/meteor/client/views/audit/components/forms/DateRangePicker.tsx
index 7eecf145865d..ed9302d14185 100644
--- a/apps/meteor/client/views/audit/components/forms/DateRangePicker.tsx
+++ b/apps/meteor/client/views/audit/components/forms/DateRangePicker.tsx
@@ -167,7 +167,7 @@ const DateRangePicker = ({ value, onChange, ...props }: DateRangePickerProps): R
 					label: t('Previous_month'),
 					action: () => dispatch('last-month'),
 				},
-			} as const),
+			}) as const,
 		[dispatch, t],
 	);
 
diff --git a/apps/meteor/client/views/banners/BannerRegion.tsx b/apps/meteor/client/views/banners/BannerRegion.tsx
index 6bf51148ac03..1dc79cbe43c8 100644
--- a/apps/meteor/client/views/banners/BannerRegion.tsx
+++ b/apps/meteor/client/views/banners/BannerRegion.tsx
@@ -2,10 +2,11 @@ import type { ReactElement } from 'react';
 import React from 'react';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
 
-import * as banners from '../../lib/banners';
 import LegacyBanner from './LegacyBanner';
 import UiKitBanner from './UiKitBanner';
 import { useUserBanners } from './hooks/useUserBanners';
+import { withErrorBoundary } from '../../components/withErrorBoundary';
+import * as banners from '../../lib/banners';
 
 const BannerRegion = (): ReactElement | null => {
 	const payload = useSyncExternalStore(...banners.firstSubscription);
@@ -23,4 +24,4 @@ const BannerRegion = (): ReactElement | null => {
 	return <UiKitBanner key={payload.viewId} initialView={payload} />;
 };
 
-export default BannerRegion;
+export default withErrorBoundary(BannerRegion);
diff --git a/apps/meteor/client/views/banners/hooks/useUserBanners.ts b/apps/meteor/client/views/banners/hooks/useUserBanners.ts
index e7a88fd7ee86..8623173b348e 100644
--- a/apps/meteor/client/views/banners/hooks/useUserBanners.ts
+++ b/apps/meteor/client/views/banners/hooks/useUserBanners.ts
@@ -1,13 +1,14 @@
-import { useTranslation, useUser } from '@rocket.chat/ui-contexts';
+import { useUser } from '@rocket.chat/ui-contexts';
 import { useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 
-import * as banners from '../../../lib/banners';
 import { useDismissUserBannerMutation } from './useDismissUserBannerMutation';
+import * as banners from '../../../lib/banners';
 
 export const useUserBanners = () => {
 	const user = useUser();
 
-	const t = useTranslation();
+	const { t, i18n } = useTranslation();
 	const { mutate: dismissUserBanner } = useDismissUserBannerMutation();
 
 	useEffect(() => {
@@ -25,8 +26,8 @@ export const useUserBanners = () => {
 
 		banners.open({
 			id: firstBanner.id,
-			title: t.has(firstBanner.title) ? t(firstBanner.title) : firstBanner.title,
-			text: t.has(firstBanner.text) ? t(firstBanner.text, firstBanner.textArguments) : firstBanner.text,
+			title: i18n.exists(firstBanner.title) ? t(firstBanner.title) : firstBanner.title,
+			text: i18n.exists(firstBanner.text) ? t(firstBanner.text, firstBanner.textArguments) : firstBanner.text,
 			modifiers: firstBanner.modifiers,
 			action() {
 				if (firstBanner.link) {
@@ -37,5 +38,5 @@ export const useUserBanners = () => {
 				dismissUserBanner({ id: firstBanner.id });
 			},
 		});
-	}, [dismissUserBanner, t, user?.banners]);
+	}, [dismissUserBanner, i18n, t, user?.banners]);
 };
diff --git a/apps/meteor/client/views/composer/AudioMessageRecorder/AudioMessageRecorder.tsx b/apps/meteor/client/views/composer/AudioMessageRecorder/AudioMessageRecorder.tsx
index d3b1e7b342cf..15f997b2cd87 100644
--- a/apps/meteor/client/views/composer/AudioMessageRecorder/AudioMessageRecorder.tsx
+++ b/apps/meteor/client/views/composer/AudioMessageRecorder/AudioMessageRecorder.tsx
@@ -1,9 +1,9 @@
 import type { IRoom } from '@rocket.chat/core-typings';
-import { Box, Throbber } from '@rocket.chat/fuselage';
+import { Box, Icon, Throbber } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { MessageComposerAction } from '@rocket.chat/ui-composer';
 import type { ReactElement } from 'react';
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { AudioRecorder } from '../../../../app/ui/client/lib/recorderjs/AudioRecorder';
@@ -100,43 +100,25 @@ const AudioMessageRecorder = ({ rid, chatContext, isMicrophoneDenied }: AudioMes
 		};
 	}, [handleUnmount, handleRecord]);
 
-	const stateClass = useMemo(() => {
-		if (recordingRoomId && recordingRoomId !== rid) {
-			return 'rc-message-box__audio-message--busy';
-		}
-
-		return state && `rc-message-box__audio-message--${state}`;
-	}, [recordingRoomId, rid, state]);
-
 	if (isMicrophoneDenied) {
 		return null;
 	}
 
 	return (
-		<Box position='absolute' pi={4} pb={12} className={`rc-message-box__audio-message ${stateClass}`}>
+		<Box display='flex' position='absolute' color='default' pi={4} pb={12}>
 			{state === 'recording' && (
 				<>
-					<MessageComposerAction
-						icon='circle-cross'
-						className='rc-message-box__icon rc-message-box__audio-message-cancel'
-						onClick={handleCancelButtonClick}
-					/>
-					<Box className='rc-message-box__audio-message-timer' color='default'>
-						<span className='rc-message-box__audio-message-timer-dot'></span>
-						<span className='rc-message-box__audio-message-timer-text'>{time}</span>
+					<MessageComposerAction icon='circle-cross' title={t('Cancel_recording')} onClick={handleCancelButtonClick} />
+					<Box display='flex' alignItems='center' mi={4} justifyContent='center'>
+						<Icon name='rec' color='red' />
+						<Box fontScale='p2' mis={4} is='span' minWidth='x40'>
+							{time}
+						</Box>
 					</Box>
-					<MessageComposerAction
-						icon='circle-check'
-						className='rc-message-box__icon rc-message-box__audio-message-done'
-						onClick={handleDoneButtonClick}
-					/>
+					<MessageComposerAction icon='circle-check' title={t('Finish_recording')} onClick={handleDoneButtonClick} />
 				</>
 			)}
-			{state === 'loading' && (
-				<div className='rc-message-box__icon'>
-					<Throbber inheritColor size='x12' />
-				</div>
-			)}
+			{state === 'loading' && <Throbber inheritColor size='x12' />}
 		</Box>
 	);
 };
diff --git a/apps/meteor/client/views/composer/EmojiPicker/CategoriesResult.tsx b/apps/meteor/client/views/composer/EmojiPicker/CategoriesResult.tsx
index fe609da8640d..7c61c0caa94b 100644
--- a/apps/meteor/client/views/composer/EmojiPicker/CategoriesResult.tsx
+++ b/apps/meteor/client/views/composer/EmojiPicker/CategoriesResult.tsx
@@ -5,9 +5,9 @@ import React, { forwardRef, useRef } from 'react';
 import type { VirtuosoHandle } from 'react-virtuoso';
 import { Virtuoso } from 'react-virtuoso';
 
+import EmojiCategoryRow from './EmojiCategoryRow';
 import type { EmojiCategoryPosition, EmojiByCategory } from '../../../../app/emoji/client';
 import { VirtuosoScrollbars } from '../../../components/CustomScrollbars';
-import EmojiCategoryRow from './EmojiCategoryRow';
 
 type CategoriesResultProps = {
 	emojiListByCategory: EmojiByCategory[];
diff --git a/apps/meteor/client/views/composer/EmojiPicker/EmojiCategoryRow.tsx b/apps/meteor/client/views/composer/EmojiPicker/EmojiCategoryRow.tsx
index 10f0ed565584..0238153aea53 100644
--- a/apps/meteor/client/views/composer/EmojiPicker/EmojiCategoryRow.tsx
+++ b/apps/meteor/client/views/composer/EmojiPicker/EmojiCategoryRow.tsx
@@ -5,9 +5,9 @@ import type { MouseEvent, MutableRefObject } from 'react';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
+import EmojiElement from './EmojiElement';
 import { CUSTOM_CATEGORY } from '../../../../app/emoji/client';
 import type { EmojiByCategory, EmojiCategoryPosition } from '../../../../app/emoji/client';
-import EmojiElement from './EmojiElement';
 
 type EmojiCategoryRowProps = EmojiByCategory & {
 	categoryKey: EmojiByCategory['key'];
diff --git a/apps/meteor/client/views/composer/EmojiPicker/EmojiPicker.tsx b/apps/meteor/client/views/composer/EmojiPicker/EmojiPicker.tsx
index f2e68a60d690..9cbd5e131f97 100644
--- a/apps/meteor/client/views/composer/EmojiPicker/EmojiPicker.tsx
+++ b/apps/meteor/client/views/composer/EmojiPicker/EmojiPicker.tsx
@@ -14,16 +14,16 @@ import type { ChangeEvent, KeyboardEvent, MouseEvent, RefObject } from 'react';
 import React, { useLayoutEffect, useState, useEffect, useRef } from 'react';
 import type { VirtuosoHandle } from 'react-virtuoso';
 
-import type { EmojiItem, EmojiCategoryPosition } from '../../../../app/emoji/client';
-import { emoji, getCategoriesList, getEmojisBySearchTerm } from '../../../../app/emoji/client';
-import { usePreviewEmoji, useEmojiPickerData } from '../../../contexts/EmojiPickerContext';
-import { useIsVisible } from '../../room/hooks/useIsVisible';
 import CategoriesResult from './CategoriesResult';
 import EmojiPickerCategoryItem from './EmojiPickerCategoryItem';
 import EmojiPickerDropdown from './EmojiPickerDropDown';
 import SearchingResult from './SearchingResult';
 import ToneSelector from './ToneSelector';
 import ToneSelectorWrapper from './ToneSelector/ToneSelectorWrapper';
+import { emoji, getCategoriesList, getEmojisBySearchTerm } from '../../../../app/emoji/client';
+import type { EmojiItem, EmojiCategoryPosition } from '../../../../app/emoji/client';
+import { usePreviewEmoji, useEmojiPickerData } from '../../../contexts/EmojiPickerContext';
+import { useIsVisible } from '../../room/hooks/useIsVisible';
 
 type EmojiPickerProps = {
 	reference: Element;
diff --git a/apps/meteor/client/views/composer/EmojiPicker/SearchingResult.tsx b/apps/meteor/client/views/composer/EmojiPicker/SearchingResult.tsx
index 152d13bae5de..ee559ea47d72 100644
--- a/apps/meteor/client/views/composer/EmojiPicker/SearchingResult.tsx
+++ b/apps/meteor/client/views/composer/EmojiPicker/SearchingResult.tsx
@@ -5,10 +5,10 @@ import { useTranslation } from 'react-i18next';
 import type { VirtuosoGridHandle } from 'react-virtuoso';
 import { VirtuosoGrid } from 'react-virtuoso';
 
-import type { EmojiItem } from '../../../../app/emoji/client';
-import { VirtuosoScrollbars } from '../../../components/CustomScrollbars';
 import EmojiElement from './EmojiElement';
 import SearchingResultWrapper from './SearchingResultWrapper';
+import type { EmojiItem } from '../../../../app/emoji/client';
+import { VirtuosoScrollbars } from '../../../components/CustomScrollbars';
 
 /**
  * the `SearchingResults` is missing the previous loadMore function that was implemented before on the latest version of EmojiPicker using the Blaze Template. It can't be implemented because of the issue with react-virtuoso and the custom scrollbars, since its using virtual list its not gonna be an issue rendering bigger results for search
diff --git a/apps/meteor/client/views/conference/ConferencePage.tsx b/apps/meteor/client/views/conference/ConferencePage.tsx
index 0b05e8b2b4d2..3db9777cf079 100644
--- a/apps/meteor/client/views/conference/ConferencePage.tsx
+++ b/apps/meteor/client/views/conference/ConferencePage.tsx
@@ -2,10 +2,10 @@ import { useRoute, useSetModal, useUser } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useEffect } from 'react';
 
+import ConferencePageError from './ConferencePageError';
 import { useUserDisplayName } from '../../hooks/useUserDisplayName';
 import { useVideoConfOpenCall } from '../room/contextualBar/VideoConference/hooks/useVideoConfOpenCall';
 import PageLoading from '../root/PageLoading';
-import ConferencePageError from './ConferencePageError';
 
 const getQueryParams = () => {
 	const queryString = window.location.search;
diff --git a/apps/meteor/client/views/conference/ConferenceRoute.tsx b/apps/meteor/client/views/conference/ConferenceRoute.tsx
index 4b27917c2d3e..4917058b246c 100644
--- a/apps/meteor/client/views/conference/ConferenceRoute.tsx
+++ b/apps/meteor/client/views/conference/ConferenceRoute.tsx
@@ -1,8 +1,8 @@
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import AuthenticationCheck from '../root/MainLayout/AuthenticationCheck';
 import ConferencePage from './ConferencePage';
+import AuthenticationCheck from '../root/MainLayout/AuthenticationCheck';
 
 const ConferenceRoute = (): ReactElement => {
 	return (
diff --git a/apps/meteor/client/views/directory/DirectoryPage.tsx b/apps/meteor/client/views/directory/DirectoryPage.tsx
index 2edfe6e05e09..e025b1046eb5 100644
--- a/apps/meteor/client/views/directory/DirectoryPage.tsx
+++ b/apps/meteor/client/views/directory/DirectoryPage.tsx
@@ -1,7 +1,8 @@
 import { Tabs } from '@rocket.chat/fuselage';
-import { useRouter, useRouteParameter, useSetting, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRouter, useRouteParameter, useSetting } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useEffect, useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { Page, PageHeader, PageContent } from '../../components/Page';
 import ChannelsTab from './tabs/channels/ChannelsTab';
@@ -11,9 +12,9 @@ import UsersTab from './tabs/users/UsersTab';
 type TabName = 'users' | 'channels' | 'teams' | 'external';
 
 const DirectoryPage = (): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
-	const defaultTab = useSetting<TabName>('Accounts_Directory_DefaultView') ?? 'users';
+	const defaultTab = useSetting<TabName>('Accounts_Directory_DefaultView', 'users');
 	const federationEnabled = useSetting('FEDERATION_Enabled');
 	const tab = useRouteParameter('tab') as TabName | undefined;
 	const router = useRouter();
diff --git a/apps/meteor/client/views/directory/hooks/useDirectoryQuery.ts b/apps/meteor/client/views/directory/hooks/useDirectoryQuery.ts
index da0c3dfac7a2..3b30cba673b6 100644
--- a/apps/meteor/client/views/directory/hooks/useDirectoryQuery.ts
+++ b/apps/meteor/client/views/directory/hooks/useDirectoryQuery.ts
@@ -1,3 +1,4 @@
+import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
 import { useMemo } from 'react';
 
 export function useDirectoryQuery(
@@ -6,15 +7,18 @@ export function useDirectoryQuery(
 	type: string,
 	workspace = 'local',
 ): { sort: string; offset?: number | undefined; count?: number; query?: string; text?: string; type?: string; workspace?: string } {
-	return useMemo(
-		() => ({
-			text,
-			type,
-			workspace,
-			sort: JSON.stringify({ [column]: direction === 'asc' ? 1 : -1 }),
-			...(itemsPerPage && { count: itemsPerPage }),
-			...(current && { offset: current }),
-		}),
-		[itemsPerPage, current, column, direction, type, workspace, text],
+	return useDebouncedValue(
+		useMemo(
+			() => ({
+				text,
+				type,
+				workspace,
+				sort: JSON.stringify({ [column]: direction === 'asc' ? 1 : -1 }),
+				...(itemsPerPage && { count: itemsPerPage }),
+				...(current && { offset: current }),
+			}),
+			[itemsPerPage, current, column, direction, type, workspace, text],
+		),
+		500,
 	);
 }
diff --git a/apps/meteor/client/views/directory/tabs/channels/ChannelsTab.tsx b/apps/meteor/client/views/directory/tabs/channels/ChannelsTab.tsx
index e1627e63e067..93bda21319d1 100644
--- a/apps/meteor/client/views/directory/tabs/channels/ChannelsTab.tsx
+++ b/apps/meteor/client/views/directory/tabs/channels/ChannelsTab.tsx
@@ -2,8 +2,8 @@ import { usePermission } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import NotAuthorizedPage from '../../../notAuthorized/NotAuthorizedPage';
 import ChannelsTable from './ChannelsTable';
+import NotAuthorizedPage from '../../../notAuthorized/NotAuthorizedPage';
 
 const ChannelsTab = (): ReactElement => {
 	const canViewPublicRooms = usePermission('view-c-room');
diff --git a/apps/meteor/client/views/directory/tabs/channels/ChannelsTable/ChannelsTable.tsx b/apps/meteor/client/views/directory/tabs/channels/ChannelsTable/ChannelsTable.tsx
index cbd4671bc076..2c73e36393d4 100644
--- a/apps/meteor/client/views/directory/tabs/channels/ChannelsTable/ChannelsTable.tsx
+++ b/apps/meteor/client/views/directory/tabs/channels/ChannelsTable/ChannelsTable.tsx
@@ -1,10 +1,11 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { Pagination, States, StatesIcon, StatesTitle, StatesActions, StatesAction } from '@rocket.chat/fuselage';
-import { useDebouncedValue, useMediaQuery } from '@rocket.chat/fuselage-hooks';
+import { useMediaQuery } from '@rocket.chat/fuselage-hooks';
 import { useRoute, useTranslation, useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import React, { useMemo, useState } from 'react';
 
+import ChannelsTableRow from './ChannelsTableRow';
 import FilterByText from '../../../../../components/FilterByText';
 import GenericNoResults from '../../../../../components/GenericNoResults';
 import {
@@ -17,14 +18,11 @@ import {
 import { usePagination } from '../../../../../components/GenericTable/hooks/usePagination';
 import { useSort } from '../../../../../components/GenericTable/hooks/useSort';
 import { useDirectoryQuery } from '../../../hooks/useDirectoryQuery';
-import ChannelsTableRow from './ChannelsTableRow';
 
 const ChannelsTable = () => {
 	const t = useTranslation();
 	const mediaQuery = useMediaQuery('(min-width: 768px)');
-
 	const [text, setText] = useState('');
-	const debouncedText = useDebouncedValue(text, 500);
 
 	const channelRoute = useRoute('channel');
 	const groupsRoute = useRoute('group');
@@ -82,7 +80,7 @@ const ChannelsTable = () => {
 	);
 
 	const getDirectoryData = useEndpoint('GET', '/v1/directory');
-	const query = useDirectoryQuery({ text: debouncedText, current, itemsPerPage }, [sortBy, sortDirection], 'channels');
+	const query = useDirectoryQuery({ text, current, itemsPerPage }, [sortBy, sortDirection], 'channels');
 	const { data, isFetched, isLoading, isError, refetch } = useQuery(['getDirectoryData', query], () => getDirectoryData(query));
 
 	const onClick = useMemo(
@@ -96,7 +94,7 @@ const ChannelsTable = () => {
 
 	return (
 		<>
-			<FilterByText placeholder={t('Search_Channels')} onChange={setText} />
+			<FilterByText placeholder={t('Search_Channels')} value={text} onChange={(event) => setText(event.target.value)} />
 			{isLoading && (
 				<GenericTable>
 					<GenericTableHeader>{headers}</GenericTableHeader>
diff --git a/apps/meteor/client/views/directory/tabs/teams/TeamsTab.tsx b/apps/meteor/client/views/directory/tabs/teams/TeamsTab.tsx
index 42814f423592..001d1c959ee2 100644
--- a/apps/meteor/client/views/directory/tabs/teams/TeamsTab.tsx
+++ b/apps/meteor/client/views/directory/tabs/teams/TeamsTab.tsx
@@ -2,8 +2,8 @@ import { usePermission } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import NotAuthorizedPage from '../../../notAuthorized/NotAuthorizedPage';
 import TeamsTable from './TeamsTable';
+import NotAuthorizedPage from '../../../notAuthorized/NotAuthorizedPage';
 
 const TeamsTab = (): ReactElement => {
 	const canViewPublicRooms = usePermission('view-c-room');
diff --git a/apps/meteor/client/views/directory/tabs/teams/TeamsTable/TeamsTable.tsx b/apps/meteor/client/views/directory/tabs/teams/TeamsTable/TeamsTable.tsx
index 43e6e0e6cdf6..ce114484caac 100644
--- a/apps/meteor/client/views/directory/tabs/teams/TeamsTable/TeamsTable.tsx
+++ b/apps/meteor/client/views/directory/tabs/teams/TeamsTable/TeamsTable.tsx
@@ -1,10 +1,11 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { Pagination, States, StatesIcon, StatesTitle, StatesActions, StatesAction } from '@rocket.chat/fuselage';
-import { useMediaQuery, useDebouncedValue } from '@rocket.chat/fuselage-hooks';
+import { useMediaQuery } from '@rocket.chat/fuselage-hooks';
 import { useRoute, useTranslation, useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import React, { useMemo, useState } from 'react';
 
+import TeamsTableRow from './TeamsTableRow';
 import FilterByText from '../../../../../components/FilterByText';
 import GenericNoResults from '../../../../../components/GenericNoResults';
 import {
@@ -17,15 +18,11 @@ import {
 import { usePagination } from '../../../../../components/GenericTable/hooks/usePagination';
 import { useSort } from '../../../../../components/GenericTable/hooks/useSort';
 import { useDirectoryQuery } from '../../../hooks/useDirectoryQuery';
-import TeamsTableRow from './TeamsTableRow';
 
 const TeamsTable = () => {
 	const t = useTranslation();
-
 	const mediaQuery = useMediaQuery('(min-width: 768px)');
-
 	const [text, setText] = useState('');
-	const debouncedText = useDebouncedValue(text, 500);
 
 	const { current, itemsPerPage, setItemsPerPage: onSetItemsPerPage, setCurrent: onSetCurrent, ...paginationProps } = usePagination();
 	const { sortBy, sortDirection, setSort } = useSort<'name' | 'usersCount' | 'lastMessage' | 'createdAt'>('name');
@@ -59,7 +56,7 @@ const TeamsTable = () => {
 	const groupsRoute = useRoute('group');
 
 	const getDirectoryData = useEndpoint('GET', '/v1/directory');
-	const query = useDirectoryQuery({ text: debouncedText, current, itemsPerPage }, [sortBy, sortDirection], 'teams');
+	const query = useDirectoryQuery({ text, current, itemsPerPage }, [sortBy, sortDirection], 'teams');
 	const { data, isFetched, isLoading, isError, refetch } = useQuery(['getDirectoryData', query], () => getDirectoryData(query));
 
 	const onClick = useMemo(
@@ -73,7 +70,7 @@ const TeamsTable = () => {
 
 	return (
 		<>
-			<FilterByText placeholder={t('Teams_Search_teams')} onChange={setText} />
+			<FilterByText placeholder={t('Teams_Search_teams')} value={text} onChange={(event) => setText(event.target.value)} />
 			{isLoading && (
 				<GenericTable>
 					<GenericTableHeader>{headers}</GenericTableHeader>
diff --git a/apps/meteor/client/views/directory/tabs/users/UsersTab.tsx b/apps/meteor/client/views/directory/tabs/users/UsersTab.tsx
index da3134ec8a7a..ac1ad6965096 100644
--- a/apps/meteor/client/views/directory/tabs/users/UsersTab.tsx
+++ b/apps/meteor/client/views/directory/tabs/users/UsersTab.tsx
@@ -2,8 +2,8 @@ import { usePermission } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import NotAuthorizedPage from '../../../notAuthorized/NotAuthorizedPage';
 import UsersTable from './UsersTable';
+import NotAuthorizedPage from '../../../notAuthorized/NotAuthorizedPage';
 
 const UsersTab = (props: { workspace?: 'external' | 'local' }): ReactElement => {
 	const canViewOutsideRoom = usePermission('view-outside-room');
diff --git a/apps/meteor/client/views/directory/tabs/users/UsersTable/UsersTable.tsx b/apps/meteor/client/views/directory/tabs/users/UsersTable/UsersTable.tsx
index db01bdf59201..00ccc5ef436c 100644
--- a/apps/meteor/client/views/directory/tabs/users/UsersTable/UsersTable.tsx
+++ b/apps/meteor/client/views/directory/tabs/users/UsersTable/UsersTable.tsx
@@ -1,11 +1,12 @@
 import type { IUser, Serialized } from '@rocket.chat/core-typings';
 import { Pagination, States, StatesIcon, StatesTitle, StatesActions, StatesAction } from '@rocket.chat/fuselage';
-import { useDebouncedValue, useMediaQuery } from '@rocket.chat/fuselage-hooks';
+import { useMediaQuery } from '@rocket.chat/fuselage-hooks';
 import { usePermission, useRoute, useTranslation, useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React, { useCallback, useMemo, useState } from 'react';
 
+import UsersTableRow from './UsersTableRow';
 import FilterByText from '../../../../../components/FilterByText';
 import GenericNoResults from '../../../../../components/GenericNoResults';
 import {
@@ -18,16 +19,14 @@ import {
 import { usePagination } from '../../../../../components/GenericTable/hooks/usePagination';
 import { useSort } from '../../../../../components/GenericTable/hooks/useSort';
 import { useDirectoryQuery } from '../../../hooks/useDirectoryQuery';
-import UsersTableRow from './UsersTableRow';
 
 const UsersTable = ({ workspace = 'local' }): ReactElement => {
 	const t = useTranslation();
 	const mediaQuery = useMediaQuery('(min-width: 1024px)');
 
-	const [text, setText] = useState('');
 	const directRoute = useRoute('direct');
 	const federation = workspace === 'external';
-	const debouncedText = useDebouncedValue(text, 500);
+	const [text, setText] = useState('');
 	const canViewFullOtherUserInfo = usePermission('view-full-other-user-info');
 
 	const { current, itemsPerPage, setItemsPerPage: onSetItemsPerPage, setCurrent: onSetCurrent, ...paginationProps } = usePagination();
@@ -79,7 +78,7 @@ const UsersTable = ({ workspace = 'local' }): ReactElement => {
 		[setSort, sortBy, sortDirection, t, mediaQuery, canViewFullOtherUserInfo, federation],
 	);
 
-	const query = useDirectoryQuery({ text: debouncedText, current, itemsPerPage }, [sortBy, sortDirection], 'users', workspace);
+	const query = useDirectoryQuery({ text, current, itemsPerPage }, [sortBy, sortDirection], 'users', workspace);
 	const getDirectoryData = useEndpoint('GET', '/v1/directory');
 
 	const { data, isFetched, isLoading, isError, refetch } = useQuery(['getDirectoryData', query], () => getDirectoryData(query));
@@ -95,7 +94,7 @@ const UsersTable = ({ workspace = 'local' }): ReactElement => {
 
 	return (
 		<>
-			<FilterByText placeholder={t('Search_Users')} onChange={setText} />
+			<FilterByText placeholder={t('Search_Users')} value={text} onChange={(event) => setText(event.target.value)} />
 			{isLoading && (
 				<GenericTable>
 					<GenericTableHeader>{headers}</GenericTableHeader>
diff --git a/apps/meteor/client/views/home/CustomHomePage.tsx b/apps/meteor/client/views/home/CustomHomePage.tsx
index 16cb3c31744d..90f54e11360c 100644
--- a/apps/meteor/client/views/home/CustomHomePage.tsx
+++ b/apps/meteor/client/views/home/CustomHomePage.tsx
@@ -1,10 +1,10 @@
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import Page from '../../components/Page/Page';
-import PageScrollableContentWithShadow from '../../components/Page/PageScrollableContentWithShadow';
 import HomePageHeader from './HomePageHeader';
 import CustomContentCard from './cards/CustomContentCard';
+import Page from '../../components/Page/Page';
+import PageScrollableContentWithShadow from '../../components/Page/PageScrollableContentWithShadow';
 
 const CustomHomePage = (): ReactElement => {
 	return (
diff --git a/apps/meteor/client/views/home/CustomHomePageContent.tsx b/apps/meteor/client/views/home/CustomHomePageContent.tsx
index d149618d396c..8a8b96f2b5a9 100644
--- a/apps/meteor/client/views/home/CustomHomePageContent.tsx
+++ b/apps/meteor/client/views/home/CustomHomePageContent.tsx
@@ -4,7 +4,7 @@ import type { ComponentProps, ReactElement } from 'react';
 import React from 'react';
 
 const CustomHomePageContent = (props: ComponentProps<typeof Box>): ReactElement => {
-	const body = String(useSetting('Layout_Home_Body'));
+	const body = useSetting('Layout_Home_Body', '');
 
 	return <Box withRichContent dangerouslySetInnerHTML={{ __html: body }} {...props} />;
 };
diff --git a/apps/meteor/client/views/home/DefaultHomePage.tsx b/apps/meteor/client/views/home/DefaultHomePage.tsx
index 85fd1ace2db9..9f06d3e09d7a 100644
--- a/apps/meteor/client/views/home/DefaultHomePage.tsx
+++ b/apps/meteor/client/views/home/DefaultHomePage.tsx
@@ -3,8 +3,6 @@ import { useAtLeastOnePermission, useSetting, useTranslation, useRole, usePermis
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import Page from '../../components/Page/Page';
-import PageScrollableContent from '../../components/Page/PageScrollableContent';
 import HomePageHeader from './HomePageHeader';
 import AddUsersCard from './cards/AddUsersCard';
 import CreateChannelsCard from './cards/CreateChannelsCard';
@@ -13,6 +11,8 @@ import DesktopAppsCard from './cards/DesktopAppsCard';
 import DocumentationCard from './cards/DocumentationCard';
 import JoinRoomsCard from './cards/JoinRoomsCard';
 import MobileAppsCard from './cards/MobileAppsCard';
+import Page from '../../components/Page/Page';
+import PageScrollableContent from '../../components/Page/PageScrollableContent';
 
 const CREATE_CHANNEL_PERMISSIONS = ['create-c', 'create-p'];
 
@@ -22,8 +22,8 @@ const DefaultHomePage = (): ReactElement => {
 	const isAdmin = useRole('admin');
 	const canCreateChannel = useAtLeastOnePermission(CREATE_CHANNEL_PERMISSIONS);
 	const workspaceName = useSetting('Site_Name');
-	const isCustomContentBodyEmpty = useSetting('Layout_Home_Body') === '';
-	const isCustomContentVisible = Boolean(useSetting('Layout_Home_Custom_Block_Visible'));
+	const isCustomContentBodyEmpty = useSetting('Layout_Home_Body', '') === '';
+	const isCustomContentVisible = useSetting('Layout_Home_Custom_Block_Visible', false);
 
 	return (
 		<Page color='default' data-qa='page-home' data-qa-type='default' background='tint'>
diff --git a/apps/meteor/client/views/home/HomePage.tsx b/apps/meteor/client/views/home/HomePage.tsx
index 54a627d14fcf..f99dae9cea29 100644
--- a/apps/meteor/client/views/home/HomePage.tsx
+++ b/apps/meteor/client/views/home/HomePage.tsx
@@ -2,9 +2,9 @@ import { useSetting } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useEffect } from 'react';
 
-import { KonchatNotification } from '../../../app/ui/client/lib/KonchatNotification';
 import CustomHomePage from './CustomHomePage';
 import DefaultHomePage from './DefaultHomePage';
+import { KonchatNotification } from '../../../app/ui/client/lib/KonchatNotification';
 
 const HomePage = (): ReactElement => {
 	useEffect(() => {
diff --git a/apps/meteor/client/views/home/HomePageHeader.tsx b/apps/meteor/client/views/home/HomePageHeader.tsx
index f32eff1881b8..02ad56cffc49 100644
--- a/apps/meteor/client/views/home/HomePageHeader.tsx
+++ b/apps/meteor/client/views/home/HomePageHeader.tsx
@@ -9,7 +9,7 @@ const EDIT_LAYOUT_PERMISSIONS = ['view-privileged-setting', 'edit-privileged-set
 
 const HomepageHeader = (): ReactElement => {
 	const t = useTranslation();
-	const title = useSetting('Layout_Home_Title') as string;
+	const title = useSetting('Layout_Home_Title', 'Home');
 	const canEditLayout = useAllPermissions(EDIT_LAYOUT_PERMISSIONS);
 	const settingsRoute = useRoute('admin-settings');
 
diff --git a/apps/meteor/client/views/home/cards/CustomContentCard.tsx b/apps/meteor/client/views/home/cards/CustomContentCard.tsx
index af1bf899dd84..a6248133a1ef 100644
--- a/apps/meteor/client/views/home/cards/CustomContentCard.tsx
+++ b/apps/meteor/client/views/home/cards/CustomContentCard.tsx
@@ -13,10 +13,10 @@ const CustomContentCard = (props: Omit<ComponentProps<typeof Card>, 'type'>): Re
 
 	const { data } = useIsEnterprise();
 	const isAdmin = useRole('admin');
-	const customContentBody = useSetting<string>('Layout_Home_Body');
+	const customContentBody = useSetting('Layout_Home_Body', '');
 	const isCustomContentBodyEmpty = customContentBody === '';
-	const isCustomContentVisible = useSetting<boolean>('Layout_Home_Custom_Block_Visible');
-	const isCustomContentOnly = useSetting<boolean>('Layout_Custom_Body_Only');
+	const isCustomContentVisible = useSetting('Layout_Home_Custom_Block_Visible', false);
+	const isCustomContentOnly = useSetting('Layout_Custom_Body_Only', false);
 
 	const setCustomContentVisible = useSettingSetValue('Layout_Home_Custom_Block_Visible');
 	const setCustomContentOnly = useSettingSetValue('Layout_Custom_Body_Only');
diff --git a/apps/meteor/client/views/hooks/roomActions/useArchiveRoom.tsx b/apps/meteor/client/views/hooks/roomActions/useArchiveRoom.tsx
index 9abcffa07a35..d0dd48e911d8 100644
--- a/apps/meteor/client/views/hooks/roomActions/useArchiveRoom.tsx
+++ b/apps/meteor/client/views/hooks/roomActions/useArchiveRoom.tsx
@@ -1,9 +1,10 @@
 import type { IRoom, RoomAdminFieldsType } from '@rocket.chat/core-typings';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useEndpoint, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
+import { useTranslation } from 'react-i18next';
 
 export const useArchiveRoom = (room: Pick<IRoom, RoomAdminFieldsType>) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 	const archiveAction = useEndpoint('POST', '/v1/rooms.changeArchivationState');
 
diff --git a/apps/meteor/client/views/hooks/roomActions/useDeleteRoom.tsx b/apps/meteor/client/views/hooks/roomActions/useDeleteRoom.tsx
index ef46a0f68ced..925bf9a548fe 100644
--- a/apps/meteor/client/views/hooks/roomActions/useDeleteRoom.tsx
+++ b/apps/meteor/client/views/hooks/roomActions/useDeleteRoom.tsx
@@ -1,15 +1,16 @@
 import type { IRoom, RoomAdminFieldsType } from '@rocket.chat/core-typings';
 import { isRoomFederated } from '@rocket.chat/core-typings';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useSetModal, useToastMessageDispatch, useRouter, usePermission, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetModal, useToastMessageDispatch, useRouter, usePermission, useEndpoint } from '@rocket.chat/ui-contexts';
 import { useMutation, useQuery } from '@tanstack/react-query';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../components/GenericModal';
 import DeleteTeamModal from '../../teams/contextualBar/info/DeleteTeam';
 
 export const useDeleteRoom = (room: IRoom | Pick<IRoom, RoomAdminFieldsType>, { reload }: { reload?: () => void } = {}) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const router = useRouter();
 	const setModal = useSetModal();
 	const dispatchToastMessage = useToastMessageDispatch();
diff --git a/apps/meteor/client/views/invite/InvitePage.tsx b/apps/meteor/client/views/invite/InvitePage.tsx
index 739b7cd0eccf..f916ccabc9aa 100644
--- a/apps/meteor/client/views/invite/InvitePage.tsx
+++ b/apps/meteor/client/views/invite/InvitePage.tsx
@@ -1,7 +1,8 @@
 import { HeroLayout, HeroLayoutTitle } from '@rocket.chat/layout';
-import { useRouteParameter, useUserId, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRouteParameter, useUserId } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import LoginPage from '../root/MainLayout/LoginPage';
 import PageLoading from '../root/PageLoading';
@@ -9,7 +10,7 @@ import { useInviteTokenMutation } from './hooks/useInviteTokenMutation';
 import { useValidateInviteQuery } from './hooks/useValidateInviteQuery';
 
 const InvitePage = (): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const token = useRouteParameter('hash');
 	const userId = useUserId();
diff --git a/apps/meteor/client/views/invite/hooks/useInviteTokenMutation.ts b/apps/meteor/client/views/invite/hooks/useInviteTokenMutation.ts
index 9408b22d9e36..f6e0c58e7f10 100644
--- a/apps/meteor/client/views/invite/hooks/useInviteTokenMutation.ts
+++ b/apps/meteor/client/views/invite/hooks/useInviteTokenMutation.ts
@@ -1,8 +1,9 @@
-import { useEndpoint, useRouter, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useRouter, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import { useMutation } from '@tanstack/react-query';
+import { useTranslation } from 'react-i18next';
 
 export const useInviteTokenMutation = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const router = useRouter();
 
 	const dispatchToastMessage = useToastMessageDispatch();
diff --git a/apps/meteor/client/views/invite/hooks/useValidateInviteQuery.ts b/apps/meteor/client/views/invite/hooks/useValidateInviteQuery.ts
index 0d5d8bfc6dc1..106a8c14c6b2 100644
--- a/apps/meteor/client/views/invite/hooks/useValidateInviteQuery.ts
+++ b/apps/meteor/client/views/invite/hooks/useValidateInviteQuery.ts
@@ -1,10 +1,11 @@
-import { useEndpoint, useSessionDispatch, useSetting, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useSessionDispatch, useSetting, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
+import { useTranslation } from 'react-i18next';
 
 import { useInviteTokenMutation } from './useInviteTokenMutation';
 
 export const useValidateInviteQuery = (userId: string | null, token: string | undefined) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const registrationForm = useSetting('Accounts_RegistrationForm');
 
diff --git a/apps/meteor/client/views/mailer/MailerUnsubscriptionPage.tsx b/apps/meteor/client/views/mailer/MailerUnsubscriptionPage.tsx
index 94bf32c8d79a..95a0c3c9745e 100644
--- a/apps/meteor/client/views/mailer/MailerUnsubscriptionPage.tsx
+++ b/apps/meteor/client/views/mailer/MailerUnsubscriptionPage.tsx
@@ -1,7 +1,8 @@
 import { Box, Callout, Throbber } from '@rocket.chat/fuselage';
 import { HeroLayout } from '@rocket.chat/layout';
-import { useToastMessageDispatch, useRouteParameter, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useToastMessageDispatch, useRouteParameter, useEndpoint } from '@rocket.chat/ui-contexts';
 import React, { useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import type { AsyncState } from '../../hooks/useAsyncState';
 import { AsyncStatePhase, useAsyncState } from '../../hooks/useAsyncState';
@@ -38,7 +39,7 @@ const useMailerUnsubscriptionState = (): AsyncState<boolean> => {
 const MailerUnsubscriptionPage = () => {
 	const { phase, error } = useMailerUnsubscriptionState();
 
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<HeroLayout>
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/AppDetailsPage.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/AppDetailsPage.tsx
index f594dcfa1f21..f3b3cabf1f56 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/AppDetailsPage.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/AppDetailsPage.tsx
@@ -7,19 +7,19 @@ import type { ReactElement } from 'react';
 import React, { useMemo, useCallback } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 
-import { AppClientOrchestratorInstance } from '../../../apps/orchestrator';
-import { Page, PageFooter, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page';
-import { handleAPIError } from '../helpers/handleAPIError';
-import { useAppInfo } from '../hooks/useAppInfo';
 import AppDetailsPageHeader from './AppDetailsPageHeader';
 import AppDetailsPageLoading from './AppDetailsPageLoading';
 import AppDetailsPageTabs from './AppDetailsPageTabs';
+import { handleAPIError } from '../helpers/handleAPIError';
+import { useAppInfo } from '../hooks/useAppInfo';
 import AppDetails from './tabs/AppDetails';
 import AppLogs from './tabs/AppLogs';
 import AppReleases from './tabs/AppReleases';
 import AppRequests from './tabs/AppRequests/AppRequests';
 import AppSecurity from './tabs/AppSecurity/AppSecurity';
 import AppSettings from './tabs/AppSettings';
+import { AppClientOrchestratorInstance } from '../../../apps/orchestrator';
+import { Page, PageFooter, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page';
 
 const AppDetailsPage = ({ id }: { id: App['id'] }): ReactElement => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/AppDetailsPageTabs.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/AppDetailsPageTabs.tsx
index 444e1bf3123a..9cb9be4b88f3 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/AppDetailsPageTabs.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/AppDetailsPageTabs.tsx
@@ -1,7 +1,8 @@
 import { Tabs } from '@rocket.chat/fuselage';
-import { usePermission, useRouter, useTranslation } from '@rocket.chat/ui-contexts';
+import { usePermission, useRouter } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import type { ISettings } from '../../../apps/@types/IOrchestrator';
 
@@ -14,7 +15,7 @@ type AppDetailsPageTabsProps = {
 };
 
 const AppDetailsPageTabs = ({ context, installed, isSecurityVisible, settings, tab }: AppDetailsPageTabsProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const isAdminUser = usePermission('manage-apps');
 
 	const router = useRouter();
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppDetails/AppDetails.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppDetails/AppDetails.tsx
index 917b4de07bc2..e55ee6dd9f1f 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppDetails/AppDetails.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppDetails/AppDetails.tsx
@@ -5,14 +5,14 @@ import DOMPurify from 'dompurify';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
+import AppDetailsAPIs from './AppDetailsAPIs';
+import { normalizeUrl } from './normalizeUrl';
 import { useExternalLink } from '../../../../../hooks/useExternalLink';
 import { useHasLicenseModule } from '../../../../../hooks/useHasLicenseModule';
 import { GET_ADDONS_LINK } from '../../../../admin/subscription/utils/links';
 import ScreenshotCarouselAnchor from '../../../components/ScreenshotCarouselAnchor';
 import type { AppInfo } from '../../../definitions/AppInfo';
 import { purifyOptions } from '../../../lib/purifyOptions';
-import AppDetailsAPIs from './AppDetailsAPIs';
-import { normalizeUrl } from './normalizeUrl';
 
 type AppDetailsProps = {
 	app: AppInfo;
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppDetails/AppDetailsAPIs.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppDetails/AppDetailsAPIs.tsx
index 820df2dc1fd9..d501c7f77631 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppDetails/AppDetailsAPIs.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppDetails/AppDetailsAPIs.tsx
@@ -1,7 +1,8 @@
 import type { IApiEndpointMetadata } from '@rocket.chat/apps-engine/definition/api';
 import { Box } from '@rocket.chat/fuselage';
-import { useAbsoluteUrl, useTranslation } from '@rocket.chat/ui-contexts';
+import { useAbsoluteUrl } from '@rocket.chat/ui-contexts';
 import React, { Fragment } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { apiCurlGetter } from '../../../helpers/apiCurlGetter';
 
@@ -10,7 +11,7 @@ type AppDetailsAPIsProps = {
 };
 
 const AppDetailsAPIs = ({ apis }: AppDetailsAPIsProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const absoluteUrl = useAbsoluteUrl();
 	const getApiCurl = apiCurlGetter(absoluteUrl);
 
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogs.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogs.tsx
index 278a72345dda..251960a24b7c 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogs.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/AppLogs.tsx
@@ -3,10 +3,10 @@ import type { ReactElement } from 'react';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
+import AppLogsItem from './AppLogsItem';
 import { useFormatDateAndTime } from '../../../../../hooks/useFormatDateAndTime';
 import AccordionLoading from '../../../components/AccordionLoading';
 import { useLogs } from '../../../hooks/useLogs';
-import AppLogsItem from './AppLogsItem';
 
 const AppLogs = ({ id }: { id: string }): ReactElement => {
 	const { t } = useTranslation();
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppReleases/AppReleases.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppReleases/AppReleases.tsx
index cf8118f2a766..c907330f6a5a 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppReleases/AppReleases.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppReleases/AppReleases.tsx
@@ -1,17 +1,18 @@
 import type { App } from '@rocket.chat/core-typings';
 import { Accordion } from '@rocket.chat/fuselage';
-import { useEndpoint, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
-import AccordionLoading from '../../../components/AccordionLoading';
 import AppReleasesItem from './AppReleasesItem';
+import AccordionLoading from '../../../components/AccordionLoading';
 
 const AppReleases = ({ id }: { id: App['id'] }): ReactElement => {
 	const getVersions = useEndpoint('GET', '/apps/:id/versions', { id });
 	const dispatchToastMessage = useToastMessageDispatch();
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const { data, isLoading, isFetched } = useQuery(
 		['apps', id, 'versions'],
@@ -34,13 +35,7 @@ const AppReleases = ({ id }: { id: App['id'] }): ReactElement => {
 		<>
 			<Accordion width='100%' alignSelf='center'>
 				{isLoading && <AccordionLoading />}
-				{isFetched && (
-					<>
-						{data?.map((release) => (
-							<AppReleasesItem release={release} key={release.version} />
-						))}
-					</>
-				)}
+				{isFetched && <>{data?.map((release) => <AppReleasesItem release={release} key={release.version} />)}</>}
 			</Accordion>
 		</>
 	);
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppRequests/AppRequests.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppRequests/AppRequests.tsx
index a478d37508bd..60e4819f56f8 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppRequests/AppRequests.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppRequests/AppRequests.tsx
@@ -1,15 +1,16 @@
 import type { App } from '@rocket.chat/core-typings';
 import { Box, Pagination, States, StatesSubtitle, StatesTitle } from '@rocket.chat/fuselage';
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useMutation } from '@tanstack/react-query';
 import type { ReactElement, SetStateAction } from 'react';
 import React, { useState, useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 
+import AppRequestItem from './AppRequestItem';
+import AppRequestsLoading from './AppRequestsLoading';
 import { useAppsReload } from '../../../../../contexts/hooks/useAppsReload';
 import { queryClient } from '../../../../../lib/queryClient';
 import { useAppRequests } from '../../../hooks/useAppRequests';
-import AppRequestItem from './AppRequestItem';
-import AppRequestsLoading from './AppRequestsLoading';
 
 type itemsPerPage = 25 | 50 | 100;
 
@@ -18,7 +19,7 @@ const AppRequests = ({ id, isAdminUser }: { id: App['id']; isAdminUser: boolean
 	const [offset, setOffset] = useState<number>(0);
 
 	const paginatedAppRequests = useAppRequests(id, limit, offset);
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const onSetItemsPerPage = (itemsPerPageOption: SetStateAction<itemsPerPage>) => setLimit(itemsPerPageOption);
 	const onSetCurrent = (currentItemsOption: SetStateAction<number>) => setOffset(currentItemsOption);
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSecurity/AppSecurity.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSecurity/AppSecurity.tsx
index 5554bde2651c..56bb42825f18 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSecurity/AppSecurity.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSecurity/AppSecurity.tsx
@@ -4,8 +4,8 @@ import type { ReactElement } from 'react';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
-import AppPermissionsList from '../../../components/AppPermissionsList';
 import AppSecurityLabel from './AppSecurityLabel';
+import AppPermissionsList from '../../../components/AppPermissionsList';
 
 type AppSecurityProps = {
 	privacyPolicySummary?: string;
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSettings/AppSettings.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSettings/AppSettings.tsx
index 59080c7f3237..72ad86378747 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSettings/AppSettings.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppSettings/AppSettings.tsx
@@ -2,8 +2,8 @@ import { Box, FieldGroup } from '@rocket.chat/fuselage';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
-import type { ISettings } from '../../../../../apps/@types/IOrchestrator';
 import AppSetting from './AppSetting';
+import type { ISettings } from '../../../../../apps/@types/IOrchestrator';
 
 const AppSettings = ({ settings }: { settings: ISettings }) => {
 	const { t } = useTranslation();
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppStatus/AppStatus.spec.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppStatus/AppStatus.spec.tsx
index 3d48bb398e26..ccf0c9d426ec 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppStatus/AppStatus.spec.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppStatus/AppStatus.spec.tsx
@@ -4,9 +4,9 @@ import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 
+import AppStatus from './AppStatus';
 import { mockedAppsContext } from '../../../../../../tests/mocks/client/marketplace';
 import { createFakeApp, createFakeLicenseInfo } from '../../../../../../tests/mocks/data';
-import AppStatus from './AppStatus';
 
 it('should look good', async () => {
 	const app = createFakeApp();
diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppStatus/AppStatus.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppStatus/AppStatus.tsx
index 70453edd898b..5608c7868411 100644
--- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppStatus/AppStatus.tsx
+++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppStatus/AppStatus.tsx
@@ -2,11 +2,13 @@ import type { App } from '@rocket.chat/core-typings';
 import { Box, Button, Tag, Margins } from '@rocket.chat/fuselage';
 import { useSafely } from '@rocket.chat/fuselage-hooks';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useRouteParameter, usePermission, useSetModal, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRouteParameter, usePermission, useSetModal } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useCallback, useState, memo } from 'react';
+import { useTranslation } from 'react-i18next';
 import semver from 'semver';
 
+import AppStatusPriceDisplay from './AppStatusPriceDisplay';
 import { useHasLicenseModule } from '../../../../../hooks/useHasLicenseModule';
 import { useIsEnterprise } from '../../../../../hooks/useIsEnterprise';
 import AddonRequiredModal from '../../../AppsList/AddonRequiredModal';
@@ -15,7 +17,6 @@ import { appButtonProps, appMultiStatusProps } from '../../../helpers';
 import type { AppInstallationHandlerParams } from '../../../hooks/useAppInstallationHandler';
 import { useAppInstallationHandler } from '../../../hooks/useAppInstallationHandler';
 import { useMarketplaceActions } from '../../../hooks/useMarketplaceActions';
-import AppStatusPriceDisplay from './AppStatusPriceDisplay';
 
 type AppStatusProps = {
 	app: App;
@@ -25,7 +26,7 @@ type AppStatusProps = {
 };
 
 const AppStatus = ({ app, showStatus = true, isAppDetailsPage, installed, ...props }: AppStatusProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [endUserRequested, setEndUserRequested] = useState(false);
 	const [loading, setLoading] = useSafely(useState(false));
 	const [isAppPurchased, setPurchased] = useSafely(useState(!!app?.isPurchased));
@@ -163,7 +164,7 @@ const AppStatus = ({ app, showStatus = true, isAppDetailsPage, installed, ...pro
 			{statuses?.map((status, index) => (
 				<Margins inlineEnd={index !== statuses.length - 1 ? 8 : undefined} key={index}>
 					<Tag data-qa-type='app-status-tag' variant={getStatusVariant(status)} title={status.tooltipText ? status.tooltipText : ''}>
-						{handleAppRequestsNumber(status)} {t(`${status.label}` as TranslationKey)}
+						{handleAppRequestsNumber(status)} {t(status.label)}
 					</Tag>
 				</Margins>
 			))}
diff --git a/apps/meteor/client/views/marketplace/AppExemptModal.tsx b/apps/meteor/client/views/marketplace/AppExemptModal.tsx
new file mode 100644
index 000000000000..ed386b27df0c
--- /dev/null
+++ b/apps/meteor/client/views/marketplace/AppExemptModal.tsx
@@ -0,0 +1,49 @@
+import { Box, Modal } from '@rocket.chat/fuselage';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+
+import GenericModal from '../../components/GenericModal';
+import { useExternalLink } from '../../hooks/useExternalLink';
+import { useCheckoutUrl } from '../admin/subscription/hooks/useCheckoutUrl';
+import { PRICING_LINK } from '../admin/subscription/utils/links';
+
+type AppExemptModalProps = {
+	onCancel: () => void;
+	appName: string;
+};
+
+const AppExemptModal = ({ onCancel, appName }: AppExemptModalProps) => {
+	const { t } = useTranslation();
+
+	const openExternalLink = useExternalLink();
+	const manageSubscriptionUrl = useCheckoutUrl()({ target: 'private-apps-page', action: 'upgrade' });
+
+	const goToManageSubscriptionPage = (): void => {
+		openExternalLink(manageSubscriptionUrl);
+		onCancel();
+	};
+
+	return (
+		<GenericModal
+			title={t('Apps_Cannot_Be_Updated')}
+			onClose={onCancel}
+			dontAskAgain={
+				<Modal.FooterAnnotation>
+					<a target='_blank' rel='noopener noreferrer' href={PRICING_LINK}>
+						{t('Compare_plans')}
+					</a>
+				</Modal.FooterAnnotation>
+			}
+			variant='warning'
+			cancelText={t('Cancel')}
+			confirmText={t('Upgrade')}
+			onCancel={onCancel}
+			onConfirm={goToManageSubscriptionPage}
+		>
+			<Box mbe={28}>{t('Apps_Private_App_Is_Exempt', { appName })}</Box>
+			{t('Upgrade_subscription_to_enable_private_apps')}
+		</GenericModal>
+	);
+};
+
+export default AppExemptModal;
diff --git a/apps/meteor/client/views/marketplace/AppInstallPage.tsx b/apps/meteor/client/views/marketplace/AppInstallPage.tsx
index 68ecc313991a..dfc58b5a47bf 100644
--- a/apps/meteor/client/views/marketplace/AppInstallPage.tsx
+++ b/apps/meteor/client/views/marketplace/AppInstallPage.tsx
@@ -4,9 +4,9 @@ import { useTranslation, useRouter } from '@rocket.chat/ui-contexts';
 import React, { useCallback } from 'react';
 import { useForm, Controller } from 'react-hook-form';
 
+import { useInstallApp } from './hooks/useInstallApp';
 import { Page, PageHeader, PageScrollableContent } from '../../components/Page';
 import { useSingleFileInput } from '../../hooks/useSingleFileInput';
-import { useInstallApp } from './hooks/useInstallApp';
 
 const AppInstallPage = () => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/marketplace/AppMenu.spec.tsx b/apps/meteor/client/views/marketplace/AppMenu.spec.tsx
index 00316b193014..3f231f59a9eb 100644
--- a/apps/meteor/client/views/marketplace/AppMenu.spec.tsx
+++ b/apps/meteor/client/views/marketplace/AppMenu.spec.tsx
@@ -3,9 +3,9 @@ import { mockAppRoot } from '@rocket.chat/mock-providers';
 import { render, screen } from '@testing-library/react';
 import React from 'react';
 
+import AppMenu from './AppMenu';
 import { mockedAppsContext } from '../../../tests/mocks/client/marketplace';
 import { createFakeApp } from '../../../tests/mocks/data';
-import AppMenu from './AppMenu';
 
 describe('without app details', () => {
 	it('should look good', async () => {
diff --git a/apps/meteor/client/views/marketplace/AppPermissionsReviewModal.tsx b/apps/meteor/client/views/marketplace/AppPermissionsReviewModal.tsx
index d06c6bc9f2f5..721a904a43a9 100644
--- a/apps/meteor/client/views/marketplace/AppPermissionsReviewModal.tsx
+++ b/apps/meteor/client/views/marketplace/AppPermissionsReviewModal.tsx
@@ -3,8 +3,8 @@ import { Box } from '@rocket.chat/fuselage';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
-import GenericModal from '../../components/GenericModal';
 import AppPermissionsList from './components/AppPermissionsList';
+import GenericModal from '../../components/GenericModal';
 
 export type AppPermissionsReviewModalProps = {
 	appPermissions: App['permissions'];
diff --git a/apps/meteor/client/views/marketplace/AppsPage/AppsFilters.tsx b/apps/meteor/client/views/marketplace/AppsPage/AppsFilters.tsx
index caa76c266480..fb7c37d98e17 100644
--- a/apps/meteor/client/views/marketplace/AppsPage/AppsFilters.tsx
+++ b/apps/meteor/client/views/marketplace/AppsPage/AppsFilters.tsx
@@ -12,10 +12,8 @@ import type { CategoryDropDownListProps, CategoryOnSelected, selectedCategoriesL
 import type { RadioDropDownGroup, RadioDropDownOnSelected } from '../definitions/RadioDropDownDefinitions';
 
 type AppsFiltersProps = {
-	setText: React.Dispatch<React.SetStateAction<string>> & {
-		flush: () => void;
-		cancel: () => void;
-	};
+	text: string;
+	setText: (text: string) => void;
 	freePaidFilterStructure: RadioDropDownGroup;
 	freePaidFilterOnSelected: RadioDropDownOnSelected;
 	categories: CategoryDropDownListProps['categories'];
@@ -30,6 +28,7 @@ type AppsFiltersProps = {
 };
 
 const AppsFilters = ({
+	text,
 	setText,
 	freePaidFilterStructure,
 	freePaidFilterOnSelected,
@@ -60,7 +59,7 @@ const AppsFilters = ({
 
 	return (
 		<Box pi={24}>
-			<FilterByText placeholder={appsSearchPlaceholders[context]} onChange={setText}>
+			<FilterByText value={text} onChange={(event) => setText(event.target.value)} placeholder={appsSearchPlaceholders[context]}>
 				{!isPrivateAppsPage && (
 					<RadioDropDown group={freePaidFilterStructure} onSelected={freePaidFilterOnSelected} flexGrow={1} {...fixFiltersSize} />
 				)}
diff --git a/apps/meteor/client/views/marketplace/AppsPage/AppsPage.tsx b/apps/meteor/client/views/marketplace/AppsPage/AppsPage.tsx
index af0b8f384c8a..729b4ea11f47 100644
--- a/apps/meteor/client/views/marketplace/AppsPage/AppsPage.tsx
+++ b/apps/meteor/client/views/marketplace/AppsPage/AppsPage.tsx
@@ -1,8 +1,8 @@
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import { Page } from '../../../components/Page';
 import AppsPageContent from './AppsPageContent';
+import { Page } from '../../../components/Page';
 
 const AppsPage = (): ReactElement => {
 	return (
diff --git a/apps/meteor/client/views/marketplace/AppsPage/AppsPageContent.tsx b/apps/meteor/client/views/marketplace/AppsPage/AppsPageContent.tsx
index 15ee5c5ba692..be647eecc7ac 100644
--- a/apps/meteor/client/views/marketplace/AppsPage/AppsPageContent.tsx
+++ b/apps/meteor/client/views/marketplace/AppsPage/AppsPageContent.tsx
@@ -1,17 +1,9 @@
-import { useDebouncedState } from '@rocket.chat/fuselage-hooks';
-import { useRouteParameter, useRouter, useTranslation } from '@rocket.chat/ui-contexts';
+import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
+import { useRouteParameter, useRouter } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useEffect, useMemo, useState, useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
-import { usePagination } from '../../../components/GenericTable/hooks/usePagination';
-import { useAppsResult } from '../../../contexts/hooks/useAppsResult';
-import { AsyncStatePhase } from '../../../lib/asyncState';
-import MarketplaceHeader from '../components/MarketplaceHeader';
-import type { RadioDropDownGroup } from '../definitions/RadioDropDownDefinitions';
-import { useCategories } from '../hooks/useCategories';
-import type { appsDataType } from '../hooks/useFilteredApps';
-import { useFilteredApps } from '../hooks/useFilteredApps';
-import { useRadioToggle } from '../hooks/useRadioToggle';
 import AppsFilters from './AppsFilters';
 import AppsPageConnectionError from './AppsPageConnectionError';
 import AppsPageContentBody from './AppsPageContentBody';
@@ -22,13 +14,23 @@ import NoInstalledAppsEmptyState from './NoInstalledAppsEmptyState';
 import NoMarketplaceOrInstalledAppMatchesEmptyState from './NoMarketplaceOrInstalledAppMatchesEmptyState';
 import PrivateEmptyState from './PrivateEmptyState';
 import UnsupportedEmptyState from './UnsupportedEmptyState';
+import { usePagination } from '../../../components/GenericTable/hooks/usePagination';
+import { useAppsResult } from '../../../contexts/hooks/useAppsResult';
+import { AsyncStatePhase } from '../../../lib/asyncState';
+import MarketplaceHeader from '../components/MarketplaceHeader';
+import type { RadioDropDownGroup } from '../definitions/RadioDropDownDefinitions';
+import { useCategories } from '../hooks/useCategories';
+import { useFilteredApps } from '../hooks/useFilteredApps';
+import type { appsDataType } from '../hooks/useFilteredApps';
+import { useRadioToggle } from '../hooks/useRadioToggle';
 
 type AppsContext = 'explore' | 'installed' | 'premium' | 'private' | 'requested';
 
 const AppsPageContent = (): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { marketplaceApps, installedApps, privateApps, reload } = useAppsResult();
-	const [text, setText] = useDebouncedState('', 500);
+	const [text, setText] = useState('');
+	const debouncedText = useDebouncedValue(text, 500);
 	const { current, itemsPerPage, setItemsPerPage: onSetItemsPerPage, setCurrent: onSetCurrent, ...paginationProps } = usePagination();
 
 	const router = useRouter();
@@ -126,7 +128,7 @@ const AppsPageContent = (): ReactElement => {
 	const [categories, selectedCategories, categoryTagList, onSelected] = useCategories();
 	const appsResult = useFilteredApps({
 		appsData: getAppsData(),
-		text,
+		text: debouncedText,
 		current,
 		itemsPerPage,
 		categories: useMemo(() => selectedCategories.map(({ label }) => label), [selectedCategories]),
@@ -226,6 +228,7 @@ const AppsPageContent = (): ReactElement => {
 		<>
 			<MarketplaceHeader unsupportedVersion={unsupportedVersion} title={t(`Apps_context_${context}`)} />
 			<AppsFilters
+				text={text}
 				setText={setText}
 				freePaidFilterStructure={freePaidFilterStructure}
 				freePaidFilterOnSelected={freePaidFilterOnSelected}
diff --git a/apps/meteor/client/views/marketplace/AppsPage/PrivateEmptyState.spec.tsx b/apps/meteor/client/views/marketplace/AppsPage/PrivateEmptyState.spec.tsx
index c2d309d6102f..8725d5e8f29f 100644
--- a/apps/meteor/client/views/marketplace/AppsPage/PrivateEmptyState.spec.tsx
+++ b/apps/meteor/client/views/marketplace/AppsPage/PrivateEmptyState.spec.tsx
@@ -2,9 +2,9 @@ import { mockAppRoot } from '@rocket.chat/mock-providers';
 import { render, screen } from '@testing-library/react';
 import React from 'react';
 
+import PrivateEmptyState from './PrivateEmptyState';
 import { AppsContext } from '../../../contexts/AppsContext';
 import { asyncState } from '../../../lib/asyncState';
-import PrivateEmptyState from './PrivateEmptyState';
 
 describe('with private apps enabled', () => {
 	const appRoot = mockAppRoot()
diff --git a/apps/meteor/client/views/marketplace/AppsPage/PrivateEmptyState.tsx b/apps/meteor/client/views/marketplace/AppsPage/PrivateEmptyState.tsx
index aaa2be18ee3f..a7c345f86a62 100644
--- a/apps/meteor/client/views/marketplace/AppsPage/PrivateEmptyState.tsx
+++ b/apps/meteor/client/views/marketplace/AppsPage/PrivateEmptyState.tsx
@@ -1,9 +1,9 @@
 import { Box } from '@rocket.chat/fuselage';
 import React from 'react';
 
-import { usePrivateAppsEnabled } from '../hooks/usePrivateAppsEnabled';
 import PrivateEmptyStateDefault from './PrivateEmptyStateDefault';
 import PrivateEmptyStateUpgrade from './PrivateEmptyStateUpgrade';
+import { usePrivateAppsEnabled } from '../hooks/usePrivateAppsEnabled';
 
 const PrivateEmptyState = () => {
 	const privateAppsEnabled = usePrivateAppsEnabled();
diff --git a/apps/meteor/client/views/marketplace/AppsPage/UnsupportedEmptyState.spec.tsx b/apps/meteor/client/views/marketplace/AppsPage/UnsupportedEmptyState.spec.tsx
index d53da3c55f61..2d801b6e3b60 100644
--- a/apps/meteor/client/views/marketplace/AppsPage/UnsupportedEmptyState.spec.tsx
+++ b/apps/meteor/client/views/marketplace/AppsPage/UnsupportedEmptyState.spec.tsx
@@ -2,9 +2,9 @@ import { mockAppRoot } from '@rocket.chat/mock-providers';
 import { render, screen } from '@testing-library/react';
 import React from 'react';
 
+import UnsupportedEmptyState from './UnsupportedEmptyState';
 import { AppsContext } from '../../../contexts/AppsContext';
 import { asyncState } from '../../../lib/asyncState';
-import UnsupportedEmptyState from './UnsupportedEmptyState';
 
 describe('with private apps enabled', () => {
 	const appRoot = mockAppRoot()
diff --git a/apps/meteor/client/views/marketplace/AppsRoute.tsx b/apps/meteor/client/views/marketplace/AppsRoute.tsx
index d779ae459d4d..908d8f8579d3 100644
--- a/apps/meteor/client/views/marketplace/AppsRoute.tsx
+++ b/apps/meteor/client/views/marketplace/AppsRoute.tsx
@@ -2,13 +2,13 @@ import { useRouteParameter, useRoute, usePermission } from '@rocket.chat/ui-cont
 import type { ReactElement } from 'react';
 import React, { useState, useEffect } from 'react';
 
-import PageSkeleton from '../../components/PageSkeleton';
-import AppsProvider from '../../providers/AppsProvider';
-import NotAuthorizedPage from '../notAuthorized/NotAuthorizedPage';
 import AppDetailsPage from './AppDetailsPage';
 import AppInstallPage from './AppInstallPage';
 import AppsPage from './AppsPage';
 import BannerEnterpriseTrialEnded from './components/BannerEnterpriseTrialEnded';
+import PageSkeleton from '../../components/PageSkeleton';
+import AppsProvider from '../../providers/AppsProvider';
+import NotAuthorizedPage from '../notAuthorized/NotAuthorizedPage';
 
 const AppsRoute = (): ReactElement => {
 	const [isLoading, setLoading] = useState(true);
diff --git a/apps/meteor/client/views/marketplace/MarketplaceRouter.tsx b/apps/meteor/client/views/marketplace/MarketplaceRouter.tsx
index f2b321821821..2dc5ff1df6c6 100644
--- a/apps/meteor/client/views/marketplace/MarketplaceRouter.tsx
+++ b/apps/meteor/client/views/marketplace/MarketplaceRouter.tsx
@@ -2,10 +2,10 @@ import { useAtLeastOnePermission, useRoute, useRouteParameter } from '@rocket.ch
 import type { ReactElement, ReactNode } from 'react';
 import React, { Suspense, useEffect } from 'react';
 
+import MarketPlaceSidebar from './MarketplaceSidebar';
 import PageSkeleton from '../../components/PageSkeleton';
 import SidebarPortal from '../../sidebar/SidebarPortal';
 import NotFoundPage from '../notFound/NotFoundPage';
-import MarketPlaceSidebar from './MarketplaceSidebar';
 
 const MarketplaceRouter = ({ children }: { children?: ReactNode }): ReactElement => {
 	const currentContext = useRouteParameter('context') || 'all';
diff --git a/apps/meteor/client/views/marketplace/MarketplaceSidebar.tsx b/apps/meteor/client/views/marketplace/MarketplaceSidebar.tsx
index df851c0c1d3d..72e084eb1357 100644
--- a/apps/meteor/client/views/marketplace/MarketplaceSidebar.tsx
+++ b/apps/meteor/client/views/marketplace/MarketplaceSidebar.tsx
@@ -3,10 +3,10 @@ import type { ReactElement } from 'react';
 import React, { memo } from 'react';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
 
+import { getMarketplaceSidebarItems, subscribeToMarketplaceSidebarItems } from './sidebarItems';
 import Sidebar from '../../components/Sidebar';
 import SidebarItemsAssembler from '../../components/Sidebar/SidebarItemsAssembler';
 import SettingsProvider from '../../providers/SettingsProvider';
-import { getMarketplaceSidebarItems, subscribeToMarketplaceSidebarItems } from './sidebarItems';
 
 const MarketplaceSidebar = (): ReactElement => {
 	const items = useSyncExternalStore(subscribeToMarketplaceSidebarItems, getMarketplaceSidebarItems);
diff --git a/apps/meteor/client/views/marketplace/components/BannerEnterpriseTrialEnded.tsx b/apps/meteor/client/views/marketplace/components/BannerEnterpriseTrialEnded.tsx
index ca9e1fb480a8..fb5347678320 100644
--- a/apps/meteor/client/views/marketplace/components/BannerEnterpriseTrialEnded.tsx
+++ b/apps/meteor/client/views/marketplace/components/BannerEnterpriseTrialEnded.tsx
@@ -1,11 +1,12 @@
 import { Banner, Icon } from '@rocket.chat/fuselage';
 import { useLocalStorage } from '@rocket.chat/fuselage-hooks';
-import { usePermission, useSetting, useTranslation } from '@rocket.chat/ui-contexts';
+import { usePermission, useSetting } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 const BannerEnterpriseTrialEnded = (): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const isAdmin = usePermission('manage-apps');
 
 	const bannerLink = {
@@ -14,7 +15,7 @@ const BannerEnterpriseTrialEnded = (): ReactElement => {
 		linkTarget: '_blank',
 	};
 
-	const cloudWorkspaceHadTrial = useSetting('Cloud_Workspace_Had_Trial') as boolean;
+	const cloudWorkspaceHadTrial = useSetting('Cloud_Workspace_Had_Trial', false);
 
 	const [showTrialBanner, setShowTrialBanner] = useLocalStorage('showAppsTrialEndBanner', cloudWorkspaceHadTrial);
 
diff --git a/apps/meteor/client/views/marketplace/components/CategoryFilter/CategoryDropDown.stories.tsx b/apps/meteor/client/views/marketplace/components/CategoryFilter/CategoryDropDown.stories.tsx
index b4e16445bb81..3bfc89a0bce4 100644
--- a/apps/meteor/client/views/marketplace/components/CategoryFilter/CategoryDropDown.stories.tsx
+++ b/apps/meteor/client/views/marketplace/components/CategoryFilter/CategoryDropDown.stories.tsx
@@ -2,13 +2,13 @@ import { Box, ButtonGroup } from '@rocket.chat/fuselage';
 import type { StoryFn } from '@storybook/react';
 import React, { useState } from 'react';
 
-import type { CategoryDropDownListProps } from '../../definitions/CategoryDropdownDefinitions';
-import { useCategories } from '../../hooks/useCategories';
-import { useCategoryToggle } from '../../hooks/useCategoryToggle';
 import CategoryDropDown from './CategoryDropDown';
 import CategoryDropDownAnchor from './CategoryDropDownAnchor';
 import CategoryDropDownList from './CategoryDropDownList';
 import TagList from './TagList';
+import type { CategoryDropDownListProps } from '../../definitions/CategoryDropdownDefinitions';
+import { useCategories } from '../../hooks/useCategories';
+import { useCategoryToggle } from '../../hooks/useCategoryToggle';
 
 export default {
 	title: 'Admin/Apps/CategoryDropDown',
diff --git a/apps/meteor/client/views/marketplace/components/MarketplaceHeader.tsx b/apps/meteor/client/views/marketplace/components/MarketplaceHeader.tsx
index fc847ee30d13..0be91b54228b 100644
--- a/apps/meteor/client/views/marketplace/components/MarketplaceHeader.tsx
+++ b/apps/meteor/client/views/marketplace/components/MarketplaceHeader.tsx
@@ -8,9 +8,9 @@ import { GenericResourceUsageSkeleton } from '../../../components/GenericResourc
 import { PageHeader } from '../../../components/Page';
 import UpgradeButton from '../../admin/subscription/components/UpgradeButton';
 import UnlimitedAppsUpsellModal from '../UnlimitedAppsUpsellModal';
+import EnabledAppsCount from './EnabledAppsCount';
 import { useAppsCountQuery } from '../hooks/useAppsCountQuery';
 import { usePrivateAppsEnabled } from '../hooks/usePrivateAppsEnabled';
-import EnabledAppsCount from './EnabledAppsCount';
 import PrivateAppInstallModal from './PrivateAppInstallModal/PrivateAppInstallModal';
 import UpdateRocketChatButton from './UpdateRocketChatButton';
 
diff --git a/apps/meteor/client/views/marketplace/components/ScreenshotCarousel.tsx b/apps/meteor/client/views/marketplace/components/ScreenshotCarousel.tsx
index bbf803cad29f..42eaf29236da 100644
--- a/apps/meteor/client/views/marketplace/components/ScreenshotCarousel.tsx
+++ b/apps/meteor/client/views/marketplace/components/ScreenshotCarousel.tsx
@@ -30,11 +30,11 @@ const ScreenshotCarousel = ({
 						opacity: '1',
 						transitionDuration: '1s',
 						transform: 'scale(1.08)',
-				  }
+					}
 				: {
 						opacity: '0',
 						transitionDuration: '1s ease',
-				  };
+					};
 
 			return (
 				<Box style={screenshotWrapperStyle} key={currentScreenshot.id}>
diff --git a/apps/meteor/client/views/marketplace/helpers.ts b/apps/meteor/client/views/marketplace/helpers.ts
index d06a1cde0cfc..08bf9667ade5 100644
--- a/apps/meteor/client/views/marketplace/helpers.ts
+++ b/apps/meteor/client/views/marketplace/helpers.ts
@@ -3,8 +3,8 @@ import type { App } from '@rocket.chat/core-typings';
 import semver from 'semver';
 
 // import { t } from '../../../app/utils/client';
-import { t } from '../../../app/utils/lib/i18n';
 import { appErroredStatuses } from './helpers/appErroredStatuses';
+import { t } from '../../../app/utils/lib/i18n';
 
 export const appEnabledStatuses = [AppStatus.AUTO_ENABLED, AppStatus.MANUALLY_ENABLED];
 
@@ -186,21 +186,21 @@ export const appStatusSpanProps = (
 				? {
 						label: 'Enabled*',
 						tooltipText: t('Grandfathered_app'),
-				  }
+					}
 				: {
 						label: 'Enabled',
-				  };
+					};
 		}
 
 		return migrated && !isEnterprise
 			? {
 					label: 'Disabled*',
 					tooltipText: t('Grandfathered_app'),
-			  }
+				}
 			: {
 					type: 'warning',
 					label: 'Disabled',
-			  };
+				};
 	}
 
 	const isFailed = status && appErroredStatuses.includes(status);
diff --git a/apps/meteor/client/views/marketplace/helpers/formatPricingPlan.ts b/apps/meteor/client/views/marketplace/helpers/formatPricingPlan.ts
index fcd591b8df21..b65745a49732 100644
--- a/apps/meteor/client/views/marketplace/helpers/formatPricingPlan.ts
+++ b/apps/meteor/client/views/marketplace/helpers/formatPricingPlan.ts
@@ -1,7 +1,7 @@
 import type { AppPricingPlan } from '@rocket.chat/core-typings';
 
-import { t } from '../../../../app/utils/lib/i18n';
 import { formatPrice } from './formatPrice';
+import { t } from '../../../../app/utils/lib/i18n';
 
 export const formatPricingPlan = ({ strategy, price, tiers = [], trialDays }: AppPricingPlan): string => {
 	const { perUnit = false } = (Array.isArray(tiers) && tiers.find((tier) => tier.price === price)) || {};
diff --git a/apps/meteor/client/views/marketplace/helpers/installApp.ts b/apps/meteor/client/views/marketplace/helpers/installApp.ts
index 1021ab16ffd9..e1d1256d16e2 100644
--- a/apps/meteor/client/views/marketplace/helpers/installApp.ts
+++ b/apps/meteor/client/views/marketplace/helpers/installApp.ts
@@ -1,8 +1,8 @@
 import type { App, AppPermission } from '@rocket.chat/core-typings';
 
-import { AppClientOrchestratorInstance } from '../../../apps/orchestrator';
 import { handleAPIError } from './handleAPIError';
 import { warnAppInstall } from './warnAppInstall';
+import { AppClientOrchestratorInstance } from '../../../apps/orchestrator';
 
 type installAppProps = App & {
 	permissionsGranted?: AppPermission[];
diff --git a/apps/meteor/client/views/marketplace/helpers/updateApp.ts b/apps/meteor/client/views/marketplace/helpers/updateApp.ts
index 076478717ad4..d6d558b15730 100644
--- a/apps/meteor/client/views/marketplace/helpers/updateApp.ts
+++ b/apps/meteor/client/views/marketplace/helpers/updateApp.ts
@@ -1,8 +1,8 @@
 import type { App, AppPermission } from '@rocket.chat/core-typings';
 
-import { AppClientOrchestratorInstance } from '../../../apps/orchestrator';
 import { handleAPIError } from './handleAPIError';
 import { warnStatusChange } from './warnStatusChange';
+import { AppClientOrchestratorInstance } from '../../../apps/orchestrator';
 
 type updateAppProps = App & {
 	permissionsGranted?: AppPermission[];
diff --git a/apps/meteor/client/views/marketplace/helpers/warnAppInstall.ts b/apps/meteor/client/views/marketplace/helpers/warnAppInstall.ts
index 78d40829c0ce..e130098a99a8 100644
--- a/apps/meteor/client/views/marketplace/helpers/warnAppInstall.ts
+++ b/apps/meteor/client/views/marketplace/helpers/warnAppInstall.ts
@@ -1,8 +1,8 @@
 import type { AppStatus } from '@rocket.chat/apps-engine/definition/AppStatus';
 
+import { appErroredStatuses } from './appErroredStatuses';
 import { t } from '../../../../app/utils/lib/i18n';
 import { dispatchToastMessage } from '../../../lib/toast';
-import { appErroredStatuses } from './appErroredStatuses';
 
 export const warnAppInstall = (appName: string, status: AppStatus): void => {
 	if (appErroredStatuses.includes(status)) {
diff --git a/apps/meteor/client/views/marketplace/helpers/warnEnableDisableApp.ts b/apps/meteor/client/views/marketplace/helpers/warnEnableDisableApp.ts
index 2ca50d67c784..79e55cea6275 100644
--- a/apps/meteor/client/views/marketplace/helpers/warnEnableDisableApp.ts
+++ b/apps/meteor/client/views/marketplace/helpers/warnEnableDisableApp.ts
@@ -1,8 +1,8 @@
 import type { AppStatus } from '@rocket.chat/apps-engine/definition/AppStatus';
 
+import { appErroredStatuses } from './appErroredStatuses';
 import { t } from '../../../../app/utils/lib/i18n';
 import { dispatchToastMessage } from '../../../lib/toast';
-import { appErroredStatuses } from './appErroredStatuses';
 
 export const warnEnableDisableApp = (appName: string, status: AppStatus, type: string): void => {
 	if (appErroredStatuses.includes(status)) {
diff --git a/apps/meteor/client/views/marketplace/helpers/warnStatusChange.ts b/apps/meteor/client/views/marketplace/helpers/warnStatusChange.ts
index 3fc01514ec76..db1979583ea5 100644
--- a/apps/meteor/client/views/marketplace/helpers/warnStatusChange.ts
+++ b/apps/meteor/client/views/marketplace/helpers/warnStatusChange.ts
@@ -1,8 +1,8 @@
 import type { AppStatus } from '@rocket.chat/apps-engine/definition/AppStatus';
 
+import { appErroredStatuses } from './appErroredStatuses';
 import { t } from '../../../../app/utils/lib/i18n';
 import { dispatchToastMessage } from '../../../lib/toast';
-import { appErroredStatuses } from './appErroredStatuses';
 
 export const warnStatusChange = (appName: string, status: AppStatus): void => {
 	if (appErroredStatuses.includes(status)) {
diff --git a/apps/meteor/client/views/marketplace/hooks/useAppInfo.ts b/apps/meteor/client/views/marketplace/hooks/useAppInfo.ts
index f544e2f25b83..130a32c1421f 100644
--- a/apps/meteor/client/views/marketplace/hooks/useAppInfo.ts
+++ b/apps/meteor/client/views/marketplace/hooks/useAppInfo.ts
@@ -62,7 +62,7 @@ export const useAppInfo = (appId: string, context: string): AppInfo | undefined
 							marketplace: 'true',
 							update: 'true',
 							appVersion: appId,
-					  })
+						})
 							.then(({ app }: any) => {
 								(appResult as App).tosLink = app.tosLink;
 								(appResult as App).privacyLink = app.privacyLink;
diff --git a/apps/meteor/client/views/marketplace/hooks/useAppInstallationHandler.tsx b/apps/meteor/client/views/marketplace/hooks/useAppInstallationHandler.tsx
index 42bf38864894..a69582a64d1a 100644
--- a/apps/meteor/client/views/marketplace/hooks/useAppInstallationHandler.tsx
+++ b/apps/meteor/client/views/marketplace/hooks/useAppInstallationHandler.tsx
@@ -2,16 +2,16 @@ import type { App } from '@rocket.chat/core-typings';
 import { useEndpoint, useRouteParameter, useSetModal, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import React, { useCallback } from 'react';
 
+import { isMarketplaceRouteContext, useAppsCountQuery } from './useAppsCountQuery';
+import { useOpenAppPermissionsReviewModal } from './useOpenAppPermissionsReviewModal';
 import { useExternalLink } from '../../../hooks/useExternalLink';
 import { useCheckoutUrl } from '../../admin/subscription/hooks/useCheckoutUrl';
 import IframeModal from '../IframeModal';
 import AppInstallModal from '../components/AppInstallModal/AppInstallModal';
 import type { Actions } from '../helpers';
-import { handleAPIError } from '../helpers/handleAPIError';
-import { isMarketplaceRouteContext, useAppsCountQuery } from './useAppsCountQuery';
 import { useAppsOrchestration } from './useAppsOrchestration';
-import { useOpenAppPermissionsReviewModal } from './useOpenAppPermissionsReviewModal';
 import { useOpenIncompatibleModal } from './useOpenIncompatibleModal';
+import { handleAPIError } from '../helpers/handleAPIError';
 
 export type AppInstallationHandlerParams = {
 	app: App;
diff --git a/apps/meteor/client/views/marketplace/hooks/useAppMenu.tsx b/apps/meteor/client/views/marketplace/hooks/useAppMenu.tsx
index b47e48299735..820c0c52965a 100644
--- a/apps/meteor/client/views/marketplace/hooks/useAppMenu.tsx
+++ b/apps/meteor/client/views/marketplace/hooks/useAppMenu.tsx
@@ -14,6 +14,12 @@ import type { MouseEvent, ReactNode } from 'react';
 import React, { useMemo, useCallback, useState } from 'react';
 import semver from 'semver';
 
+import { useAppInstallationHandler } from './useAppInstallationHandler';
+import type { MarketplaceRouteContext } from './useAppsCountQuery';
+import { useAppsCountQuery } from './useAppsCountQuery';
+import { useMarketplaceActions } from './useMarketplaceActions';
+import { useOpenAppPermissionsReviewModal } from './useOpenAppPermissionsReviewModal';
+import { useOpenIncompatibleModal } from './useOpenIncompatibleModal';
 import WarningModal from '../../../components/WarningModal';
 import { useHasLicenseModule } from '../../../hooks/useHasLicenseModule';
 import { useIsEnterprise } from '../../../hooks/useIsEnterprise';
@@ -25,12 +31,6 @@ import type { Actions } from '../helpers';
 import { appEnabledStatuses, appButtonProps } from '../helpers';
 import { handleAPIError } from '../helpers/handleAPIError';
 import { warnEnableDisableApp } from '../helpers/warnEnableDisableApp';
-import { useAppInstallationHandler } from './useAppInstallationHandler';
-import type { MarketplaceRouteContext } from './useAppsCountQuery';
-import { useAppsCountQuery } from './useAppsCountQuery';
-import { useMarketplaceActions } from './useMarketplaceActions';
-import { useOpenAppPermissionsReviewModal } from './useOpenAppPermissionsReviewModal';
-import { useOpenIncompatibleModal } from './useOpenIncompatibleModal';
 
 export type AppMenuOption = {
 	id: string;
diff --git a/apps/meteor/client/views/marketplace/hooks/useCategories.ts b/apps/meteor/client/views/marketplace/hooks/useCategories.ts
index 17a7c878e6e4..4a1169ee151e 100644
--- a/apps/meteor/client/views/marketplace/hooks/useCategories.ts
+++ b/apps/meteor/client/views/marketplace/hooks/useCategories.ts
@@ -1,6 +1,8 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import { useCategoryFlatList } from './useCategoryFlatList';
+import { useCategoryToggle } from './useCategoryToggle';
 import { AppClientOrchestratorInstance } from '../../../apps/orchestrator';
 import type {
 	CategoryDropDownGroups,
@@ -10,8 +12,6 @@ import type {
 	selectedCategoriesList,
 } from '../definitions/CategoryDropdownDefinitions';
 import { handleAPIError } from '../helpers/handleAPIError';
-import { useCategoryFlatList } from './useCategoryFlatList';
-import { useCategoryToggle } from './useCategoryToggle';
 
 export const useCategories = (): [CategoryDropDownGroups, selectedCategoriesList, selectedCategoriesList, CategoryOnSelected] => {
 	const { t } = useTranslation();
diff --git a/apps/meteor/client/views/marketplace/hooks/useInstallApp.tsx b/apps/meteor/client/views/marketplace/hooks/useInstallApp.tsx
index 16499c0b07a2..cf9ea98d933b 100644
--- a/apps/meteor/client/views/marketplace/hooks/useInstallApp.tsx
+++ b/apps/meteor/client/views/marketplace/hooks/useInstallApp.tsx
@@ -5,12 +5,14 @@ import React, { useCallback, useState } from 'react';
 
 import { AppClientOrchestratorInstance } from '../../../apps/orchestrator';
 import { useAppsReload } from '../../../contexts/hooks/useAppsReload';
+import { useIsEnterprise } from '../../../hooks/useIsEnterprise';
+import AppExemptModal from '../AppExemptModal';
 import AppPermissionsReviewModal from '../AppPermissionsReviewModal';
 import AppUpdateModal from '../AppUpdateModal';
+import { useAppsCountQuery } from './useAppsCountQuery';
 import { handleAPIError } from '../helpers/handleAPIError';
 import { handleInstallError } from '../helpers/handleInstallError';
 import { getManifestFromZippedApp } from '../lib/getManifestFromZippedApp';
-import { useAppsCountQuery } from './useAppsCountQuery';
 
 export const useInstallApp = (file: File): { install: () => void; isInstalling: boolean } => {
 	const reloadAppsList = useAppsReload();
@@ -22,6 +24,7 @@ export const useInstallApp = (file: File): { install: () => void; isInstalling:
 
 	const uploadAppEndpoint = useUpload('/apps');
 	const uploadUpdateEndpoint = useUpload('/apps/update');
+	const { data } = useIsEnterprise();
 
 	const [isInstalling, setInstalling] = useState(false);
 
@@ -87,6 +90,11 @@ export const useInstallApp = (file: File): { install: () => void; isInstalling:
 	const uploadFile = async (appFile: File, { id, permissions }: { id: string; permissions: AppPermission[] }) => {
 		const isInstalled = await isAppInstalled(id);
 
+		const isExempt = !data?.isEnterprise && isInstalled;
+		if (isInstalled && isExempt) {
+			return setModal(<AppExemptModal appName={appFile.name} onCancel={cancelAction} />);
+		}
+
 		if (isInstalled) {
 			return setModal(<AppUpdateModal cancel={cancelAction} confirm={() => handleAppPermissionsReview(permissions, appFile, id)} />);
 		}
diff --git a/apps/meteor/client/views/marketplace/hooks/useMarketplaceActions.ts b/apps/meteor/client/views/marketplace/hooks/useMarketplaceActions.ts
index 84882e35de8b..efc614a90d93 100644
--- a/apps/meteor/client/views/marketplace/hooks/useMarketplaceActions.ts
+++ b/apps/meteor/client/views/marketplace/hooks/useMarketplaceActions.ts
@@ -1,10 +1,10 @@
 import type { App, AppPermission } from '@rocket.chat/core-typings';
 import { useMutation } from '@tanstack/react-query';
 
+import { useAppsOrchestration } from './useAppsOrchestration';
 import { handleAPIError } from '../helpers/handleAPIError';
 import { warnAppInstall } from '../helpers/warnAppInstall';
 import { warnStatusChange } from '../helpers/warnStatusChange';
-import { useAppsOrchestration } from './useAppsOrchestration';
 
 type InstallAppParams = App & {
 	permissionsGranted?: AppPermission[];
diff --git a/apps/meteor/client/views/marketplace/hooks/useOpenIncompatibleModal.tsx b/apps/meteor/client/views/marketplace/hooks/useOpenIncompatibleModal.tsx
index 1645f47f4432..7409e0b608c8 100644
--- a/apps/meteor/client/views/marketplace/hooks/useOpenIncompatibleModal.tsx
+++ b/apps/meteor/client/views/marketplace/hooks/useOpenIncompatibleModal.tsx
@@ -2,8 +2,8 @@ import { useSetModal } from '@rocket.chat/ui-contexts';
 import React, { useCallback } from 'react';
 
 import IframeModal from '../IframeModal';
-import { handleAPIError } from '../helpers/handleAPIError';
 import { useAppsOrchestration } from './useAppsOrchestration';
+import { handleAPIError } from '../helpers/handleAPIError';
 
 export const useOpenIncompatibleModal = () => {
 	const setModal = useSetModal();
diff --git a/apps/meteor/client/views/marketplace/sidebarItems.tsx b/apps/meteor/client/views/marketplace/sidebarItems.tsx
index f829cccf3238..985a80151e8b 100644
--- a/apps/meteor/client/views/marketplace/sidebarItems.tsx
+++ b/apps/meteor/client/views/marketplace/sidebarItems.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
 
+import MarketplaceRequestBadge from './components/MarketplaceRequestBadge';
 import { hasAtLeastOnePermission, hasPermission } from '../../../app/authorization/client';
 import { createSidebarItems } from '../../lib/createSidebarItems';
-import MarketplaceRequestBadge from './components/MarketplaceRequestBadge';
 
 export const {
 	registerSidebarItem: registerMarketplaceSidebarItem,
diff --git a/apps/meteor/client/views/meet/CallPage.tsx b/apps/meteor/client/views/meet/CallPage.tsx
index d07e3dfd6831..3ffaa2675689 100644
--- a/apps/meteor/client/views/meet/CallPage.tsx
+++ b/apps/meteor/client/views/meet/CallPage.tsx
@@ -4,10 +4,10 @@ import { useTranslation, useStream } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
 import React, { useEffect, useState } from 'react';
 
+import OngoingCallDuration from './OngoingCallDuration';
 import { sdk } from '../../../app/utils/client/lib/SDKClient';
 import { WebRTC } from '../../../app/webrtc/client';
 import { WEB_RTC_EVENTS } from '../../../app/webrtc/lib/constants';
-import OngoingCallDuration from './OngoingCallDuration';
 import './styles.css';
 
 type CallPageProps = {
@@ -60,35 +60,47 @@ const CallPage = ({
 			if (!visitorId) {
 				throw new Error('Call Page - no visitor id');
 			}
-			const webrtcInstance = WebRTC.getInstanceByRoomId(roomId, visitorId as any);
+			const webrtcInstance = WebRTC.getInstanceByRoomId(roomId, visitorId);
 			const isMobileDevice = (): boolean => {
 				if (isLayoutEmbedded) {
 					setCallInIframe(true);
 				}
 				if (window.innerWidth <= 450 && window.innerHeight >= 629 && window.innerHeight <= 900) {
 					setIsLocalMobileDevice(true);
-					webrtcInstance.media = {
-						audio: true,
-						video: {
-							width: { ideal: 440 },
-							height: { ideal: 580 },
-						},
-					};
+					if (webrtcInstance)
+						webrtcInstance.media = {
+							audio: true,
+							video: {
+								width: { ideal: 440 },
+								height: { ideal: 580 },
+							},
+						};
 					return true;
 				}
 				return false;
 			};
 
-			const unsubNotifyUser = subscribeNotifyUser(`${visitorId}/${WEB_RTC_EVENTS.WEB_RTC}`, (type: any, data: any) => {
+			const unsubNotifyUser = subscribeNotifyUser(`${visitorId}/${WEB_RTC_EVENTS.WEB_RTC}`, (type, data) => {
 				if (data.room == null) {
 					return;
 				}
-				webrtcInstance.onUserStream(type, data);
+
+				switch (type) {
+					case 'candidate':
+						webrtcInstance?.onUserStream('candidate', data);
+						break;
+					case 'description':
+						webrtcInstance?.onUserStream('description', data);
+						break;
+					case 'join':
+						webrtcInstance?.onUserStream('join', data);
+						break;
+				}
 			});
 
 			const unsubNotifyRoom = subscribeNotifyRoom(`${roomId}/${WEB_RTC_EVENTS.WEB_RTC}`, (type: any, data: any) => {
 				if (type === 'callStatus' && data.callStatus === 'ended') {
-					webrtcInstance.stop();
+					webrtcInstance?.stop();
 					setStatus(data.callStatus);
 				} else if (type === 'getDeviceType') {
 					sdk.publish('notify-room', [
@@ -130,7 +142,7 @@ const CallPage = ({
 			if (status === 'inProgress') {
 				sdk.publish('notify-room', [`${roomId}/${WEB_RTC_EVENTS.WEB_RTC}`, 'getDeviceType']);
 
-				webrtcInstance.startCall({
+				webrtcInstance?.startCall({
 					audio: true,
 					video: {
 						width: { ideal: 1920 },
@@ -145,10 +157,10 @@ const CallPage = ({
 				if (type === 'callStatus') {
 					switch (data.callStatus) {
 						case 'ended':
-							webrtcInstance.stop();
+							webrtcInstance?.stop();
 							break;
 						case 'inProgress':
-							webrtcInstance.startCall({
+							webrtcInstance?.startCall({
 								audio: true,
 								video: {
 									width: { ideal: 1920 },
@@ -168,10 +180,10 @@ const CallPage = ({
 
 	const toggleButton = (control: any): any => {
 		if (control === 'mic') {
-			WebRTC.getInstanceByRoomId(roomId, visitorToken).toggleAudio();
+			WebRTC.getInstanceByRoomId(roomId, visitorToken)?.toggleAudio();
 			return setIsMicOn(!isMicOn);
 		}
-		WebRTC.getInstanceByRoomId(roomId, visitorToken).toggleVideo();
+		WebRTC.getInstanceByRoomId(roomId, visitorToken)?.toggleVideo();
 		setIsCameraOn(!isCameraOn);
 		sdk.publish('notify-room', [
 			`${roomId}/${WEB_RTC_EVENTS.WEB_RTC}`,
@@ -201,7 +213,7 @@ const CallPage = ({
 						top: '5%',
 						right: '2%',
 					}}
-					className='Self_Video'
+					className='meet__video--self'
 					alignItems='center'
 					backgroundColor='dark'
 				>
@@ -238,7 +250,7 @@ const CallPage = ({
 							square
 							title={isMicOn ? t('Mute_microphone') : t('Unmute_microphone')}
 							onClick={(): any => toggleButton('mic')}
-							className={isMicOn ? 'On' : 'Off'}
+							className={isMicOn ? 'meet__button--on' : 'meet__button--off'}
 							size={Number(buttonSize)}
 						>
 							{isMicOn ? <Icon name='mic' size={iconSize} /> : <Icon name='mic-off' size={iconSize} />}
@@ -248,7 +260,7 @@ const CallPage = ({
 							square
 							title={isCameraOn ? t('Turn_off_video') : t('Turn_on_video')}
 							onClick={(): void => toggleButton('camera')}
-							className={isCameraOn ? 'On' : 'Off'}
+							className={isCameraOn ? 'meet__button--on' : 'meet__button--off'}
 							size={parseInt(buttonSize)}
 						>
 							{isCameraOn ? <Icon name='video' size={iconSize} /> : <Icon name='video-off' size={iconSize} />}
@@ -332,7 +344,7 @@ const CallPage = ({
 								top: '5%',
 								right: '2%',
 							}}
-							className='Self_Video'
+							className='meet__video--self'
 							backgroundColor='dark'
 							alignItems='center'
 						>
diff --git a/apps/meteor/client/views/meet/MeetPage.tsx b/apps/meteor/client/views/meet/MeetPage.tsx
index e7a34b78fd1d..afbfd3ff7294 100644
--- a/apps/meteor/client/views/meet/MeetPage.tsx
+++ b/apps/meteor/client/views/meet/MeetPage.tsx
@@ -1,18 +1,19 @@
 import { Button, Box, Flex } from '@rocket.chat/fuselage';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
-import { useRouteParameter, useSearchParameter, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRouteParameter, useSearchParameter } from '@rocket.chat/ui-contexts';
 import { Meteor } from 'meteor/meteor';
 import React, { useEffect, useState, useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
+import CallPage from './CallPage';
 import { sdk } from '../../../app/utils/client/lib/SDKClient';
 import { useEmbeddedLayout } from '../../hooks/useEmbeddedLayout';
 import NotFoundPage from '../notFound/NotFoundPage';
 import PageLoading from '../root/PageLoading';
-import CallPage from './CallPage';
 import './styles.css';
 
 const MeetPage = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [isRoomMember, setIsRoomMember] = useState(false);
 	const [status, setStatus] = useState(null);
 	const [visitorId, setVisitorId] = useState(null);
@@ -86,7 +87,7 @@ const MeetPage = () => {
 							top: '5%',
 							right: '2%',
 						}}
-						className='Self_Video'
+						className='meet__video--self'
 						backgroundColor='dark'
 						alignItems='center'
 					>
diff --git a/apps/meteor/client/views/meet/MeetRoute.tsx b/apps/meteor/client/views/meet/MeetRoute.tsx
index bbc20356a30b..7e2df4e3e342 100644
--- a/apps/meteor/client/views/meet/MeetRoute.tsx
+++ b/apps/meteor/client/views/meet/MeetRoute.tsx
@@ -3,9 +3,9 @@ import { useQuery } from '@tanstack/react-query';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
+import MeetPage from './MeetPage';
 import { VisitorDoesNotExistError } from '../../lib/errors/VisitorDoesNotExistError';
 import PageLoading from '../root/PageLoading';
-import MeetPage from './MeetPage';
 
 const MeetRoute = () => {
 	const router = useRouter();
diff --git a/apps/meteor/client/views/meet/styles.css b/apps/meteor/client/views/meet/styles.css
index 799fd59faec8..6e4b30b45a71 100644
--- a/apps/meteor/client/views/meet/styles.css
+++ b/apps/meteor/client/views/meet/styles.css
@@ -1,41 +1,49 @@
-.Off {
-	color: #ffffff !important;
-	border-color: #2f343d !important;
-	background-color: #2f343d !important;
-}
-
-.On {
-	color: #000000 !important;
-	border-color: #ffffff !important;
-	background-color: #ffffff !important;
-}
+.meet {
+	&__button {
+		&--off {
+			color: #ffffff !important;
+			border-color: #2f343d !important;
+			background-color: #2f343d !important;
+		}
 
-.Self_Video {
-	display: flex;
-
-	width: 15%;
-	height: 17.5%;
+		&--on {
+			color: #000000 !important;
+			border-color: #ffffff !important;
+			background-color: #ffffff !important;
+		}
+	}
 
-	justify-content: center;
+	&__video--self {
+		display: flex;
+		width: 15%;
+		height: 17.5%;
+		justify-content: center;
+	}
 }
 
-@media (max-width: 900px) and (min-height: 500px) {
-	.Self_Video {
-		width: 30%;
-		height: 20%;
+@media (width <= 900px) and (height >= 500px) {
+	.meet {
+		&__video--self {
+			width: 30%;
+			height: 20%;
+		}
 	}
 }
 
-@media (max-width: 900px) and (max-height: 500px) {
-	.Self_Video {
-		width: 30%;
-		height: 35%;
+@media (width <= 900px) and (height <= 500px) {
+	.meet {
+		&__video--self {
+			width: 30%;
+			height: 35%;
+		}
 	}
 }
 
-@media (min-width: 901px) and (max-width: 1300px) and (max-height: 500px) {
-	.Self_Video {
-		width: 20%;
-		height: 40%;
+@media (width >= 901px) and (width <= 1300px) and (height <= 500px) {
+	.meet {
+		&__video--self {
+			width: 20%;
+			height: 40%;
+		}
 	}
 }
diff --git a/apps/meteor/client/views/modal/uikit/ModalBlock.tsx b/apps/meteor/client/views/modal/uikit/ModalBlock.tsx
index 402ccb7e27ad..57016f0df637 100644
--- a/apps/meteor/client/views/modal/uikit/ModalBlock.tsx
+++ b/apps/meteor/client/views/modal/uikit/ModalBlock.tsx
@@ -6,8 +6,8 @@ import type { FormEventHandler, ReactElement } from 'react';
 import React, { useCallback, useEffect, useMemo, useRef } from 'react';
 import { FocusScope } from 'react-aria';
 
-import { getURL } from '../../../../app/utils/client/getURL';
 import { getButtonStyle } from './getButtonStyle';
+import { getURL } from '../../../../app/utils/client/getURL';
 
 const focusableElementsString = `
 	a[href]:not([tabindex="-1"]),
diff --git a/apps/meteor/client/views/modal/uikit/UiKitModal.tsx b/apps/meteor/client/views/modal/uikit/UiKitModal.tsx
index 55c6c8a32d71..fcdaecfacb71 100644
--- a/apps/meteor/client/views/modal/uikit/UiKitModal.tsx
+++ b/apps/meteor/client/views/modal/uikit/UiKitModal.tsx
@@ -5,12 +5,12 @@ import type * as UiKit from '@rocket.chat/ui-kit';
 import React from 'react';
 import type { FormEvent } from 'react';
 
+import ModalBlock from './ModalBlock';
 import { detectEmoji } from '../../../lib/utils/detectEmoji';
 import { preventSyntheticEvent } from '../../../lib/utils/preventSyntheticEvent';
 import { useModalContextValue } from '../../../uikit/hooks/useModalContextValue';
 import { useUiKitActionManager } from '../../../uikit/hooks/useUiKitActionManager';
 import { useUiKitView } from '../../../uikit/hooks/useUiKitView';
-import ModalBlock from './ModalBlock';
 
 type UiKitModalProps = {
 	key: UiKit.ModalView['id']; // force re-mount when viewId changes
diff --git a/apps/meteor/client/views/notFound/NotFoundPage.spec.tsx b/apps/meteor/client/views/notFound/NotFoundPage.spec.tsx
index 19d2238cefc4..868cef2066d8 100644
--- a/apps/meteor/client/views/notFound/NotFoundPage.spec.tsx
+++ b/apps/meteor/client/views/notFound/NotFoundPage.spec.tsx
@@ -3,8 +3,8 @@ import userEvent from '@testing-library/user-event';
 import type { MutableRefObject } from 'react';
 import React from 'react';
 
-import RouterContextMock from '../../../tests/mocks/client/RouterContextMock';
 import NotFoundPage from './NotFoundPage';
+import RouterContextMock from '../../../tests/mocks/client/RouterContextMock';
 
 it('should look good', async () => {
 	render(<NotFoundPage />, { legacyRoot: true });
diff --git a/apps/meteor/client/views/oauth/components/AuthorizationFormPage.tsx b/apps/meteor/client/views/oauth/components/AuthorizationFormPage.tsx
index 623214352372..f068a81014ed 100644
--- a/apps/meteor/client/views/oauth/components/AuthorizationFormPage.tsx
+++ b/apps/meteor/client/views/oauth/components/AuthorizationFormPage.tsx
@@ -7,9 +7,9 @@ import { Accounts } from 'meteor/accounts-base';
 import React, { useEffect, useMemo, useRef } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 
-import { queueMicrotask } from '../../../lib/utils/queueMicrotask';
 import CurrentUserDisplay from './CurrentUserDisplay';
 import Layout from './Layout';
+import { queueMicrotask } from '../../../lib/utils/queueMicrotask';
 
 type AuthorizationFormPageProps = {
 	oauthApp: IOAuthApps;
@@ -60,14 +60,10 @@ const AuthorizationFormPage = ({ oauthApp, redirectUri, user }: AuthorizationFor
 						<CurrentUserDisplay user={user} />
 
 						<p>
-							<Trans i18nKey='core.The_application_will_be_able_to' t={t}>
-								The application <strong>{{ appName: oauthApp.name }}</strong> will be able to:
+							<Trans i18nKey='core.OAuth_Full_Access_Warning' t={t}>
+								<strong>{{ appName: oauthApp.name }}</strong>
 							</Trans>
 						</p>
-
-						<ul>
-							<li>{t('core.access_your_basic_information')}</li>
-						</ul>
 					</Box>
 					<input type='hidden' name='access_token' value={token} />
 					<input type='hidden' name='client_id' value={oauthApp.clientId} />
diff --git a/apps/meteor/client/views/oauth/components/CurrentUserDisplay.tsx b/apps/meteor/client/views/oauth/components/CurrentUserDisplay.tsx
index 6e52570418de..59e1584d5ae2 100644
--- a/apps/meteor/client/views/oauth/components/CurrentUserDisplay.tsx
+++ b/apps/meteor/client/views/oauth/components/CurrentUserDisplay.tsx
@@ -22,7 +22,7 @@ type CurrentUserDisplayProps = {
 };
 
 const CurrentUserDisplay = ({ user }: CurrentUserDisplayProps) => {
-	const showRealNames = useSetting<boolean>('UI_Use_Real_Name');
+	const showRealNames = useSetting('UI_Use_Real_Name', false);
 	const getRoles = useRolesDescription();
 
 	const { t } = useTranslation();
diff --git a/apps/meteor/client/views/oauth/components/ErrorPage.tsx b/apps/meteor/client/views/oauth/components/ErrorPage.tsx
index 812a5badf114..9c0f0a14e915 100644
--- a/apps/meteor/client/views/oauth/components/ErrorPage.tsx
+++ b/apps/meteor/client/views/oauth/components/ErrorPage.tsx
@@ -2,8 +2,8 @@ import { States, StatesIcon, StatesSubtitle, StatesTitle } from '@rocket.chat/fu
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { getErrorMessage } from '../../../lib/errorHandling';
 import Layout from './Layout';
+import { getErrorMessage } from '../../../lib/errorHandling';
 
 type ErrorPageProps = {
 	error: unknown;
diff --git a/apps/meteor/client/views/oauth/components/Layout.tsx b/apps/meteor/client/views/oauth/components/Layout.tsx
index 5f7857aed675..dce1a583b416 100644
--- a/apps/meteor/client/views/oauth/components/Layout.tsx
+++ b/apps/meteor/client/views/oauth/components/Layout.tsx
@@ -9,7 +9,7 @@ type LayoutProps = {
 };
 
 const Layout = ({ children }: LayoutProps) => {
-	const hideLogo = useSetting<boolean>('Layout_Login_Hide_Logo');
+	const hideLogo = useSetting('Layout_Login_Hide_Logo', false);
 	const customLogo = useAssetWithDarkModePath('logo');
 	const customBackground = useAssetWithDarkModePath('background');
 
diff --git a/apps/meteor/client/views/omnichannel/ExternalFrameContainer.tsx b/apps/meteor/client/views/omnichannel/ExternalFrameContainer.tsx
index 3fe37eaced50..f59cf8c0c20c 100644
--- a/apps/meteor/client/views/omnichannel/ExternalFrameContainer.tsx
+++ b/apps/meteor/client/views/omnichannel/ExternalFrameContainer.tsx
@@ -10,8 +10,8 @@ function ExternalFrameContainer() {
 	const uid = useUserId();
 	const room = useRoom();
 	const { 'X-Auth-Token': authToken } = sdk.rest.getCredentials() || {};
-	const keyStr = useSetting<string>('Omnichannel_External_Frame_Encryption_JWK');
-	const frameURLSetting = useSetting<string>('Omnichannel_External_Frame_URL');
+	const keyStr = useSetting('Omnichannel_External_Frame_Encryption_JWK', '');
+	const frameURLSetting = useSetting('Omnichannel_External_Frame_URL', '');
 
 	const token = useQuery(['externalFrame', keyStr, authToken], async () => {
 		if (!keyStr || !authToken) {
@@ -39,7 +39,7 @@ function ExternalFrameContainer() {
 
 	return (
 		<div className='flex-nav'>
-			<iframe title='external-frame' className='external-frame' src={externalFrameUrl} />
+			<iframe style={{ width: '100%', height: '100%' }} title='external-frame' src={externalFrameUrl} />
 		</div>
 	);
 }
diff --git a/apps/meteor/client/views/omnichannel/OmnichannelRouter.tsx b/apps/meteor/client/views/omnichannel/OmnichannelRouter.tsx
index eb699cea2a8b..24d187a27a53 100644
--- a/apps/meteor/client/views/omnichannel/OmnichannelRouter.tsx
+++ b/apps/meteor/client/views/omnichannel/OmnichannelRouter.tsx
@@ -2,9 +2,9 @@ import { useRouter } from '@rocket.chat/ui-contexts';
 import type { ReactNode, ReactElement } from 'react';
 import React, { Suspense, useEffect } from 'react';
 
+import OmnichannelSidebar from './sidebar/OmnichannelSidebar';
 import PageSkeleton from '../../components/PageSkeleton';
 import SidebarPortal from '../../sidebar/SidebarPortal';
-import OmnichannelSidebar from './sidebar/OmnichannelSidebar';
 
 type OmnichannelRouterProps = {
 	children?: ReactNode;
diff --git a/apps/meteor/client/views/omnichannel/additionalForms.tsx b/apps/meteor/client/views/omnichannel/additionalForms.tsx
index 824b5eb69694..ef2c41757244 100644
--- a/apps/meteor/client/views/omnichannel/additionalForms.tsx
+++ b/apps/meteor/client/views/omnichannel/additionalForms.tsx
@@ -1,5 +1,5 @@
 import BusinessHoursMultiple from '../../omnichannel/additionalForms/BusinessHoursMultiple';
-import ContactManager from '../../omnichannel/additionalForms/ContactManager';
+import ContactManagerInput from '../../omnichannel/additionalForms/ContactManagerInput';
 import CurrentChatTags from '../../omnichannel/additionalForms/CurrentChatTags';
 import CustomFieldsAdditionalForm from '../../omnichannel/additionalForms/CustomFieldsAdditionalForm';
 import DepartmentBusinessHours from '../../omnichannel/additionalForms/DepartmentBusinessHours';
@@ -20,7 +20,7 @@ export {
 	EeTextAreaInput,
 	BusinessHoursMultiple,
 	EeTextInput,
-	ContactManager,
+	ContactManagerInput,
 	CurrentChatTags,
 	DepartmentBusinessHours,
 	DepartmentForwarding,
diff --git a/apps/meteor/client/views/omnichannel/agents/AgentEditWithData.tsx b/apps/meteor/client/views/omnichannel/agents/AgentEditWithData.tsx
index df092de6f5eb..3e1134ad9ae0 100644
--- a/apps/meteor/client/views/omnichannel/agents/AgentEditWithData.tsx
+++ b/apps/meteor/client/views/omnichannel/agents/AgentEditWithData.tsx
@@ -1,15 +1,16 @@
 import type { ILivechatAgent } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
-import { FormSkeleton } from '../../../components/Skeleton';
 import AgentEdit from './AgentEdit';
+import { FormSkeleton } from '../../../components/Skeleton';
 
 const AgentEditWithData = ({ uid }: { uid: ILivechatAgent['_id'] }): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const getAvailableDepartments = useEndpoint('GET', '/v1/livechat/department');
 	const getAgentById = useEndpoint('GET', '/v1/livechat/users/agent/:_id', { _id: uid });
diff --git a/apps/meteor/client/views/omnichannel/agents/AgentInfo.tsx b/apps/meteor/client/views/omnichannel/agents/AgentInfo.tsx
index 350485993446..9312c3c160d8 100644
--- a/apps/meteor/client/views/omnichannel/agents/AgentInfo.tsx
+++ b/apps/meteor/client/views/omnichannel/agents/AgentInfo.tsx
@@ -1,8 +1,9 @@
 import { Box, Margins, ButtonGroup, ContextualbarSkeleton } from '@rocket.chat/fuselage';
-import { useEndpoint, useRouter, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useRouter } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import type { HTMLAttributes } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import {
 	Contextualbar,
@@ -23,7 +24,7 @@ type AgentInfoProps = {
 } & Omit<HTMLAttributes<HTMLElement>, 'is'>;
 
 const AgentInfo = ({ uid }: AgentInfoProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const router = useRouter();
 	const getAgentById = useEndpoint('GET', '/v1/livechat/users/agent/:_id', { _id: uid });
 	const { data, isLoading, isError } = useQuery(['livechat-getAgentInfoById', uid], async () => getAgentById(), {
@@ -71,7 +72,7 @@ const AgentInfo = ({ uid }: AgentInfoProps) => {
 					{statusLivechat && (
 						<>
 							<InfoPanelLabel data-qa='AgentInfoUserInfoLabel'>{t('Livechat_status')}</InfoPanelLabel>
-							<InfoPanelText>{t(statusLivechat === 'available' ? 'Available' : 'Not_Available')}</InfoPanelText>
+							<InfoPanelText>{statusLivechat === 'available' ? t('Available') : t('Not_Available')}</InfoPanelText>
 						</>
 					)}
 					{MaxChatsPerAgentDisplay && <MaxChatsPerAgentDisplay maxNumberSimultaneousChat={data.user.livechat?.maxNumberSimultaneousChat} />}
diff --git a/apps/meteor/client/views/omnichannel/agents/AgentsPage.tsx b/apps/meteor/client/views/omnichannel/agents/AgentsPage.tsx
index 18d4f41a7017..0dbe9f64484a 100644
--- a/apps/meteor/client/views/omnichannel/agents/AgentsPage.tsx
+++ b/apps/meteor/client/views/omnichannel/agents/AgentsPage.tsx
@@ -1,16 +1,17 @@
-import { usePermission, useRouteParameter, useTranslation } from '@rocket.chat/ui-contexts';
+import { usePermission, useRouteParameter } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
-import { ContextualbarDialog } from '../../../components/Contextualbar';
-import { Page, PageHeader, PageContent } from '../../../components/Page';
-import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import AgentEditWithData from './AgentEditWithData';
 import AgentInfo from './AgentInfo';
 import AgentsTable from './AgentsTable/AgentsTable';
+import { ContextualbarDialog } from '../../../components/Contextualbar';
+import { Page, PageHeader, PageContent } from '../../../components/Page';
+import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 
 const AgentsPage = (): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const canViewAgents = usePermission('manage-livechat-agents');
 
 	const context = useRouteParameter('context');
diff --git a/apps/meteor/client/views/omnichannel/agents/AgentsTable/AddAgent.tsx b/apps/meteor/client/views/omnichannel/agents/AgentsTable/AddAgent.tsx
index 4ad019281bbf..57960c7b6c7d 100644
--- a/apps/meteor/client/views/omnichannel/agents/AgentsTable/AddAgent.tsx
+++ b/apps/meteor/client/views/omnichannel/agents/AgentsTable/AddAgent.tsx
@@ -1,9 +1,10 @@
 import { Button, Box, Field, FieldLabel, FieldRow } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { UserAutoComplete } from '@rocket.chat/ui-client';
-import { useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useEndpointAction } from '../../../../hooks/useEndpointAction';
 
@@ -12,7 +13,7 @@ type AddAgentProps = {
 };
 
 const AddAgent = ({ reload }: AddAgentProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [username, setUsername] = useState('');
 	const dispatchToastMessage = useToastMessageDispatch();
 
diff --git a/apps/meteor/client/views/omnichannel/agents/AgentsTable/AgentsTable.tsx b/apps/meteor/client/views/omnichannel/agents/AgentsTable/AgentsTable.tsx
index 6c2c8663f0d4..ed50d53b5f07 100644
--- a/apps/meteor/client/views/omnichannel/agents/AgentsTable/AgentsTable.tsx
+++ b/apps/meteor/client/views/omnichannel/agents/AgentsTable/AgentsTable.tsx
@@ -4,6 +4,8 @@ import { hashQueryKey } from '@tanstack/react-query';
 import React, { useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import AddAgent from './AddAgent';
+import AgentsTableRow from './AgentsTableRow';
 import FilterByText from '../../../../components/FilterByText';
 import GenericNoResults from '../../../../components/GenericNoResults/GenericNoResults';
 import {
@@ -17,16 +19,13 @@ import { usePagination } from '../../../../components/GenericTable/hooks/usePagi
 import { useSort } from '../../../../components/GenericTable/hooks/useSort';
 import { useAgentsQuery } from '../hooks/useAgentsQuery';
 import { useQuery } from '../hooks/useQuery';
-import AddAgent from './AddAgent';
-import AgentsTableRow from './AgentsTableRow';
 
 // TODO: missing error state
 const AgentsTable = () => {
 	const { t } = useTranslation();
-	const [filter, setFilter] = useState('');
 
 	const { sortBy, sortDirection, setSort } = useSort<'name' | 'username' | 'emails.address' | 'statusLivechat'>('name');
-	const debouncedFilter = useDebouncedValue(filter, 500);
+	const [text, setText] = useState('');
 	const debouncedSort = useDebouncedValue(
 		useMemo(() => [sortBy, sortDirection], [sortBy, sortDirection]),
 		500,
@@ -34,7 +33,7 @@ const AgentsTable = () => {
 
 	const { current, itemsPerPage, setItemsPerPage, setCurrent, ...paginationProps } = usePagination();
 
-	const query = useQuery({ text: debouncedFilter, current, itemsPerPage }, debouncedSort);
+	const query = useQuery({ text, current, itemsPerPage }, debouncedSort);
 	const { data, isSuccess, isLoading, refetch } = useAgentsQuery(query);
 
 	const [defaultQuery] = useState(hashQueryKey([query]));
@@ -73,7 +72,9 @@ const AgentsTable = () => {
 	return (
 		<>
 			<AddAgent reload={refetch} />
-			{((isSuccess && data?.users.length > 0) || queryHasChanged) && <FilterByText onChange={setFilter} />}
+			{((isSuccess && data?.users.length > 0) || queryHasChanged) && (
+				<FilterByText value={text} onChange={(event) => setText(event.target.value)} />
+			)}
 			{isLoading && (
 				<GenericTable>
 					<GenericTableHeader>{headers}</GenericTableHeader>
@@ -94,12 +95,10 @@ const AgentsTable = () => {
 			)}
 			{isSuccess && data?.users.length > 0 && (
 				<>
-					<GenericTable aria-busy={filter !== debouncedFilter} data-qa-id='agents-table'>
+					<GenericTable aria-busy={isLoading} data-qa-id='agents-table'>
 						<GenericTableHeader>{headers}</GenericTableHeader>
 						<GenericTableBody data-qa='GenericTableAgentInfoBody'>
-							{data?.users.map((user) => (
-								<AgentsTableRow key={user._id} user={user} mediaQuery={mediaQuery} />
-							))}
+							{data?.users.map((user) => <AgentsTableRow key={user._id} user={user} mediaQuery={mediaQuery} />)}
 						</GenericTableBody>
 					</GenericTable>
 					<Pagination
diff --git a/apps/meteor/client/views/omnichannel/agents/AgentsTable/AgentsTableRow.tsx b/apps/meteor/client/views/omnichannel/agents/AgentsTable/AgentsTableRow.tsx
index a072a1a3fd6e..0c1a6e04582a 100644
--- a/apps/meteor/client/views/omnichannel/agents/AgentsTable/AgentsTableRow.tsx
+++ b/apps/meteor/client/views/omnichannel/agents/AgentsTable/AgentsTableRow.tsx
@@ -1,8 +1,9 @@
 import { Box, IconButton } from '@rocket.chat/fuselage';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
-import { useRouter, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRouter } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { GenericTableRow, GenericTableCell } from '../../../../components/GenericTable';
 import { useRemoveAgent } from '../hooks/useRemoveAgent';
@@ -21,7 +22,7 @@ const AgentsTableRow = ({
 	};
 	mediaQuery: boolean;
 }): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const router = useRouter();
 
 	const handleDelete = useRemoveAgent(_id);
diff --git a/apps/meteor/client/views/omnichannel/agents/hooks/useQuery.ts b/apps/meteor/client/views/omnichannel/agents/hooks/useQuery.ts
index 767a4bb6a189..0b045b995911 100644
--- a/apps/meteor/client/views/omnichannel/agents/hooks/useQuery.ts
+++ b/apps/meteor/client/views/omnichannel/agents/hooks/useQuery.ts
@@ -1,3 +1,4 @@
+import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
 import type { PaginatedRequest } from '@rocket.chat/rest-typings';
 import { useMemo } from 'react';
 
@@ -15,15 +16,18 @@ export const useQuery = (
 	},
 	[column, direction]: [string, 'asc' | 'desc'],
 ): PaginatedRequest<{ text: string }> =>
-	useMemo(
-		() => ({
-			text,
-			sort: JSON.stringify({
-				[column]: sortDir(direction),
-				usernames: column === 'name' ? sortDir(direction) : undefined,
+	useDebouncedValue(
+		useMemo(
+			() => ({
+				text,
+				sort: JSON.stringify({
+					[column]: sortDir(direction),
+					usernames: column === 'name' ? sortDir(direction) : undefined,
+				}),
+				...(itemsPerPage && { count: itemsPerPage }),
+				...(current && { offset: current }),
 			}),
-			...(itemsPerPage && { count: itemsPerPage }),
-			...(current && { offset: current }),
-		}),
-		[text, itemsPerPage, current, column, direction],
+			[text, itemsPerPage, current, column, direction],
+		),
+		500,
 	);
diff --git a/apps/meteor/client/views/omnichannel/analytics/AgentOverview.tsx b/apps/meteor/client/views/omnichannel/analytics/AgentOverview.tsx
index b9f0abd6b14c..0d6bb641a513 100644
--- a/apps/meteor/client/views/omnichannel/analytics/AgentOverview.tsx
+++ b/apps/meteor/client/views/omnichannel/analytics/AgentOverview.tsx
@@ -1,7 +1,8 @@
 import { Table, TableBody, TableCell, TableHead, TableRow } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import React, { useMemo, useEffect, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 const style = { width: '100%' };
 
@@ -14,7 +15,7 @@ const AgentOverview = ({
 	dateRange: { start: string; end: string };
 	departmentId: string;
 }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { start, end } = dateRange;
 
 	const params = useMemo(
@@ -48,11 +49,7 @@ const AgentOverview = ({
 	return (
 		<Table style={style} fixed>
 			<TableHead>
-				<TableRow>
-					{displayData.head?.map(({ name }, i) => (
-						<TableCell key={i}>{t(name as TranslationKey)}</TableCell>
-					))}
-				</TableRow>
+				<TableRow>{displayData.head?.map(({ name }, i) => <TableCell key={i}>{t(name as TranslationKey)}</TableCell>)}</TableRow>
 			</TableHead>
 			<TableBody>
 				{displayData.data?.map(({ name, value }, i) => (
diff --git a/apps/meteor/client/views/omnichannel/analytics/AnalyticsPage.tsx b/apps/meteor/client/views/omnichannel/analytics/AnalyticsPage.tsx
index 986221840005..4fae2e621e01 100644
--- a/apps/meteor/client/views/omnichannel/analytics/AnalyticsPage.tsx
+++ b/apps/meteor/client/views/omnichannel/analytics/AnalyticsPage.tsx
@@ -3,12 +3,12 @@ import { Box, Select, Margins, Field, FieldLabel, FieldRow, Label, Option } from
 import React, { useMemo, useState, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import AutoCompleteDepartment from '../../../components/AutoCompleteDepartment';
-import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page';
 import AgentOverview from './AgentOverview';
 import DateRangePicker from './DateRangePicker';
 import InterchangeableChart from './InterchangeableChart';
 import Overview from './Overview';
+import AutoCompleteDepartment from '../../../components/AutoCompleteDepartment';
+import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page';
 
 const useOptions = (type: string): SelectOption[] => {
 	const { t } = useTranslation();
diff --git a/apps/meteor/client/views/omnichannel/analytics/InterchangeableChart.tsx b/apps/meteor/client/views/omnichannel/analytics/InterchangeableChart.tsx
index 2f5d53f72934..eff03e73d3f7 100644
--- a/apps/meteor/client/views/omnichannel/analytics/InterchangeableChart.tsx
+++ b/apps/meteor/client/views/omnichannel/analytics/InterchangeableChart.tsx
@@ -1,7 +1,8 @@
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useToastMessageDispatch, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
+import { useToastMessageDispatch, useMethod } from '@rocket.chat/ui-contexts';
 import type * as chartjs from 'chart.js';
 import React, { useRef, useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { drawLineChart } from '../../../../app/livechat/client/lib/chartHandler';
 import { secondsToHHMMSS } from '../../../../lib/utils/secondsToHHMMSS';
@@ -46,7 +47,7 @@ const InterchangeableChart = ({
 	w: string;
 	alignSelf: string;
 }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 
 	const canvas = useRef<HTMLCanvasElement | null>(null);
diff --git a/apps/meteor/client/views/omnichannel/analytics/Overview.tsx b/apps/meteor/client/views/omnichannel/analytics/Overview.tsx
index 075d67bf7f12..308ca14f761d 100644
--- a/apps/meteor/client/views/omnichannel/analytics/Overview.tsx
+++ b/apps/meteor/client/views/omnichannel/analytics/Overview.tsx
@@ -1,7 +1,8 @@
 import { Box, Skeleton } from '@rocket.chat/fuselage';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import React, { useEffect, useState, useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import CounterItem from '../realTimeMonitoring/counter/CounterItem';
 import CounterRow from '../realTimeMonitoring/counter/CounterRow';
@@ -12,7 +13,7 @@ const conversationsInitialData = [initialData, initialData];
 const productivityInitialData = [initialData];
 
 const Overview = ({ type, dateRange, departmentId }: { type: string; dateRange: { start: string; end: string }; departmentId: string }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const { start, end } = dateRange;
 
diff --git a/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.tsx b/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.tsx
index 92bcfc4c5d30..8a254fb02a1c 100644
--- a/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.tsx
+++ b/apps/meteor/client/views/omnichannel/appearance/AppearanceForm.tsx
@@ -18,9 +18,9 @@ import React from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 
+import FieldLabel from './AppearanceFieldLabel';
 import MarkdownText from '../../../components/MarkdownText';
 import { useHasLicenseModule } from '../../../hooks/useHasLicenseModule';
-import FieldLabel from './AppearanceFieldLabel';
 
 const AppearanceForm = () => {
 	const { t } = useTranslation();
diff --git a/apps/meteor/client/views/omnichannel/appearance/AppearancePage.tsx b/apps/meteor/client/views/omnichannel/appearance/AppearancePage.tsx
index b90c32af6a7d..7e590d190b5b 100644
--- a/apps/meteor/client/views/omnichannel/appearance/AppearancePage.tsx
+++ b/apps/meteor/client/views/omnichannel/appearance/AppearancePage.tsx
@@ -1,12 +1,13 @@
 import type { ISetting, Serialized } from '@rocket.chat/core-typings';
 import { ButtonGroup, Button, Box } from '@rocket.chat/fuselage';
 import { useMutableCallback, useUniqueId } from '@rocket.chat/fuselage-hooks';
-import { useToastMessageDispatch, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useToastMessageDispatch, useEndpoint } from '@rocket.chat/ui-contexts';
 import React from 'react';
 import { useForm, FormProvider } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
-import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../../components/Page';
 import AppearanceForm from './AppearanceForm';
+import { Page, PageHeader, PageScrollableContentWithShadow, PageFooter } from '../../../components/Page';
 
 type LivechatAppearanceSettings = {
 	Livechat_title: string;
@@ -40,7 +41,7 @@ const reduceAppearance = (settings: Serialized<ISetting>[]): AppearanceSettings
 	}, {});
 
 const AppearancePage = ({ settings }: { settings: Serialized<ISetting>[] }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 
 	const saveAction = useEndpoint('POST', '/v1/livechat/appearance');
diff --git a/apps/meteor/client/views/omnichannel/appearance/AppearancePageContainer.tsx b/apps/meteor/client/views/omnichannel/appearance/AppearancePageContainer.tsx
index b3e18ce53ae7..73fe25692899 100644
--- a/apps/meteor/client/views/omnichannel/appearance/AppearancePageContainer.tsx
+++ b/apps/meteor/client/views/omnichannel/appearance/AppearancePageContainer.tsx
@@ -1,16 +1,17 @@
 import { Callout } from '@rocket.chat/fuselage';
-import { usePermission, useTranslation } from '@rocket.chat/ui-contexts';
+import { usePermission } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
+import AppearancePage from './AppearancePage';
 import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page';
 import PageSkeleton from '../../../components/PageSkeleton';
 import { AsyncStatePhase } from '../../../hooks/useAsyncState';
 import { useEndpointData } from '../../../hooks/useEndpointData';
 import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
-import AppearancePage from './AppearancePage';
 
 const AppearancePageContainer = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const { value: data, phase: state, error } = useEndpointData('/v1/livechat/appearance');
 
diff --git a/apps/meteor/client/views/omnichannel/businessHours/BusinessHoursDisabledPage.tsx b/apps/meteor/client/views/omnichannel/businessHours/BusinessHoursDisabledPage.tsx
index 8aba7862d956..61562cf1c2b7 100644
--- a/apps/meteor/client/views/omnichannel/businessHours/BusinessHoursDisabledPage.tsx
+++ b/apps/meteor/client/views/omnichannel/businessHours/BusinessHoursDisabledPage.tsx
@@ -1,11 +1,12 @@
 import { States, StatesIcon, StatesTitle, StatesSubtitle, StatesActions, StatesAction, StatesLink, Box } from '@rocket.chat/fuselage';
-import { useRole, useRouter, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRole, useRouter } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { Page, PageHeader, PageContent } from '../../../components/Page';
 
 const BusinessHoursDisabledPage = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const router = useRouter();
 	const isAdmin = useRole('admin');
 
diff --git a/apps/meteor/client/views/omnichannel/businessHours/BusinessHoursMultiplePage.tsx b/apps/meteor/client/views/omnichannel/businessHours/BusinessHoursMultiplePage.tsx
index 64703e487a90..e2004226d354 100644
--- a/apps/meteor/client/views/omnichannel/businessHours/BusinessHoursMultiplePage.tsx
+++ b/apps/meteor/client/views/omnichannel/businessHours/BusinessHoursMultiplePage.tsx
@@ -1,11 +1,12 @@
 import { Button, ButtonGroup } from '@rocket.chat/fuselage';
-import { useRouter, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRouter } from '@rocket.chat/ui-contexts';
 import React, { lazy, useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { Page, PageHeader, PageContent } from '../../../components/Page';
 
 const BusinessHoursMultiplePage = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const router = useRouter();
 
 	const BusinessHoursTable = useMemo(() => lazy(() => import('../../../omnichannel/businessHours/BusinessHoursTable')), []);
diff --git a/apps/meteor/client/views/omnichannel/businessHours/EditBusinessHours.tsx b/apps/meteor/client/views/omnichannel/businessHours/EditBusinessHours.tsx
index 7700487ad3be..effcfa65e22b 100644
--- a/apps/meteor/client/views/omnichannel/businessHours/EditBusinessHours.tsx
+++ b/apps/meteor/client/views/omnichannel/businessHours/EditBusinessHours.tsx
@@ -5,12 +5,12 @@ import { useToastMessageDispatch, useMethod, useTranslation, useRouter } from '@
 import React from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 
-import { Page, PageFooter, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page';
-import { useRemoveBusinessHour } from '../../../omnichannel/businessHours/useRemoveBusinessHour';
 import type { BusinessHoursFormData } from './BusinessHoursForm';
 import BusinessHoursForm from './BusinessHoursForm';
 import { defaultWorkHours } from './mapBusinessHoursForm';
 import { useIsSingleBusinessHours } from './useIsSingleBusinessHours';
+import { Page, PageFooter, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page';
+import { useRemoveBusinessHour } from '../../../omnichannel/businessHours/useRemoveBusinessHour';
 
 const getInitialData = (businessHourData: Serialized<ILivechatBusinessHour> | undefined) => ({
 	name: businessHourData?.name || '',
diff --git a/apps/meteor/client/views/omnichannel/businessHours/EditBusinessHoursWithData.tsx b/apps/meteor/client/views/omnichannel/businessHours/EditBusinessHoursWithData.tsx
index cb810b419bcf..1ade22846e25 100644
--- a/apps/meteor/client/views/omnichannel/businessHours/EditBusinessHoursWithData.tsx
+++ b/apps/meteor/client/views/omnichannel/businessHours/EditBusinessHoursWithData.tsx
@@ -1,15 +1,16 @@
 import type { ILivechatBusinessHour, LivechatBusinessHourTypes } from '@rocket.chat/core-typings';
 import { Button, States, StatesAction, StatesActions, StatesIcon, StatesTitle } from '@rocket.chat/fuselage';
-import { useEndpoint, useRouter, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useRouter } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
+import EditBusinessHours from './EditBusinessHours';
 import { Page, PageHeader, PageContent } from '../../../components/Page';
 import PageSkeleton from '../../../components/PageSkeleton';
-import EditBusinessHours from './EditBusinessHours';
 
 const EditBusinessHoursWidthData = ({ id, type }: { id?: ILivechatBusinessHour['_id']; type: LivechatBusinessHourTypes }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const router = useRouter();
 	const getBusinessHour = useEndpoint('GET', '/v1/livechat/business-hour');
 
diff --git a/apps/meteor/client/views/omnichannel/components/CustomField.tsx b/apps/meteor/client/views/omnichannel/components/CustomField.tsx
index ef2a0e9094a9..ff61298aab30 100644
--- a/apps/meteor/client/views/omnichannel/components/CustomField.tsx
+++ b/apps/meteor/client/views/omnichannel/components/CustomField.tsx
@@ -1,7 +1,8 @@
 import { Box } from '@rocket.chat/fuselage';
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { InfoPanelField, InfoPanelLabel, InfoPanelText } from '../../../components/InfoPanel';
 import { FormSkeleton } from '../directory/components/FormSkeleton';
@@ -12,7 +13,7 @@ type CustomFieldProps = {
 };
 
 const CustomField = ({ id, value }: CustomFieldProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const getCustomField = useEndpoint('GET', '/v1/livechat/custom-fields/:_id', { _id: id });
 	const { data, isLoading, isError } = useQuery(['/v1/livechat/custom-field', id], () => getCustomField());
 
diff --git a/apps/meteor/client/views/omnichannel/components/OmnichannelVerificationTag.tsx b/apps/meteor/client/views/omnichannel/components/OmnichannelVerificationTag.tsx
new file mode 100644
index 000000000000..8636741b0ad1
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/components/OmnichannelVerificationTag.tsx
@@ -0,0 +1,28 @@
+import { Icon, Tag } from '@rocket.chat/fuselage';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { useHasLicenseModule } from '../../../hooks/useHasLicenseModule';
+
+type OmnichannelVerificationTagProps = {
+	verified?: boolean;
+	onClick?: () => void;
+};
+
+const OmnichannelVerificationTag = ({ verified, onClick }: OmnichannelVerificationTagProps) => {
+	const { t } = useTranslation();
+	const hasLicense = useHasLicenseModule('contact-id-verification') as boolean;
+	const isVerified = hasLicense && verified;
+
+	return (
+		<Tag
+			variant={isVerified ? 'primary' : undefined}
+			onClick={!isVerified && onClick ? onClick : undefined}
+			icon={<Icon size='x12' mie={4} name={isVerified ? 'success-circle' : 'question-mark'} />}
+		>
+			{isVerified ? t('Verified') : t('Unverified')}
+		</Tag>
+	);
+};
+
+export default OmnichannelVerificationTag;
diff --git a/apps/meteor/client/views/omnichannel/contactHistory/ContactHistory.tsx b/apps/meteor/client/views/omnichannel/contactHistory/ContactHistory.tsx
deleted file mode 100644
index 955c1918be05..000000000000
--- a/apps/meteor/client/views/omnichannel/contactHistory/ContactHistory.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import React, { useState } from 'react';
-
-import { useRoomToolbox } from '../../room/contexts/RoomToolboxContext';
-import ContactHistoryList from './ContactHistoryList';
-import ContactHistoryMessagesList from './MessageList/ContactHistoryMessagesList';
-
-const ContactHistory = () => {
-	const [chatId, setChatId] = useState<string>('');
-	const { closeTab } = useRoomToolbox();
-
-	return (
-		<>
-			{chatId && chatId !== '' ? (
-				<ContactHistoryMessagesList chatId={chatId} setChatId={setChatId} close={closeTab} />
-			) : (
-				<ContactHistoryList setChatId={setChatId} close={closeTab} />
-			)}
-		</>
-	);
-};
-
-export default ContactHistory;
diff --git a/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryItem.tsx b/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryItem.tsx
deleted file mode 100644
index 24b30e94cc33..000000000000
--- a/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryItem.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import {
-	Message,
-	Box,
-	MessageGenericPreview,
-	MessageGenericPreviewContent,
-	MessageGenericPreviewDescription,
-	MessageGenericPreviewTitle,
-	MessageSystemBody,
-} from '@rocket.chat/fuselage';
-import type { VisitorSearchChatsResult } from '@rocket.chat/rest-typings';
-import { UserAvatar } from '@rocket.chat/ui-avatar';
-import type { ComponentPropsWithoutRef, Dispatch, ReactElement, SetStateAction } from 'react';
-import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
-
-import { useFormatDateAndTime } from '../../../hooks/useFormatDateAndTime';
-import { clickableItem } from '../../../lib/clickableItem';
-
-type ContactHistoryItemProps = {
-	history: VisitorSearchChatsResult;
-	setChatId: Dispatch<SetStateAction<string>>;
-} & ComponentPropsWithoutRef<typeof Box>;
-
-function ContactHistoryItem({ history, setChatId, ...props }: ContactHistoryItemProps): ReactElement {
-	const { t } = useTranslation();
-	const formatDate = useFormatDateAndTime();
-	const username = history.servedBy?.username;
-	const hasClosingMessage = !!history.closingMessage?.msg?.trim();
-	const onClick = (): void => {
-		setChatId(history._id);
-	};
-
-	return (
-		<Box pbs={16} is={Message} onClick={onClick} data-qa='chat-history-item' {...props}>
-			<Message.LeftContainer>{username && <UserAvatar username={username} size='x36' />}</Message.LeftContainer>
-			<Message.Container>
-				<Message.Header>
-					<Message.Name title={username}>{username}</Message.Name>
-					{history.closingMessage?.ts && <Message.Timestamp>{formatDate(history.closingMessage?.ts)}</Message.Timestamp>}
-				</Message.Header>
-				<Message.Body>
-					<MessageSystemBody title={t('Conversation_closed_without_comment')}>{t('Conversation_closed_without_comment')}</MessageSystemBody>
-					{hasClosingMessage && (
-						<MessageGenericPreview>
-							<MessageGenericPreviewContent>
-								<MessageGenericPreviewTitle>{t('Closing_chat_message')}:</MessageGenericPreviewTitle>
-								<MessageGenericPreviewDescription clamp>
-									<Box title={history.closingMessage?.msg}>{history.closingMessage?.msg}</Box>
-								</MessageGenericPreviewDescription>
-							</MessageGenericPreviewContent>
-						</MessageGenericPreview>
-					)}
-				</Message.Body>
-				<Message.Metrics>
-					<Message.Metrics.Item>
-						<Message.Metrics.Item.Icon name='thread' />
-						<Message.Metrics.Item.Label>{history.msgs}</Message.Metrics.Item.Label>
-					</Message.Metrics.Item>
-				</Message.Metrics>
-			</Message.Container>
-		</Box>
-	);
-}
-
-export default memo(clickableItem(ContactHistoryItem));
diff --git a/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryList.tsx b/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryList.tsx
deleted file mode 100644
index 5a1cd52eab3c..000000000000
--- a/apps/meteor/client/views/omnichannel/contactHistory/ContactHistoryList.tsx
+++ /dev/null
@@ -1,99 +0,0 @@
-import { Box, Margins, TextInput, Icon, Throbber, States, StatesIcon, StatesTitle, StatesSubtitle } from '@rocket.chat/fuselage';
-import type { ChangeEvent, Dispatch, ReactElement, SetStateAction } from 'react';
-import React, { useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { Virtuoso } from 'react-virtuoso';
-
-import {
-	ContextualbarHeader,
-	ContextualbarContent,
-	ContextualbarTitle,
-	ContextualbarIcon,
-	ContextualbarClose,
-	ContextualbarEmptyContent,
-} from '../../../components/Contextualbar';
-import { VirtuosoScrollbars } from '../../../components/CustomScrollbars';
-import { useRecordList } from '../../../hooks/lists/useRecordList';
-import { AsyncStatePhase } from '../../../lib/asyncState';
-import { useOmnichannelRoom } from '../../room/contexts/RoomContext';
-import ContactHistoryItem from './ContactHistoryItem';
-import { useHistoryList } from './useHistoryList';
-
-const ContactHistoryList = ({ setChatId, close }: { setChatId: Dispatch<SetStateAction<string>>; close: () => void }): ReactElement => {
-	const [text, setText] = useState('');
-	const { t } = useTranslation();
-	const room = useOmnichannelRoom();
-	const { itemsList: historyList, loadMoreItems } = useHistoryList(
-		useMemo(() => ({ roomId: room._id, filter: text, visitorId: room.v._id }), [room, text]),
-	);
-
-	const handleSearchChange = (event: ChangeEvent<HTMLInputElement>): void => {
-		setText(event.currentTarget.value);
-	};
-
-	const { phase, error, items: history, itemCount: totalItemCount } = useRecordList(historyList);
-
-	return (
-		<>
-			<ContextualbarHeader>
-				<ContextualbarIcon name='history' />
-				<ContextualbarTitle>{t('Contact_Chat_History')}</ContextualbarTitle>
-				<ContextualbarClose onClick={close} />
-			</ContextualbarHeader>
-
-			<ContextualbarContent paddingInline={0}>
-				<Box
-					display='flex'
-					flexDirection='row'
-					p={24}
-					borderBlockEndWidth='default'
-					borderBlockEndStyle='solid'
-					borderBlockEndColor='extra-light'
-					flexShrink={0}
-				>
-					<Box display='flex' flexDirection='row' flexGrow={1} mi='neg-x4'>
-						<Margins inline={4}>
-							<TextInput
-								placeholder={t('Search_Chat_History')}
-								value={text}
-								onChange={handleSearchChange}
-								addon={<Icon name='magnifier' size='x20' />}
-							/>
-						</Margins>
-					</Box>
-				</Box>
-				{phase === AsyncStatePhase.LOADING && (
-					<Box pi={24} pb={12}>
-						<Throbber size='x12' />
-					</Box>
-				)}
-				{error && (
-					<States>
-						<StatesIcon name='warning' variation='danger' />
-						<StatesTitle>{t('Something_went_wrong')}</StatesTitle>
-						<StatesSubtitle>{error.toString()}</StatesSubtitle>
-					</States>
-				)}
-				{phase !== AsyncStatePhase.LOADING && totalItemCount === 0 && <ContextualbarEmptyContent title={t('No_results_found')} />}
-				<Box flexGrow={1} flexShrink={1} overflow='hidden' display='flex'>
-					{!error && totalItemCount > 0 && history.length > 0 && (
-						<Virtuoso
-							totalCount={totalItemCount}
-							endReached={
-								phase === AsyncStatePhase.LOADING
-									? (): void => undefined
-									: (start): unknown => loadMoreItems(start, Math.min(50, totalItemCount - start))
-							}
-							overscan={25}
-							data={history}
-							components={{ Scroller: VirtuosoScrollbars }}
-							itemContent={(index, data): ReactElement => <ContactHistoryItem key={index} history={data} setChatId={setChatId} />}
-						/>
-					)}
-				</Box>
-			</ContextualbarContent>
-		</>
-	);
-};
-
-export default ContactHistoryList;
diff --git a/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessage.tsx b/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessage.tsx
index 2915e4907c7d..6d0a09461730 100644
--- a/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessage.tsx
+++ b/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessage.tsx
@@ -16,6 +16,7 @@ import {
 	MessageSystemName,
 	MessageSystemBody,
 	MessageSystemTimestamp,
+	Bubble,
 } from '@rocket.chat/fuselage';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
 import React, { memo } from 'react';
@@ -79,7 +80,13 @@ const ContactHistoryMessage = ({ message, sequential, isNewDay, showUserAvatar }
 
 	return (
 		<>
-			{isNewDay && <MessageDivider>{format(message.ts)}</MessageDivider>}
+			{isNewDay && (
+				<MessageDivider>
+					<Bubble small secondary>
+						{format(message.ts)}
+					</Bubble>
+				</MessageDivider>
+			)}
 			<MessageTemplate isPending={message.temp} sequential={sequential} role='listitem' data-qa='chat-history-message'>
 				<MessageLeftContainer>
 					{!sequential && message.u.username && showUserAvatar && (
@@ -95,7 +102,6 @@ const ContactHistoryMessage = ({ message, sequential, isNewDay, showUserAvatar }
 					)}
 					{sequential && <StatusIndicators message={message} />}
 				</MessageLeftContainer>
-
 				<MessageContainer>
 					{!sequential && (
 						<MessageHeaderTemplate>
diff --git a/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessagesList.tsx b/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessagesList.tsx
index 3bf6385a19a0..ff2c017a92f8 100644
--- a/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessagesList.tsx
+++ b/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessagesList.tsx
@@ -1,12 +1,28 @@
-import { Box, Icon, Margins, States, StatesIcon, StatesSubtitle, StatesTitle, TextInput, Throbber } from '@rocket.chat/fuselage';
-import { useSetting, useTranslation, useUserPreference } from '@rocket.chat/ui-contexts';
-import type { ChangeEvent, Dispatch, ReactElement, SetStateAction } from 'react';
+import {
+	Box,
+	Button,
+	ButtonGroup,
+	ContextualbarFooter,
+	Icon,
+	Margins,
+	States,
+	StatesIcon,
+	StatesSubtitle,
+	StatesTitle,
+	TextInput,
+	Throbber,
+} from '@rocket.chat/fuselage';
+import { useDebouncedValue, useResizeObserver } from '@rocket.chat/fuselage-hooks';
+import { useSetting, useUserPreference, useUserId } from '@rocket.chat/ui-contexts';
+import type { ChangeEvent, ReactElement } from 'react';
 import React, { useMemo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 import { Virtuoso } from 'react-virtuoso';
 
+import ContactHistoryMessage from './ContactHistoryMessage';
+import { useHistoryMessageList } from './useHistoryMessageList';
 import {
 	ContextualbarHeader,
-	ContextualbarAction,
 	ContextualbarIcon,
 	ContextualbarTitle,
 	ContextualbarClose,
@@ -18,39 +34,49 @@ import { useRecordList } from '../../../../hooks/lists/useRecordList';
 import { AsyncStatePhase } from '../../../../lib/asyncState';
 import { isMessageNewDay } from '../../../room/MessageList/lib/isMessageNewDay';
 import { isMessageSequential } from '../../../room/MessageList/lib/isMessageSequential';
-import ContactHistoryMessage from './ContactHistoryMessage';
-import { useHistoryMessageList } from './useHistoryMessageList';
 
-const ContactHistoryMessagesList = ({
-	chatId,
-	setChatId,
-	close,
-}: {
+type ContactHistoryMessagesListProps = {
 	chatId: string;
-	setChatId: Dispatch<SetStateAction<string>>;
-	close: () => void;
-}): ReactElement => {
+	onClose: () => void;
+	onOpenRoom?: () => void;
+};
+
+const ContactHistoryMessagesList = ({ chatId, onClose, onOpenRoom }: ContactHistoryMessagesListProps) => {
+	const { t } = useTranslation();
 	const [text, setText] = useState('');
-	const t = useTranslation();
 	const showUserAvatar = !!useUserPreference<boolean>('displayAvatars');
-	const { itemsList: messageList, loadMoreItems } = useHistoryMessageList(
-		useMemo(() => ({ roomId: chatId, filter: text }), [chatId, text]),
+	const userId = useUserId();
+
+	const { ref, contentBoxSize: { inlineSize = 378, blockSize = 1 } = {} } = useResizeObserver<HTMLElement>({
+		debounceDelay: 200,
+	});
+
+	const query = useDebouncedValue(
+		useMemo(
+			() => ({
+				roomId: chatId,
+				filter: text,
+			}),
+			[text, chatId],
+		),
+		500,
 	);
 
+	const { itemsList: messageList, loadMoreItems } = useHistoryMessageList(query, userId);
+
 	const handleSearchChange = (event: ChangeEvent<HTMLInputElement>): void => {
 		setText(event.currentTarget.value);
 	};
 
 	const { phase, error, items: messages, itemCount: totalItemCount } = useRecordList(messageList);
-	const messageGroupingPeriod = Number(useSetting('Message_GroupingPeriod'));
+	const messageGroupingPeriod = useSetting('Message_GroupingPeriod', 300);
 
 	return (
 		<>
 			<ContextualbarHeader>
-				<ContextualbarAction onClick={(): void => setChatId('')} title={t('Back')} name='arrow-back' />
 				<ContextualbarIcon name='history' />
-				<ContextualbarTitle>{t('Chat_History')}</ContextualbarTitle>
-				<ContextualbarClose onClick={close} />
+				<ContextualbarTitle>{t('Conversation')}</ContextualbarTitle>
+				<ContextualbarClose onClick={onClose} />
 			</ContextualbarHeader>
 
 			<ContextualbarContent paddingInline={0}>
@@ -87,14 +113,22 @@ const ContactHistoryMessagesList = ({
 					</States>
 				)}
 				{phase !== AsyncStatePhase.LOADING && totalItemCount === 0 && <ContextualbarEmptyContent title={t('No_results_found')} />}
-				<Box flexGrow={1} flexShrink={1} overflow='hidden' display='flex'>
+				<Box flexGrow={1} flexShrink={1} overflow='hidden' display='flex' ref={ref}>
 					{!error && totalItemCount > 0 && history.length > 0 && (
 						<Virtuoso
 							totalCount={totalItemCount}
+							initialTopMostItemIndex={{ index: 'LAST' }}
+							followOutput
+							style={{
+								height: blockSize,
+								width: inlineSize,
+							}}
 							endReached={
 								phase === AsyncStatePhase.LOADING
 									? (): void => undefined
-									: (start): unknown => loadMoreItems(start, Math.min(50, totalItemCount - start))
+									: (start): void => {
+											loadMoreItems(start, Math.min(50, totalItemCount - start));
+										}
 							}
 							overscan={25}
 							data={messages}
@@ -111,6 +145,13 @@ const ContactHistoryMessagesList = ({
 					)}
 				</Box>
 			</ContextualbarContent>
+			{onOpenRoom && (
+				<ContextualbarFooter>
+					<ButtonGroup stretch>
+						<Button onClick={onOpenRoom}>{t('Open_chat')}</Button>
+					</ButtonGroup>
+				</ContextualbarFooter>
+			)}
 		</>
 	);
 };
diff --git a/apps/meteor/client/views/omnichannel/contactHistory/MessageList/useHistoryMessageList.ts b/apps/meteor/client/views/omnichannel/contactHistory/MessageList/useHistoryMessageList.ts
index cd231b84e8dd..ba450cda05e3 100644
--- a/apps/meteor/client/views/omnichannel/contactHistory/MessageList/useHistoryMessageList.ts
+++ b/apps/meteor/client/views/omnichannel/contactHistory/MessageList/useHistoryMessageList.ts
@@ -1,9 +1,12 @@
+import type { IUser } from '@rocket.chat/core-typings';
 import { useEndpoint } from '@rocket.chat/ui-contexts';
-import { useCallback, useState } from 'react';
+import { useCallback, useMemo, useState } from 'react';
 
 import { useScrollableMessageList } from '../../../../hooks/lists/useScrollableMessageList';
+import { useStreamUpdatesForMessageList } from '../../../../hooks/lists/useStreamUpdatesForMessageList';
 import { useComponentDidUpdate } from '../../../../hooks/useComponentDidUpdate';
 import { MessageList } from '../../../../lib/lists/MessageList';
+import { getConfig } from '../../../../lib/utils/getConfig';
 
 type HistoryMessageListOptions = {
 	filter: string;
@@ -12,6 +15,7 @@ type HistoryMessageListOptions = {
 
 export const useHistoryMessageList = (
 	options: HistoryMessageListOptions,
+	uid: IUser['_id'] | null,
 ): {
 	itemsList: MessageList;
 	initialItemCount: number;
@@ -42,7 +46,12 @@ export const useHistoryMessageList = (
 		[getMessages, options.filter],
 	);
 
-	const { loadMoreItems, initialItemCount } = useScrollableMessageList(itemsList, fetchMessages, 25);
+	const { loadMoreItems, initialItemCount } = useScrollableMessageList(
+		itemsList,
+		fetchMessages,
+		useMemo(() => parseInt(`${getConfig('historyMessageListSize', 10)}`), []),
+	);
+	useStreamUpdatesForMessageList(itemsList, uid, options.roomId);
 
 	return {
 		itemsList,
diff --git a/apps/meteor/client/views/omnichannel/contactHistory/useHistoryList.ts b/apps/meteor/client/views/omnichannel/contactHistory/useHistoryList.ts
deleted file mode 100644
index 62d304b39d13..000000000000
--- a/apps/meteor/client/views/omnichannel/contactHistory/useHistoryList.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-import type { VisitorSearchChatsResult } from '@rocket.chat/rest-typings';
-import { useEndpoint } from '@rocket.chat/ui-contexts';
-import { useCallback, useState } from 'react';
-
-import { useScrollableRecordList } from '../../../hooks/lists/useScrollableRecordList';
-import { useComponentDidUpdate } from '../../../hooks/useComponentDidUpdate';
-import { RecordList } from '../../../lib/lists/RecordList';
-import { mapMessageFromApi } from '../../../lib/utils/mapMessageFromApi';
-
-type HistoryListOptions = {
-	filter: string;
-	roomId: string;
-	visitorId: string;
-};
-
-export const useHistoryList = (
-	options: HistoryListOptions,
-): {
-	itemsList: RecordList<VisitorSearchChatsResult & { _updatedAt: Date }>;
-	initialItemCount: number;
-	loadMoreItems: (start: number, end: number) => void;
-} => {
-	const [itemsList, setItemsList] = useState(() => new RecordList<VisitorSearchChatsResult & { _updatedAt: Date }>());
-	const reload = useCallback(() => setItemsList(new RecordList<VisitorSearchChatsResult & { _updatedAt: Date }>()), []);
-
-	const getHistory = useEndpoint('GET', '/v1/livechat/visitors.searchChats/room/:roomId/visitor/:visitorId', {
-		roomId: options.roomId,
-		visitorId: options.visitorId,
-	});
-
-	useComponentDidUpdate(() => {
-		options && reload();
-	}, [options, reload]);
-
-	const fetchData = useCallback(
-		async (start, end) => {
-			const { history, total } = await getHistory({
-				...(options.filter && { searchText: options.filter }),
-				closedChatsOnly: 'true',
-				servedChatsOnly: 'false',
-				offset: start,
-				count: end + start,
-			});
-			return {
-				items: history.map((history) => ({
-					...history,
-					ts: new Date(history.ts),
-					_updatedAt: new Date(history.ts),
-					closedAt: history.closedAt ? new Date(history.closedAt) : undefined,
-					servedBy: history.servedBy ? { ...history.servedBy, ts: new Date(history.servedBy.ts) } : undefined,
-					closingMessage: history.closingMessage ? mapMessageFromApi(history.closingMessage) : undefined,
-				})),
-				itemCount: total,
-			};
-		},
-		[getHistory, options],
-	);
-
-	const { loadMoreItems, initialItemCount } = useScrollableRecordList(itemsList, fetchData, 25);
-
-	return {
-		itemsList,
-		loadMoreItems,
-		initialItemCount,
-	};
-};
diff --git a/apps/meteor/client/views/omnichannel/contactInfo/AdvancedContactModal.tsx b/apps/meteor/client/views/omnichannel/contactInfo/AdvancedContactModal.tsx
new file mode 100644
index 000000000000..884197bf0749
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/contactInfo/AdvancedContactModal.tsx
@@ -0,0 +1,36 @@
+import { useRole } from '@rocket.chat/ui-contexts';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { getURL } from '../../../../app/utils/client/getURL';
+import GenericUpsellModal from '../../../components/GenericUpsellModal';
+import { useUpsellActions } from '../../../components/GenericUpsellModal/hooks';
+import { useExternalLink } from '../../../hooks/useExternalLink';
+import { useHasLicenseModule } from '../../../hooks/useHasLicenseModule';
+
+type AdvancedContactModalProps = {
+	onCancel: () => void;
+};
+
+const AdvancedContactModal = ({ onCancel }: AdvancedContactModalProps) => {
+	const { t } = useTranslation();
+	const isAdmin = useRole('admin');
+	const hasLicense = useHasLicenseModule('contact-id-verification') as boolean;
+	const { shouldShowUpsell, handleManageSubscription } = useUpsellActions(hasLicense);
+	const openExternalLink = useExternalLink();
+
+	return (
+		<GenericUpsellModal
+			title={t('Advanced_contact_profile')}
+			description={t('Advanced_contact_profile_description')}
+			img={getURL('images/single-contact-id-upsell.png')}
+			onClose={onCancel}
+			onCancel={shouldShowUpsell ? onCancel : () => openExternalLink('https://go.rocket.chat/i/omnichannel-docs')}
+			cancelText={!shouldShowUpsell ? t('Learn_more') : undefined}
+			onConfirm={shouldShowUpsell ? handleManageSubscription : undefined}
+			annotation={!shouldShowUpsell && !isAdmin ? t('Ask_enable_advanced_contact_profile') : undefined}
+		/>
+	);
+};
+
+export default AdvancedContactModal;
diff --git a/apps/meteor/client/views/omnichannel/contactInfo/ContactInfo/ContactInfo.tsx b/apps/meteor/client/views/omnichannel/contactInfo/ContactInfo/ContactInfo.tsx
new file mode 100644
index 000000000000..a54867cdff74
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/contactInfo/ContactInfo/ContactInfo.tsx
@@ -0,0 +1,107 @@
+import type { ILivechatContact, Serialized } from '@rocket.chat/core-typings';
+import { Box, Button, ButtonGroup, Callout, IconButton, Tabs, TabsItem } from '@rocket.chat/fuselage';
+import { UserAvatar } from '@rocket.chat/ui-avatar';
+import { usePermission, useRouteParameter, useSetModal } from '@rocket.chat/ui-contexts';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+
+import ReviewContactModal from './ReviewContactModal';
+import { ContextualbarHeader, ContextualbarIcon, ContextualbarTitle, ContextualbarClose } from '../../../../components/Contextualbar';
+import { useFormatDate } from '../../../../hooks/useFormatDate';
+import { useContactRoute } from '../../hooks/useContactRoute';
+import { useValidCustomFields } from '../hooks/useValidCustomFields';
+import ContactInfoChannels from '../tabs/ContactInfoChannels/ContactInfoChannels';
+import ContactInfoDetails from '../tabs/ContactInfoDetails';
+import ContactInfoHistory from '../tabs/ContactInfoHistory';
+
+type ContactInfoProps = {
+	contact: Serialized<ILivechatContact>;
+	onClose: () => void;
+};
+
+const ContactInfo = ({ contact, onClose }: ContactInfoProps) => {
+	const { t } = useTranslation();
+
+	const setModal = useSetModal();
+	const handleNavigate = useContactRoute();
+	const context = useRouteParameter('context');
+
+	const formatDate = useFormatDate();
+	const canEditContact = usePermission('edit-omnichannel-contact');
+
+	const { name, emails, phones, conflictingFields, createdAt, lastChat, contactManager, customFields: userCustomFields } = contact;
+
+	const hasConflicts = conflictingFields && conflictingFields?.length > 0;
+	const customFieldEntries = useValidCustomFields(userCustomFields);
+
+	return (
+		<>
+			<ContextualbarHeader>
+				<ContextualbarIcon name='user' />
+				<ContextualbarTitle>{t('Contact')}</ContextualbarTitle>
+				<ContextualbarClose onClick={onClose} />
+			</ContextualbarHeader>
+			<Box display='flex' flexDirection='column' pi={24}>
+				{name && (
+					<Box width='100%' pb={16} display='flex' alignItems='center' justifyContent='space-between'>
+						<Box withTruncatedText display='flex'>
+							<UserAvatar size='x40' title={name} username={name} />
+							<Box withTruncatedText mis={16} display='flex' flexDirection='column'>
+								<Box withTruncatedText fontScale='h4'>
+									{name}
+								</Box>
+								{lastChat && <Box fontScale='c1'>{`${t('Last_Chat')}: ${formatDate(lastChat.ts)}`}</Box>}
+							</Box>
+						</Box>
+						<IconButton
+							disabled={!canEditContact || hasConflicts}
+							title={canEditContact ? t('Edit') : t('Not_authorized')}
+							small
+							icon='pencil'
+							onClick={() => handleNavigate({ context: 'edit' })}
+						/>
+					</Box>
+				)}
+				{hasConflicts && (
+					<Callout
+						mbe={8}
+						alignItems='center'
+						icon='members'
+						actions={
+							<ButtonGroup>
+								<Button onClick={() => setModal(<ReviewContactModal onCancel={() => setModal(null)} contact={contact} />)} small>
+									{t('See_conflicts')}
+								</Button>
+							</ButtonGroup>
+						}
+						title={t('Conflicts_found', { conflicts: conflictingFields?.length })}
+					/>
+				)}
+			</Box>
+			<Tabs>
+				<TabsItem onClick={() => handleNavigate({ context: 'details' })} selected={context === 'details'}>
+					{t('Details')}
+				</TabsItem>
+				<TabsItem onClick={() => handleNavigate({ context: 'channels' })} selected={context === 'channels'}>
+					{t('Channels')}
+				</TabsItem>
+				<TabsItem onClick={() => handleNavigate({ context: 'history' })} selected={context === 'history'}>
+					{t('History')}
+				</TabsItem>
+			</Tabs>
+			{context === 'details' && (
+				<ContactInfoDetails
+					createdAt={createdAt}
+					contactManager={contactManager}
+					phones={phones?.map(({ phoneNumber }) => phoneNumber)}
+					emails={emails?.map(({ address }) => address)}
+					customFieldEntries={customFieldEntries}
+				/>
+			)}
+			{context === 'channels' && <ContactInfoChannels contactId={contact?._id} />}
+			{context === 'history' && <ContactInfoHistory contact={contact} />}
+		</>
+	);
+};
+
+export default ContactInfo;
diff --git a/apps/meteor/client/views/omnichannel/contactInfo/ContactInfo/ContactInfoWithData.tsx b/apps/meteor/client/views/omnichannel/contactInfo/ContactInfo/ContactInfoWithData.tsx
new file mode 100644
index 000000000000..17e893d267ee
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/contactInfo/ContactInfo/ContactInfoWithData.tsx
@@ -0,0 +1,33 @@
+import { useEndpoint, usePermission } from '@rocket.chat/ui-contexts';
+import { useQuery } from '@tanstack/react-query';
+import React from 'react';
+
+import { ContextualbarSkeleton } from '../../../../components/Contextualbar';
+import ContactInfoError from '../ContactInfoError';
+import ContactInfo from './ContactInfo';
+
+type ContactInfoWithDataProps = {
+	id: string;
+	onClose: () => void;
+};
+
+const ContactInfoWithData = ({ id: contactId, onClose }: ContactInfoWithDataProps) => {
+	const canViewCustomFields = usePermission('view-livechat-room-customfields');
+
+	const getContact = useEndpoint('GET', '/v1/omnichannel/contacts.get');
+	const { data, isLoading, isError } = useQuery(['getContactById', contactId], () => getContact({ contactId }), {
+		enabled: canViewCustomFields && !!contactId,
+	});
+
+	if (isLoading) {
+		return <ContextualbarSkeleton />;
+	}
+
+	if (isError || !data?.contact) {
+		return <ContactInfoError onClose={onClose} />;
+	}
+
+	return <ContactInfo contact={data?.contact} onClose={onClose} />;
+};
+
+export default ContactInfoWithData;
diff --git a/apps/meteor/client/views/omnichannel/contactInfo/ContactInfo/ReviewContactModal.tsx b/apps/meteor/client/views/omnichannel/contactInfo/ContactInfo/ReviewContactModal.tsx
new file mode 100644
index 000000000000..29492d18760a
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/contactInfo/ContactInfo/ReviewContactModal.tsx
@@ -0,0 +1,115 @@
+import type { ILivechatContact, Serialized } from '@rocket.chat/core-typings';
+import { Badge, Box, Field, FieldError, FieldGroup, FieldHint, FieldLabel, FieldRow, Select } from '@rocket.chat/fuselage';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useAtLeastOnePermission } from '@rocket.chat/ui-contexts';
+import React, { useMemo } from 'react';
+import { Controller, useForm } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
+
+import { mapLivechatContactConflicts } from '../../../../../lib/mapLivechatContactConflicts';
+import GenericModal from '../../../../components/GenericModal';
+import { useHasLicenseModule } from '../../../../hooks/useHasLicenseModule';
+import { ContactManagerInput } from '../../additionalForms';
+import { useCustomFieldsMetadata } from '../../directory/hooks/useCustomFieldsMetadata';
+import { useEditContact } from '../hooks/useEditContact';
+
+type ReviewContactModalProps = {
+	contact: Serialized<ILivechatContact>;
+	onCancel: () => void;
+};
+
+type HandleConflictsPayload = {
+	name: string;
+	contactManager: string;
+	[key: string]: string;
+};
+
+const ReviewContactModal = ({ contact, onCancel }: ReviewContactModalProps) => {
+	const { t } = useTranslation();
+	const hasLicense = useHasLicenseModule('livechat-enterprise');
+
+	const {
+		control,
+		handleSubmit,
+		formState: { errors },
+	} = useForm<HandleConflictsPayload>();
+
+	const canViewCustomFields = useAtLeastOnePermission(['view-livechat-room-customfields', 'edit-livechat-room-customfields']);
+
+	const { data: customFieldsMetadata = [] } = useCustomFieldsMetadata({
+		scope: 'visitor',
+		enabled: canViewCustomFields,
+	});
+
+	const editContact = useEditContact(['getContactById']);
+
+	const handleConflicts = async ({ name, contactManager, ...customFields }: HandleConflictsPayload) => {
+		const payload = {
+			name,
+			contactManager,
+			...(customFields && { ...customFields }),
+			wipeConflicts: true,
+		};
+
+		editContact.mutate(
+			{ contactId: contact?._id, ...payload },
+			{
+				onSettled: () => onCancel(),
+			},
+		);
+	};
+
+	const conflictingFields = useMemo(() => {
+		const mappedConflicts = mapLivechatContactConflicts(contact, customFieldsMetadata);
+		return Object.values(mappedConflicts);
+	}, [contact, customFieldsMetadata]);
+
+	return (
+		<GenericModal
+			icon={null}
+			variant='warning'
+			onCancel={onCancel}
+			confirmText={t('Save')}
+			onConfirm={handleSubmit(handleConflicts)}
+			annotation={t('Contact_history_is_preserved')}
+			title={t('Review_contact')}
+		>
+			<FieldGroup>
+				{conflictingFields.map(({ name, label, values }, index) => {
+					const isContactManagerField = name === 'contactManager';
+					const mappedOptions = values.map((option) => [option, option] as const);
+					const Component = isContactManagerField ? ContactManagerInput : Select;
+
+					if (isContactManagerField && !hasLicense) {
+						return null;
+					}
+
+					return (
+						<Field key={index}>
+							<FieldLabel>{t(label as TranslationKey)}</FieldLabel>
+							<FieldRow>
+								<Controller
+									name={name}
+									control={control}
+									rules={{
+										required: isContactManagerField ? undefined : t('Required_field', { field: t(label as TranslationKey) }),
+									}}
+									render={({ field: { value, onChange } }) => <Component options={mappedOptions} value={value} onChange={onChange} />}
+								/>
+							</FieldRow>
+							<FieldHint>
+								<Box display='flex' alignItems='center'>
+									<Box mie={4}>{t('different_values_found', { number: values.length })}</Box>
+									<Badge variant='primary' small />
+								</Box>
+							</FieldHint>
+							{errors?.[name] && <FieldError>{errors?.[name]?.message}</FieldError>}
+						</Field>
+					);
+				})}
+			</FieldGroup>
+		</GenericModal>
+	);
+};
+
+export default ReviewContactModal;
diff --git a/apps/meteor/client/views/omnichannel/contactInfo/ContactInfo/index.ts b/apps/meteor/client/views/omnichannel/contactInfo/ContactInfo/index.ts
new file mode 100644
index 000000000000..59e2beece146
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/contactInfo/ContactInfo/index.ts
@@ -0,0 +1 @@
+export { default } from './ContactInfoWithData';
diff --git a/apps/meteor/client/views/omnichannel/contactInfo/ContactInfoError.tsx b/apps/meteor/client/views/omnichannel/contactInfo/ContactInfoError.tsx
new file mode 100644
index 000000000000..666aa476ccce
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/contactInfo/ContactInfoError.tsx
@@ -0,0 +1,27 @@
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+
+import {
+	ContextualbarHeader,
+	ContextualbarIcon,
+	ContextualbarTitle,
+	ContextualbarClose,
+	ContextualbarEmptyContent,
+} from '../../../components/Contextualbar';
+
+const ContactInfoError = ({ onClose }: { onClose: () => void }) => {
+	const { t } = useTranslation();
+
+	return (
+		<>
+			<ContextualbarHeader>
+				<ContextualbarIcon name='user' />
+				<ContextualbarTitle>{t('Contact')}</ContextualbarTitle>
+				<ContextualbarClose onClick={onClose} />
+			</ContextualbarHeader>
+			<ContextualbarEmptyContent icon='user' title={t('Contact_not_found')} />
+		</>
+	);
+};
+
+export default ContactInfoError;
diff --git a/apps/meteor/client/views/omnichannel/contactInfo/ContactInfoRouter.tsx b/apps/meteor/client/views/omnichannel/contactInfo/ContactInfoRouter.tsx
new file mode 100644
index 000000000000..0e6cb4984bfe
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/contactInfo/ContactInfoRouter.tsx
@@ -0,0 +1,30 @@
+import { useRoute, useRouteParameter } from '@rocket.chat/ui-contexts';
+import React from 'react';
+
+import ContactInfo from './ContactInfo';
+import ContactInfoError from './ContactInfoError';
+import EditContactInfoWithData from './EditContactInfoWithData';
+import { useOmnichannelRoom } from '../../room/contexts/RoomContext';
+import { useRoomToolbox } from '../../room/contexts/RoomToolboxContext';
+
+const ContactInfoRouter = () => {
+	const room = useOmnichannelRoom();
+	const { closeTab } = useRoomToolbox();
+
+	const liveRoute = useRoute('live');
+	const context = useRouteParameter('context');
+
+	const handleCloseEdit = (): void => liveRoute.push({ id: room._id, tab: 'contact-profile' });
+
+	if (!room.contactId) {
+		return <ContactInfoError onClose={closeTab} />;
+	}
+
+	if (context === 'edit' && room.contactId) {
+		return <EditContactInfoWithData id={room.contactId} onClose={closeTab} onCancel={handleCloseEdit} />;
+	}
+
+	return <ContactInfo id={room.contactId} onClose={closeTab} />;
+};
+
+export default ContactInfoRouter;
diff --git a/apps/meteor/client/views/omnichannel/contactInfo/EditContactInfo.tsx b/apps/meteor/client/views/omnichannel/contactInfo/EditContactInfo.tsx
new file mode 100644
index 000000000000..92ac141af083
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/contactInfo/EditContactInfo.tsx
@@ -0,0 +1,310 @@
+import type { ILivechatContact, Serialized } from '@rocket.chat/core-typings';
+import { Field, FieldLabel, FieldRow, FieldError, TextInput, ButtonGroup, Button, IconButton, Divider } from '@rocket.chat/fuselage';
+import { useUniqueId } from '@rocket.chat/fuselage-hooks';
+import { CustomFieldsForm } from '@rocket.chat/ui-client';
+import { useSetModal } from '@rocket.chat/ui-contexts';
+import type { ReactElement } from 'react';
+import React, { Fragment } from 'react';
+import { Controller, useFieldArray, useForm } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
+
+import AdvancedContactModal from './AdvancedContactModal';
+import { useCreateContact } from './hooks/useCreateContact';
+import { useEditContact } from './hooks/useEditContact';
+import { hasAtLeastOnePermission } from '../../../../app/authorization/client';
+import { validateEmail } from '../../../../lib/emailValidator';
+import {
+	ContextualbarScrollableContent,
+	ContextualbarContent,
+	ContextualbarFooter,
+	ContextualbarHeader,
+	ContextualbarIcon,
+	ContextualbarTitle,
+	ContextualbarClose,
+} from '../../../components/Contextualbar';
+import { useHasLicenseModule } from '../../../hooks/useHasLicenseModule';
+import { ContactManagerInput } from '../additionalForms';
+import { FormSkeleton } from '../directory/components/FormSkeleton';
+import { useCustomFieldsMetadata } from '../directory/hooks/useCustomFieldsMetadata';
+
+type ContactNewEditProps = {
+	contactData?: Serialized<ILivechatContact> | null;
+	onClose: () => void;
+	onCancel: () => void;
+};
+
+type ContactFormData = {
+	name: string;
+	emails: { address: string }[];
+	phones: { phoneNumber: string }[];
+	customFields: Record<any, any>;
+	contactManager: string;
+};
+
+const DEFAULT_VALUES = {
+	name: '',
+	emails: [],
+	phones: [],
+	contactManager: '',
+	customFields: {},
+};
+
+const getInitialValues = (data: ContactNewEditProps['contactData']): ContactFormData => {
+	if (!data) {
+		return DEFAULT_VALUES;
+	}
+
+	const { name, phones, emails, customFields, contactManager } = data ?? {};
+
+	return {
+		name: name ?? '',
+		emails: emails ?? [],
+		phones: phones ?? [],
+		customFields: customFields ?? {},
+		contactManager: contactManager ?? '',
+	};
+};
+
+const validateMultipleFields = (fieldsLength: number, hasLicense: boolean) => fieldsLength >= 1 && !hasLicense;
+
+const EditContactInfo = ({ contactData, onClose, onCancel }: ContactNewEditProps): ReactElement => {
+	const { t } = useTranslation();
+	const setModal = useSetModal();
+
+	const hasLicense = useHasLicenseModule('contact-id-verification') as boolean;
+	const canViewCustomFields = hasAtLeastOnePermission(['view-livechat-room-customfields', 'edit-livechat-room-customfields']);
+
+	const editContact = useEditContact(['current-contacts']);
+	const createContact = useCreateContact(['current-contacts']);
+
+	const handleOpenUpSellModal = () => setModal(<AdvancedContactModal onCancel={() => setModal(null)} />);
+
+	const { data: customFieldsMetadata = [], isInitialLoading: isLoadingCustomFields } = useCustomFieldsMetadata({
+		scope: 'visitor',
+		enabled: canViewCustomFields,
+	});
+
+	const initialValue = getInitialValues(contactData);
+
+	const {
+		formState: { errors, isSubmitting },
+		control,
+		watch,
+		handleSubmit,
+	} = useForm<ContactFormData>({
+		mode: 'onBlur',
+		reValidateMode: 'onBlur',
+		defaultValues: initialValue,
+	});
+
+	const {
+		fields: emailFields,
+		append: appendEmail,
+		remove: removeEmail,
+	} = useFieldArray({
+		control,
+		name: 'emails',
+	});
+
+	const {
+		fields: phoneFields,
+		append: appendPhone,
+		remove: removePhone,
+	} = useFieldArray({
+		control,
+		name: 'phones',
+	});
+
+	const { emails, phones } = watch();
+
+	const validateEmailFormat = async (emailValue: string) => {
+		const currentEmails = emails.map(({ address }) => address);
+		const isDuplicated = currentEmails.filter((email) => email === emailValue).length > 1;
+
+		if (!validateEmail(emailValue)) {
+			return t('error-invalid-email-address');
+		}
+
+		return !isDuplicated ? true : t('Email_already_exists');
+	};
+
+	const validatePhone = async (phoneValue: string) => {
+		const currentPhones = phones.map(({ phoneNumber }) => phoneNumber);
+		const isDuplicated = currentPhones.filter((phone) => phone === phoneValue).length > 1;
+
+		return !isDuplicated ? true : t('Phone_already_exists');
+	};
+
+	const validateName = (v: string): string | boolean => (!v.trim() ? t('Required_field', { field: t('Name') }) : true);
+
+	const handleSave = async (data: ContactFormData): Promise<void> => {
+		const { name, phones, emails, customFields, contactManager } = data;
+
+		const payload = {
+			name,
+			phones: phones.map(({ phoneNumber }) => phoneNumber),
+			emails: emails.map(({ address }) => address),
+			customFields,
+			contactManager,
+		};
+
+		if (contactData) {
+			return editContact.mutate({ contactId: contactData?._id, ...payload });
+		}
+
+		return createContact.mutate(payload);
+	};
+
+	const formId = useUniqueId();
+	const nameField = useUniqueId();
+	const emailField = useUniqueId();
+	const phoneField = useUniqueId();
+
+	if (isLoadingCustomFields) {
+		return (
+			<ContextualbarContent>
+				<FormSkeleton />
+			</ContextualbarContent>
+		);
+	}
+
+	return (
+		<>
+			<ContextualbarHeader>
+				<ContextualbarIcon name={contactData ? 'pencil' : 'user'} />
+				<ContextualbarTitle>{contactData ? t('Edit_Contact_Profile') : t('New_contact')}</ContextualbarTitle>
+				<ContextualbarClose onClick={onClose} />
+			</ContextualbarHeader>
+			<ContextualbarScrollableContent id={formId} is='form' onSubmit={handleSubmit(handleSave)}>
+				<Field>
+					<FieldLabel htmlFor={nameField} required>
+						{t('Name')}
+					</FieldLabel>
+					<FieldRow>
+						<Controller
+							name='name'
+							control={control}
+							rules={{ validate: validateName }}
+							render={({ field }) => (
+								<TextInput
+									id={nameField}
+									{...field}
+									error={errors.name?.message}
+									aria-invalid={errors.name ? 'true' : 'false'}
+									aria-describedby={`${nameField}-error`}
+								/>
+							)}
+						/>
+					</FieldRow>
+					{errors.name && (
+						<FieldError id={`${nameField}-error`} role='alert'>
+							{errors.name.message}
+						</FieldError>
+					)}
+				</Field>
+				<Field>
+					<FieldLabel id={emailField}>{t('Email')}</FieldLabel>
+					{emailFields.map((field, index) => (
+						<Fragment key={field.id}>
+							<FieldRow>
+								<Controller
+									name={`emails.${index}.address`}
+									control={control}
+									rules={{
+										required: t('Required_field', { field: t('Email') }),
+										validate: validateEmailFormat,
+									}}
+									render={({ field }) => (
+										<TextInput
+											{...field}
+											aria-labelledby={emailField}
+											error={errors.emails?.[index]?.address?.message}
+											aria-invalid={errors.emails?.[index]?.address ? 'true' : 'false'}
+											aria-describedby={`${emailField + index}-error`}
+											aria-required='true'
+										/>
+									)}
+								/>
+								<IconButton title={t('Remove_email')} small onClick={() => removeEmail(index)} mis={8} icon='trash' />
+							</FieldRow>
+							{errors.emails?.[index]?.address && (
+								<FieldError id={`${emailField + index}-error`} role='alert'>
+									{errors.emails?.[index]?.address?.message}
+								</FieldError>
+							)}
+						</Fragment>
+					))}
+					<Button
+						mbs={8}
+						onClick={validateMultipleFields(emailFields.length, hasLicense) ? handleOpenUpSellModal : () => appendEmail({ address: '' })}
+					>
+						{t('Add_email')}
+					</Button>
+				</Field>
+				<Field>
+					<FieldLabel id={phoneField}>{t('Phone')}</FieldLabel>
+					{phoneFields.map((field, index) => (
+						<Fragment key={field.id}>
+							<FieldRow>
+								<Controller
+									name={`phones.${index}.phoneNumber`}
+									control={control}
+									rules={{
+										required: t('Required_field', { field: t('Phone') }),
+										validate: validatePhone,
+									}}
+									render={({ field }) => (
+										<TextInput
+											{...field}
+											aria-labelledby={phoneField}
+											error={errors.phones?.[index]?.phoneNumber?.message}
+											aria-invalid={errors.phones?.[index]?.phoneNumber ? 'true' : 'false'}
+											aria-describedby={`${phoneField + index}-error`}
+											aria-required='true'
+										/>
+									)}
+								/>
+								<IconButton title={t('Remove_phone')} small onClick={() => removePhone(index)} mis={8} icon='trash' />
+							</FieldRow>
+							{errors.phones?.[index]?.phoneNumber && (
+								<FieldError id={`${phoneField + index}-error`} role='alert'>
+									{errors.phones?.[index]?.phoneNumber?.message}
+								</FieldError>
+							)}
+						</Fragment>
+					))}
+					<Button
+						mbs={8}
+						onClick={
+							validateMultipleFields(phoneFields.length, hasLicense) ? handleOpenUpSellModal : () => appendPhone({ phoneNumber: '' })
+						}
+					>
+						{t('Add_phone')}
+					</Button>
+				</Field>
+				<Field>
+					<FieldLabel>{t('Contact_Manager')}</FieldLabel>
+					<FieldRow>
+						<Controller
+							name='contactManager'
+							control={control}
+							render={({ field: { value, onChange } }) => <ContactManagerInput value={value} onChange={onChange} />}
+						/>
+					</FieldRow>
+				</Field>
+				<Divider />
+				{canViewCustomFields && <CustomFieldsForm formName='customFields' formControl={control} metadata={customFieldsMetadata} />}
+			</ContextualbarScrollableContent>
+			<ContextualbarFooter>
+				<ButtonGroup stretch>
+					<Button onClick={onCancel}>{t('Cancel')}</Button>
+					<Button type='submit' form={formId} loading={isSubmitting} primary>
+						{t('Save')}
+					</Button>
+				</ButtonGroup>
+			</ContextualbarFooter>
+		</>
+	);
+};
+
+export default EditContactInfo;
diff --git a/apps/meteor/client/views/omnichannel/contactInfo/EditContactInfoWithData.tsx b/apps/meteor/client/views/omnichannel/contactInfo/EditContactInfoWithData.tsx
new file mode 100644
index 000000000000..e069790596e4
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/contactInfo/EditContactInfoWithData.tsx
@@ -0,0 +1,35 @@
+import { ContextualbarContent } from '@rocket.chat/fuselage';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
+import { useQuery } from '@tanstack/react-query';
+import React from 'react';
+
+import ContactInfoError from './ContactInfoError';
+import EditContactInfo from './EditContactInfo';
+import { FormSkeleton } from '../directory/components/FormSkeleton';
+
+type EditContactInfoWithDataProps = {
+	id: string;
+	onClose: () => void;
+	onCancel: () => void;
+};
+
+const EditContactInfoWithData = ({ id, onClose, onCancel }: EditContactInfoWithDataProps) => {
+	const getContactEndpoint = useEndpoint('GET', '/v1/omnichannel/contacts.get');
+	const { data, isLoading, isError } = useQuery(['getContactById', id], async () => getContactEndpoint({ contactId: id }));
+
+	if (isLoading) {
+		return (
+			<ContextualbarContent>
+				<FormSkeleton />
+			</ContextualbarContent>
+		);
+	}
+
+	if (isError) {
+		return <ContactInfoError onClose={onClose} />;
+	}
+
+	return <EditContactInfo contactData={data.contact} onClose={onClose} onCancel={onCancel} />;
+};
+
+export default EditContactInfoWithData;
diff --git a/apps/meteor/client/views/omnichannel/contactInfo/hooks/useCreateContact.ts b/apps/meteor/client/views/omnichannel/contactInfo/hooks/useCreateContact.ts
new file mode 100644
index 000000000000..a285c600d649
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/contactInfo/hooks/useCreateContact.ts
@@ -0,0 +1,26 @@
+import { useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
+import type { QueryKey } from '@tanstack/react-query';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { useTranslation } from 'react-i18next';
+
+import { useContactRoute } from '../../hooks/useContactRoute';
+
+export const useCreateContact = (invalidateQueries: QueryKey) => {
+	const { t } = useTranslation();
+	const createContact = useEndpoint('POST', '/v1/omnichannel/contacts');
+	const dispatchToastMessage = useToastMessageDispatch();
+	const queryClient = useQueryClient();
+	const handleNavigate = useContactRoute();
+
+	return useMutation({
+		mutationFn: createContact,
+		onSuccess: async ({ contactId }) => {
+			handleNavigate({ context: 'details', id: contactId });
+			dispatchToastMessage({ type: 'success', message: t('Contact_has_been_created') });
+			await queryClient.invalidateQueries({ queryKey: invalidateQueries });
+		},
+		onError: (error) => {
+			dispatchToastMessage({ type: 'error', message: error });
+		},
+	});
+};
diff --git a/apps/meteor/client/views/omnichannel/contactInfo/hooks/useCustomFieldsQuery.ts b/apps/meteor/client/views/omnichannel/contactInfo/hooks/useCustomFieldsQuery.ts
new file mode 100644
index 000000000000..96dd27a6d07c
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/contactInfo/hooks/useCustomFieldsQuery.ts
@@ -0,0 +1,8 @@
+import { useEndpoint } from '@rocket.chat/ui-contexts';
+import { useQuery } from '@tanstack/react-query';
+
+// TODO: Unify this hook with all the other with the same proposal
+export const useCustomFieldsQuery = () => {
+	const getCustomFields = useEndpoint('GET', '/v1/livechat/custom-fields');
+	return useQuery(['/v1/livechat/custom-fields'], async () => getCustomFields());
+};
diff --git a/apps/meteor/client/views/omnichannel/contactInfo/hooks/useEditContact.ts b/apps/meteor/client/views/omnichannel/contactInfo/hooks/useEditContact.ts
new file mode 100644
index 000000000000..3a033ed68f9c
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/contactInfo/hooks/useEditContact.ts
@@ -0,0 +1,26 @@
+import { useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
+import type { QueryKey } from '@tanstack/react-query';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { useTranslation } from 'react-i18next';
+
+import { useContactRoute } from '../../hooks/useContactRoute';
+
+export const useEditContact = (invalidateQueries?: QueryKey) => {
+	const { t } = useTranslation();
+	const updateContact = useEndpoint('POST', '/v1/omnichannel/contacts.update');
+	const dispatchToastMessage = useToastMessageDispatch();
+	const queryClient = useQueryClient();
+	const handleNavigate = useContactRoute();
+
+	return useMutation({
+		mutationFn: updateContact,
+		onSuccess: async ({ contact }) => {
+			handleNavigate({ context: 'details', id: contact?._id });
+			dispatchToastMessage({ type: 'success', message: t('Contact_has_been_updated') });
+			await queryClient.invalidateQueries({ queryKey: invalidateQueries });
+		},
+		onError: (error) => {
+			dispatchToastMessage({ type: 'error', message: error });
+		},
+	});
+};
diff --git a/apps/meteor/client/views/omnichannel/contactInfo/hooks/useValidCustomFields.ts b/apps/meteor/client/views/omnichannel/contactInfo/hooks/useValidCustomFields.ts
new file mode 100644
index 000000000000..c2ede8837943
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/contactInfo/hooks/useValidCustomFields.ts
@@ -0,0 +1,24 @@
+import { usePermission } from '@rocket.chat/ui-contexts';
+import { useMemo } from 'react';
+
+import { useCustomFieldsQuery } from './useCustomFieldsQuery';
+
+const checkIsVisibleAndScopeVisitor = (key: string, customFields: Record<string, string | unknown>[]) => {
+	const field = customFields?.find(({ _id }) => _id === key);
+	return field?.visibility === 'visible' && field?.scope === 'visitor';
+};
+
+export const useValidCustomFields = (userCustomFields: Record<string, string | unknown> | undefined) => {
+	const { data, isError } = useCustomFieldsQuery();
+	const canViewCustomFields = usePermission('view-livechat-room-customfields');
+
+	const customFieldEntries = useMemo(() => {
+		if (!canViewCustomFields || !userCustomFields || !data?.customFields || isError) {
+			return [];
+		}
+
+		return Object.entries(userCustomFields).filter(([key, value]) => checkIsVisibleAndScopeVisitor(key, data?.customFields) && value);
+	}, [data?.customFields, userCustomFields, canViewCustomFields, isError]);
+
+	return customFieldEntries;
+};
diff --git a/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoChannels/BlockChannelModal.tsx b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoChannels/BlockChannelModal.tsx
new file mode 100644
index 000000000000..0e4a614191e6
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoChannels/BlockChannelModal.tsx
@@ -0,0 +1,22 @@
+import { Box } from '@rocket.chat/fuselage';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+
+import GenericModal from '../../../../../components/GenericModal';
+
+type BlockChannelModalProps = {
+	onCancel: () => void;
+	onConfirm: () => void;
+};
+
+const BlockChannelModal = ({ onCancel, onConfirm }: BlockChannelModalProps) => {
+	const { t } = useTranslation();
+
+	return (
+		<GenericModal variant='danger' icon='ban' title={t('Block_channel')} confirmText={t('Block')} onConfirm={onConfirm} onCancel={onCancel}>
+			<Box>{t('Block_channel_description')}</Box>
+		</GenericModal>
+	);
+};
+
+export default BlockChannelModal;
diff --git a/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoChannels/ContactInfoChannels.tsx b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoChannels/ContactInfoChannels.tsx
new file mode 100644
index 000000000000..18b0634a3bec
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoChannels/ContactInfoChannels.tsx
@@ -0,0 +1,69 @@
+import type { ILivechatContact } from '@rocket.chat/core-typings';
+import { Box, States, StatesIcon, StatesTitle, Throbber } from '@rocket.chat/fuselage';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
+import { useQuery } from '@tanstack/react-query';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import { Virtuoso } from 'react-virtuoso';
+
+import ContactInfoChannelsItem from './ContactInfoChannelsItem';
+import { ContextualbarContent, ContextualbarEmptyContent } from '../../../../../components/Contextualbar';
+import { VirtuosoScrollbars } from '../../../../../components/CustomScrollbars';
+
+type ContactInfoChannelsProps = {
+	contactId: ILivechatContact['_id'];
+};
+
+const ContactInfoChannels = ({ contactId }: ContactInfoChannelsProps) => {
+	const { t } = useTranslation();
+
+	const getContactChannels = useEndpoint('GET', '/v1/omnichannel/contacts.channels');
+	const { data, isError, isLoading } = useQuery(['getContactChannels', contactId], () => getContactChannels({ contactId }));
+
+	if (isLoading) {
+		return (
+			<ContextualbarContent>
+				<Box pb={12}>
+					<Throbber size='x12' />
+				</Box>
+			</ContextualbarContent>
+		);
+	}
+
+	if (isError) {
+		return (
+			<ContextualbarContent paddingInline={0}>
+				<States>
+					<StatesIcon name='warning' variation='danger' />
+					<StatesTitle>{t('Something_went_wrong')}</StatesTitle>
+				</States>
+			</ContextualbarContent>
+		);
+	}
+
+	return (
+		<ContextualbarContent paddingInline={0}>
+			{data.channels?.length === 0 && (
+				<ContextualbarEmptyContent icon='balloon' title={t('No_channels_yet')} subtitle={t('No_channels_yet_description')} />
+			)}
+			{data.channels && data.channels.length > 0 && (
+				<>
+					<Box is='span' fontScale='p2' pbs={24} pis={24} mbe={8}>
+						{t('Last_contacts')}
+					</Box>
+					<Box role='list' flexGrow={1} flexShrink={1} overflow='hidden' display='flex'>
+						<Virtuoso
+							totalCount={data.channels.length}
+							overscan={25}
+							data={data?.channels}
+							components={{ Scroller: VirtuosoScrollbars }}
+							itemContent={(index, data) => <ContactInfoChannelsItem key={index} {...data} />}
+						/>
+					</Box>
+				</>
+			)}
+		</ContextualbarContent>
+	);
+};
+
+export default ContactInfoChannels;
diff --git a/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoChannels/ContactInfoChannelsItem.tsx b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoChannels/ContactInfoChannelsItem.tsx
new file mode 100644
index 000000000000..a221a34a618d
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoChannels/ContactInfoChannelsItem.tsx
@@ -0,0 +1,77 @@
+import type { ILivechatContactChannel, Serialized } from '@rocket.chat/core-typings';
+import { css } from '@rocket.chat/css-in-js';
+import { Box, Palette } from '@rocket.chat/fuselage';
+import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
+import { GenericMenu } from '@rocket.chat/ui-client';
+import React, { useState } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { useBlockChannel } from './useBlockChannel';
+import { OmnichannelRoomIcon } from '../../../../../components/RoomIcon/OmnichannelRoomIcon';
+import { useTimeFromNow } from '../../../../../hooks/useTimeFromNow';
+import { useOmnichannelSource } from '../../../hooks/useOmnichannelSource';
+
+type ContactInfoChannelsItemProps = Serialized<ILivechatContactChannel>;
+
+const ContactInfoChannelsItem = ({ visitor, details, blocked, lastChat }: ContactInfoChannelsItemProps) => {
+	const { t } = useTranslation();
+	const { getSourceLabel, getSourceName } = useOmnichannelSource();
+	const getTimeFromNow = useTimeFromNow(true);
+
+	const [showButton, setShowButton] = useState(false);
+	const handleBlockContact = useBlockChannel({ association: visitor, blocked });
+
+	const customClass = css`
+		&:hover,
+		&:focus {
+			background: ${Palette.surface['surface-hover']};
+		}
+	`;
+
+	const menuItems: GenericMenuItemProps[] = [
+		{
+			id: 'block',
+			icon: 'ban',
+			content: blocked ? t('Unblock') : t('Block'),
+			variant: 'danger',
+			onClick: handleBlockContact,
+		},
+	];
+
+	return (
+		<Box
+			tabIndex={0}
+			borderBlockEndWidth={1}
+			borderBlockEndColor='stroke-extra-light'
+			borderBlockEndStyle='solid'
+			className={['rcx-box--animated', customClass]}
+			pi={24}
+			pb={12}
+			display='flex'
+			flexDirection='column'
+			onFocus={() => setShowButton(true)}
+			onPointerEnter={() => setShowButton(true)}
+			onPointerLeave={() => setShowButton(false)}
+		>
+			<Box display='flex' alignItems='center'>
+				{details && <OmnichannelRoomIcon source={details} size='x18' placement='default' />}
+				{details && (
+					<Box mi={4} fontScale='p2b'>
+						{getSourceName(details)} {blocked && `(${t('Blocked')})`}
+					</Box>
+				)}
+				{lastChat && (
+					<Box mis={4} fontScale='c1'>
+						{getTimeFromNow(lastChat.ts)}
+					</Box>
+				)}
+			</Box>
+			<Box minHeight='x24' alignItems='center' mbs={4} display='flex' justifyContent='space-between'>
+				<Box>{getSourceLabel(details)}</Box>
+				{showButton && <GenericMenu detached title={t('Options')} sections={[{ items: menuItems }]} tiny />}
+			</Box>
+		</Box>
+	);
+};
+
+export default ContactInfoChannelsItem;
diff --git a/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoChannels/index.ts b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoChannels/index.ts
new file mode 100644
index 000000000000..5af62e1fb624
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoChannels/index.ts
@@ -0,0 +1 @@
+export { default } from './ContactInfoChannels';
diff --git a/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoChannels/useBlockChannel.tsx b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoChannels/useBlockChannel.tsx
new file mode 100644
index 000000000000..ca262834ebbd
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoChannels/useBlockChannel.tsx
@@ -0,0 +1,52 @@
+import type { ILivechatContactVisitorAssociation } from '@rocket.chat/core-typings';
+import { useEndpoint, useSetModal, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
+import { useQueryClient } from '@tanstack/react-query';
+import React, { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import BlockChannelModal from './BlockChannelModal';
+import { useHasLicenseModule } from '../../../../../hooks/useHasLicenseModule';
+import AdvancedContactModal from '../../AdvancedContactModal';
+
+export const useBlockChannel = ({ blocked, association }: { blocked: boolean; association: ILivechatContactVisitorAssociation }) => {
+	const { t } = useTranslation();
+	const setModal = useSetModal();
+	const dispatchToastMessage = useToastMessageDispatch();
+	const hasLicense = useHasLicenseModule('contact-id-verification') as boolean;
+	const queryClient = useQueryClient();
+
+	const blockContact = useEndpoint('POST', '/v1/omnichannel/contacts.block');
+	const unblockContact = useEndpoint('POST', '/v1/omnichannel/contacts.unblock');
+
+	const handleUnblock = useCallback(async () => {
+		try {
+			await unblockContact({ visitor: association });
+			dispatchToastMessage({ type: 'success', message: t('Contact_unblocked') });
+			queryClient.invalidateQueries(['getContactById']);
+		} catch (error) {
+			dispatchToastMessage({ type: 'error', message: error });
+		}
+	}, [association, dispatchToastMessage, queryClient, t, unblockContact]);
+
+	const handleBlock = useCallback(() => {
+		if (!hasLicense) {
+			return setModal(<AdvancedContactModal onCancel={() => setModal(null)} />);
+		}
+
+		const blockAction = async () => {
+			try {
+				await blockContact({ visitor: association });
+				dispatchToastMessage({ type: 'success', message: t('Contact_blocked') });
+				queryClient.invalidateQueries(['getContactById']);
+			} catch (error) {
+				dispatchToastMessage({ type: 'error', message: error });
+			} finally {
+				setModal(null);
+			}
+		};
+
+		setModal(<BlockChannelModal onCancel={() => setModal(null)} onConfirm={blockAction} />);
+	}, [association, blockContact, dispatchToastMessage, hasLicense, queryClient, setModal, t]);
+
+	return blocked ? handleUnblock : handleBlock;
+};
diff --git a/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoDetails/ContactInfoCallButton.tsx b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoDetails/ContactInfoCallButton.tsx
new file mode 100644
index 000000000000..acd109c7ab3e
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoDetails/ContactInfoCallButton.tsx
@@ -0,0 +1,27 @@
+import { IconButton } from '@rocket.chat/fuselage';
+// import { useTranslation } from '@rocket.chat/ui-contexts';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { useVoipOutboundStates } from '../../../../../contexts/CallContext';
+import { useDialModal } from '../../../../../hooks/useDialModal';
+
+type ContactInfoCallButtonProps = { phoneNumber: string };
+
+const ContactInfoCallButton = ({ phoneNumber }: ContactInfoCallButtonProps) => {
+	const { t } = useTranslation();
+	const { openDialModal } = useDialModal();
+	const { outBoundCallsAllowed, outBoundCallsEnabledForUser } = useVoipOutboundStates();
+
+	return (
+		<IconButton
+			onClick={() => openDialModal({ initialValue: phoneNumber })}
+			tiny
+			disabled={!outBoundCallsEnabledForUser || !phoneNumber}
+			title={outBoundCallsAllowed ? t('Call_number') : t('Call_number_premium_only')}
+			icon='dialpad'
+		/>
+	);
+};
+
+export default ContactInfoCallButton;
diff --git a/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoDetails/ContactInfoDetails.tsx b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoDetails/ContactInfoDetails.tsx
new file mode 100644
index 000000000000..f531f88097d1
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoDetails/ContactInfoDetails.tsx
@@ -0,0 +1,49 @@
+import { Divider, Margins } from '@rocket.chat/fuselage';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+
+import ContactInfoDetailsGroup from './ContactInfoDetailsGroup';
+import ContactManagerInfo from './ContactManagerInfo';
+import { ContextualbarScrollableContent } from '../../../../../components/Contextualbar';
+import { useFormatDate } from '../../../../../hooks/useFormatDate';
+import CustomField from '../../../components/CustomField';
+import Field from '../../../components/Field';
+import Info from '../../../components/Info';
+import Label from '../../../components/Label';
+
+type ContactInfoDetailsProps = {
+	emails?: string[];
+	phones?: string[];
+	createdAt: string;
+	customFieldEntries: [string, string | unknown][];
+	contactManager?: string;
+};
+
+const ContactInfoDetails = ({ emails, phones, createdAt, customFieldEntries, contactManager }: ContactInfoDetailsProps) => {
+	const { t } = useTranslation();
+	const formatDate = useFormatDate();
+
+	return (
+		<ContextualbarScrollableContent>
+			{emails?.length ? <ContactInfoDetailsGroup type='email' label={t('Email')} values={emails} /> : null}
+			{phones?.length ? <ContactInfoDetailsGroup type='phone' label={t('Phone_number')} values={phones} /> : null}
+			{contactManager && <ContactManagerInfo userId={contactManager} />}
+			<Margins block={4}>
+				{createdAt && (
+					<Field>
+						<Label>{t('Created_at')}</Label>
+						<Info>{formatDate(createdAt)}</Info>
+					</Field>
+				)}
+				{customFieldEntries.length > 0 && (
+					<>
+						<Divider mi={-24} />
+						{customFieldEntries?.map(([key, value]) => <CustomField key={key} id={key} value={value as string} />)}
+					</>
+				)}
+			</Margins>
+		</ContextualbarScrollableContent>
+	);
+};
+
+export default ContactInfoDetails;
diff --git a/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoDetails/ContactInfoDetailsEntry.tsx b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoDetails/ContactInfoDetailsEntry.tsx
new file mode 100644
index 000000000000..c2fbc720f7dc
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoDetails/ContactInfoDetailsEntry.tsx
@@ -0,0 +1,38 @@
+import type { IconProps } from '@rocket.chat/fuselage';
+import { Box, Icon, IconButton } from '@rocket.chat/fuselage';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+
+import ContactInfoCallButton from './ContactInfoCallButton';
+import { useIsCallReady } from '../../../../../contexts/CallContext';
+import useClipboardWithToast from '../../../../../hooks/useClipboardWithToast';
+
+type ContactInfoDetailsEntryProps = {
+	icon: IconProps['name'];
+	isPhone: boolean;
+	value: string;
+};
+
+const ContactInfoDetailsEntry = ({ icon, isPhone, value }: ContactInfoDetailsEntryProps) => {
+	const { t } = useTranslation();
+	const { copy } = useClipboardWithToast(value);
+
+	const isCallReady = useIsCallReady();
+
+	return (
+		<Box display='flex' alignItems='center'>
+			<Icon size='x18' name={icon} />
+			<Box withTruncatedText display='flex' flexGrow={1} alignItems='center' justifyContent='space-between'>
+				<Box is='p' fontScale='p2' withTruncatedText data-type={isPhone ? 'phone' : 'email'} mi={4}>
+					{value}
+				</Box>
+				<Box display='flex' alignItems='center'>
+					{isCallReady && isPhone && <ContactInfoCallButton phoneNumber={value} />}
+					<IconButton onClick={() => copy()} tiny title={t('Copy')} icon='copy' />
+				</Box>
+			</Box>
+		</Box>
+	);
+};
+
+export default ContactInfoDetailsEntry;
diff --git a/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoDetails/ContactInfoDetailsGroup.tsx b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoDetails/ContactInfoDetailsGroup.tsx
new file mode 100644
index 000000000000..107dc987d2d3
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoDetails/ContactInfoDetailsGroup.tsx
@@ -0,0 +1,31 @@
+import { Box } from '@rocket.chat/fuselage';
+import React from 'react';
+
+import ContactInfoDetailsEntry from './ContactInfoDetailsEntry';
+import { parseOutboundPhoneNumber } from '../../../../../lib/voip/parseOutboundPhoneNumber';
+
+type ContactInfoDetailsGroupProps = {
+	type: 'phone' | 'email';
+	label: string;
+	values: string[];
+};
+
+const ContactInfoDetailsGroup = ({ type, label, values }: ContactInfoDetailsGroupProps) => {
+	return (
+		<Box>
+			<Box mbe={4} fontScale='p2'>
+				{label}
+			</Box>
+			{values.map((value, index) => (
+				<ContactInfoDetailsEntry
+					key={index}
+					isPhone={type === 'phone'}
+					icon={type === 'phone' ? 'phone' : 'mail'}
+					value={type === 'phone' ? parseOutboundPhoneNumber(value) : value}
+				/>
+			))}
+		</Box>
+	);
+};
+
+export default ContactInfoDetailsGroup;
diff --git a/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoDetails/ContactManagerInfo.tsx b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoDetails/ContactManagerInfo.tsx
new file mode 100644
index 000000000000..ff74d6d2d7be
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoDetails/ContactManagerInfo.tsx
@@ -0,0 +1,39 @@
+import { Box, Skeleton } from '@rocket.chat/fuselage';
+import { UserAvatar } from '@rocket.chat/ui-avatar';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
+import { useQuery } from '@tanstack/react-query';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { UserStatus } from '../../../../../components/UserStatus';
+
+type ContactManagerInfoProps = { userId: string };
+
+const ContactManagerInfo = ({ userId }: ContactManagerInfoProps) => {
+	const { t } = useTranslation();
+
+	const getContactManagerByUsername = useEndpoint('GET', '/v1/users.info');
+	const { data, isLoading, isError } = useQuery(['getContactManagerByUserId', userId], async () => getContactManagerByUsername({ userId }));
+
+	if (isError) {
+		return null;
+	}
+
+	return (
+		<Box>
+			<Box mbe={4}>{t('Contact_Manager')}</Box>
+			{isLoading && <Skeleton />}
+			{!isLoading && (
+				<Box display='flex' alignItems='center'>
+					{data.user.username && <UserAvatar size='x18' username={data.user.username} />}
+					<Box mi={8}>
+						<UserStatus status={data.user.status} />
+					</Box>
+					<Box fontScale='p2'>{data.user.name}</Box>
+				</Box>
+			)}
+		</Box>
+	);
+};
+
+export default ContactManagerInfo;
diff --git a/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoDetails/index.ts b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoDetails/index.ts
new file mode 100644
index 000000000000..10307cc890f5
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoDetails/index.ts
@@ -0,0 +1 @@
+export { default } from './ContactInfoDetails';
diff --git a/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoHistory/ContactInfoHistory.tsx b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoHistory/ContactInfoHistory.tsx
new file mode 100644
index 000000000000..a82ac58920a4
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoHistory/ContactInfoHistory.tsx
@@ -0,0 +1,129 @@
+import type { ILivechatContact, Serialized } from '@rocket.chat/core-typings';
+import { OmnichannelSourceType } from '@rocket.chat/core-typings';
+import { Box, Margins, Throbber, States, StatesIcon, StatesTitle, Select } from '@rocket.chat/fuselage';
+import { useLocalStorage } from '@rocket.chat/fuselage-hooks';
+import { useEndpoint, useSetModal } from '@rocket.chat/ui-contexts';
+import { useQuery } from '@tanstack/react-query';
+import type { Key } from 'react';
+import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+import { Virtuoso } from 'react-virtuoso';
+
+import ContactInfoHistoryItem from './ContactInfoHistoryItem';
+import { ContextualbarContent, ContextualbarEmptyContent } from '../../../../../components/Contextualbar';
+import { VirtuosoScrollbars } from '../../../../../components/CustomScrollbars';
+import { useHasLicenseModule } from '../../../../../hooks/useHasLicenseModule';
+import { useOmnichannelSource } from '../../../hooks/useOmnichannelSource';
+import AdvancedContactModal from '../../AdvancedContactModal';
+
+type ContactInfoHistoryProps = {
+	contact: Serialized<ILivechatContact>;
+	setChatId: (chatId: string) => void;
+};
+
+const isFilterBlocked = (hasLicense: boolean, fieldValue: Key) => !hasLicense && fieldValue !== 'all';
+
+const ContactInfoHistory = ({ contact, setChatId }: ContactInfoHistoryProps) => {
+	const { t } = useTranslation();
+	const setModal = useSetModal();
+	const [storedType, setStoredType] = useLocalStorage<string>('contact-history-type', 'all');
+
+	const hasLicense = useHasLicenseModule('contact-id-verification') as boolean;
+	const type = isFilterBlocked(hasLicense, storedType) ? 'all' : storedType;
+
+	const { getSourceName } = useOmnichannelSource();
+
+	const getContactHistory = useEndpoint('GET', '/v1/omnichannel/contacts.history');
+	const { data, isLoading, isError } = useQuery(['getContactHistory', contact._id, type], () =>
+		getContactHistory({ contactId: contact._id, source: type === 'all' ? undefined : type }),
+	);
+
+	const handleChangeFilter = (value: Key) => {
+		if (isFilterBlocked(hasLicense, value)) {
+			return setModal(<AdvancedContactModal onCancel={() => setModal(null)} />);
+		}
+
+		setStoredType(value as string);
+	};
+
+	const historyFilterOptions: [string, string][] = useMemo(
+		() =>
+			Object.values(OmnichannelSourceType).reduce(
+				(acc, cv) => {
+					let sourceName;
+					const hasSourceType = contact.channels?.find((item) => {
+						sourceName = getSourceName(item.details, false);
+						return item.details.type === cv;
+					});
+
+					if (hasSourceType && sourceName) {
+						acc.push([cv, sourceName]);
+					}
+
+					return acc;
+				},
+				[['all', t('All')]],
+			),
+		[contact.channels, getSourceName, t],
+	);
+
+	return (
+		<ContextualbarContent paddingInline={0}>
+			<Box
+				display='flex'
+				flexDirection='row'
+				p={24}
+				borderBlockEndWidth='default'
+				borderBlockEndStyle='solid'
+				borderBlockEndColor='extra-light'
+				flexShrink={0}
+			>
+				<Box display='flex' flexDirection='row' flexGrow={1} mi='neg-x4'>
+					<Margins inline={4}>
+						<Select
+							value={type}
+							onChange={handleChangeFilter}
+							placeholder={t('Filter')}
+							options={historyFilterOptions}
+							disabled={type === 'all' && data?.history.length === 0}
+						/>
+					</Margins>
+				</Box>
+			</Box>
+			{isLoading && (
+				<Box pi={24} pb={12}>
+					<Throbber size='x12' />
+				</Box>
+			)}
+			{isError && (
+				<States>
+					<StatesIcon name='warning' variation='danger' />
+					<StatesTitle>{t('Something_went_wrong')}</StatesTitle>
+				</States>
+			)}
+			{data?.history.length === 0 && (
+				<ContextualbarEmptyContent icon='history' title={t('No_history_yet')} subtitle={t('No_history_yet_description')} />
+			)}
+			{!isError && data?.history && data.history.length > 0 && (
+				<>
+					<Box pi={24} pb={12}>
+						<Box is='span' color='hint' fontScale='p2'>
+							{t('Showing_current_of_total', { current: data?.history.length, total: data?.total })}
+						</Box>
+					</Box>
+					<Box role='list' flexGrow={1} flexShrink={1} overflow='hidden' display='flex'>
+						<Virtuoso
+							totalCount={data.history.length}
+							overscan={25}
+							data={data?.history}
+							components={{ Scroller: VirtuosoScrollbars }}
+							itemContent={(index, data) => <ContactInfoHistoryItem key={index} onClick={() => setChatId(data._id)} {...data} />}
+						/>
+					</Box>
+				</>
+			)}
+		</ContextualbarContent>
+	);
+};
+
+export default ContactInfoHistory;
diff --git a/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoHistory/ContactInfoHistoryItem.tsx b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoHistory/ContactInfoHistoryItem.tsx
new file mode 100644
index 000000000000..ef588b9f982d
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoHistory/ContactInfoHistoryItem.tsx
@@ -0,0 +1,104 @@
+import type { Serialized } from '@rocket.chat/core-typings';
+import { css } from '@rocket.chat/css-in-js';
+import {
+	Box,
+	Palette,
+	IconButton,
+	Icon,
+	MessageGenericPreview,
+	MessageGenericPreviewContent,
+	MessageGenericPreviewDescription,
+	MessageGenericPreviewTitle,
+} from '@rocket.chat/fuselage';
+import type { ContactSearchChatsResult } from '@rocket.chat/rest-typings';
+import { useSetModal } from '@rocket.chat/ui-contexts';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { OmnichannelRoomIcon } from '../../../../../components/RoomIcon/OmnichannelRoomIcon';
+import { useHasLicenseModule } from '../../../../../hooks/useHasLicenseModule';
+import { usePreventPropagation } from '../../../../../hooks/usePreventPropagation';
+import { useTimeFromNow } from '../../../../../hooks/useTimeFromNow';
+import { useOmnichannelSource } from '../../../hooks/useOmnichannelSource';
+import AdvancedContactModal from '../../AdvancedContactModal';
+
+type ContactInfoHistoryItemProps = Serialized<ContactSearchChatsResult> & {
+	onClick: () => void;
+};
+
+const ContactInfoHistoryItem = ({ source, lastMessage, verified, onClick }: ContactInfoHistoryItemProps) => {
+	const { t } = useTranslation();
+	const getTimeFromNow = useTimeFromNow(true);
+	const setModal = useSetModal();
+	const preventPropagation = usePreventPropagation();
+	const hasLicense = useHasLicenseModule('contact-id-verification') as boolean;
+	const { getSourceName } = useOmnichannelSource();
+
+	const customClass = css`
+		&:hover {
+			cursor: pointer;
+		}
+
+		&:hover,
+		&:focus {
+			background: ${Palette.surface['surface-hover']};
+		}
+	`;
+
+	return (
+		<Box
+			tabIndex={0}
+			role='listitem'
+			aria-label={getSourceName(source)}
+			borderBlockEndWidth={1}
+			borderBlockEndColor='stroke-extra-light'
+			borderBlockEndStyle='solid'
+			className={['rcx-box--animated', customClass]}
+			pi={24}
+			pb={12}
+			display='flex'
+			flexDirection='column'
+			onClick={onClick}
+		>
+			<Box display='flex' justifyContent='space-between'>
+				<Box display='flex' alignItems='center'>
+					{source && <OmnichannelRoomIcon source={source} size='x18' placement='default' />}
+					{source && (
+						<Box mi={4} fontScale='p2b'>
+							{getSourceName(source)}
+						</Box>
+					)}
+					{lastMessage && (
+						<Box mis={4} fontScale='c1'>
+							{getTimeFromNow(lastMessage.ts)}
+						</Box>
+					)}
+				</Box>
+				<Box mis={4} is='span' onClick={preventPropagation}>
+					{hasLicense && verified ? (
+						<Icon title={t('Verified')} mis={4} size='x16' name='success-circle' color='stroke-highlight' />
+					) : (
+						<IconButton
+							title={t('Unverified')}
+							onClick={() => setModal(<AdvancedContactModal onCancel={() => setModal(null)} />)}
+							icon='question-mark'
+							tiny
+						/>
+					)}
+				</Box>
+			</Box>
+			{lastMessage?.msg.trim() && (
+				<Box width='full' mbs={8}>
+					<MessageGenericPreview>
+						<MessageGenericPreviewContent>
+							<MessageGenericPreviewTitle>{t('Closing_chat_message')}:</MessageGenericPreviewTitle>
+							<MessageGenericPreviewDescription clamp>{lastMessage?.msg}</MessageGenericPreviewDescription>
+						</MessageGenericPreviewContent>
+					</MessageGenericPreview>
+				</Box>
+			)}
+		</Box>
+	);
+};
+
+export default ContactInfoHistoryItem;
diff --git a/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoHistory/ContactInfoHistoryMessages.tsx b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoHistory/ContactInfoHistoryMessages.tsx
new file mode 100644
index 000000000000..568a20d7c311
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoHistory/ContactInfoHistoryMessages.tsx
@@ -0,0 +1,142 @@
+import {
+	Box,
+	Button,
+	ButtonGroup,
+	ContextualbarFooter,
+	Icon,
+	IconButton,
+	Margins,
+	States,
+	StatesIcon,
+	StatesSubtitle,
+	StatesTitle,
+	TextInput,
+	Throbber,
+} from '@rocket.chat/fuselage';
+import { useDebouncedValue, useResizeObserver } from '@rocket.chat/fuselage-hooks';
+import { useSetting, useUserPreference, useUserId } from '@rocket.chat/ui-contexts';
+import type { ChangeEvent, ReactElement } from 'react';
+import React, { useMemo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { Virtuoso } from 'react-virtuoso';
+
+import { ContextualbarContent, ContextualbarEmptyContent } from '../../../../../components/Contextualbar';
+import { VirtuosoScrollbars } from '../../../../../components/CustomScrollbars';
+import { useRecordList } from '../../../../../hooks/lists/useRecordList';
+import { AsyncStatePhase } from '../../../../../lib/asyncState';
+import { isMessageNewDay } from '../../../../room/MessageList/lib/isMessageNewDay';
+import { isMessageSequential } from '../../../../room/MessageList/lib/isMessageSequential';
+import ContactHistoryMessage from '../../../contactHistory/MessageList/ContactHistoryMessage';
+import { useHistoryMessageList } from '../../../contactHistory/MessageList/useHistoryMessageList';
+
+type ContactHistoryMessagesListProps = {
+	chatId: string;
+	onBack: () => void;
+	onOpenRoom?: () => void;
+};
+
+const ContactInfoHistoryMessages = ({ chatId, onBack, onOpenRoom }: ContactHistoryMessagesListProps) => {
+	const { t } = useTranslation();
+	const [text, setText] = useState('');
+	const showUserAvatar = !!useUserPreference<boolean>('displayAvatars');
+	const userId = useUserId();
+
+	const { ref, contentBoxSize: { inlineSize = 378, blockSize = 1 } = {} } = useResizeObserver<HTMLElement>({
+		debounceDelay: 200,
+	});
+
+	const query = useDebouncedValue(
+		useMemo(() => ({ roomId: chatId, filter: text }), [chatId, text]),
+		500,
+	);
+
+	const { itemsList: messageList, loadMoreItems } = useHistoryMessageList(query, userId);
+
+	const handleSearchChange = (event: ChangeEvent<HTMLInputElement>): void => {
+		setText(event.currentTarget.value);
+	};
+
+	const { phase, error, items: messages, itemCount: totalItemCount } = useRecordList(messageList);
+	const messageGroupingPeriod = Number(useSetting('Message_GroupingPeriod'));
+
+	return (
+		<>
+			<ContextualbarContent paddingInline={0}>
+				<Box
+					display='flex'
+					flexDirection='row'
+					p={24}
+					borderBlockEndWidth='default'
+					borderBlockEndStyle='solid'
+					borderBlockEndColor='extra-light'
+					flexShrink={0}
+				>
+					<Box display='flex' alignItems='center' flexDirection='row' flexGrow={1} mi='neg-x4'>
+						<Margins inline={4}>
+							<TextInput
+								placeholder={t('Search')}
+								value={text}
+								onChange={handleSearchChange}
+								addon={<Icon name='magnifier' size='x20' />}
+							/>
+							<IconButton title={t('Back')} small icon='back' onClick={onBack} />
+						</Margins>
+					</Box>
+				</Box>
+				{phase === AsyncStatePhase.LOADING && (
+					<Box pi={24} pb={12}>
+						<Throbber size='x12' />
+					</Box>
+				)}
+				{error && (
+					<States>
+						<StatesIcon name='warning' variation='danger' />
+						<StatesTitle>{t('Something_went_wrong')}</StatesTitle>
+						<StatesSubtitle>{error.toString()}</StatesSubtitle>
+					</States>
+				)}
+				{phase !== AsyncStatePhase.LOADING && totalItemCount === 0 && <ContextualbarEmptyContent title={t('No_results_found')} />}
+				<Box flexGrow={1} flexShrink={1} overflow='hidden' display='flex' ref={ref}>
+					{!error && totalItemCount > 0 && history.length > 0 && (
+						<Virtuoso
+							totalCount={totalItemCount}
+							initialTopMostItemIndex={{ index: 'LAST' }}
+							followOutput
+							style={{
+								height: blockSize,
+								width: inlineSize,
+							}}
+							endReached={
+								phase === AsyncStatePhase.LOADING
+									? (): void => undefined
+									: (start): void => {
+											loadMoreItems(start, Math.min(50, totalItemCount - start));
+										}
+							}
+							overscan={25}
+							data={messages}
+							components={{ Scroller: VirtuosoScrollbars }}
+							itemContent={(index, data): ReactElement => {
+								const lastMessage = messages[index - 1];
+								const isSequential = isMessageSequential(data, lastMessage, messageGroupingPeriod);
+								const isNewDay = isMessageNewDay(data, lastMessage);
+								return (
+									<ContactHistoryMessage message={data} sequential={isSequential} isNewDay={isNewDay} showUserAvatar={showUserAvatar} />
+								);
+							}}
+						/>
+					)}
+				</Box>
+			</ContextualbarContent>
+			{onOpenRoom && (
+				<ContextualbarFooter>
+					<ButtonGroup stretch>
+						<Button onClick={onOpenRoom}>{t('Open_chat')}</Button>
+					</ButtonGroup>
+				</ContextualbarFooter>
+			)}
+		</>
+	);
+};
+
+export default ContactInfoHistoryMessages;
diff --git a/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoHistory/ContactInfoHistoryRouter.tsx b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoHistory/ContactInfoHistoryRouter.tsx
new file mode 100644
index 000000000000..f763744460b5
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoHistory/ContactInfoHistoryRouter.tsx
@@ -0,0 +1,21 @@
+import type { ILivechatContact, Serialized } from '@rocket.chat/core-typings';
+import { useRouter } from '@rocket.chat/ui-contexts';
+import React, { useState } from 'react';
+
+import ContactInfoHistory from './ContactInfoHistory';
+import ContactInfoHistoryMessages from './ContactInfoHistoryMessages';
+
+const ContactInfoHistoryRouter = ({ contact }: { contact: Serialized<ILivechatContact> }) => {
+	const [chatId, setChatId] = useState<string | undefined>();
+	const { navigate } = useRouter();
+
+	if (chatId) {
+		return (
+			<ContactInfoHistoryMessages chatId={chatId} onBack={() => setChatId(undefined)} onOpenRoom={() => navigate(`/live/${chatId}`)} />
+		);
+	}
+
+	return <ContactInfoHistory contact={contact} setChatId={setChatId} />;
+};
+
+export default ContactInfoHistoryRouter;
diff --git a/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoHistory/index.ts b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoHistory/index.ts
new file mode 100644
index 000000000000..cea83bf02c29
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoHistory/index.ts
@@ -0,0 +1 @@
+export { default } from './ContactInfoHistoryRouter';
diff --git a/apps/meteor/client/views/omnichannel/currentChats/CurrentChatsPage.tsx b/apps/meteor/client/views/omnichannel/currentChats/CurrentChatsPage.tsx
index c439cc838874..928b696f46fc 100644
--- a/apps/meteor/client/views/omnichannel/currentChats/CurrentChatsPage.tsx
+++ b/apps/meteor/client/views/omnichannel/currentChats/CurrentChatsPage.tsx
@@ -1,12 +1,18 @@
 import { Callout, Pagination } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import type { GETLivechatRoomsParams } from '@rocket.chat/rest-typings';
-import { usePermission, useTranslation } from '@rocket.chat/ui-contexts';
+import { usePermission, useRouter } from '@rocket.chat/ui-contexts';
 import { hashQueryKey } from '@tanstack/react-query';
 import moment from 'moment';
 import type { ComponentProps, ReactElement } from 'react';
 import React, { memo, useCallback, useMemo, useState } from 'react';
+import { Trans, useTranslation } from 'react-i18next';
 
+import CustomFieldsList from './CustomFieldsList';
+import FilterByText from './FilterByText';
+import RemoveChatButton from './RemoveChatButton';
+import { useAllCustomFields } from './hooks/useAllCustomFields';
+import { useCurrentChats } from './hooks/useCurrentChats';
 import GenericNoResults from '../../../components/GenericNoResults';
 import {
 	GenericTable,
@@ -24,11 +30,6 @@ import { useIsOverMacLimit } from '../../../hooks/omnichannel/useIsOverMacLimit'
 import { RoomActivityIcon } from '../../../omnichannel/components/RoomActivityIcon';
 import { useOmnichannelPriorities } from '../../../omnichannel/hooks/useOmnichannelPriorities';
 import { PriorityIcon } from '../../../omnichannel/priorities/PriorityIcon';
-import CustomFieldsList from './CustomFieldsList';
-import FilterByText from './FilterByText';
-import RemoveChatButton from './RemoveChatButton';
-import { useAllCustomFields } from './hooks/useAllCustomFields';
-import { useCurrentChats } from './hooks/useCurrentChats';
 
 type DebouncedParams = {
 	fname: string;
@@ -129,7 +130,8 @@ const CurrentChatsPage = ({ id, onRowClick }: { id?: string; onRowClick: (_id: s
 	);
 	const [customFields, setCustomFields] = useState<{ [key: string]: string }>();
 
-	const t = useTranslation();
+	const { t } = useTranslation();
+	const directoryPath = useRouter().buildRoutePath('/omnichannel-directory');
 
 	const canRemoveClosedChats = usePermission('remove-closed-livechat-room');
 	const { enabled: isPriorityEnabled } = useOmnichannelPriorities();
@@ -203,7 +205,11 @@ const CurrentChatsPage = ({ id, onRowClick }: { id?: string; onRowClick: (_id: s
 					<GenericTableCell withTruncatedText data-qa='current-chats-cell-status'>
 						<RoomActivityIcon room={room} /> {getStatusText(open, onHold, !!servedBy?.username)}
 					</GenericTableCell>
-					{canRemoveClosedChats && !open && <RemoveChatButton _id={_id} />}
+					{canRemoveClosedChats && (
+						<GenericTableCell maxHeight='x36' fontScale='p2' color='hint' withTruncatedText data-qa='current-chats-cell-delete'>
+							{!open && <RemoveChatButton _id={_id} />}
+						</GenericTableCell>
+					)}
 				</GenericTableRow>
 			);
 		},
@@ -300,6 +306,12 @@ const CurrentChatsPage = ({ id, onRowClick }: { id?: string; onRowClick: (_id: s
 			<Page>
 				<PageHeader title={t('Current_Chats')} />
 				<PageContent>
+					<Callout type='warning' title={t('This_page_will_be_deprecated_soon')}>
+						<Trans i18nKey='Manage_conversations_in_the_contact_center'>
+							Manage conversations in the
+							<a href={directoryPath}>contact center</a>.
+						</Trans>
+					</Callout>
 					{((isSuccess && data?.rooms.length > 0) || queryHasChanged) && (
 						<FilterByText
 							setFilter={onFilter as ComponentProps<typeof FilterByText>['setFilter']}
diff --git a/apps/meteor/client/views/omnichannel/currentChats/CurrentChatsRoute.tsx b/apps/meteor/client/views/omnichannel/currentChats/CurrentChatsRoute.tsx
index 842a1ad6227d..607cca3f8f3d 100644
--- a/apps/meteor/client/views/omnichannel/currentChats/CurrentChatsRoute.tsx
+++ b/apps/meteor/client/views/omnichannel/currentChats/CurrentChatsRoute.tsx
@@ -3,9 +3,9 @@ import { usePermission, useRouteParameter, useRouter } from '@rocket.chat/ui-con
 import React, { memo } from 'react';
 import type { ReactElement } from 'react';
 
+import CurrentChatsPage from './CurrentChatsPage';
 import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import Chat from '../directory/chats/Chat';
-import CurrentChatsPage from './CurrentChatsPage';
 
 const CurrentChatsRoute = (): ReactElement => {
 	const id = useRouteParameter('id');
diff --git a/apps/meteor/client/views/omnichannel/currentChats/FilterByText.tsx b/apps/meteor/client/views/omnichannel/currentChats/FilterByText.tsx
index cda579387ea1..67372102f155 100644
--- a/apps/meteor/client/views/omnichannel/currentChats/FilterByText.tsx
+++ b/apps/meteor/client/views/omnichannel/currentChats/FilterByText.tsx
@@ -1,9 +1,10 @@
 import { TextInput, Box, Select, InputBox } from '@rocket.chat/fuselage';
 import { useMutableCallback, useLocalStorage } from '@rocket.chat/fuselage-hooks';
-import { useSetModal, useToastMessageDispatch, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetModal, useToastMessageDispatch, useMethod } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
 import type { Dispatch, SetStateAction } from 'react';
 import React, { useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import AutoCompleteAgent from '../../../components/AutoCompleteAgent';
 import AutoCompleteDepartment from '../../../components/AutoCompleteDepartment';
@@ -23,7 +24,7 @@ type FilterByTextTypeProps = {
 const FilterByText = ({ setFilter, reload, customFields, setCustomFields, hasCustomFields, ...props }: FilterByTextTypeProps) => {
 	const setModal = useSetModal();
 	const dispatchToastMessage = useToastMessageDispatch();
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const statusOptions: [string, string][] = [
 		['all', t('All')],
diff --git a/apps/meteor/client/views/omnichannel/currentChats/RemoveChatButton.tsx b/apps/meteor/client/views/omnichannel/currentChats/RemoveChatButton.tsx
index f487eed3599f..5fe5c2f9e1ee 100644
--- a/apps/meteor/client/views/omnichannel/currentChats/RemoveChatButton.tsx
+++ b/apps/meteor/client/views/omnichannel/currentChats/RemoveChatButton.tsx
@@ -1,11 +1,11 @@
 import { IconButton } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useSetModal, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetModal, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
-import GenericModal from '../../../components/GenericModal';
-import { GenericTableCell } from '../../../components/GenericTable';
 import { useRemoveCurrentChatMutation } from './hooks/useRemoveCurrentChatMutation';
+import GenericModal from '../../../components/GenericModal';
 
 type RemoveChatButtonProps = { _id: string };
 
@@ -13,7 +13,7 @@ const RemoveChatButton = ({ _id }: RemoveChatButtonProps) => {
 	const removeCurrentChatMutation = useRemoveCurrentChatMutation();
 	const setModal = useSetModal();
 	const dispatchToastMessage = useToastMessageDispatch();
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const handleRemoveClick = useMutableCallback(async () => {
 		removeCurrentChatMutation.mutate(_id);
@@ -31,27 +31,18 @@ const RemoveChatButton = ({ _id }: RemoveChatButtonProps) => {
 			setModal(null);
 		};
 
-		const handleClose = (): void => {
-			setModal(null);
-		};
-
 		setModal(
 			<GenericModal
 				variant='danger'
 				data-qa-id='current-chats-modal-remove'
 				onConfirm={onDeleteAgent}
-				onClose={handleClose}
-				onCancel={handleClose}
+				onCancel={() => setModal(null)}
 				confirmText={t('Delete')}
 			/>,
 		);
 	});
 
-	return (
-		<GenericTableCell maxHeight='x36' fontScale='p2' color='hint' withTruncatedText data-qa='current-chats-cell-delete'>
-			<IconButton small icon='trash' title={t('Remove')} disabled={removeCurrentChatMutation.isLoading} onClick={handleDelete} />
-		</GenericTableCell>
-	);
+	return <IconButton danger small icon='trash' title={t('Remove')} disabled={removeCurrentChatMutation.isLoading} onClick={handleDelete} />;
 };
 
 export default RemoveChatButton;
diff --git a/apps/meteor/client/views/omnichannel/customFields/CustomFieldsPage.tsx b/apps/meteor/client/views/omnichannel/customFields/CustomFieldsPage.tsx
index 2e18a3ec3503..b8e5c274a177 100644
--- a/apps/meteor/client/views/omnichannel/customFields/CustomFieldsPage.tsx
+++ b/apps/meteor/client/views/omnichannel/customFields/CustomFieldsPage.tsx
@@ -1,15 +1,16 @@
 import { Button } from '@rocket.chat/fuselage';
-import { useRouteParameter, useRouter, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRouteParameter, useRouter } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
-import { ContextualbarDialog } from '../../../components/Contextualbar';
-import { Page, PageHeader, PageContent } from '../../../components/Page';
 import CustomFieldsTable from './CustomFieldsTable';
 import EditCustomFields from './EditCustomFields';
 import EditCustomFieldsWithData from './EditCustomFieldsWithData';
+import { ContextualbarDialog } from '../../../components/Contextualbar';
+import { Page, PageHeader, PageContent } from '../../../components/Page';
 
 const CustomFieldsPage = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const router = useRouter();
 
 	const context = useRouteParameter('context');
diff --git a/apps/meteor/client/views/omnichannel/customFields/CustomFieldsRoute.tsx b/apps/meteor/client/views/omnichannel/customFields/CustomFieldsRoute.tsx
index 2ffc7580e3fa..f0727e1fc48a 100644
--- a/apps/meteor/client/views/omnichannel/customFields/CustomFieldsRoute.tsx
+++ b/apps/meteor/client/views/omnichannel/customFields/CustomFieldsRoute.tsx
@@ -1,8 +1,8 @@
 import { usePermission } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import CustomFieldsPage from './CustomFieldsPage';
+import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 
 const CustomFieldsRoute = () => {
 	const canViewCustomFields = usePermission('view-livechat-customfields');
diff --git a/apps/meteor/client/views/omnichannel/customFields/CustomFieldsTable.tsx b/apps/meteor/client/views/omnichannel/customFields/CustomFieldsTable.tsx
index f8043a178857..b5572c344444 100644
--- a/apps/meteor/client/views/omnichannel/customFields/CustomFieldsTable.tsx
+++ b/apps/meteor/client/views/omnichannel/customFields/CustomFieldsTable.tsx
@@ -4,6 +4,7 @@ import { useTranslation, useEndpoint, useRouter } from '@rocket.chat/ui-contexts
 import { useQuery, hashQueryKey } from '@tanstack/react-query';
 import React, { useMemo, useState } from 'react';
 
+import { useRemoveCustomField } from './useRemoveCustomField';
 import FilterByText from '../../../components/FilterByText';
 import GenericNoResults from '../../../components/GenericNoResults';
 import {
@@ -17,13 +18,11 @@ import {
 } from '../../../components/GenericTable';
 import { usePagination } from '../../../components/GenericTable/hooks/usePagination';
 import { useSort } from '../../../components/GenericTable/hooks/useSort';
-import { useRemoveCustomField } from './useRemoveCustomField';
 
 const CustomFieldsTable = () => {
 	const t = useTranslation();
 	const router = useRouter();
-	const [filter, setFilter] = useState('');
-	const debouncedFilter = useDebouncedValue(filter, 500);
+	const [text, setText] = useState('');
 
 	const { current, itemsPerPage, setItemsPerPage: onSetItemsPerPage, setCurrent: onSetCurrent, ...paginationProps } = usePagination();
 	const { sortBy, sortDirection, setSort } = useSort<'_id' | 'label' | 'scope' | 'visibility'>('_id');
@@ -33,18 +32,21 @@ const CustomFieldsTable = () => {
 
 	const handleDelete = useRemoveCustomField();
 
-	const query = useMemo(
-		() => ({
-			text: debouncedFilter,
-			sort: `{ "${sortBy}": ${sortDirection === 'asc' ? 1 : -1} }`,
-			...(itemsPerPage && { count: itemsPerPage }),
-			...(current && { offset: current }),
-		}),
-		[debouncedFilter, itemsPerPage, current, sortBy, sortDirection],
+	const query = useDebouncedValue(
+		useMemo(
+			() => ({
+				text,
+				sort: `{ "${sortBy}": ${sortDirection === 'asc' ? 1 : -1} }`,
+				...(itemsPerPage && { count: itemsPerPage }),
+				...(current && { offset: current }),
+			}),
+			[text, itemsPerPage, current, sortBy, sortDirection],
+		),
+		500,
 	);
 
 	const getCustomFields = useEndpoint('GET', '/v1/livechat/custom-fields');
-	const { data, isSuccess, isLoading } = useQuery(['livechat-customFields', query, debouncedFilter], async () => getCustomFields(query));
+	const { data, isSuccess, isLoading } = useQuery(['livechat-customFields', query], async () => getCustomFields(query));
 
 	const [defaultQuery] = useState(hashQueryKey([query]));
 	const queryHasChanged = defaultQuery !== hashQueryKey([query]);
@@ -75,7 +77,9 @@ const CustomFieldsTable = () => {
 
 	return (
 		<>
-			{((isSuccess && data?.customFields.length > 0) || queryHasChanged) && <FilterByText onChange={setFilter} />}
+			{((isSuccess && data?.customFields.length > 0) || queryHasChanged) && (
+				<FilterByText value={text} onChange={(event) => setText(event.target.value)} />
+			)}
 			{isLoading && (
 				<GenericTable>
 					<GenericTableHeader>{headers}</GenericTableHeader>
@@ -99,7 +103,7 @@ const CustomFieldsTable = () => {
 
 			{isSuccess && data.customFields.length > 0 && (
 				<>
-					<GenericTable data-qa='GenericTableCustomFieldsInfoBody' aria-busy={filter !== debouncedFilter} aria-live='assertive'>
+					<GenericTable data-qa='GenericTableCustomFieldsInfoBody' aria-busy={isLoading} aria-live='assertive'>
 						<GenericTableHeader>{headers}</GenericTableHeader>
 						<GenericTableBody>
 							{data.customFields.map(({ label, _id, scope, visibility }) => (
diff --git a/apps/meteor/client/views/omnichannel/customFields/EditCustomFieldsWithData.tsx b/apps/meteor/client/views/omnichannel/customFields/EditCustomFieldsWithData.tsx
index cf5a1b918e95..15ad92552356 100644
--- a/apps/meteor/client/views/omnichannel/customFields/EditCustomFieldsWithData.tsx
+++ b/apps/meteor/client/views/omnichannel/customFields/EditCustomFieldsWithData.tsx
@@ -1,14 +1,15 @@
 import type { ILivechatCustomField } from '@rocket.chat/core-typings';
 import { Callout } from '@rocket.chat/fuselage';
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
-import PageSkeleton from '../../../components/PageSkeleton';
 import EditCustomFields from './EditCustomFields';
+import PageSkeleton from '../../../components/PageSkeleton';
 
 const EditCustomFieldsWithData = ({ customFieldId }: { customFieldId: ILivechatCustomField['_id'] }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const getCustomFieldById = useEndpoint('GET', '/v1/livechat/custom-fields/:_id', { _id: customFieldId });
 	const { data, isLoading, isError } = useQuery(['livechat-getCustomFieldsById', customFieldId], async () => getCustomFieldById(), {
diff --git a/apps/meteor/client/views/omnichannel/customFields/useRemoveCustomField.tsx b/apps/meteor/client/views/omnichannel/customFields/useRemoveCustomField.tsx
index f4bbeb62a770..5ded1beb739e 100644
--- a/apps/meteor/client/views/omnichannel/customFields/useRemoveCustomField.tsx
+++ b/apps/meteor/client/views/omnichannel/customFields/useRemoveCustomField.tsx
@@ -1,12 +1,13 @@
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useSetModal, useToastMessageDispatch, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetModal, useToastMessageDispatch, useMethod } from '@rocket.chat/ui-contexts';
 import { useQueryClient } from '@tanstack/react-query';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../components/GenericModal';
 
 export const useRemoveCustomField = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const setModal = useSetModal();
 	const dispatchToastMessage = useToastMessageDispatch();
 	const removeCustomField = useMethod('livechat:removeCustomField');
diff --git a/apps/meteor/client/views/omnichannel/departments/DepartmentAgentsTable/AddAgent.tsx b/apps/meteor/client/views/omnichannel/departments/DepartmentAgentsTable/AddAgent.tsx
index 4b997a56322b..792983baf161 100644
--- a/apps/meteor/client/views/omnichannel/departments/DepartmentAgentsTable/AddAgent.tsx
+++ b/apps/meteor/client/views/omnichannel/departments/DepartmentAgentsTable/AddAgent.tsx
@@ -1,14 +1,15 @@
 import { Box, Button } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import React, { useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import AutoCompleteAgent from '../../../../components/AutoCompleteAgent';
 import { useEndpointAction } from '../../../../hooks/useEndpointAction';
 import type { IDepartmentAgent } from '../EditDepartment';
 
 function AddAgent({ agentList, onAdd }: { agentList: IDepartmentAgent[]; onAdd: (agent: IDepartmentAgent) => void }) {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const [userId, setUserId] = useState('');
 
diff --git a/apps/meteor/client/views/omnichannel/departments/DepartmentAgentsTable/RemoveAgentButton.tsx b/apps/meteor/client/views/omnichannel/departments/DepartmentAgentsTable/RemoveAgentButton.tsx
index 2c28ad7d1aec..b55c6ccd4b78 100644
--- a/apps/meteor/client/views/omnichannel/departments/DepartmentAgentsTable/RemoveAgentButton.tsx
+++ b/apps/meteor/client/views/omnichannel/departments/DepartmentAgentsTable/RemoveAgentButton.tsx
@@ -1,14 +1,15 @@
 import { IconButton } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useSetModal, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetModal, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../components/GenericModal';
 
 function RemoveAgentButton({ agentId, onRemove }: { agentId: string; onRemove: (agentId: string) => void }) {
 	const setModal = useSetModal();
 	const dispatchToastMessage = useToastMessageDispatch();
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const handleDelete = useMutableCallback((e) => {
 		e.stopPropagation();
diff --git a/apps/meteor/client/views/omnichannel/departments/DepartmentsPage.tsx b/apps/meteor/client/views/omnichannel/departments/DepartmentsPage.tsx
index 0583f53a14ef..50fb515d6a23 100644
--- a/apps/meteor/client/views/omnichannel/departments/DepartmentsPage.tsx
+++ b/apps/meteor/client/views/omnichannel/departments/DepartmentsPage.tsx
@@ -3,10 +3,10 @@ import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useRoute, useTranslation, useRouteParameter } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import { Page, PageHeader, PageContent } from '../../../components/Page';
 import DepartmentsTableV2 from './DepartmentsTable';
 import EditDepartmentWithData from './EditDepartmentWithData';
 import NewDepartment from './NewDepartment';
+import { Page, PageHeader, PageContent } from '../../../components/Page';
 
 const DepartmentsPage = () => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/omnichannel/departments/DepartmentsRoute.tsx b/apps/meteor/client/views/omnichannel/departments/DepartmentsRoute.tsx
index c92134a18e69..f1e848666f71 100644
--- a/apps/meteor/client/views/omnichannel/departments/DepartmentsRoute.tsx
+++ b/apps/meteor/client/views/omnichannel/departments/DepartmentsRoute.tsx
@@ -1,8 +1,8 @@
 import { usePermission } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import DepartmentsPage from './DepartmentsPage';
+import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 
 const DepartmentsRoute = () => {
 	const canViewDepartments = usePermission('manage-livechat-departments');
diff --git a/apps/meteor/client/views/omnichannel/departments/DepartmentsTable/DepartmentsTable.tsx b/apps/meteor/client/views/omnichannel/departments/DepartmentsTable/DepartmentsTable.tsx
index 46ef80d5b0e3..a96d3b8d8fcd 100644
--- a/apps/meteor/client/views/omnichannel/departments/DepartmentsTable/DepartmentsTable.tsx
+++ b/apps/meteor/client/views/omnichannel/departments/DepartmentsTable/DepartmentsTable.tsx
@@ -5,6 +5,7 @@ import { useTranslation, useEndpoint, useRouter } from '@rocket.chat/ui-contexts
 import { useQuery, hashQueryKey } from '@tanstack/react-query';
 import React, { useState, useMemo } from 'react';
 
+import DepartmentItemMenu from './DepartmentItemMenu';
 import FilterByText from '../../../../components/FilterByText';
 import GenericNoResults from '../../../../components/GenericNoResults/GenericNoResults';
 import {
@@ -18,7 +19,6 @@ import {
 } from '../../../../components/GenericTable';
 import { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
 import { useSort } from '../../../../components/GenericTable/hooks/useSort';
-import DepartmentItemMenu from './DepartmentItemMenu';
 
 const DEPARTMENTS_ENDPOINTS = {
 	department: '/v1/livechat/department',
@@ -27,9 +27,8 @@ const DEPARTMENTS_ENDPOINTS = {
 
 const DepartmentsTable = ({ archived }: { archived: boolean }) => {
 	const t = useTranslation();
-	const [text, setText] = useState('');
 	const router = useRouter();
-	const debouncedText = useDebouncedValue(text, 500);
+	const [text, setText] = useState('');
 
 	const { current, itemsPerPage, setItemsPerPage: onSetItemsPerPage, setCurrent: onSetCurrent, ...paginationProps } = usePagination();
 	const { sortBy, sortDirection, setSort } = useSort<'name' | 'description' | 'numAgents' | 'enabled' | 'showOnRegistration'>('name');
@@ -38,15 +37,18 @@ const DepartmentsTable = ({ archived }: { archived: boolean }) => {
 
 	const handleAddNew = useMutableCallback(() => router.navigate('/omnichannel/departments/new'));
 
-	const query = useMemo(
-		() => ({
-			onlyMyDepartments: 'true' as const,
-			text: debouncedText,
-			sort: JSON.stringify({ [sortBy]: sortDirection === 'asc' ? 1 : -1 }),
-			...(current && { offset: current }),
-			...(itemsPerPage && { count: itemsPerPage }),
-		}),
-		[current, itemsPerPage, sortBy, sortDirection, debouncedText],
+	const query = useDebouncedValue(
+		useMemo(
+			() => ({
+				onlyMyDepartments: 'true' as const,
+				text,
+				sort: JSON.stringify({ [sortBy]: sortDirection === 'asc' ? 1 : -1 }),
+				...(current && { offset: current }),
+				...(itemsPerPage && { count: itemsPerPage }),
+			}),
+			[current, itemsPerPage, sortBy, sortDirection, text],
+		),
+		500,
 	);
 
 	const { data, isSuccess, isLoading } = useQuery(['livechat-departments', query, archived], async () => getDepartments(query), {
@@ -91,7 +93,9 @@ const DepartmentsTable = ({ archived }: { archived: boolean }) => {
 
 	return (
 		<>
-			{((isSuccess && data?.departments.length > 0) || queryHasChanged) && <FilterByText onChange={setText} />}
+			{((isSuccess && data?.departments.length > 0) || queryHasChanged) && (
+				<FilterByText value={text} onChange={(event) => setText(event.target.value)} />
+			)}
 			{isLoading && (
 				<GenericTable>
 					<GenericTableHeader>{headers}</GenericTableHeader>
@@ -114,7 +118,7 @@ const DepartmentsTable = ({ archived }: { archived: boolean }) => {
 			)}
 			{isSuccess && data?.departments.length > 0 && (
 				<>
-					<GenericTable aria-busy={text !== debouncedText} aria-live='assertive'>
+					<GenericTable aria-busy={isLoading} aria-live='assertive'>
 						<GenericTableHeader>{headers}</GenericTableHeader>
 						<GenericTableBody>
 							{data.departments.map((department: Omit<ILivechatDepartment, '_updatedAt'>) => (
diff --git a/apps/meteor/client/views/omnichannel/departments/DepartmentsTable/RemoveDepartmentModal.tsx b/apps/meteor/client/views/omnichannel/departments/DepartmentsTable/RemoveDepartmentModal.tsx
index 0f569f68ba1f..c6d6436f6a4b 100644
--- a/apps/meteor/client/views/omnichannel/departments/DepartmentsTable/RemoveDepartmentModal.tsx
+++ b/apps/meteor/client/views/omnichannel/departments/DepartmentsTable/RemoveDepartmentModal.tsx
@@ -1,8 +1,9 @@
 import { Box, Input } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useToastMessageDispatch, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useToastMessageDispatch, useEndpoint } from '@rocket.chat/ui-contexts';
 import type { ChangeEvent, ReactElement } from 'react';
 import React, { useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../components/GenericModal';
 
@@ -14,7 +15,7 @@ type RemoveDepartmentModalProps = {
 };
 
 const RemoveDepartmentModal = ({ _id = '', name, reset, onClose }: RemoveDepartmentModalProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [text, setText] = useState('');
 
 	const removeDepartment = useEndpoint('DELETE', '/v1/livechat/department/:_id', { _id });
diff --git a/apps/meteor/client/views/omnichannel/departments/EditDepartmentWithAllowedForwardData.tsx b/apps/meteor/client/views/omnichannel/departments/EditDepartmentWithAllowedForwardData.tsx
index 633f0a9fc3d1..b929a77ea670 100644
--- a/apps/meteor/client/views/omnichannel/departments/EditDepartmentWithAllowedForwardData.tsx
+++ b/apps/meteor/client/views/omnichannel/departments/EditDepartmentWithAllowedForwardData.tsx
@@ -1,14 +1,15 @@
 import { Box } from '@rocket.chat/fuselage';
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
-import { FormSkeleton } from '../../../components/Skeleton';
 import type { EditDepartmentProps } from './EditDepartment';
 import EditDepartment from './EditDepartment';
+import { FormSkeleton } from '../../../components/Skeleton';
 
 const EditDepartmentWithAllowedForwardData = ({ data, ...props }: Omit<EditDepartmentProps, 'allowedToForwardData'>) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const getDepartmentListByIds = useEndpoint('GET', '/v1/livechat/department.listByIds');
 
 	const {
diff --git a/apps/meteor/client/views/omnichannel/departments/EditDepartmentWithData.tsx b/apps/meteor/client/views/omnichannel/departments/EditDepartmentWithData.tsx
index 64016d23db23..191df366e35c 100644
--- a/apps/meteor/client/views/omnichannel/departments/EditDepartmentWithData.tsx
+++ b/apps/meteor/client/views/omnichannel/departments/EditDepartmentWithData.tsx
@@ -1,11 +1,12 @@
 import { Box } from '@rocket.chat/fuselage';
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
-import { FormSkeleton } from '../../../components/Skeleton';
 import EditDepartment from './EditDepartment';
 import EditDepartmentWithAllowedForwardData from './EditDepartmentWithAllowedForwardData';
+import { FormSkeleton } from '../../../components/Skeleton';
 
 const params = { onlyMyDepartments: 'true' } as const;
 
@@ -15,7 +16,7 @@ type EditDepartmentWithDataProps = {
 };
 
 const EditDepartmentWithData = ({ id, title }: EditDepartmentWithDataProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const getDepartment = useEndpoint('GET', '/v1/livechat/department/:_id', { _id: id ?? '' });
 	const { data, isInitialLoading, isError } = useQuery(['/v1/livechat/department/:_id', id], () => getDepartment(params), {
 		enabled: !!id,
diff --git a/apps/meteor/client/views/omnichannel/departments/NewDepartment.tsx b/apps/meteor/client/views/omnichannel/departments/NewDepartment.tsx
index 85d72cf26bfa..55d85275a4b5 100644
--- a/apps/meteor/client/views/omnichannel/departments/NewDepartment.tsx
+++ b/apps/meteor/client/views/omnichannel/departments/NewDepartment.tsx
@@ -1,18 +1,19 @@
 import { Callout } from '@rocket.chat/fuselage';
-import { useEndpoint, useSetModal, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useSetModal } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
+import EditDepartment from './EditDepartment';
 import EnterpriseDepartmentsModal from '../../../components/Omnichannel/modals/EnterpriseDepartmentsModal';
 import PageSkeleton from '../../../components/PageSkeleton';
-import EditDepartment from './EditDepartment';
 
 type NewDepartmentProps = {
 	id?: string;
 };
 
 const NewDepartment = ({ id }: NewDepartmentProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const setModal = useSetModal();
 	const getDepartmentCreationAvailable = useEndpoint('GET', '/v1/livechat/department/isDepartmentCreationAvailable');
 	const { data, isLoading, isError } = useQuery(['getDepartments'], () => getDepartmentCreationAvailable(), {
diff --git a/apps/meteor/client/views/omnichannel/directory/CallsContextualBarDirectory.tsx b/apps/meteor/client/views/omnichannel/directory/CallsContextualBarDirectory.tsx
index 6bd1500b3414..715271e7d564 100644
--- a/apps/meteor/client/views/omnichannel/directory/CallsContextualBarDirectory.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/CallsContextualBarDirectory.tsx
@@ -1,26 +1,27 @@
 import type { IVoipRoom } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
-import { useRoute, useRouteParameter, useSearchParameter, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRoute, useRouteParameter, useSearchParameter } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
-import { Contextualbar } from '../../../components/Contextualbar';
-import { AsyncStatePhase } from '../../../hooks/useAsyncState';
-import { useEndpointData } from '../../../hooks/useEndpointData';
 import Call from './calls/Call';
 import { VoipInfo } from './calls/contextualBar/VoipInfo';
 import { FormSkeleton } from './components/FormSkeleton';
+import { Contextualbar } from '../../../components/Contextualbar';
+import { AsyncStatePhase } from '../../../hooks/useAsyncState';
+import { useEndpointData } from '../../../hooks/useEndpointData';
 
 const CallsContextualBarDirectory = () => {
-	const directoryRoute = useRoute('omnichannel-directory');
+	const { t } = useTranslation();
 
-	const bar = useRouteParameter('bar') || 'info';
 	const id = useRouteParameter('id');
 	const token = useSearchParameter('token');
+	const context = useRouteParameter('context');
 
-	const t = useTranslation();
+	const directoryRoute = useRoute('omnichannel-directory');
 
 	const handleClose = (): void => {
-		directoryRoute.push({ page: 'calls' });
+		directoryRoute.push({ tab: 'calls' });
 	};
 
 	const query = useMemo(
@@ -33,7 +34,7 @@ const CallsContextualBarDirectory = () => {
 
 	const { value: data, phase: state, error } = useEndpointData(`/v1/voip/room`, { params: query });
 
-	if (bar === 'view' && id) {
+	if (context === 'view' && id) {
 		return <Call rid={id} />;
 	}
 
@@ -51,7 +52,7 @@ const CallsContextualBarDirectory = () => {
 
 	const room = data.room as unknown as IVoipRoom; // TODO Check why types are incompatible even though the endpoint returns an IVoipRooms
 
-	return <Contextualbar>{bar === 'info' && <VoipInfo room={room} onClickClose={handleClose} />}</Contextualbar>;
+	return <Contextualbar>{context === 'info' && <VoipInfo room={room} onClickClose={handleClose} />}</Contextualbar>;
 };
 
 export default CallsContextualBarDirectory;
diff --git a/apps/meteor/client/views/omnichannel/directory/ChatsContextualBar.tsx b/apps/meteor/client/views/omnichannel/directory/ChatsContextualBar.tsx
index b8cb6dd57120..c3bf302a8065 100644
--- a/apps/meteor/client/views/omnichannel/directory/ChatsContextualBar.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/ChatsContextualBar.tsx
@@ -1,85 +1,26 @@
-import { Box } from '@rocket.chat/fuselage';
-import { useRoute, useRouteParameter, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRouteParameter, useRouter } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import {
-	Contextualbar,
-	ContextualbarHeader,
-	ContextualbarIcon,
-	ContextualbarTitle,
-	ContextualbarAction,
-	ContextualbarClose,
-} from '../../../components/Contextualbar';
-import Chat from './chats/Chat';
-import ChatInfoDirectory from './chats/contextualBar/ChatInfoDirectory';
-import { RoomEditWithData } from './chats/contextualBar/RoomEdit';
-import { FormSkeleton } from './components';
-import { useOmnichannelRoomInfo } from './hooks/useOmnichannelRoomInfo';
+import ChatsFiltersContextualBar from './chats/ChatsFiltersContextualBar';
+import ContactHistoryMessagesList from '../contactHistory/MessageList/ContactHistoryMessagesList';
 
-type ChatsContextualBarProps = { chatReload?: () => void };
+const ChatsContextualBar = () => {
+	const router = useRouter();
+	const context = useRouteParameter('context');
+	const id = useRouteParameter('id');
 
-const ChatsContextualBar = ({ chatReload }: ChatsContextualBarProps) => {
-	const directoryRoute = useRoute('omnichannel-directory');
+	const handleOpenRoom = () => id && router.navigate(`/live/${id}`);
+	const handleClose = () => router.navigate('/omnichannel-directory/chats');
 
-	const bar = useRouteParameter('bar') || 'info';
-	const id = useRouteParameter('id') || '';
-
-	const t = useTranslation();
-
-	const openInRoom = (): void => {
-		id && directoryRoute.push({ page: 'chats', id, bar: 'view' });
-	};
-
-	const handleChatsContextualbarCloseButtonClick = (): void => {
-		directoryRoute.push({ page: 'chats' });
-	};
-
-	const handleChatsContextualbarBackButtonClick = (): void => {
-		id && directoryRoute.push({ page: 'chats', id, bar: 'info' });
-	};
-
-	const { data: room, isLoading, isError, refetch: reloadInfo } = useOmnichannelRoomInfo(id);
-
-	if (bar === 'view' && id) {
-		return <Chat rid={id} />;
-	}
-
-	if (isLoading) {
-		return (
-			<Box pi={24}>
-				<FormSkeleton />
-			</Box>
-		);
+	if (context === 'filters') {
+		return <ChatsFiltersContextualBar onClose={handleClose} />;
 	}
 
-	if (isError || !room) {
-		return <Box mbs={16}>{t('Room_not_found')}</Box>;
+	if (context === 'info' && id) {
+		return <ContactHistoryMessagesList chatId={id} onClose={handleClose} onOpenRoom={handleOpenRoom} />;
 	}
 
-	return (
-		<Contextualbar>
-			<ContextualbarHeader expanded>
-				{bar === 'info' && (
-					<>
-						<ContextualbarIcon name='info-circled' />
-						<ContextualbarTitle>{t('Room_Info')}</ContextualbarTitle>
-						<ContextualbarAction title={t('View_full_conversation')} name='new-window' onClick={openInRoom} />
-					</>
-				)}
-				{bar === 'edit' && (
-					<>
-						<ContextualbarIcon name='pencil' />
-						<ContextualbarTitle>{t('edit-room')}</ContextualbarTitle>
-					</>
-				)}
-				<ContextualbarClose onClick={handleChatsContextualbarCloseButtonClick} />
-			</ContextualbarHeader>
-			{bar === 'info' && <ChatInfoDirectory id={id} room={room} />}
-			{bar === 'edit' && (
-				<RoomEditWithData id={id} reload={chatReload} reloadInfo={reloadInfo} onClose={handleChatsContextualbarBackButtonClick} />
-			)}
-		</Contextualbar>
-	);
+	return null;
 };
 
 export default ChatsContextualBar;
diff --git a/apps/meteor/client/views/omnichannel/directory/ContactContextualBar.tsx b/apps/meteor/client/views/omnichannel/directory/ContactContextualBar.tsx
index ee43c29a9404..36f5f3315d6c 100644
--- a/apps/meteor/client/views/omnichannel/directory/ContactContextualBar.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/ContactContextualBar.tsx
@@ -1,54 +1,35 @@
-import { useRoute, useRouteParameter, useTranslation } from '@rocket.chat/ui-contexts';
-import React, { useMemo } from 'react';
-
-import {
-	Contextualbar,
-	ContextualbarHeader,
-	ContextualbarIcon,
-	ContextualbarTitle,
-	ContextualbarClose,
-} from '../../../components/Contextualbar';
-import ContactEditWithData from './contacts/contextualBar/ContactEditWithData';
-import ContactInfo from './contacts/contextualBar/ContactInfo';
-import ContactNewEdit from './contacts/contextualBar/ContactNewEdit';
-
-const HEADER_OPTIONS = {
-	new: { icon: 'user', title: 'New_contact' },
-	info: { icon: 'user', title: 'Contact_Info' },
-	edit: { icon: 'pencil', title: 'Edit_Contact_Profile' },
-} as const;
-
-type BarOptions = keyof typeof HEADER_OPTIONS;
+import { useRoute, useRouteParameter } from '@rocket.chat/ui-contexts';
+import React from 'react';
+
+import ContactInfo from '../contactInfo/ContactInfo';
+import ContactInfoError from '../contactInfo/ContactInfoError';
+import EditContactInfo from '../contactInfo/EditContactInfo';
+import EditContactInfoWithData from '../contactInfo/EditContactInfoWithData';
 
 const ContactContextualBar = () => {
 	const directoryRoute = useRoute('omnichannel-directory');
-	const bar = (useRouteParameter('bar') || 'info') as BarOptions;
-	const contactId = useRouteParameter('id') || '';
-
-	const t = useTranslation();
+	const contactId = useRouteParameter('id');
+	const context = useRouteParameter('context');
 
-	const handleContactsContextualbarCloseButtonClick = () => {
-		directoryRoute.push({ page: 'contacts' });
+	const handleClose = () => {
+		directoryRoute.push({ tab: 'contacts' });
 	};
 
-	const handleContactsContextualbarBackButtonClick = () => {
-		directoryRoute.push({ page: 'contacts', id: contactId, bar: 'info' });
-	};
+	const handleCancel = () => contactId && directoryRoute.push({ tab: 'contacts', context: 'details', id: contactId });
+
+	if (context === 'edit' && contactId) {
+		return <EditContactInfoWithData id={contactId} onClose={handleClose} onCancel={handleCancel} />;
+	}
+
+	if (context === 'new' && !contactId) {
+		return <EditContactInfo onClose={handleClose} onCancel={handleClose} />;
+	}
+
+	if (!contactId) {
+		return <ContactInfoError onClose={handleClose} />;
+	}
 
-	const header = useMemo(() => HEADER_OPTIONS[bar] || HEADER_OPTIONS.info, [bar]);
-
-	return (
-		<Contextualbar>
-			<ContextualbarHeader>
-				<ContextualbarIcon name={header.icon} />
-				<ContextualbarTitle>{t(header.title)}</ContextualbarTitle>
-				<ContextualbarClose onClick={handleContactsContextualbarCloseButtonClick} />
-			</ContextualbarHeader>
-			{bar === 'new' && <ContactNewEdit id={contactId} close={handleContactsContextualbarCloseButtonClick} />}
-			{bar === 'info' && <ContactInfo id={contactId} />}
-			{bar === 'edit' && <ContactEditWithData id={contactId} close={handleContactsContextualbarBackButtonClick} />}
-		</Contextualbar>
-	);
+	return <ContactInfo id={contactId} onClose={handleClose} />;
 };
 
 export default ContactContextualBar;
diff --git a/apps/meteor/client/views/omnichannel/directory/ContextualBar.tsx b/apps/meteor/client/views/omnichannel/directory/ContextualBarRouter.tsx
similarity index 62%
rename from apps/meteor/client/views/omnichannel/directory/ContextualBar.tsx
rename to apps/meteor/client/views/omnichannel/directory/ContextualBarRouter.tsx
index f0706a00590b..0ab0cdb59162 100644
--- a/apps/meteor/client/views/omnichannel/directory/ContextualBar.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/ContextualBarRouter.tsx
@@ -5,18 +5,14 @@ import CallsContextualBarDirectory from './CallsContextualBarDirectory';
 import ChatsContextualBar from './ChatsContextualBar';
 import ContactContextualBar from './ContactContextualBar';
 
-type ContextualBarProps = {
-	chatReload?: () => void;
-};
-
-const ContextualBar = ({ chatReload }: ContextualBarProps) => {
-	const page = useRouteParameter('page');
+const ContextualBarRouter = () => {
+	const tab = useRouteParameter('tab');
 
-	switch (page) {
+	switch (tab) {
 		case 'contacts':
 			return <ContactContextualBar />;
 		case 'chats':
-			return <ChatsContextualBar chatReload={chatReload} />;
+			return <ChatsContextualBar />;
 		case 'calls':
 			return <CallsContextualBarDirectory />;
 		default:
@@ -24,4 +20,4 @@ const ContextualBar = ({ chatReload }: ContextualBarProps) => {
 	}
 };
 
-export default ContextualBar;
+export default ContextualBarRouter;
diff --git a/apps/meteor/client/views/omnichannel/directory/OmnichannelDirectoryPage.tsx b/apps/meteor/client/views/omnichannel/directory/OmnichannelDirectoryPage.tsx
index 08b344ae3a9f..fcce2c39a2ac 100644
--- a/apps/meteor/client/views/omnichannel/directory/OmnichannelDirectoryPage.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/OmnichannelDirectoryPage.tsx
@@ -1,74 +1,70 @@
 import { Tabs } from '@rocket.chat/fuselage';
-import { useRouteParameter, usePermission, useTranslation, useRouter } from '@rocket.chat/ui-contexts';
-import type { ReactElement } from 'react';
+import { useRouteParameter, useRouter } from '@rocket.chat/ui-contexts';
 import React, { useEffect, useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
-import { ContextualbarDialog } from '../../../components/Contextualbar';
-import { Page, PageHeader, PageContent } from '../../../components/Page';
-import { queryClient } from '../../../lib/queryClient';
-import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
-import ContextualBar from './ContextualBar';
+import ContextualBarRouter from './ContextualBarRouter';
 import CallTab from './calls/CallTab';
-import ChatTab from './chats/ChatTab';
+import ChatsTab from './chats/ChatsTab';
 import ContactTab from './contacts/ContactTab';
+import ChatsProvider from './providers/ChatsProvider';
+import { ContextualbarDialog } from '../../../components/Contextualbar';
+import { Page, PageHeader, PageContent } from '../../../components/Page';
 
-const DEFAULT_TAB = 'contacts';
+const DEFAULT_TAB = 'chats';
 
-const OmnichannelDirectoryPage = (): ReactElement => {
-	const t = useTranslation();
+const OmnichannelDirectoryPage = () => {
+	const { t } = useTranslation();
 	const router = useRouter();
-	const page = useRouteParameter('page');
-	const bar = useRouteParameter('bar');
-	const canViewDirectory = usePermission('view-omnichannel-contact-center');
+	const tab = useRouteParameter('tab');
+	const context = useRouteParameter('context');
 
 	useEffect(
 		() =>
 			router.subscribeToRouteChange(() => {
-				if (router.getRouteName() !== 'omnichannel-directory' || !!router.getRouteParameters().page) {
+				if (router.getRouteName() !== 'omnichannel-directory' || !!router.getRouteParameters().tab) {
 					return;
 				}
 
 				router.navigate({
 					name: 'omnichannel-directory',
-					params: { page: DEFAULT_TAB },
+					params: { tab: DEFAULT_TAB },
 				});
 			}),
 		[router],
 	);
 
-	const handleTabClick = useCallback((tab) => () => router.navigate({ name: 'omnichannel-directory', params: { tab } }), [router]);
-
-	const chatReload = () => queryClient.invalidateQueries({ queryKey: ['current-chats'] });
-
-	if (!canViewDirectory) {
-		return <NotAuthorizedPage />;
-	}
+	const handleTabClick = useCallback((tab) => router.navigate({ name: 'omnichannel-directory', params: { tab } }), [router]);
 
 	return (
-		<Page flexDirection='row'>
-			<Page>
-				<PageHeader title={t('Omnichannel_Contact_Center')} />
-				<Tabs flexShrink={0}>
-					<Tabs.Item selected={page === 'contacts'} onClick={handleTabClick('contacts')}>
-						{t('Contacts')}
-					</Tabs.Item>
-					<Tabs.Item selected={page === 'chats'} onClick={handleTabClick('chats')}>
-						{t('Chats' as 'color')}
-					</Tabs.Item>
-					<Tabs.Item selected={page === 'calls'} onClick={handleTabClick('calls')}>
-						{t('Calls' as 'color')}
-					</Tabs.Item>
-				</Tabs>
-				<PageContent>
-					{(page === 'contacts' && <ContactTab />) || (page === 'chats' && <ChatTab />) || (page === 'calls' && <CallTab />)}
-				</PageContent>
+		<ChatsProvider>
+			<Page flexDirection='row'>
+				<Page>
+					<PageHeader title={t('Omnichannel_Contact_Center')} />
+					<Tabs flexShrink={0}>
+						<Tabs.Item selected={tab === 'chats'} onClick={() => handleTabClick('chats')}>
+							{t('Chats')}
+						</Tabs.Item>
+						<Tabs.Item selected={tab === 'contacts'} onClick={() => handleTabClick('contacts')}>
+							{t('Contacts')}
+						</Tabs.Item>
+						<Tabs.Item selected={tab === 'calls'} onClick={() => handleTabClick('calls')}>
+							{t('Calls')}
+						</Tabs.Item>
+					</Tabs>
+					<PageContent>
+						{tab === 'chats' && <ChatsTab />}
+						{tab === 'contacts' && <ContactTab />}
+						{tab === 'calls' && <CallTab />}
+					</PageContent>
+				</Page>
+				{context && (
+					<ContextualbarDialog>
+						<ContextualBarRouter />
+					</ContextualbarDialog>
+				)}
 			</Page>
-			{bar && (
-				<ContextualbarDialog>
-					<ContextualBar chatReload={chatReload} />
-				</ContextualbarDialog>
-			)}
-		</Page>
+		</ChatsProvider>
 	);
 };
 
diff --git a/apps/meteor/client/views/omnichannel/directory/OmnichannelDirectoryRouter.tsx b/apps/meteor/client/views/omnichannel/directory/OmnichannelDirectoryRouter.tsx
new file mode 100644
index 000000000000..2bb1d1365117
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/directory/OmnichannelDirectoryRouter.tsx
@@ -0,0 +1,17 @@
+import { usePermission } from '@rocket.chat/ui-contexts';
+import React from 'react';
+
+import OmnichannelDirectoryPage from './OmnichannelDirectoryPage';
+import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
+
+const OmnichannelDirectoryRouter = () => {
+	const canViewDirectory = usePermission('view-omnichannel-contact-center');
+
+	if (!canViewDirectory) {
+		return <NotAuthorizedPage />;
+	}
+
+	return <OmnichannelDirectoryPage />;
+};
+
+export default OmnichannelDirectoryRouter;
diff --git a/apps/meteor/client/views/omnichannel/directory/calls/CallTab.tsx b/apps/meteor/client/views/omnichannel/directory/calls/CallTab.tsx
index 3014753c5529..aef7ed7ae649 100644
--- a/apps/meteor/client/views/omnichannel/directory/calls/CallTab.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/calls/CallTab.tsx
@@ -2,8 +2,8 @@ import { usePermission } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import NotAuthorizedPage from '../../../notAuthorized/NotAuthorizedPage';
 import CallTable from './CallTable';
+import NotAuthorizedPage from '../../../notAuthorized/NotAuthorizedPage';
 
 // TODO Check if I need to type the setstateaction params, if I should do:
 // { setCallReload: Dispatch<SetStateAction<(param: () => void) => void>> }
diff --git a/apps/meteor/client/views/omnichannel/directory/calls/CallTable.tsx b/apps/meteor/client/views/omnichannel/directory/calls/CallTable.tsx
index 2b529999fea1..d578ae69fbed 100644
--- a/apps/meteor/client/views/omnichannel/directory/calls/CallTable.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/calls/CallTable.tsx
@@ -1,9 +1,10 @@
 import { Pagination } from '@rocket.chat/fuselage';
-import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
+import { useDebouncedValue, useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useRoute, useTranslation, useEndpoint, useUserId } from '@rocket.chat/ui-contexts';
 import { useQuery, hashQueryKey } from '@tanstack/react-query';
 import React, { useState, useMemo } from 'react';
 
+import { CallTableRow } from './CallTableRow';
 import FilterByText from '../../../../components/FilterByText';
 import GenericNoResults from '../../../../components/GenericNoResults/GenericNoResults';
 import {
@@ -11,11 +12,10 @@ import {
 	GenericTableBody,
 	GenericTableHeader,
 	GenericTableHeaderCell,
-	GenericTableLoadingRow,
+	GenericTableLoadingTable,
 } from '../../../../components/GenericTable';
 import { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
 import { useSort } from '../../../../components/GenericTable/hooks/useSort';
-import { CallTableRow } from './CallTableRow';
 
 const CallTable = () => {
 	const t = useTranslation();
@@ -26,23 +26,26 @@ const CallTable = () => {
 	const { current, itemsPerPage, setItemsPerPage: onSetItemsPerPage, setCurrent: onSetCurrent, ...paginationProps } = usePagination();
 	const { sortBy, sortDirection, setSort } = useSort<'fname' | 'phone' | 'queue' | 'ts' | 'callDuration' | 'direction'>('fname');
 
-	const query = useMemo(
-		() => ({
-			sort: `{ "${sortBy}": ${sortDirection === 'asc' ? 1 : -1} }`,
-			open: 'false' as const,
-			roomName: text || '',
-			agents: userIdLoggedIn ? [userIdLoggedIn] : [],
-			...(itemsPerPage && { count: itemsPerPage }),
-			...(current && { offset: current }),
-		}),
-		[sortBy, current, sortDirection, itemsPerPage, userIdLoggedIn, text],
+	const query = useDebouncedValue(
+		useMemo(
+			() => ({
+				sort: `{ "${sortBy}": ${sortDirection === 'asc' ? 1 : -1} }`,
+				open: 'false' as const,
+				roomName: text || '',
+				agents: userIdLoggedIn ? [userIdLoggedIn] : [],
+				...(itemsPerPage && { count: itemsPerPage }),
+				...(current && { offset: current }),
+			}),
+			[sortBy, current, sortDirection, itemsPerPage, userIdLoggedIn, text],
+		),
+		500,
 	);
 
 	const onRowClick = useMutableCallback((id, token) => {
 		directoryRoute.push(
 			{
-				page: 'calls',
-				bar: 'info',
+				tab: 'calls',
+				context: 'info',
 				id,
 			},
 			{ token },
@@ -95,12 +98,14 @@ const CallTable = () => {
 
 	return (
 		<>
-			{((isSuccess && data?.rooms.length > 0) || queryHasChanged) && <FilterByText onChange={setText} />}
+			{((isSuccess && data?.rooms.length > 0) || queryHasChanged) && (
+				<FilterByText value={text} onChange={(event) => setText(event.target.value)} />
+			)}
 			{isLoading && (
 				<GenericTable>
 					<GenericTableHeader>{headers}</GenericTableHeader>
 					<GenericTableBody>
-						<GenericTableLoadingRow cols={7} />
+						<GenericTableLoadingTable headerCells={headers.props.children.filter(Boolean).length} />
 					</GenericTableBody>
 				</GenericTable>
 			)}
@@ -119,9 +124,7 @@ const CallTable = () => {
 					<GenericTable>
 						<GenericTableHeader>{headers}</GenericTableHeader>
 						<GenericTableBody>
-							{data?.rooms.map((room) => (
-								<CallTableRow key={room._id} room={room} onRowClick={onRowClick} />
-							))}
+							{data?.rooms.map((room) => <CallTableRow key={room._id} room={room} onRowClick={onRowClick} />)}
 						</GenericTableBody>
 					</GenericTable>
 					<Pagination
diff --git a/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/CallsContextualBarRoom.tsx b/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/CallsContextualBarRoom.tsx
index 2e5e2cb5f697..3f7ceb355da1 100644
--- a/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/CallsContextualBarRoom.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/CallsContextualBarRoom.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
 
+import { VoipInfo } from './VoipInfo';
 import { useVoipRoom } from '../../../../room/contexts/RoomContext';
 import { useRoomToolbox } from '../../../../room/contexts/RoomToolboxContext';
-import { VoipInfo } from './VoipInfo';
 
 // Contextual Bar for room view
 const VoipInfoWithData = () => {
diff --git a/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfo.tsx b/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfo.tsx
index 75f6d1d5c3bd..fa63816c4d97 100644
--- a/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfo.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfo.tsx
@@ -6,6 +6,8 @@ import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import { InfoField } from './InfoField';
+import { VoipInfoCallButton } from './VoipInfoCallButton';
 import {
 	ContextualbarIcon,
 	ContextualbarHeader,
@@ -20,8 +22,6 @@ import { useIsCallReady } from '../../../../../contexts/CallContext';
 import { parseOutboundPhoneNumber } from '../../../../../lib/voip/parseOutboundPhoneNumber';
 import AgentInfoDetails from '../../../components/AgentInfoDetails';
 import AgentField from '../../components/AgentField';
-import { InfoField } from './InfoField';
-import { VoipInfoCallButton } from './VoipInfoCallButton';
 
 type VoipInfoPropsType = {
 	room: IVoipRoom;
diff --git a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/ChatInfo.tsx b/apps/meteor/client/views/omnichannel/directory/chats/ChatInfo/ChatInfo.tsx
similarity index 99%
rename from apps/meteor/client/views/omnichannel/directory/chats/contextualBar/ChatInfo.tsx
rename to apps/meteor/client/views/omnichannel/directory/chats/ChatInfo/ChatInfo.tsx
index edff7a81b132..887ab1561747 100644
--- a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/ChatInfo.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/chats/ChatInfo/ChatInfo.tsx
@@ -7,6 +7,8 @@ import { Meteor } from 'meteor/meteor';
 import moment from 'moment';
 import React, { useEffect, useMemo, useState } from 'react';
 
+import DepartmentField from './DepartmentField';
+import VisitorClientInfo from './VisitorClientInfo';
 import { ContextualbarScrollableContent, ContextualbarFooter } from '../../../../../components/Contextualbar';
 import { InfoPanelField, InfoPanelLabel, InfoPanelText } from '../../../../../components/InfoPanel';
 import MarkdownText from '../../../../../components/MarkdownText';
@@ -18,8 +20,6 @@ import { AgentField, SlaField, ContactField, SourceField } from '../../component
 import PriorityField from '../../components/PriorityField';
 import { useOmnichannelRoomInfo } from '../../hooks/useOmnichannelRoomInfo';
 import { formatQueuedAt } from '../../utils/formatQueuedAt';
-import DepartmentField from './DepartmentField';
-import VisitorClientInfo from './VisitorClientInfo';
 
 type ChatInfoProps = {
 	id: string;
@@ -90,12 +90,12 @@ function ChatInfo({ id, route }: ChatInfoProps) {
 						tab: 'room-info',
 						context: 'edit',
 						id,
-				  }
+					}
 				: {
 						page: 'chats',
 						id,
 						bar: 'edit',
-				  },
+					},
 		);
 	});
 
diff --git a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/ChatsContextualBar.tsx b/apps/meteor/client/views/omnichannel/directory/chats/ChatInfo/ChatInfoRouter.tsx
similarity index 83%
rename from apps/meteor/client/views/omnichannel/directory/chats/contextualBar/ChatsContextualBar.tsx
rename to apps/meteor/client/views/omnichannel/directory/chats/ChatInfo/ChatInfoRouter.tsx
index d78f7e9a4ab9..b65cb3a43588 100644
--- a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/ChatsContextualBar.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/chats/ChatInfo/ChatInfoRouter.tsx
@@ -1,11 +1,12 @@
-import { useRoute, useRouteParameter, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRoute, useRouteParameter } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
+import ChatInfo from './ChatInfo';
+import RoomEdit from './RoomEdit';
 import { ContextualbarHeader, ContextualbarIcon, ContextualbarTitle, ContextualbarClose } from '../../../../../components/Contextualbar';
 import { useRoom } from '../../../../room/contexts/RoomContext';
 import { useRoomToolbox } from '../../../../room/contexts/RoomToolboxContext';
-import ChatInfo from './ChatInfo';
-import { RoomEditWithData } from './RoomEdit';
 
 const PATH = 'live';
 
@@ -15,7 +16,7 @@ const HEADER_DATA = {
 } as const;
 
 const ChatsContextualBar = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const context = useRouteParameter('context') as 'edit' | 'info' | undefined;
 	const directoryRoute = useRoute(PATH);
@@ -36,7 +37,7 @@ const ChatsContextualBar = () => {
 				<ContextualbarClose onClick={closeTab} />
 			</ContextualbarHeader>
 			{context === 'edit' ? (
-				<RoomEditWithData id={room._id} onClose={handleRoomEditBarCloseButtonClick} />
+				<RoomEdit id={room._id} onClose={handleRoomEditBarCloseButtonClick} />
 			) : (
 				<ChatInfo route={PATH} id={room._id} />
 			)}
diff --git a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/DepartmentField.tsx b/apps/meteor/client/views/omnichannel/directory/chats/ChatInfo/DepartmentField.tsx
similarity index 100%
rename from apps/meteor/client/views/omnichannel/directory/chats/contextualBar/DepartmentField.tsx
rename to apps/meteor/client/views/omnichannel/directory/chats/ChatInfo/DepartmentField.tsx
diff --git a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/RoomEdit/RoomEdit.tsx b/apps/meteor/client/views/omnichannel/directory/chats/ChatInfo/RoomEdit/RoomEdit.tsx
similarity index 100%
rename from apps/meteor/client/views/omnichannel/directory/chats/contextualBar/RoomEdit/RoomEdit.tsx
rename to apps/meteor/client/views/omnichannel/directory/chats/ChatInfo/RoomEdit/RoomEdit.tsx
diff --git a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/RoomEdit/RoomEditWithData.tsx b/apps/meteor/client/views/omnichannel/directory/chats/ChatInfo/RoomEdit/RoomEditWithData.tsx
similarity index 100%
rename from apps/meteor/client/views/omnichannel/directory/chats/contextualBar/RoomEdit/RoomEditWithData.tsx
rename to apps/meteor/client/views/omnichannel/directory/chats/ChatInfo/RoomEdit/RoomEditWithData.tsx
index e2c053fe90ab..0365e757498d 100644
--- a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/RoomEdit/RoomEditWithData.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/chats/ChatInfo/RoomEdit/RoomEditWithData.tsx
@@ -2,10 +2,10 @@ import { Box } from '@rocket.chat/fuselage';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
+import RoomEdit from './RoomEdit';
 import { FormSkeleton } from '../../../components';
 import { useOmnichannelRoomInfo } from '../../../hooks/useOmnichannelRoomInfo';
 import { useVisitorInfo } from '../../../hooks/useVisitorInfo';
-import RoomEdit from './RoomEdit';
 
 type RoomEditWithDataProps = {
 	id: string;
diff --git a/apps/meteor/client/views/omnichannel/directory/chats/ChatInfo/RoomEdit/index.ts b/apps/meteor/client/views/omnichannel/directory/chats/ChatInfo/RoomEdit/index.ts
new file mode 100644
index 000000000000..99205f80da8b
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/directory/chats/ChatInfo/RoomEdit/index.ts
@@ -0,0 +1 @@
+export { default } from './RoomEditWithData';
diff --git a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/VisitorClientInfo.tsx b/apps/meteor/client/views/omnichannel/directory/chats/ChatInfo/VisitorClientInfo.tsx
similarity index 100%
rename from apps/meteor/client/views/omnichannel/directory/chats/contextualBar/VisitorClientInfo.tsx
rename to apps/meteor/client/views/omnichannel/directory/chats/ChatInfo/VisitorClientInfo.tsx
diff --git a/apps/meteor/client/views/omnichannel/directory/chats/ChatTable.tsx b/apps/meteor/client/views/omnichannel/directory/chats/ChatTable.tsx
deleted file mode 100644
index c6d090c7547c..000000000000
--- a/apps/meteor/client/views/omnichannel/directory/chats/ChatTable.tsx
+++ /dev/null
@@ -1,186 +0,0 @@
-import { Tag, Box, Pagination, States, StatesIcon, StatesTitle, StatesActions, StatesAction } from '@rocket.chat/fuselage';
-import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useRoute, useTranslation, useUserId } from '@rocket.chat/ui-contexts';
-import { hashQueryKey } from '@tanstack/react-query';
-import moment from 'moment';
-import React, { useState, useMemo, useCallback } from 'react';
-
-import FilterByText from '../../../../components/FilterByText';
-import GenericNoResults from '../../../../components/GenericNoResults/GenericNoResults';
-import {
-	GenericTable,
-	GenericTableBody,
-	GenericTableCell,
-	GenericTableHeader,
-	GenericTableHeaderCell,
-	GenericTableLoadingTable,
-	GenericTableRow,
-} from '../../../../components/GenericTable';
-import { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
-import { useSort } from '../../../../components/GenericTable/hooks/useSort';
-import { useCurrentChats } from '../../currentChats/hooks/useCurrentChats';
-
-const ChatTable = () => {
-	const t = useTranslation();
-	const [text, setText] = useState('');
-	const userIdLoggedIn = useUserId();
-	const directoryRoute = useRoute('omnichannel-directory');
-
-	const { current, itemsPerPage, setItemsPerPage: onSetItemsPerPage, setCurrent: onSetCurrent, ...paginationProps } = usePagination();
-	const { sortBy, sortDirection, setSort } = useSort<'fname' | 'department' | 'ts' | 'chatDuration' | 'closedAt'>('fname');
-
-	const query = useMemo(
-		() => ({
-			sort: `{ "${sortBy}": ${sortDirection === 'asc' ? 1 : -1} }`,
-			open: false,
-			roomName: text || '',
-			agents: userIdLoggedIn ? [userIdLoggedIn] : [],
-			...(itemsPerPage && { count: itemsPerPage }),
-			...(current && { offset: current }),
-		}),
-		[sortBy, current, sortDirection, itemsPerPage, userIdLoggedIn, text],
-	);
-
-	const onRowClick = useMutableCallback((id) =>
-		directoryRoute.push({
-			page: 'chats',
-			bar: 'info',
-			id,
-		}),
-	);
-
-	const headers = (
-		<>
-			<GenericTableHeaderCell key='fname' direction={sortDirection} active={sortBy === 'fname'} onClick={setSort} sort='fname' w='x400'>
-				{t('Contact_Name')}
-			</GenericTableHeaderCell>
-			<GenericTableHeaderCell
-				key='department'
-				direction={sortDirection}
-				active={sortBy === 'department'}
-				onClick={setSort}
-				sort='department'
-				w='x200'
-			>
-				{t('Department')}
-			</GenericTableHeaderCell>
-			<GenericTableHeaderCell key='ts' direction={sortDirection} active={sortBy === 'ts'} onClick={setSort} sort='ts' w='x200'>
-				{t('Started_At')}
-			</GenericTableHeaderCell>
-			<GenericTableHeaderCell
-				key='chatDuration'
-				direction={sortDirection}
-				active={sortBy === 'chatDuration'}
-				onClick={setSort}
-				sort='chatDuration'
-				w='x120'
-			>
-				{t('Chat_Duration')}
-			</GenericTableHeaderCell>
-			<GenericTableHeaderCell
-				key='closedAt'
-				direction={sortDirection}
-				active={sortBy === 'closedAt'}
-				onClick={setSort}
-				sort='closedAt'
-				w='x200'
-			>
-				{t('Closed_At')}
-			</GenericTableHeaderCell>
-		</>
-	);
-
-	const { data, isLoading, isSuccess, isError, refetch } = useCurrentChats(query);
-
-	const [defaultQuery] = useState(hashQueryKey([query]));
-	const queryHasChanged = defaultQuery !== hashQueryKey([query]);
-
-	const renderRow = useCallback(
-		({ _id, fname, ts, closedAt, department, tags }) => (
-			<GenericTableRow key={_id} tabIndex={0} role='link' onClick={(): void => onRowClick(_id)} action qa-user-id={_id}>
-				<GenericTableCell withTruncatedText>
-					<Box display='flex' flexDirection='column'>
-						<Box withTruncatedText>{fname}</Box>
-						{tags && (
-							<Box color='hint' display='flex' flex-direction='row'>
-								{tags.map((tag: string) => (
-									<Box
-										style={{
-											marginTop: 4,
-											whiteSpace: 'nowrap',
-											overflow: tag.length > 10 ? 'hidden' : 'visible',
-											textOverflow: 'ellipsis',
-										}}
-										key={tag}
-										mie={4}
-									>
-										<Tag style={{ display: 'inline' }} disabled>
-											{tag}
-										</Tag>
-									</Box>
-								))}
-							</Box>
-						)}
-					</Box>
-				</GenericTableCell>
-				<GenericTableCell withTruncatedText>{department ? department.name : ''}</GenericTableCell>
-				<GenericTableCell withTruncatedText>{moment(ts).format('L LTS')}</GenericTableCell>
-				<GenericTableCell withTruncatedText>{moment(closedAt).from(moment(ts), true)}</GenericTableCell>
-				<GenericTableCell withTruncatedText>{moment(closedAt).format('L LTS')}</GenericTableCell>
-			</GenericTableRow>
-		),
-		[onRowClick],
-	);
-
-	return (
-		<>
-			{((isSuccess && data?.rooms.length > 0) || queryHasChanged) && <FilterByText onChange={setText} />}
-			{isLoading && (
-				<GenericTable>
-					<GenericTableHeader>{headers}</GenericTableHeader>
-					<GenericTableBody>
-						<GenericTableLoadingTable headerCells={5} />
-					</GenericTableBody>
-				</GenericTable>
-			)}
-			{isSuccess && data?.rooms.length === 0 && queryHasChanged && <GenericNoResults />}
-			{isSuccess && data?.rooms.length === 0 && !queryHasChanged && (
-				<GenericNoResults
-					icon='message'
-					title={t('No_chats_yet')}
-					description={t('No_chats_yet_description')}
-					linkHref='https://go.rocket.chat/i/omnichannel-docs'
-					linkText={t('Learn_more_about_conversations')}
-				/>
-			)}
-			{isSuccess && data?.rooms.length > 0 && (
-				<>
-					<GenericTable>
-						<GenericTableHeader>{headers}</GenericTableHeader>
-						<GenericTableBody>{data?.rooms.map((room) => renderRow(room))}</GenericTableBody>
-					</GenericTable>
-					<Pagination
-						divider
-						current={current}
-						itemsPerPage={itemsPerPage}
-						count={data?.total || 0}
-						onSetItemsPerPage={onSetItemsPerPage}
-						onSetCurrent={onSetCurrent}
-						{...paginationProps}
-					/>
-				</>
-			)}
-			{isError && (
-				<States>
-					<StatesIcon name='warning' variation='danger' />
-					<StatesTitle>{t('Something_went_wrong')}</StatesTitle>
-					<StatesActions>
-						<StatesAction onClick={() => refetch()}>{t('Reload_page')}</StatesAction>
-					</StatesActions>
-				</States>
-			)}
-		</>
-	);
-};
-
-export default ChatTable;
diff --git a/apps/meteor/client/views/omnichannel/directory/chats/ChatsFiltersContextualBar.tsx b/apps/meteor/client/views/omnichannel/directory/chats/ChatsFiltersContextualBar.tsx
new file mode 100644
index 000000000000..5fd70d67758d
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/directory/chats/ChatsFiltersContextualBar.tsx
@@ -0,0 +1,182 @@
+import { Button, ButtonGroup, Field, FieldLabel, FieldRow, InputBox, Select, TextInput } from '@rocket.chat/fuselage';
+import { useEndpoint, usePermission } from '@rocket.chat/ui-contexts';
+import { useQuery, useQueryClient } from '@tanstack/react-query';
+import { format } from 'date-fns';
+import React from 'react';
+import { Controller, useForm } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
+
+import AutoCompleteAgent from '../../../../components/AutoCompleteAgent';
+import AutoCompleteDepartment from '../../../../components/AutoCompleteDepartment';
+import {
+	ContextualbarHeader,
+	ContextualbarIcon,
+	ContextualbarTitle,
+	ContextualbarClose,
+	ContextualbarScrollableContent,
+	ContextualbarFooter,
+} from '../../../../components/Contextualbar';
+import { CurrentChatTags } from '../../additionalForms';
+import type { ChatsFiltersQuery } from '../contexts/ChatsContext';
+import { useChatsContext } from '../contexts/ChatsContext';
+
+type ChatsFiltersContextualBarProps = {
+	onClose: () => void;
+};
+
+const ChatsFiltersContextualBar = ({ onClose }: ChatsFiltersContextualBarProps) => {
+	const { t } = useTranslation();
+	const canViewLivechatRooms = usePermission('view-livechat-rooms');
+	const canViewCustomFields = usePermission('view-livechat-room-customfields');
+
+	const allCustomFields = useEndpoint('GET', '/v1/livechat/custom-fields');
+	const { data } = useQuery(['livechat/custom-fields'], async () => allCustomFields());
+	const contactCustomFields = data?.customFields.filter((customField) => customField.scope !== 'visitor');
+
+	const { filtersQuery, setFiltersQuery, resetFiltersQuery, hasAppliedFilters } = useChatsContext();
+	const queryClient = useQueryClient();
+
+	const { handleSubmit, control, reset } = useForm<ChatsFiltersQuery>({
+		values: filtersQuery,
+	});
+
+	const statusOptions: [string, string][] = [
+		['all', t('All')],
+		['closed', t('Closed')],
+		['opened', t('Room_Status_Open')],
+		['onhold', t('On_Hold_Chats')],
+		['queued', t('Queued')],
+	];
+
+	const handleSubmitFilters = (data: ChatsFiltersQuery) => {
+		setFiltersQuery(({ guest }) => ({ ...data, guest }));
+		queryClient.invalidateQueries(['current-chats']);
+	};
+
+	const handleResetFilters = () => {
+		resetFiltersQuery();
+		reset();
+	};
+
+	return (
+		<>
+			<ContextualbarHeader>
+				<ContextualbarIcon name='customize' />
+				<ContextualbarTitle>{t('Filters')}</ContextualbarTitle>
+				<ContextualbarClose onClick={onClose} />
+			</ContextualbarHeader>
+			<ContextualbarScrollableContent>
+				<Field>
+					<FieldLabel>{t('From')}</FieldLabel>
+					<FieldRow>
+						<Controller
+							name='from'
+							control={control}
+							render={({ field }) => <InputBox type='date' placeholder={t('From')} max={format(new Date(), 'yyyy-MM-dd')} {...field} />}
+						/>
+					</FieldRow>
+				</Field>
+				<Field>
+					<FieldLabel>{t('To')}</FieldLabel>
+					<FieldRow>
+						<Controller
+							name='to'
+							control={control}
+							render={({ field }) => <InputBox type='date' placeholder={t('To')} max={format(new Date(), 'yyyy-MM-dd')} {...field} />}
+						/>
+					</FieldRow>
+				</Field>
+				{canViewLivechatRooms && (
+					<Field>
+						<FieldLabel>{t('Served_By')}</FieldLabel>
+						<FieldRow>
+							<Controller
+								name='servedBy'
+								control={control}
+								render={({ field: { value, onChange } }) => <AutoCompleteAgent haveAll value={value} onChange={onChange} />}
+							/>
+						</FieldRow>
+					</Field>
+				)}
+				<Field>
+					<FieldLabel>{t('Status')}</FieldLabel>
+					<Controller
+						name='status'
+						control={control}
+						render={({ field }) => <Select {...field} options={statusOptions} placeholder={t('Select_an_option')} />}
+					/>
+				</Field>
+				<Field>
+					<FieldLabel>{t('Department')}</FieldLabel>
+					<FieldRow>
+						<Controller
+							name='department'
+							control={control}
+							render={({ field: { value, onChange } }) => (
+								<AutoCompleteDepartment haveAll showArchived value={value} onChange={onChange} onlyMyDepartments />
+							)}
+						/>
+					</FieldRow>
+				</Field>
+				<Field>
+					<FieldLabel>{t('Tags')}</FieldLabel>
+					<FieldRow>
+						<Controller
+							name='tags'
+							control={control}
+							render={({ field: { value, onChange } }) => <CurrentChatTags value={value} handler={onChange} viewAll />}
+						/>
+					</FieldRow>
+				</Field>
+				{canViewCustomFields &&
+					contactCustomFields?.map((customField) => {
+						if (customField.type === 'select') {
+							return (
+								<Field key={customField._id}>
+									<FieldLabel>{customField.label}</FieldLabel>
+									<FieldRow>
+										<Controller
+											name={customField._id}
+											control={control}
+											render={({ field }) => (
+												<Select
+													{...field}
+													value={field.value as string}
+													options={(customField.options || '').split(',').map((item) => [item, item])}
+												/>
+											)}
+										/>
+									</FieldRow>
+								</Field>
+							);
+						}
+
+						return (
+							<Field key={customField._id}>
+								<FieldLabel>{customField.label}</FieldLabel>
+								<FieldRow>
+									<Controller
+										name={customField._id}
+										control={control}
+										render={({ field }) => <TextInput {...field} value={field.value as string} />}
+									/>
+								</FieldRow>
+							</Field>
+						);
+					})}
+			</ContextualbarScrollableContent>
+			<ContextualbarFooter>
+				<ButtonGroup stretch>
+					<Button disabled={!hasAppliedFilters} onClick={handleResetFilters}>
+						{t('Clear_filters')}
+					</Button>
+					<Button onClick={handleSubmit(handleSubmitFilters)} primary>
+						{t('Apply')}
+					</Button>
+				</ButtonGroup>
+			</ContextualbarFooter>
+		</>
+	);
+};
+
+export default ChatsFiltersContextualBar;
diff --git a/apps/meteor/client/views/omnichannel/directory/chats/ChatTab.tsx b/apps/meteor/client/views/omnichannel/directory/chats/ChatsTab.tsx
similarity index 61%
rename from apps/meteor/client/views/omnichannel/directory/chats/ChatTab.tsx
rename to apps/meteor/client/views/omnichannel/directory/chats/ChatsTab.tsx
index bcc3648d4864..59aedad4663a 100644
--- a/apps/meteor/client/views/omnichannel/directory/chats/ChatTab.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/chats/ChatsTab.tsx
@@ -1,18 +1,17 @@
 import { usePermission } from '@rocket.chat/ui-contexts';
-import type { ReactElement } from 'react';
 import React from 'react';
 
+import ChatsTable from './ChatsTable';
 import NotAuthorizedPage from '../../../notAuthorized/NotAuthorizedPage';
-import ChatTable from './ChatTable';
 
-const ChatTab = (): ReactElement => {
+const ChatsTab = () => {
 	const hasAccess = usePermission('view-l-room');
 
 	if (hasAccess) {
-		return <ChatTable />;
+		return <ChatsTable />;
 	}
 
 	return <NotAuthorizedPage />;
 };
 
-export default ChatTab;
+export default ChatsTab;
diff --git a/apps/meteor/client/views/omnichannel/directory/chats/ChatsTable/ChatsTable.tsx b/apps/meteor/client/views/omnichannel/directory/chats/ChatsTable/ChatsTable.tsx
new file mode 100644
index 000000000000..205781faa05b
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/directory/chats/ChatsTable/ChatsTable.tsx
@@ -0,0 +1,153 @@
+import { Pagination, States, StatesIcon, StatesTitle, StatesActions, StatesAction } from '@rocket.chat/fuselage';
+import { usePermission } from '@rocket.chat/ui-contexts';
+import { hashQueryKey } from '@tanstack/react-query';
+import React, { useState, useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import ChatFilterByText from './ChatsTableFilter';
+import ChatsTableRow from './ChatsTableRow';
+import { useChatsQuery } from './useChatsQuery';
+import GenericNoResults from '../../../../../components/GenericNoResults/GenericNoResults';
+import {
+	GenericTable,
+	GenericTableBody,
+	GenericTableHeader,
+	GenericTableHeaderCell,
+	GenericTableLoadingTable,
+} from '../../../../../components/GenericTable';
+import { usePagination } from '../../../../../components/GenericTable/hooks/usePagination';
+import { useSort } from '../../../../../components/GenericTable/hooks/useSort';
+import { useOmnichannelPriorities } from '../../../../../omnichannel/hooks/useOmnichannelPriorities';
+import { useCurrentChats } from '../../../currentChats/hooks/useCurrentChats';
+import { useChatsContext } from '../../contexts/ChatsContext';
+
+const ChatsTable = () => {
+	const { t } = useTranslation();
+	const canRemoveClosedChats = usePermission('remove-closed-livechat-room');
+	const { filtersQuery: filters } = useChatsContext();
+
+	const { enabled: isPriorityEnabled } = useOmnichannelPriorities();
+
+	const chatsQuery = useChatsQuery();
+
+	const { current, itemsPerPage, setItemsPerPage: onSetItemsPerPage, setCurrent: onSetCurrent, ...paginationProps } = usePagination();
+	const { sortBy, sortDirection, setSort } = useSort<
+		'fname' | 'priorityWeight' | 'source.type' | 'verified' | 'department.name' | 'servedBy' | 'ts' | 'lm' | 'status'
+	>('lm', 'desc');
+
+	const query = useMemo(
+		() => chatsQuery(filters, [sortBy, sortDirection], current, itemsPerPage),
+		[itemsPerPage, filters, sortBy, sortDirection, current, chatsQuery],
+	);
+
+	const { data, isLoading, isSuccess, isError, refetch } = useCurrentChats(query);
+
+	const [defaultQuery] = useState(hashQueryKey([query]));
+	const queryHasChanged = defaultQuery !== hashQueryKey([query]);
+
+	const headers = (
+		<>
+			<GenericTableHeaderCell key='fname' direction={sortDirection} active={sortBy === 'fname'} onClick={setSort} sort='fname'>
+				{t('Name')}
+			</GenericTableHeaderCell>
+			{isPriorityEnabled && (
+				<GenericTableHeaderCell
+					key='priorityWeight'
+					direction={sortDirection}
+					active={sortBy === 'priorityWeight'}
+					onClick={setSort}
+					sort='priorityWeight'
+					alignItems='center'
+				>
+					{t('Priority')}
+				</GenericTableHeaderCell>
+			)}
+			<GenericTableHeaderCell
+				key='source.type'
+				direction={sortDirection}
+				active={sortBy === 'source.type'}
+				onClick={setSort}
+				sort='source.type'
+			>
+				{t('Channel')}
+			</GenericTableHeaderCell>
+			<GenericTableHeaderCell key='servedBy' direction={sortDirection} active={sortBy === 'servedBy'} onClick={setSort} sort='servedBy'>
+				{t('Agent')}
+			</GenericTableHeaderCell>
+			<GenericTableHeaderCell w='x100' direction={sortDirection} active={sortBy === 'verified'} onClick={setSort} sort='verified'>
+				{t('Verification')}
+			</GenericTableHeaderCell>
+			<GenericTableHeaderCell
+				key='department.name'
+				direction={sortDirection}
+				active={sortBy === 'department.name'}
+				onClick={setSort}
+				sort='department.name'
+			>
+				{t('Department')}
+			</GenericTableHeaderCell>
+			<GenericTableHeaderCell key='ts' direction={sortDirection} active={sortBy === 'ts'} onClick={setSort} sort='ts'>
+				{t('Started_At')}
+			</GenericTableHeaderCell>
+			<GenericTableHeaderCell key='lm' direction={sortDirection} active={sortBy === 'lm'} onClick={setSort} sort='lm'>
+				{t('Last_Message')}
+			</GenericTableHeaderCell>
+			<GenericTableHeaderCell key='status' direction={sortDirection} active={sortBy === 'status'} onClick={setSort} sort='status'>
+				{t('Status')}
+			</GenericTableHeaderCell>
+			{canRemoveClosedChats && <GenericTableHeaderCell key='remove' w='x60' data-qa='current-chats-header-remove' />}
+		</>
+	);
+
+	return (
+		<>
+			<ChatFilterByText />
+			{isLoading && (
+				<GenericTable>
+					<GenericTableHeader>{headers}</GenericTableHeader>
+					<GenericTableBody>
+						<GenericTableLoadingTable headerCells={headers.props.children.filter(Boolean).length} />
+					</GenericTableBody>
+				</GenericTable>
+			)}
+			{isSuccess && data?.rooms.length === 0 && queryHasChanged && <GenericNoResults />}
+			{isSuccess && data?.rooms.length === 0 && !queryHasChanged && (
+				<GenericNoResults
+					icon='message'
+					title={t('No_chats_yet')}
+					description={t('No_chats_yet_description')}
+					linkHref='https://go.rocket.chat/i/omnichannel-docs'
+					linkText={t('Learn_more_about_conversations')}
+				/>
+			)}
+			{isSuccess && data?.rooms.length > 0 && (
+				<>
+					<GenericTable fixed={false}>
+						<GenericTableHeader>{headers}</GenericTableHeader>
+						<GenericTableBody>{data?.rooms.map((room) => <ChatsTableRow key={room._id} {...room} />)}</GenericTableBody>
+					</GenericTable>
+					<Pagination
+						divider
+						current={current}
+						itemsPerPage={itemsPerPage}
+						count={data?.total || 0}
+						onSetItemsPerPage={onSetItemsPerPage}
+						onSetCurrent={onSetCurrent}
+						{...paginationProps}
+					/>
+				</>
+			)}
+			{isError && (
+				<States>
+					<StatesIcon name='warning' variation='danger' />
+					<StatesTitle>{t('Something_went_wrong')}</StatesTitle>
+					<StatesActions>
+						<StatesAction onClick={() => refetch()}>{t('Reload_page')}</StatesAction>
+					</StatesActions>
+				</States>
+			)}
+		</>
+	);
+};
+
+export default ChatsTable;
diff --git a/apps/meteor/client/views/omnichannel/directory/chats/ChatsTable/ChatsTableFilter.tsx b/apps/meteor/client/views/omnichannel/directory/chats/ChatsTable/ChatsTableFilter.tsx
new file mode 100644
index 000000000000..2cf3118fc9a8
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/directory/chats/ChatsTable/ChatsTableFilter.tsx
@@ -0,0 +1,98 @@
+import { Box, Button, Chip } from '@rocket.chat/fuselage';
+import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
+import { GenericMenu } from '@rocket.chat/ui-client';
+import { useMethod, useRoute, useSetModal, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
+import { useQueryClient } from '@tanstack/react-query';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+
+import FilterByText from '../../../../../components/FilterByText';
+import GenericModal from '../../../../../components/GenericModal';
+import { useChatsContext } from '../../contexts/ChatsContext';
+
+const ChatsTableFilter = () => {
+	const { t } = useTranslation();
+	const setModal = useSetModal();
+	const dispatchToastMessage = useToastMessageDispatch();
+	const directoryRoute = useRoute('omnichannel-directory');
+	const removeClosedChats = useMethod('livechat:removeAllClosedRooms');
+	const queryClient = useQueryClient();
+
+	const { filtersQuery, displayFilters, setFiltersQuery, removeFilter, textInputRef } = useChatsContext();
+
+	const handleRemoveAllClosed = useEffectEvent(async () => {
+		const onDeleteAll = async () => {
+			try {
+				await removeClosedChats();
+				queryClient.invalidateQueries(['current-chats']);
+				dispatchToastMessage({ type: 'success', message: t('Chat_removed') });
+			} catch (error) {
+				dispatchToastMessage({ type: 'error', message: error });
+			} finally {
+				setModal(null);
+			}
+		};
+
+		setModal(
+			<GenericModal
+				variant='danger'
+				data-qa-id='current-chats-modal-remove-all-closed'
+				onConfirm={onDeleteAll}
+				onCancel={() => setModal(null)}
+				confirmText={t('Delete')}
+			/>,
+		);
+	});
+
+	const menuItems = [
+		{
+			items: [
+				{
+					id: 'delete-all-closed-chats',
+					variant: 'danger',
+					icon: 'trash',
+					content: t('Delete_all_closed_chats'),
+					onClick: handleRemoveAllClosed,
+				} as const,
+			],
+		},
+	];
+
+	return (
+		<>
+			<FilterByText
+				ref={textInputRef}
+				value={filtersQuery.guest}
+				onChange={(event) => setFiltersQuery((prevState) => ({ ...prevState, guest: event.target.value }))}
+			>
+				<Button
+					onClick={() =>
+						directoryRoute.push({
+							tab: 'chats',
+							context: 'filters',
+						})
+					}
+					icon='customize'
+				>
+					{t('Filters')}
+				</Button>
+				<GenericMenu placement='bottom-end' detached title={t('More')} sections={menuItems} />
+			</FilterByText>
+			<Box display='flex' flexWrap='wrap' mbe={4}>
+				{Object.entries(displayFilters).map(([value, label], index) => {
+					if (!label) {
+						return null;
+					}
+
+					return (
+						<Chip mie={8} mbe={8} key={index} onClick={() => removeFilter(value)}>
+							{label}
+						</Chip>
+					);
+				})}
+			</Box>
+		</>
+	);
+};
+
+export default ChatsTableFilter;
diff --git a/apps/meteor/client/views/omnichannel/directory/chats/ChatsTable/ChatsTableRow.tsx b/apps/meteor/client/views/omnichannel/directory/chats/ChatsTable/ChatsTableRow.tsx
new file mode 100644
index 000000000000..38004d44425a
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/directory/chats/ChatsTable/ChatsTableRow.tsx
@@ -0,0 +1,95 @@
+import type { IOmnichannelRoomWithDepartment } from '@rocket.chat/core-typings';
+import { Tag, Box } from '@rocket.chat/fuselage';
+import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
+import { usePermission, useRoute } from '@rocket.chat/ui-contexts';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { GenericTableCell, GenericTableRow } from '../../../../../components/GenericTable';
+import { OmnichannelRoomIcon } from '../../../../../components/RoomIcon/OmnichannelRoomIcon';
+import { useTimeFromNow } from '../../../../../hooks/useTimeFromNow';
+import { RoomActivityIcon } from '../../../../../omnichannel/components/RoomActivityIcon';
+import { useOmnichannelPriorities } from '../../../../../omnichannel/hooks/useOmnichannelPriorities';
+import { PriorityIcon } from '../../../../../omnichannel/priorities/PriorityIcon';
+import OmnichannelVerificationTag from '../../../components/OmnichannelVerificationTag';
+import RemoveChatButton from '../../../currentChats/RemoveChatButton';
+import { useOmnichannelSource } from '../../../hooks/useOmnichannelSource';
+
+const ChatsTableRow = (room: IOmnichannelRoomWithDepartment) => {
+	const { t } = useTranslation();
+	const { _id, fname, tags, servedBy, ts, department, open, priorityWeight, lm, onHold, source, verified } = room;
+	const { enabled: isPriorityEnabled } = useOmnichannelPriorities();
+	const getTimeFromNow = useTimeFromNow(true);
+	const { getSourceLabel } = useOmnichannelSource();
+
+	const canRemoveClosedChats = usePermission('remove-closed-livechat-room');
+	const directoryRoute = useRoute('omnichannel-directory');
+
+	const getStatusText = (open = false, onHold = false): string => {
+		if (!open) {
+			return t('Closed');
+		}
+
+		if (open && !servedBy) {
+			return t('Queued');
+		}
+
+		return onHold ? t('On_Hold_Chats') : t('Room_Status_Open');
+	};
+
+	const onRowClick = useEffectEvent((id) =>
+		directoryRoute.push({
+			tab: 'chats',
+			context: 'info',
+			id,
+		}),
+	);
+
+	return (
+		<GenericTableRow key={_id} tabIndex={0} role='link' onClick={() => onRowClick(_id)} action qa-user-id={_id}>
+			<GenericTableCell withTruncatedText>
+				<Box display='flex' flexDirection='column'>
+					<Box withTruncatedText>{fname}</Box>
+					{tags && (
+						<Box color='hint' display='flex' flex-direction='row'>
+							{tags.map((tag: string) => (
+								<Box mbs={4} mie={4} withTruncatedText overflow={tag.length > 10 ? 'hidden' : 'visible'} key={tag}>
+									<Tag style={{ display: 'inline' }} disabled>
+										{tag}
+									</Tag>
+								</Box>
+							))}
+						</Box>
+					)}
+				</Box>
+			</GenericTableCell>
+			{isPriorityEnabled && (
+				<GenericTableCell>
+					<PriorityIcon level={priorityWeight} />
+				</GenericTableCell>
+			)}
+			<GenericTableCell withTruncatedText>
+				<Box display='flex' alignItems='center'>
+					<OmnichannelRoomIcon size='x20' source={source} />
+					<Box mis={8}>{getSourceLabel(source)}</Box>
+				</Box>
+			</GenericTableCell>
+			<GenericTableCell withTruncatedText>{servedBy?.username}</GenericTableCell>
+			<GenericTableCell>
+				<Box display='flex'>
+					<OmnichannelVerificationTag verified={verified} />
+				</Box>
+			</GenericTableCell>
+			<GenericTableCell withTruncatedText>{department?.name}</GenericTableCell>
+			<GenericTableCell withTruncatedText>{getTimeFromNow(ts)}</GenericTableCell>
+			<GenericTableCell withTruncatedText>{getTimeFromNow(lm)}</GenericTableCell>
+			<GenericTableCell withTruncatedText>
+				<RoomActivityIcon room={room} />
+				{getStatusText(open, onHold)}
+			</GenericTableCell>
+			{canRemoveClosedChats && <GenericTableCell>{!open && <RemoveChatButton _id={_id} />}</GenericTableCell>}
+		</GenericTableRow>
+	);
+};
+
+export default ChatsTableRow;
diff --git a/apps/meteor/client/views/omnichannel/directory/chats/ChatsTable/index.ts b/apps/meteor/client/views/omnichannel/directory/chats/ChatsTable/index.ts
new file mode 100644
index 000000000000..a22b8212eecc
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/directory/chats/ChatsTable/index.ts
@@ -0,0 +1 @@
+export { default } from './ChatsTable';
diff --git a/apps/meteor/client/views/omnichannel/directory/chats/ChatsTable/useChatsQuery.ts b/apps/meteor/client/views/omnichannel/directory/chats/ChatsTable/useChatsQuery.ts
new file mode 100644
index 000000000000..cbed6ab41ee9
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/directory/chats/ChatsTable/useChatsQuery.ts
@@ -0,0 +1,97 @@
+import type { GETLivechatRoomsParams } from '@rocket.chat/rest-typings';
+import { usePermission, useUserId } from '@rocket.chat/ui-contexts';
+import moment from 'moment';
+import { useCallback } from 'react';
+
+import type { ChatsFiltersQuery } from '../../contexts/ChatsContext';
+
+type useQueryType = (
+	debouncedParams: ChatsFiltersQuery,
+	[column, direction]: [string, 'asc' | 'desc'],
+	current: number,
+	itemsPerPage: 25 | 50 | 100,
+) => GETLivechatRoomsParams;
+
+type CurrentChatQuery = {
+	agents?: string[];
+	offset?: number;
+	roomName?: string;
+	departmentId?: string;
+	open?: boolean;
+	createdAt?: string;
+	closedAt?: string;
+	tags?: string[];
+	onhold?: boolean;
+	customFields?: string;
+	sort: string;
+	count?: number;
+	queued?: boolean;
+};
+
+const sortDir = (sortDir: 'asc' | 'desc'): 1 | -1 => (sortDir === 'asc' ? 1 : -1);
+
+export const useChatsQuery = () => {
+	const userIdLoggedIn = useUserId();
+	const canViewLivechatRooms = usePermission('view-livechat-rooms');
+
+	const chatsQuery: useQueryType = useCallback(
+		({ guest, servedBy, department, status, from, to, tags, ...customFields }, [column, direction], current, itemsPerPage) => {
+			const query: CurrentChatQuery = {
+				...(guest && { roomName: guest }),
+				sort: JSON.stringify({
+					[column]: sortDir(direction),
+					ts: column === 'ts' ? sortDir(direction) : undefined,
+				}),
+				...(itemsPerPage && { count: itemsPerPage }),
+				...(current && { offset: current }),
+			};
+
+			if (from || to) {
+				query.createdAt = JSON.stringify({
+					...(from && {
+						start: moment(new Date(from)).set({ hour: 0, minutes: 0, seconds: 0 }).toISOString(),
+					}),
+					...(to && {
+						end: moment(new Date(to)).set({ hour: 23, minutes: 59, seconds: 59 }).toISOString(),
+					}),
+				});
+			}
+
+			if (status !== 'all') {
+				query.open = status === 'opened' || status === 'onhold' || status === 'queued';
+				query.onhold = status === 'onhold';
+				query.queued = status === 'queued';
+			}
+
+			if (!canViewLivechatRooms) {
+				query.agents = userIdLoggedIn ? [userIdLoggedIn] : [];
+			}
+
+			if (canViewLivechatRooms && servedBy && servedBy !== 'all') {
+				query.agents = [servedBy];
+			}
+
+			if (department && department !== 'all') {
+				query.departmentId = department;
+			}
+
+			if (tags && tags.length > 0) {
+				query.tags = tags.map((tag) => tag.value);
+			}
+
+			if (customFields && Object.keys(customFields).length > 0) {
+				const customFieldsQuery = Object.fromEntries(
+					Object.entries(customFields).filter((item) => item[1] !== undefined && item[1] !== ''),
+				);
+				if (Object.keys(customFieldsQuery).length > 0) {
+					query.customFields = JSON.stringify(customFieldsQuery);
+				}
+			}
+
+			return query;
+		},
+		[canViewLivechatRooms, userIdLoggedIn],
+	);
+
+	return chatsQuery;
+};
diff --git a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/ChatInfoDirectory.tsx b/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/ChatInfoDirectory.tsx
deleted file mode 100644
index 5389435425e7..000000000000
--- a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/ChatInfoDirectory.tsx
+++ /dev/null
@@ -1,194 +0,0 @@
-import type { ILivechatCustomField, IOmnichannelRoom, IVisitor, Serialized } from '@rocket.chat/core-typings';
-import { Box, Margins, Tag, Button, ButtonGroup } from '@rocket.chat/fuselage';
-import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import type { IRouterPaths } from '@rocket.chat/ui-contexts';
-import { useToastMessageDispatch, useRoute, useUserSubscription, useTranslation } from '@rocket.chat/ui-contexts';
-import { Meteor } from 'meteor/meteor';
-import moment from 'moment';
-import React, { useEffect, useMemo, useState } from 'react';
-
-import { hasPermission } from '../../../../../../app/authorization/client';
-import { ContextualbarScrollableContent, ContextualbarFooter } from '../../../../../components/Contextualbar';
-import { InfoPanelField, InfoPanelLabel, InfoPanelText } from '../../../../../components/InfoPanel';
-import MarkdownText from '../../../../../components/MarkdownText';
-import { useEndpointData } from '../../../../../hooks/useEndpointData';
-import { useFormatDateAndTime } from '../../../../../hooks/useFormatDateAndTime';
-import { useFormatDuration } from '../../../../../hooks/useFormatDuration';
-import CustomField from '../../../components/CustomField';
-import { AgentField, ContactField, SlaField } from '../../components';
-import PriorityField from '../../components/PriorityField';
-import { formatQueuedAt } from '../../utils/formatQueuedAt';
-import DepartmentField from './DepartmentField';
-import VisitorClientInfo from './VisitorClientInfo';
-
-type ChatInfoDirectoryProps = {
-	id: string;
-	route?: keyof IRouterPaths;
-	room: Serialized<IOmnichannelRoom>; // FIXME: `room` is serialized, but we need to deserialize it
-};
-
-function ChatInfoDirectory({ id, route = undefined, room }: ChatInfoDirectoryProps) {
-	const t = useTranslation();
-
-	const formatDateAndTime = useFormatDateAndTime();
-	const { value: allCustomFields, phase: stateCustomFields } = useEndpointData('/v1/livechat/custom-fields');
-	const [customFields, setCustomFields] = useState<Serialized<ILivechatCustomField>[]>([]);
-	const formatDuration = useFormatDuration();
-
-	const {
-		ts,
-		tags,
-		closedAt,
-		departmentId,
-		v,
-		servedBy,
-		metrics,
-		topic,
-		waitingResponse,
-		responseBy,
-		slaId,
-		priorityId,
-		livechatData,
-		queuedAt,
-	} = room || { v: {} };
-
-	const routePath = useRoute(route || 'omnichannel-directory');
-	const canViewCustomFields = () => hasPermission('view-livechat-room-customfields');
-	const subscription = useUserSubscription(id);
-	const hasGlobalEditRoomPermission = hasPermission('save-others-livechat-room-info');
-	const hasLocalEditRoomPermission = servedBy?._id === Meteor.userId();
-	const visitorId = v?._id;
-	const queueStartedAt = queuedAt || ts;
-
-	const queueTime = useMemo(() => formatQueuedAt(room), [room]);
-
-	const dispatchToastMessage = useToastMessageDispatch();
-	useEffect(() => {
-		if (allCustomFields) {
-			const { customFields: customFieldsAPI } = allCustomFields;
-			setCustomFields(customFieldsAPI);
-		}
-	}, [allCustomFields, stateCustomFields]);
-
-	const checkIsVisibleAndScopeRoom = (key: string) => {
-		const field = customFields.find(({ _id }) => _id === key);
-		if (field && field.visibility === 'visible' && field.scope === 'room') {
-			return true;
-		}
-		return false;
-	};
-
-	const onEditClick = useMutableCallback(() => {
-		const hasEditAccess = !!subscription || hasLocalEditRoomPermission || hasGlobalEditRoomPermission;
-		if (!hasEditAccess) {
-			return dispatchToastMessage({ type: 'error', message: t('Not_authorized') });
-		}
-
-		routePath.push(
-			route
-				? {
-						tab: 'room-info',
-						context: 'edit',
-						id,
-				  }
-				: {
-						page: 'chats',
-						id,
-						bar: 'edit',
-				  },
-		);
-	});
-
-	return (
-		<>
-			<ContextualbarScrollableContent p={24}>
-				<Margins block='x4'>
-					{room && v && <ContactField contact={v as IVisitor} room={room as unknown as IOmnichannelRoom} />}
-					{visitorId && <VisitorClientInfo uid={visitorId} />}
-					{servedBy && <AgentField agent={servedBy as unknown as IOmnichannelRoom['servedBy']} />}
-					{departmentId && <DepartmentField departmentId={departmentId} />}
-					{tags && tags.length > 0 && (
-						<InfoPanelField>
-							<InfoPanelLabel>{t('Tags')}</InfoPanelLabel>
-							<InfoPanelText>
-								{tags.map((tag) => (
-									<Box key={tag} mie={4} display='inline'>
-										<Tag style={{ display: 'inline' }} disabled>
-											{tag}
-										</Tag>
-									</Box>
-								))}
-							</InfoPanelText>
-						</InfoPanelField>
-					)}
-					{topic && (
-						<InfoPanelField>
-							<InfoPanelLabel>{t('Topic')}</InfoPanelLabel>
-							<InfoPanelText withTruncatedText={false}>
-								<MarkdownText variant='inline' content={topic} />
-							</InfoPanelText>
-						</InfoPanelField>
-					)}
-					{queueStartedAt && (
-						<InfoPanelField>
-							<InfoPanelLabel>{t('Queue_Time')}</InfoPanelLabel>
-							{queueTime}
-						</InfoPanelField>
-					)}
-					{closedAt && (
-						<InfoPanelField>
-							<InfoPanelLabel>{t('Chat_Duration')}</InfoPanelLabel>
-							<InfoPanelText>{moment(closedAt).from(moment(ts), true)}</InfoPanelText>
-						</InfoPanelField>
-					)}
-					{ts && (
-						<InfoPanelField>
-							<InfoPanelLabel>{t('Created_at')}</InfoPanelLabel>
-							<InfoPanelText>{formatDateAndTime(ts)}</InfoPanelText>
-						</InfoPanelField>
-					)}
-					{closedAt && (
-						<InfoPanelField>
-							<InfoPanelLabel>{t('Closed_At')}</InfoPanelLabel>
-							<InfoPanelText>{formatDateAndTime(closedAt)}</InfoPanelText>
-						</InfoPanelField>
-					)}
-					{servedBy?.ts && (
-						<InfoPanelField>
-							<InfoPanelLabel>{t('Taken_at')}</InfoPanelLabel>
-							<InfoPanelText>{formatDateAndTime(servedBy.ts)}</InfoPanelText>
-						</InfoPanelField>
-					)}
-					{metrics?.response?.avg && formatDuration(metrics.response.avg) && (
-						<InfoPanelField>
-							<InfoPanelLabel>{t('Avg_response_time')}</InfoPanelLabel>
-							<InfoPanelText>{formatDuration(metrics.response.avg)}</InfoPanelText>
-						</InfoPanelField>
-					)}
-					{!waitingResponse && responseBy?.lastMessageTs && (
-						<InfoPanelField>
-							<InfoPanelLabel>{t('Inactivity_Time')}</InfoPanelLabel>
-							<InfoPanelText>{moment(responseBy.lastMessageTs).fromNow(true)}</InfoPanelText>
-						</InfoPanelField>
-					)}
-					{canViewCustomFields() &&
-						livechatData &&
-						Object.keys(livechatData).map(
-							(key) => checkIsVisibleAndScopeRoom(key) && livechatData[key] && <CustomField key={key} id={key} value={livechatData[key]} />,
-						)}
-					{slaId && <SlaField id={slaId} />}
-					{priorityId && <PriorityField id={priorityId} />}
-				</Margins>
-			</ContextualbarScrollableContent>
-			<ContextualbarFooter>
-				<ButtonGroup stretch>
-					<Button icon='pencil' onClick={onEditClick}>
-						{t('Edit')}
-					</Button>
-				</ButtonGroup>
-			</ContextualbarFooter>
-		</>
-	);
-}
-
-export default ChatInfoDirectory;
diff --git a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/RoomEdit/index.ts b/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/RoomEdit/index.ts
deleted file mode 100644
index dcfd1c14d2d9..000000000000
--- a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/RoomEdit/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { default as RoomEditWithData } from './RoomEditWithData';
diff --git a/apps/meteor/client/views/omnichannel/directory/components/AgentField.tsx b/apps/meteor/client/views/omnichannel/directory/components/AgentField.tsx
index 91b21d219ffe..9fe9d5d84c69 100644
--- a/apps/meteor/client/views/omnichannel/directory/components/AgentField.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/components/AgentField.tsx
@@ -1,15 +1,16 @@
 import type { IOmnichannelRoom } from '@rocket.chat/core-typings';
 import { UserAvatar } from '@rocket.chat/ui-avatar';
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
+import { FormSkeleton } from './FormSkeleton';
 import { UserStatus } from '../../../../components/UserStatus';
 import AgentInfoDetails from '../../components/AgentInfoDetails';
 import Field from '../../components/Field';
 import Info from '../../components/Info';
 import Label from '../../components/Label';
-import { FormSkeleton } from './FormSkeleton';
 
 type AgentFieldProps = {
 	agent: IOmnichannelRoom['servedBy'];
@@ -17,7 +18,7 @@ type AgentFieldProps = {
 };
 
 const AgentField = ({ agent, isSmall = false }: AgentFieldProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { username = '' } = agent ?? {};
 	const getUserInfo = useEndpoint('GET', '/v1/users.info');
 	const { data, isLoading } = useQuery(['/v1/users.info', username], () => getUserInfo({ username }));
diff --git a/apps/meteor/client/views/omnichannel/directory/components/CallDialpadButton.tsx b/apps/meteor/client/views/omnichannel/directory/components/CallDialpadButton.tsx
index 4c68389a9604..9ba308f02649 100644
--- a/apps/meteor/client/views/omnichannel/directory/components/CallDialpadButton.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/components/CallDialpadButton.tsx
@@ -13,7 +13,7 @@ const rcxCallDialButton = css`
 	}
 `;
 
-export const CallDialpadButton = ({ phoneNumber }: { phoneNumber: string }): ReactElement => {
+export const CallDialpadButton = ({ phoneNumber }: { phoneNumber?: string }): ReactElement => {
 	const { t } = useTranslation();
 
 	const { outBoundCallsAllowed, outBoundCallsEnabledForUser } = useVoipOutboundStates();
diff --git a/apps/meteor/client/views/omnichannel/directory/components/ContactField.tsx b/apps/meteor/client/views/omnichannel/directory/components/ContactField.tsx
index d9d4541b425c..94e678d8c8e5 100644
--- a/apps/meteor/client/views/omnichannel/directory/components/ContactField.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/components/ContactField.tsx
@@ -1,16 +1,17 @@
 import type { IOmnichannelGenericRoom, IVisitor } from '@rocket.chat/core-typings';
 import { Avatar, Box } from '@rocket.chat/fuselage';
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
+import { FormSkeleton } from './FormSkeleton';
 import { UserStatus } from '../../../../components/UserStatus';
 import { roomCoordinator } from '../../../../lib/rooms/roomCoordinator';
 import AgentInfoDetails from '../../components/AgentInfoDetails';
 import Field from '../../components/Field';
 import Info from '../../components/Info';
 import Label from '../../components/Label';
-import { FormSkeleton } from './FormSkeleton';
 
 type ContactFieldProps = {
 	contact: IVisitor;
@@ -18,7 +19,7 @@ type ContactFieldProps = {
 };
 
 const ContactField = ({ contact, room }: ContactFieldProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { status } = contact;
 	const { fname, t: type } = room;
 	const avatarUrl = roomCoordinator.getRoomDirectives(type).getAvatarPath(room) || '';
diff --git a/apps/meteor/client/views/omnichannel/directory/components/PriorityField.tsx b/apps/meteor/client/views/omnichannel/directory/components/PriorityField.tsx
index 86ca44762d44..4a1945657841 100644
--- a/apps/meteor/client/views/omnichannel/directory/components/PriorityField.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/components/PriorityField.tsx
@@ -2,11 +2,11 @@ import { Box } from '@rocket.chat/fuselage';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
+import { FormSkeleton } from './FormSkeleton';
 import Field from '../../components/Field';
 import Info from '../../components/Info';
 import Label from '../../components/Label';
 import { usePriorityInfo } from '../hooks/usePriorityInfo';
-import { FormSkeleton } from './FormSkeleton';
 
 type PriorityFieldProps = {
 	id: string;
diff --git a/apps/meteor/client/views/omnichannel/directory/components/SlaField.tsx b/apps/meteor/client/views/omnichannel/directory/components/SlaField.tsx
index 7b029d73403a..3cbb016b1e60 100644
--- a/apps/meteor/client/views/omnichannel/directory/components/SlaField.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/components/SlaField.tsx
@@ -2,11 +2,11 @@ import { Box } from '@rocket.chat/fuselage';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
+import { FormSkeleton } from './FormSkeleton';
 import Field from '../../components/Field';
 import Info from '../../components/Info';
 import Label from '../../components/Label';
 import { useSlaInfo } from '../hooks/useSlaInfo';
-import { FormSkeleton } from './FormSkeleton';
 
 type SlaFieldProps = {
 	id: string;
diff --git a/apps/meteor/client/views/omnichannel/directory/components/SourceField.tsx b/apps/meteor/client/views/omnichannel/directory/components/SourceField.tsx
index ca3f703abd1d..f1588dc59238 100644
--- a/apps/meteor/client/views/omnichannel/directory/components/SourceField.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/components/SourceField.tsx
@@ -7,6 +7,7 @@ import { OmnichannelRoomIcon } from '../../../../components/RoomIcon/Omnichannel
 import Field from '../../components/Field';
 import Info from '../../components/Info';
 import Label from '../../components/Label';
+import { useOmnichannelSource } from '../../hooks/useOmnichannelSource';
 
 type SourceFieldProps = {
 	room: IOmnichannelRoom;
@@ -14,26 +15,7 @@ type SourceFieldProps = {
 
 const SourceField = ({ room }: SourceFieldProps) => {
 	const { t } = useTranslation();
-
-	const roomSource = room.source.alias || room.source.id || room.source.type;
-
-	// TODO: create a hook that gets the default types values (alias, icons, ids, etc...)
-	// so we don't have to write this object again and again
-	const defaultTypesLabels: {
-		widget: string;
-		email: string;
-		sms: string;
-		app: string;
-		api: string;
-		other: string;
-	} = {
-		widget: t('Livechat'),
-		email: t('Email'),
-		sms: t('SMS'),
-		app: room.source.alias || t('Custom_Integration'),
-		api: room.source.alias || t('Custom_Integration'),
-		other: t('Custom_Integration'),
-	};
+	const { getSourceName } = useOmnichannelSource();
 
 	const defaultTypesVisitorData: {
 		widget: string | undefined;
@@ -58,7 +40,7 @@ const SourceField = ({ room }: SourceFieldProps) => {
 				<Box display='flex' alignItems='center'>
 					<OmnichannelRoomIcon source={room.source} status={room.v.status} size='x24' />
 					<Label mi={8} mbe='0'>
-						{defaultTypesLabels[room.source.type] || roomSource}
+						{getSourceName(room.source)}
 					</Label>
 					{defaultTypesVisitorData[room.source.type]}
 				</Box>
diff --git a/apps/meteor/client/views/omnichannel/directory/contacts/ContactTab.tsx b/apps/meteor/client/views/omnichannel/directory/contacts/ContactTab.tsx
index 6942a33afc37..0ef8f0050c1e 100644
--- a/apps/meteor/client/views/omnichannel/directory/contacts/ContactTab.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/contacts/ContactTab.tsx
@@ -1,8 +1,8 @@
 import { usePermission } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import NotAuthorizedPage from '../../../notAuthorized/NotAuthorizedPage';
 import ContactTable from './ContactTable';
+import NotAuthorizedPage from '../../../notAuthorized/NotAuthorizedPage';
 
 const ContactTab = () => {
 	const hasAccess = usePermission('view-l-room');
diff --git a/apps/meteor/client/views/omnichannel/directory/contacts/ContactTable.tsx b/apps/meteor/client/views/omnichannel/directory/contacts/ContactTable.tsx
index 09ec19e6a2fe..b7441c3dbf6c 100644
--- a/apps/meteor/client/views/omnichannel/directory/contacts/ContactTable.tsx
+++ b/apps/meteor/client/views/omnichannel/directory/contacts/ContactTable.tsx
@@ -1,42 +1,39 @@
 import { Pagination, States, StatesAction, StatesActions, StatesIcon, StatesTitle, Box, Button } from '@rocket.chat/fuselage';
-import { useDebouncedState, useDebouncedValue, useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useRoute, useTranslation } from '@rocket.chat/ui-contexts';
+import { useDebouncedValue, useEffectEvent } from '@rocket.chat/fuselage-hooks';
+import { useRoute } from '@rocket.chat/ui-contexts';
 import { hashQueryKey } from '@tanstack/react-query';
-import type { ReactElement } from 'react';
 import React, { useMemo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
+import ContactTableRow from './ContactTableRow';
+import { useCurrentContacts } from './hooks/useCurrentContacts';
 import FilterByText from '../../../../components/FilterByText';
 import GenericNoResults from '../../../../components/GenericNoResults';
 import {
 	GenericTable,
 	GenericTableHeader,
-	GenericTableCell,
 	GenericTableBody,
-	GenericTableRow,
 	GenericTableHeaderCell,
-	GenericTableLoadingRow,
+	GenericTableLoadingTable,
 } from '../../../../components/GenericTable';
 import { usePagination } from '../../../../components/GenericTable/hooks/usePagination';
 import { useSort } from '../../../../components/GenericTable/hooks/useSort';
 import { useIsCallReady } from '../../../../contexts/CallContext';
-import { useFormatDate } from '../../../../hooks/useFormatDate';
-import { parseOutboundPhoneNumber } from '../../../../lib/voip/parseOutboundPhoneNumber';
-import { CallDialpadButton } from '../components/CallDialpadButton';
-import { useCurrentContacts } from './hooks/useCurrentContacts';
 
-function ContactTable(): ReactElement {
-	const { current, itemsPerPage, setItemsPerPage, setCurrent, ...paginationProps } = usePagination();
-	const { sortBy, sortDirection, setSort } = useSort<'username' | 'phone' | 'name' | 'visitorEmails.address' | 'lastChat.ts'>('username');
-	const isCallReady = useIsCallReady();
+function ContactTable() {
+	const { t } = useTranslation();
 
-	const [term, setTerm] = useDebouncedState('', 500);
+	const [term, setTerm] = useState('');
+	const directoryRoute = useRoute('omnichannel-directory');
+	const isCallReady = useIsCallReady();
 
-	const t = useTranslation();
+	const { current, itemsPerPage, setItemsPerPage, setCurrent, ...paginationProps } = usePagination();
+	const { sortBy, sortDirection, setSort } = useSort<'name' | 'channels.lastChat.ts' | 'contactManager.username' | 'lastChat.ts'>('name');
 
 	const query = useDebouncedValue(
 		useMemo(
 			() => ({
-				term,
+				searchText: term,
 				sort: `{ "${sortBy}": ${sortDirection === 'asc' ? 1 : -1} }`,
 				...(itemsPerPage && { count: itemsPerPage }),
 				...(current && { offset: current }),
@@ -46,25 +43,13 @@ function ContactTable(): ReactElement {
 		500,
 	);
 
-	const directoryRoute = useRoute('omnichannel-directory');
-	const formatDate = useFormatDate();
-
-	const onButtonNewClick = useMutableCallback(() =>
+	const onButtonNewClick = useEffectEvent(() =>
 		directoryRoute.push({
-			page: 'contacts',
-			bar: 'new',
+			tab: 'contacts',
+			context: 'new',
 		}),
 	);
 
-	const onRowClick = useMutableCallback(
-		(id) => (): void =>
-			directoryRoute.push({
-				page: 'contacts',
-				id,
-				bar: 'info',
-			}),
-	);
-
 	const { data, isLoading, isError, isSuccess, refetch } = useCurrentContacts(query);
 
 	const [defaultQuery] = useState(hashQueryKey([query]));
@@ -72,23 +57,26 @@ function ContactTable(): ReactElement {
 
 	const headers = (
 		<>
-			<GenericTableHeaderCell key='username' direction={sortDirection} active={sortBy === 'username'} onClick={setSort} sort='username'>
-				{t('Username')}
-			</GenericTableHeaderCell>
 			<GenericTableHeaderCell key='name' direction={sortDirection} active={sortBy === 'name'} onClick={setSort} sort='name'>
 				{t('Name')}
 			</GenericTableHeaderCell>
-			<GenericTableHeaderCell key='phone' direction={sortDirection} active={sortBy === 'phone'} onClick={setSort} sort='phone'>
-				{t('Phone')}
+			<GenericTableHeaderCell
+				key='lastChannel'
+				direction={sortDirection}
+				active={sortBy === 'channels.lastChat.ts'}
+				onClick={setSort}
+				sort='channels.lastChat.ts'
+			>
+				{t('Last_channel')}
 			</GenericTableHeaderCell>
 			<GenericTableHeaderCell
-				key='email'
+				key='contactManager'
 				direction={sortDirection}
-				active={sortBy === 'visitorEmails.address'}
+				active={sortBy === 'contactManager.username'}
 				onClick={setSort}
-				sort='visitorEmails.address'
+				sort='contactManager.username'
 			>
-				{t('Email')}
+				{t('Contact_Manager')}
 			</GenericTableHeaderCell>
 			<GenericTableHeaderCell
 				key='lastchat'
@@ -99,14 +87,14 @@ function ContactTable(): ReactElement {
 			>
 				{t('Last_Chat')}
 			</GenericTableHeaderCell>
-			<GenericTableHeaderCell key='call' width={44} />
+			{isCallReady && <GenericTableHeaderCell key='call' width={44} />}
 		</>
 	);
 
 	return (
 		<>
-			{((isSuccess && data?.visitors.length > 0) || queryHasChanged) && (
-				<FilterByText onChange={setTerm}>
+			{((isSuccess && data?.contacts.length > 0) || queryHasChanged) && (
+				<FilterByText value={term} onChange={(event) => setTerm(event.target.value)}>
 					<Button onClick={onButtonNewClick} primary>
 						{t('New_contact')}
 					</Button>
@@ -116,12 +104,12 @@ function ContactTable(): ReactElement {
 				<GenericTable>
 					<GenericTableHeader>{headers}</GenericTableHeader>
 					<GenericTableBody>
-						<GenericTableLoadingRow cols={6} />
+						<GenericTableLoadingTable headerCells={headers.props.children.filter(Boolean).length} />
 					</GenericTableBody>
 				</GenericTable>
 			)}
-			{isSuccess && data?.visitors.length === 0 && queryHasChanged && <GenericNoResults />}
-			{isSuccess && data?.visitors.length === 0 && !queryHasChanged && (
+			{isSuccess && data?.contacts.length === 0 && queryHasChanged && <GenericNoResults />}
+			{isSuccess && data?.contacts.length === 0 && !queryHasChanged && (
 				<GenericNoResults
 					icon='user-plus'
 					title={t('No_contacts_yet')}
@@ -132,36 +120,11 @@ function ContactTable(): ReactElement {
 					linkText={t('Learn_more_about_contacts')}
 				/>
 			)}
-			{isSuccess && data?.visitors.length > 0 && (
+			{isSuccess && data?.contacts.length > 0 && (
 				<>
 					<GenericTable>
 						<GenericTableHeader>{headers}</GenericTableHeader>
-						<GenericTableBody>
-							{data?.visitors.map(({ _id, username, fname, name, visitorEmails, phone, lastChat }) => {
-								const phoneNumber = (phone?.length && phone[0].phoneNumber) || '';
-								const visitorEmail = visitorEmails?.length && visitorEmails[0].address;
-
-								return (
-									<GenericTableRow
-										action
-										key={_id}
-										tabIndex={0}
-										role='link'
-										height='40px'
-										qa-user-id={_id}
-										rcx-show-call-button-on-hover
-										onClick={onRowClick(_id)}
-									>
-										<GenericTableCell withTruncatedText>{username}</GenericTableCell>
-										<GenericTableCell withTruncatedText>{parseOutboundPhoneNumber(fname || name)}</GenericTableCell>
-										<GenericTableCell withTruncatedText>{parseOutboundPhoneNumber(phoneNumber)}</GenericTableCell>
-										<GenericTableCell withTruncatedText>{visitorEmail}</GenericTableCell>
-										<GenericTableCell withTruncatedText>{lastChat && formatDate(lastChat.ts)}</GenericTableCell>
-										<GenericTableCell>{isCallReady && <CallDialpadButton phoneNumber={phoneNumber} />}</GenericTableCell>
-									</GenericTableRow>
-								);
-							})}
-						</GenericTableBody>
+						<GenericTableBody>{data?.contacts.map((contact) => <ContactTableRow key={contact._id} {...contact} />)}</GenericTableBody>
 					</GenericTable>
 					<Pagination
 						divider
diff --git a/apps/meteor/client/views/omnichannel/directory/contacts/ContactTableRow.tsx b/apps/meteor/client/views/omnichannel/directory/contacts/ContactTableRow.tsx
new file mode 100644
index 000000000000..a8b3e97ae00e
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/directory/contacts/ContactTableRow.tsx
@@ -0,0 +1,71 @@
+import { Box } from '@rocket.chat/fuselage';
+import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
+import type { ILivechatContactWithManagerData } from '@rocket.chat/rest-typings';
+import { useRoute } from '@rocket.chat/ui-contexts';
+import React from 'react';
+
+import { GenericTableCell, GenericTableRow } from '../../../../components/GenericTable';
+import { OmnichannelRoomIcon } from '../../../../components/RoomIcon/OmnichannelRoomIcon';
+import { useIsCallReady } from '../../../../contexts/CallContext';
+import { useTimeFromNow } from '../../../../hooks/useTimeFromNow';
+import { useOmnichannelSource } from '../../hooks/useOmnichannelSource';
+import { CallDialpadButton } from '../components/CallDialpadButton';
+
+const ContactTableRow = ({ _id, name, phones, contactManager, lastChat, channels }: ILivechatContactWithManagerData) => {
+	const { getSourceLabel } = useOmnichannelSource();
+	const getTimeFromNow = useTimeFromNow(true);
+	const directoryRoute = useRoute('omnichannel-directory');
+	const isCallReady = useIsCallReady();
+
+	const phoneNumber = phones?.length ? phones[0].phoneNumber : undefined;
+	const latestChannel = channels?.sort((a, b) => {
+		if (a.lastChat && b.lastChat) {
+			return a.lastChat.ts > b.lastChat.ts ? -1 : 1;
+		}
+
+		return 0;
+	})[0];
+
+	const onRowClick = useEffectEvent(
+		(id) => (): void =>
+			directoryRoute.push({
+				id,
+				tab: 'contacts',
+				context: 'details',
+			}),
+	);
+
+	return (
+		<GenericTableRow
+			action
+			key={_id}
+			tabIndex={0}
+			role='link'
+			height='40px'
+			qa-user-id={_id}
+			rcx-show-call-button-on-hover
+			onClick={onRowClick(_id)}
+		>
+			<GenericTableCell withTruncatedText>{name}</GenericTableCell>
+			<GenericTableCell withTruncatedText>
+				{latestChannel?.details && (
+					<Box withTruncatedText display='flex' alignItems='center'>
+						<OmnichannelRoomIcon size='x20' source={latestChannel?.details} />
+						<Box withTruncatedText mis={8}>
+							{getSourceLabel(latestChannel?.details)}
+						</Box>
+					</Box>
+				)}
+			</GenericTableCell>
+			<GenericTableCell withTruncatedText>{contactManager?.username}</GenericTableCell>
+			<GenericTableCell withTruncatedText>{lastChat && getTimeFromNow(lastChat.ts)}</GenericTableCell>
+			{isCallReady && (
+				<GenericTableCell>
+					<CallDialpadButton phoneNumber={phoneNumber} />
+				</GenericTableCell>
+			)}
+		</GenericTableRow>
+	);
+};
+
+export default ContactTableRow;
diff --git a/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactEditWithData.tsx b/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactEditWithData.tsx
deleted file mode 100644
index 778367f41c01..000000000000
--- a/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactEditWithData.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import { Box, ContextualbarContent } from '@rocket.chat/fuselage';
-import React, { useMemo } from 'react';
-import { useTranslation } from 'react-i18next';
-
-import { AsyncStatePhase } from '../../../../../hooks/useAsyncState';
-import { useEndpointData } from '../../../../../hooks/useEndpointData';
-import { FormSkeleton } from '../../components/FormSkeleton';
-import ContactNewEdit from './ContactNewEdit';
-
-type ContactEditWithDataProps = {
-	id: string;
-	close: () => void;
-};
-
-function ContactEditWithData({ id, close }: ContactEditWithDataProps) {
-	const { t } = useTranslation();
-	const {
-		value: data,
-		phase: state,
-		error,
-	} = useEndpointData('/v1/omnichannel/contact', { params: useMemo(() => ({ contactId: id }), [id]) });
-
-	if ([state].includes(AsyncStatePhase.LOADING)) {
-		return (
-			<ContextualbarContent>
-				<FormSkeleton />
-			</ContextualbarContent>
-		);
-	}
-
-	if (error || !data || !data.contact) {
-		return <Box mbs={16}>{t('Contact_not_found')}</Box>;
-	}
-
-	return <ContactNewEdit id={id} data={data} close={close} />;
-}
-
-export default ContactEditWithData;
diff --git a/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactInfo.tsx b/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactInfo.tsx
deleted file mode 100644
index 184006a745c4..000000000000
--- a/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactInfo.tsx
+++ /dev/null
@@ -1,197 +0,0 @@
-import { Box, Margins, ButtonGroup, Button, Divider } from '@rocket.chat/fuselage';
-import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { UserAvatar } from '@rocket.chat/ui-avatar';
-import type { RouteName } from '@rocket.chat/ui-contexts';
-import { useToastMessageDispatch, useRoute, useTranslation, useEndpoint, usePermission, useRouter } from '@rocket.chat/ui-contexts';
-import { useQuery } from '@tanstack/react-query';
-import React, { useCallback } from 'react';
-import { useSyncExternalStore } from 'use-sync-external-store/shim';
-
-import { ContextualbarScrollableContent, ContextualbarFooter } from '../../../../../components/Contextualbar';
-import { UserStatus } from '../../../../../components/UserStatus';
-import { useIsCallReady } from '../../../../../contexts/CallContext';
-import { useFormatDate } from '../../../../../hooks/useFormatDate';
-import { parseOutboundPhoneNumber } from '../../../../../lib/voip/parseOutboundPhoneNumber';
-import ContactManagerInfo from '../../../../../omnichannel/ContactManagerInfo';
-import AgentInfoDetails from '../../../components/AgentInfoDetails';
-import CustomField from '../../../components/CustomField';
-import Field from '../../../components/Field';
-import Info from '../../../components/Info';
-import Label from '../../../components/Label';
-import { VoipInfoCallButton } from '../../calls/contextualBar/VoipInfoCallButton';
-import { FormSkeleton } from '../../components/FormSkeleton';
-
-type ContactInfoProps = {
-	id: string;
-	rid?: string;
-	route?: RouteName;
-};
-
-const ContactInfo = ({ id: contactId, rid: roomId = '', route }: ContactInfoProps) => {
-	const t = useTranslation();
-	const dispatchToastMessage = useToastMessageDispatch();
-
-	const router = useRouter();
-	const liveRoute = useRoute('live');
-
-	const currentRouteName = useSyncExternalStore(
-		router.subscribeToRouteChange,
-		useCallback(() => router.getRouteName(), [router]),
-	);
-
-	const formatDate = useFormatDate();
-	const isCallReady = useIsCallReady();
-
-	const canViewCustomFields = usePermission('view-livechat-room-customfields');
-	const canEditContact = usePermission('edit-omnichannel-contact');
-
-	const getCustomFields = useEndpoint('GET', '/v1/livechat/custom-fields');
-	const { data: { customFields } = {} } = useQuery(['/v1/livechat/custom-fields'], () => getCustomFields());
-
-	const getContact = useEndpoint('GET', '/v1/omnichannel/contact');
-	const {
-		data: { contact } = {},
-		isInitialLoading,
-		isError,
-	} = useQuery(['/v1/omnichannel/contact', contactId], () => getContact({ contactId }), {
-		enabled: canViewCustomFields && !!contactId,
-	});
-
-	const onEditButtonClick = useMutableCallback(() => {
-		if (!canEditContact) {
-			return dispatchToastMessage({ type: 'error', message: t('Not_authorized') });
-		}
-
-		if (route) {
-			router.navigate({
-				name: route,
-				params: {
-					tab: 'contact-profile',
-					context: 'edit',
-					id: roomId,
-				},
-			});
-			return;
-		}
-
-		router.navigate({
-			name: 'omnichannel-directory',
-			params: {
-				page: 'contacts',
-				id: contactId,
-				bar: 'edit',
-			},
-		});
-	});
-
-	if (isInitialLoading) {
-		return (
-			<Box pi={24}>
-				<FormSkeleton />
-			</Box>
-		);
-	}
-
-	if (isError || !contact) {
-		return <Box mbs={16}>{t('Contact_not_found')}</Box>;
-	}
-
-	const { username, visitorEmails, phone, ts, livechatData, lastChat, contactManager, status } = contact;
-
-	const showContactHistory = currentRouteName === 'live' && lastChat;
-
-	const [{ phoneNumber = '' }] = phone ?? [{}];
-	const [{ address: email = '' }] = visitorEmails ?? [{}];
-
-	const checkIsVisibleAndScopeVisitor = (key: string) => {
-		const field = customFields?.find(({ _id }) => _id === key);
-		return field?.visibility === 'visible' && field?.scope === 'visitor';
-	};
-
-	const onChatHistory = () => {
-		const { _id = '' } = lastChat ?? {};
-		liveRoute.push({ id: _id, tab: 'contact-chat-history' });
-	};
-
-	// Serialized does not like unknown :(
-	const customFieldEntries = Object.entries((livechatData ?? {}) as unknown as Record<string, string>).filter(
-		([key, value]) => checkIsVisibleAndScopeVisitor(key) && value,
-	);
-
-	return (
-		<>
-			<ContextualbarScrollableContent p={24}>
-				<Margins block={4}>
-					{username && (
-						<Field>
-							<Label>{`${t('Name')} / ${t('Username')}`}</Label>
-							<Info style={{ display: 'flex' }}>
-								<UserAvatar size='x40' title={username} username={username} />
-								<AgentInfoDetails mis={10} name={username} shortName={username} status={<UserStatus status={status} />} />
-							</Info>
-						</Field>
-					)}
-					{email && (
-						<Field>
-							<Label>{t('Email')}</Label>
-							<Info data-qa-id='contactInfo-email'>{email}</Info>
-						</Field>
-					)}
-					{phoneNumber && (
-						<Field>
-							<Label>{t('Phone')}</Label>
-							<Info>{parseOutboundPhoneNumber(phoneNumber)}</Info>
-						</Field>
-					)}
-					{ts && (
-						<Field>
-							<Label>{t('Created_at')}</Label>
-							<Info>{formatDate(ts)}</Info>
-						</Field>
-					)}
-
-					{lastChat && (
-						<Field>
-							<Label>{t('Last_Chat')}</Label>
-							<Info>{formatDate(lastChat.ts)}</Info>
-						</Field>
-					)}
-
-					{canViewCustomFields &&
-						customFieldEntries.map(([key, value]) => {
-							return <CustomField key={key} id={key} value={value} />;
-						})}
-
-					{contactManager && (
-						<Field>
-							<Label>{t('Contact_Manager')}</Label>
-							<ContactManagerInfo username={contactManager.username} />
-						</Field>
-					)}
-				</Margins>
-			</ContextualbarScrollableContent>
-			<ContextualbarFooter>
-				{isCallReady && (
-					<ButtonGroup stretch>
-						<>
-							<VoipInfoCallButton phoneNumber={phoneNumber} />
-							{showContactHistory && <Divider width='100%' />}
-						</>
-					</ButtonGroup>
-				)}
-				<ButtonGroup stretch>
-					{showContactHistory && (
-						<Button icon='history' onClick={onChatHistory}>
-							{t('Chat_History')}
-						</Button>
-					)}
-					<Button icon='pencil' onClick={onEditButtonClick}>
-						{t('Edit')}
-					</Button>
-				</ButtonGroup>
-			</ContextualbarFooter>
-		</>
-	);
-};
-
-export default ContactInfo;
diff --git a/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactNewEdit.tsx b/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactNewEdit.tsx
deleted file mode 100644
index f4d2e8119c39..000000000000
--- a/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactNewEdit.tsx
+++ /dev/null
@@ -1,233 +0,0 @@
-import type { ILivechatVisitor, Serialized } from '@rocket.chat/core-typings';
-import { Field, FieldLabel, FieldRow, FieldError, TextInput, ButtonGroup, Button, ContextualbarContent } from '@rocket.chat/fuselage';
-import { CustomFieldsForm } from '@rocket.chat/ui-client';
-import { useToastMessageDispatch, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
-import { useQueryClient } from '@tanstack/react-query';
-import type { ReactElement } from 'react';
-import React, { useState, useEffect } from 'react';
-import { useForm } from 'react-hook-form';
-
-import { hasAtLeastOnePermission } from '../../../../../../app/authorization/client';
-import { validateEmail } from '../../../../../../lib/emailValidator';
-import { ContextualbarScrollableContent, ContextualbarFooter } from '../../../../../components/Contextualbar';
-import { createToken } from '../../../../../lib/utils/createToken';
-import { ContactManager as ContactManagerForm } from '../../../additionalForms';
-import { FormSkeleton } from '../../components/FormSkeleton';
-import { useCustomFieldsMetadata } from '../../hooks/useCustomFieldsMetadata';
-
-type ContactNewEditProps = {
-	id: string;
-	data?: { contact: Serialized<ILivechatVisitor> | null };
-	close(): void;
-};
-
-type ContactFormData = {
-	token: string;
-	name: string;
-	email: string;
-	phone: string;
-	username: string;
-	customFields: Record<any, any>;
-};
-
-const DEFAULT_VALUES = {
-	token: '',
-	name: '',
-	email: '',
-	phone: '',
-	username: '',
-	customFields: {},
-};
-
-const getInitialValues = (data: ContactNewEditProps['data']): ContactFormData => {
-	if (!data) {
-		return DEFAULT_VALUES;
-	}
-
-	const { name, token, phone, visitorEmails, livechatData, contactManager } = data.contact ?? {};
-
-	return {
-		token: token ?? '',
-		name: name ?? '',
-		email: visitorEmails ? visitorEmails[0].address : '',
-		phone: phone ? phone[0].phoneNumber : '',
-		customFields: livechatData ?? {},
-		username: contactManager?.username ?? '',
-	};
-};
-
-const ContactNewEdit = ({ id, data, close }: ContactNewEditProps): ReactElement => {
-	const t = useTranslation();
-	const dispatchToastMessage = useToastMessageDispatch();
-	const queryClient = useQueryClient();
-
-	const canViewCustomFields = (): boolean =>
-		hasAtLeastOnePermission(['view-livechat-room-customfields', 'edit-livechat-room-customfields']);
-
-	const [userId, setUserId] = useState('no-agent-selected');
-	const saveContact = useEndpoint('POST', '/v1/omnichannel/contact');
-	const getContactBy = useEndpoint('GET', '/v1/omnichannel/contact.search');
-	const getUserData = useEndpoint('GET', '/v1/users.info');
-
-	const { data: customFieldsMetadata = [], isInitialLoading: isLoadingCustomFields } = useCustomFieldsMetadata({
-		scope: 'visitor',
-		enabled: canViewCustomFields(),
-	});
-
-	const initialValue = getInitialValues(data);
-	const { username: initialUsername } = initialValue;
-
-	const {
-		register,
-		formState: { errors, isValid, isDirty, isSubmitting },
-		control,
-		setValue,
-		handleSubmit,
-		setError,
-	} = useForm<ContactFormData>({
-		mode: 'onChange',
-		reValidateMode: 'onChange',
-		defaultValues: initialValue,
-	});
-
-	useEffect(() => {
-		if (!initialUsername) {
-			return;
-		}
-
-		getUserData({ username: initialUsername }).then(({ user }) => {
-			setUserId(user._id);
-		});
-	}, [getUserData, initialUsername]);
-
-	const validateEmailFormat = (email: string): boolean | string => {
-		if (!email || email === initialValue.email) {
-			return true;
-		}
-
-		if (!validateEmail(email)) {
-			return t('error-invalid-email-address');
-		}
-
-		return true;
-	};
-
-	const validateContactField = async (name: 'phone' | 'email', value: string, optional = true) => {
-		if ((optional && !value) || value === initialValue[name]) {
-			return true;
-		}
-
-		const query = { [name]: value } as Record<'phone' | 'email', string>;
-		const { contact } = await getContactBy(query);
-		return !contact || contact._id === id;
-	};
-
-	const validateName = (v: string): string | boolean => (!v.trim() ? t('Required_field', { field: t('Name') }) : true);
-
-	const handleContactManagerChange = async (userId: string): Promise<void> => {
-		setUserId(userId);
-
-		if (userId === 'no-agent-selected') {
-			setValue('username', '', { shouldDirty: true });
-			return;
-		}
-
-		const { user } = await getUserData({ userId });
-		setValue('username', user.username || '', { shouldDirty: true });
-	};
-
-	const validateAsync = async ({ phone = '', email = '' } = {}) => {
-		const isEmailValid = await validateContactField('email', email);
-		const isPhoneValid = await validateContactField('phone', phone);
-
-		!isEmailValid && setError('email', { message: t('Email_already_exists') });
-		!isPhoneValid && setError('phone', { message: t('Phone_already_exists') });
-
-		return isEmailValid && isPhoneValid;
-	};
-
-	const handleSave = async (data: ContactFormData): Promise<void> => {
-		if (!(await validateAsync(data))) {
-			return;
-		}
-
-		const { name, phone, email, customFields, username, token } = data;
-
-		const payload = {
-			name,
-			phone,
-			email,
-			customFields,
-			token: token || createToken(),
-			...(username && { contactManager: { username } }),
-			...(id && { _id: id }),
-		};
-
-		try {
-			await saveContact(payload);
-			dispatchToastMessage({ type: 'success', message: t('Saved') });
-			await queryClient.invalidateQueries({ queryKey: ['current-contacts'] });
-			close();
-		} catch (error) {
-			dispatchToastMessage({ type: 'error', message: error });
-		}
-	};
-
-	if (isLoadingCustomFields) {
-		return (
-			<ContextualbarContent>
-				<FormSkeleton />
-			</ContextualbarContent>
-		);
-	}
-
-	return (
-		<>
-			<ContextualbarScrollableContent is='form' onSubmit={handleSubmit(handleSave)}>
-				<Field>
-					<FieldLabel>{t('Name')}*</FieldLabel>
-					<FieldRow>
-						<TextInput {...register('name', { validate: validateName })} error={errors.name?.message} flexGrow={1} />
-					</FieldRow>
-					<FieldError>{errors.name?.message}</FieldError>
-				</Field>
-				<Field>
-					<FieldLabel>{t('Email')}</FieldLabel>
-					<FieldRow>
-						<TextInput {...register('email', { validate: validateEmailFormat })} error={errors.email?.message} flexGrow={1} />
-					</FieldRow>
-					<FieldError>{errors.email?.message}</FieldError>
-				</Field>
-				<Field>
-					<FieldLabel>{t('Phone')}</FieldLabel>
-					<FieldRow>
-						<TextInput {...register('phone')} error={errors.phone?.message} flexGrow={1} />
-					</FieldRow>
-					<FieldError>{errors.phone?.message}</FieldError>
-				</Field>
-				{canViewCustomFields() && <CustomFieldsForm formName='customFields' formControl={control} metadata={customFieldsMetadata} />}
-				<ContactManagerForm value={userId} handler={handleContactManagerChange} />
-			</ContextualbarScrollableContent>
-			<ContextualbarFooter>
-				<ButtonGroup stretch>
-					<Button flexGrow={1} onClick={close}>
-						{t('Cancel')}
-					</Button>
-					<Button
-						mie='none'
-						type='submit'
-						onClick={handleSubmit(handleSave)}
-						flexGrow={1}
-						loading={isSubmitting}
-						disabled={!isValid || !isDirty}
-						primary
-					>
-						{t('Save')}
-					</Button>
-				</ButtonGroup>
-			</ContextualbarFooter>
-		</>
-	);
-};
-
-export default ContactNewEdit;
diff --git a/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactsContextualBar.tsx b/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactsContextualBar.tsx
deleted file mode 100644
index ac3322026eb7..000000000000
--- a/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactsContextualBar.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import { useRoute, useRouteParameter, useTranslation } from '@rocket.chat/ui-contexts';
-import React from 'react';
-
-import { ContextualbarHeader, ContextualbarIcon, ContextualbarTitle, ContextualbarClose } from '../../../../../components/Contextualbar';
-import { useOmnichannelRoom } from '../../../../room/contexts/RoomContext';
-import { useRoomToolbox } from '../../../../room/contexts/RoomToolboxContext';
-import ContactEditWithData from './ContactEditWithData';
-import ContactInfo from './ContactInfo';
-
-const PATH = 'live';
-
-const ContactsContextualBar = () => {
-	const t = useTranslation();
-
-	const room = useOmnichannelRoom();
-	const { closeTab } = useRoomToolbox();
-
-	const directoryRoute = useRoute(PATH);
-
-	const context = useRouteParameter('context');
-
-	const handleContactEditBarCloseButtonClick = (): void => {
-		directoryRoute.push({ id: room._id, tab: 'contact-profile' });
-	};
-
-	const {
-		v: { _id },
-	} = room;
-
-	return (
-		<>
-			<ContextualbarHeader>
-				{(context === 'info' || !context) && (
-					<>
-						<ContextualbarIcon name='info-circled' />
-						<ContextualbarTitle>{t('Contact_Info')}</ContextualbarTitle>
-					</>
-				)}
-				{context === 'edit' && (
-					<>
-						<ContextualbarIcon name='pencil' />
-						<ContextualbarTitle>{t('Edit_Contact_Profile')}</ContextualbarTitle>
-					</>
-				)}
-				<ContextualbarClose onClick={closeTab} />
-			</ContextualbarHeader>
-			{context === 'edit' ? (
-				<ContactEditWithData id={_id} close={handleContactEditBarCloseButtonClick} />
-			) : (
-				<ContactInfo id={_id} rid={room._id} route={PATH} />
-			)}
-		</>
-	);
-};
-
-export default ContactsContextualBar;
diff --git a/apps/meteor/client/views/omnichannel/directory/contacts/hooks/useCurrentContacts.ts b/apps/meteor/client/views/omnichannel/directory/contacts/hooks/useCurrentContacts.ts
index 7a5487e93921..b7f1ac7866c1 100644
--- a/apps/meteor/client/views/omnichannel/directory/contacts/hooks/useCurrentContacts.ts
+++ b/apps/meteor/client/views/omnichannel/directory/contacts/hooks/useCurrentContacts.ts
@@ -1,12 +1,14 @@
-import type { GETLivechatRoomsParams, OperationResult } from '@rocket.chat/rest-typings';
+import type { OperationResult, PaginatedRequest } from '@rocket.chat/rest-typings';
 import { useEndpoint } from '@rocket.chat/ui-contexts';
 import type { UseQueryResult } from '@tanstack/react-query';
 import { useQuery } from '@tanstack/react-query';
 
 export const useCurrentContacts = (
-	query: GETLivechatRoomsParams,
-): UseQueryResult<OperationResult<'GET', '/v1/livechat/visitors.search'>> => {
-	const currentContacts = useEndpoint('GET', '/v1/livechat/visitors.search');
+	query: PaginatedRequest<{
+		searchText: string;
+	}>,
+): UseQueryResult<OperationResult<'GET', '/v1/omnichannel/contacts.search'>> => {
+	const currentContacts = useEndpoint('GET', '/v1/omnichannel/contacts.search');
 
 	return useQuery(['current-contacts', query], () => currentContacts(query));
 };
diff --git a/apps/meteor/client/views/omnichannel/directory/contexts/ChatsContext.ts b/apps/meteor/client/views/omnichannel/directory/contexts/ChatsContext.ts
new file mode 100644
index 000000000000..95630877a7e8
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/directory/contexts/ChatsContext.ts
@@ -0,0 +1,68 @@
+import type { RefObject, SetStateAction } from 'react';
+import { createContext, useContext } from 'react';
+
+export type ChatsFiltersQuery = {
+	guest: string;
+	servedBy: string;
+	status: string;
+	department: string;
+	from: string;
+	to: string;
+	tags: { _id: string; label: string; value: string }[];
+	[key: string]: unknown;
+};
+
+export const initialValues: ChatsFiltersQuery = {
+	guest: '',
+	servedBy: 'all',
+	status: 'all',
+	department: 'all',
+	from: '',
+	to: '',
+	tags: [],
+};
+
+export type ChatsContextValue = {
+	filtersQuery: ChatsFiltersQuery;
+	setFiltersQuery: (value: SetStateAction<ChatsFiltersQuery>) => void;
+	resetFiltersQuery: () => void;
+	displayFilters: {
+		from: string | undefined;
+		to: string | undefined;
+		guest: string | undefined;
+		servedBy: string | undefined;
+		department: string | undefined;
+		status: string | undefined;
+		tags: string | undefined;
+	};
+	removeFilter: (filter: keyof ChatsFiltersQuery) => void;
+	hasAppliedFilters: boolean;
+	textInputRef: RefObject<HTMLInputElement> | null;
+};
+
+export const ChatsContext = createContext<ChatsContextValue>({
+	filtersQuery: initialValues,
+	setFiltersQuery: () => undefined,
+	resetFiltersQuery: () => undefined,
+	displayFilters: {
+		from: undefined,
+		to: undefined,
+		guest: undefined,
+		servedBy: undefined,
+		department: undefined,
+		status: undefined,
+		tags: undefined,
+	},
+	removeFilter: () => undefined,
+	hasAppliedFilters: false,
+	textInputRef: null,
+});
+
+export const useChatsContext = (): ChatsContextValue => {
+	const context = useContext(ChatsContext);
+	if (!context) {
+		throw new Error('Must be running in Chats Context');
+	}
+
+	return context;
+};
diff --git a/apps/meteor/client/views/omnichannel/directory/hooks/useContactRoute.ts b/apps/meteor/client/views/omnichannel/directory/hooks/useContactRoute.ts
new file mode 100644
index 000000000000..21de6c8f379f
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/directory/hooks/useContactRoute.ts
@@ -0,0 +1,45 @@
+import type { RouteParameters } from '@rocket.chat/ui-contexts';
+import { useRouter } from '@rocket.chat/ui-contexts';
+import { useCallback, useEffect } from 'react';
+
+export const useContactRoute = () => {
+	const { navigate, getRouteParameters, getRouteName } = useRouter();
+	const currentRouteName = getRouteName();
+	const currentParams = getRouteParameters();
+
+	const handleNavigate = useCallback(
+		(params: RouteParameters) => {
+			if (!currentRouteName) {
+				return;
+			}
+
+			if (currentRouteName === 'omnichannel-directory') {
+				return navigate({
+					name: currentRouteName,
+					params: {
+						...currentParams,
+						tab: 'contacts',
+						...params,
+					},
+				});
+			}
+
+			navigate({
+				name: currentRouteName,
+				params: {
+					...currentParams,
+					...params,
+				},
+			});
+		},
+		[navigate, currentParams, currentRouteName],
+	);
+
+	useEffect(() => {
+		if (!currentParams.context) {
+			handleNavigate({ context: 'info' });
+		}
+	}, [currentParams.context, handleNavigate]);
+
+	return handleNavigate;
+};
diff --git a/apps/meteor/client/views/omnichannel/directory/hooks/useDisplayFilters.ts b/apps/meteor/client/views/omnichannel/directory/hooks/useDisplayFilters.ts
new file mode 100644
index 000000000000..a02660ea7510
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/directory/hooks/useDisplayFilters.ts
@@ -0,0 +1,47 @@
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
+import { useQuery } from '@tanstack/react-query';
+import { useTranslation } from 'react-i18next';
+
+import { useFormatDate } from '../../../../hooks/useFormatDate';
+import type { ChatsFiltersQuery } from '../contexts/ChatsContext';
+
+const statusTextMap: { [key: string]: TranslationKey } = {
+	all: 'All',
+	closed: 'Closed',
+	opened: 'Room_Status_Open',
+	onhold: 'On_Hold_Chats',
+	queued: 'Queued',
+};
+
+export const useDisplayFilters = (filtersQuery: ChatsFiltersQuery) => {
+	const { t } = useTranslation();
+	const formatDate = useFormatDate();
+
+	const { guest, servedBy, status, department, from, to, tags, ...customFields } = filtersQuery;
+
+	const getDepartment = useEndpoint('GET', '/v1/livechat/department/:_id', { _id: department });
+	const getAgent = useEndpoint('GET', '/v1/livechat/users/agent/:_id', { _id: servedBy });
+
+	const { data: departmentData } = useQuery(['getDepartmentDataForFilter', department], () => getDepartment({}));
+	const { data: agentData } = useQuery(['getAgentDataForFilter', servedBy], () => getAgent());
+
+	const displayCustomFields = Object.entries(customFields).reduce(
+		(acc, [key, value]) => {
+			acc[key] = value ? `${key}: ${value}` : undefined;
+			return acc;
+		},
+		{} as { [key: string]: string | undefined },
+	);
+
+	return {
+		from: from !== '' ? `${t('From')}: ${formatDate(from)}` : undefined,
+		to: to !== '' ? `${t('To')}: ${formatDate(to)}` : undefined,
+		guest: guest !== '' ? `${t('Text')}: ${guest}` : undefined,
+		servedBy: servedBy !== 'all' ? `${t('Served_By')}: ${agentData?.user.name}` : undefined,
+		department: department !== 'all' ? `${t('Department')}: ${departmentData?.department.name}` : undefined,
+		status: status !== 'all' ? `${t('Status')}: ${t(statusTextMap[status])}` : undefined,
+		tags: tags.length > 0 ? `${t('Tags')}: ${tags.map((tag) => tag.label).join(', ')}` : undefined,
+		...displayCustomFields,
+	};
+};
diff --git a/apps/meteor/client/views/omnichannel/directory/providers/ChatsProvider.tsx b/apps/meteor/client/views/omnichannel/directory/providers/ChatsProvider.tsx
new file mode 100644
index 000000000000..7ef3cb4e3a23
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/directory/providers/ChatsProvider.tsx
@@ -0,0 +1,51 @@
+import { useLocalStorage } from '@rocket.chat/fuselage-hooks';
+import type { ReactNode } from 'react';
+import React, { useMemo, useRef } from 'react';
+
+import { ChatsContext, initialValues } from '../contexts/ChatsContext';
+import { useDisplayFilters } from '../hooks/useDisplayFilters';
+
+type ChatsProviderProps = {
+	children: ReactNode;
+};
+
+const ChatsProvider = ({ children }: ChatsProviderProps) => {
+	const textInputRef = useRef<HTMLInputElement>(null);
+	const [filtersQuery, setFiltersQuery] = useLocalStorage('conversationsQuery', initialValues);
+	const displayFilters = useDisplayFilters(filtersQuery);
+
+	const contextValue = useMemo(
+		() => ({
+			filtersQuery,
+			setFiltersQuery,
+			resetFiltersQuery: () =>
+				setFiltersQuery((prevState) => {
+					const customFields = Object.keys(prevState).filter((item) => !Object.keys(initialValues).includes(item));
+
+					const initialCustomFields = customFields.reduce(
+						(acc, cv) => {
+							acc[cv] = '';
+							return acc;
+						},
+						{} as { [key: string]: string },
+					);
+
+					return { ...initialValues, ...initialCustomFields };
+				}),
+			displayFilters,
+			removeFilter: (filter: keyof typeof initialValues) => {
+				if (filter === 'guest' && textInputRef.current) {
+					textInputRef.current.focus();
+				}
+				return setFiltersQuery((prevState) => ({ ...prevState, [filter]: initialValues[filter] }));
+			},
+			hasAppliedFilters: Object.values(displayFilters).filter((value) => value !== undefined).length > 0,
+			textInputRef,
+		}),
+		[displayFilters, filtersQuery, setFiltersQuery],
+	);
+
+	return <ChatsContext.Provider children={children} value={contextValue} />;
+};
+
+export default ChatsProvider;
diff --git a/apps/meteor/client/views/omnichannel/hooks/useContactRoute.ts b/apps/meteor/client/views/omnichannel/hooks/useContactRoute.ts
new file mode 100644
index 000000000000..867119f7eaa9
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/hooks/useContactRoute.ts
@@ -0,0 +1,47 @@
+import type { RouteParameters } from '@rocket.chat/ui-contexts';
+import { useRouter } from '@rocket.chat/ui-contexts';
+import { useCallback, useEffect } from 'react';
+
+export const useContactRoute = () => {
+	const { navigate, getRouteParameters, getRouteName } = useRouter();
+	const currentRouteName = getRouteName();
+	const currentParams = getRouteParameters();
+
+	const handleNavigate = useCallback(
+		({ id, ...params }: RouteParameters) => {
+			if (!currentRouteName) {
+				return;
+			}
+
+			if (currentRouteName === 'omnichannel-directory') {
+				return navigate({
+					name: currentRouteName,
+					params: {
+						...currentParams,
+						tab: 'contacts',
+						id: id || currentParams.id,
+						...params,
+					},
+				});
+			}
+
+			navigate({
+				name: currentRouteName,
+				params: {
+					...currentParams,
+					id: currentParams.id,
+					...params,
+				},
+			});
+		},
+		[navigate, currentParams, currentRouteName],
+	);
+
+	useEffect(() => {
+		if (!currentParams.context) {
+			handleNavigate({ context: 'details' });
+		}
+	}, [currentParams.context, handleNavigate]);
+
+	return handleNavigate;
+};
diff --git a/apps/meteor/client/views/omnichannel/hooks/useOmnichannelSource.ts b/apps/meteor/client/views/omnichannel/hooks/useOmnichannelSource.ts
new file mode 100644
index 000000000000..848ea9ffc707
--- /dev/null
+++ b/apps/meteor/client/views/omnichannel/hooks/useOmnichannelSource.ts
@@ -0,0 +1,34 @@
+import type { IOmnichannelSource } from '@rocket.chat/core-typings';
+import { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
+
+export const useOmnichannelSource = () => {
+	const { t } = useTranslation();
+
+	const getSourceName = useCallback(
+		(source: IOmnichannelSource, allowAlias = true) => {
+			const roomSource = source.alias || source.id || source.type;
+
+			const defaultTypesLabels: { [key: string]: string } = {
+				widget: t('Livechat'),
+				email: t('Email'),
+				sms: t('SMS'),
+				app: (allowAlias && source.alias) || t('Custom_APP'),
+				api: (allowAlias && source.alias) || t('Custom_API'),
+				other: t('Custom_Integration'),
+			};
+
+			return defaultTypesLabels[source.type] || roomSource;
+		},
+		[t],
+	);
+
+	const getSourceLabel = useCallback(
+		(source: IOmnichannelSource) => {
+			return source?.destination || source?.label || t('No_app_label_provided');
+		},
+		[t],
+	);
+
+	return { getSourceName, getSourceLabel };
+};
diff --git a/apps/meteor/client/views/omnichannel/installation/Installation.tsx b/apps/meteor/client/views/omnichannel/installation/Installation.tsx
index a6433eed415c..b8a1c658fcc0 100644
--- a/apps/meteor/client/views/omnichannel/installation/Installation.tsx
+++ b/apps/meteor/client/views/omnichannel/installation/Installation.tsx
@@ -1,18 +1,18 @@
 import { Box } from '@rocket.chat/fuselage';
-import { useSetting, useTranslation } from '@rocket.chat/ui-contexts';
+import { useAbsoluteUrl, useSetting } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
+import Wrapper from './Wrapper';
 import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page';
 import RawText from '../../../components/RawText';
 import TextCopy from '../../../components/TextCopy';
-import Wrapper from './Wrapper';
 
 // TODO: use `CodeSnippet` Component
 const Installation = (): ReactElement => {
-	const t = useTranslation();
-	const setting = useSetting('Site_Url') as string;
-	const siteUrl = setting?.replace(/\/$/, '');
+	const { t } = useTranslation();
+	const siteUrl = useSetting('Site_Url', useAbsoluteUrl()('')).replace(/\/$/, '');
 
 	const installString = `<!-- Start of Rocket.Chat Livechat Script -->
 	<script type="text/javascript">
diff --git a/apps/meteor/client/views/omnichannel/managers/AddManager.tsx b/apps/meteor/client/views/omnichannel/managers/AddManager.tsx
index 24817a03846e..894f3a75f990 100644
--- a/apps/meteor/client/views/omnichannel/managers/AddManager.tsx
+++ b/apps/meteor/client/views/omnichannel/managers/AddManager.tsx
@@ -1,14 +1,15 @@
 import { Button, Box, Field, FieldLabel, FieldRow } from '@rocket.chat/fuselage';
 import { useMutableCallback, useUniqueId } from '@rocket.chat/fuselage-hooks';
 import { UserAutoComplete } from '@rocket.chat/ui-client';
-import { useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useEndpointAction } from '../../../hooks/useEndpointAction';
 
 const AddManager = ({ reload }: { reload: () => void }): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [username, setUsername] = useState('');
 	const dispatchToastMessage = useToastMessageDispatch();
 
diff --git a/apps/meteor/client/views/omnichannel/managers/ManagersRoute.tsx b/apps/meteor/client/views/omnichannel/managers/ManagersRoute.tsx
index 64aea5dc848c..8d93e2954c9c 100644
--- a/apps/meteor/client/views/omnichannel/managers/ManagersRoute.tsx
+++ b/apps/meteor/client/views/omnichannel/managers/ManagersRoute.tsx
@@ -1,13 +1,14 @@
-import { usePermission, useTranslation } from '@rocket.chat/ui-contexts';
+import { usePermission } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
+import ManagersTable from './ManagersTable';
 import { Page, PageHeader, PageContent } from '../../../components/Page';
 import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
-import ManagersTable from './ManagersTable';
 
 const ManagersRoute = (): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const canViewManagers = usePermission('manage-livechat-managers');
 
 	if (!canViewManagers) {
diff --git a/apps/meteor/client/views/omnichannel/managers/ManagersTable.tsx b/apps/meteor/client/views/omnichannel/managers/ManagersTable.tsx
index 753b562cb519..08be100fa0db 100644
--- a/apps/meteor/client/views/omnichannel/managers/ManagersTable.tsx
+++ b/apps/meteor/client/views/omnichannel/managers/ManagersTable.tsx
@@ -5,6 +5,8 @@ import { useTranslation, useEndpoint } from '@rocket.chat/ui-contexts';
 import { hashQueryKey, useQuery } from '@tanstack/react-query';
 import React, { useMemo, useState } from 'react';
 
+import AddManager from './AddManager';
+import RemoveManagerButton from './RemoveManagerButton';
 import FilterByText from '../../../components/FilterByText';
 import GenericNoResults from '../../../components/GenericNoResults/GenericNoResults';
 import {
@@ -18,15 +20,12 @@ import {
 } from '../../../components/GenericTable';
 import { usePagination } from '../../../components/GenericTable/hooks/usePagination';
 import { useSort } from '../../../components/GenericTable/hooks/useSort';
-import AddManager from './AddManager';
-import RemoveManagerButton from './RemoveManagerButton';
 
 // TODO: Missing error state
 const ManagersTable = () => {
 	const t = useTranslation();
 
 	const [text, setText] = useState('');
-	const debouncedText = useDebouncedValue(text, 500);
 
 	const { sortBy, sortDirection, setSort } = useSort<'name' | 'username' | 'emails.address'>('name');
 
@@ -35,12 +34,12 @@ const ManagersTable = () => {
 	const query = useDebouncedValue(
 		useMemo(
 			() => ({
-				text: debouncedText,
+				text,
 				sort: `{ "${sortBy}": ${sortDirection === 'asc' ? 1 : -1} }`,
 				count: itemsPerPage,
 				offset: current,
 			}),
-			[debouncedText, sortBy, sortDirection, itemsPerPage, current],
+			[text, sortBy, sortDirection, itemsPerPage, current],
 		),
 		500,
 	);
@@ -79,7 +78,9 @@ const ManagersTable = () => {
 	return (
 		<>
 			<AddManager reload={refetch} />
-			{((isSuccess && data?.users.length > 0) || queryHasChanged) && <FilterByText onChange={setText} />}
+			{((isSuccess && data?.users.length > 0) || queryHasChanged) && (
+				<FilterByText value={text} onChange={(event) => setText(event.target.value)} />
+			)}
 			{isLoading && (
 				<GenericTable aria-busy>
 					<GenericTableHeader>{headers}</GenericTableHeader>
@@ -99,7 +100,7 @@ const ManagersTable = () => {
 			)}
 			{isSuccess && data.users.length > 0 && (
 				<>
-					<GenericTable aria-busy={text !== debouncedText} aria-label={t('Managers')}>
+					<GenericTable aria-busy={isLoading} aria-label={t('Managers')}>
 						<GenericTableHeader>{headers}</GenericTableHeader>
 						<GenericTableBody>
 							{data.users.map((user) => (
diff --git a/apps/meteor/client/views/omnichannel/managers/RemoveManagerButton.tsx b/apps/meteor/client/views/omnichannel/managers/RemoveManagerButton.tsx
index 8ce973b7b69f..36c08475982b 100644
--- a/apps/meteor/client/views/omnichannel/managers/RemoveManagerButton.tsx
+++ b/apps/meteor/client/views/omnichannel/managers/RemoveManagerButton.tsx
@@ -1,15 +1,16 @@
 import { IconButton } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useSetModal, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetModal, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../components/GenericModal';
 import { GenericTableCell } from '../../../components/GenericTable';
 import { useEndpointAction } from '../../../hooks/useEndpointAction';
 
 const RemoveManagerButton = ({ _id, reload }: { _id: string; reload: () => void }): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const deleteAction = useEndpointAction('DELETE', '/v1/livechat/users/manager/:_id', { keys: { _id } });
 	const setModal = useSetModal();
 	const dispatchToastMessage = useToastMessageDispatch();
diff --git a/apps/meteor/client/views/omnichannel/queueList/QueueListPage.tsx b/apps/meteor/client/views/omnichannel/queueList/QueueListPage.tsx
index 63b62b85e642..3aee6f8e87a6 100644
--- a/apps/meteor/client/views/omnichannel/queueList/QueueListPage.tsx
+++ b/apps/meteor/client/views/omnichannel/queueList/QueueListPage.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { Page, PageHeader, PageContent } from '../../../components/Page';
 import QueueListTable from './QueueListTable';
+import { Page, PageHeader, PageContent } from '../../../components/Page';
 
 const QueueListPage = () => {
 	const { t } = useTranslation();
diff --git a/apps/meteor/client/views/omnichannel/queueList/QueueListTable.tsx b/apps/meteor/client/views/omnichannel/queueList/QueueListTable.tsx
index b6508658e520..88ff5a6f6661 100644
--- a/apps/meteor/client/views/omnichannel/queueList/QueueListTable.tsx
+++ b/apps/meteor/client/views/omnichannel/queueList/QueueListTable.tsx
@@ -7,6 +7,7 @@ import { useQuery } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React, { useMemo, useState } from 'react';
 
+import { QueueListFilter } from './QueueListFilter';
 import GenericNoResults from '../../../components/GenericNoResults';
 import {
 	GenericTable,
@@ -19,7 +20,6 @@ import {
 } from '../../../components/GenericTable';
 import { usePagination } from '../../../components/GenericTable/hooks/usePagination';
 import { useSort } from '../../../components/GenericTable/hooks/useSort';
-import { QueueListFilter } from './QueueListFilter';
 
 const QueueListTable = (): ReactElement => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/AgentStatusChart.tsx b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/AgentStatusChart.tsx
index 32dc4fbc5f03..fe69a36fd423 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/AgentStatusChart.tsx
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/AgentStatusChart.tsx
@@ -7,11 +7,11 @@ import type { ComponentPropsWithoutRef, MutableRefObject } from 'react';
 import React, { useRef, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import Chart from './Chart';
+import { useUpdateChartData } from './useUpdateChartData';
 import { drawDoughnutChart } from '../../../../../app/livechat/client/lib/chartHandler';
 import { AsyncStatePhase } from '../../../../hooks/useAsyncState';
 import { useEndpointData } from '../../../../hooks/useEndpointData';
-import Chart from './Chart';
-import { useUpdateChartData } from './useUpdateChartData';
 
 const labels = ['Available', 'Away', 'Busy', 'Offline'];
 
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatDurationChart.tsx b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatDurationChart.tsx
index 02180c857616..0c96f0e5cf13 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatDurationChart.tsx
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatDurationChart.tsx
@@ -6,14 +6,14 @@ import type { ComponentPropsWithoutRef, MutableRefObject } from 'react';
 import React, { useRef, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { drawLineChart } from '../../../../../app/livechat/client/lib/chartHandler';
-import { secondsToHHMMSS } from '../../../../../lib/utils/secondsToHHMMSS';
-import { AsyncStatePhase } from '../../../../hooks/useAsyncState';
-import { useEndpointData } from '../../../../hooks/useEndpointData';
 import Chart from './Chart';
 import { getMomentChartLabelsAndData } from './getMomentChartLabelsAndData';
 import { getMomentCurrentLabel } from './getMomentCurrentLabel';
 import { useUpdateChartData } from './useUpdateChartData';
+import { drawLineChart } from '../../../../../app/livechat/client/lib/chartHandler';
+import { secondsToHHMMSS } from '../../../../../lib/utils/secondsToHHMMSS';
+import { AsyncStatePhase } from '../../../../hooks/useAsyncState';
+import { useEndpointData } from '../../../../hooks/useEndpointData';
 
 const [labels, initialData] = getMomentChartLabelsAndData();
 const tooltipCallbacks = {
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsChart.tsx b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsChart.tsx
index 15a8eb2ddce8..7ab01b247e59 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsChart.tsx
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsChart.tsx
@@ -7,11 +7,11 @@ import type { ComponentPropsWithoutRef, MutableRefObject } from 'react';
 import React, { useRef, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import Chart from './Chart';
+import { useUpdateChartData } from './useUpdateChartData';
 import { drawDoughnutChart } from '../../../../../app/livechat/client/lib/chartHandler';
 import { AsyncStatePhase } from '../../../../hooks/useAsyncState';
 import { useEndpointData } from '../../../../hooks/useEndpointData';
-import Chart from './Chart';
-import { useUpdateChartData } from './useUpdateChartData';
 
 const labels = ['Open', 'Queued', 'On_Hold_Chats', 'Closed'];
 
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerAgentChart.tsx b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerAgentChart.tsx
index 89433d2b48bb..7483291997a5 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerAgentChart.tsx
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerAgentChart.tsx
@@ -6,11 +6,11 @@ import type { ComponentPropsWithoutRef, MutableRefObject } from 'react';
 import React, { useRef, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import Chart from './Chart';
+import { useUpdateChartData } from './useUpdateChartData';
 import { drawLineChart } from '../../../../../app/livechat/client/lib/chartHandler';
 import { AsyncStatePhase } from '../../../../hooks/useAsyncState';
 import { useEndpointData } from '../../../../hooks/useEndpointData';
-import Chart from './Chart';
-import { useUpdateChartData } from './useUpdateChartData';
 
 const init = (canvas: HTMLCanvasElement, context: chartjs.Chart<'line'> | undefined, t: TFunction) =>
 	drawLineChart(canvas, context, [t('Open'), t('Closed'), t('On_Hold_Chats')], [], [[], []], {
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerDepartmentChart.tsx b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerDepartmentChart.tsx
index c2cdbcb32907..5f9789452414 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerDepartmentChart.tsx
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ChatsPerDepartmentChart.tsx
@@ -6,11 +6,11 @@ import type { MutableRefObject, ComponentPropsWithoutRef } from 'react';
 import React, { useRef, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import Chart from './Chart';
+import { useUpdateChartData } from './useUpdateChartData';
 import { drawLineChart } from '../../../../../app/livechat/client/lib/chartHandler';
 import { AsyncStatePhase } from '../../../../hooks/useAsyncState';
 import { useEndpointData } from '../../../../hooks/useEndpointData';
-import Chart from './Chart';
-import { useUpdateChartData } from './useUpdateChartData';
 
 const init = (canvas: HTMLCanvasElement, context: chartjs.Chart<'line'> | undefined, t: TFunction) =>
 	drawLineChart(canvas, context, [t('Open'), t('Closed')], [], [[], []], {
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ResponseTimesChart.tsx b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ResponseTimesChart.tsx
index 008c0bc3a1a9..717a046a83ad 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ResponseTimesChart.tsx
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/charts/ResponseTimesChart.tsx
@@ -6,14 +6,14 @@ import type { MutableRefObject, ComponentPropsWithoutRef } from 'react';
 import React, { useRef, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { drawLineChart } from '../../../../../app/livechat/client/lib/chartHandler';
-import { secondsToHHMMSS } from '../../../../../lib/utils/secondsToHHMMSS';
-import { AsyncStatePhase } from '../../../../hooks/useAsyncState';
-import { useEndpointData } from '../../../../hooks/useEndpointData';
 import Chart from './Chart';
 import { getMomentChartLabelsAndData } from './getMomentChartLabelsAndData';
 import { getMomentCurrentLabel } from './getMomentCurrentLabel';
 import { useUpdateChartData } from './useUpdateChartData';
+import { drawLineChart } from '../../../../../app/livechat/client/lib/chartHandler';
+import { secondsToHHMMSS } from '../../../../../lib/utils/secondsToHHMMSS';
+import { AsyncStatePhase } from '../../../../hooks/useAsyncState';
+import { useEndpointData } from '../../../../hooks/useEndpointData';
 
 const [labels, initialData] = getMomentChartLabelsAndData();
 const tooltipCallbacks = {
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.tsx b/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.tsx
index fbfb7d639712..cc3b82c25480 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.tsx
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterContainer.tsx
@@ -5,9 +5,9 @@ import type { ComponentPropsWithoutRef } from 'react';
 import React, { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { AsyncStatePhase } from '../../../../hooks/useAsyncState';
 import CounterItem from './CounterItem';
 import CounterRow from './CounterRow';
+import { AsyncStatePhase } from '../../../../hooks/useAsyncState';
 
 export type DataType = {
 	title: string;
diff --git a/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterRow.tsx b/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterRow.tsx
index caf0b1ad697e..a284de5f50a0 100644
--- a/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterRow.tsx
+++ b/apps/meteor/client/views/omnichannel/realTimeMonitoring/counter/CounterRow.tsx
@@ -17,7 +17,7 @@ const CounterRow = ({ children, ...props }: CounterRowProps) => (
 								...acc,
 								<Fragment key={i}>{child}</Fragment>,
 								<Divider key={(i + 1) * children.length} width='x2' m='none' alignSelf='stretch' />,
-						  ]
+							]
 						: [...acc, child],
 				[] as ReactNode[],
 			)}
diff --git a/apps/meteor/client/views/omnichannel/sidebarItems.tsx b/apps/meteor/client/views/omnichannel/sidebarItems.tsx
index 7942764a8b89..c2a721275991 100644
--- a/apps/meteor/client/views/omnichannel/sidebarItems.tsx
+++ b/apps/meteor/client/views/omnichannel/sidebarItems.tsx
@@ -1,4 +1,4 @@
-import { hasPermission } from '../../../app/authorization/client';
+import { hasAtLeastOnePermission, hasPermission } from '../../../app/authorization/client';
 import { createSidebarItems } from '../../lib/createSidebarItems';
 
 export const {
@@ -79,4 +79,10 @@ export const {
 		i18nLabel: 'Business_Hours',
 		permissionGranted: (): boolean => hasPermission('view-livechat-business-hours'),
 	},
+	{
+		href: '/omnichannel/security-privacy',
+		icon: 'shield-check',
+		i18nLabel: 'Security_and_privacy',
+		permissionGranted: () => hasAtLeastOnePermission(['view-privileged-setting', 'edit-privileged-setting', 'manage-selected-settings']),
+	},
 ]);
diff --git a/apps/meteor/client/views/omnichannel/triggers/EditTrigger.tsx b/apps/meteor/client/views/omnichannel/triggers/EditTrigger.tsx
index 512978abc664..8710f03e3401 100644
--- a/apps/meteor/client/views/omnichannel/triggers/EditTrigger.tsx
+++ b/apps/meteor/client/views/omnichannel/triggers/EditTrigger.tsx
@@ -1,11 +1,14 @@
 import { type ILivechatTrigger, type ILivechatTriggerAction, type Serialized } from '@rocket.chat/core-typings';
 import { FieldGroup, Button, ButtonGroup, Field, FieldLabel, FieldRow, FieldError, TextInput, ToggleSwitch } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
-import { useToastMessageDispatch, useRouter, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useToastMessageDispatch, useRouter, useEndpoint } from '@rocket.chat/ui-contexts';
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import React, { useMemo } from 'react';
 import { Controller, useFieldArray, useForm } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
+import { ConditionForm } from './ConditionForm';
+import { ActionForm } from './actions/ActionForm';
 import {
 	ContextualbarScrollableContent,
 	ContextualbarTitle,
@@ -14,8 +17,6 @@ import {
 	ContextualbarHeader,
 	ContextualbarClose,
 } from '../../../components/Contextualbar';
-import { ConditionForm } from './ConditionForm';
-import { ActionForm } from './actions/ActionForm';
 
 export type TriggersPayload = {
 	name: string;
@@ -74,7 +75,7 @@ const getInitialValues = (triggerData: Serialized<ILivechatTrigger> | undefined)
 });
 
 const EditTrigger = ({ triggerData }: { triggerData?: Serialized<ILivechatTrigger> }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const router = useRouter();
 	const queryClient = useQueryClient();
 	const dispatchToastMessage = useToastMessageDispatch();
diff --git a/apps/meteor/client/views/omnichannel/triggers/EditTriggerWithData.tsx b/apps/meteor/client/views/omnichannel/triggers/EditTriggerWithData.tsx
index 10a54494c4fd..5bb3d2dd7136 100644
--- a/apps/meteor/client/views/omnichannel/triggers/EditTriggerWithData.tsx
+++ b/apps/meteor/client/views/omnichannel/triggers/EditTriggerWithData.tsx
@@ -1,14 +1,15 @@
 import type { ILivechatTrigger } from '@rocket.chat/core-typings';
 import { Callout } from '@rocket.chat/fuselage';
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
-import { ContextualbarSkeleton } from '../../../components/Contextualbar';
 import EditTrigger from './EditTrigger';
+import { ContextualbarSkeleton } from '../../../components/Contextualbar';
 
 const EditTriggerWithData = ({ triggerId }: { triggerId: ILivechatTrigger['_id'] }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const getTriggersById = useEndpoint('GET', '/v1/livechat/triggers/:_id', { _id: triggerId });
 	const { data, isLoading, isError } = useQuery(['livechat-getTriggersById', triggerId], async () => getTriggersById(), {
 		refetchOnWindowFocus: false,
diff --git a/apps/meteor/client/views/omnichannel/triggers/TriggersPage.tsx b/apps/meteor/client/views/omnichannel/triggers/TriggersPage.tsx
index c01cd7e80e18..2ccbd28d91cc 100644
--- a/apps/meteor/client/views/omnichannel/triggers/TriggersPage.tsx
+++ b/apps/meteor/client/views/omnichannel/triggers/TriggersPage.tsx
@@ -1,15 +1,16 @@
 import { Button } from '@rocket.chat/fuselage';
-import { useRouteParameter, useRouter, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRouteParameter, useRouter } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
-import { ContextualbarDialog } from '../../../components/Contextualbar';
-import { Page, PageHeader, PageContent } from '../../../components/Page';
 import EditTrigger from './EditTrigger';
 import EditTriggerWithData from './EditTriggerWithData';
 import TriggersTable from './TriggersTable';
+import { ContextualbarDialog } from '../../../components/Contextualbar';
+import { Page, PageHeader, PageContent } from '../../../components/Page';
 
 const TriggersPage = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const id = useRouteParameter('id');
 	const context = useRouteParameter('context');
 	const router = useRouter();
diff --git a/apps/meteor/client/views/omnichannel/triggers/TriggersRoute.tsx b/apps/meteor/client/views/omnichannel/triggers/TriggersRoute.tsx
index 7cf2d06bd3b7..f9a00de96995 100644
--- a/apps/meteor/client/views/omnichannel/triggers/TriggersRoute.tsx
+++ b/apps/meteor/client/views/omnichannel/triggers/TriggersRoute.tsx
@@ -1,8 +1,8 @@
 import { usePermission } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 import TriggersPage from './TriggersPage';
+import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
 
 const TriggersRoute = () => {
 	const canViewTriggers = usePermission('view-livechat-triggers');
diff --git a/apps/meteor/client/views/omnichannel/triggers/TriggersTable.tsx b/apps/meteor/client/views/omnichannel/triggers/TriggersTable.tsx
index b4e30085429b..7587bb18c7bc 100644
--- a/apps/meteor/client/views/omnichannel/triggers/TriggersTable.tsx
+++ b/apps/meteor/client/views/omnichannel/triggers/TriggersTable.tsx
@@ -4,6 +4,7 @@ import { useTranslation, useEndpoint, useRouter } from '@rocket.chat/ui-contexts
 import { useQuery, hashQueryKey } from '@tanstack/react-query';
 import React, { useMemo, useState } from 'react';
 
+import TriggersRow from './TriggersRow';
 import GenericError from '../../../components/GenericError';
 import GenericNoResults from '../../../components/GenericNoResults';
 import {
@@ -14,7 +15,6 @@ import {
 	GenericTableLoadingRow,
 } from '../../../components/GenericTable';
 import { usePagination } from '../../../components/GenericTable/hooks/usePagination';
-import TriggersRow from './TriggersRow';
 
 const TriggersTable = () => {
 	const t = useTranslation();
diff --git a/apps/meteor/client/views/omnichannel/triggers/actions/ActionExternalServiceUrl.tsx b/apps/meteor/client/views/omnichannel/triggers/actions/ActionExternalServiceUrl.tsx
index 6b8f11b9203e..c64624d5337e 100644
--- a/apps/meteor/client/views/omnichannel/triggers/actions/ActionExternalServiceUrl.tsx
+++ b/apps/meteor/client/views/omnichannel/triggers/actions/ActionExternalServiceUrl.tsx
@@ -1,12 +1,13 @@
 import { Box, Button, Field, FieldError, FieldHint, FieldLabel, FieldRow, Icon, TextInput } from '@rocket.chat/fuselage';
 import { useSafely, useUniqueId } from '@rocket.chat/fuselage-hooks';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useMutation } from '@tanstack/react-query';
 import type { ComponentProps } from 'react';
 import React, { useState } from 'react';
 import type { Control, UseFormTrigger } from 'react-hook-form';
 import { Controller, useWatch } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import type { TriggersPayload } from '../EditTrigger';
 import { useFieldError } from '../hooks';
@@ -19,7 +20,7 @@ type ActionExternaServicelUrlType = ComponentProps<typeof Field> & {
 };
 
 export const ActionExternalServiceUrl = ({ control, trigger, index, disabled, ...props }: ActionExternaServicelUrlType) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const serviceUrlFieldId = useUniqueId();
 	const serviceUrlFieldName = `actions.${index}.params.serviceUrl` as const;
diff --git a/apps/meteor/client/views/omnichannel/webhooks/WebhooksPageContainer.tsx b/apps/meteor/client/views/omnichannel/webhooks/WebhooksPageContainer.tsx
index 0b59999b24b8..c5258ef3ffec 100644
--- a/apps/meteor/client/views/omnichannel/webhooks/WebhooksPageContainer.tsx
+++ b/apps/meteor/client/views/omnichannel/webhooks/WebhooksPageContainer.tsx
@@ -1,13 +1,14 @@
 import type { ISetting, Serialized, SettingValue } from '@rocket.chat/core-typings';
 import { Callout } from '@rocket.chat/fuselage';
-import { useEndpoint, usePermission, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, usePermission } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
+import WebhooksPage from './WebhooksPage';
 import { Page, PageHeader, PageScrollableContentWithShadow } from '../../../components/Page';
 import PageSkeleton from '../../../components/PageSkeleton';
 import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage';
-import WebhooksPage from './WebhooksPage';
 
 const reduceSettings = (settings: Serialized<ISetting>[]) =>
 	settings.reduce<Record<string, SettingValue>>((acc, { _id, value }) => {
@@ -16,7 +17,7 @@ const reduceSettings = (settings: Serialized<ISetting>[]) =>
 	}, {});
 
 const WebhooksPageContainer = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const getIntegrationsSettings = useEndpoint('GET', '/v1/livechat/integrations.settings');
 
diff --git a/apps/meteor/client/views/outlookCalendar/OutlookCalendarEventModal.tsx b/apps/meteor/client/views/outlookCalendar/OutlookCalendarEventModal.tsx
index 980382717607..2c11d08ab098 100644
--- a/apps/meteor/client/views/outlookCalendar/OutlookCalendarEventModal.tsx
+++ b/apps/meteor/client/views/outlookCalendar/OutlookCalendarEventModal.tsx
@@ -3,10 +3,10 @@ import { useQuery } from '@tanstack/react-query';
 import type { ComponentProps } from 'react';
 import React from 'react';
 
-import GenericModal from '../../components/GenericModal';
-import GenericModalSkeleton from '../../components/GenericModal/GenericModalSkeleton';
 import OutlookEventItemContent from './OutlookEventsList/OutlookEventItemContent';
 import { useOutlookOpenCall } from './hooks/useOutlookOpenCall';
+import GenericModal from '../../components/GenericModal';
+import GenericModalSkeleton from '../../components/GenericModal/GenericModalSkeleton';
 
 type OutlookCalendarEventModalProps = ComponentProps<typeof GenericModal> & {
 	id?: string;
diff --git a/apps/meteor/client/views/outlookCalendar/OutlookEventsList/OutlookEventItem.tsx b/apps/meteor/client/views/outlookCalendar/OutlookEventsList/OutlookEventItem.tsx
index c69ce7c43530..8ebd6f114a5f 100644
--- a/apps/meteor/client/views/outlookCalendar/OutlookEventsList/OutlookEventItem.tsx
+++ b/apps/meteor/client/views/outlookCalendar/OutlookEventsList/OutlookEventItem.tsx
@@ -1,15 +1,18 @@
 import type { ICalendarEvent, Serialized } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
 import { Box, Button, Palette } from '@rocket.chat/fuselage';
-import { useSetModal, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetModal } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useFormatDateAndTime } from '../../../hooks/useFormatDateAndTime';
 import OutlookCalendarEventModal from '../OutlookCalendarEventModal';
 import { useOutlookOpenCall } from '../hooks/useOutlookOpenCall';
 
-const OutlookEventItem = ({ subject, description, startTime, meetingUrl }: Serialized<ICalendarEvent>) => {
-	const t = useTranslation();
+type OutlookEventItemProps = Serialized<ICalendarEvent>;
+
+const OutlookEventItem = ({ subject, description, startTime, meetingUrl }: OutlookEventItemProps) => {
+	const { t } = useTranslation();
 	const setModal = useSetModal();
 	const formatDateAndTime = useFormatDateAndTime();
 	const openCall = useOutlookOpenCall(meetingUrl);
diff --git a/apps/meteor/client/views/outlookCalendar/OutlookEventsList/OutlookEventsList.tsx b/apps/meteor/client/views/outlookCalendar/OutlookEventsList/OutlookEventsList.tsx
index 286028e0059d..8cef3107f85f 100644
--- a/apps/meteor/client/views/outlookCalendar/OutlookEventsList/OutlookEventsList.tsx
+++ b/apps/meteor/client/views/outlookCalendar/OutlookEventsList/OutlookEventsList.tsx
@@ -5,6 +5,7 @@ import type { ReactElement } from 'react';
 import React from 'react';
 import { Virtuoso } from 'react-virtuoso';
 
+import OutlookEventItem from './OutlookEventItem';
 import {
 	ContextualbarHeader,
 	ContextualbarIcon,
@@ -19,7 +20,6 @@ import { getErrorMessage } from '../../../lib/errorHandling';
 import { useOutlookAuthentication } from '../hooks/useOutlookAuthentication';
 import { useMutationOutlookCalendarSync, useOutlookCalendarListForToday } from '../hooks/useOutlookCalendarList';
 import { NotOnDesktopError } from '../lib/NotOnDesktopError';
-import OutlookEventItem from './OutlookEventItem';
 
 type OutlookEventsListProps = {
 	onClose: () => void;
@@ -28,7 +28,7 @@ type OutlookEventsListProps = {
 
 const OutlookEventsList = ({ onClose, changeRoute }: OutlookEventsListProps): ReactElement => {
 	const t = useTranslation();
-	const outlookUrl = useSetting<string>('Outlook_Calendar_Outlook_Url');
+	const outlookUrl = useSetting('Outlook_Calendar_Outlook_Url', '');
 	const { authEnabled, isError, error } = useOutlookAuthentication();
 
 	const hasOutlookMethods = !(isError && error instanceof NotOnDesktopError);
diff --git a/apps/meteor/client/views/outlookCalendar/OutlookEventsRoute.tsx b/apps/meteor/client/views/outlookCalendar/OutlookEventsRoute.tsx
index 334c0763f92a..435d857f880a 100644
--- a/apps/meteor/client/views/outlookCalendar/OutlookEventsRoute.tsx
+++ b/apps/meteor/client/views/outlookCalendar/OutlookEventsRoute.tsx
@@ -1,8 +1,8 @@
 import React, { useState } from 'react';
 
-import { useRoomToolbox } from '../room/contexts/RoomToolboxContext';
 import OutlookEventsList from './OutlookEventsList';
 import OutlookSettingsList from './OutlookSettingsList';
+import { useRoomToolbox } from '../room/contexts/RoomToolboxContext';
 
 type OutlookCalendarRoutes = 'list' | 'settings';
 
diff --git a/apps/meteor/client/views/outlookCalendar/OutlookSettingsList/OutlookSettingsList.tsx b/apps/meteor/client/views/outlookCalendar/OutlookSettingsList/OutlookSettingsList.tsx
index 3ceb891d7f9d..bf8715972579 100644
--- a/apps/meteor/client/views/outlookCalendar/OutlookSettingsList/OutlookSettingsList.tsx
+++ b/apps/meteor/client/views/outlookCalendar/OutlookSettingsList/OutlookSettingsList.tsx
@@ -3,6 +3,7 @@ import { useTranslation, useUserPreference, useEndpoint, useToastMessageDispatch
 import type { ReactElement } from 'react';
 import React, { useCallback } from 'react';
 
+import OutlookSettingItem from './OutlookSettingItem';
 import {
 	ContextualbarHeader,
 	ContextualbarIcon,
@@ -12,7 +13,6 @@ import {
 	ContextualbarFooter,
 } from '../../../components/Contextualbar';
 import { useOutlookAuthentication, useOutlookAuthenticationMutationLogout } from '../hooks/useOutlookAuthentication';
-import OutlookSettingItem from './OutlookSettingItem';
 
 type OutlookSettingsListProps = {
 	onClose: () => void;
diff --git a/apps/meteor/client/views/outlookCalendar/hooks/useOutlookAuthentication.ts b/apps/meteor/client/views/outlookCalendar/hooks/useOutlookAuthentication.ts
index d671c051f8dd..29d6515759fc 100644
--- a/apps/meteor/client/views/outlookCalendar/hooks/useOutlookAuthentication.ts
+++ b/apps/meteor/client/views/outlookCalendar/hooks/useOutlookAuthentication.ts
@@ -1,5 +1,6 @@
-import { useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import { useTranslation } from 'react-i18next';
 
 import { NotOnDesktopError } from '../lib/NotOnDesktopError';
 
@@ -38,7 +39,7 @@ export const useOutlookAuthenticationMutation = () => {
 };
 
 export const useOutlookAuthenticationMutationLogout = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 	const mutation = useOutlookAuthenticationMutation();
 	return useMutation({
diff --git a/apps/meteor/client/views/outlookCalendar/hooks/useOutlookCalendarList.ts b/apps/meteor/client/views/outlookCalendar/hooks/useOutlookCalendarList.ts
index 35c33b24e256..980d087a2370 100644
--- a/apps/meteor/client/views/outlookCalendar/hooks/useOutlookCalendarList.ts
+++ b/apps/meteor/client/views/outlookCalendar/hooks/useOutlookCalendarList.ts
@@ -1,8 +1,8 @@
 import { useToastMessageDispatch, useTranslation, useEndpoint } from '@rocket.chat/ui-contexts';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 
-import { syncOutlookEvents } from '../lib/syncOutlookEvents';
 import { useOutlookAuthenticationMutation } from './useOutlookAuthentication';
+import { syncOutlookEvents } from '../lib/syncOutlookEvents';
 
 export const useOutlookCalendarListForToday = () => {
 	return useOutlookCalendarList(new Date());
diff --git a/apps/meteor/client/views/room/Announcement/Announcement.tsx b/apps/meteor/client/views/room/Announcement/Announcement.tsx
index d1ee3b5268c9..c583d09c022b 100644
--- a/apps/meteor/client/views/room/Announcement/Announcement.tsx
+++ b/apps/meteor/client/views/room/Announcement/Announcement.tsx
@@ -1,12 +1,13 @@
 import { Box } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useSetModal, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetModal } from '@rocket.chat/ui-contexts';
 import type { MouseEvent } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
+import AnnouncementComponent from './AnnouncementComponent';
 import GenericModal from '../../../components/GenericModal';
 import MarkdownText from '../../../components/MarkdownText';
-import AnnouncementComponent from './AnnouncementComponent';
 
 type AnnouncementProps = {
 	announcement: string;
@@ -14,7 +15,7 @@ type AnnouncementProps = {
 };
 
 const Announcement = ({ announcement, announcementDetails }: AnnouncementProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const setModal = useSetModal();
 	const closeModal = useMutableCallback(() => setModal(null));
 	const handleClick = (e: MouseEvent<HTMLAnchorElement>): void => {
@@ -34,7 +35,7 @@ const Announcement = ({ announcement, announcementDetails }: AnnouncementProps)
 							<MarkdownText content={announcement} parseEmoji />
 						</Box>
 					</GenericModal>,
-			  );
+				);
 	};
 
 	return announcement ? (
diff --git a/apps/meteor/client/views/room/E2EESetup/RoomE2EENotAllowed.tsx b/apps/meteor/client/views/room/E2EESetup/RoomE2EENotAllowed.tsx
index 03beebb8487e..9a41076b246a 100644
--- a/apps/meteor/client/views/room/E2EESetup/RoomE2EENotAllowed.tsx
+++ b/apps/meteor/client/views/room/E2EESetup/RoomE2EENotAllowed.tsx
@@ -10,9 +10,10 @@ import {
 	StatesTitle,
 } from '@rocket.chat/fuselage';
 import type { Keys as IconName } from '@rocket.chat/icons';
-import { useRouter, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRouter } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 const DOCS_URL = 'https://go.rocket.chat/i/e2ee-guide';
 
@@ -26,7 +27,7 @@ type RoomE2EENotAllowedProps = {
 
 const RoomE2EENotAllowed = ({ title, subTitle, action, btnText, icon }: RoomE2EENotAllowedProps): ReactElement => {
 	const router = useRouter();
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const handleGoHomeClick = () => {
 		router.navigate('/home');
 	};
diff --git a/apps/meteor/client/views/room/E2EESetup/RoomE2EESetup.tsx b/apps/meteor/client/views/room/E2EESetup/RoomE2EESetup.tsx
index 7a9ca6772472..88ef05fd7e56 100644
--- a/apps/meteor/client/views/room/E2EESetup/RoomE2EESetup.tsx
+++ b/apps/meteor/client/views/room/E2EESetup/RoomE2EESetup.tsx
@@ -3,6 +3,7 @@ import { Accounts } from 'meteor/accounts-base';
 import React, { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import RoomE2EENotAllowed from './RoomE2EENotAllowed';
 import { e2e } from '../../../../app/e2e/client';
 import { E2EEState } from '../../../../app/e2e/client/E2EEState';
 import { E2ERoomState } from '../../../../app/e2e/client/E2ERoomState';
@@ -11,7 +12,6 @@ import RoomBodyV2 from '../body/RoomBodyV2';
 import { useRoom } from '../contexts/RoomContext';
 import { useE2EERoomState } from '../hooks/useE2EERoomState';
 import { useE2EEState } from '../hooks/useE2EEState';
-import RoomE2EENotAllowed from './RoomE2EENotAllowed';
 
 const RoomE2EESetup = () => {
 	const room = useRoom();
diff --git a/apps/meteor/client/views/room/Header/DirectRoomHeader.tsx b/apps/meteor/client/views/room/Header/DirectRoomHeader.tsx
index 524eb8d2e525..6446e3455344 100644
--- a/apps/meteor/client/views/room/Header/DirectRoomHeader.tsx
+++ b/apps/meteor/client/views/room/Header/DirectRoomHeader.tsx
@@ -3,8 +3,8 @@ import { useUserId } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import { usePresence } from '../../../hooks/usePresence';
 import RoomHeader from './RoomHeader';
+import { usePresence } from '../../../hooks/usePresence';
 
 type DirectRoomHeaderProps = {
 	room: IRoom;
diff --git a/apps/meteor/client/views/room/Header/Header.tsx b/apps/meteor/client/views/room/Header/Header.tsx
index 298076c65ce6..e63c3864195d 100644
--- a/apps/meteor/client/views/room/Header/Header.tsx
+++ b/apps/meteor/client/views/room/Header/Header.tsx
@@ -20,7 +20,7 @@ type HeaderProps<T> = {
 const Header = ({ room }: HeaderProps<IRoom>): ReactElement | null => {
 	const { isMobile, isEmbedded, showTopNavbarEmbeddedLayout } = useLayout();
 	const encrypted = Boolean(room.encrypted);
-	const unencryptedMessagesAllowed = useSetting<boolean>('E2E_Allow_Unencrypted_Messages');
+	const unencryptedMessagesAllowed = useSetting('E2E_Allow_Unencrypted_Messages', false);
 	const shouldDisplayE2EESetup = encrypted && !unencryptedMessagesAllowed;
 
 	const slots = useMemo(
diff --git a/apps/meteor/client/views/room/Header/Omnichannel/BackButton.tsx b/apps/meteor/client/views/room/Header/Omnichannel/BackButton.tsx
index 54470a2b0f64..fb3cbd97a73c 100644
--- a/apps/meteor/client/views/room/Header/Omnichannel/BackButton.tsx
+++ b/apps/meteor/client/views/room/Header/Omnichannel/BackButton.tsx
@@ -1,13 +1,14 @@
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useRouter, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRouter } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { HeaderToolbarAction } from '../../../../components/Header';
 
 export const BackButton = ({ routeName }: { routeName?: string }): ReactElement => {
 	const router = useRouter();
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const back = useMutableCallback(() => {
 		switch (routeName) {
@@ -16,7 +17,7 @@ export const BackButton = ({ routeName }: { routeName?: string }): ReactElement
 					name: 'omnichannel-directory',
 					params: {
 						...router.getRouteParameters(),
-						bar: 'info',
+						context: 'info',
 					},
 				});
 				break;
diff --git a/apps/meteor/client/views/room/Header/Omnichannel/OmnichannelRoomHeader.tsx b/apps/meteor/client/views/room/Header/Omnichannel/OmnichannelRoomHeader.tsx
index e6ae9a3747d7..d814a30da0b0 100644
--- a/apps/meteor/client/views/room/Header/Omnichannel/OmnichannelRoomHeader.tsx
+++ b/apps/meteor/client/views/room/Header/Omnichannel/OmnichannelRoomHeader.tsx
@@ -7,6 +7,7 @@ import SidebarToggler from '../../../../components/SidebarToggler';
 import { useOmnichannelRoom } from '../../contexts/RoomContext';
 import RoomHeader from '../RoomHeader';
 import { BackButton } from './BackButton';
+import OmnichannelRoomHeaderTag from './OmnichannelRoomHeaderTag';
 import QuickActions from './QuickActions';
 
 type OmnichannelRoomHeaderProps = {
@@ -44,6 +45,7 @@ const OmnichannelRoomHeader = ({ slots: parentSlot }: OmnichannelRoomHeaderProps
 					<BackButton routeName={currentRouteName} />
 				</HeaderToolbar>
 			),
+			insideContent: <OmnichannelRoomHeaderTag />,
 			posContent: <QuickActions />,
 		}),
 		[isMobile, currentRouteName, parentSlot],
diff --git a/apps/meteor/client/views/room/Header/Omnichannel/OmnichannelRoomHeaderTag.tsx b/apps/meteor/client/views/room/Header/Omnichannel/OmnichannelRoomHeaderTag.tsx
new file mode 100644
index 000000000000..ec02774dfc33
--- /dev/null
+++ b/apps/meteor/client/views/room/Header/Omnichannel/OmnichannelRoomHeaderTag.tsx
@@ -0,0 +1,20 @@
+import { Box } from '@rocket.chat/fuselage';
+import { useSetModal } from '@rocket.chat/ui-contexts';
+import React from 'react';
+
+import OmnichannelVerificationTag from '../../../omnichannel/components/OmnichannelVerificationTag';
+import AdvancedContactModal from '../../../omnichannel/contactInfo/AdvancedContactModal';
+import { useOmnichannelRoom } from '../../contexts/RoomContext';
+
+const OmnichannelRoomHeaderTag = () => {
+	const setModal = useSetModal();
+	const { verified } = useOmnichannelRoom();
+
+	return (
+		<Box mis={4} withTruncatedText>
+			<OmnichannelVerificationTag verified={verified} onClick={() => setModal(<AdvancedContactModal onCancel={() => setModal(null)} />)} />
+		</Box>
+	);
+};
+
+export default OmnichannelRoomHeaderTag;
diff --git a/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/QuickActions.tsx b/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/QuickActions.tsx
index f3b7ef7562d6..d3ca9d5bd750 100644
--- a/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/QuickActions.tsx
+++ b/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/QuickActions.tsx
@@ -3,10 +3,10 @@ import type { ComponentProps } from 'react';
 import React, { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { HeaderToolbar, HeaderToolbarAction, HeaderToolbarDivider } from '../../../../../components/Header';
-import { useOmnichannelRoom } from '../../../contexts/RoomContext';
 import QuickActionOptions from './QuickActionOptions';
 import { useQuickActions } from './hooks/useQuickActions';
+import { HeaderToolbar, HeaderToolbarAction, HeaderToolbarDivider } from '../../../../../components/Header';
+import { useOmnichannelRoom } from '../../../contexts/RoomContext';
 
 type QuickActionsProps = {
 	className?: ComponentProps<typeof Box>['className'];
@@ -33,10 +33,10 @@ const QuickActions = ({ className }: QuickActionsProps) => {
 				};
 
 				if (options) {
-					return <QuickActionOptions options={options} {...props} key={id} />;
+					return <QuickActionOptions options={options} key={id} {...props} />;
 				}
 
-				return <HeaderToolbarAction {...props} key={id} />;
+				return <HeaderToolbarAction key={id} {...props} />;
 			})}
 			{quickActions.length > 0 && <HeaderToolbarDivider />}
 		</HeaderToolbar>
diff --git a/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/hooks/useQuickActions.tsx b/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/hooks/useQuickActions.tsx
index edf5ffcbdc8a..c5fd6c51d0c2 100644
--- a/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/hooks/useQuickActions.tsx
+++ b/apps/meteor/client/views/room/Header/Omnichannel/QuickActions/hooks/useQuickActions.tsx
@@ -14,8 +14,10 @@ import {
 } from '@rocket.chat/ui-contexts';
 import React, { useCallback, useState, useEffect } from 'react';
 
-import PlaceChatOnHoldModal from '../../../../../../../app/livechat-enterprise/client/components/modals/PlaceChatOnHoldModal';
+import { usePutChatOnHoldMutation } from './usePutChatOnHoldMutation';
+import { useReturnChatToQueueMutation } from './useReturnChatToQueueMutation';
 import { LivechatInquiry } from '../../../../../../../app/livechat/client/collections/LivechatInquiry';
+import PlaceChatOnHoldModal from '../../../../../../../app/livechat-enterprise/client/components/modals/PlaceChatOnHoldModal';
 import { LegacyRoomManager } from '../../../../../../../app/ui-utils/client';
 import CloseChatModal from '../../../../../../components/Omnichannel/modals/CloseChatModal';
 import CloseChatModalData from '../../../../../../components/Omnichannel/modals/CloseChatModalData';
@@ -29,8 +31,6 @@ import { quickActionHooks } from '../../../../../../ui';
 import { useOmnichannelRoom } from '../../../../contexts/RoomContext';
 import type { QuickActionsActionConfig } from '../../../../lib/quickActions';
 import { QuickActionsEnum } from '../../../../lib/quickActions';
-import { usePutChatOnHoldMutation } from './usePutChatOnHoldMutation';
-import { useReturnChatToQueueMutation } from './useReturnChatToQueueMutation';
 
 export const useQuickActions = (): {
 	quickActions: QuickActionsActionConfig[];
@@ -196,7 +196,7 @@ export const useQuickActions = (): {
 									sendToVisitor: preferences?.omnichannelTranscriptEmail,
 									requestData,
 								},
-						  }
+							}
 						: { transcriptEmail: { sendToVisitor: false } }),
 				});
 				LivechatInquiry.remove({ rid });
diff --git a/apps/meteor/client/views/room/Header/ParentRoomWithEndpointData.tsx b/apps/meteor/client/views/room/Header/ParentRoomWithEndpointData.tsx
index 06571dd02cce..27c397d06ce4 100644
--- a/apps/meteor/client/views/room/Header/ParentRoomWithEndpointData.tsx
+++ b/apps/meteor/client/views/room/Header/ParentRoomWithEndpointData.tsx
@@ -2,9 +2,9 @@ import type { IRoom } from '@rocket.chat/core-typings';
 import type { ReactElement } from 'react';
 import React from 'react';
 
+import ParentRoom from './ParentRoom';
 import { HeaderTagSkeleton } from '../../../components/Header';
 import { useRoomInfoEndpoint } from '../../../hooks/useRoomInfoEndpoint';
-import ParentRoom from './ParentRoom';
 
 type ParentRoomWithEndpointDataProps = {
 	rid: IRoom['_id'];
diff --git a/apps/meteor/client/views/room/Header/RoomHeader.tsx b/apps/meteor/client/views/room/Header/RoomHeader.tsx
index 5d98d4a33f8d..1ba0ca80cd6a 100644
--- a/apps/meteor/client/views/room/Header/RoomHeader.tsx
+++ b/apps/meteor/client/views/room/Header/RoomHeader.tsx
@@ -4,8 +4,6 @@ import { RoomAvatar } from '@rocket.chat/ui-avatar';
 import React, { Suspense } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { Header, HeaderAvatar, HeaderContent, HeaderContentRow, HeaderSubtitle, HeaderToolbar } from '../../../components/Header';
-import MarkdownText from '../../../components/MarkdownText';
 import FederatedRoomOriginServer from './FederatedRoomOriginServer';
 import ParentRoomWithData from './ParentRoomWithData';
 import ParentTeam from './ParentTeam';
@@ -14,6 +12,8 @@ import RoomToolbox from './RoomToolbox';
 import Encrypted from './icons/Encrypted';
 import Favorite from './icons/Favorite';
 import Translate from './icons/Translate';
+import { Header, HeaderAvatar, HeaderContent, HeaderContentRow, HeaderSubtitle, HeaderToolbar } from '../../../components/Header';
+import MarkdownText from '../../../components/MarkdownText';
 
 export type RoomHeaderProps = {
 	room: IRoom;
diff --git a/apps/meteor/client/views/room/Header/RoomHeaderE2EESetup.tsx b/apps/meteor/client/views/room/Header/RoomHeaderE2EESetup.tsx
index c9bfe325be92..a40bf902469c 100644
--- a/apps/meteor/client/views/room/Header/RoomHeaderE2EESetup.tsx
+++ b/apps/meteor/client/views/room/Header/RoomHeaderE2EESetup.tsx
@@ -1,11 +1,11 @@
 import React, { lazy } from 'react';
 
+import RoomHeader from './RoomHeader';
+import type { RoomHeaderProps } from './RoomHeader';
 import { E2EEState } from '../../../../app/e2e/client/E2EEState';
 import { E2ERoomState } from '../../../../app/e2e/client/E2ERoomState';
 import { useE2EERoomState } from '../hooks/useE2EERoomState';
 import { useE2EEState } from '../hooks/useE2EEState';
-import RoomHeader from './RoomHeader';
-import type { RoomHeaderProps } from './RoomHeader';
 
 const RoomToolboxE2EESetup = lazy(() => import('./RoomToolbox/RoomToolboxE2EESetup'));
 
diff --git a/apps/meteor/client/views/room/Header/RoomTitle.tsx b/apps/meteor/client/views/room/Header/RoomTitle.tsx
index 9a3e810a46b7..b481586d7339 100644
--- a/apps/meteor/client/views/room/Header/RoomTitle.tsx
+++ b/apps/meteor/client/views/room/Header/RoomTitle.tsx
@@ -4,9 +4,9 @@ import { useDocumentTitle } from '@rocket.chat/ui-client';
 import type { KeyboardEvent, ReactElement } from 'react';
 import React from 'react';
 
+import HeaderIconWithRoom from './HeaderIconWithRoom';
 import { HeaderTitle, HeaderTitleButton } from '../../../components/Header';
 import { useRoomToolbox } from '../contexts/RoomToolboxContext';
-import HeaderIconWithRoom from './HeaderIconWithRoom';
 
 const RoomTitle = ({ room }: { room: IRoom }): ReactElement => {
 	useDocumentTitle(room.name, false);
diff --git a/apps/meteor/client/views/room/Header/RoomToolbox/RoomToolbox.tsx b/apps/meteor/client/views/room/Header/RoomToolbox/RoomToolbox.tsx
index ff9880ba1e84..bd7d6000db58 100644
--- a/apps/meteor/client/views/room/Header/RoomToolbox/RoomToolbox.tsx
+++ b/apps/meteor/client/views/room/Header/RoomToolbox/RoomToolbox.tsx
@@ -2,9 +2,10 @@ import type { Box } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { GenericMenu } from '@rocket.chat/ui-client';
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
-import { useLayout, useTranslation } from '@rocket.chat/ui-contexts';
+import { useLayout } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { HeaderToolbarAction, HeaderToolbarDivider } from '../../../../components/Header';
 import { useRoomToolbox } from '../../contexts/RoomToolboxContext';
@@ -20,7 +21,7 @@ type MenuActionsProps = {
 }[];
 
 const RoomToolbox = ({ className }: RoomToolboxProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { roomToolboxExpanded } = useLayout();
 
 	const toolbox = useRoomToolbox();
diff --git a/apps/meteor/client/views/room/Header/icons/Encrypted.tsx b/apps/meteor/client/views/room/Header/icons/Encrypted.tsx
index 71acc234f885..ca21153126fd 100644
--- a/apps/meteor/client/views/room/Header/icons/Encrypted.tsx
+++ b/apps/meteor/client/views/room/Header/icons/Encrypted.tsx
@@ -1,12 +1,13 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import colors from '@rocket.chat/fuselage-tokens/colors';
-import { useSetting, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetting } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { HeaderState } from '../../../../components/Header';
 
 const Encrypted = ({ room }: { room: IRoom }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const e2eEnabled = useSetting('E2E_Enable');
 	return e2eEnabled && room?.encrypted ? <HeaderState title={t('Encrypted')} icon='key' color={colors.g500} tiny /> : null;
 };
diff --git a/apps/meteor/client/views/room/Header/icons/Translate.tsx b/apps/meteor/client/views/room/Header/icons/Translate.tsx
index 701de69cb679..993b844a4213 100644
--- a/apps/meteor/client/views/room/Header/icons/Translate.tsx
+++ b/apps/meteor/client/views/room/Header/icons/Translate.tsx
@@ -1,6 +1,7 @@
 import type { IRoom } from '@rocket.chat/core-typings';
-import { useSetting, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetting } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { HeaderState } from '../../../../components/Header';
 
@@ -9,7 +10,7 @@ type TranslateProps = {
 };
 
 const Translate = ({ room: { autoTranslateLanguage, autoTranslate } }: TranslateProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const autoTranslateEnabled = useSetting('AutoTranslate_Enabled');
 	const encryptedLabel = t('Translated');
 	return autoTranslateEnabled && autoTranslate && autoTranslateLanguage ? (
diff --git a/apps/meteor/client/views/room/HeaderV2/Header.tsx b/apps/meteor/client/views/room/HeaderV2/Header.tsx
index 25394b703280..bcf701ab35e9 100644
--- a/apps/meteor/client/views/room/HeaderV2/Header.tsx
+++ b/apps/meteor/client/views/room/HeaderV2/Header.tsx
@@ -19,7 +19,7 @@ type HeaderProps = {
 const Header = ({ room }: HeaderProps): ReactElement | null => {
 	const { isMobile, isEmbedded, showTopNavbarEmbeddedLayout } = useLayout();
 	const encrypted = Boolean(room.encrypted);
-	const unencryptedMessagesAllowed = useSetting<boolean>('E2E_Allow_Unencrypted_Messages');
+	const unencryptedMessagesAllowed = useSetting('E2E_Allow_Unencrypted_Messages', false);
 	const shouldDisplayE2EESetup = encrypted && !unencryptedMessagesAllowed;
 
 	const slots = useMemo(
diff --git a/apps/meteor/client/views/room/HeaderV2/Omnichannel/BackButton.tsx b/apps/meteor/client/views/room/HeaderV2/Omnichannel/BackButton.tsx
index fc9ef65593d8..5ad221129ae3 100644
--- a/apps/meteor/client/views/room/HeaderV2/Omnichannel/BackButton.tsx
+++ b/apps/meteor/client/views/room/HeaderV2/Omnichannel/BackButton.tsx
@@ -1,7 +1,8 @@
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useRouter, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRouter } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { HeaderToolbarAction } from '../../../../components/Header';
 
@@ -9,7 +10,7 @@ type BackButtonProps = { routeName?: string };
 
 const BackButton = ({ routeName }: BackButtonProps): ReactElement => {
 	const router = useRouter();
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const back = useMutableCallback(() => {
 		switch (routeName) {
diff --git a/apps/meteor/client/views/room/HeaderV2/Omnichannel/OmnichannelRoomHeader.tsx b/apps/meteor/client/views/room/HeaderV2/Omnichannel/OmnichannelRoomHeader.tsx
index 3e4834318894..8c72b22933ea 100644
--- a/apps/meteor/client/views/room/HeaderV2/Omnichannel/OmnichannelRoomHeader.tsx
+++ b/apps/meteor/client/views/room/HeaderV2/Omnichannel/OmnichannelRoomHeader.tsx
@@ -7,6 +7,7 @@ import SidebarToggler from '../../../../components/SidebarToggler';
 import { useOmnichannelRoom } from '../../contexts/RoomContext';
 import RoomHeader from '../RoomHeader';
 import BackButton from './BackButton';
+import OmnichannelRoomHeaderTag from './OmnichannelRoomHeaderTag';
 import QuickActions from './QuickActions';
 
 type OmnichannelRoomHeaderProps = {
@@ -44,6 +45,7 @@ const OmnichannelRoomHeader = ({ slots: parentSlot }: OmnichannelRoomHeaderProps
 					<BackButton routeName={currentRouteName} />
 				</HeaderToolbar>
 			),
+			insideContent: <OmnichannelRoomHeaderTag />,
 			posContent: <QuickActions />,
 		}),
 		[isMobile, currentRouteName, parentSlot],
diff --git a/apps/meteor/client/views/room/HeaderV2/Omnichannel/OmnichannelRoomHeaderTag.tsx b/apps/meteor/client/views/room/HeaderV2/Omnichannel/OmnichannelRoomHeaderTag.tsx
new file mode 100644
index 000000000000..ec02774dfc33
--- /dev/null
+++ b/apps/meteor/client/views/room/HeaderV2/Omnichannel/OmnichannelRoomHeaderTag.tsx
@@ -0,0 +1,20 @@
+import { Box } from '@rocket.chat/fuselage';
+import { useSetModal } from '@rocket.chat/ui-contexts';
+import React from 'react';
+
+import OmnichannelVerificationTag from '../../../omnichannel/components/OmnichannelVerificationTag';
+import AdvancedContactModal from '../../../omnichannel/contactInfo/AdvancedContactModal';
+import { useOmnichannelRoom } from '../../contexts/RoomContext';
+
+const OmnichannelRoomHeaderTag = () => {
+	const setModal = useSetModal();
+	const { verified } = useOmnichannelRoom();
+
+	return (
+		<Box mis={4} withTruncatedText>
+			<OmnichannelVerificationTag verified={verified} onClick={() => setModal(<AdvancedContactModal onCancel={() => setModal(null)} />)} />
+		</Box>
+	);
+};
+
+export default OmnichannelRoomHeaderTag;
diff --git a/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/QuickActions.tsx b/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/QuickActions.tsx
index f3b7ef7562d6..d3ca9d5bd750 100644
--- a/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/QuickActions.tsx
+++ b/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/QuickActions.tsx
@@ -3,10 +3,10 @@ import type { ComponentProps } from 'react';
 import React, { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { HeaderToolbar, HeaderToolbarAction, HeaderToolbarDivider } from '../../../../../components/Header';
-import { useOmnichannelRoom } from '../../../contexts/RoomContext';
 import QuickActionOptions from './QuickActionOptions';
 import { useQuickActions } from './hooks/useQuickActions';
+import { HeaderToolbar, HeaderToolbarAction, HeaderToolbarDivider } from '../../../../../components/Header';
+import { useOmnichannelRoom } from '../../../contexts/RoomContext';
 
 type QuickActionsProps = {
 	className?: ComponentProps<typeof Box>['className'];
@@ -33,10 +33,10 @@ const QuickActions = ({ className }: QuickActionsProps) => {
 				};
 
 				if (options) {
-					return <QuickActionOptions options={options} {...props} key={id} />;
+					return <QuickActionOptions options={options} key={id} {...props} />;
 				}
 
-				return <HeaderToolbarAction {...props} key={id} />;
+				return <HeaderToolbarAction key={id} {...props} />;
 			})}
 			{quickActions.length > 0 && <HeaderToolbarDivider />}
 		</HeaderToolbar>
diff --git a/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/hooks/useQuickActions.tsx b/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/hooks/useQuickActions.tsx
index 7446d0630b09..9fb85a581ace 100644
--- a/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/hooks/useQuickActions.tsx
+++ b/apps/meteor/client/views/room/HeaderV2/Omnichannel/QuickActions/hooks/useQuickActions.tsx
@@ -13,8 +13,10 @@ import {
 } from '@rocket.chat/ui-contexts';
 import React, { useCallback, useState, useEffect } from 'react';
 
-import PlaceChatOnHoldModal from '../../../../../../../app/livechat-enterprise/client/components/modals/PlaceChatOnHoldModal';
+import { usePutChatOnHoldMutation } from './usePutChatOnHoldMutation';
+import { useReturnChatToQueueMutation } from './useReturnChatToQueueMutation';
 import { LivechatInquiry } from '../../../../../../../app/livechat/client/collections/LivechatInquiry';
+import PlaceChatOnHoldModal from '../../../../../../../app/livechat-enterprise/client/components/modals/PlaceChatOnHoldModal';
 import { LegacyRoomManager } from '../../../../../../../app/ui-utils/client';
 import CloseChatModal from '../../../../../../components/Omnichannel/modals/CloseChatModal';
 import CloseChatModalData from '../../../../../../components/Omnichannel/modals/CloseChatModalData';
@@ -28,8 +30,6 @@ import { quickActionHooks } from '../../../../../../ui';
 import { useOmnichannelRoom } from '../../../../contexts/RoomContext';
 import type { QuickActionsActionConfig } from '../../../../lib/quickActions';
 import { QuickActionsEnum } from '../../../../lib/quickActions';
-import { usePutChatOnHoldMutation } from './usePutChatOnHoldMutation';
-import { useReturnChatToQueueMutation } from './useReturnChatToQueueMutation';
 
 export const useQuickActions = (): {
 	quickActions: QuickActionsActionConfig[];
@@ -194,7 +194,7 @@ export const useQuickActions = (): {
 									sendToVisitor: preferences?.omnichannelTranscriptEmail,
 									requestData,
 								},
-						  }
+							}
 						: { transcriptEmail: { sendToVisitor: false } }),
 				});
 				LivechatInquiry.remove({ rid });
diff --git a/apps/meteor/client/views/room/HeaderV2/ParentRoomWithEndpointData.tsx b/apps/meteor/client/views/room/HeaderV2/ParentRoomWithEndpointData.tsx
index 89d0ea1f8220..08888fc243a4 100644
--- a/apps/meteor/client/views/room/HeaderV2/ParentRoomWithEndpointData.tsx
+++ b/apps/meteor/client/views/room/HeaderV2/ParentRoomWithEndpointData.tsx
@@ -1,9 +1,9 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import React from 'react';
 
+import ParentRoom from './ParentRoom';
 import { HeaderTagSkeleton } from '../../../components/Header';
 import { useRoomInfoEndpoint } from '../../../hooks/useRoomInfoEndpoint';
-import ParentRoom from './ParentRoom';
 
 type ParentRoomWithEndpointDataProps = {
 	rid: IRoom['_id'];
diff --git a/apps/meteor/client/views/room/HeaderV2/RoomHeader.tsx b/apps/meteor/client/views/room/HeaderV2/RoomHeader.tsx
index a99265368dee..82d63485d026 100644
--- a/apps/meteor/client/views/room/HeaderV2/RoomHeader.tsx
+++ b/apps/meteor/client/views/room/HeaderV2/RoomHeader.tsx
@@ -4,7 +4,6 @@ import { RoomAvatar } from '@rocket.chat/ui-avatar';
 import React, { Suspense } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { Header, HeaderAvatar, HeaderContent, HeaderContentRow, HeaderToolbar } from '../../../components/Header';
 import FederatedRoomOriginServer from './FederatedRoomOriginServer';
 import ParentRoomWithData from './ParentRoomWithData';
 import ParentTeam from './ParentTeam';
@@ -13,6 +12,7 @@ import RoomToolbox from './RoomToolbox';
 import Encrypted from './icons/Encrypted';
 import Favorite from './icons/Favorite';
 import Translate from './icons/Translate';
+import { Header, HeaderAvatar, HeaderContent, HeaderContentRow, HeaderToolbar } from '../../../components/Header';
 
 export type RoomHeaderProps = {
 	room: IRoom;
diff --git a/apps/meteor/client/views/room/HeaderV2/RoomHeaderE2EESetup.tsx b/apps/meteor/client/views/room/HeaderV2/RoomHeaderE2EESetup.tsx
index c9bfe325be92..a40bf902469c 100644
--- a/apps/meteor/client/views/room/HeaderV2/RoomHeaderE2EESetup.tsx
+++ b/apps/meteor/client/views/room/HeaderV2/RoomHeaderE2EESetup.tsx
@@ -1,11 +1,11 @@
 import React, { lazy } from 'react';
 
+import RoomHeader from './RoomHeader';
+import type { RoomHeaderProps } from './RoomHeader';
 import { E2EEState } from '../../../../app/e2e/client/E2EEState';
 import { E2ERoomState } from '../../../../app/e2e/client/E2ERoomState';
 import { useE2EERoomState } from '../hooks/useE2EERoomState';
 import { useE2EEState } from '../hooks/useE2EEState';
-import RoomHeader from './RoomHeader';
-import type { RoomHeaderProps } from './RoomHeader';
 
 const RoomToolboxE2EESetup = lazy(() => import('./RoomToolbox/RoomToolboxE2EESetup'));
 
diff --git a/apps/meteor/client/views/room/HeaderV2/RoomTitle.tsx b/apps/meteor/client/views/room/HeaderV2/RoomTitle.tsx
index d728f8c03a3f..9b8011737636 100644
--- a/apps/meteor/client/views/room/HeaderV2/RoomTitle.tsx
+++ b/apps/meteor/client/views/room/HeaderV2/RoomTitle.tsx
@@ -4,9 +4,9 @@ import { useDocumentTitle } from '@rocket.chat/ui-client';
 import type { KeyboardEvent } from 'react';
 import React from 'react';
 
+import HeaderIconWithRoom from './HeaderIconWithRoom';
 import { HeaderTitle, HeaderTitleButton } from '../../../components/Header';
 import { useRoomToolbox } from '../contexts/RoomToolboxContext';
-import HeaderIconWithRoom from './HeaderIconWithRoom';
 
 type RoomTitleProps = { room: IRoom };
 
diff --git a/apps/meteor/client/views/room/HeaderV2/RoomToolbox/RoomToolbox.tsx b/apps/meteor/client/views/room/HeaderV2/RoomToolbox/RoomToolbox.tsx
index abf9b41b89da..5c0aeb430478 100644
--- a/apps/meteor/client/views/room/HeaderV2/RoomToolbox/RoomToolbox.tsx
+++ b/apps/meteor/client/views/room/HeaderV2/RoomToolbox/RoomToolbox.tsx
@@ -2,9 +2,10 @@ import type { Box } from '@rocket.chat/fuselage';
 import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
 import { GenericMenu } from '@rocket.chat/ui-client';
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
-import { useLayout, useTranslation } from '@rocket.chat/ui-contexts';
+import { useLayout } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { HeaderToolbarAction, HeaderToolbarDivider } from '../../../../components/Header';
 import { useRoomToolbox } from '../../contexts/RoomToolboxContext';
@@ -20,7 +21,7 @@ type MenuActionsProps = {
 }[];
 
 const RoomToolbox = ({ className }: RoomToolboxProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { roomToolboxExpanded } = useLayout();
 
 	const toolbox = useRoomToolbox();
diff --git a/apps/meteor/client/views/room/HeaderV2/icons/Encrypted.tsx b/apps/meteor/client/views/room/HeaderV2/icons/Encrypted.tsx
index 71acc234f885..ca21153126fd 100644
--- a/apps/meteor/client/views/room/HeaderV2/icons/Encrypted.tsx
+++ b/apps/meteor/client/views/room/HeaderV2/icons/Encrypted.tsx
@@ -1,12 +1,13 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import colors from '@rocket.chat/fuselage-tokens/colors';
-import { useSetting, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetting } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { HeaderState } from '../../../../components/Header';
 
 const Encrypted = ({ room }: { room: IRoom }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const e2eEnabled = useSetting('E2E_Enable');
 	return e2eEnabled && room?.encrypted ? <HeaderState title={t('Encrypted')} icon='key' color={colors.g500} tiny /> : null;
 };
diff --git a/apps/meteor/client/views/room/HeaderV2/icons/Translate.tsx b/apps/meteor/client/views/room/HeaderV2/icons/Translate.tsx
index 0097c9f2e3d8..993b844a4213 100644
--- a/apps/meteor/client/views/room/HeaderV2/icons/Translate.tsx
+++ b/apps/meteor/client/views/room/HeaderV2/icons/Translate.tsx
@@ -1,7 +1,7 @@
 import type { IRoom } from '@rocket.chat/core-typings';
-import { useSetting, useTranslation } from '@rocket.chat/ui-contexts';
-import type { FC } from 'react';
+import { useSetting } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { HeaderState } from '../../../../components/Header';
 
@@ -9,8 +9,8 @@ type TranslateProps = {
 	room: IRoom;
 };
 
-const Translate: FC<TranslateProps> = ({ room: { autoTranslateLanguage, autoTranslate } }) => {
-	const t = useTranslation();
+const Translate = ({ room: { autoTranslateLanguage, autoTranslate } }: TranslateProps) => {
+	const { t } = useTranslation();
 	const autoTranslateEnabled = useSetting('AutoTranslate_Enabled');
 	const encryptedLabel = t('Translated');
 	return autoTranslateEnabled && autoTranslate && autoTranslateLanguage ? (
diff --git a/apps/meteor/client/views/room/MessageList/MessageList.tsx b/apps/meteor/client/views/room/MessageList/MessageList.tsx
index a7d635ae4255..91bc72fe9526 100644
--- a/apps/meteor/client/views/room/MessageList/MessageList.tsx
+++ b/apps/meteor/client/views/room/MessageList/MessageList.tsx
@@ -4,11 +4,11 @@ import { useSetting, useUserPreference } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import React, { Fragment } from 'react';
 
+import { MessageListItem } from './MessageListItem';
 import { MessageTypes } from '../../../../app/ui-utils/client';
 import { useRoomSubscription } from '../contexts/RoomContext';
 import { useFirstUnreadMessageId } from '../hooks/useFirstUnreadMessageId';
 import { SelectedMessagesProvider } from '../providers/SelectedMessagesProvider';
-import { MessageListItem } from './MessageListItem';
 import { useMessages } from './hooks/useMessages';
 import { isMessageSequential } from './lib/isMessageSequential';
 import MessageListProvider from './providers/MessageListProvider';
@@ -22,7 +22,7 @@ export const MessageList = function MessageList({ rid, messageListRef }: Message
 	const messages = useMessages({ rid });
 	const subscription = useRoomSubscription();
 	const showUserAvatar = !!useUserPreference<boolean>('displayAvatars');
-	const messageGroupingPeriod = Number(useSetting('Message_GroupingPeriod'));
+	const messageGroupingPeriod = useSetting('Message_GroupingPeriod', 300);
 	const firstUnreadMessageId = useFirstUnreadMessageId();
 
 	return (
diff --git a/apps/meteor/client/views/room/MessageList/hooks/useAutoLinkDomains.ts b/apps/meteor/client/views/room/MessageList/hooks/useAutoLinkDomains.ts
index 570cd4884ff8..93f0511bf9a4 100644
--- a/apps/meteor/client/views/room/MessageList/hooks/useAutoLinkDomains.ts
+++ b/apps/meteor/client/views/room/MessageList/hooks/useAutoLinkDomains.ts
@@ -2,7 +2,7 @@ import { useSetting } from '@rocket.chat/ui-contexts';
 import { useMemo } from 'react';
 
 export const useAutoLinkDomains = (): string[] => {
-	const domains = useSetting<string>('Message_CustomDomain_AutoLink');
+	const domains = useSetting('Message_CustomDomain_AutoLink', '');
 
 	const customDomains = useMemo(() => (domains ? domains.split(',').map((domain) => domain.trim()) : []), [domains]);
 
diff --git a/apps/meteor/client/views/room/MessageList/hooks/useAutoTranslate.ts b/apps/meteor/client/views/room/MessageList/hooks/useAutoTranslate.ts
index cce522566a22..4180dc46d3d1 100644
--- a/apps/meteor/client/views/room/MessageList/hooks/useAutoTranslate.ts
+++ b/apps/meteor/client/views/room/MessageList/hooks/useAutoTranslate.ts
@@ -14,7 +14,7 @@ export type AutoTranslateOptions = {
 };
 
 export const useAutoTranslate = (subscription?: ISubscription): AutoTranslateOptions => {
-	const autoTranslateSettingEnabled = Boolean(useSetting('AutoTranslate_Enabled'));
+	const autoTranslateSettingEnabled = useSetting('AutoTranslate_Enabled', false);
 	const isSubscriptionEnabled = autoTranslateSettingEnabled && subscription?.autoTranslateLanguage && subscription?.autoTranslate;
 	const isLivechatRoom = useMemo(() => subscription && roomCoordinator.isLivechatRoom(subscription?.t), [subscription]);
 	const autoTranslateEnabled = Boolean(isSubscriptionEnabled || isLivechatRoom);
diff --git a/apps/meteor/client/views/room/MessageList/hooks/useKatex.ts b/apps/meteor/client/views/room/MessageList/hooks/useKatex.ts
index b652bf283d54..094c7015c126 100644
--- a/apps/meteor/client/views/room/MessageList/hooks/useKatex.ts
+++ b/apps/meteor/client/views/room/MessageList/hooks/useKatex.ts
@@ -5,9 +5,9 @@ export const useKatex = (): {
 	katexDollarSyntaxEnabled: boolean;
 	katexParenthesisSyntaxEnabled: boolean;
 } => {
-	const katexEnabled = Boolean(useSetting('Katex_Enabled'));
-	const katexDollarSyntaxEnabled = Boolean(useSetting('Katex_Dollar_Syntax')) && katexEnabled;
-	const katexParenthesisSyntaxEnabled = Boolean(useSetting('Katex_Parenthesis_Syntax')) && katexEnabled;
+	const katexEnabled = useSetting('Katex_Enabled', true);
+	const katexDollarSyntaxEnabled = useSetting('Katex_Dollar_Syntax', false) && katexEnabled;
+	const katexParenthesisSyntaxEnabled = useSetting('Katex_Parenthesis_Syntax', true) && katexEnabled;
 
 	return {
 		katexEnabled,
diff --git a/apps/meteor/client/views/room/MessageList/hooks/useMessageBody.tsx b/apps/meteor/client/views/room/MessageList/hooks/useMessageBody.tsx
index a9e04aec315c..2174874e5321 100644
--- a/apps/meteor/client/views/room/MessageList/hooks/useMessageBody.tsx
+++ b/apps/meteor/client/views/room/MessageList/hooks/useMessageBody.tsx
@@ -3,9 +3,9 @@ import type { Options, Root } from '@rocket.chat/message-parser';
 import { useUserSubscription } from '@rocket.chat/ui-contexts';
 import { useMemo } from 'react';
 
-import { parseMessageTextToAstMarkdown } from '../../../../lib/parseMessageTextToAstMarkdown';
 import { useAutoLinkDomains } from './useAutoLinkDomains';
 import { useAutoTranslate } from './useAutoTranslate';
+import { parseMessageTextToAstMarkdown } from '../../../../lib/parseMessageTextToAstMarkdown';
 
 export const useMessageBody = (message: IMessage | undefined, rid: string): string | Root => {
 	const subscription = useUserSubscription(rid);
diff --git a/apps/meteor/client/views/room/MessageList/hooks/useMessages.ts b/apps/meteor/client/views/room/MessageList/hooks/useMessages.ts
index 72a85b45235c..62bd70bbbaee 100644
--- a/apps/meteor/client/views/room/MessageList/hooks/useMessages.ts
+++ b/apps/meteor/client/views/room/MessageList/hooks/useMessages.ts
@@ -4,7 +4,7 @@ import { useSetting, useUserPreference } from '@rocket.chat/ui-contexts';
 import type { Mongo } from 'meteor/mongo';
 import { useCallback, useMemo } from 'react';
 
-import { ChatMessage } from '../../../../../app/models/client';
+import { Messages } from '../../../../../app/models/client';
 import { useReactiveValue } from '../../../../hooks/useReactiveValue';
 import { useRoom } from '../../contexts/RoomContext';
 
@@ -17,7 +17,7 @@ const mergeHideSysMessages = (
 
 export const useMessages = ({ rid }: { rid: IRoom['_id'] }): IMessage[] => {
 	const showThreadsInMainChannel = useUserPreference<boolean>('showThreadsInMainChannel', false);
-	const hideSysMesSetting = useSetting<MessageTypesValues[]>('Hide_System_Messages') ?? [];
+	const hideSysMesSetting = useSetting<MessageTypesValues[]>('Hide_System_Messages', []);
 	const room = useRoom();
 	const hideRoomSysMes: Array<MessageTypesValues> = Array.isArray(room.sysMes) ? room.sysMes : [];
 
@@ -38,7 +38,7 @@ export const useMessages = ({ rid }: { rid: IRoom['_id'] }): IMessage[] => {
 	return useReactiveValue(
 		useCallback(
 			() =>
-				ChatMessage.find(query, {
+				Messages.find(query, {
 					sort: {
 						ts: 1,
 					},
diff --git a/apps/meteor/client/views/room/MessageList/lib/isMessageSequential.spec.ts b/apps/meteor/client/views/room/MessageList/lib/isMessageSequential.spec.ts
index d3da6c88fd5b..1d8c8bb5dd44 100644
--- a/apps/meteor/client/views/room/MessageList/lib/isMessageSequential.spec.ts
+++ b/apps/meteor/client/views/room/MessageList/lib/isMessageSequential.spec.ts
@@ -1,7 +1,7 @@
 import type { IMessage } from '@rocket.chat/core-typings';
 
-import { MessageTypes } from '../../../../../app/ui-utils/lib/MessageTypes';
 import { isMessageSequential } from './isMessageSequential';
+import { MessageTypes } from '../../../../../app/ui-utils/lib/MessageTypes';
 
 const TIME_RANGE_IN_SECONDS = 300;
 
diff --git a/apps/meteor/client/views/room/MessageList/lib/isMessageSequential.ts b/apps/meteor/client/views/room/MessageList/lib/isMessageSequential.ts
index 0a736d1c8e29..e50779d832d3 100644
--- a/apps/meteor/client/views/room/MessageList/lib/isMessageSequential.ts
+++ b/apps/meteor/client/views/room/MessageList/lib/isMessageSequential.ts
@@ -1,8 +1,8 @@
 import type { IMessage } from '@rocket.chat/core-typings';
 import { differenceInSeconds } from 'date-fns';
 
-import { MessageTypes } from '../../../../../app/ui-utils/lib/MessageTypes';
 import { isMessageNewDay } from './isMessageNewDay';
+import { MessageTypes } from '../../../../../app/ui-utils/lib/MessageTypes';
 
 export const isMessageSequential = (current: IMessage, previous: IMessage | undefined, groupingRange: number): boolean => {
 	if (!previous) {
diff --git a/apps/meteor/client/views/room/MessageList/lib/isOwnUserMessage.spec.ts b/apps/meteor/client/views/room/MessageList/lib/isOwnUserMessage.spec.ts
index c819a864bd9a..481490e8a46a 100644
--- a/apps/meteor/client/views/room/MessageList/lib/isOwnUserMessage.spec.ts
+++ b/apps/meteor/client/views/room/MessageList/lib/isOwnUserMessage.spec.ts
@@ -1,7 +1,7 @@
 import type { IMessage, ISubscription } from '@rocket.chat/core-typings';
 
-import { MessageTypes } from '../../../../../app/ui-utils/lib/MessageTypes';
 import { isOwnUserMessage } from './isOwnUserMessage';
+import { MessageTypes } from '../../../../../app/ui-utils/lib/MessageTypes';
 
 const date = new Date('2021-10-27T00:00:00.000Z');
 
diff --git a/apps/meteor/client/views/room/MessageList/providers/MessageHighlightProvider.tsx b/apps/meteor/client/views/room/MessageList/providers/MessageHighlightProvider.tsx
index bb4177f7d974..73807b4917b2 100644
--- a/apps/meteor/client/views/room/MessageList/providers/MessageHighlightProvider.tsx
+++ b/apps/meteor/client/views/room/MessageList/providers/MessageHighlightProvider.tsx
@@ -2,8 +2,8 @@ import type { ReactElement, ContextType, ReactNode } from 'react';
 import React, { useMemo } from 'react';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
 
-import MessageHighlightContext from '../contexts/MessageHighlightContext';
 import * as messageHighlightSubscription from './messageHighlightSubscription';
+import MessageHighlightContext from '../contexts/MessageHighlightContext';
 
 const MessageHighlightProvider = ({ children }: { children: ReactNode }): ReactElement => {
 	const highlightMessageId = useSyncExternalStore(messageHighlightSubscription.subscribe, messageHighlightSubscription.getSnapshot);
diff --git a/apps/meteor/client/views/room/MessageList/providers/MessageListProvider.tsx b/apps/meteor/client/views/room/MessageList/providers/MessageListProvider.tsx
index 08b0bbbf16be..f594f172e4fc 100644
--- a/apps/meteor/client/views/room/MessageList/providers/MessageListProvider.tsx
+++ b/apps/meteor/client/views/room/MessageList/providers/MessageListProvider.tsx
@@ -37,10 +37,10 @@ const MessageListProvider = ({ children, messageListRef, attachmentDimension }:
 
 	const { isMobile } = useLayout();
 
-	const showRealName = Boolean(useSetting('UI_Use_Real_Name'));
-	const showColors = useSetting('HexColorPreview_Enabled') as boolean;
+	const showRealName = useSetting('UI_Use_Real_Name', false);
+	const showColors = useSetting('HexColorPreview_Enabled', false);
 
-	const displayRolesGlobal = Boolean(useSetting('UI_DisplayRoles'));
+	const displayRolesGlobal = useSetting('UI_DisplayRoles', true);
 	const hideRolesPreference = Boolean(!useUserPreference<boolean>('hideRoles') && !isMobile);
 	const showRoles = displayRolesGlobal && hideRolesPreference;
 	const showUsername = Boolean(!useUserPreference<boolean>('hideUsernames') && !isMobile);
diff --git a/apps/meteor/client/views/room/Room.tsx b/apps/meteor/client/views/room/Room.tsx
index 55f8b4a82be8..b0001db4daab 100644
--- a/apps/meteor/client/views/room/Room.tsx
+++ b/apps/meteor/client/views/room/Room.tsx
@@ -5,7 +5,6 @@ import React, { createElement, lazy, memo, Suspense } from 'react';
 import { FocusScope } from 'react-aria';
 import { ErrorBoundary } from 'react-error-boundary';
 
-import { ContextualbarSkeleton } from '../../components/Contextualbar';
 import RoomE2EESetup from './E2EESetup/RoomE2EESetup';
 import Header from './Header';
 import { HeaderV2 } from './HeaderV2';
@@ -19,6 +18,7 @@ import RoomLayout from './layout/RoomLayout';
 import ChatProvider from './providers/ChatProvider';
 import { DateListProvider } from './providers/DateListProvider';
 import { SelectedMessagesProvider } from './providers/SelectedMessagesProvider';
+import { ContextualbarSkeleton } from '../../components/Contextualbar';
 
 const UiKitContextualBar = lazy(() => import('./contextualBar/uikit/UiKitContextualBar'));
 
diff --git a/apps/meteor/client/views/room/RoomAnnouncement/RoomAnnouncement.tsx b/apps/meteor/client/views/room/RoomAnnouncement/RoomAnnouncement.tsx
index 4c96b88bb348..3e6243102ef4 100644
--- a/apps/meteor/client/views/room/RoomAnnouncement/RoomAnnouncement.tsx
+++ b/apps/meteor/client/views/room/RoomAnnouncement/RoomAnnouncement.tsx
@@ -1,20 +1,21 @@
 import { Box } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useSetModal, useTranslation } from '@rocket.chat/ui-contexts';
-import type { FC, MouseEvent } from 'react';
+import { useSetModal } from '@rocket.chat/ui-contexts';
+import type { MouseEvent } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
+import AnnouncementComponent from './AnnouncementComponent';
 import GenericModal from '../../../components/GenericModal';
 import MarkdownText from '../../../components/MarkdownText';
-import AnnouncementComponent from './AnnouncementComponent';
 
 type RoomAnnouncementParams = {
 	announcement: string;
 	announcementDetails?: () => void;
 };
 
-const RoomAnnouncement: FC<RoomAnnouncementParams> = ({ announcement, announcementDetails }) => {
-	const t = useTranslation();
+const RoomAnnouncement = ({ announcement, announcementDetails }: RoomAnnouncementParams) => {
+	const { t } = useTranslation();
 	const setModal = useSetModal();
 	const closeModal = useMutableCallback(() => setModal(null));
 	const handleClick = (e: MouseEvent<HTMLAnchorElement>): void => {
@@ -34,7 +35,7 @@ const RoomAnnouncement: FC<RoomAnnouncementParams> = ({ announcement, announceme
 							<MarkdownText content={announcement} parseEmoji />
 						</Box>
 					</GenericModal>,
-			  );
+				);
 	};
 
 	return announcement ? (
diff --git a/apps/meteor/client/views/room/RoomNotFound.tsx b/apps/meteor/client/views/room/RoomNotFound.tsx
index 12aa61deef50..70cd7dda7dc4 100644
--- a/apps/meteor/client/views/room/RoomNotFound.tsx
+++ b/apps/meteor/client/views/room/RoomNotFound.tsx
@@ -1,15 +1,16 @@
 import { Box } from '@rocket.chat/fuselage';
 import { Header, HeaderToolbar } from '@rocket.chat/ui-client';
-import { useLayout, useTranslation } from '@rocket.chat/ui-contexts';
+import { useLayout } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
+import RoomLayout from './layout/RoomLayout';
 import NotFoundState from '../../components/NotFoundState';
 import SidebarToggler from '../../components/SidebarToggler';
-import RoomLayout from './layout/RoomLayout';
 
 const RoomNotFound = (): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { isMobile } = useLayout();
 
 	return (
diff --git a/apps/meteor/client/views/room/RoomOpener.tsx b/apps/meteor/client/views/room/RoomOpener.tsx
index f87339a67a68..3006a6acd940 100644
--- a/apps/meteor/client/views/room/RoomOpener.tsx
+++ b/apps/meteor/client/views/room/RoomOpener.tsx
@@ -5,15 +5,15 @@ import type { ReactElement } from 'react';
 import React, { lazy, Suspense } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import RoomSkeleton from './RoomSkeleton';
+import RoomSidepanel from './Sidepanel/RoomSidepanel';
+import { useOpenRoom } from './hooks/useOpenRoom';
 import { FeaturePreviewSidePanelNavigation } from '../../components/FeaturePreviewSidePanelNavigation';
 import { Header } from '../../components/Header';
 import { getErrorMessage } from '../../lib/errorHandling';
 import { NotAuthorizedError } from '../../lib/errors/NotAuthorizedError';
 import { OldUrlRoomError } from '../../lib/errors/OldUrlRoomError';
 import { RoomNotFoundError } from '../../lib/errors/RoomNotFoundError';
-import RoomSkeleton from './RoomSkeleton';
-import RoomSidepanel from './Sidepanel/RoomSidepanel';
-import { useOpenRoom } from './hooks/useOpenRoom';
 
 const RoomProvider = lazy(() => import('./providers/RoomProvider'));
 const RoomNotFound = lazy(() => import('./RoomNotFound'));
diff --git a/apps/meteor/client/views/room/RoomSkeleton.tsx b/apps/meteor/client/views/room/RoomSkeleton.tsx
index 083a729c309e..b6c463417a92 100644
--- a/apps/meteor/client/views/room/RoomSkeleton.tsx
+++ b/apps/meteor/client/views/room/RoomSkeleton.tsx
@@ -2,11 +2,11 @@ import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '@rocket.cha
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import MessageListSkeleton from '../../components/message/list/MessageListSkeleton';
 import HeaderSkeleton from './Header/HeaderSkeleton';
 import HeaderSkeletonV2 from './HeaderV2/HeaderSkeleton';
 import RoomComposerSkeleton from './composer/RoomComposer/RoomComposerSkeleton';
 import RoomLayout from './layout/RoomLayout';
+import MessageListSkeleton from '../../components/message/list/MessageListSkeleton';
 
 const RoomSkeleton = (): ReactElement => (
 	<RoomLayout
diff --git a/apps/meteor/client/views/room/ShareLocation/ShareLocationModal.tsx b/apps/meteor/client/views/room/ShareLocation/ShareLocationModal.tsx
index 2d21affb1a88..481315805c7b 100644
--- a/apps/meteor/client/views/room/ShareLocation/ShareLocationModal.tsx
+++ b/apps/meteor/client/views/room/ShareLocation/ShareLocationModal.tsx
@@ -4,10 +4,10 @@ import { useQuery, useQueryClient } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import GenericModal from '../../../components/GenericModal';
-import MapView from '../../../components/message/content/location/MapView';
 import { getGeolocationPermission } from './getGeolocationPermission';
 import { getGeolocationPosition } from './getGeolocationPosition';
+import GenericModal from '../../../components/GenericModal';
+import MapView from '../../../components/message/content/location/MapView';
 
 type ShareLocationModalProps = {
 	rid: IRoom['_id'];
diff --git a/apps/meteor/client/views/room/Sidepanel/RoomSidepanel.tsx b/apps/meteor/client/views/room/Sidepanel/RoomSidepanel.tsx
index 6ee16a850202..926498263400 100644
--- a/apps/meteor/client/views/room/Sidepanel/RoomSidepanel.tsx
+++ b/apps/meteor/client/views/room/Sidepanel/RoomSidepanel.tsx
@@ -4,13 +4,13 @@ import { useUserPreference } from '@rocket.chat/ui-contexts';
 import React, { memo } from 'react';
 import { Virtuoso } from 'react-virtuoso';
 
-import { VirtuosoScrollbars } from '../../../components/CustomScrollbars';
-import { useRoomInfoEndpoint } from '../../../hooks/useRoomInfoEndpoint';
-import { useOpenedRoom, useSecondLevelOpenedRoom } from '../../../lib/RoomManager';
 import RoomSidepanelListWrapper from './RoomSidepanelListWrapper';
 import RoomSidepanelLoading from './RoomSidepanelLoading';
 import RoomSidepanelItem from './SidepanelItem';
 import { useTeamsListChildrenUpdate } from './hooks/useTeamslistChildren';
+import { VirtuosoScrollbars } from '../../../components/CustomScrollbars';
+import { useRoomInfoEndpoint } from '../../../hooks/useRoomInfoEndpoint';
+import { useOpenedRoom, useSecondLevelOpenedRoom } from '../../../lib/RoomManager';
 
 const RoomSidepanel = () => {
 	const parentRid = useOpenedRoom();
diff --git a/apps/meteor/client/views/room/Sidepanel/hooks/useItemData.tsx b/apps/meteor/client/views/room/Sidepanel/hooks/useItemData.tsx
index 7ac4b3feb23c..89aa1887c938 100644
--- a/apps/meteor/client/views/room/Sidepanel/hooks/useItemData.tsx
+++ b/apps/meteor/client/views/room/Sidepanel/hooks/useItemData.tsx
@@ -5,8 +5,9 @@ import { useTranslation } from 'react-i18next';
 
 import { RoomIcon } from '../../../../components/RoomIcon';
 import { roomCoordinator } from '../../../../lib/rooms/roomCoordinator';
-import { getBadgeTitle, getMessage } from '../../../../sidebarv2/RoomList/SidebarItemTemplateWithData';
+import { getMessage } from '../../../../sidebarv2/RoomList/SidebarItemTemplateWithData';
 import { useAvatarTemplate } from '../../../../sidebarv2/hooks/useAvatarTemplate';
+import { useUnreadDisplay } from '../../../../sidebarv2/hooks/useUnreadDisplay';
 
 export const useItemData = (
 	room: ISubscription & IRoom,
@@ -15,7 +16,7 @@ export const useItemData = (
 	const { t } = useTranslation();
 	const AvatarTemplate = useAvatarTemplate();
 
-	const highlighted = Boolean(!room.hideUnreadStatus && (room.alert || room.unread));
+	const { unreadTitle, unreadVariant, showUnread, highlightUnread: highlighted, unreadCount } = useUnreadDisplay(room);
 
 	const icon = useMemo(
 		() => <SidebarItemIcon highlighted={highlighted} icon={<RoomIcon room={room} placement='sidebar' size='x20' />} />,
@@ -24,28 +25,17 @@ export const useItemData = (
 	const time = 'lastMessage' in room ? room.lastMessage?.ts : undefined;
 	const message = viewMode === 'extended' && getMessage(room, room.lastMessage, t);
 
-	const threadUnread = Number(room.tunread?.length) > 0;
-	const isUnread = room.unread > 0 || threadUnread;
-	const showBadge =
-		!room.hideUnreadStatus || (!room.hideMentionStatus && (Boolean(room.userMentions) || Number(room.tunreadUser?.length) > 0));
-	const badgeTitle = getBadgeTitle(room.userMentions, Number(room.tunread?.length), room.groupMentions, room.unread, t);
-	const variant =
-		((room.userMentions || room.tunreadUser?.length) && 'danger') ||
-		(threadUnread && 'primary') ||
-		(room.groupMentions && 'warning') ||
-		'secondary';
-
 	const badges = useMemo(
 		() => (
 			<>
-				{showBadge && isUnread && (
-					<SidebarItemBadge variant={variant} title={badgeTitle}>
-						{room.unread + (room.tunread?.length || 0)}
+				{showUnread && (
+					<SidebarItemBadge variant={unreadVariant} title={unreadTitle} role='status'>
+						{unreadCount.total}
 					</SidebarItemBadge>
 				)}
 			</>
 		),
-		[badgeTitle, isUnread, room.tunread?.length, room.unread, showBadge, variant],
+		[showUnread, unreadCount.total, unreadTitle, unreadVariant],
 	);
 
 	const itemData = useMemo(
diff --git a/apps/meteor/client/views/room/Sidepanel/hooks/useTeamslistChildren.ts b/apps/meteor/client/views/room/Sidepanel/hooks/useTeamslistChildren.ts
index 1722a42c7a4d..e186a3b0a806 100644
--- a/apps/meteor/client/views/room/Sidepanel/hooks/useTeamslistChildren.ts
+++ b/apps/meteor/client/views/room/Sidepanel/hooks/useTeamslistChildren.ts
@@ -3,13 +3,16 @@ import { useQuery } from '@tanstack/react-query';
 import type { Mongo } from 'meteor/mongo';
 import { useEffect, useMemo } from 'react';
 
-import { ChatRoom } from '../../../../../app/models/client';
+import { Rooms } from '../../../../../app/models/client';
+import { useSortQueryOptions } from '../../../../hooks/useSortQueryOptions';
 
 export const useTeamsListChildrenUpdate = (
 	parentRid: string,
 	teamId?: string | null,
 	sidepanelItems?: 'channels' | 'discussions' | null,
 ) => {
+	const options = useSortQueryOptions();
+
 	const query = useMemo(() => {
 		const query: Mongo.Selector<IRoom> = {
 			$or: [
@@ -34,11 +37,8 @@ export const useTeamsListChildrenUpdate = (
 	}, [parentRid, teamId, sidepanelItems]);
 
 	const result = useQuery({
-		queryKey: ['sidepanel', 'list', parentRid, sidepanelItems],
-		queryFn: () =>
-			ChatRoom.find(query, {
-				sort: { lm: -1 },
-			}).fetch(),
+		queryKey: ['sidepanel', 'list', parentRid, sidepanelItems, options],
+		queryFn: () => Rooms.find(query, options).fetch(),
 		enabled: sidepanelItems !== null && teamId !== null,
 		refetchInterval: 5 * 60 * 1000,
 		keepPreviousData: true,
@@ -47,7 +47,7 @@ export const useTeamsListChildrenUpdate = (
 	const { refetch } = result;
 
 	useEffect(() => {
-		const liveQueryHandle = ChatRoom.find(query).observe({
+		const liveQueryHandle = Rooms.find(query).observe({
 			added: () => queueMicrotask(() => refetch({ exact: false })),
 			changed: () => queueMicrotask(() => refetch({ exact: false })),
 			removed: () => queueMicrotask(() => refetch({ exact: false })),
diff --git a/apps/meteor/client/views/room/UserCard/UserCardWithData.tsx b/apps/meteor/client/views/room/UserCard/UserCardWithData.tsx
index feaf12fd6b04..70826fd24e40 100644
--- a/apps/meteor/client/views/room/UserCard/UserCardWithData.tsx
+++ b/apps/meteor/client/views/room/UserCard/UserCardWithData.tsx
@@ -1,9 +1,10 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import { useEffectEvent } from '@rocket.chat/fuselage-hooks';
 import { GenericMenu } from '@rocket.chat/ui-client';
-import { useSetting, useRolesDescription, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetting, useRolesDescription } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { getUserDisplayName } from '../../../../lib/getUserDisplayName';
 import LocalTime from '../../../components/LocalTime';
@@ -12,6 +13,7 @@ import { ReactiveUserStatus } from '../../../components/UserStatus';
 import { useUserInfoQuery } from '../../../hooks/useUserInfoQuery';
 import { useMemberExists } from '../../hooks/useMemberExists';
 import { useUserInfoActions } from '../hooks/useUserInfoActions';
+import type { UserInfoAction } from '../hooks/useUserInfoActions/useUserInfoActions';
 
 type UserCardWithDataProps = {
 	username: string;
@@ -21,9 +23,9 @@ type UserCardWithDataProps = {
 };
 
 const UserCardWithData = ({ username, rid, onOpenUserInfo, onClose }: UserCardWithDataProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const getRoles = useRolesDescription();
-	const showRealNames = Boolean(useSetting('UI_Use_Real_Name'));
+	const showRealNames = useSetting('UI_Use_Real_Name', false);
 
 	const { data, isLoading: isUserInfoLoading } = useUserInfoQuery({ username });
 	const {
@@ -97,8 +99,8 @@ const UserCardWithData = ({ username, rid, onOpenUserInfo, onClose }: UserCardWi
 	}, [menuOptions, onClose, t]);
 
 	const actions = useMemo(() => {
-		const mapAction = ([key, { content, title, icon, onClick }]: any): ReactElement => (
-			<UserCardAction key={key} label={content || title} aria-label={content || title} onClick={onClick} icon={icon} />
+		const mapAction = ([key, { content, title, icon, onClick }]: [string, UserInfoAction]): ReactElement => (
+			<UserCardAction key={key} label={content || title} aria-label={content || title} onClick={onClick} icon={icon!} />
 		);
 
 		return [...actionsDefinition.map(mapAction), menu].filter(Boolean);
diff --git a/apps/meteor/client/views/room/body/DropTargetOverlay.tsx b/apps/meteor/client/views/room/body/DropTargetOverlay.tsx
index 2e9e16ef3201..6c5c46c15e6f 100644
--- a/apps/meteor/client/views/room/body/DropTargetOverlay.tsx
+++ b/apps/meteor/client/views/room/body/DropTargetOverlay.tsx
@@ -81,7 +81,7 @@ function DropTargetOverlay({ enabled, reason, onFileDrop, visible = true, onDism
 			borderColor='currentColor'
 			color={enabled ? 'primary' : 'danger'}
 			className={css`
-				animation-name: zoomIn;
+				animation-name: zoom-in;
 				animation-duration: 0.1s;
 			`}
 			onDragLeave={handleDragLeave}
diff --git a/apps/meteor/client/views/room/body/RetentionPolicyWarning.spec.tsx b/apps/meteor/client/views/room/body/RetentionPolicyWarning.spec.tsx
index 5e4e13fa3eab..b1b1398e3b35 100644
--- a/apps/meteor/client/views/room/body/RetentionPolicyWarning.spec.tsx
+++ b/apps/meteor/client/views/room/body/RetentionPolicyWarning.spec.tsx
@@ -1,9 +1,9 @@
 import { render, screen } from '@testing-library/react';
 import React from 'react';
 
+import RetentionPolicyWarning from './RetentionPolicyWarning';
 import { createRenteionPolicySettingsMock as createMock } from '../../../../tests/mocks/client/mockRetentionPolicySettings';
 import { createFakeRoom } from '../../../../tests/mocks/data';
-import RetentionPolicyWarning from './RetentionPolicyWarning';
 
 jest.useFakeTimers();
 
diff --git a/apps/meteor/client/views/room/body/RoomBody.tsx b/apps/meteor/client/views/room/body/RoomBody.tsx
index a592bb1fa2c0..13c111592c39 100644
--- a/apps/meteor/client/views/room/body/RoomBody.tsx
+++ b/apps/meteor/client/views/room/body/RoomBody.tsx
@@ -5,6 +5,9 @@ import { usePermission, useRole, useSetting, useTranslation, useUser, useUserPre
 import type { MouseEventHandler, ReactElement, UIEvent } from 'react';
 import React, { memo, useCallback, useMemo, useRef } from 'react';
 
+import DropTargetOverlay from './DropTargetOverlay';
+import JumpToRecentMessageButton from './JumpToRecentMessageButton';
+import LeaderBar from './LeaderBar';
 import { RoomRoles } from '../../../../app/models/client';
 import { isTruthy } from '../../../../lib/isTruthy';
 import { CustomScrollbars } from '../../../components/CustomScrollbars';
@@ -13,6 +16,8 @@ import { useReactiveQuery } from '../../../hooks/useReactiveQuery';
 import Announcement from '../Announcement';
 import { BubbleDate } from '../BubbleDate';
 import { MessageList } from '../MessageList';
+import LoadingMessagesIndicator from './LoadingMessagesIndicator';
+import RetentionPolicyWarning from './RetentionPolicyWarning';
 import MessageListErrorBoundary from '../MessageList/MessageListErrorBoundary';
 import ComposerContainer from '../composer/ComposerContainer';
 import RoomComposer from '../composer/RoomComposer/RoomComposer';
@@ -23,11 +28,6 @@ import { useUserCard } from '../contexts/UserCardContext';
 import { useDateScroll } from '../hooks/useDateScroll';
 import { useMessageListNavigation } from '../hooks/useMessageListNavigation';
 import { useRetentionPolicy } from '../hooks/useRetentionPolicy';
-import DropTargetOverlay from './DropTargetOverlay';
-import JumpToRecentMessageButton from './JumpToRecentMessageButton';
-import LeaderBar from './LeaderBar';
-import LoadingMessagesIndicator from './LoadingMessagesIndicator';
-import RetentionPolicyWarning from './RetentionPolicyWarning';
 import RoomForeword from './RoomForeword/RoomForeword';
 import UnreadMessagesIndicator from './UnreadMessagesIndicator';
 import UploadProgressIndicator from './UploadProgressIndicator';
@@ -64,7 +64,7 @@ const RoomBody = (): ReactElement => {
 
 	const { hasMorePreviousMessages, hasMoreNextMessages, isLoadingMoreMessages } = useRoomMessages();
 
-	const allowAnonymousRead = useSetting('Accounts_AllowAnonymousRead') as boolean | undefined;
+	const allowAnonymousRead = useSetting('Accounts_AllowAnonymousRead', false);
 
 	const canPreviewChannelRoom = usePermission('preview-c-room');
 
@@ -86,7 +86,7 @@ const RoomBody = (): ReactElement => {
 		return subscribed;
 	}, [allowAnonymousRead, canPreviewChannelRoom, room, subscribed]);
 
-	const useRealName = useSetting('UI_Use_Real_Name') as boolean;
+	const useRealName = useSetting('UI_Use_Real_Name', false);
 
 	const innerBoxRef = useRef<HTMLDivElement | null>(null);
 
diff --git a/apps/meteor/client/views/room/body/RoomBodyV2.tsx b/apps/meteor/client/views/room/body/RoomBodyV2.tsx
index cfd6cb94cb51..3f1ecb0fd2bc 100644
--- a/apps/meteor/client/views/room/body/RoomBodyV2.tsx
+++ b/apps/meteor/client/views/room/body/RoomBodyV2.tsx
@@ -10,8 +10,12 @@ import { CustomScrollbars } from '../../../components/CustomScrollbars';
 import { useEmbeddedLayout } from '../../../hooks/useEmbeddedLayout';
 import { BubbleDate } from '../BubbleDate';
 import { MessageList } from '../MessageList';
+import DropTargetOverlay from './DropTargetOverlay';
+import JumpToRecentMessageButton from './JumpToRecentMessageButton';
 import MessageListErrorBoundary from '../MessageList/MessageListErrorBoundary';
 import RoomAnnouncement from '../RoomAnnouncement';
+import LoadingMessagesIndicator from './LoadingMessagesIndicator';
+import RetentionPolicyWarning from './RetentionPolicyWarning';
 import ComposerContainer from '../composer/ComposerContainer';
 import RoomComposer from '../composer/RoomComposer/RoomComposer';
 import { useChat } from '../contexts/ChatContext';
@@ -20,10 +24,6 @@ import { useRoomToolbox } from '../contexts/RoomToolboxContext';
 import { useDateScroll } from '../hooks/useDateScroll';
 import { useMessageListNavigation } from '../hooks/useMessageListNavigation';
 import { useRetentionPolicy } from '../hooks/useRetentionPolicy';
-import DropTargetOverlay from './DropTargetOverlay';
-import JumpToRecentMessageButton from './JumpToRecentMessageButton';
-import LoadingMessagesIndicator from './LoadingMessagesIndicator';
-import RetentionPolicyWarning from './RetentionPolicyWarning';
 import RoomForeword from './RoomForeword/RoomForeword';
 import { RoomTopic } from './RoomTopic';
 import UnreadMessagesIndicator from './UnreadMessagesIndicator';
@@ -61,7 +61,7 @@ const RoomBody = (): ReactElement => {
 
 	const { hasMorePreviousMessages, hasMoreNextMessages, isLoadingMoreMessages } = useRoomMessages();
 
-	const allowAnonymousRead = useSetting('Accounts_AllowAnonymousRead') as boolean | undefined;
+	const allowAnonymousRead = useSetting('Accounts_AllowAnonymousRead', false);
 
 	const canPreviewChannelRoom = usePermission('preview-c-room');
 
diff --git a/apps/meteor/client/views/room/body/RoomForeword/RoomForeword.tsx b/apps/meteor/client/views/room/body/RoomForeword/RoomForeword.tsx
index 7629fc14c508..9f1dfeaa34f5 100644
--- a/apps/meteor/client/views/room/body/RoomForeword/RoomForeword.tsx
+++ b/apps/meteor/client/views/room/body/RoomForeword/RoomForeword.tsx
@@ -6,8 +6,8 @@ import type { ReactElement } from 'react';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { VoipRoomForeword } from '../../../../components/voip/room/VoipRoomForeword';
 import RoomForewordUsernameList from './RoomForewordUsernameList';
+import { VoipRoomForeword } from '../../../../components/voip/room/VoipRoomForeword';
 
 type RoomForewordProps = { user: IUser | null; room: IRoom };
 
diff --git a/apps/meteor/client/views/room/body/RoomForeword/RoomForewordUsernameList.tsx b/apps/meteor/client/views/room/body/RoomForeword/RoomForewordUsernameList.tsx
index b5fa945908b5..268c17628166 100644
--- a/apps/meteor/client/views/room/body/RoomForeword/RoomForewordUsernameList.tsx
+++ b/apps/meteor/client/views/room/body/RoomForeword/RoomForewordUsernameList.tsx
@@ -3,13 +3,13 @@ import { Margins } from '@rocket.chat/fuselage';
 import { useSetting } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
-import { roomCoordinator } from '../../../../lib/rooms/roomCoordinator';
 import RoomForewordUsernameListItem from './RoomForewordUsernameListItem';
+import { roomCoordinator } from '../../../../lib/rooms/roomCoordinator';
 
 type RoomForewordUsernameListProps = { usernames: Array<NonNullable<IUser['username']>> };
 
 const RoomForewordUsernameList = ({ usernames }: RoomForewordUsernameListProps) => {
-	const useRealName = Boolean(useSetting('UI_Use_Real_Name'));
+	const useRealName = useSetting('UI_Use_Real_Name', false);
 	return (
 		<Margins inline={4}>
 			{usernames.map((username) => (
diff --git a/apps/meteor/client/views/room/body/RoomTopic.tsx b/apps/meteor/client/views/room/body/RoomTopic.tsx
index fd385aff9fa6..0987f39602a8 100644
--- a/apps/meteor/client/views/room/body/RoomTopic.tsx
+++ b/apps/meteor/client/views/room/body/RoomTopic.tsx
@@ -23,7 +23,7 @@ export const RoomTopic = ({ room, user }: RoomTopicProps) => {
 	const userId = useUserId();
 	const directUserId = room.uids?.filter((uid) => uid !== userId).shift();
 	const directUserData = usePresence(directUserId);
-	const useRealName = useSetting('UI_Use_Real_Name') as boolean;
+	const useRealName = useSetting('UI_Use_Real_Name', false);
 	const router = useRouter();
 
 	const currentRoute = router.getLocationPathname();
diff --git a/apps/meteor/client/views/room/body/UploadProgressIndicator.tsx b/apps/meteor/client/views/room/body/UploadProgressIndicator.tsx
index 3c9a9b0a809d..2e6103dbad99 100644
--- a/apps/meteor/client/views/room/body/UploadProgressIndicator.tsx
+++ b/apps/meteor/client/views/room/body/UploadProgressIndicator.tsx
@@ -2,8 +2,8 @@ import type { ReactElement } from 'react';
 import React, { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import type { Upload } from '../../../lib/chats/Upload';
 import ErroredUploadProgressIndicator from './ErroredUploadProgressIndicator';
+import type { Upload } from '../../../lib/chats/Upload';
 
 type UploadProgressIndicatorProps = {
 	id: Upload['id'];
diff --git a/apps/meteor/client/views/room/body/hooks/useFileUpload.ts b/apps/meteor/client/views/room/body/hooks/useFileUpload.ts
index 088e4b198cba..bdccc6d63fde 100644
--- a/apps/meteor/client/views/room/body/hooks/useFileUpload.ts
+++ b/apps/meteor/client/views/room/body/hooks/useFileUpload.ts
@@ -1,9 +1,9 @@
 import { useCallback, useEffect } from 'react';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
 
+import { useFileUploadDropTarget } from './useFileUploadDropTarget';
 import type { Upload } from '../../../../lib/chats/Upload';
 import { useChat } from '../../contexts/ChatContext';
-import { useFileUploadDropTarget } from './useFileUploadDropTarget';
 
 export const useFileUpload = () => {
 	const chat = useChat();
diff --git a/apps/meteor/client/views/room/body/hooks/useFileUploadDropTarget.ts b/apps/meteor/client/views/room/body/hooks/useFileUploadDropTarget.ts
index b97c0ad0866c..c3fe4301cb75 100644
--- a/apps/meteor/client/views/room/body/hooks/useFileUploadDropTarget.ts
+++ b/apps/meteor/client/views/room/body/hooks/useFileUploadDropTarget.ts
@@ -4,12 +4,12 @@ import type { ReactNode } from 'react';
 import type React from 'react';
 import { useCallback, useMemo } from 'react';
 
+import { useDropTarget } from './useDropTarget';
 import { useIsRoomOverMacLimit } from '../../../../hooks/omnichannel/useIsRoomOverMacLimit';
 import { useReactiveValue } from '../../../../hooks/useReactiveValue';
 import { roomCoordinator } from '../../../../lib/rooms/roomCoordinator';
 import { useChat } from '../../contexts/ChatContext';
 import { useRoom, useRoomSubscription } from '../../contexts/RoomContext';
-import { useDropTarget } from './useDropTarget';
 
 export const useFileUploadDropTarget = (): readonly [
 	fileUploadTriggerProps: {
@@ -29,7 +29,7 @@ export const useFileUploadDropTarget = (): readonly [
 
 	const t = useTranslation();
 
-	const fileUploadEnabled = useSetting<boolean>('FileUpload_Enabled');
+	const fileUploadEnabled = useSetting('FileUpload_Enabled', true);
 	const user = useUser();
 	const fileUploadAllowedForUser = useReactiveValue(
 		useCallback(() => !roomCoordinator.readOnly(room._id, { username: user?.username }), [room._id, user?.username]),
diff --git a/apps/meteor/client/views/room/body/hooks/useGoToHomeOnRemoved.ts b/apps/meteor/client/views/room/body/hooks/useGoToHomeOnRemoved.ts
index 9cb94e8c93f0..5aa8eae0df07 100644
--- a/apps/meteor/client/views/room/body/hooks/useGoToHomeOnRemoved.ts
+++ b/apps/meteor/client/views/room/body/hooks/useGoToHomeOnRemoved.ts
@@ -1,7 +1,8 @@
 import { isOmnichannelRoom, type IRoom } from '@rocket.chat/core-typings';
-import { useRouter, useStream, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRouter, useStream, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import { useQueryClient } from '@tanstack/react-query';
 import { useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useOmnichannelCloseRoute } from '../../../../hooks/omnichannel/useOmnichannelCloseRoute';
 
@@ -10,7 +11,7 @@ export function useGoToHomeOnRemoved(room: IRoom, userId?: string): void {
 	const queryClient = useQueryClient();
 	const dispatchToastMessage = useToastMessageDispatch();
 	const subscribeToNotifyUser = useStream('notify-user');
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { navigateHome } = useOmnichannelCloseRoute();
 
 	useEffect(() => {
diff --git a/apps/meteor/client/views/room/body/hooks/useRoomRolesManagement.ts b/apps/meteor/client/views/room/body/hooks/useRoomRolesManagement.ts
index 60e8572172ae..7b3716e28d4f 100644
--- a/apps/meteor/client/views/room/body/hooks/useRoomRolesManagement.ts
+++ b/apps/meteor/client/views/room/body/hooks/useRoomRolesManagement.ts
@@ -2,7 +2,7 @@ import type { IRoom, IUser } from '@rocket.chat/core-typings';
 import { useMethod, useStream } from '@rocket.chat/ui-contexts';
 import { useEffect } from 'react';
 
-import { RoomRoles, ChatMessage } from '../../../../../app/models/client';
+import { RoomRoles, Messages } from '../../../../../app/models/client';
 
 // const roomRoles = RoomRoles as Mongo.Collection<Pick<ISubscription, 'rid' | 'u' | 'roles'>>;
 
@@ -27,19 +27,19 @@ export const useRoomRolesManagement = (rid: IRoom['_id']): void => {
 				if (!role.u?._id) {
 					return;
 				}
-				ChatMessage.update({ rid, 'u._id': role.u._id }, { $addToSet: { roles: role._id } }, { multi: true });
+				Messages.update({ rid, 'u._id': role.u._id }, { $addToSet: { roles: role._id } }, { multi: true });
 			},
 			changed: (role) => {
 				if (!role.u?._id) {
 					return;
 				}
-				ChatMessage.update({ rid, 'u._id': role.u._id }, { $inc: { rerender: 1 } }, { multi: true });
+				Messages.update({ rid, 'u._id': role.u._id }, { $inc: { rerender: 1 } }, { multi: true });
 			},
 			removed: (role) => {
 				if (!role.u?._id) {
 					return;
 				}
-				ChatMessage.update({ rid, 'u._id': role.u._id }, { $pull: { roles: role._id } }, { multi: true });
+				Messages.update({ rid, 'u._id': role.u._id }, { $pull: { roles: role._id } }, { multi: true });
 			},
 		});
 
diff --git a/apps/meteor/client/views/room/body/hooks/useUnreadMessages.ts b/apps/meteor/client/views/room/body/hooks/useUnreadMessages.ts
index 343b9cb88a98..2273bf63b35c 100644
--- a/apps/meteor/client/views/room/body/hooks/useUnreadMessages.ts
+++ b/apps/meteor/client/views/room/body/hooks/useUnreadMessages.ts
@@ -3,7 +3,7 @@ import { useRouter } from '@rocket.chat/ui-contexts';
 import type { Dispatch, SetStateAction } from 'react';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
-import { ChatMessage } from '../../../../../app/models/client';
+import { Messages } from '../../../../../app/models/client';
 import { LegacyRoomManager, RoomHistoryManager } from '../../../../../app/ui-utils/client';
 import { withDebouncing, withThrottling } from '../../../../../lib/utils/highOrderFunctions';
 import { useReactiveValue } from '../../../../hooks/useReactiveValue';
@@ -60,7 +60,7 @@ export const useHandleUnread = (
 		const { firstUnread } = RoomHistoryManager.getRoom(rid);
 		let message = firstUnread?.get();
 		if (!message) {
-			message = ChatMessage.findOne({ rid, ts: { $gt: unread?.since } }, { sort: { ts: 1 }, limit: 1 });
+			message = Messages.findOne({ rid, ts: { $gt: unread?.since } }, { sort: { ts: 1 }, limit: 1 });
 		}
 		if (!message) {
 			return;
@@ -80,7 +80,7 @@ export const useHandleUnread = (
 			return;
 		}
 
-		const count = ChatMessage.find({
+		const count = Messages.find({
 			rid: room._id,
 			ts: { $lte: lastMessageDate, $gt: subscription?.ls },
 		}).count();
@@ -158,7 +158,7 @@ export const useHandleUnread = (
 							return;
 						}
 
-						const lastMessage = ChatMessage.findOne(lastInvisibleMessageOnScreen.id);
+						const lastMessage = Messages.findOne(lastInvisibleMessageOnScreen.id);
 						if (!lastMessage) {
 							setUnreadCount(0);
 							return;
diff --git a/apps/meteor/client/views/room/composer/ComposerBoxPopup.tsx b/apps/meteor/client/views/room/composer/ComposerBoxPopup.tsx
index cdac8d6d4daf..dc755e8c4b75 100644
--- a/apps/meteor/client/views/room/composer/ComposerBoxPopup.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerBoxPopup.tsx
@@ -84,8 +84,8 @@ function ComposerBoxPopup<
 	}, [focused]);
 
 	return (
-		<Box className='message-popup-position' position='relative'>
-			<Tile ref={composerBoxPopupRef} className='message-popup' padding={0} role='menu' mbe={8} overflow='hidden' aria-labelledby={id}>
+		<Box position='relative'>
+			<Tile ref={composerBoxPopupRef} padding={0} role='menu' mbe={8} overflow='hidden' aria-labelledby={id}>
 				{title && (
 					<Box bg='tint' pi={16} pb={8} id={id}>
 						{title}
diff --git a/apps/meteor/client/views/room/composer/ComposerBoxPopupPreview.tsx b/apps/meteor/client/views/room/composer/ComposerBoxPopupPreview.tsx
index d75e7c93c56a..b3327775e955 100644
--- a/apps/meteor/client/views/room/composer/ComposerBoxPopupPreview.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerBoxPopupPreview.tsx
@@ -4,8 +4,8 @@ import { useMethod } from '@rocket.chat/ui-contexts';
 import type { ForwardedRef } from 'react';
 import React, { forwardRef, useEffect, useImperativeHandle } from 'react';
 
-import { useChat } from '../contexts/ChatContext';
 import type { ComposerBoxPopupProps } from './ComposerBoxPopup';
+import { useChat } from '../contexts/ChatContext';
 
 type ComposerBoxPopupPreviewItem = { _id: string; type: 'image' | 'video' | 'audio' | 'text' | 'other'; value: string; sort?: number };
 
@@ -96,8 +96,8 @@ const ComposerBoxPopupPreview = forwardRef(function ComposerBoxPopupPreview(
 	}
 
 	return (
-		<Box className='message-popup-position' position='relative'>
-			<Tile className='message-popup' display='flex' padding={8} role='menu' mbe={8} aria-labelledby={id}>
+		<Box position='relative'>
+			<Tile display='flex' padding={8} role='menu' mbe={8} aria-labelledby={id}>
 				<Box role='listbox' display='flex' overflow='auto' fontSize={0} width={0} flexGrow={1} aria-busy={isLoading}>
 					{isLoading &&
 						Array(5)
diff --git a/apps/meteor/client/views/room/composer/ComposerContainer.tsx b/apps/meteor/client/views/room/composer/ComposerContainer.tsx
index 0e870067133f..e027ff1f5b87 100644
--- a/apps/meteor/client/views/room/composer/ComposerContainer.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerContainer.tsx
@@ -3,8 +3,6 @@ import { usePermission } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { memo } from 'react';
 
-import { useAirGappedRestriction } from '../../../hooks/useAirGappedRestriction';
-import { useRoom } from '../contexts/RoomContext';
 import ComposerAirGappedRestricted from './ComposerAirGappedRestricted';
 import ComposerAnonymous from './ComposerAnonymous';
 import ComposerArchived from './ComposerArchived';
@@ -16,10 +14,12 @@ import ComposerMessage from './ComposerMessage';
 import ComposerOmnichannel from './ComposerOmnichannel';
 import ComposerReadOnly from './ComposerReadOnly';
 import ComposerVoIP from './ComposerVoIP';
+import { useRoom } from '../contexts/RoomContext';
 import { useMessageComposerIsAnonymous } from './hooks/useMessageComposerIsAnonymous';
 import { useMessageComposerIsArchived } from './hooks/useMessageComposerIsArchived';
 import { useMessageComposerIsBlocked } from './hooks/useMessageComposerIsBlocked';
 import { useMessageComposerIsReadOnly } from './hooks/useMessageComposerIsReadOnly';
+import { useAirGappedRestriction } from '../../../hooks/useAirGappedRestriction';
 
 const ComposerContainer = ({ children, ...props }: ComposerMessageProps): ReactElement => {
 	const room = useRoom();
diff --git a/apps/meteor/client/views/room/composer/ComposerMessage.tsx b/apps/meteor/client/views/room/composer/ComposerMessage.tsx
index 3f37f7a40443..9148185da50c 100644
--- a/apps/meteor/client/views/room/composer/ComposerMessage.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerMessage.tsx
@@ -3,11 +3,11 @@ import { useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ReactNode } from 'react';
 import React, { memo, useCallback, useMemo } from 'react';
 
+import ComposerSkeleton from './ComposerSkeleton';
 import { LegacyRoomManager } from '../../../../app/ui-utils/client';
 import { useReactiveValue } from '../../../hooks/useReactiveValue';
 import { useChat } from '../contexts/ChatContext';
 import { useRoom } from '../contexts/RoomContext';
-import ComposerSkeleton from './ComposerSkeleton';
 import MessageBox from './messageBox/MessageBox';
 
 export type ComposerMessageProps = {
diff --git a/apps/meteor/client/views/room/composer/ComposerOmnichannel/ComposerOmnichannel.tsx b/apps/meteor/client/views/room/composer/ComposerOmnichannel/ComposerOmnichannel.tsx
index 5ba9b580e109..575fbc032653 100644
--- a/apps/meteor/client/views/room/composer/ComposerOmnichannel/ComposerOmnichannel.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerOmnichannel/ComposerOmnichannel.tsx
@@ -1,52 +1,80 @@
 import { MessageFooterCallout } from '@rocket.chat/ui-composer';
-import { useTranslation, useUserId } from '@rocket.chat/ui-contexts';
-import type { ReactElement } from 'react';
+import { useUserId } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useIsRoomOverMacLimit } from '../../../../hooks/omnichannel/useIsRoomOverMacLimit';
 import { useOmnichannelRoom, useUserIsSubscribed } from '../../contexts/RoomContext';
 import type { ComposerMessageProps } from '../ComposerMessage';
 import ComposerMessage from '../ComposerMessage';
+import ComposerOmnichannelCallout from './ComposerOmnichannelCallout';
 import { ComposerOmnichannelInquiry } from './ComposerOmnichannelInquiry';
 import { ComposerOmnichannelJoin } from './ComposerOmnichannelJoin';
 import { ComposerOmnichannelOnHold } from './ComposerOmnichannelOnHold';
 
-const ComposerOmnichannel = (props: ComposerMessageProps): ReactElement => {
+const ComposerOmnichannel = (props: ComposerMessageProps) => {
+	const { t } = useTranslation();
+	const userId = useUserId();
 	const room = useOmnichannelRoom();
+
 	const { servedBy, queuedAt, open, onHold } = room;
-	const userId = useUserId();
 
 	const isSubscribed = useUserIsSubscribed();
-
-	const t = useTranslation();
-
 	const isInquired = !servedBy && queuedAt;
-
 	const isSameAgent = servedBy?._id === userId;
-
 	const isRoomOverMacLimit = useIsRoomOverMacLimit(room);
 
 	if (!open) {
-		return <MessageFooterCallout color='default'>{t('This_conversation_is_already_closed')}</MessageFooterCallout>;
+		return (
+			<>
+				<ComposerOmnichannelCallout />
+				<MessageFooterCallout color='default'>{t('This_conversation_is_already_closed')}</MessageFooterCallout>
+			</>
+		);
 	}
 
 	if (isRoomOverMacLimit) {
-		return <MessageFooterCallout color='default'>{t('Workspace_exceeded_MAC_limit_disclaimer')}</MessageFooterCallout>;
+		return (
+			<>
+				<ComposerOmnichannelCallout />
+				<MessageFooterCallout color='default'>{t('Workspace_exceeded_MAC_limit_disclaimer')}</MessageFooterCallout>
+			</>
+		);
 	}
 
 	if (onHold) {
-		return <ComposerOmnichannelOnHold />;
+		return (
+			<>
+				<ComposerOmnichannelCallout />
+				<ComposerOmnichannelOnHold />
+			</>
+		);
 	}
 
 	if (isInquired) {
-		return <ComposerOmnichannelInquiry />;
+		return (
+			<>
+				<ComposerOmnichannelCallout />
+				<ComposerOmnichannelInquiry />
+			</>
+		);
 	}
 
 	if (!isSubscribed && !isSameAgent) {
-		return <ComposerOmnichannelJoin />;
+		return (
+			<>
+				<ComposerOmnichannelCallout />
+				<ComposerOmnichannelJoin />
+			</>
+		);
 	}
 
-	return <ComposerMessage {...props} />;
+	return (
+		<>
+			<ComposerOmnichannelCallout />
+			<ComposerMessage {...props} />
+		</>
+	);
 };
 
 export default ComposerOmnichannel;
diff --git a/apps/meteor/client/views/room/composer/ComposerOmnichannel/ComposerOmnichannelCallout.tsx b/apps/meteor/client/views/room/composer/ComposerOmnichannel/ComposerOmnichannelCallout.tsx
new file mode 100644
index 000000000000..1501b81712ab
--- /dev/null
+++ b/apps/meteor/client/views/room/composer/ComposerOmnichannel/ComposerOmnichannelCallout.tsx
@@ -0,0 +1,75 @@
+import { Box, Button, ButtonGroup, Callout } from '@rocket.chat/fuselage';
+import { useAtLeastOnePermission, useEndpoint, useRouter, useSetting } from '@rocket.chat/ui-contexts';
+import { useQuery } from '@tanstack/react-query';
+import React from 'react';
+import { Trans, useTranslation } from 'react-i18next';
+
+import { isSameChannel } from '../../../../../app/livechat/lib/isSameChannel';
+import { useHasLicenseModule } from '../../../../hooks/useHasLicenseModule';
+import { useBlockChannel } from '../../../omnichannel/contactInfo/tabs/ContactInfoChannels/useBlockChannel';
+import { useOmnichannelRoom } from '../../contexts/RoomContext';
+
+const ComposerOmnichannelCallout = () => {
+	const { t } = useTranslation();
+	const room = useOmnichannelRoom();
+	const { navigate, buildRoutePath } = useRouter();
+	const hasLicense = useHasLicenseModule('contact-id-verification');
+	const securityPrivacyRoute = buildRoutePath('/omnichannel/security-privacy');
+	const shouldShowSecurityRoute = useSetting('Livechat_Require_Contact_Verification') !== 'never' || !hasLicense;
+
+	const canViewSecurityPrivacy = useAtLeastOnePermission([
+		'view-privileged-setting',
+		'edit-privileged-setting',
+		'manage-selected-settings',
+	]);
+
+	const {
+		_id,
+		v: { _id: visitorId },
+		source,
+		contactId,
+	} = room;
+
+	const getContactById = useEndpoint('GET', '/v1/omnichannel/contacts.get');
+	const { data } = useQuery(['getContactById', contactId], () => getContactById({ contactId }));
+
+	const association = { visitorId, source };
+	const currentChannel = data?.contact?.channels?.find((channel) => isSameChannel(channel.visitor, association));
+
+	const handleBlock = useBlockChannel({ blocked: currentChannel?.blocked || false, association });
+
+	if (!data?.contact?.unknown) {
+		return null;
+	}
+
+	return (
+		<Callout
+			mbe={16}
+			title={t('Contact_unknown')}
+			actions={
+				<ButtonGroup>
+					<Button onClick={() => navigate(`/live/${_id}/contact-profile/edit`)} small>
+						{t('Add_contact')}
+					</Button>
+					<Button danger secondary small onClick={handleBlock}>
+						{currentChannel?.blocked ? t('Unblock') : t('Block')}
+					</Button>
+				</ButtonGroup>
+			}
+		>
+			{shouldShowSecurityRoute ? (
+				<Trans i18nKey='Add_to_contact_and_enable_verification_description'>
+					Add to contact list manually and
+					<Box is={canViewSecurityPrivacy ? 'a' : 'span'} href={securityPrivacyRoute}>
+						enable verification
+					</Box>
+					using multi-factor authentication.
+				</Trans>
+			) : (
+				t('Add_to_contact_list_manually')
+			)}
+		</Callout>
+	);
+};
+
+export default ComposerOmnichannelCallout;
diff --git a/apps/meteor/client/views/room/composer/ComposerOmnichannel/ComposerOmnichannelJoin.tsx b/apps/meteor/client/views/room/composer/ComposerOmnichannel/ComposerOmnichannelJoin.tsx
index 62dd7ef88fb8..8daf8dc3156a 100644
--- a/apps/meteor/client/views/room/composer/ComposerOmnichannel/ComposerOmnichannelJoin.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerOmnichannel/ComposerOmnichannelJoin.tsx
@@ -1,7 +1,8 @@
 import { MessageFooterCallout, MessageFooterCalloutAction, MessageFooterCalloutContent } from '@rocket.chat/ui-composer';
-import { useEndpoint, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { useOmnichannelRoom } from '../../contexts/RoomContext';
 
@@ -11,7 +12,7 @@ export const ComposerOmnichannelJoin = (): ReactElement => {
 
 	const dispatchToastMessage = useToastMessageDispatch();
 
-	const t = useTranslation();
+	const { t } = useTranslation();
 	return (
 		<MessageFooterCallout>
 			<MessageFooterCalloutContent>{t('room_is_read_only')}</MessageFooterCalloutContent>
diff --git a/apps/meteor/client/views/room/composer/ComposerOmnichannel/ComposerOmnichannelOnHold.tsx b/apps/meteor/client/views/room/composer/ComposerOmnichannel/ComposerOmnichannelOnHold.tsx
index 74ee27dac24f..d8995a78dffa 100644
--- a/apps/meteor/client/views/room/composer/ComposerOmnichannel/ComposerOmnichannelOnHold.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerOmnichannel/ComposerOmnichannelOnHold.tsx
@@ -3,8 +3,8 @@ import type { ReactElement } from 'react';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { useOmnichannelRoom } from '../../contexts/RoomContext';
 import { useResumeChatOnHoldMutation } from './hooks/useResumeChatOnHoldMutation';
+import { useOmnichannelRoom } from '../../contexts/RoomContext';
 
 export const ComposerOmnichannelOnHold = (): ReactElement => {
 	const resumeChatOnHoldMutation = useResumeChatOnHoldMutation();
diff --git a/apps/meteor/client/views/room/composer/ComposerReadOnly.tsx b/apps/meteor/client/views/room/composer/ComposerReadOnly.tsx
index 01156121c3e5..f71879d520c2 100644
--- a/apps/meteor/client/views/room/composer/ComposerReadOnly.tsx
+++ b/apps/meteor/client/views/room/composer/ComposerReadOnly.tsx
@@ -1,15 +1,16 @@
 import { Button } from '@rocket.chat/fuselage';
 import { MessageFooterCallout, MessageFooterCalloutContent } from '@rocket.chat/ui-composer';
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useMutation } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { dispatchToastMessage } from '../../../lib/toast';
 import { useRoom, useUserIsSubscribed } from '../contexts/RoomContext';
 
 const ComposerReadOnly = (): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const room = useRoom();
 	const isSubscribed = useUserIsSubscribed();
 	const joinChannel = useEndpoint('POST', '/v1/channels.join');
diff --git a/apps/meteor/client/views/room/composer/hooks/useComposerBoxPopup.ts b/apps/meteor/client/views/room/composer/hooks/useComposerBoxPopup.ts
index c47f1a5ddab4..670d944093e4 100644
--- a/apps/meteor/client/views/room/composer/hooks/useComposerBoxPopup.ts
+++ b/apps/meteor/client/views/room/composer/hooks/useComposerBoxPopup.ts
@@ -3,9 +3,9 @@ import type { UseQueryResult } from '@tanstack/react-query';
 import type { MutableRefObject } from 'react';
 import { useEffect, useCallback, useState, useRef } from 'react';
 
+import { useComposerBoxPopupQueries } from './useComposerBoxPopupQueries';
 import { useChat } from '../../contexts/ChatContext';
 import type { ComposerPopupOption } from '../../contexts/ComposerPopupContext';
-import { useComposerBoxPopupQueries } from './useComposerBoxPopupQueries';
 
 type ComposerBoxPopupImperativeCommands<T> = MutableRefObject<
 	| {
diff --git a/apps/meteor/client/views/room/composer/hooks/useComposerBoxPopupQueries.ts b/apps/meteor/client/views/room/composer/hooks/useComposerBoxPopupQueries.ts
index 492579f2738c..d2ee61ffeaee 100644
--- a/apps/meteor/client/views/room/composer/hooks/useComposerBoxPopupQueries.ts
+++ b/apps/meteor/client/views/room/composer/hooks/useComposerBoxPopupQueries.ts
@@ -2,9 +2,9 @@ import type { QueriesResults } from '@tanstack/react-query';
 import { useQueries } from '@tanstack/react-query';
 import { useEffect, useState } from 'react';
 
+import { useEnablePopupPreview } from './useEnablePopupPreview';
 import { slashCommands } from '../../../../../app/utils/client/slashCommand';
 import type { ComposerPopupOption } from '../../contexts/ComposerPopupContext';
-import { useEnablePopupPreview } from './useEnablePopupPreview';
 
 export const useComposerBoxPopupQueries = <T extends { _id: string; sort?: number }>(filter: unknown, popup?: ComposerPopupOption<T>) => {
 	const [counter, setCounter] = useState(0);
diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBox.tsx b/apps/meteor/client/views/room/composer/messageBox/MessageBox.tsx
index 1577cc50dc24..6546a6be9245 100644
--- a/apps/meteor/client/views/room/composer/messageBox/MessageBox.tsx
+++ b/apps/meteor/client/views/room/composer/messageBox/MessageBox.tsx
@@ -15,8 +15,12 @@ import { useTranslation, useUserPreference, useLayout, useSetting } from '@rocke
 import { useMutation } from '@tanstack/react-query';
 import type { ReactElement, MouseEventHandler, FormEvent, ClipboardEventHandler, MouseEvent } from 'react';
 import React, { memo, useRef, useReducer, useCallback } from 'react';
-import { useSubscription } from 'use-subscription';
+import { useSyncExternalStore } from 'use-sync-external-store/shim';
 
+import MessageBoxActionsToolbar from './MessageBoxActionsToolbar';
+import MessageBoxFormattingToolbar from './MessageBoxFormattingToolbar';
+import MessageBoxHint from './MessageBoxHint';
+import MessageBoxReplies from './MessageBoxReplies';
 import { createComposerAPI } from '../../../../../app/ui-message/client/messageBox/createComposerAPI';
 import type { FormattingButton } from '../../../../../app/ui-message/client/messageBox/messageBoxFormatting';
 import { formattingButtons } from '../../../../../app/ui-message/client/messageBox/messageBoxFormatting';
@@ -38,10 +42,6 @@ import { useAutoGrow } from '../RoomComposer/hooks/useAutoGrow';
 import { useComposerBoxPopup } from '../hooks/useComposerBoxPopup';
 import { useEnablePopupPreview } from '../hooks/useEnablePopupPreview';
 import { useMessageComposerMergedRefs } from '../hooks/useMessageComposerMergedRefs';
-import MessageBoxActionsToolbar from './MessageBoxActionsToolbar';
-import MessageBoxFormattingToolbar from './MessageBoxFormattingToolbar';
-import MessageBoxHint from './MessageBoxHint';
-import MessageBoxReplies from './MessageBoxReplies';
 import { useMessageBoxAutoFocus } from './hooks/useMessageBoxAutoFocus';
 import { useMessageBoxPlaceholder } from './hooks/useMessageBoxPlaceholder';
 
@@ -108,8 +108,8 @@ const MessageBox = ({
 	const chat = useChat();
 	const room = useRoom();
 	const t = useTranslation();
-	const e2eEnabled = useSetting<boolean>('E2E_Enable');
-	const unencryptedMessagesAllowed = useSetting<boolean>('E2E_Allow_Unencrypted_Messages');
+	const e2eEnabled = useSetting('E2E_Enable', false);
+	const unencryptedMessagesAllowed = useSetting('E2E_Allow_Unencrypted_Messages', false);
 	const isSlashCommandAllowed = !e2eEnabled || !room.encrypted || unencryptedMessagesAllowed;
 	const composerPlaceholder = useMessageBoxPlaceholder(t('Message'), room);
 
@@ -248,30 +248,27 @@ const MessageBox = ({
 		onTyping?.();
 	});
 
-	const isEditing = useSubscription({
-		getCurrentValue: chat.composer?.editing.get ?? getEmptyFalse,
-		subscribe: chat.composer?.editing.subscribe ?? emptySubscribe,
-	});
+	const isEditing = useSyncExternalStore(chat.composer?.editing.subscribe ?? emptySubscribe, chat.composer?.editing.get ?? getEmptyFalse);
 
-	const isRecordingAudio = useSubscription({
-		getCurrentValue: chat.composer?.recording.get ?? getEmptyFalse,
-		subscribe: chat.composer?.recording.subscribe ?? emptySubscribe,
-	});
+	const isRecordingAudio = useSyncExternalStore(
+		chat.composer?.recording.subscribe ?? emptySubscribe,
+		chat.composer?.recording.get ?? getEmptyFalse,
+	);
 
-	const isMicrophoneDenied = useSubscription({
-		getCurrentValue: chat.composer?.isMicrophoneDenied.get ?? getEmptyFalse,
-		subscribe: chat.composer?.isMicrophoneDenied.subscribe ?? emptySubscribe,
-	});
+	const isMicrophoneDenied = useSyncExternalStore(
+		chat.composer?.isMicrophoneDenied.subscribe ?? emptySubscribe,
+		chat.composer?.isMicrophoneDenied.get ?? getEmptyFalse,
+	);
 
-	const isRecordingVideo = useSubscription({
-		getCurrentValue: chat.composer?.recordingVideo.get ?? getEmptyFalse,
-		subscribe: chat.composer?.recordingVideo.subscribe ?? emptySubscribe,
-	});
+	const isRecordingVideo = useSyncExternalStore(
+		chat.composer?.recordingVideo.subscribe ?? emptySubscribe,
+		chat.composer?.recordingVideo.get ?? getEmptyFalse,
+	);
 
-	const formatters = useSubscription({
-		getCurrentValue: chat.composer?.formatters.get ?? getEmptyArray,
-		subscribe: chat.composer?.formatters.subscribe ?? emptySubscribe,
-	});
+	const formatters = useSyncExternalStore(
+		chat.composer?.formatters.subscribe ?? emptySubscribe,
+		chat.composer?.formatters.get ?? getEmptyArray,
+	);
 
 	const isRecording = isRecordingAudio || isRecordingVideo;
 
diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/MessageBoxActionsToolbar.tsx b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/MessageBoxActionsToolbar.tsx
index 38396844866b..b4ec012f3337 100644
--- a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/MessageBoxActionsToolbar.tsx
+++ b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/MessageBoxActionsToolbar.tsx
@@ -8,17 +8,17 @@ import { useTranslation, useLayoutHiddenActions } from '@rocket.chat/ui-contexts
 import type { ComponentProps, MouseEvent } from 'react';
 import React, { memo } from 'react';
 
-import { messageBox } from '../../../../../../app/ui-utils/client';
-import { isTruthy } from '../../../../../../lib/isTruthy';
-import { useMessageboxAppsActionButtons } from '../../../../../hooks/useAppActionButtons';
-import { useChat } from '../../../contexts/ChatContext';
-import { useRoom } from '../../../contexts/RoomContext';
 import { useAudioMessageAction } from './hooks/useAudioMessageAction';
 import { useCreateDiscussionAction } from './hooks/useCreateDiscussionAction';
 import { useFileUploadAction } from './hooks/useFileUploadAction';
 import { useShareLocationAction } from './hooks/useShareLocationAction';
 import { useVideoMessageAction } from './hooks/useVideoMessageAction';
 import { useWebdavActions } from './hooks/useWebdavActions';
+import { messageBox } from '../../../../../../app/ui-utils/client';
+import { isTruthy } from '../../../../../../lib/isTruthy';
+import { useMessageboxAppsActionButtons } from '../../../../../hooks/useAppActionButtons';
+import { useChat } from '../../../contexts/ChatContext';
+import { useRoom } from '../../../contexts/RoomContext';
 
 type MessageBoxActionsToolbarProps = {
 	canSend: boolean;
diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useAudioMessageAction.ts b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useAudioMessageAction.ts
index 9738f714fa97..708d6a27b8a7 100644
--- a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useAudioMessageAction.ts
+++ b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useAudioMessageAction.ts
@@ -11,10 +11,10 @@ import { useMediaPermissions } from '../../hooks/useMediaPermissions';
 const audioRecorder = new AudioRecorder();
 
 export const useAudioMessageAction = (disabled: boolean, isMicrophoneDenied: boolean): GenericMenuItemProps => {
-	const isFileUploadEnabled = useSetting('FileUpload_Enabled') as boolean;
-	const isAudioRecorderEnabled = useSetting('Message_AudioRecorderEnabled') as boolean;
-	const fileUploadMediaTypeBlackList = useSetting('FileUpload_MediaTypeBlackList') as string;
-	const fileUploadMediaTypeWhiteList = useSetting('FileUpload_MediaTypeWhiteList') as string;
+	const isFileUploadEnabled = useSetting('FileUpload_Enabled', true);
+	const isAudioRecorderEnabled = useSetting('Message_AudioRecorderEnabled', true);
+	const fileUploadMediaTypeBlackList = useSetting('FileUpload_MediaTypeBlackList', '');
+	const fileUploadMediaTypeWhiteList = useSetting('FileUpload_MediaTypeWhiteList', '');
 	const [isPermissionDenied] = useMediaPermissions('microphone');
 
 	const isAllowed = useMemo(
diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useCreateDiscussionAction.tsx b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useCreateDiscussionAction.tsx
index 03bff48876f3..7f7ddf938cba 100644
--- a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useCreateDiscussionAction.tsx
+++ b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useCreateDiscussionAction.tsx
@@ -17,7 +17,7 @@ export const useCreateDiscussionAction = (room?: IRoom): GenericMenuItemProps =>
 	const handleCreateDiscussion = () =>
 		setModal(<CreateDiscussion onClose={() => setModal(null)} defaultParentRoom={room?.prid || room?._id} />);
 
-	const discussionEnabled = useSetting('Discussion_enabled') as boolean;
+	const discussionEnabled = useSetting('Discussion_enabled', true);
 	const canStartDiscussion = usePermission('start-discussion', room._id);
 	const canSstartDiscussionOtherUser = usePermission('start-discussion-other-user', room._id);
 
diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useFileUploadAction.ts b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useFileUploadAction.ts
index f576aba9803c..8367ed210de6 100644
--- a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useFileUploadAction.ts
+++ b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useFileUploadAction.ts
@@ -9,7 +9,7 @@ const fileInputProps = { type: 'file', multiple: true };
 
 export const useFileUploadAction = (disabled: boolean): GenericMenuItemProps => {
 	const t = useTranslation();
-	const fileUploadEnabled = useSetting<boolean>('FileUpload_Enabled');
+	const fileUploadEnabled = useSetting('FileUpload_Enabled', true);
 	const fileInputRef = useFileInput(fileInputProps);
 	const chat = useChat();
 
diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useShareLocationAction.tsx b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useShareLocationAction.tsx
index a49253c2744d..ac14f2a2fd85 100644
--- a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useShareLocationAction.tsx
+++ b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useShareLocationAction.tsx
@@ -1,8 +1,9 @@
 import type { IMessage, IRoom } from '@rocket.chat/core-typings';
 import { isRoomFederated } from '@rocket.chat/core-typings';
 import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
-import { useSetting, useSetModal, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetting, useSetModal } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import ShareLocationModal from '../../../../ShareLocation/ShareLocationModal';
 
@@ -11,12 +12,12 @@ export const useShareLocationAction = (room?: IRoom, tmid?: IMessage['tmid']): G
 		throw new Error('Invalid room');
 	}
 
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const setModal = useSetModal();
 
 	const isMapViewEnabled = useSetting('MapView_Enabled') === true;
 	const isGeolocationCurrentPositionSupported = Boolean(navigator.geolocation?.getCurrentPosition);
-	const googleMapsApiKey = useSetting('MapView_GMapsAPIKey') as string;
+	const googleMapsApiKey = useSetting('MapView_GMapsAPIKey', '');
 	const canGetGeolocation = isMapViewEnabled && isGeolocationCurrentPositionSupported && googleMapsApiKey && googleMapsApiKey.length;
 
 	const handleShareLocation = () => setModal(<ShareLocationModal rid={room._id} tmid={tmid} onClose={() => setModal(null)} />);
diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useVideoMessageAction.ts b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useVideoMessageAction.ts
index 2608597fb202..fa4ea2084408 100644
--- a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useVideoMessageAction.ts
+++ b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useVideoMessageAction.ts
@@ -9,10 +9,10 @@ import { useMediaActionTitle } from '../../hooks/useMediaActionTitle';
 import { useMediaPermissions } from '../../hooks/useMediaPermissions';
 
 export const useVideoMessageAction = (disabled: boolean): GenericMenuItemProps => {
-	const isFileUploadEnabled = useSetting('FileUpload_Enabled') as boolean;
-	const isVideoRecorderEnabled = useSetting('Message_VideoRecorderEnabled') as boolean;
-	const fileUploadMediaTypeBlackList = useSetting('FileUpload_MediaTypeBlackList') as string;
-	const fileUploadMediaTypeWhiteList = useSetting('FileUpload_MediaTypeWhiteList') as string;
+	const isFileUploadEnabled = useSetting('FileUpload_Enabled', true);
+	const isVideoRecorderEnabled = useSetting('Message_VideoRecorderEnabled', true);
+	const fileUploadMediaTypeBlackList = useSetting('FileUpload_MediaTypeBlackList', 'image/svg+xml');
+	const fileUploadMediaTypeWhiteList = useSetting('FileUpload_MediaTypeWhiteList', '');
 	const [isPermissionDenied, setIsPermissionDenied] = useMediaPermissions('camera');
 
 	const isAllowed = useMemo(
diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useWebdavActions.tsx b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useWebdavActions.tsx
index 806bebaa65e3..baa8dbf24891 100644
--- a/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useWebdavActions.tsx
+++ b/apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/hooks/useWebdavActions.tsx
@@ -10,7 +10,7 @@ import AddWebdavAccountModal from '../../../../webdav/AddWebdavAccountModal';
 import WebdavFilePickerModal from '../../../../webdav/WebdavFilePickerModal';
 
 export const useWebdavActions = (): GenericMenuItemProps[] => {
-	const enabled = useSetting<boolean>('Webdav_Integration_Enabled', false);
+	const enabled = useSetting('Webdav_Integration_Enabled', false);
 
 	const { isSuccess, data } = useWebDAVAccountIntegrationsQuery({ enabled });
 
@@ -42,7 +42,7 @@ export const useWebdavActions = (): GenericMenuItemProps[] => {
 					content: account.name,
 					icon: 'cloud-plus' as const,
 					onClick: () => handleOpenWebdav(account),
-			  }))
+				}))
 			: []),
 	];
 };
diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/MessageBoxFormattingToolbar.tsx b/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/MessageBoxFormattingToolbar.tsx
index c5b1f06dd9b8..9e7e9fb81e0c 100644
--- a/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/MessageBoxFormattingToolbar.tsx
+++ b/apps/meteor/client/views/room/composer/messageBox/MessageBoxFormattingToolbar/MessageBoxFormattingToolbar.tsx
@@ -2,10 +2,10 @@ import { MessageComposerAction } from '@rocket.chat/ui-composer';
 import React, { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import FormattingToolbarDropdown from './FormattingToolbarDropdown';
 import type { FormattingButton } from '../../../../../../app/ui-message/client/messageBox/messageBoxFormatting';
 import { isPromptButton } from '../../../../../../app/ui-message/client/messageBox/messageBoxFormatting';
 import type { ComposerAPI } from '../../../../../lib/chats/ChatAPI';
-import FormattingToolbarDropdown from './FormattingToolbarDropdown';
 
 type MessageBoxFormattingToolbarProps = {
 	composer: ComposerAPI;
@@ -61,13 +61,8 @@ const MessageBoxFormattingToolbar = ({ items, variant = 'large', composer, disab
 						}}
 					/>
 				) : (
-					<span
-						{...(disabled && { style: { pointerEvents: 'none' } })}
-						className='rc-message-box__toolbar-formatting-item'
-						title={formatter.label}
-						key={formatter.label}
-					>
-						<a href={formatter.link} target='_blank' rel='noopener noreferrer' className='rc-message-box__toolbar-formatting-link'>
+					<span key={formatter.label} {...(disabled && { style: { pointerEvents: 'none' } })} title={formatter.label}>
+						<a href={formatter.link} target='_blank' rel='noopener noreferrer'>
 							{formatter.text()}
 						</a>
 					</span>
diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBoxHint.spec.tsx b/apps/meteor/client/views/room/composer/messageBox/MessageBoxHint.spec.tsx
index 4ebe89264d4e..6f4562a7fd33 100644
--- a/apps/meteor/client/views/room/composer/messageBox/MessageBoxHint.spec.tsx
+++ b/apps/meteor/client/views/room/composer/messageBox/MessageBoxHint.spec.tsx
@@ -2,10 +2,10 @@ import { mockAppRoot } from '@rocket.chat/mock-providers';
 import { render, screen } from '@testing-library/react';
 import React from 'react';
 
+import MessageBoxHint from './MessageBoxHint';
 import { E2ERoomState } from '../../../../../app/e2e/client/E2ERoomState';
 import { useRoom } from '../../contexts/RoomContext';
 import { useE2EERoomState } from '../../hooks/useE2EERoomState';
-import MessageBoxHint from './MessageBoxHint';
 
 jest.mock('../../hooks/useE2EERoomState', () => ({
 	useE2EERoomState: jest.fn(),
diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBoxReplies.tsx b/apps/meteor/client/views/room/composer/messageBox/MessageBoxReplies.tsx
index 9c52b78ca599..41423dc225bc 100644
--- a/apps/meteor/client/views/room/composer/messageBox/MessageBoxReplies.tsx
+++ b/apps/meteor/client/views/room/composer/messageBox/MessageBoxReplies.tsx
@@ -4,7 +4,7 @@ import { IconButton, Box, Margins } from '@rocket.chat/fuselage';
 import { useSetting } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { memo } from 'react';
-import { useSubscription } from 'use-subscription';
+import { useSyncExternalStore } from 'use-sync-external-store/shim';
 
 import { getUserDisplayName } from '../../../../../lib/getUserDisplayName';
 import { QuoteAttachment } from '../../../../components/message/content/attachments/QuoteAttachment';
@@ -18,12 +18,9 @@ const MessageBoxReplies = (): ReactElement | null => {
 		throw new Error('Chat context not found');
 	}
 
-	const replies = useSubscription({
-		getCurrentValue: chat.composer.quotedMessages.get,
-		subscribe: chat.composer.quotedMessages.subscribe,
-	});
+	const replies = useSyncExternalStore(chat.composer.quotedMessages.subscribe, chat.composer.quotedMessages.get);
 
-	const useRealName = Boolean(useSetting('UI_Use_Real_Name'));
+	const useRealName = useSetting('UI_Use_Real_Name', false);
 
 	if (!replies.length) {
 		return null;
diff --git a/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslate.stories.tsx b/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslate.stories.tsx
index c98519092fe1..5217423cf34c 100644
--- a/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslate.stories.tsx
+++ b/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslate.stories.tsx
@@ -1,8 +1,8 @@
 import type { Meta, StoryFn } from '@storybook/react';
 import React from 'react';
 
-import { Contextualbar } from '../../../../components/Contextualbar';
 import AutoTranslate from './AutoTranslate';
+import { Contextualbar } from '../../../../components/Contextualbar';
 
 export default {
 	title: 'Room/Contextual Bar/AutoTranslate',
diff --git a/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslateWithData.tsx b/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslateWithData.tsx
index d31e8bde76b9..302199b56467 100644
--- a/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslateWithData.tsx
+++ b/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslateWithData.tsx
@@ -4,12 +4,12 @@ import type { ReactElement } from 'react';
 import React, { useMemo, useEffect, useState, memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import AutoTranslate from './AutoTranslate';
 import { useEndpointAction } from '../../../../hooks/useEndpointAction';
 import { useEndpointData } from '../../../../hooks/useEndpointData';
 import { dispatchToastMessage } from '../../../../lib/toast';
 import { useRoom, useRoomSubscription } from '../../contexts/RoomContext';
 import { useRoomToolbox } from '../../contexts/RoomToolboxContext';
-import AutoTranslate from './AutoTranslate';
 
 const AutoTranslateWithData = (): ReactElement => {
 	const room = useRoom();
diff --git a/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsList.tsx b/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsList.tsx
index 6cc6e692640d..f3b87aa66ff4 100644
--- a/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsList.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsList.tsx
@@ -1,11 +1,13 @@
 import type { IDiscussionMessage } from '@rocket.chat/core-typings';
 import { Box, Icon, TextInput, Callout, Throbber } from '@rocket.chat/fuselage';
 import { useResizeObserver, useAutoFocus } from '@rocket.chat/fuselage-hooks';
-import { useSetting, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetting } from '@rocket.chat/ui-contexts';
 import type { RefObject } from 'react';
 import React, { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 import { Virtuoso } from 'react-virtuoso';
 
+import DiscussionsListRow from './DiscussionsListRow';
 import {
 	ContextualbarHeader,
 	ContextualbarIcon,
@@ -17,7 +19,6 @@ import {
 } from '../../../../components/Contextualbar';
 import { VirtuosoScrollbars } from '../../../../components/CustomScrollbars';
 import { goToRoomById } from '../../../../lib/utils/goToRoomById';
-import DiscussionsListRow from './DiscussionsListRow';
 
 type DiscussionsListProps = {
 	total: number;
@@ -40,8 +41,8 @@ function DiscussionsList({
 	text,
 	onChangeFilter,
 }: DiscussionsListProps) {
-	const t = useTranslation();
-	const showRealNames = useSetting<boolean>('UI_Use_Real_Name') || false;
+	const { t } = useTranslation();
+	const showRealNames = useSetting('UI_Use_Real_Name', false);
 	const inputRef = useAutoFocus(true);
 
 	const onClick = useCallback((e) => {
diff --git a/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsListContextBar.tsx b/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsListContextBar.tsx
index d59267c9ab17..0830cfbe0722 100644
--- a/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsListContextBar.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsListContextBar.tsx
@@ -4,12 +4,12 @@ import { useUserId } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useCallback, useMemo, useState } from 'react';
 
+import DiscussionsList from './DiscussionsList';
+import { useDiscussionsList } from './useDiscussionsList';
 import { useRecordList } from '../../../../hooks/lists/useRecordList';
 import { AsyncStatePhase } from '../../../../hooks/useAsyncState';
 import { useRoom } from '../../contexts/RoomContext';
 import { useRoomToolbox } from '../../contexts/RoomToolboxContext';
-import DiscussionsList from './DiscussionsList';
-import { useDiscussionsList } from './useDiscussionsList';
 
 const DiscussionListContextBar = (): ReactElement | null => {
 	const userId = useUserId();
diff --git a/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsListRow.tsx b/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsListRow.tsx
index 09e5faddc5cd..05edbd8cd8a6 100644
--- a/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsListRow.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsListRow.tsx
@@ -2,9 +2,9 @@ import type { IDiscussionMessage } from '@rocket.chat/core-typings';
 import type { MouseEvent } from 'react';
 import React, { memo } from 'react';
 
+import DiscussionsListItem from './components/DiscussionsListItem';
 import { useTimeAgo } from '../../../../hooks/useTimeAgo';
 import { normalizeThreadMessage } from '../../../../lib/normalizeThreadMessage';
-import DiscussionsListItem from './components/DiscussionsListItem';
 
 type DiscussionListRowProps = {
 	discussion: IDiscussionMessage;
diff --git a/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.stories.tsx b/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.stories.tsx
index 9fe37701a8d0..3aa179d0df6e 100644
--- a/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.stories.tsx
+++ b/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.stories.tsx
@@ -1,8 +1,8 @@
 import type { Meta, StoryFn } from '@storybook/react';
 import React from 'react';
 
-import { Contextualbar } from '../../../../components/Contextualbar';
 import ExportMessages from './index';
+import { Contextualbar } from '../../../../components/Contextualbar';
 
 export default {
 	title: 'Room/Contextual Bar/ExportMessages',
diff --git a/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.tsx b/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.tsx
index 99bcabfd03b3..f6a621200119 100644
--- a/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.tsx
+++ b/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.tsx
@@ -4,12 +4,12 @@ import React, { useMemo } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 
+import FileExport from './FileExport';
+import MailExportForm from './MailExportForm';
 import { ContextualbarHeader, ContextualbarIcon, ContextualbarTitle, ContextualbarClose } from '../../../../components/Contextualbar';
 import { roomCoordinator } from '../../../../lib/rooms/roomCoordinator';
 import { useRoom } from '../../contexts/RoomContext';
 import { useRoomToolbox } from '../../contexts/RoomToolboxContext';
-import FileExport from './FileExport';
-import MailExportForm from './MailExportForm';
 
 export type MailExportFormValues = {
 	type: 'email' | 'file';
diff --git a/apps/meteor/client/views/room/contextualBar/ExportMessages/FileExport.tsx b/apps/meteor/client/views/room/contextualBar/ExportMessages/FileExport.tsx
index 7344926ec646..2d4a3bf0030c 100644
--- a/apps/meteor/client/views/room/contextualBar/ExportMessages/FileExport.tsx
+++ b/apps/meteor/client/views/room/contextualBar/ExportMessages/FileExport.tsx
@@ -6,9 +6,9 @@ import React, { useMemo } from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 
-import { ContextualbarScrollableContent, ContextualbarFooter } from '../../../../components/Contextualbar';
 import type { MailExportFormValues } from './ExportMessages';
 import { useRoomExportMutation } from './useRoomExportMutation';
+import { ContextualbarScrollableContent, ContextualbarFooter } from '../../../../components/Contextualbar';
 
 type FileExportProps = {
 	formId: string;
diff --git a/apps/meteor/client/views/room/contextualBar/ExportMessages/MailExportForm.tsx b/apps/meteor/client/views/room/contextualBar/ExportMessages/MailExportForm.tsx
index 41b6c33fec6c..c7a3276ac8e1 100644
--- a/apps/meteor/client/views/room/contextualBar/ExportMessages/MailExportForm.tsx
+++ b/apps/meteor/client/views/room/contextualBar/ExportMessages/MailExportForm.tsx
@@ -21,12 +21,12 @@ import React, { useEffect, useContext } from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 
+import type { MailExportFormValues } from './ExportMessages';
+import { useRoomExportMutation } from './useRoomExportMutation';
 import { validateEmail } from '../../../../../lib/emailValidator';
 import { ContextualbarScrollableContent, ContextualbarFooter } from '../../../../components/Contextualbar';
 import UserAutoCompleteMultiple from '../../../../components/UserAutoCompleteMultiple';
 import { SelectedMessageContext, useCountSelected } from '../../MessageList/contexts/SelectedMessagesContext';
-import type { MailExportFormValues } from './ExportMessages';
-import { useRoomExportMutation } from './useRoomExportMutation';
 
 type MailExportFormProps = {
 	formId: string;
@@ -163,7 +163,7 @@ const MailExportForm = ({ formId, rid, onCancel, exportOptions }: MailExportForm
 													return undefined;
 												}
 
-												return t('Mail_Message_Invalid_emails', additionalEmails);
+												return t('Mail_Message_Invalid_emails', { postProcess: 'sprintf', sprintf: [additionalEmails] });
 											},
 											validateToUsers: (additionalEmails) => {
 												if (additionalEmails !== '' || toUsers?.length > 0) {
diff --git a/apps/meteor/client/views/room/contextualBar/ExportMessages/useRoomExportMutation.ts b/apps/meteor/client/views/room/contextualBar/ExportMessages/useRoomExportMutation.ts
index ef8d67e3af3d..5f85a8536ab4 100644
--- a/apps/meteor/client/views/room/contextualBar/ExportMessages/useRoomExportMutation.ts
+++ b/apps/meteor/client/views/room/contextualBar/ExportMessages/useRoomExportMutation.ts
@@ -1,8 +1,9 @@
-import { useEndpoint, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import { useMutation } from '@tanstack/react-query';
+import { useTranslation } from 'react-i18next';
 
 export const useRoomExportMutation = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const roomsExport = useEndpoint('POST', '/v1/rooms.export');
 	const dispatchToastMessage = useToastMessageDispatch();
 
diff --git a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx
index 1233768a671c..1b644a9275fb 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx
@@ -32,6 +32,8 @@ import type { ChangeEvent } from 'react';
 import React, { useMemo } from 'react';
 import { useForm, Controller } from 'react-hook-form';
 
+import { useEditRoomInitialValues } from './useEditRoomInitialValues';
+import { useEditRoomPermissions } from './useEditRoomPermissions';
 import { MessageTypesValues } from '../../../../../../app/lib/lib/MessageTypes';
 import {
 	ContextualbarHeader,
@@ -47,8 +49,6 @@ import { msToTimeUnit, TIMEUNIT } from '../../../../../lib/convertTimeUnit';
 import { getDirtyFields } from '../../../../../lib/getDirtyFields';
 import { useArchiveRoom } from '../../../../hooks/roomActions/useArchiveRoom';
 import { useRetentionPolicy } from '../../../hooks/useRetentionPolicy';
-import { useEditRoomInitialValues } from './useEditRoomInitialValues';
-import { useEditRoomPermissions } from './useEditRoomPermissions';
 
 type EditRoomInfoProps = {
 	room: IRoomWithRetentionPolicy;
@@ -83,7 +83,7 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) =>
 	const roomType = 'prid' in room ? 'discussion' : room.teamMain ? 'team' : 'channel';
 
 	const retentionPolicy = useRetentionPolicy(room);
-	const retentionMaxAgeDefault = msToTimeUnit(TIMEUNIT.days, Number(useSetting<number>(getRetentionSetting(room.t)))) ?? 30;
+	const retentionMaxAgeDefault = msToTimeUnit(TIMEUNIT.days, useSetting(getRetentionSetting(room.t), 2592000000)) ?? 30;
 	const defaultValues = useEditRoomInitialValues(room);
 	const namesValidation = useSetting('UTF8_Channel_Names_Validation');
 	const allowSpecialNames = useSetting('UI_Allow_room_names_with_special_chars');
diff --git a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfoWithData.tsx b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfoWithData.tsx
index ad758c1bc8a6..f96ac853bdfa 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfoWithData.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfoWithData.tsx
@@ -1,9 +1,9 @@
 import type { IRoomWithRetentionPolicy } from '@rocket.chat/core-typings';
 import React from 'react';
 
+import EditRoomInfo from './EditRoomInfo';
 import { useRoom } from '../../../contexts/RoomContext';
 import { useRoomToolbox } from '../../../contexts/RoomToolboxContext';
-import EditRoomInfo from './EditRoomInfo';
 
 const EditRoomInfoWithData = ({ onClickBack }: { onClickBack: () => void }) => {
 	const room = useRoom() as IRoomWithRetentionPolicy;
diff --git a/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.stories.tsx b/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.stories.tsx
index 9f0200441bc6..0f9dd417d6eb 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.stories.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.stories.tsx
@@ -2,8 +2,8 @@ import type { RoomType } from '@rocket.chat/core-typings';
 import type { Meta, StoryFn } from '@storybook/react';
 import React from 'react';
 
-import { Contextualbar } from '../../../../../components/Contextualbar';
 import RoomInfo from './RoomInfo';
+import { Contextualbar } from '../../../../../components/Contextualbar';
 
 export default {
 	title: 'Room/Contextual Bar/RoomInfo',
diff --git a/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.tsx b/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.tsx
index cbbaad6427d1..f3184709f8f1 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.tsx
@@ -5,6 +5,7 @@ import { GenericMenu } from '@rocket.chat/ui-client';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
+import RoomInfoActions from './RoomInfoActions';
 import {
 	ContextualbarHeader,
 	ContextualbarScrollableContent,
@@ -28,7 +29,6 @@ import MarkdownText from '../../../../../components/MarkdownText';
 import { useRetentionPolicy } from '../../../hooks/useRetentionPolicy';
 import { useRoomActions } from '../hooks/useRoomActions';
 import { useSplitRoomActions } from '../hooks/useSplitRoomActions';
-import RoomInfoActions from './RoomInfoActions';
 
 type RoomInfoProps = {
 	room: IRoom;
diff --git a/apps/meteor/client/views/room/contextualBar/Info/RoomInfoRouter.tsx b/apps/meteor/client/views/room/contextualBar/Info/RoomInfoRouter.tsx
index 0aa83bd2ec1b..643638af9f3c 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/RoomInfoRouter.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Info/RoomInfoRouter.tsx
@@ -2,11 +2,11 @@ import type { IRoom } from '@rocket.chat/core-typings';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import React, { useState } from 'react';
 
-import { useRoom } from '../../contexts/RoomContext';
-import { useRoomToolbox } from '../../contexts/RoomToolboxContext';
 import EditRoomInfoWithData from './EditRoomInfo';
 import RoomInfo from './RoomInfo';
 import { useCanEditRoom } from './hooks/useCanEditRoom';
+import { useRoom } from '../../contexts/RoomContext';
+import { useRoomToolbox } from '../../contexts/RoomToolboxContext';
 
 type RoomInfoRouterProps = {
 	onClickBack?: () => void;
diff --git a/apps/meteor/client/views/room/contextualBar/Info/hooks/useRoomActions.ts b/apps/meteor/client/views/room/contextualBar/Info/hooks/useRoomActions.ts
index 512fb83fa153..592093fa1ae7 100644
--- a/apps/meteor/client/views/room/contextualBar/Info/hooks/useRoomActions.ts
+++ b/apps/meteor/client/views/room/contextualBar/Info/hooks/useRoomActions.ts
@@ -2,11 +2,11 @@ import type { IRoom } from '@rocket.chat/core-typings';
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { useDeleteRoom } from '../../../../hooks/roomActions/useDeleteRoom';
 import { useRoomConvertToTeam } from './actions/useRoomConvertToTeam';
 import { useRoomHide } from './actions/useRoomHide';
 import { useRoomLeave } from './actions/useRoomLeave';
 import { useRoomMoveToTeam } from './actions/useRoomMoveToTeam';
+import { useDeleteRoom } from '../../../../hooks/roomActions/useDeleteRoom';
 
 type UseRoomActionsOptions = {
 	onClickEnterRoom?: () => void;
@@ -42,7 +42,7 @@ export const useRoomActions = (room: IRoom, options: UseRoomActionsOptions) => {
 								icon: 'login' as const,
 								onClick: onClickEnterRoom,
 							},
-					  ]
+						]
 					: []),
 				...(onClickEdit
 					? [
@@ -52,7 +52,7 @@ export const useRoomActions = (room: IRoom, options: UseRoomActionsOptions) => {
 								icon: 'edit' as const,
 								onClick: onClickEdit,
 							},
-					  ]
+						]
 					: []),
 				...(handleLeave
 					? [
@@ -62,7 +62,7 @@ export const useRoomActions = (room: IRoom, options: UseRoomActionsOptions) => {
 								icon: 'sign-out' as const,
 								onClick: handleLeave,
 							},
-					  ]
+						]
 					: []),
 				...(handleMoveToTeam
 					? [
@@ -72,7 +72,7 @@ export const useRoomActions = (room: IRoom, options: UseRoomActionsOptions) => {
 								icon: 'team-arrow-right' as const,
 								onClick: handleMoveToTeam,
 							},
-					  ]
+						]
 					: []),
 				...(handleConvertToTeam
 					? [
@@ -82,7 +82,7 @@ export const useRoomActions = (room: IRoom, options: UseRoomActionsOptions) => {
 								icon: 'team' as const,
 								onClick: handleConvertToTeam,
 							},
-					  ]
+						]
 					: []),
 				...(canDeleteRoom
 					? [
@@ -93,7 +93,7 @@ export const useRoomActions = (room: IRoom, options: UseRoomActionsOptions) => {
 								onClick: handleDelete,
 								variant: 'danger',
 							},
-					  ]
+						]
 					: []),
 			],
 		};
diff --git a/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.stories.tsx b/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.stories.tsx
index fe5c19b7f856..a43f12fdddec 100644
--- a/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.stories.tsx
+++ b/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.stories.tsx
@@ -1,8 +1,8 @@
 import type { Meta, StoryFn } from '@storybook/react';
 import React from 'react';
 
-import { Contextualbar } from '../../../../components/Contextualbar';
 import KeyboardShortcutsWithData from './KeyboardShortcutsWithData';
+import { Contextualbar } from '../../../../components/Contextualbar';
 
 export default {
 	title: 'Room/Contextual Bar/KeyboardShortcut',
diff --git a/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.tsx b/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.tsx
index 6dab532b27c6..608fce5a6b2e 100644
--- a/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.tsx
+++ b/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.tsx
@@ -2,6 +2,7 @@ import type { ReactElement } from 'react';
 import React, { memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import KeyboardShortcutSection from './KeyboardShortcutSection';
 import {
 	ContextualbarHeader,
 	ContextualbarIcon,
@@ -9,7 +10,6 @@ import {
 	ContextualbarClose,
 	ContextualbarScrollableContent,
 } from '../../../../components/Contextualbar';
-import KeyboardShortcutSection from './KeyboardShortcutSection';
 
 const KeyboardShortcuts = ({ handleClose }: { handleClose: () => void }): ReactElement => {
 	const { t } = useTranslation();
diff --git a/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcutsWithData.tsx b/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcutsWithData.tsx
index b832e10a9e1a..776719cc1cf7 100644
--- a/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcutsWithData.tsx
+++ b/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcutsWithData.tsx
@@ -1,8 +1,8 @@
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import { useRoomToolbox } from '../../contexts/RoomToolboxContext';
 import KeyboardShortcuts from './KeyboardShortcuts';
+import { useRoomToolbox } from '../../contexts/RoomToolboxContext';
 
 const KeyboardShortcutsWithData = (): ReactElement => {
 	const { closeTab } = useRoomToolbox();
diff --git a/apps/meteor/client/views/room/contextualBar/MentionsTab.tsx b/apps/meteor/client/views/room/contextualBar/MentionsTab.tsx
index 23be0abc8bb0..d03277cddf8a 100644
--- a/apps/meteor/client/views/room/contextualBar/MentionsTab.tsx
+++ b/apps/meteor/client/views/room/contextualBar/MentionsTab.tsx
@@ -1,12 +1,13 @@
 import type { IMessage } from '@rocket.chat/core-typings';
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
+import MessageListTab from './MessageListTab';
 import { mapMessageFromApi } from '../../../lib/utils/mapMessageFromApi';
 import { useRoom } from '../contexts/RoomContext';
-import MessageListTab from './MessageListTab';
 
 const MentionsTab = (): ReactElement => {
 	const getMentionedMessages = useEndpoint('GET', '/v1/chat.getMentionedMessages');
@@ -28,7 +29,7 @@ const MentionsTab = (): ReactElement => {
 		return messages;
 	});
 
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<MessageListTab
diff --git a/apps/meteor/client/views/room/contextualBar/MessageSearchTab/MessageSearchTab.tsx b/apps/meteor/client/views/room/contextualBar/MessageSearchTab/MessageSearchTab.tsx
index 6a3c74fd3fa4..74d78ab1507c 100644
--- a/apps/meteor/client/views/room/contextualBar/MessageSearchTab/MessageSearchTab.tsx
+++ b/apps/meteor/client/views/room/contextualBar/MessageSearchTab/MessageSearchTab.tsx
@@ -2,6 +2,9 @@ import { Callout } from '@rocket.chat/fuselage';
 import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import MessageSearch from './components/MessageSearch';
+import MessageSearchForm from './components/MessageSearchForm';
+import { useMessageSearchProviderQuery } from './hooks/useMessageSearchProviderQuery';
 import {
 	ContextualbarClose,
 	ContextualbarContent,
@@ -11,9 +14,6 @@ import {
 	ContextualbarSection,
 } from '../../../../components/Contextualbar';
 import { useRoomToolbox } from '../../contexts/RoomToolboxContext';
-import MessageSearch from './components/MessageSearch';
-import MessageSearchForm from './components/MessageSearchForm';
-import { useMessageSearchProviderQuery } from './hooks/useMessageSearchProviderQuery';
 
 const MessageSearchTab = () => {
 	const providerQuery = useMessageSearchProviderQuery();
diff --git a/apps/meteor/client/views/room/contextualBar/MessageSearchTab/components/MessageSearch.tsx b/apps/meteor/client/views/room/contextualBar/MessageSearchTab/components/MessageSearch.tsx
index 576502fa357d..a55b8ac484dc 100644
--- a/apps/meteor/client/views/room/contextualBar/MessageSearchTab/components/MessageSearch.tsx
+++ b/apps/meteor/client/views/room/contextualBar/MessageSearchTab/components/MessageSearch.tsx
@@ -25,7 +25,7 @@ type MessageSearchProps = {
 const MessageSearch = ({ searchText, globalSearch }: MessageSearchProps): ReactElement => {
 	const t = useTranslation();
 	const formatDate = useFormatDate();
-	const pageSize = useSetting<number>('PageSize') ?? 10;
+	const pageSize = useSetting('PageSize', 10);
 	const [limit, setLimit] = useState(pageSize);
 	const showUserAvatar = !!useUserPreference<boolean>('displayAvatars');
 
diff --git a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.stories.tsx b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.stories.tsx
index 083359eaee77..186c41fa008c 100644
--- a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.stories.tsx
+++ b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.stories.tsx
@@ -2,8 +2,8 @@ import { action } from '@storybook/addon-actions';
 import type { Meta, StoryFn } from '@storybook/react';
 import React from 'react';
 
-import { Contextualbar } from '../../../../components/Contextualbar';
 import NotificationsPreferences from './NotificationPreferences';
+import { Contextualbar } from '../../../../components/Contextualbar';
 
 export default {
 	title: 'Room/Contextual Bar/NotificationsPreferences',
diff --git a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.tsx b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.tsx
index c7ccb8b61232..ad2e07c24e0f 100644
--- a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.tsx
+++ b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.tsx
@@ -5,6 +5,7 @@ import React from 'react';
 import { useFormContext } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 
+import NotificationPreferencesForm from './NotificationPreferencesForm';
 import {
 	ContextualbarHeader,
 	ContextualbarIcon,
@@ -13,7 +14,6 @@ import {
 	ContextualbarScrollableContent,
 	ContextualbarFooter,
 } from '../../../../components/Contextualbar';
-import NotificationPreferencesForm from './NotificationPreferencesForm';
 
 type NotificationPreferencesProps = {
 	handleClose: () => void;
diff --git a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferencesWithData.tsx b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferencesWithData.tsx
index dc34260c6e78..c893a6efc290 100644
--- a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferencesWithData.tsx
+++ b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferencesWithData.tsx
@@ -4,10 +4,10 @@ import type { ReactElement } from 'react';
 import React, { memo } from 'react';
 import { useForm, FormProvider } from 'react-hook-form';
 
+import NotificationPreferences from './NotificationPreferences';
 import { useEndpointAction } from '../../../../hooks/useEndpointAction';
 import { useRoom, useRoomSubscription } from '../../contexts/RoomContext';
 import { useRoomToolbox } from '../../contexts/RoomToolboxContext';
-import NotificationPreferences from './NotificationPreferences';
 
 export type NotificationFormValues = {
 	turnOn: boolean;
diff --git a/apps/meteor/client/views/room/contextualBar/OTR/OTR.stories.tsx b/apps/meteor/client/views/room/contextualBar/OTR/OTR.stories.tsx
index 65da453ec5f8..902acab03387 100644
--- a/apps/meteor/client/views/room/contextualBar/OTR/OTR.stories.tsx
+++ b/apps/meteor/client/views/room/contextualBar/OTR/OTR.stories.tsx
@@ -1,9 +1,9 @@
 import type { Meta, StoryFn } from '@storybook/react';
 import React from 'react';
 
+import OTR from './OTR';
 import { OtrRoomState } from '../../../../../app/otr/lib/OtrRoomState';
 import { Contextualbar } from '../../../../components/Contextualbar';
-import OTR from './OTR';
 
 export default {
 	title: 'Room/Contextual Bar/OTR',
diff --git a/apps/meteor/client/views/room/contextualBar/OTR/OTR.tsx b/apps/meteor/client/views/room/contextualBar/OTR/OTR.tsx
index 89c82fd966ec..ce47e10d9a20 100644
--- a/apps/meteor/client/views/room/contextualBar/OTR/OTR.tsx
+++ b/apps/meteor/client/views/room/contextualBar/OTR/OTR.tsx
@@ -4,6 +4,8 @@ import type { MouseEventHandler, ReactElement } from 'react';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
+import OTREstablished from './components/OTREstablished';
+import OTRStates from './components/OTRStates';
 import { OtrRoomState } from '../../../../../app/otr/lib/OtrRoomState';
 import {
 	ContextualbarHeader,
@@ -13,8 +15,6 @@ import {
 	ContextualbarScrollableContent,
 } from '../../../../components/Contextualbar';
 import { useRoom } from '../../contexts/RoomContext';
-import OTREstablished from './components/OTREstablished';
-import OTRStates from './components/OTRStates';
 
 type OTRProps = {
 	isOnline: boolean;
@@ -53,7 +53,7 @@ const OTR = ({ isOnline, onClickClose, onClickStart, onClickEnd, onClickRefresh,
 				return (
 					<OTRStates
 						title={t('OTR_Chat_Declined_Title')}
-						description={t('OTR_Chat_Declined_Description', peerUsername || '')}
+						description={t('OTR_Chat_Declined_Description', { postProcess: 'sprintf', sprintf: [peerUsername || ''] })}
 						icon='cross'
 						onClickStart={onClickStart}
 					/>
@@ -62,7 +62,7 @@ const OTR = ({ isOnline, onClickClose, onClickStart, onClickEnd, onClickRefresh,
 				return (
 					<OTRStates
 						title={t('OTR_Chat_Timeout_Title')}
-						description={t('OTR_Chat_Timeout_Description', peerUsername || '')}
+						description={t('OTR_Chat_Timeout_Description', { postProcess: 'sprintf', sprintf: [peerUsername || ''] })}
 						icon='clock'
 						onClickStart={onClickStart}
 					/>
diff --git a/apps/meteor/client/views/room/contextualBar/OTR/OTRWithData.tsx b/apps/meteor/client/views/room/contextualBar/OTR/OTRWithData.tsx
index c64d76892cb2..5f0650b05c16 100644
--- a/apps/meteor/client/views/room/contextualBar/OTR/OTRWithData.tsx
+++ b/apps/meteor/client/views/room/contextualBar/OTR/OTRWithData.tsx
@@ -1,11 +1,11 @@
 import type { ReactElement } from 'react';
 import React, { useEffect } from 'react';
 
+import OTRComponent from './OTR';
 import { OtrRoomState } from '../../../../../app/otr/lib/OtrRoomState';
 import { useOTR } from '../../../../hooks/useOTR';
 import { usePresence } from '../../../../hooks/usePresence';
 import { useRoomToolbox } from '../../contexts/RoomToolboxContext';
-import OTRComponent from './OTR';
 
 const OTRWithData = (): ReactElement => {
 	const { otr, otrState } = useOTR();
diff --git a/apps/meteor/client/views/room/contextualBar/PinnedMessagesTab.tsx b/apps/meteor/client/views/room/contextualBar/PinnedMessagesTab.tsx
index dcdab0612db9..82a002c40c95 100644
--- a/apps/meteor/client/views/room/contextualBar/PinnedMessagesTab.tsx
+++ b/apps/meteor/client/views/room/contextualBar/PinnedMessagesTab.tsx
@@ -1,13 +1,14 @@
 import type { IMessage } from '@rocket.chat/core-typings';
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
+import MessageListTab from './MessageListTab';
 import { onClientMessageReceived } from '../../../lib/onClientMessageReceived';
 import { mapMessageFromApi } from '../../../lib/utils/mapMessageFromApi';
 import { useRoom } from '../contexts/RoomContext';
-import MessageListTab from './MessageListTab';
 
 const PinnedMessagesTab = (): ReactElement => {
 	const getPinnedMessages = useEndpoint('GET', '/v1/chat.getPinnedMessages');
@@ -29,7 +30,7 @@ const PinnedMessagesTab = (): ReactElement => {
 		return Promise.all(messages.map(onClientMessageReceived));
 	});
 
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<MessageListTab
diff --git a/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.stories.tsx b/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.stories.tsx
index 2452a91fe9b1..678d22cb4f3b 100644
--- a/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.stories.tsx
+++ b/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.stories.tsx
@@ -2,8 +2,8 @@ import type { Meta, StoryFn } from '@storybook/react';
 import React from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
 
-import { Contextualbar } from '../../../../components/Contextualbar';
 import PruneMessages from './PruneMessages';
+import { Contextualbar } from '../../../../components/Contextualbar';
 
 export default {
 	title: 'Room/Contextual Bar/PruneMessages',
diff --git a/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.tsx b/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.tsx
index 88b979dc8bc3..6ade99ea391a 100644
--- a/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.tsx
+++ b/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.tsx
@@ -5,6 +5,7 @@ import React from 'react';
 import { useFormContext, Controller } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 
+import PruneMessagesDateTimeRow from './PruneMessagesDateTimeRow';
 import {
 	ContextualbarHeader,
 	ContextualbarIcon,
@@ -14,7 +15,6 @@ import {
 	ContextualbarClose,
 } from '../../../../components/Contextualbar';
 import UserAutoCompleteMultiple from '../../../../components/UserAutoCompleteMultiple';
-import PruneMessagesDateTimeRow from './PruneMessagesDateTimeRow';
 
 type PruneMessagesProps = {
 	callOutText?: string;
diff --git a/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessagesWithData.tsx b/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessagesWithData.tsx
index c5a045b659fc..b3254ec3f3b8 100644
--- a/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessagesWithData.tsx
+++ b/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessagesWithData.tsx
@@ -1,15 +1,16 @@
 import { isDirectMessageRoom } from '@rocket.chat/core-typings';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useSetModal, useToastMessageDispatch, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetModal, useToastMessageDispatch, useEndpoint } from '@rocket.chat/ui-contexts';
 import moment from 'moment';
 import type { ReactElement } from 'react';
 import React, { useCallback, useMemo, useState } from 'react';
 import { useForm, FormProvider } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
+import PruneMessages from './PruneMessages';
 import GenericModal from '../../../../components/GenericModal';
 import { useRoom } from '../../contexts/RoomContext';
 import { useRoomToolbox } from '../../contexts/RoomToolboxContext';
-import PruneMessages from './PruneMessages';
 
 const getTimeZoneOffset = (): string => {
 	const offset = new Date().getTimezoneOffset();
@@ -37,7 +38,7 @@ export const initialValues = {
 const DEFAULT_PRUNE_LIMIT = 2000;
 
 const PruneMessagesWithData = (): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const room = useRoom();
 	const setModal = useSetModal();
 	const { closeTab: close } = useRoomToolbox();
@@ -119,14 +120,15 @@ const PruneMessagesWithData = (): ReactElement => {
 	});
 
 	const callOutText = useMemo(() => {
-		const exceptPinned = pinned ? ` ${t('except_pinned', {})}` : '';
+		const name = room && ((isDirectMessageRoom(room) && room.usernames?.join(' x ')) || room.fname || room.name);
+		const exceptPinned = pinned ? ` ${t('except_pinned')}` : '';
 		const ifFrom = users.length
 			? ` ${t('if_they_are_from', {
 					postProcess: 'sprintf',
 					sprintf: [users.map((element) => element).join(', ')],
-			  })}`
+				})}`
 			: '';
-		const filesOrMessages = t(attached ? 'files' : 'messages', {});
+		const filesOrMessages = attached ? t('files') : t('messages');
 
 		if (newerDate && olderDate) {
 			return (
@@ -164,7 +166,7 @@ const PruneMessagesWithData = (): ReactElement => {
 		return (
 			t('Prune_Warning_all', {
 				postProcess: 'sprintf',
-				sprintf: [filesOrMessages, room && ((isDirectMessageRoom(room) && room.usernames?.join(' x ')) || room.fname || room.name)],
+				sprintf: [filesOrMessages, name],
 			}) +
 			exceptPinned +
 			ifFrom
@@ -173,17 +175,11 @@ const PruneMessagesWithData = (): ReactElement => {
 
 	const validateText = useMemo(() => {
 		if (fromDate > toDate) {
-			return t('Newer_than_may_not_exceed_Older_than', {
-				postProcess: 'sprintf',
-				sprintf: [],
-			});
+			return t('Newer_than_may_not_exceed_Older_than');
 		}
 
 		if (isNaN(fromDate.getTime()) || isNaN(toDate.getTime())) {
-			return t('error-invalid-date', {
-				postProcess: 'sprintf',
-				sprintf: [],
-			});
+			return t('error-invalid-date');
 		}
 
 		return undefined;
diff --git a/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.stories.tsx b/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.stories.tsx
index 0fb585c8d137..3208ad699ced 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.stories.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.stories.tsx
@@ -2,8 +2,8 @@ import { action } from '@storybook/addon-actions';
 import type { Meta, StoryFn } from '@storybook/react';
 import React from 'react';
 
-import { Contextualbar } from '../../../../components/Contextualbar';
 import RoomFiles from './RoomFiles';
+import { Contextualbar } from '../../../../components/Contextualbar';
 
 export default {
 	title: 'Room/Contextual Bar/RoomFiles',
diff --git a/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.tsx b/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.tsx
index e699ee6f6c77..81a8ed42e2c9 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.tsx
@@ -6,6 +6,7 @@ import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Virtuoso } from 'react-virtuoso';
 
+import FileItem from './components/FileItem';
 import {
 	ContextualbarHeader,
 	ContextualbarIcon,
@@ -15,7 +16,6 @@ import {
 	ContextualbarEmptyContent,
 } from '../../../../components/Contextualbar';
 import { VirtuosoScrollbars } from '../../../../components/CustomScrollbars';
-import FileItem from './components/FileItem';
 
 type RoomFilesProps = {
 	loading: boolean;
diff --git a/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFilesWithData.tsx b/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFilesWithData.tsx
index 1b8e0f8e6509..40de6a0cf93f 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFilesWithData.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFilesWithData.tsx
@@ -1,13 +1,13 @@
 import { useLocalStorage } from '@rocket.chat/fuselage-hooks';
 import React, { useState, useCallback, useMemo } from 'react';
 
+import RoomFiles from './RoomFiles';
+import { useDeleteFile } from './hooks/useDeleteFile';
+import { useFilesList } from './hooks/useFilesList';
 import { useRecordList } from '../../../../hooks/lists/useRecordList';
 import { AsyncStatePhase } from '../../../../hooks/useAsyncState';
 import { useRoom } from '../../contexts/RoomContext';
 import { useRoomToolbox } from '../../contexts/RoomToolboxContext';
-import RoomFiles from './RoomFiles';
-import { useDeleteFile } from './hooks/useDeleteFile';
-import { useFilesList } from './hooks/useFilesList';
 
 const RoomFilesWithData = () => {
 	const room = useRoom();
diff --git a/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItem.stories.tsx b/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItem.stories.tsx
index 7740c22924b2..bdce083f803f 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItem.stories.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItem.stories.tsx
@@ -1,8 +1,8 @@
 import type { Meta, StoryFn } from '@storybook/react';
 import React from 'react';
 
-import { Contextualbar } from '../../../../../components/Contextualbar';
 import FileItem from './FileItem';
+import { Contextualbar } from '../../../../../components/Contextualbar';
 
 export default {
 	title: 'Room/Contextual Bar/RoomFiles/FileItem',
diff --git a/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItem.tsx b/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItem.tsx
index a13014fb7834..2d9026afa1be 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItem.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItem.tsx
@@ -3,11 +3,11 @@ import { css } from '@rocket.chat/css-in-js';
 import { Box, Palette } from '@rocket.chat/fuselage';
 import React from 'react';
 
-import { useDownloadFromServiceWorker } from '../../../../../hooks/useDownloadFromServiceWorker';
-import { useFormatDateAndTime } from '../../../../../hooks/useFormatDateAndTime';
 import FileItemIcon from './FileItemIcon';
 import FileItemMenu from './FileItemMenu';
 import ImageItem from './ImageItem';
+import { useDownloadFromServiceWorker } from '../../../../../hooks/useDownloadFromServiceWorker';
+import { useFormatDateAndTime } from '../../../../../hooks/useFormatDateAndTime';
 
 const hoverClass = css`
 	&:hover {
diff --git a/apps/meteor/client/views/room/contextualBar/RoomFiles/hooks/useDeleteFile.tsx b/apps/meteor/client/views/room/contextualBar/RoomFiles/hooks/useDeleteFile.tsx
index bbc6676ff93c..59e6bc769492 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomFiles/hooks/useDeleteFile.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomFiles/hooks/useDeleteFile.tsx
@@ -1,11 +1,12 @@
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useSetModal, useToastMessageDispatch, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetModal, useToastMessageDispatch, useMethod } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../../components/GenericModal';
 
 export const useDeleteFile = (reload: () => void) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const setModal = useSetModal();
 	const dispatchToastMessage = useToastMessageDispatch();
 	const deleteFile = useMethod('deleteFileMessage');
diff --git a/apps/meteor/client/views/room/contextualBar/RoomFiles/hooks/useMessageDeletionIsAllowed.ts b/apps/meteor/client/views/room/contextualBar/RoomFiles/hooks/useMessageDeletionIsAllowed.ts
index fee190e36423..9928aefd504c 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomFiles/hooks/useMessageDeletionIsAllowed.ts
+++ b/apps/meteor/client/views/room/contextualBar/RoomFiles/hooks/useMessageDeletionIsAllowed.ts
@@ -10,7 +10,7 @@ export const useMessageDeletionIsAllowed = (rid: IRoom['_id'], file: IUpload, ui
 	const userHasPermissionToDeleteAny = usePermission('delete-message', rid);
 	const userHasPermissionToDeleteOwn = usePermission('delete-own-message');
 	const bypassBlockTimeLimit = usePermission('bypass-time-limit-edit-and-delete', rid);
-	const blockDeleteInMinutes = useSetting<number>('Message_AllowDeleting_BlockDeleteInMinutes');
+	const blockDeleteInMinutes = useSetting('Message_AllowDeleting_BlockDeleteInMinutes', 0);
 
 	const isDeletionAllowed = useMemo(() => {
 		if (canForceDelete) {
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddMatrixUsers/AddMatrixUsersModal.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddMatrixUsers/AddMatrixUsersModal.tsx
index 4ae17296a53e..730ed18e2d65 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddMatrixUsers/AddMatrixUsersModal.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddMatrixUsers/AddMatrixUsersModal.tsx
@@ -1,8 +1,9 @@
 import { Modal, Button, Box, Icon } from '@rocket.chat/fuselage';
-import { useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import type { ComponentProps, ReactElement } from 'react';
 import React from 'react';
 import { useForm } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 type AddMatrixUsersModalProps = {
 	matrixIdVerifiedStatus: Map<string, string>;
@@ -48,7 +49,7 @@ const AddMatrixUsersModal = ({ onClose, matrixIdVerifiedStatus, onSave, complete
 			.catch((error) => dispatchToastMessage({ type: 'error', message: error as Error }));
 	};
 
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<Modal>
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.stories.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.stories.tsx
index 532c377aea7c..528c88b852d6 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.stories.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.stories.tsx
@@ -1,8 +1,8 @@
 import type { Meta, StoryFn } from '@storybook/react';
 import React from 'react';
 
-import { Contextualbar } from '../../../../../components/Contextualbar';
 import AddUsers from './AddUsers';
+import { Contextualbar } from '../../../../../components/Contextualbar';
 
 export default {
 	title: 'Room/Contextual Bar/RoomMembers/AddUsers',
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.tsx
index 12a84dacd19e..23e0db5a76b5 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.tsx
@@ -2,11 +2,13 @@ import type { IRoom } from '@rocket.chat/core-typings';
 import { isRoomFederated } from '@rocket.chat/core-typings';
 import { Field, FieldLabel, Button, ButtonGroup, FieldGroup } from '@rocket.chat/fuselage';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
-import { useToastMessageDispatch, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
+import { useToastMessageDispatch, useMethod } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 import { Controller, useForm } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
+import { useAddMatrixUsers } from './AddMatrixUsers/useAddMatrixUsers';
 import {
 	ContextualbarHeader,
 	ContextualbarBack,
@@ -19,7 +21,6 @@ import UserAutoCompleteMultiple from '../../../../../components/UserAutoComplete
 import UserAutoCompleteMultipleFederated from '../../../../../components/UserAutoCompleteMultiple/UserAutoCompleteMultipleFederated';
 import { useRoom } from '../../../contexts/RoomContext';
 import { useRoomToolbox } from '../../../contexts/RoomToolboxContext';
-import { useAddMatrixUsers } from './AddMatrixUsers/useAddMatrixUsers';
 
 type AddUsersProps = {
 	rid: IRoom['_id'];
@@ -28,7 +29,7 @@ type AddUsersProps = {
 };
 
 const AddUsers = ({ rid, onClickBack, reload }: AddUsersProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 	const room = useRoom();
 
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.stories.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.stories.tsx
index 31fc774dcb33..eebacbc20db0 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.stories.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.stories.tsx
@@ -1,8 +1,8 @@
 import type { Meta, StoryFn } from '@storybook/react';
 import React from 'react';
 
-import { Contextualbar } from '../../../../../components/Contextualbar';
 import InviteUsers from './InviteUsers';
+import { Contextualbar } from '../../../../../components/Contextualbar';
 
 export default {
 	title: 'Room/Contextual Bar/RoomMembers/InviteUsers',
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.tsx
index 1ae82e75681a..f96e5925d9c4 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.tsx
@@ -3,6 +3,8 @@ import type { ReactElement } from 'react';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
+import EditInviteLink from './EditInviteLink';
+import InviteLink from './InviteLink';
 import {
 	ContextualbarHeader,
 	ContextualbarTitle,
@@ -10,8 +12,6 @@ import {
 	ContextualbarClose,
 	ContextualbarScrollableContent,
 } from '../../../../../components/Contextualbar';
-import EditInviteLink from './EditInviteLink';
-import InviteLink from './InviteLink';
 
 type InviteUsersProps = {
 	onClickBackMembers?: () => void;
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsersWithData.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsersWithData.tsx
index 88dad1edd740..ccfa4f2a5559 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsersWithData.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsersWithData.tsx
@@ -4,9 +4,9 @@ import { useEndpoint, useTranslation, useToastMessageDispatch } from '@rocket.ch
 import type { ReactElement } from 'react';
 import React, { useState, useEffect } from 'react';
 
+import InviteUsers from './InviteUsers';
 import { useFormatDateAndTime } from '../../../../../hooks/useFormatDateAndTime';
 import { useRoomToolbox } from '../../../contexts/RoomToolboxContext';
-import InviteUsers from './InviteUsers';
 
 type InviteUsersWithDataProps = {
 	rid: IRoom['_id'];
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.stories.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.stories.tsx
index 05a8987855a6..379a966ba9f1 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.stories.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.stories.tsx
@@ -3,8 +3,8 @@ import { action } from '@storybook/addon-actions';
 import type { Meta, StoryFn } from '@storybook/react';
 import React from 'react';
 
-import { Contextualbar } from '../../../../components/Contextualbar';
 import RoomMembers from './RoomMembers';
+import { Contextualbar } from '../../../../components/Contextualbar';
 
 export default {
 	title: 'Room/Contextual Bar/RoomMembers',
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.tsx
index d14c5d8a692c..0f182215190c 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.tsx
@@ -7,6 +7,7 @@ import type { ReactElement, FormEventHandler, ComponentProps, MouseEvent } from
 import React, { useMemo } from 'react';
 import { Virtuoso } from 'react-virtuoso';
 
+import RoomMembersRow from './RoomMembersRow';
 import {
 	ContextualbarHeader,
 	ContextualbarIcon,
@@ -19,7 +20,6 @@ import {
 } from '../../../../components/Contextualbar';
 import { VirtuosoScrollbars } from '../../../../components/CustomScrollbars';
 import InfiniteListAnchor from '../../../../components/InfiniteListAnchor';
-import RoomMembersRow from './RoomMembersRow';
 
 type RoomMemberUser = Pick<IUser, 'username' | '_id' | 'name' | 'status' | 'freeSwitchExtension'>;
 
@@ -84,7 +84,7 @@ const RoomMembers = ({
 		[loadMoreItems, members],
 	);
 
-	const useRealName = Boolean(useSetting('UI_Use_Real_Name'));
+	const useRealName = useSetting('UI_Use_Real_Name', false);
 
 	return (
 		<>
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersItem.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersItem.tsx
index 562d36536dbe..1c1a570d8641 100644
--- a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersItem.tsx
+++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembersItem.tsx
@@ -15,10 +15,10 @@ import { UserAvatar } from '@rocket.chat/ui-avatar';
 import type { ReactElement, MouseEvent } from 'react';
 import React, { useState } from 'react';
 
+import UserActions from './RoomMembersActions';
 import { getUserDisplayNames } from '../../../../../lib/getUserDisplayNames';
 import { ReactiveUserStatus } from '../../../../components/UserStatus';
 import { usePreventPropagation } from '../../../../hooks/usePreventPropagation';
-import UserActions from './RoomMembersActions';
 
 type RoomMembersItemProps = {
 	onClickView: (e: MouseEvent<HTMLElement>) => void;
diff --git a/apps/meteor/client/views/room/contextualBar/StarredMessagesTab.tsx b/apps/meteor/client/views/room/contextualBar/StarredMessagesTab.tsx
index 4159f570f5c9..f120db8cb40d 100644
--- a/apps/meteor/client/views/room/contextualBar/StarredMessagesTab.tsx
+++ b/apps/meteor/client/views/room/contextualBar/StarredMessagesTab.tsx
@@ -1,12 +1,13 @@
 import type { IMessage } from '@rocket.chat/core-typings';
-import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
+import MessageListTab from './MessageListTab';
 import { onClientMessageReceived } from '../../../lib/onClientMessageReceived';
 import { mapMessageFromApi } from '../../../lib/utils/mapMessageFromApi';
 import { useRoom } from '../contexts/RoomContext';
-import MessageListTab from './MessageListTab';
 
 const StarredMessagesTab = () => {
 	const getStarredMessages = useEndpoint('GET', '/v1/chat.getStarredMessages');
@@ -28,7 +29,7 @@ const StarredMessagesTab = () => {
 		return Promise.all(messages.map(onClientMessageReceived));
 	});
 
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	return (
 		<MessageListTab
diff --git a/apps/meteor/client/views/room/contextualBar/Threads/Thread.tsx b/apps/meteor/client/views/room/contextualBar/Threads/Thread.tsx
index 38f8d0748785..d69c3958050d 100644
--- a/apps/meteor/client/views/room/contextualBar/Threads/Thread.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Threads/Thread.tsx
@@ -5,6 +5,11 @@ import { useLocalStorage } from '@rocket.chat/fuselage-hooks';
 import { useLayoutContextualBarExpanded, useToastMessageDispatch, useTranslation, useUserId } from '@rocket.chat/ui-contexts';
 import React from 'react';
 
+import ThreadChat from './components/ThreadChat';
+import ThreadSkeleton from './components/ThreadSkeleton';
+import ThreadTitle from './components/ThreadTitle';
+import { useThreadMainMessageQuery } from './hooks/useThreadMainMessageQuery';
+import { useToggleFollowingThreadMutation } from './hooks/useToggleFollowingThreadMutation';
 import {
 	Contextualbar,
 	ContextualbarHeader,
@@ -17,11 +22,6 @@ import {
 import { useRoomToolbox } from '../../contexts/RoomToolboxContext';
 import { useGoToThreadList } from '../../hooks/useGoToThreadList';
 import ChatProvider from '../../providers/ChatProvider';
-import ThreadChat from './components/ThreadChat';
-import ThreadSkeleton from './components/ThreadSkeleton';
-import ThreadTitle from './components/ThreadTitle';
-import { useThreadMainMessageQuery } from './hooks/useThreadMainMessageQuery';
-import { useToggleFollowingThreadMutation } from './hooks/useToggleFollowingThreadMutation';
 
 type ThreadProps = {
 	tmid: IMessage['_id'];
@@ -44,7 +44,7 @@ const Thread = ({ tmid }: ThreadProps) => {
 	const [expanded, setExpanded] = useLocalStorage('expand-threads', false);
 
 	const uid = useUserId();
-	const following = uid ? mainMessageQueryResult.data?.replies?.includes(uid) ?? false : false;
+	const following = uid ? (mainMessageQueryResult.data?.replies?.includes(uid) ?? false) : false;
 	const toggleFollowingMutation = useToggleFollowingThreadMutation({
 		onError: (error) => {
 			dispatchToastMessage({ type: 'error', message: error });
@@ -90,7 +90,7 @@ const Thread = ({ tmid }: ThreadProps) => {
 									@media (min-width: 780px) and (max-width: 1135px) {
 										max-width: calc(100% - var(--sidebar-width)) !important;
 									}
-							  `
+								`
 							: undefined
 					}
 					position={expanded ? 'fixed' : 'absolute'}
diff --git a/apps/meteor/client/views/room/contextualBar/Threads/ThreadList.tsx b/apps/meteor/client/views/room/contextualBar/Threads/ThreadList.tsx
index e9ec3d61d1e7..287bb5658926 100644
--- a/apps/meteor/client/views/room/contextualBar/Threads/ThreadList.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Threads/ThreadList.tsx
@@ -1,4 +1,4 @@
-import type { IMessage } from '@rocket.chat/core-typings';
+import type { IMessage, IThreadMainMessage } from '@rocket.chat/core-typings';
 import { Box, Icon, TextInput, Select, Callout, Throbber } from '@rocket.chat/fuselage';
 import { useResizeObserver, useAutoFocus, useLocalStorage, useDebouncedValue } from '@rocket.chat/fuselage-hooks';
 import { useTranslation, useUserId } from '@rocket.chat/ui-contexts';
@@ -6,6 +6,8 @@ import type { FormEvent, ReactElement } from 'react';
 import React, { useMemo, useState, useCallback } from 'react';
 import { Virtuoso } from 'react-virtuoso';
 
+import ThreadListItem from './components/ThreadListItem';
+import { useThreadsList } from './hooks/useThreadsList';
 import {
 	ContextualbarClose,
 	ContextualbarContent,
@@ -22,8 +24,6 @@ import type { ThreadsListOptions } from '../../../../lib/lists/ThreadsList';
 import { useRoom, useRoomSubscription } from '../../contexts/RoomContext';
 import { useRoomToolbox } from '../../contexts/RoomToolboxContext';
 import { useGoToThread } from '../../hooks/useGoToThread';
-import ThreadListItem from './components/ThreadListItem';
-import { useThreadsList } from './hooks/useThreadsList';
 
 type ThreadType = 'all' | 'following' | 'unread';
 
@@ -163,12 +163,12 @@ const ThreadList = () => {
 									? (): void => undefined
 									: (start): void => {
 											loadMoreItems(start, Math.min(50, itemCount - start));
-									  }
+										}
 							}
 							overscan={25}
 							data={items}
 							components={{ Scroller: VirtuosoScrollbars }}
-							itemContent={(_index, data: IMessage): ReactElement => (
+							itemContent={(_index, data: IThreadMainMessage): ReactElement => (
 								<ThreadListItem
 									thread={data}
 									unread={subscription?.tunread ?? []}
diff --git a/apps/meteor/client/views/room/contextualBar/Threads/Threads.tsx b/apps/meteor/client/views/room/contextualBar/Threads/Threads.tsx
index 39588f2dfc73..b4a970fb39c5 100644
--- a/apps/meteor/client/views/room/contextualBar/Threads/Threads.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Threads/Threads.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
 
-import { useRoomToolbox } from '../../contexts/RoomToolboxContext';
 import Thread from './Thread';
 import ThreadList from './ThreadList';
+import { useRoomToolbox } from '../../contexts/RoomToolboxContext';
 
 const Threads = () => {
 	const { context: tmid } = useRoomToolbox();
diff --git a/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadChat.tsx b/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadChat.tsx
index 7afe0b442bbc..1edf74a34bf7 100644
--- a/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadChat.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadChat.tsx
@@ -5,6 +5,7 @@ import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import { useMethod, useTranslation, useUserPreference } from '@rocket.chat/ui-contexts';
 import React, { useState, useEffect, useCallback } from 'react';
 
+import ThreadMessageList from './ThreadMessageList';
 import { callbacks } from '../../../../../../lib/callbacks';
 import { ContextualbarContent } from '../../../../../components/Contextualbar';
 import MessageListErrorBoundary from '../../../MessageList/MessageListErrorBoundary';
@@ -16,7 +17,6 @@ import { useChat } from '../../../contexts/ChatContext';
 import { useRoom, useRoomSubscription } from '../../../contexts/RoomContext';
 import { useRoomToolbox } from '../../../contexts/RoomToolboxContext';
 import { DateListProvider } from '../../../providers/DateListProvider';
-import ThreadMessageList from './ThreadMessageList';
 
 type ThreadChatProps = {
 	mainMessage: IThreadMainMessage;
diff --git a/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadListItem.tsx b/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadListItem.tsx
index 0ceaa34a338a..9f26267d7150 100644
--- a/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadListItem.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadListItem.tsx
@@ -1,20 +1,20 @@
-import type { IMessage } from '@rocket.chat/core-typings';
+import type { IThreadMainMessage } from '@rocket.chat/core-typings';
 import { css } from '@rocket.chat/css-in-js';
 import { Palette } from '@rocket.chat/fuselage';
-import { useMethod, useSetting, useToastMessageDispatch, useUserId } from '@rocket.chat/ui-contexts';
+import { useSetting, useUserId } from '@rocket.chat/ui-contexts';
 import type { MouseEvent, ReactElement } from 'react';
 import React, { useCallback, memo } from 'react';
 
+import ThreadListMessage from './ThreadListMessage';
 import { useDecryptedMessage } from '../../../../../hooks/useDecryptedMessage';
 import { normalizeThreadMessage } from '../../../../../lib/normalizeThreadMessage';
-import ThreadListMessage from './ThreadListMessage';
 
 type ThreadListItemProps = {
-	thread: IMessage;
+	thread: IThreadMainMessage;
 	unread: string[];
 	unreadUser: string[];
 	unreadGroup: string[];
-	onClick: (tmid: IMessage['_id']) => void;
+	onClick: (tmid: IThreadMainMessage['_id']) => void;
 };
 
 const ThreadListItem = ({ thread, unread, unreadUser, unreadGroup, onClick }: ThreadListItemProps): ReactElement => {
@@ -26,31 +26,6 @@ const ThreadListItem = ({ thread, unread, unreadUser, unreadGroup, onClick }: Th
 
 	const following = !!uid && (thread.replies?.includes(uid) ?? false);
 
-	const followMessage = useMethod('followMessage');
-	const unfollowMessage = useMethod('unfollowMessage');
-	const dispatchToastMessage = useToastMessageDispatch();
-
-	const toggleFollowMessage = useCallback(async (): Promise<void> => {
-		try {
-			if (following) {
-				await unfollowMessage({ mid: thread._id });
-			} else {
-				await followMessage({ mid: thread._id });
-			}
-		} catch (error) {
-			dispatchToastMessage({ type: 'error', message: error });
-		}
-	}, [following, unfollowMessage, thread._id, followMessage, dispatchToastMessage]);
-
-	const handleToggleFollowButtonClick = useCallback(
-		(event: MouseEvent<HTMLElement>): void => {
-			event.preventDefault();
-			event.stopPropagation();
-			toggleFollowMessage();
-		},
-		[toggleFollowMessage],
-	);
-
 	const showRealNames = (useSetting('UI_Use_Real_Name') as boolean | undefined) ?? false;
 
 	const handleListItemClick = useCallback(
@@ -77,7 +52,7 @@ const ThreadListItem = ({ thread, unread, unreadUser, unreadGroup, onClick }: Th
 			replies={thread.tcount ?? 0}
 			tlm={thread.tlm}
 			ts={thread.ts}
-			participants={thread.replies?.length}
+			participants={thread.replies}
 			name={showRealNames ? name : thread.u.username}
 			username={thread.u.username}
 			unread={unread.includes(thread._id)}
@@ -86,7 +61,7 @@ const ThreadListItem = ({ thread, unread, unreadUser, unreadGroup, onClick }: Th
 			following={following}
 			data-id={thread._id}
 			msg={msg ?? ''}
-			handleFollowButton={handleToggleFollowButtonClick}
+			rid={thread.rid}
 			onClick={handleListItemClick}
 			emoji={thread?.emoji}
 		/>
diff --git a/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadListMessage.tsx b/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadListMessage.tsx
index 4a0e71746417..7dc76c830b39 100644
--- a/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadListMessage.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadListMessage.tsx
@@ -1,15 +1,13 @@
 import type { IMessage } from '@rocket.chat/core-typings';
-import { Message, Box, IconButton } from '@rocket.chat/fuselage';
+import { Message, Box } from '@rocket.chat/fuselage';
 import { MessageAvatar } from '@rocket.chat/ui-avatar';
-import type { ComponentProps, MouseEventHandler, ReactElement, ReactNode } from 'react';
+import type { ComponentProps, ReactElement, ReactNode } from 'react';
 import React, { memo } from 'react';
-import { useTranslation } from 'react-i18next';
 
+import ThreadListMetrics from './ThreadListMetrics';
 import Emoji from '../../../../../components/Emoji';
-import { followStyle, anchor } from '../../../../../components/message/helpers/followSyle';
-import AllMentionNotification from '../../../../../components/message/notification/AllMentionNotification';
-import MeMentionNotification from '../../../../../components/message/notification/MeMentionNotification';
-import UnreadMessagesNotification from '../../../../../components/message/notification/UnreadMessagesNotification';
+import ThreadMetricsFollow from '../../../../../components/message/content/ThreadMetricsFollow';
+import ThreadMetricsUnreadBadge from '../../../../../components/message/content/ThreadMetricsUnreadBadge';
 import { useTimeAgo } from '../../../../../hooks/useTimeAgo';
 
 type ThreadListMessageProps = {
@@ -19,13 +17,13 @@ type ThreadListMessageProps = {
 	username: IMessage['u']['username'];
 	name?: IMessage['u']['name'];
 	ts: IMessage['ts'];
-	replies: ReactNode;
-	participants: ReactNode;
-	handleFollowButton: MouseEventHandler;
+	replies: number;
+	participants: string[] | undefined;
+	rid: IMessage['rid'];
 	unread: boolean;
 	mention: boolean;
 	all: boolean;
-	tlm: Date | undefined;
+	tlm: Date;
 	emoji: IMessage['emoji'];
 } & Omit<ComponentProps<typeof Box>, 'is'>;
 
@@ -38,8 +36,8 @@ const ThreadListMessage = ({
 	ts,
 	replies,
 	participants,
-	handleFollowButton,
 	unread,
+	rid,
 	mention,
 	all,
 	tlm,
@@ -47,13 +45,10 @@ const ThreadListMessage = ({
 	emoji,
 	...props
 }: ThreadListMessageProps): ReactElement => {
-	const { t } = useTranslation();
 	const formatDate = useTimeAgo();
 
-	const button = !following ? 'bell-off' : 'bell';
-	const actionLabel = t(!following ? 'Not_Following' : 'Following');
 	return (
-		<Box className={[className, !following && followStyle].flat()}>
+		<Box className={className}>
 			<Box pbs={16} is={Message} {...props}>
 				<Message.LeftContainer>
 					<MessageAvatar emoji={emoji ? <Emoji emojiHandle={emoji} fillContainer /> : undefined} username={username} size='x36' />
@@ -64,40 +59,15 @@ const ThreadListMessage = ({
 						<Message.Timestamp>{formatDate(ts)}</Message.Timestamp>
 					</Message.Header>
 					<Message.Body clamp={2}>{msg}</Message.Body>
-					<Message.Block>
-						<Message.Metrics>
-							<Message.Metrics.Item>
-								<Message.Metrics.Item.Icon name='thread' />
-								<Message.Metrics.Item.Label>{replies}</Message.Metrics.Item.Label>
-							</Message.Metrics.Item>
-							<Message.Metrics.Item>
-								<Message.Metrics.Item.Icon name='user' />
-								<Message.Metrics.Item.Label>{participants}</Message.Metrics.Item.Label>
-							</Message.Metrics.Item>
-							{tlm && (
-								<Message.Metrics.Item>
-									<Message.Metrics.Item.Icon name='clock' />
-									<Message.Metrics.Item.Label>{formatDate(tlm)}</Message.Metrics.Item.Label>
-								</Message.Metrics.Item>
-							)}
-						</Message.Metrics>
-					</Message.Block>
+					<ThreadListMetrics lm={tlm} participants={participants || []} counter={replies} />
 				</Message.Container>
 				<Message.ContainerFixed>
-					<IconButton
-						className={anchor}
-						small
-						icon={button}
-						flexShrink={0}
-						data-following={following}
-						data-id={_id}
-						onClick={handleFollowButton}
-						title={actionLabel}
-						aria-label={actionLabel}
-					/>
-					<Box mb={24}>
-						{(mention && <MeMentionNotification />) || (all && <AllMentionNotification />) || (unread && <UnreadMessagesNotification />)}
-					</Box>
+					<ThreadMetricsFollow following={following} mid={_id} rid={rid} mention={false} unread={false} all={false} />
+					{unread && (
+						<Box mbs={24}>
+							<ThreadMetricsUnreadBadge unread={unread} mention={mention} all={all} />
+						</Box>
+					)}
 				</Message.ContainerFixed>
 			</Box>
 		</Box>
diff --git a/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadListMetrics.tsx b/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadListMetrics.tsx
new file mode 100644
index 000000000000..ba2b32bd6b8d
--- /dev/null
+++ b/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadListMetrics.tsx
@@ -0,0 +1,42 @@
+import { MessageMetricsItem, MessageBlock, MessageMetrics, MessageMetricsItemIcon, MessageMetricsItemLabel } from '@rocket.chat/fuselage';
+import { useResizeObserver } from '@rocket.chat/fuselage-hooks';
+import { useTranslation } from '@rocket.chat/ui-contexts';
+import type { ReactElement } from 'react';
+import React from 'react';
+
+import ThreadMetricsParticipants from '../../../../../components/message/content/ThreadMetricsParticipants';
+import { useTimeAgo } from '../../../../../hooks/useTimeAgo';
+
+type ThreadMetricsProps = {
+	lm: Date;
+	counter: number;
+	participants: Array<string>;
+};
+
+const ThreadListMetrics = ({ counter, participants, lm }: ThreadMetricsProps): ReactElement => {
+	const t = useTranslation();
+
+	const format = useTimeAgo();
+
+	const { ref, borderBoxSize } = useResizeObserver<HTMLDivElement>();
+
+	const isSmall = (borderBoxSize.inlineSize || Infinity) < 200;
+
+	return (
+		<MessageBlock ref={ref}>
+			<MessageMetrics>
+				{participants?.length > 0 && <ThreadMetricsParticipants participants={participants} />}
+				<MessageMetricsItem title={t('Last_message__date__', { date: format(lm) })}>
+					<MessageMetricsItemIcon name='thread' />
+					{isSmall ? (
+						<MessageMetricsItemLabel>{t('__count__replies', { count: counter })}</MessageMetricsItemLabel>
+					) : (
+						<MessageMetricsItemLabel>{t('__count__replies__date__', { count: counter, date: format(lm) })}</MessageMetricsItemLabel>
+					)}
+				</MessageMetricsItem>
+			</MessageMetrics>
+		</MessageBlock>
+	);
+};
+
+export default ThreadListMetrics;
diff --git a/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadMessageList.tsx b/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadMessageList.tsx
index 125c08ad67cf..fff5d55e31c1 100644
--- a/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadMessageList.tsx
+++ b/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadMessageList.tsx
@@ -1,11 +1,13 @@
 import type { IMessage, IThreadMainMessage } from '@rocket.chat/core-typings';
 import { Box } from '@rocket.chat/fuselage';
 import { useMergedRefs } from '@rocket.chat/fuselage-hooks';
-import { useSetting, useUserPreference, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetting, useUserPreference } from '@rocket.chat/ui-contexts';
 import { differenceInSeconds } from 'date-fns';
 import type { ReactElement } from 'react';
 import React, { Fragment } from 'react';
+import { useTranslation } from 'react-i18next';
 
+import { ThreadMessageItem } from './ThreadMessageItem';
 import { MessageTypes } from '../../../../../../app/ui-utils/client';
 import { isTruthy } from '../../../../../../lib/isTruthy';
 import { CustomScrollbars } from '../../../../../components/CustomScrollbars';
@@ -19,7 +21,6 @@ import { useMessageListNavigation } from '../../../hooks/useMessageListNavigatio
 import { useLegacyThreadMessageJump } from '../hooks/useLegacyThreadMessageJump';
 import { useLegacyThreadMessageListScrolling } from '../hooks/useLegacyThreadMessageListScrolling';
 import { useLegacyThreadMessages } from '../hooks/useLegacyThreadMessages';
-import { ThreadMessageItem } from './ThreadMessageItem';
 
 const isMessageSequential = (current: IMessage, previous: IMessage | undefined, groupingRange: number): boolean => {
 	if (!previous) {
@@ -49,7 +50,7 @@ type ThreadMessageListProps = {
 };
 
 const ThreadMessageList = ({ mainMessage }: ThreadMessageListProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const { innerRef, bubbleRef, listStyle, ...bubbleDate } = useDateScroll();
 
 	const { messages, loading } = useLegacyThreadMessages(mainMessage._id);
@@ -63,7 +64,7 @@ const ThreadMessageList = ({ mainMessage }: ThreadMessageListProps): ReactElemen
 	const hideUsernames = useUserPreference<boolean>('hideUsernames');
 	const showUserAvatar = !!useUserPreference<boolean>('displayAvatars');
 	const firstUnreadMessageId = useFirstUnreadMessageId();
-	const messageGroupingPeriod = Number(useSetting('Message_GroupingPeriod'));
+	const messageGroupingPeriod = useSetting('Message_GroupingPeriod', 300);
 
 	const { messageListRef } = useMessageListNavigation();
 	const listRef = useMergedRefs<HTMLElement | null>(listScrollRef, messageListRef);
diff --git a/apps/meteor/client/views/room/contextualBar/Threads/hooks/useThreadMainMessageQuery.ts b/apps/meteor/client/views/room/contextualBar/Threads/hooks/useThreadMainMessageQuery.ts
index 76e80d774ca3..1636489e7d0d 100644
--- a/apps/meteor/client/views/room/contextualBar/Threads/hooks/useThreadMainMessageQuery.ts
+++ b/apps/meteor/client/views/room/contextualBar/Threads/hooks/useThreadMainMessageQuery.ts
@@ -4,12 +4,12 @@ import type { UseQueryResult } from '@tanstack/react-query';
 import { useQueryClient, useQuery } from '@tanstack/react-query';
 import { useCallback, useEffect, useRef } from 'react';
 
+import { useGetMessageByID } from './useGetMessageByID';
 import { withDebouncing } from '../../../../../../lib/utils/highOrderFunctions';
 import type { FieldExpression, Query } from '../../../../../lib/minimongo';
 import { createFilterFromQuery } from '../../../../../lib/minimongo';
 import { onClientMessageReceived } from '../../../../../lib/onClientMessageReceived';
 import { useRoom } from '../../../contexts/RoomContext';
-import { useGetMessageByID } from './useGetMessageByID';
 
 type RoomMessagesRidEvent = IMessage;
 
diff --git a/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoWithData.tsx b/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoWithData.tsx
index 2e3255ea2e0a..e207f62039c3 100644
--- a/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoWithData.tsx
+++ b/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoWithData.tsx
@@ -1,9 +1,11 @@
 import type { IUser, IRoom } from '@rocket.chat/core-typings';
 import { Callout } from '@rocket.chat/fuselage';
-import { useRolesDescription, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRolesDescription } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
 
+import UserInfoActions from './UserInfoActions';
 import { getUserEmailAddress } from '../../../../../lib/getUserEmailAddress';
 import {
 	ContextualbarHeader,
@@ -20,7 +22,6 @@ import { ReactiveUserStatus } from '../../../../components/UserStatus';
 import { AsyncStatePhase } from '../../../../hooks/useAsyncState';
 import { useEndpointData } from '../../../../hooks/useEndpointData';
 import { getUserEmailVerified } from '../../../../lib/utils/getUserEmailVerified';
-import UserInfoActions from './UserInfoActions';
 
 type UserInfoWithDataProps = {
 	uid?: IUser['_id'];
@@ -31,7 +32,7 @@ type UserInfoWithDataProps = {
 };
 
 const UserInfoWithData = ({ uid, username, rid, onClose, onClickBack }: UserInfoWithDataProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const getRoles = useRolesDescription();
 
 	const {
diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfList.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfList.tsx
index c8c7b6a59e3b..ea3a4a4ed1aa 100644
--- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfList.tsx
+++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfList.tsx
@@ -6,6 +6,7 @@ import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { Virtuoso } from 'react-virtuoso';
 
+import VideoConfListItem from './VideoConfListItem';
 import {
 	ContextualbarHeader,
 	ContextualbarIcon,
@@ -16,7 +17,6 @@ import {
 } from '../../../../../components/Contextualbar';
 import { VirtuosoScrollbars } from '../../../../../components/CustomScrollbars';
 import { getErrorMessage } from '../../../../../lib/errorHandling';
-import VideoConfListItem from './VideoConfListItem';
 
 type VideoConfListProps = {
 	onClose: () => void;
@@ -80,7 +80,7 @@ const VideoConfList = ({ onClose, total, videoConfs, loading, error, reload, loa
 									? (): void => undefined
 									: (start) => {
 											loadMoreItems(start, Math.min(50, total - start));
-									  }
+										}
 							}
 							overscan={25}
 							data={videoConfs}
diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfListItem.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfListItem.tsx
index 543ff87ebf9e..72ec0536c8b4 100644
--- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfListItem.tsx
+++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfListItem.tsx
@@ -25,7 +25,7 @@ const VideoConfListItem = ({
 	const t = useTranslation();
 	const formatDate = useTimeAgo();
 	const joinCall = useVideoConfJoinCall();
-	const showRealName = Boolean(useSetting('UI_Use_Real_Name'));
+	const showRealName = useSetting('UI_Use_Real_Name', false);
 
 	const {
 		_id: callId,
diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfListWithData.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfListWithData.tsx
index c0bf41c5906f..12ebc5dc7062 100644
--- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfListWithData.tsx
+++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfListWithData.tsx
@@ -1,11 +1,11 @@
 import React, { useMemo } from 'react';
 
+import VideoConfList from './VideoConfList';
+import { useVideoConfList } from './useVideoConfList';
 import { useRecordList } from '../../../../../hooks/lists/useRecordList';
 import { AsyncStatePhase } from '../../../../../hooks/useAsyncState';
 import { useRoom } from '../../../contexts/RoomContext';
 import { useRoomToolbox } from '../../../contexts/RoomToolboxContext';
-import VideoConfList from './VideoConfList';
-import { useVideoConfList } from './useVideoConfList';
 
 const VideoConfListWithData = () => {
 	const room = useRoom();
diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/useVideoConfList.ts b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/useVideoConfList.ts
index c676319b26c6..ce9d991dd3f7 100644
--- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/useVideoConfList.ts
+++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/useVideoConfList.ts
@@ -2,9 +2,9 @@ import type { IRoom } from '@rocket.chat/core-typings';
 import { useEndpoint } from '@rocket.chat/ui-contexts';
 import { useCallback, useState } from 'react';
 
+import { VideoConfRecordList } from './VideoConfRecordList';
 import { useScrollableRecordList } from '../../../../../hooks/lists/useScrollableRecordList';
 import { useComponentDidUpdate } from '../../../../../hooks/useComponentDidUpdate';
-import { VideoConfRecordList } from './VideoConfRecordList';
 
 export const useVideoConfList = (options: {
 	roomId: IRoom['_id'];
diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/IncomingPopup.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/IncomingPopup.tsx
index 09ddfb51b3a2..77dca0ce0c65 100644
--- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/IncomingPopup.tsx
+++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/IncomingPopup.tsx
@@ -17,10 +17,10 @@ import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import VideoConfPopupRoomInfo from './VideoConfPopupRoomInfo';
 import { useVideoConfSetPreferences } from '../../../../../../contexts/VideoConfContext';
 import { AsyncStatePhase } from '../../../../../../hooks/useAsyncState';
 import { useEndpointData } from '../../../../../../hooks/useEndpointData';
-import VideoConfPopupRoomInfo from './VideoConfPopupRoomInfo';
 
 type IncomingPopupProps = {
 	id: string;
diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/OutgoingPopup.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/OutgoingPopup.tsx
index eaf82c5a301e..c375b7b544c2 100644
--- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/OutgoingPopup.tsx
+++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/OutgoingPopup.tsx
@@ -15,8 +15,8 @@ import type { ReactElement } from 'react';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { useVideoConfCapabilities, useVideoConfPreferences } from '../../../../../../contexts/VideoConfContext';
 import VideoConfPopupRoomInfo from './VideoConfPopupRoomInfo';
+import { useVideoConfCapabilities, useVideoConfPreferences } from '../../../../../../contexts/VideoConfContext';
 
 type OutgoingPopupProps = {
 	id: string;
diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/StartCallPopup.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/StartCallPopup.tsx
index a9fcb8527767..f28f76ace5ee 100644
--- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/StartCallPopup.tsx
+++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/StartCallPopup.tsx
@@ -16,9 +16,9 @@ import type { KeyboardEvent, ReactElement } from 'react';
 import React, { useCallback, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import VideoConfPopupRoomInfo from './VideoConfPopupRoomInfo';
 import { useVideoConfSetPreferences, useVideoConfCapabilities, useVideoConfPreferences } from '../../../../../../contexts/VideoConfContext';
 import { useVideoConfRoomName } from '../../hooks/useVideoConfRoomName';
-import VideoConfPopupRoomInfo from './VideoConfPopupRoomInfo';
 
 type StartCallPopupProps = {
 	id: string;
diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/TimedVideoConfPopup.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/TimedVideoConfPopup.tsx
index b4fca03406f3..9137b9b03036 100644
--- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/TimedVideoConfPopup.tsx
+++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopup/TimedVideoConfPopup.tsx
@@ -3,6 +3,9 @@ import { useUserRoom } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useState } from 'react';
 
+import IncomingPopup from './IncomingPopup';
+import OutgoingPopup from './OutgoingPopup';
+import StartCallPopup from './StartCallPopup';
 import {
 	useVideoConfAcceptCall,
 	useVideoConfAbortCall,
@@ -11,9 +14,6 @@ import {
 	useVideoConfStartCall,
 	useVideoConfDismissOutgoing,
 } from '../../../../../../contexts/VideoConfContext';
-import IncomingPopup from './IncomingPopup';
-import OutgoingPopup from './OutgoingPopup';
-import StartCallPopup from './StartCallPopup';
 
 type TimedVideoConfPopupProps = {
 	id: string;
diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopups.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopups.tsx
index 9a4b8a21ce18..7130e878fd7e 100644
--- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopups.tsx
+++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfPopups/VideoConfPopups.tsx
@@ -4,10 +4,10 @@ import type { ReactElement } from 'react';
 import React, { useEffect, useMemo } from 'react';
 import { FocusScope } from 'react-aria';
 
+import VideoConfPopup from './VideoConfPopup';
 import type { VideoConfPopupPayload } from '../../../../../contexts/VideoConfContext';
 import { useVideoConfIsCalling, useVideoConfIsRinging, useVideoConfIncomingCalls } from '../../../../../contexts/VideoConfContext';
 import VideoConfPopupPortal from '../../../../../portals/VideoConfPopupPortal';
-import VideoConfPopup from './VideoConfPopup';
 
 const VideoConfPopups = ({ children }: { children?: VideoConfPopupPayload }): ReactElement => {
 	const customSound = useCustomSound();
diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/hooks/useVideoConfOpenCall.spec.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/hooks/useVideoConfOpenCall.spec.tsx
index d0e69399e8a2..4a847d207cda 100644
--- a/apps/meteor/client/views/room/contextualBar/VideoConference/hooks/useVideoConfOpenCall.spec.tsx
+++ b/apps/meteor/client/views/room/contextualBar/VideoConference/hooks/useVideoConfOpenCall.spec.tsx
@@ -51,7 +51,7 @@ describe('without window.RocketChatDesktop set', () => {
 	});
 
 	it('should open window', async () => {
-		window.open = jest.fn(() => ({} as Window));
+		window.open = jest.fn(() => ({}) as Window);
 
 		const { result } = renderHook(() => useVideoConfOpenCall(), {
 			legacyRoot: true,
diff --git a/apps/meteor/client/views/room/hooks/useDateScroll.ts b/apps/meteor/client/views/room/hooks/useDateScroll.ts
index 56c86a62839c..c01580e43c59 100644
--- a/apps/meteor/client/views/room/hooks/useDateScroll.ts
+++ b/apps/meteor/client/views/room/hooks/useDateScroll.ts
@@ -53,45 +53,48 @@ export const useDateScroll = (margin = 8): useDateScrollReturn => {
 					clearTimeout(timeout);
 
 					// Gets the first non visible message date and sets the bubble date to it
-					const [date, message, style] = [...elements].reduce((ret, message) => {
-						// Sanitize elements
-						if (!message.dataset.id) {
-							return ret;
-						}
+					const [date, message, style] = [...elements].reduce(
+						(ret, message) => {
+							// Sanitize elements
+							if (!message.dataset.id) {
+								return ret;
+							}
 
-						const { top, height } = message.getBoundingClientRect();
-						const { id } = message.dataset;
-
-						// if the bubble if between the divider and the top, position it at the top of the divider
-						if (top > bubbleOffset && top < bubbleOffset + height) {
-							return [
-								ret[0] || new Date(id).toISOString(),
-								ret[1] || message,
-								{
-									position: 'absolute',
-									top: `${top - height - bubbleOffset + margin}px`,
-									left: ' 50%',
-									translate: '-50%',
-									zIndex: 11,
-								},
-							];
-						}
+							const { top, height } = message.getBoundingClientRect();
+							const { id } = message.dataset;
+
+							// if the bubble if between the divider and the top, position it at the top of the divider
+							if (top > bubbleOffset && top < bubbleOffset + height) {
+								return [
+									ret[0] || new Date(id).toISOString(),
+									ret[1] || message,
+									{
+										position: 'absolute',
+										top: `${top - height - bubbleOffset + margin}px`,
+										left: ' 50%',
+										translate: '-50%',
+										zIndex: 11,
+									},
+								];
+							}
 
-						if (top < bubbleOffset + height) {
-							return [
-								new Date(id).toISOString(),
-								message,
-								{
-									position: 'absolute',
-									top: `${margin}px`,
-									left: ' 50%',
-									translate: '-50%',
-									zIndex: 11,
-								},
-							];
-						}
-						return ret;
-					}, [] as [string, HTMLElement, { [key: number]: string | number }?] | []);
+							if (top < bubbleOffset + height) {
+								return [
+									new Date(id).toISOString(),
+									message,
+									{
+										position: 'absolute',
+										top: `${margin}px`,
+										left: ' 50%',
+										translate: '-50%',
+										zIndex: 11,
+									},
+								];
+							}
+							return ret;
+						},
+						[] as [string, HTMLElement, { [key: number]: string | number }?] | [],
+					);
 
 					// We always keep the previous date if we don't have a new one, so when the bubble disappears it doesn't flicker
 					setBubbleDate((current) => ({
@@ -143,7 +146,7 @@ export const useDateScroll = (margin = 8): useDateScrollReturn => {
 					& [data-time='${bubbleDate.date.replaceAll(/[-T:.]/g, '').substring(0, 8)}'] {
 						opacity: 0;
 					}
-			  `
+				`
 			: undefined;
 
 	return {
diff --git a/apps/meteor/client/views/room/hooks/useE2EEResetRoomKey.spec.ts b/apps/meteor/client/views/room/hooks/useE2EEResetRoomKey.spec.ts
index 44fb054ee219..be7d3341da0e 100644
--- a/apps/meteor/client/views/room/hooks/useE2EEResetRoomKey.spec.ts
+++ b/apps/meteor/client/views/room/hooks/useE2EEResetRoomKey.spec.ts
@@ -1,8 +1,8 @@
 import { mockAppRoot } from '@rocket.chat/mock-providers';
 import { renderHook, waitFor } from '@testing-library/react';
 
-import { e2e } from '../../../../app/e2e/client';
 import { useE2EEResetRoomKey } from './useE2EEResetRoomKey';
+import { e2e } from '../../../../app/e2e/client';
 
 jest.mock('../../../../app/e2e/client', () => ({
 	e2e: {
diff --git a/apps/meteor/client/views/room/hooks/useE2EERoomState.ts b/apps/meteor/client/views/room/hooks/useE2EERoomState.ts
index c541aad121d4..b1fcc8408bcd 100644
--- a/apps/meteor/client/views/room/hooks/useE2EERoomState.ts
+++ b/apps/meteor/client/views/room/hooks/useE2EERoomState.ts
@@ -1,8 +1,8 @@
 import { useMemo } from 'react';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
 
-import type { E2ERoomState } from '../../../../app/e2e/client/E2ERoomState';
 import { useE2EERoom } from './useE2EERoom';
+import type { E2ERoomState } from '../../../../app/e2e/client/E2ERoomState';
 
 export const useE2EERoomState = (rid: string) => {
 	const e2eRoom = useE2EERoom(rid);
diff --git a/apps/meteor/client/views/room/hooks/useGoToRoom.ts b/apps/meteor/client/views/room/hooks/useGoToRoom.ts
index 330dc338fde4..205a531a8ec3 100644
--- a/apps/meteor/client/views/room/hooks/useGoToRoom.ts
+++ b/apps/meteor/client/views/room/hooks/useGoToRoom.ts
@@ -2,7 +2,7 @@ import type { IRoom, ISubscription } from '@rocket.chat/core-typings';
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import { useMethod, useRouter } from '@rocket.chat/ui-contexts';
 
-import { ChatSubscription } from '../../../../app/models/client';
+import { Subscriptions } from '../../../../app/models/client';
 import { roomCoordinator } from '../../../lib/rooms/roomCoordinator';
 
 export const useGoToRoom = ({ replace = false }: { replace?: boolean } = {}): ((rid: IRoom['_id']) => void) => {
@@ -15,7 +15,7 @@ export const useGoToRoom = ({ replace = false }: { replace?: boolean } = {}): ((
 			return;
 		}
 
-		const subscription: ISubscription | undefined = ChatSubscription.findOne({ rid });
+		const subscription: ISubscription | undefined = Subscriptions.findOne({ rid });
 
 		if (subscription) {
 			roomCoordinator.openRouteLink(subscription.t, subscription, router.getSearchParameters(), { replace });
diff --git a/apps/meteor/client/views/room/hooks/useOpenRoom.ts b/apps/meteor/client/views/room/hooks/useOpenRoom.ts
index 631a46b11d2f..9937af4ecef7 100644
--- a/apps/meteor/client/views/room/hooks/useOpenRoom.ts
+++ b/apps/meteor/client/views/room/hooks/useOpenRoom.ts
@@ -12,7 +12,7 @@ import { queryClient } from '../../../lib/queryClient';
 
 export function useOpenRoom({ type, reference }: { type: RoomType; reference: string }) {
 	const user = useUser();
-	const allowAnonymousRead = useSetting<boolean>('Accounts_AllowAnonymousRead') ?? true;
+	const allowAnonymousRead = useSetting('Accounts_AllowAnonymousRead', true);
 	const getRoomByTypeAndName = useMethod('getRoomByTypeAndName');
 	const createDirectMessage = useMethod('createDirectMessage');
 	const openRoom = useMethod('openRoom');
@@ -38,9 +38,9 @@ export function useOpenRoom({ type, reference }: { type: RoomType; reference: st
 
 				try {
 					const { rid } = await createDirectMessage(...reference.split(', '));
-					const { ChatSubscription } = await import('../../../../app/models/client');
+					const { Subscriptions } = await import('../../../../app/models/client');
 					const { waitUntilFind } = await import('../../../lib/utils/waitUntilFind');
-					await waitUntilFind(() => ChatSubscription.findOne({ rid }));
+					await waitUntilFind(() => Subscriptions.findOne({ rid }));
 					directRoute.push({ rid }, (prev) => prev);
 				} catch (error) {
 					throw new RoomNotFoundError(undefined, { type, reference });
@@ -64,10 +64,10 @@ export function useOpenRoom({ type, reference }: { type: RoomType; reference: st
 				}
 			}
 
-			const { ChatRoom, ChatSubscription } = await import('../../../../app/models/client');
+			const { Rooms, Subscriptions } = await import('../../../../app/models/client');
 
-			ChatRoom.upsert({ _id: roomData._id }, { $set, $unset });
-			const room = ChatRoom.findOne({ _id: roomData._id });
+			Rooms.upsert({ _id: roomData._id }, { $set, $unset });
+			const room = Rooms.findOne({ _id: roomData._id });
 
 			if (!room) {
 				throw new TypeError('room is undefined');
@@ -95,7 +95,7 @@ export function useOpenRoom({ type, reference }: { type: RoomType; reference: st
 			}
 
 			// update user's room subscription
-			const sub = ChatSubscription.findOne({ rid: room._id });
+			const sub = Subscriptions.findOne({ rid: room._id });
 			if (sub && !sub.open) {
 				await openRoom(room._id);
 			}
@@ -105,9 +105,9 @@ export function useOpenRoom({ type, reference }: { type: RoomType; reference: st
 			retry: 0,
 			onError: async (error) => {
 				if (['l', 'v'].includes(type) && error instanceof RoomNotFoundError) {
-					const { ChatRoom } = await import('../../../../app/models/client');
+					const { Rooms } = await import('../../../../app/models/client');
 
-					ChatRoom.remove(reference);
+					Rooms.remove(reference);
 					queryClient.removeQueries(['rooms', reference]);
 					queryClient.removeQueries(['/v1/rooms.info', reference]);
 				}
diff --git a/apps/meteor/client/views/room/hooks/useRetentionPolicy.spec.ts b/apps/meteor/client/views/room/hooks/useRetentionPolicy.spec.ts
index b5d9079c9cab..49ae90c0eb47 100644
--- a/apps/meteor/client/views/room/hooks/useRetentionPolicy.spec.ts
+++ b/apps/meteor/client/views/room/hooks/useRetentionPolicy.spec.ts
@@ -1,8 +1,8 @@
 import { mockAppRoot } from '@rocket.chat/mock-providers';
 import { renderHook } from '@testing-library/react';
 
-import { createFakeRoom } from '../../../../tests/mocks/data';
 import { useRetentionPolicy } from './useRetentionPolicy';
+import { createFakeRoom } from '../../../../tests/mocks/data';
 
 const getGlobalSettings = ({
 	enabled = false,
diff --git a/apps/meteor/client/views/room/hooks/useRetentionPolicy.ts b/apps/meteor/client/views/room/hooks/useRetentionPolicy.ts
index 076ad13c5a0f..d345cb20d060 100644
--- a/apps/meteor/client/views/room/hooks/useRetentionPolicy.ts
+++ b/apps/meteor/client/views/room/hooks/useRetentionPolicy.ts
@@ -97,16 +97,16 @@ export const useRetentionPolicy = (
 	  }
 	| undefined => {
 	const settings = {
-		enabled: useSetting('RetentionPolicy_Enabled') as boolean,
-		filesOnly: useSetting('RetentionPolicy_FilesOnly') as boolean,
-		doNotPrunePinned: useSetting('RetentionPolicy_DoNotPrunePinned') as boolean,
-		ignoreThreads: useSetting('RetentionPolicy_DoNotPruneThreads') as boolean,
-		appliesToChannels: useSetting('RetentionPolicy_AppliesToChannels') as boolean,
-		maxAgeChannels: useSetting('RetentionPolicy_TTL_Channels') as number,
-		appliesToGroups: useSetting('RetentionPolicy_AppliesToGroups') as boolean,
-		maxAgeGroups: useSetting('RetentionPolicy_TTL_Groups') as number,
-		appliesToDMs: useSetting('RetentionPolicy_AppliesToDMs') as boolean,
-		maxAgeDMs: useSetting('RetentionPolicy_TTL_DMs') as number,
+		enabled: useSetting('RetentionPolicy_Enabled', false),
+		filesOnly: useSetting('RetentionPolicy_FilesOnly', false),
+		doNotPrunePinned: useSetting('RetentionPolicy_DoNotPrunePinned', false),
+		ignoreThreads: useSetting('RetentionPolicy_DoNotPruneThreads', true),
+		appliesToChannels: useSetting('RetentionPolicy_AppliesToChannels', false),
+		maxAgeChannels: useSetting('RetentionPolicy_TTL_Channels', 2592000000),
+		appliesToGroups: useSetting('RetentionPolicy_AppliesToGroups', false),
+		maxAgeGroups: useSetting('RetentionPolicy_TTL_Groups', 2592000000),
+		appliesToDMs: useSetting('RetentionPolicy_AppliesToDMs', false),
+		maxAgeDMs: useSetting('RetentionPolicy_TTL_DMs', 2592000000),
 	} as const;
 
 	if (!room) {
diff --git a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useAddUserAction.tsx b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useAddUserAction.tsx
index 42388b100d41..2047127eb66e 100644
--- a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useAddUserAction.tsx
+++ b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useAddUserAction.tsx
@@ -86,7 +86,7 @@ export const useAddUserAction = (
 						icon: 'user-plus' as const,
 						onClick: addUserOptionAction,
 						type: 'management' as const,
-				  }
+					}
 				: undefined,
 		[roomCanInvite, userCanAdd, room.archived, t, addUserOptionAction],
 	);
diff --git a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useBlockUserAction.ts b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useBlockUserAction.ts
index 216ff4e10216..a1b5091327ad 100644
--- a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useBlockUserAction.ts
+++ b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useBlockUserAction.ts
@@ -42,7 +42,7 @@ export const useBlockUserAction = (user: Pick<IUser, '_id' | 'username'>, rid: I
 						content: t(isUserBlocked ? 'Unblock' : 'Block'),
 						icon: 'ban' as const,
 						onClick: toggleBlockUserAction,
-				  }
+					}
 				: undefined,
 		[isUserBlocked, ownUserId, roomCanBlock, t, toggleBlockUserAction, uid],
 	);
diff --git a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useChangeLeaderAction.ts b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useChangeLeaderAction.ts
index 2177f8a66f7a..f97ae7dab10b 100644
--- a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useChangeLeaderAction.ts
+++ b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useChangeLeaderAction.ts
@@ -37,7 +37,7 @@ export const useChangeLeaderAction = (user: Pick<IUser, '_id' | 'username'>, rid
 						icon: 'shield-alt' as const,
 						onClick: changeLeaderAction,
 						type: 'privileges' as UserInfoActionType,
-				  }
+					}
 				: undefined,
 		[isLeader, roomCanSetLeader, t, userCanSetLeader, changeLeaderAction],
 	);
diff --git a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useChangeModeratorAction.tsx b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useChangeModeratorAction.tsx
index f3043f0ddcec..095695b160c1 100644
--- a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useChangeModeratorAction.tsx
+++ b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useChangeModeratorAction.tsx
@@ -125,7 +125,7 @@ export const useChangeModeratorAction = (user: Pick<IUser, '_id' | 'username'>,
 						icon: 'shield-blank' as const,
 						onClick: changeModeratorAction,
 						type: 'privileges' as UserInfoActionType,
-				  }
+					}
 				: undefined,
 		[changeModeratorAction, isModerator, roomCanSetModerator, t, userCanSetModerator, room],
 	);
diff --git a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useChangeOwnerAction.tsx b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useChangeOwnerAction.tsx
index ac336e8bbd44..5894138d87f4 100644
--- a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useChangeOwnerAction.tsx
+++ b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useChangeOwnerAction.tsx
@@ -108,7 +108,7 @@ export const useChangeOwnerAction = (user: Pick<IUser, '_id' | 'username'>, rid:
 						icon: 'shield-check' as const,
 						onClick: changeOwnerAction,
 						type: 'privileges' as UserInfoActionType,
-				  }
+					}
 				: undefined,
 		[changeOwnerAction, roomCanSetOwner, userCanSetOwner, isOwner, t, room],
 	);
diff --git a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useDirectMessageAction.ts b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useDirectMessageAction.ts
index 5ca51e2abe43..b4efb0fe543b 100644
--- a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useDirectMessageAction.ts
+++ b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useDirectMessageAction.ts
@@ -46,7 +46,7 @@ export const useDirectMessageAction = (user: Pick<IUser, '_id' | 'username'>, ri
 						icon: 'balloon' as const,
 						onClick: openDirectMessage,
 						type: 'communication' as UserInfoActionType,
-				  }
+					}
 				: undefined,
 		[openDirectMessage, shouldOpenDirectMessage, t],
 	);
diff --git a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useIgnoreUserAction.ts b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useIgnoreUserAction.ts
index 5b0a55648cbd..cf2192a1fa56 100644
--- a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useIgnoreUserAction.ts
+++ b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useIgnoreUserAction.ts
@@ -51,7 +51,7 @@ export const useIgnoreUserAction = (user: Pick<IUser, '_id' | 'username'>, rid:
 						icon: 'ban' as const,
 						onClick: ignoreUserAction,
 						type: 'management' as UserInfoActionType,
-				  }
+					}
 				: undefined,
 		[ignoreUserAction, isIgnored, ownUserId, roomCanIgnore, t, uid],
 	);
diff --git a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useMuteUserAction.tsx b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useMuteUserAction.tsx
index c06cba609d15..0105768bd681 100644
--- a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useMuteUserAction.tsx
+++ b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useMuteUserAction.tsx
@@ -105,7 +105,7 @@ export const useMuteUserAction = (user: Pick<IUser, '_id' | 'username'>, rid: IR
 					icon: isMuted ? ('mic' as const) : ('mic-off' as const),
 					onClick: action,
 					type: 'management' as UserInfoActionType,
-			  }
+				}
 			: undefined;
 	}, [
 		closeModal,
diff --git a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useRedirectModerationConsole.ts b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useRedirectModerationConsole.ts
index 3a46a5310c1b..4a1a73034726 100644
--- a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useRedirectModerationConsole.ts
+++ b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useRedirectModerationConsole.ts
@@ -1,10 +1,11 @@
 import type { IUser } from '@rocket.chat/core-typings';
-import { usePermission, useRoute, useTranslation } from '@rocket.chat/ui-contexts';
+import { usePermission, useRoute } from '@rocket.chat/ui-contexts';
+import { useTranslation } from 'react-i18next';
 
 import type { UserInfoAction, UserInfoActionType } from '../useUserInfoActions';
 
 export const useRedirectModerationConsole = (uid: IUser['_id']): UserInfoAction | undefined => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const hasPermissionToView = usePermission('view-moderation-console');
 	const router = useRoute('moderation-console');
 
diff --git a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useRemoveUserAction.tsx b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useRemoveUserAction.tsx
index 81633139d5e9..81ebbb0d1378 100644
--- a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useRemoveUserAction.tsx
+++ b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useRemoveUserAction.tsx
@@ -97,7 +97,7 @@ export const useRemoveUserAction = (
 						onClick: removeUserOptionAction,
 						type: 'moderation' as const,
 						variant: 'danger' as const,
-				  }
+					}
 				: undefined,
 		[room, roomCanRemove, userCanRemove, removeUserOptionAction, t],
 	);
diff --git a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useReportUser.tsx b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useReportUser.tsx
index 0c2314431db3..91acf1a874ef 100644
--- a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useReportUser.tsx
+++ b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useReportUser.tsx
@@ -48,7 +48,7 @@ export const useReportUser = (user: Pick<IUser, '_id' | 'username' | 'name'>): U
 					onClick: action,
 					type: 'moderation' as const,
 					variant: 'danger' as const,
-			  }
+				}
 			: undefined;
 	}, [ownUserId, uid, t, setModal, username, reportUserMutation.mutate, displayName]);
 
diff --git a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useVideoCallAction.tsx b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useVideoCallAction.tsx
index 8b3f0e5307b5..18af1650e2c4 100644
--- a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useVideoCallAction.tsx
+++ b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useVideoCallAction.tsx
@@ -48,7 +48,7 @@ export const useVideoCallAction = (user: Pick<IUser, '_id' | 'username'>): UserI
 					title: t('Video_call'),
 					icon: 'video',
 					onClick: action,
-			  }
+				}
 			: undefined;
 	}, [
 		room,
diff --git a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useVoipCallAction.tsx b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useVoipCallAction.tsx
index da02cf26e560..9684c2065d29 100644
--- a/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useVoipCallAction.tsx
+++ b/apps/meteor/client/views/room/hooks/useUserInfoActions/actions/useVoipCallAction.tsx
@@ -35,7 +35,7 @@ export const useVoipCallAction = (user: Pick<IUser, '_id' | 'username' | 'freeSw
 					icon: 'phone',
 					disabled,
 					onClick: handleClick,
-			  }
+				}
 			: undefined;
 	}, [closeUserCard, disabled, isEnabled, isSameUser, makeCall, t, user?.freeSwitchExtension]);
 
diff --git a/apps/meteor/client/views/room/hooks/useUserInfoActions/useUserInfoActions.ts b/apps/meteor/client/views/room/hooks/useUserInfoActions/useUserInfoActions.ts
index 90dbfbbaba4c..be78886ee399 100644
--- a/apps/meteor/client/views/room/hooks/useUserInfoActions/useUserInfoActions.ts
+++ b/apps/meteor/client/views/room/hooks/useUserInfoActions/useUserInfoActions.ts
@@ -5,7 +5,6 @@ import { useLayoutHiddenActions } from '@rocket.chat/ui-contexts';
 import type { ComponentProps } from 'react';
 import { useMemo } from 'react';
 
-import { useEmbeddedLayout } from '../../../../hooks/useEmbeddedLayout';
 import { useAddUserAction } from './actions/useAddUserAction';
 import { useBlockUserAction } from './actions/useBlockUserAction';
 import { useChangeLeaderAction } from './actions/useChangeLeaderAction';
@@ -19,6 +18,7 @@ import { useRemoveUserAction } from './actions/useRemoveUserAction';
 import { useReportUser } from './actions/useReportUser';
 import { useVideoCallAction } from './actions/useVideoCallAction';
 import { useVoipCallAction } from './actions/useVoipCallAction';
+import { useEmbeddedLayout } from '../../../../hooks/useEmbeddedLayout';
 
 export type UserInfoActionType = 'communication' | 'privileges' | 'management' | 'moderation';
 
diff --git a/apps/meteor/client/views/room/modals/FileUploadModal/FilePreview.tsx b/apps/meteor/client/views/room/modals/FileUploadModal/FilePreview.tsx
index c898c8b0081d..757efd246829 100644
--- a/apps/meteor/client/views/room/modals/FileUploadModal/FilePreview.tsx
+++ b/apps/meteor/client/views/room/modals/FileUploadModal/FilePreview.tsx
@@ -1,9 +1,9 @@
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import { isIE11 } from '../../../../lib/utils/isIE11';
 import GenericPreview from './GenericPreview';
 import MediaPreview from './MediaPreview';
+import { isIE11 } from '../../../../lib/utils/isIE11';
 
 export enum FilePreviewType {
 	IMAGE = 'image',
diff --git a/apps/meteor/client/views/room/modals/FileUploadModal/FileUploadModal.spec.tsx b/apps/meteor/client/views/room/modals/FileUploadModal/FileUploadModal.spec.tsx
new file mode 100644
index 000000000000..caec7c6d3fb0
--- /dev/null
+++ b/apps/meteor/client/views/room/modals/FileUploadModal/FileUploadModal.spec.tsx
@@ -0,0 +1,37 @@
+import { mockAppRoot } from '@rocket.chat/mock-providers';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import React from 'react';
+
+import FileUploadModal from './FileUploadModal';
+
+const defaultProps = {
+	onClose: () => undefined,
+	file: new File([], 'testing.png'),
+	fileName: 'Testing',
+	fileDescription: '',
+	onSubmit: () => undefined,
+	invalidContentType: false,
+	showDescription: true,
+};
+
+it('should show Undo request button when roomOpen is true and transcriptRequest exist', async () => {
+	render(<FileUploadModal {...defaultProps} />, {
+		legacyRoot: true,
+		wrapper: mockAppRoot()
+			.withTranslations('en', 'core', {
+				Cannot_upload_file_character_limit: 'Cannot upload file, description is over the {{count}} character limit',
+				Send: 'Send',
+				Upload_file_description: 'File description',
+			})
+			.withSetting('Message_MaxAllowedSize', 10)
+			.build(),
+	});
+
+	const input = await screen.findByRole('textbox', { name: 'File description' });
+	expect(input).toBeInTheDocument();
+	await userEvent.type(input, '12345678910');
+	await userEvent.tab();
+
+	expect(screen.getByText('Cannot upload file, description is over the 10 character limit')).toBeInTheDocument();
+});
diff --git a/apps/meteor/client/views/room/modals/FileUploadModal/FileUploadModal.tsx b/apps/meteor/client/views/room/modals/FileUploadModal/FileUploadModal.tsx
index 23135d9b961e..16a7891cf982 100644
--- a/apps/meteor/client/views/room/modals/FileUploadModal/FileUploadModal.tsx
+++ b/apps/meteor/client/views/room/modals/FileUploadModal/FileUploadModal.tsx
@@ -1,9 +1,10 @@
 import { Modal, Box, Field, FieldGroup, FieldLabel, FieldRow, FieldError, TextInput, Button } from '@rocket.chat/fuselage';
-import { useAutoFocus } from '@rocket.chat/fuselage-hooks';
+import { useUniqueId } from '@rocket.chat/fuselage-hooks';
 import { useToastMessageDispatch, useTranslation, useSetting } from '@rocket.chat/ui-contexts';
 import fileSize from 'filesize';
-import type { ReactElement, ChangeEvent, FormEventHandler, ComponentProps } from 'react';
-import React, { memo, useState, useEffect } from 'react';
+import type { ReactElement, ComponentProps } from 'react';
+import React, { memo, useEffect } from 'react';
+import { useForm } from 'react-hook-form';
 
 import FilePreview from './FilePreview';
 
@@ -26,31 +27,21 @@ const FileUploadModal = ({
 	invalidContentType,
 	showDescription = true,
 }: FileUploadModalProps): ReactElement => {
-	const [name, setName] = useState<string>(fileName);
-	const [description, setDescription] = useState<string>(fileDescription || '');
+	const {
+		register,
+		handleSubmit,
+		formState: { errors, isSubmitting },
+	} = useForm({ mode: 'onBlur', defaultValues: { name: fileName, description: fileDescription } });
+
 	const t = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
-	const maxFileSize = useSetting('FileUpload_MaxFileSize') as number;
-
-	const ref = useAutoFocus<HTMLInputElement>();
-
-	const handleName = (e: ChangeEvent<HTMLInputElement>): void => {
-		setName(e.currentTarget.value);
-	};
+	const maxMsgSize = useSetting('Message_MaxAllowedSize', 5000);
+	const maxFileSize = useSetting('FileUpload_MaxFileSize', 104857600);
 
-	const handleDescription = (e: ChangeEvent<HTMLInputElement>): void => {
-		setDescription(e.currentTarget.value);
-	};
-
-	const handleSubmit: FormEventHandler<HTMLFormElement> = (e): void => {
-		e.preventDefault();
-		if (!name) {
-			return dispatchToastMessage({
-				type: 'error',
-				message: t('Required_field', { field: t('Upload_file_name') }),
-			});
-		}
+	const isDescriptionValid = (description: string) =>
+		description.length >= maxMsgSize ? t('Cannot_upload_file_character_limit', { count: maxMsgSize }) : true;
 
+	const submit = ({ name, description }: { name: string; description?: string }): void => {
 		// -1 maxFileSize means there is no limit
 		if (maxFileSize > -1 && (file.size || 0) > maxFileSize) {
 			onClose();
@@ -82,12 +73,21 @@ const FileUploadModal = ({
 		}
 	}, [file, dispatchToastMessage, invalidContentType, t, onClose]);
 
+	const fileUploadFormId = useUniqueId();
+	const fileNameField = useUniqueId();
+	const fileDescriptionField = useUniqueId();
+
 	return (
-		<Modal wrapperFunction={(props: ComponentProps<typeof Box>) => <Box is='form' onSubmit={handleSubmit} {...props} />}>
+		<Modal
+			aria-labelledby={`${fileUploadFormId}-title`}
+			wrapperFunction={(props: ComponentProps<typeof Box>) => (
+				<Box is='form' id={fileUploadFormId} onSubmit={handleSubmit(submit)} {...props} />
+			)}
+		>
 			<Box display='flex' flexDirection='column' height='100%'>
 				<Modal.Header>
-					<Modal.Title>{t('FileUpload')}</Modal.Title>
-					<Modal.Close onClick={onClose} />
+					<Modal.Title id={`${fileUploadFormId}-title`}>{t('FileUpload')}</Modal.Title>
+					<Modal.Close tabIndex={-1} onClick={onClose} />
 				</Modal.Header>
 				<Modal.Content>
 					<Box display='flex' maxHeight='x360' w='full' justifyContent='center' alignContent='center' mbe={16}>
@@ -95,18 +95,36 @@ const FileUploadModal = ({
 					</Box>
 					<FieldGroup>
 						<Field>
-							<FieldLabel>{t('Upload_file_name')}</FieldLabel>
+							<FieldLabel htmlFor={fileNameField}>{t('Upload_file_name')}</FieldLabel>
 							<FieldRow>
-								<TextInput value={name} onChange={handleName} />
+								<TextInput
+									id={fileNameField}
+									{...register('name', {
+										required: t('error-the-field-is-required', { field: t('Upload_file_name') }),
+									})}
+									error={errors.name?.message}
+									aria-invalid={errors.name ? 'true' : 'false'}
+									aria-describedby={`${fileNameField}-error`}
+									aria-required='true'
+								/>
 							</FieldRow>
-							{!name && <FieldError>{t('Required_field', { field: t('Upload_file_name') })}</FieldError>}
+							{errors.name && <FieldError id={`${fileNameField}-error`}>{errors.name.message}</FieldError>}
 						</Field>
 						{showDescription && (
 							<Field>
-								<FieldLabel>{t('Upload_file_description')}</FieldLabel>
+								<FieldLabel htmlFor={fileDescriptionField}>{t('Upload_file_description')}</FieldLabel>
 								<FieldRow>
-									<TextInput value={description} onChange={handleDescription} placeholder={t('Description')} ref={ref} />
+									<TextInput
+										id={fileDescriptionField}
+										{...register('description', {
+											validate: (value) => isDescriptionValid(value || ''),
+										})}
+										error={errors.description?.message}
+										aria-invalid={errors.description ? 'true' : 'false'}
+										aria-describedby={`${fileDescriptionField}-error`}
+									/>
 								</FieldRow>
+								{errors.description && <FieldError id={`${fileDescriptionField}-error`}>{errors.description.message}</FieldError>}
 							</Field>
 						)}
 					</FieldGroup>
@@ -116,7 +134,7 @@ const FileUploadModal = ({
 						<Button secondary onClick={onClose}>
 							{t('Cancel')}
 						</Button>
-						<Button primary type='submit'>
+						<Button primary type='submit' loading={isSubmitting}>
 							{t('Send')}
 						</Button>
 					</Modal.FooterControllers>
diff --git a/apps/meteor/client/views/room/modals/FileUploadModal/MediaPreview.tsx b/apps/meteor/client/views/room/modals/FileUploadModal/MediaPreview.tsx
index ff96e220723a..05be2381f32a 100644
--- a/apps/meteor/client/views/room/modals/FileUploadModal/MediaPreview.tsx
+++ b/apps/meteor/client/views/room/modals/FileUploadModal/MediaPreview.tsx
@@ -3,10 +3,10 @@ import type { ReactElement } from 'react';
 import React, { useEffect, useState, memo } from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { userAgentMIMETypeFallback } from '../../../../lib/utils/userAgentMIMETypeFallback';
 import { FilePreviewType } from './FilePreview';
 import ImagePreview from './ImagePreview';
 import PreviewSkeleton from './PreviewSkeleton';
+import { userAgentMIMETypeFallback } from '../../../../lib/utils/userAgentMIMETypeFallback';
 
 type ReaderOnloadCallback = (url: FileReader['result']) => void;
 
diff --git a/apps/meteor/client/views/room/modals/ReactionListModal/ReactionListModal.tsx b/apps/meteor/client/views/room/modals/ReactionListModal/ReactionListModal.tsx
index cd309923ffd4..18e7a60d5863 100644
--- a/apps/meteor/client/views/room/modals/ReactionListModal/ReactionListModal.tsx
+++ b/apps/meteor/client/views/room/modals/ReactionListModal/ReactionListModal.tsx
@@ -3,8 +3,8 @@ import type { ReactElement } from 'react';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
-import GenericModal from '../../../../components/GenericModal';
 import Reactions from './Reactions';
+import GenericModal from '../../../../components/GenericModal';
 
 type ReactionListModalProps = {
 	reactions: Required<IMessage>['reactions'];
diff --git a/apps/meteor/client/views/room/modals/ReactionListModal/Reactions.tsx b/apps/meteor/client/views/room/modals/ReactionListModal/Reactions.tsx
index 1e4d997bdfbc..d266dce22d18 100644
--- a/apps/meteor/client/views/room/modals/ReactionListModal/Reactions.tsx
+++ b/apps/meteor/client/views/room/modals/ReactionListModal/Reactions.tsx
@@ -4,8 +4,8 @@ import { useSetting } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import Emoji from '../../../../components/Emoji';
 import ReactionUserTag from './ReactionUserTag';
+import Emoji from '../../../../components/Emoji';
 
 const Reactions = ({ reactions }: { reactions: Required<IMessage>['reactions'] }): ReactElement => {
 	const useRealName = useSetting('UI_Use_Real_Name');
diff --git a/apps/meteor/client/views/room/modals/ReadReceiptsModal/ReadReceiptsModal.tsx b/apps/meteor/client/views/room/modals/ReadReceiptsModal/ReadReceiptsModal.tsx
index ca033c2dcb0d..f07f98cdcd47 100644
--- a/apps/meteor/client/views/room/modals/ReadReceiptsModal/ReadReceiptsModal.tsx
+++ b/apps/meteor/client/views/room/modals/ReadReceiptsModal/ReadReceiptsModal.tsx
@@ -1,12 +1,13 @@
 import type { IMessage, ReadReceipt } from '@rocket.chat/core-typings';
-import { useMethod, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useMethod, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import { useQuery } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React, { useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 
+import ReadReceiptRow from './ReadReceiptRow';
 import GenericModal from '../../../../components/GenericModal';
 import GenericModalSkeleton from '../../../../components/GenericModal/GenericModalSkeleton';
-import ReadReceiptRow from './ReadReceiptRow';
 
 type ReadReceiptsModalProps = {
 	messageId: IMessage['_id'];
@@ -14,7 +15,7 @@ type ReadReceiptsModalProps = {
 };
 
 const ReadReceiptsModal = ({ messageId, onClose }: ReadReceiptsModalProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 
 	const getReadReceipts = useMethod('getReadReceipts');
@@ -40,7 +41,7 @@ const ReadReceiptsModal = ({ messageId, onClose }: ReadReceiptsModalProps): Reac
 			{readReceipts.length > 0 && (
 				<div role='list'>
 					{readReceipts.map((receipt) => (
-						<ReadReceiptRow {...receipt} key={receipt._id} />
+						<ReadReceiptRow key={receipt._id} {...receipt} />
 					))}
 				</div>
 			)}
diff --git a/apps/meteor/client/views/room/providers/ComposerPopupProvider.tsx b/apps/meteor/client/views/room/providers/ComposerPopupProvider.tsx
index 245a2a0112f3..6246cb92b69f 100644
--- a/apps/meteor/client/views/room/providers/ComposerPopupProvider.tsx
+++ b/apps/meteor/client/views/room/providers/ComposerPopupProvider.tsx
@@ -2,9 +2,10 @@ import type { IRoom } from '@rocket.chat/core-typings';
 import { isOmnichannelRoom } from '@rocket.chat/core-typings';
 import { useLocalStorage } from '@rocket.chat/fuselage-hooks';
 import { escapeRegExp } from '@rocket.chat/string-helpers';
-import { useMethod, useSetting, useTranslation, useUserPreference } from '@rocket.chat/ui-contexts';
+import { useMethod, useSetting, useUserPreference } from '@rocket.chat/ui-contexts';
 import React, { useMemo } from 'react';
 import type { ReactNode } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import { hasAtLeastOnePermission } from '../../../../app/authorization/client';
 import { CannedResponse } from '../../../../app/canned-responses/client/collections/CannedResponse';
@@ -24,17 +25,22 @@ import type { ComposerBoxPopupUserProps } from '../composer/ComposerBoxPopupUser
 import type { ComposerPopupContextValue } from '../contexts/ComposerPopupContext';
 import { ComposerPopupContext, createMessageBoxPopupConfig } from '../contexts/ComposerPopupContext';
 
-const ComposerPopupProvider = ({ children, room }: { children: ReactNode; room: IRoom }) => {
+type ComposerPopupProviderProps = {
+	children: ReactNode;
+	room: IRoom;
+};
+
+const ComposerPopupProvider = ({ children, room }: ComposerPopupProviderProps) => {
 	const { _id: rid, encrypted: isRoomEncrypted } = room;
 	const userSpotlight = useMethod('spotlight');
-	const suggestionsCount = useSetting<number>('Number_of_users_autocomplete_suggestions');
-	const cannedResponseEnabled = useSetting<boolean>('Canned_Responses_Enable');
+	const suggestionsCount = useSetting('Number_of_users_autocomplete_suggestions', 5);
+	const cannedResponseEnabled = useSetting('Canned_Responses_Enable', true);
 	const [recentEmojis] = useLocalStorage('emoji.recent', []);
 	const isOmnichannel = isOmnichannelRoom(room);
 	const useEmoji = useUserPreference('useEmojis');
-	const t = useTranslation();
-	const e2eEnabled = useSetting<boolean>('E2E_Enable');
-	const unencryptedMessagesAllowed = useSetting<boolean>('E2E_Allow_Unencrypted_Messages');
+	const { t, i18n } = useTranslation();
+	const e2eEnabled = useSetting('E2E_Enable', false);
+	const unencryptedMessagesAllowed = useSetting('E2E_Allow_Unencrypted_Messages', false);
 	const encrypted = isRoomEncrypted && e2eEnabled && !unencryptedMessagesAllowed;
 
 	const call = useMethod('getSlashCommandPreviews');
@@ -289,8 +295,8 @@ const ComposerPopupProvider = ({ children, room }: { children: ReactNode; room:
 							const item = slashCommands.commands[command];
 							return {
 								_id: command,
-								params: item.params && t.has(item.params) ? t(item.params) : item.params ?? '',
-								description: item.description && t.has(item.description) ? t(item.description) : item.description,
+								params: item.params && i18n.exists(item.params) ? t(item.params) : (item.params ?? ''),
+								description: item.description && i18n.exists(item.description) ? t(item.description) : item.description,
 								permission: item.permission,
 								...(encrypted && { disabled: encrypted }),
 							};
@@ -365,7 +371,7 @@ const ComposerPopupProvider = ({ children, room }: { children: ReactNode; room:
 				},
 			}),
 		].filter(Boolean);
-	}, [t, cannedResponseEnabled, isOmnichannel, recentEmojis, suggestionsCount, userSpotlight, rid, call, useEmoji, encrypted]);
+	}, [t, i18n, cannedResponseEnabled, isOmnichannel, recentEmojis, suggestionsCount, userSpotlight, rid, call, useEmoji, encrypted]);
 
 	return <ComposerPopupContext.Provider value={value} children={children} />;
 };
diff --git a/apps/meteor/client/views/room/providers/RoomProvider.tsx b/apps/meteor/client/views/room/providers/RoomProvider.tsx
index d67c8566e3c6..7cf08bcbff2c 100644
--- a/apps/meteor/client/views/room/providers/RoomProvider.tsx
+++ b/apps/meteor/client/views/room/providers/RoomProvider.tsx
@@ -3,9 +3,15 @@ import { useRouter } from '@rocket.chat/ui-contexts';
 import type { ReactNode, ContextType, ReactElement } from 'react';
 import React, { useMemo, memo, useEffect, useCallback } from 'react';
 
-import { ChatSubscription } from '../../../../app/models/client';
-import { RoomHistoryManager } from '../../../../app/ui-utils/client';
+import ComposerPopupProvider from './ComposerPopupProvider';
+import RoomToolboxProvider from './RoomToolboxProvider';
+import UserCardProvider from './UserCardProvider';
+import { useRedirectOnSettingsChanged } from './hooks/useRedirectOnSettingsChanged';
+import { useRoomQuery } from './hooks/useRoomQuery';
+import { useUsersNameChanged } from './hooks/useUsersNameChanged';
+import { Subscriptions } from '../../../../app/models/client';
 import { UserAction } from '../../../../app/ui/client/lib/UserAction';
+import { RoomHistoryManager } from '../../../../app/ui-utils/client';
 import { useReactiveQuery } from '../../../hooks/useReactiveQuery';
 import { useReactiveValue } from '../../../hooks/useReactiveValue';
 import { useRoomInfoEndpoint } from '../../../hooks/useRoomInfoEndpoint';
@@ -18,12 +24,6 @@ import RoomSkeleton from '../RoomSkeleton';
 import { useRoomRolesManagement } from '../body/hooks/useRoomRolesManagement';
 import type { IRoomWithFederationOriginalName } from '../contexts/RoomContext';
 import { RoomContext } from '../contexts/RoomContext';
-import ComposerPopupProvider from './ComposerPopupProvider';
-import RoomToolboxProvider from './RoomToolboxProvider';
-import UserCardProvider from './UserCardProvider';
-import { useRedirectOnSettingsChanged } from './hooks/useRedirectOnSettingsChanged';
-import { useRoomQuery } from './hooks/useRoomQuery';
-import { useUsersNameChanged } from './hooks/useUsersNameChanged';
 
 type RoomProviderProps = {
 	children: ReactNode;
@@ -45,7 +45,7 @@ const RoomProvider = ({ rid, children }: RoomProviderProps): ReactElement => {
 		}
 	}, [resultFromLocal.data, resultFromLocal.isSuccess, resultFromServer, router]);
 
-	const subscriptionQuery = useReactiveQuery(['subscriptions', { rid }], () => ChatSubscription.findOne({ rid }) ?? null);
+	const subscriptionQuery = useReactiveQuery(['subscriptions', { rid }], () => Subscriptions.findOne({ rid }) ?? null);
 
 	useRedirectOnSettingsChanged(subscriptionQuery.data);
 
diff --git a/apps/meteor/client/views/room/providers/hooks/useChatMessagesInstance.spec.ts b/apps/meteor/client/views/room/providers/hooks/useChatMessagesInstance.spec.ts
index d38961b62e5b..f01fe275b304 100644
--- a/apps/meteor/client/views/room/providers/hooks/useChatMessagesInstance.spec.ts
+++ b/apps/meteor/client/views/room/providers/hooks/useChatMessagesInstance.spec.ts
@@ -3,13 +3,13 @@ import type { IActionManager } from '@rocket.chat/ui-contexts';
 import { useUserId } from '@rocket.chat/ui-contexts';
 import { renderHook } from '@testing-library/react';
 
+import { useChatMessagesInstance } from './useChatMessagesInstance';
 import { E2ERoomState } from '../../../../../app/e2e/client/E2ERoomState';
 import { ChatMessages } from '../../../../../app/ui/client/lib/ChatMessages';
 import { useEmojiPicker } from '../../../../contexts/EmojiPickerContext';
 import { useUiKitActionManager } from '../../../../uikit/hooks/useUiKitActionManager';
 import { useRoomSubscription } from '../../contexts/RoomContext';
 import { useE2EERoomState } from '../../hooks/useE2EERoomState';
-import { useChatMessagesInstance } from './useChatMessagesInstance';
 
 jest.mock('@rocket.chat/ui-contexts', () => ({
 	useUserId: jest.fn(),
diff --git a/apps/meteor/client/views/room/providers/hooks/useChatMessagesInstance.ts b/apps/meteor/client/views/room/providers/hooks/useChatMessagesInstance.ts
index 49d6070b115c..fbadf90e2947 100644
--- a/apps/meteor/client/views/room/providers/hooks/useChatMessagesInstance.ts
+++ b/apps/meteor/client/views/room/providers/hooks/useChatMessagesInstance.ts
@@ -2,13 +2,13 @@ import type { IMessage, IRoom } from '@rocket.chat/core-typings';
 import { useUserId } from '@rocket.chat/ui-contexts';
 import { useEffect } from 'react';
 
+import { useInstance } from './useInstance';
 import { ChatMessages } from '../../../../../app/ui/client/lib/ChatMessages';
 import { useEmojiPicker } from '../../../../contexts/EmojiPickerContext';
 import type { ChatAPI } from '../../../../lib/chats/ChatAPI';
 import { useUiKitActionManager } from '../../../../uikit/hooks/useUiKitActionManager';
 import { useRoomSubscription } from '../../contexts/RoomContext';
 import { useE2EERoomState } from '../../hooks/useE2EERoomState';
-import { useInstance } from './useInstance';
 
 export function useChatMessagesInstance({
 	rid,
diff --git a/apps/meteor/client/views/room/providers/hooks/useRoomQuery.ts b/apps/meteor/client/views/room/providers/hooks/useRoomQuery.ts
index 57fca52cf0d1..b808ff6da00c 100644
--- a/apps/meteor/client/views/room/providers/hooks/useRoomQuery.ts
+++ b/apps/meteor/client/views/room/providers/hooks/useRoomQuery.ts
@@ -3,7 +3,7 @@ import type { UseQueryOptions, UseQueryResult } from '@tanstack/react-query';
 import { useQuery } from '@tanstack/react-query';
 import { useEffect } from 'react';
 
-import { ChatRoom } from '../../../../../app/models/client';
+import { Rooms } from '../../../../../app/models/client';
 import { queueMicrotask } from '../../../../lib/utils/queueMicrotask';
 
 export function useRoomQuery(
@@ -12,7 +12,7 @@ export function useRoomQuery(
 ): UseQueryResult<IRoom | null, Error> {
 	const queryKey = ['rooms', rid] as const;
 
-	const queryResult = useQuery(queryKey, async (): Promise<IRoom | null> => ChatRoom.findOne({ _id: rid }, { reactive: false }) ?? null, {
+	const queryResult = useQuery(queryKey, async (): Promise<IRoom | null> => Rooms.findOne({ _id: rid }, { reactive: false }) ?? null, {
 		staleTime: Infinity,
 		...options,
 	});
@@ -20,7 +20,7 @@ export function useRoomQuery(
 	const { refetch } = queryResult;
 
 	useEffect(() => {
-		const liveQueryHandle = ChatRoom.find({ _id: rid }).observe({
+		const liveQueryHandle = Rooms.find({ _id: rid }).observe({
 			added: () => queueMicrotask(() => refetch({ exact: false })),
 			changed: () => queueMicrotask(() => refetch({ exact: false })),
 			removed: () => queueMicrotask(() => refetch({ exact: false })),
diff --git a/apps/meteor/client/views/room/webdav/AddWebdavAccountModal.tsx b/apps/meteor/client/views/room/webdav/AddWebdavAccountModal.tsx
index 63ebaecc5eb6..94de5d4380c7 100644
--- a/apps/meteor/client/views/room/webdav/AddWebdavAccountModal.tsx
+++ b/apps/meteor/client/views/room/webdav/AddWebdavAccountModal.tsx
@@ -1,10 +1,11 @@
 import type { IWebdavAccountPayload } from '@rocket.chat/core-typings';
 import { Modal, Field, FieldGroup, FieldLabel, FieldRow, FieldError, TextInput, PasswordInput, Button, Box } from '@rocket.chat/fuselage';
-import { useToastMessageDispatch, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
+import { useToastMessageDispatch, useMethod } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useState } from 'react';
 import type { SubmitHandler } from 'react-hook-form';
 import { useForm } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 type AddWebdavAccountModalPayload = IWebdavAccountPayload;
 
@@ -22,7 +23,7 @@ const AddWebdavAccountModal = ({ onClose, onConfirm }: AddWebdavAccountModalProp
 		handleSubmit,
 		formState: { errors },
 	} = useForm<AddWebdavAccountModalPayload>();
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const onSubmit: SubmitHandler<AddWebdavAccountModalPayload> = async (data) => {
 		setIsLoading(true);
diff --git a/apps/meteor/client/views/room/webdav/SaveToWebdavModal.tsx b/apps/meteor/client/views/room/webdav/SaveToWebdavModal.tsx
index e64a4e33c1bb..f2a25fa4616d 100644
--- a/apps/meteor/client/views/room/webdav/SaveToWebdavModal.tsx
+++ b/apps/meteor/client/views/room/webdav/SaveToWebdavModal.tsx
@@ -2,10 +2,11 @@ import type { MessageAttachment, IWebdavAccount } from '@rocket.chat/core-typing
 import type { SelectOption } from '@rocket.chat/fuselage';
 import { Modal, Box, Button, FieldGroup, Field, FieldLabel, FieldRow, FieldError, Select, Throbber } from '@rocket.chat/fuselage';
 import { useUniqueId } from '@rocket.chat/fuselage-hooks';
-import { useMethod, useSetting, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useMethod, useSetting, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useState, useMemo, useEffect, useRef } from 'react';
 import { useForm, Controller } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import { useWebDAVAccountIntegrationsQuery } from '../../../hooks/webdav/useWebDAVAccountIntegrationsQuery';
 import { getWebdavServerName } from '../../../lib/getWebdavServerName';
@@ -19,7 +20,7 @@ type SaveToWebdavModalProps = {
 };
 
 const SaveToWebdavModal = ({ onClose, data }: SaveToWebdavModalProps): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const [isLoading, setIsLoading] = useState(false);
 	const dispatchToastMessage = useToastMessageDispatch();
 	const uploadFileToWebdav = useMethod('uploadFileToWebdav');
diff --git a/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerGrid/WebdavFilePickerGrid.tsx b/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerGrid/WebdavFilePickerGrid.tsx
index 4f2f4123c2a3..c8e41caec1cf 100644
--- a/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerGrid/WebdavFilePickerGrid.tsx
+++ b/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerGrid/WebdavFilePickerGrid.tsx
@@ -4,9 +4,9 @@ import { Box, Icon, Skeleton, Palette } from '@rocket.chat/fuselage';
 import type { ReactElement } from 'react';
 import React from 'react';
 
+import WebdavFilePickerGridItem from './WebdavFilePickerGridItem';
 import GenericNoResults from '../../../../../components/GenericNoResults';
 import { getNodeIconType } from '../lib/getNodeIconType';
-import WebdavFilePickerGridItem from './WebdavFilePickerGridItem';
 
 type WebdavFilePickerGridProps = {
 	webdavNodes: IWebdavNode[];
diff --git a/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerModal.tsx b/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerModal.tsx
index 38895d4c211e..6dcd1a3d9120 100644
--- a/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerModal.tsx
+++ b/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerModal.tsx
@@ -6,14 +6,14 @@ import { useMethod, useToastMessageDispatch, useTranslation, useSetModal } from
 import type { ReactElement, MouseEvent } from 'react';
 import React, { useState, useEffect, useCallback } from 'react';
 
-import { fileUploadIsValidContentType } from '../../../../../app/utils/client';
-import FilterByText from '../../../../components/FilterByText';
-import { useSort } from '../../../../components/GenericTable/hooks/useSort';
-import FileUploadModal from '../../modals/FileUploadModal';
 import FilePickerBreadcrumbs from './FilePickerBreadcrumbs';
 import WebdavFilePickerGrid from './WebdavFilePickerGrid';
 import WebdavFilePickerTable from './WebdavFilePickerTable';
 import { sortWebdavNodes } from './lib/sortWebdavNodes';
+import { fileUploadIsValidContentType } from '../../../../../app/utils/client';
+import FilterByText from '../../../../components/FilterByText';
+import { useSort } from '../../../../components/GenericTable/hooks/useSort';
+import FileUploadModal from '../../modals/FileUploadModal';
 
 export type WebdavSortOptions = 'name' | 'size' | 'dataModified';
 
@@ -36,7 +36,7 @@ const WebdavFilePickerModal = ({ onUpload, onClose, account }: WebdavFilePickerM
 	const [parentFolders, setParentFolders] = useState<string[]>([]);
 	const [webdavNodes, setWebdavNodes] = useState<IWebdavNode[]>([]);
 	const [filterText, setFilterText] = useState('');
-	const debouncedFilter = useDebouncedValue(filterText, 500);
+	const debouncedFilter = useDebouncedValue('', 500);
 	const [isLoading, setIsLoading] = useState(false);
 
 	const showFilePreviews = useMutableCallback(async (accountId, nodes) => {
@@ -196,7 +196,7 @@ const WebdavFilePickerModal = ({ onUpload, onClose, account }: WebdavFilePickerM
 					</Box>
 				</Box>
 				<Box display='flex' flexDirection='column'>
-					<FilterByText onChange={setFilterText}>
+					<FilterByText value={filterText} onChange={(event) => setFilterText(event.target.value)}>
 						{typeView === 'grid' && (
 							<Select value={sortBy} onChange={(value): void => handleSort(value as WebdavSortOptions)} options={options} />
 						)}
diff --git a/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerTable.tsx b/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerTable.tsx
index 32b379eca432..72140fe00738 100644
--- a/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerTable.tsx
+++ b/apps/meteor/client/views/room/webdav/WebdavFilePickerModal/WebdavFilePickerTable.tsx
@@ -4,6 +4,9 @@ import type { ReactElement } from 'react';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
+import type { WebdavSortOptions } from './WebdavFilePickerModal';
+import { getNodeFileSize } from './lib/getNodeFileSize';
+import { getNodeIconType } from './lib/getNodeIconType';
 import GenericNoResults from '../../../../components/GenericNoResults';
 import {
 	GenericTable,
@@ -15,9 +18,6 @@ import {
 	GenericTableRow,
 } from '../../../../components/GenericTable';
 import { timeAgo } from '../../../../lib/utils/timeAgo';
-import type { WebdavSortOptions } from './WebdavFilePickerModal';
-import { getNodeFileSize } from './lib/getNodeFileSize';
-import { getNodeIconType } from './lib/getNodeIconType';
 
 type WebdavFilePickerTableProps = {
 	webdavNodes: IWebdavNode[];
diff --git a/apps/meteor/client/views/root/AppLayout.tsx b/apps/meteor/client/views/root/AppLayout.tsx
index 68b1c0ec155d..20c117739d39 100644
--- a/apps/meteor/client/views/root/AppLayout.tsx
+++ b/apps/meteor/client/views/root/AppLayout.tsx
@@ -1,14 +1,16 @@
 import React, { useEffect, Suspense } from 'react';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
 
-import { useAnalytics } from '../../../app/analytics/client/loadScript';
-import { useAnalyticsEventTracking } from '../../hooks/useAnalyticsEventTracking';
-import { appLayout } from '../../lib/appLayout';
 import DocumentTitleWrapper from './DocumentTitleWrapper';
 import PageLoading from './PageLoading';
 import { useEscapeKeyStroke } from './hooks/useEscapeKeyStroke';
 import { useGoogleTagManager } from './hooks/useGoogleTagManager';
 import { useMessageLinkClicks } from './hooks/useMessageLinkClicks';
+import { useAnalytics } from '../../../app/analytics/client/loadScript';
+import { useAnalyticsEventTracking } from '../../hooks/useAnalyticsEventTracking';
+import { useLoadRoomForAllowedAnonymousRead } from '../../hooks/useLoadRoomForAllowedAnonymousRead';
+import { useNotifyUser } from '../../hooks/useNotifyUser';
+import { appLayout } from '../../lib/appLayout';
 
 const AppLayout = () => {
 	useEffect(() => {
@@ -24,6 +26,8 @@ const AppLayout = () => {
 	useAnalytics();
 	useEscapeKeyStroke();
 	useAnalyticsEventTracking();
+	useLoadRoomForAllowedAnonymousRead();
+	useNotifyUser();
 
 	const layout = useSyncExternalStore(appLayout.subscribe, appLayout.getSnapshot);
 
diff --git a/apps/meteor/client/views/root/AppRoot.tsx b/apps/meteor/client/views/root/AppRoot.tsx
index dfb2de8d7264..759b6266865e 100644
--- a/apps/meteor/client/views/root/AppRoot.tsx
+++ b/apps/meteor/client/views/root/AppRoot.tsx
@@ -3,9 +3,9 @@ import type { ReactElement } from 'react';
 import React, { lazy, Suspense } from 'react';
 import { createPortal } from 'react-dom';
 
-import { queryClient } from '../../lib/queryClient';
 import OutermostErrorBoundary from './OutermostErrorBoundary';
 import PageLoading from './PageLoading';
+import { queryClient } from '../../lib/queryClient';
 
 const MeteorProvider = lazy(() => import('../../providers/MeteorProvider'));
 const AppLayout = lazy(() => import('./AppLayout'));
diff --git a/apps/meteor/client/views/root/DocumentTitleWrapper.tsx b/apps/meteor/client/views/root/DocumentTitleWrapper.tsx
index 002be6962138..2efc934230bc 100644
--- a/apps/meteor/client/views/root/DocumentTitleWrapper.tsx
+++ b/apps/meteor/client/views/root/DocumentTitleWrapper.tsx
@@ -22,7 +22,7 @@ type DocumentTitleWrapperProps = {
 };
 
 const DocumentTitleWrapper = ({ children }: DocumentTitleWrapperProps) => {
-	useDocumentTitle(useSetting<string>('Site_Name') || '', false);
+	useDocumentTitle(useSetting('Site_Name', ''), false);
 	const { title, key } = useDocumentTitle(useUnreadMessages(), false);
 
 	const refocusRef = useRouteTitleFocus();
diff --git a/apps/meteor/client/views/root/MainLayout/AccessibilityShortcut.tsx b/apps/meteor/client/views/root/MainLayout/AccessibilityShortcut.tsx
index f82f5d96ec3b..2656cb22d347 100644
--- a/apps/meteor/client/views/root/MainLayout/AccessibilityShortcut.tsx
+++ b/apps/meteor/client/views/root/MainLayout/AccessibilityShortcut.tsx
@@ -1,10 +1,11 @@
 import { css } from '@rocket.chat/css-in-js';
 import { Button } from '@rocket.chat/fuselage';
-import { useRouter, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRouter } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 const AccessibilityShortcut = () => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const router = useRouter();
 	const currentRoutePath = router.getLocationPathname();
 
diff --git a/apps/meteor/client/views/root/MainLayout/LayoutWithSidebar.tsx b/apps/meteor/client/views/root/MainLayout/LayoutWithSidebar.tsx
index 0fb26c0cbc22..9bcc489d5f8f 100644
--- a/apps/meteor/client/views/root/MainLayout/LayoutWithSidebar.tsx
+++ b/apps/meteor/client/views/root/MainLayout/LayoutWithSidebar.tsx
@@ -3,9 +3,9 @@ import { useLayout, useSetting, useCurrentModal, useRoute, useCurrentRoutePath }
 import type { ReactElement, ReactNode } from 'react';
 import React, { useEffect, useRef } from 'react';
 
-import Sidebar from '../../../sidebar';
 import AccessibilityShortcut from './AccessibilityShortcut';
 import { MainLayoutStyleTags } from './MainLayoutStyleTags';
+import Sidebar from '../../../sidebar';
 
 const LayoutWithSidebar = ({ children }: { children: ReactNode }): ReactElement => {
 	const { isEmbedded: embeddedLayout } = useLayout();
@@ -51,7 +51,7 @@ const LayoutWithSidebar = ({ children }: { children: ReactNode }): ReactElement
 			{!removeSidenav && <Sidebar />}
 			<main
 				id='main-content'
-				className={['rc-old', 'main-content', readReceiptsEnabled ? 'read-receipts-enabled' : undefined].filter(Boolean).join(' ')}
+				className={['main-content', readReceiptsEnabled ? 'read-receipts-enabled' : undefined].filter(Boolean).join(' ')}
 			>
 				{children}
 			</main>
diff --git a/apps/meteor/client/views/root/MainLayout/LayoutWithSidebarV2.tsx b/apps/meteor/client/views/root/MainLayout/LayoutWithSidebarV2.tsx
index 495cd469400f..d58d21c4c240 100644
--- a/apps/meteor/client/views/root/MainLayout/LayoutWithSidebarV2.tsx
+++ b/apps/meteor/client/views/root/MainLayout/LayoutWithSidebarV2.tsx
@@ -4,10 +4,10 @@ import { useLayout, useSetting, useCurrentModal, useCurrentRoutePath, useRouter
 import type { ReactElement, ReactNode } from 'react';
 import React, { useEffect, useRef } from 'react';
 
-import NavBar from '../../../NavBarV2';
-import Sidebar from '../../../sidebarv2';
 import AccessibilityShortcut from './AccessibilityShortcut';
 import { MainLayoutStyleTags } from './MainLayoutStyleTags';
+import NavBar from '../../../NavBarV2';
+import Sidebar from '../../../sidebarv2';
 
 const LayoutWithSidebarV2 = ({ children }: { children: ReactNode }): ReactElement => {
 	const { isEmbedded: embeddedLayout } = useLayout();
@@ -55,7 +55,7 @@ const LayoutWithSidebarV2 = ({ children }: { children: ReactNode }): ReactElemen
 				{!removeSidenav && <Sidebar />}
 				<main
 					id='main-content'
-					className={['rc-old', 'main-content', readReceiptsEnabled ? 'read-receipts-enabled' : undefined].filter(Boolean).join(' ')}
+					className={['main-content', readReceiptsEnabled ? 'read-receipts-enabled' : undefined].filter(Boolean).join(' ')}
 				>
 					{children}
 				</main>
diff --git a/apps/meteor/client/views/root/MainLayout/LoginPage.tsx b/apps/meteor/client/views/root/MainLayout/LoginPage.tsx
index 18c3bf34d0ac..ccf8f83d297f 100644
--- a/apps/meteor/client/views/root/MainLayout/LoginPage.tsx
+++ b/apps/meteor/client/views/root/MainLayout/LoginPage.tsx
@@ -1,14 +1,15 @@
-import { useSession, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSession } from '@rocket.chat/ui-contexts';
 import type { LoginRoutes } from '@rocket.chat/web-ui-registration';
 import RegistrationRoute from '@rocket.chat/web-ui-registration';
 import type { ReactElement, ReactNode } from 'react';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
-import LoggedOutBanner from '../../../components/deviceManagement/LoggedOutBanner';
 import { useIframeLogin } from './useIframeLogin';
+import LoggedOutBanner from '../../../components/deviceManagement/LoggedOutBanner';
 
 const LoginPage = ({ defaultRoute, children }: { defaultRoute?: LoginRoutes; children?: ReactNode }): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const showForcedLogoutBanner = useSession('force_logout');
 	const iframeLoginUrl = useIframeLogin();
 
diff --git a/apps/meteor/client/views/root/MainLayout/Preload.tsx b/apps/meteor/client/views/root/MainLayout/Preload.tsx
index cd5ba0e817db..c1e233d8a8cc 100644
--- a/apps/meteor/client/views/root/MainLayout/Preload.tsx
+++ b/apps/meteor/client/views/root/MainLayout/Preload.tsx
@@ -4,7 +4,6 @@ import React, { useEffect } from 'react';
 
 import { CachedChatSubscription } from '../../../../app/models/client';
 import { settings } from '../../../../app/settings/client';
-import { CachedCollectionManager } from '../../../../app/ui-cached-collection/client';
 import { mainReady } from '../../../../app/ui-utils/client';
 import { useReactiveVar } from '../../../hooks/useReactiveVar';
 import { isSyncReady } from '../../../lib/userData';
@@ -19,7 +18,6 @@ const Preload = ({ children }: { children: ReactNode }): ReactElement => {
 	const ready = !uid || (userDataReady && subscriptionsReady && settingsReady);
 
 	useEffect(() => {
-		CachedCollectionManager.syncEnabled = ready;
 		mainReady.set(ready);
 	}, [ready]);
 
diff --git a/apps/meteor/client/views/root/MainLayout/RegisterUsername.tsx b/apps/meteor/client/views/root/MainLayout/RegisterUsername.tsx
index fd1691bcb16d..8e60fa35a4bf 100644
--- a/apps/meteor/client/views/root/MainLayout/RegisterUsername.tsx
+++ b/apps/meteor/client/views/root/MainLayout/RegisterUsername.tsx
@@ -30,7 +30,7 @@ const RegisterUsername = () => {
 	const uid = useUserId();
 	const logout = useLogout();
 	const formLabelId = useUniqueId();
-	const hideLogo = useSetting<boolean>('Layout_Login_Hide_Logo');
+	const hideLogo = useSetting('Layout_Login_Hide_Logo', false);
 	const customLogo = useAssetWithDarkModePath('logo');
 	const customBackground = useAssetWithDarkModePath('background');
 	const dispatchToastMessage = useToastMessageDispatch();
diff --git a/apps/meteor/client/views/root/MainLayout/TwoFactorAuthSetupCheck.tsx b/apps/meteor/client/views/root/MainLayout/TwoFactorAuthSetupCheck.tsx
index d6fc7e9d14cf..8c3dbf91bda3 100644
--- a/apps/meteor/client/views/root/MainLayout/TwoFactorAuthSetupCheck.tsx
+++ b/apps/meteor/client/views/root/MainLayout/TwoFactorAuthSetupCheck.tsx
@@ -3,10 +3,10 @@ import { useLayout, useUser, useSetting } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ReactNode } from 'react';
 import React, { lazy, useCallback } from 'react';
 
-import { Roles } from '../../../../app/models/client';
-import { useReactiveValue } from '../../../hooks/useReactiveValue';
 import LayoutWithSidebar from './LayoutWithSidebar';
 import LayoutWithSidebarV2 from './LayoutWithSidebarV2';
+import { Roles } from '../../../../app/models/client';
+import { useReactiveValue } from '../../../hooks/useReactiveValue';
 
 const AccountSecurityPage = lazy(() => import('../../account/security/AccountSecurityPage'));
 
@@ -29,7 +29,7 @@ const TwoFactorAuthSetupCheck = ({ children }: { children: ReactNode }): ReactEl
 	if (require2faSetup) {
 		return (
 			<main id='rocket-chat' className={embeddedLayout ? 'embedded-view' : undefined}>
-				<div className='rc-old main-content content-background-color'>
+				<div className='main-content content-background-color'>
 					<AccountSecurityPage />
 				</div>
 			</main>
diff --git a/apps/meteor/client/views/root/MainLayout/UsernameCheck.tsx b/apps/meteor/client/views/root/MainLayout/UsernameCheck.tsx
index d709dc29b6df..aab3c00cb459 100644
--- a/apps/meteor/client/views/root/MainLayout/UsernameCheck.tsx
+++ b/apps/meteor/client/views/root/MainLayout/UsernameCheck.tsx
@@ -2,16 +2,16 @@ import { useUserId, useSetting } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ReactNode } from 'react';
 import React, { useCallback } from 'react';
 
-import { useReactiveValue } from '../../../hooks/useReactiveValue';
-import { useUserInfoQuery } from '../../../hooks/useUserInfoQuery';
 import PasswordChangeCheck from './PasswordChangeCheck';
 import RegisterUsername from './RegisterUsername';
+import { useReactiveValue } from '../../../hooks/useReactiveValue';
+import { useUserInfoQuery } from '../../../hooks/useUserInfoQuery';
 
 const UsernameCheck = ({ children }: { children: ReactNode }): ReactElement => {
 	const userId = useUserId();
 	const { data: userData, isLoading } = useUserInfoQuery({ userId: userId || '' });
 
-	const allowAnonymousRead = useSetting<boolean>('Accounts_AllowAnonymousRead') ?? false;
+	const allowAnonymousRead = useSetting('Accounts_AllowAnonymousRead', false);
 
 	const shouldRegisterUsername = useReactiveValue(
 		useCallback(() => {
diff --git a/apps/meteor/client/views/root/OutermostErrorBoundary.tsx b/apps/meteor/client/views/root/OutermostErrorBoundary.tsx
index 90a83400420a..403035540bd5 100644
--- a/apps/meteor/client/views/root/OutermostErrorBoundary.tsx
+++ b/apps/meteor/client/views/root/OutermostErrorBoundary.tsx
@@ -5,8 +5,8 @@ import type { ReactNode } from 'react';
 import React from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
 
-import { Info } from '../../../app/utils/rocketchat.info';
 import AppErrorPage from './AppErrorPage';
+import { Info } from '../../../app/utils/rocketchat.info';
 
 declare global {
 	// eslint-disable-next-line @typescript-eslint/naming-convention
diff --git a/apps/meteor/client/views/root/SAMLLoginRoute.spec.tsx b/apps/meteor/client/views/root/SAMLLoginRoute.spec.tsx
index e642e7851707..577243f1d7fa 100644
--- a/apps/meteor/client/views/root/SAMLLoginRoute.spec.tsx
+++ b/apps/meteor/client/views/root/SAMLLoginRoute.spec.tsx
@@ -3,8 +3,8 @@ import { render } from '@testing-library/react';
 import { Meteor } from 'meteor/meteor';
 import React from 'react';
 
-import RouterContextMock from '../../../tests/mocks/client/RouterContextMock';
 import SAMLLoginRoute from './SAMLLoginRoute';
+import RouterContextMock from '../../../tests/mocks/client/RouterContextMock';
 
 const navigateStub = jest.fn();
 
diff --git a/apps/meteor/client/views/root/hooks/useClearUnreadAllMessagesMutation.ts b/apps/meteor/client/views/root/hooks/useClearUnreadAllMessagesMutation.ts
index e3b8e6dc1fb4..e9802db9d999 100644
--- a/apps/meteor/client/views/root/hooks/useClearUnreadAllMessagesMutation.ts
+++ b/apps/meteor/client/views/root/hooks/useClearUnreadAllMessagesMutation.ts
@@ -2,13 +2,13 @@ import { useEndpoint } from '@rocket.chat/ui-contexts';
 import type { UseMutationOptions } from '@tanstack/react-query';
 import { useMutation } from '@tanstack/react-query';
 
-import { ChatSubscription } from '../../../../app/models/client';
+import { Subscriptions } from '../../../../app/models/client';
 
 export const useClearUnreadAllMessagesMutation = (options?: Omit<UseMutationOptions<void, unknown, void, unknown>, 'mutationFn'>) => {
 	const readSubscription = useEndpoint('POST', '/v1/subscriptions.read');
 
 	return useMutation(async () => {
-		const promises = ChatSubscription.find(
+		const promises = Subscriptions.find(
 			{
 				open: true,
 			},
diff --git a/apps/meteor/client/views/root/hooks/useEscapeKeyStroke.ts b/apps/meteor/client/views/root/hooks/useEscapeKeyStroke.ts
index d15c96f0ae30..3dc629340f4b 100644
--- a/apps/meteor/client/views/root/hooks/useEscapeKeyStroke.ts
+++ b/apps/meteor/client/views/root/hooks/useEscapeKeyStroke.ts
@@ -1,13 +1,14 @@
-import { useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import { useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 
+import { useClearUnreadAllMessagesMutation } from './useClearUnreadAllMessagesMutation';
 import GenericModal from '../../../components/GenericModal';
 import { imperativeModal } from '../../../lib/imperativeModal';
-import { useClearUnreadAllMessagesMutation } from './useClearUnreadAllMessagesMutation';
 
 export const useEscapeKeyStroke = () => {
 	const dispatchToastMessage = useToastMessageDispatch();
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const clearUnreadAllMessagesMutation = useClearUnreadAllMessagesMutation({
 		onError: (error) => {
diff --git a/apps/meteor/client/views/root/hooks/useGoogleTagManager.ts b/apps/meteor/client/views/root/hooks/useGoogleTagManager.ts
index 72a9a6d86751..d374affba3c2 100644
--- a/apps/meteor/client/views/root/hooks/useGoogleTagManager.ts
+++ b/apps/meteor/client/views/root/hooks/useGoogleTagManager.ts
@@ -2,7 +2,7 @@ import { useSetting } from '@rocket.chat/ui-contexts';
 import { useEffect } from 'react';
 
 export const useGoogleTagManager = () => {
-	const i = useSetting<string>('GoogleTagManager_id');
+	const i = useSetting('GoogleTagManager_id', '');
 
 	useEffect(() => {
 		if (typeof i !== 'string' || i.trim() === '') {
diff --git a/apps/meteor/client/views/root/hooks/useUnreadMessages.ts b/apps/meteor/client/views/root/hooks/useUnreadMessages.ts
index 8dfff52cbc43..5f0ea8875c3a 100644
--- a/apps/meteor/client/views/root/hooks/useUnreadMessages.ts
+++ b/apps/meteor/client/views/root/hooks/useUnreadMessages.ts
@@ -1,7 +1,8 @@
-import { useSession, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSession } from '@rocket.chat/ui-contexts';
+import { useTranslation } from 'react-i18next';
 
 export const useUnreadMessages = (): string | undefined => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const unreadMessages = useSession('unread') as number | '' | '999+' | '•';
 
 	return (() => {
diff --git a/apps/meteor/client/views/setupWizard/SetupWizardRoute.tsx b/apps/meteor/client/views/setupWizard/SetupWizardRoute.tsx
index 91e47b4a590f..3eb9586af0d7 100644
--- a/apps/meteor/client/views/setupWizard/SetupWizardRoute.tsx
+++ b/apps/meteor/client/views/setupWizard/SetupWizardRoute.tsx
@@ -2,10 +2,9 @@ import { useBreakpoints } from '@rocket.chat/fuselage-hooks';
 import { DarkModeProvider } from '@rocket.chat/layout';
 import type { ReactElement } from 'react';
 import React from 'react';
-import { useTranslation, I18nextProvider } from 'react-i18next';
 
-import ModalRegion from '../modal/ModalRegion';
 import SetupWizardPage from './SetupWizardPage';
+import ModalRegion from '../modal/ModalRegion';
 import { useBodyPosition } from './hooks/useBodyPosition';
 import { useRouteLock } from './hooks/useRouteLock';
 import SetupWizardProvider from './providers/SetupWizardProvider';
@@ -16,22 +15,17 @@ export const SetupWizardRoute = (): ReactElement | null => {
 	const isMobile = !breakpoints.includes('md');
 	useBodyPosition('relative', isMobile);
 
-	const { i18n } = useTranslation();
-
 	if (locked) {
 		return null;
 	}
 
 	return (
-		// FIXME: setting the defaultNS here is problematic for components/hooks expecting it to be 'core'
-		<I18nextProvider i18n={i18n} defaultNS='onboarding'>
-			<SetupWizardProvider>
-				<DarkModeProvider.default>
-					<SetupWizardPage />
-					<ModalRegion />
-				</DarkModeProvider.default>
-			</SetupWizardProvider>
-		</I18nextProvider>
+		<SetupWizardProvider>
+			<DarkModeProvider.default>
+				<SetupWizardPage />
+				<ModalRegion />
+			</DarkModeProvider.default>
+		</SetupWizardProvider>
 	);
 };
 
diff --git a/apps/meteor/client/views/setupWizard/steps/AdminInfoStep.tsx b/apps/meteor/client/views/setupWizard/steps/AdminInfoStep.tsx
index b2640d0a4a14..fc457135cfa8 100644
--- a/apps/meteor/client/views/setupWizard/steps/AdminInfoStep.tsx
+++ b/apps/meteor/client/views/setupWizard/steps/AdminInfoStep.tsx
@@ -1,8 +1,9 @@
 import { AdminInfoPage } from '@rocket.chat/onboarding-ui';
 import { escapeRegExp } from '@rocket.chat/string-helpers';
-import { useSetting, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetting } from '@rocket.chat/ui-contexts';
 import type { ReactElement, ComponentProps } from 'react';
 import React from 'react';
+import { I18nextProvider, useTranslation } from 'react-i18next';
 
 import { useSetupWizardContext } from '../contexts/SetupWizardContext';
 
@@ -12,7 +13,7 @@ const hasBlockedName = (username: string): boolean =>
 	!!usernameBlackList.length && usernameBlackList.some((restrictedUsername) => restrictedUsername.test(escapeRegExp(username).trim()));
 
 const AdminInfoStep = (): ReactElement => {
-	const t = useTranslation();
+	const { t, i18n } = useTranslation();
 	const regexpForUsernameValidation = useSetting('UTF8_User_Names_Validation');
 	const usernameRegExp = new RegExp(`^${regexpForUsernameValidation}$`);
 
@@ -32,15 +33,17 @@ const AdminInfoStep = (): ReactElement => {
 	};
 
 	return (
-		<AdminInfoPage
-			validatePassword={(password): boolean => password.length > 0}
-			passwordRulesHint=''
-			validateUsername={validateUsername}
-			validateEmail={validateEmail}
-			currentStep={currentStep}
-			stepCount={maxSteps}
-			onSubmit={handleSubmit}
-		/>
+		<I18nextProvider i18n={i18n} defaultNS='onboarding'>
+			<AdminInfoPage
+				validatePassword={(password): boolean => password.length > 0}
+				passwordRulesHint=''
+				validateUsername={validateUsername}
+				validateEmail={validateEmail}
+				currentStep={currentStep}
+				stepCount={maxSteps}
+				onSubmit={handleSubmit}
+			/>
+		</I18nextProvider>
 	);
 };
 
diff --git a/apps/meteor/client/views/setupWizard/steps/CloudAccountConfirmation.tsx b/apps/meteor/client/views/setupWizard/steps/CloudAccountConfirmation.tsx
index ee3a2f8d3c5c..202868b0a478 100644
--- a/apps/meteor/client/views/setupWizard/steps/CloudAccountConfirmation.tsx
+++ b/apps/meteor/client/views/setupWizard/steps/CloudAccountConfirmation.tsx
@@ -1,7 +1,8 @@
 import { AwaitingConfirmationPage } from '@rocket.chat/onboarding-ui';
-import { useToastMessageDispatch, useSettingSetValue, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useToastMessageDispatch, useSettingSetValue, useEndpoint } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useEffect, useCallback } from 'react';
+import { I18nextProvider, useTranslation } from 'react-i18next';
 
 import { useSetupWizardContext } from '../contexts/SetupWizardContext';
 
@@ -19,7 +20,7 @@ const CloudAccountConfirmation = (): ReactElement => {
 	const setShowSetupWizard = useSettingSetValue('Show_Setup_Wizard');
 	const cloudConfirmationPoll = useEndpoint('GET', '/v1/cloud.confirmationPoll');
 	const dispatchToastMessage = useToastMessageDispatch();
-	const t = useTranslation();
+	const { t, i18n } = useTranslation();
 
 	const getConfirmation = useCallback(async () => {
 		try {
@@ -46,14 +47,16 @@ const CloudAccountConfirmation = (): ReactElement => {
 	}, [getConfirmation, registrationData.interval]);
 
 	return (
-		<AwaitingConfirmationPage
-			currentStep={currentStep}
-			stepCount={maxSteps}
-			emailAddress={registrationData.cloudEmail}
-			securityCode={registrationData.user_code}
-			onResendEmailRequest={(): Promise<void> => registerServer({ email: registrationData.cloudEmail, resend: true })}
-			onChangeEmailRequest={(): void => goToStep(3)}
-		/>
+		<I18nextProvider i18n={i18n} defaultNS='onboarding'>
+			<AwaitingConfirmationPage
+				currentStep={currentStep}
+				stepCount={maxSteps}
+				emailAddress={registrationData.cloudEmail}
+				securityCode={registrationData.user_code}
+				onResendEmailRequest={(): Promise<void> => registerServer({ email: registrationData.cloudEmail, resend: true })}
+				onChangeEmailRequest={(): void => goToStep(3)}
+			/>
+		</I18nextProvider>
 	);
 };
 
diff --git a/apps/meteor/client/views/setupWizard/steps/OrganizationInfoStep.tsx b/apps/meteor/client/views/setupWizard/steps/OrganizationInfoStep.tsx
index b922d365b15b..2f0c251a4c39 100644
--- a/apps/meteor/client/views/setupWizard/steps/OrganizationInfoStep.tsx
+++ b/apps/meteor/client/views/setupWizard/steps/OrganizationInfoStep.tsx
@@ -1,16 +1,18 @@
 import type { ISetting } from '@rocket.chat/core-typings';
 import { OrganizationInfoPage } from '@rocket.chat/onboarding-ui';
 import type { TranslationKey } from '@rocket.chat/ui-contexts';
-import { useRole, useTranslation } from '@rocket.chat/ui-contexts';
+import { useRole } from '@rocket.chat/ui-contexts';
+import type { TFunction } from 'i18next';
 import type { ComponentProps, ReactElement } from 'react';
 import React from 'react';
+import { I18nextProvider, useTranslation } from 'react-i18next';
 
 import { useSetupWizardContext } from '../contexts/SetupWizardContext';
 
 const getSettingOptions = (
 	settings: Array<ISetting> | undefined,
 	settingId: ISetting['_id'],
-	t: ReturnType<typeof useTranslation>,
+	t: TFunction,
 ): Array<[key: string, text: string]> => {
 	if (!settings) {
 		return [];
@@ -26,7 +28,7 @@ const getSettingOptions = (
 };
 
 const OrganizationInfoStep = (): ReactElement => {
-	const t = useTranslation();
+	const { t, i18n } = useTranslation();
 	const hasAdminRole = useRole('admin');
 
 	const {
@@ -59,17 +61,19 @@ const OrganizationInfoStep = (): ReactElement => {
 	};
 
 	return (
-		<OrganizationInfoPage
-			initialValues={organizationData}
-			onSubmit={handleSubmit}
-			onBackButtonClick={!hasAdminRole ? goToPreviousStep : undefined}
-			currentStep={currentStep}
-			stepCount={maxSteps}
-			organizationIndustryOptions={organizationIndustryOptions}
-			organizationSizeOptions={organizationSizeOptions}
-			countryOptions={countryOptions}
-			nextStep={skipCloudRegistration ? t('Register') : undefined}
-		/>
+		<I18nextProvider i18n={i18n} defaultNS='onboarding'>
+			<OrganizationInfoPage
+				initialValues={organizationData}
+				onSubmit={handleSubmit}
+				onBackButtonClick={!hasAdminRole ? goToPreviousStep : undefined}
+				currentStep={currentStep}
+				stepCount={maxSteps}
+				organizationIndustryOptions={organizationIndustryOptions}
+				organizationSizeOptions={organizationSizeOptions}
+				countryOptions={countryOptions}
+				nextStep={skipCloudRegistration ? t('Register') : undefined}
+			/>
+		</I18nextProvider>
 	);
 };
 
diff --git a/apps/meteor/client/views/setupWizard/steps/RegisterServerStep.tsx b/apps/meteor/client/views/setupWizard/steps/RegisterServerStep.tsx
index e6831658c786..d4a4eb270740 100644
--- a/apps/meteor/client/views/setupWizard/steps/RegisterServerStep.tsx
+++ b/apps/meteor/client/views/setupWizard/steps/RegisterServerStep.tsx
@@ -1,8 +1,9 @@
 import { RegisterServerPage, RegisterOfflinePage } from '@rocket.chat/onboarding-ui';
-import { useEndpoint, useMethod, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, useMethod } from '@rocket.chat/ui-contexts';
 import { useMutation, useQuery } from '@tanstack/react-query';
 import type { ReactElement, ComponentProps } from 'react';
 import React, { useState } from 'react';
+import { I18nextProvider, useTranslation } from 'react-i18next';
 
 import { useInvalidateLicense } from '../../../hooks/useLicense';
 import { dispatchToastMessage } from '../../../lib/toast';
@@ -14,7 +15,7 @@ const SERVER_OPTIONS = {
 };
 
 const RegisterServerStep = (): ReactElement => {
-	const t = useTranslation();
+	const { t, i18n } = useTranslation();
 	const { currentStep, goToNextStep, setSetupWizardData, registerServer, maxSteps, completeSetupWizard, saveAgreementData } =
 		useSetupWizardContext();
 	const [serverOption, setServerOption] = useState(SERVER_OPTIONS.REGISTERED);
@@ -81,13 +82,15 @@ const RegisterServerStep = (): ReactElement => {
 	}
 
 	return (
-		<RegisterServerPage
-			onClickRegisterOffline={(): void => setServerOption(SERVER_OPTIONS.OFFLINE)}
-			stepCount={maxSteps}
-			onSubmit={handleRegister}
-			currentStep={currentStep}
-			offline={isError || (!isLoading && offline)}
-		/>
+		<I18nextProvider i18n={i18n} defaultNS='onboarding'>
+			<RegisterServerPage
+				onClickRegisterOffline={(): void => setServerOption(SERVER_OPTIONS.OFFLINE)}
+				stepCount={maxSteps}
+				onSubmit={handleRegister}
+				currentStep={currentStep}
+				offline={isError || (!isLoading && offline)}
+			/>
+		</I18nextProvider>
 	);
 };
 
diff --git a/apps/meteor/client/views/teams/ChannelDesertionTable/ChannelDesertionTable.tsx b/apps/meteor/client/views/teams/ChannelDesertionTable/ChannelDesertionTable.tsx
index a86399ac2477..c672ce8edcd9 100644
--- a/apps/meteor/client/views/teams/ChannelDesertionTable/ChannelDesertionTable.tsx
+++ b/apps/meteor/client/views/teams/ChannelDesertionTable/ChannelDesertionTable.tsx
@@ -4,9 +4,9 @@ import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import ChannelDesertionTableRow from './ChannelDesertionTableRow';
 import { GenericTable, GenericTableHeaderCell, GenericTableHeader, GenericTableBody } from '../../../components/GenericTable';
 import { useSort } from '../../../components/GenericTable/hooks/useSort';
-import ChannelDesertionTableRow from './ChannelDesertionTableRow';
 
 type ChannelDesertionTableProps = {
 	lastOwnerWarning?: string;
diff --git a/apps/meteor/client/views/teams/ConvertToChannelModal/ConvertToChannelModal.tsx b/apps/meteor/client/views/teams/ConvertToChannelModal/ConvertToChannelModal.tsx
index 20022e21eb25..f742102cd524 100644
--- a/apps/meteor/client/views/teams/ConvertToChannelModal/ConvertToChannelModal.tsx
+++ b/apps/meteor/client/views/teams/ConvertToChannelModal/ConvertToChannelModal.tsx
@@ -1,10 +1,10 @@
 import type { IRoom, Serialized } from '@rocket.chat/core-typings';
 import React, { useMemo } from 'react';
 
+import BaseConvertToChannelModal from './BaseConvertToChannelModal';
 import GenericModalSkeleton from '../../../components/GenericModal/GenericModalSkeleton';
 import { useEndpointData } from '../../../hooks/useEndpointData';
 import { AsyncStatePhase } from '../../../lib/asyncState';
-import BaseConvertToChannelModal from './BaseConvertToChannelModal';
 
 type ConvertToChannelModalProps = {
 	onClose: () => void;
diff --git a/apps/meteor/client/views/teams/contextualBar/TeamAutocomplete/TeamAutocomplete.tsx b/apps/meteor/client/views/teams/contextualBar/TeamAutocomplete/TeamAutocomplete.tsx
index 0c3a03fdfe68..4747255eba4d 100644
--- a/apps/meteor/client/views/teams/contextualBar/TeamAutocomplete/TeamAutocomplete.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/TeamAutocomplete/TeamAutocomplete.tsx
@@ -19,7 +19,7 @@ const TeamAutocomplete = ({ value, onChange, ...props }: TeamAutocompleteProps)
 				? data?.teams.map(({ name, teamId, _id, avatarETag, t }) => ({
 						value: teamId as string,
 						label: { name, avatarETag, type: t, _id },
-				  }))
+					}))
 				: [],
 		[data, isSuccess],
 	);
diff --git a/apps/meteor/client/views/teams/contextualBar/channels/AddExistingModal/AddExistingModal.tsx b/apps/meteor/client/views/teams/contextualBar/channels/AddExistingModal/AddExistingModal.tsx
index 4917304f33fe..52192d2a71de 100644
--- a/apps/meteor/client/views/teams/contextualBar/channels/AddExistingModal/AddExistingModal.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/channels/AddExistingModal/AddExistingModal.tsx
@@ -1,7 +1,8 @@
 import { Box, Button, Field, FieldLabel, Modal } from '@rocket.chat/fuselage';
-import { useToastMessageDispatch, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts';
+import { useToastMessageDispatch, useEndpoint } from '@rocket.chat/ui-contexts';
 import React, { memo, useCallback } from 'react';
 import { useForm, Controller } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import RoomsAvailableForTeamsAutoComplete from './RoomsAvailableForTeamsAutoComplete';
 
@@ -12,7 +13,7 @@ type AddExistingModalProps = {
 };
 
 const AddExistingModal = ({ teamId, onClose, reload }: AddExistingModalProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const dispatchToastMessage = useToastMessageDispatch();
 
 	const addRoomEndpoint = useEndpoint('POST', '/v1/teams.addRooms');
diff --git a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItem.tsx b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItem.tsx
index 5ed3056420cf..74eafea1e710 100644
--- a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItem.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItem.tsx
@@ -13,12 +13,13 @@ import {
 } from '@rocket.chat/fuselage';
 import { usePrefersReducedMotion } from '@rocket.chat/fuselage-hooks';
 import { RoomAvatar } from '@rocket.chat/ui-avatar';
-import { usePermission, useTranslation } from '@rocket.chat/ui-contexts';
+import { usePermission } from '@rocket.chat/ui-contexts';
 import React, { useState } from 'react';
+import { useTranslation } from 'react-i18next';
 
+import TeamsChannelItemMenu from './TeamsChannelItemMenu';
 import { usePreventPropagation } from '../../../../hooks/usePreventPropagation';
 import { roomCoordinator } from '../../../../lib/rooms/roomCoordinator';
-import TeamsChannelItemMenu from './TeamsChannelItemMenu';
 
 type TeamsChannelItemProps = {
 	room: IRoom;
@@ -28,7 +29,7 @@ type TeamsChannelItemProps = {
 };
 
 const TeamsChannelItem = ({ room, mainRoom, onClickView, reload }: TeamsChannelItemProps) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const rid = room._id;
 	const type = room.t;
 
diff --git a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItemMenu.tsx b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItemMenu.tsx
index aae1d604dba0..ca90a9d4fd85 100644
--- a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItemMenu.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelItemMenu.tsx
@@ -5,9 +5,9 @@ import type { GenericMenuItemProps } from '@rocket.chat/ui-client';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
-import { useDeleteRoom } from '../../../hooks/roomActions/useDeleteRoom';
 import { useRemoveRoomFromTeam } from './hooks/useRemoveRoomFromTeam';
 import { useToggleAutoJoin } from './hooks/useToggleAutoJoin';
+import { useDeleteRoom } from '../../../hooks/roomActions/useDeleteRoom';
 
 const TeamsChannelItemMenu = ({ room, mainRoom, reload }: { room: IRoom; mainRoom: IRoom; reload?: () => void }) => {
 	const { t } = useTranslation();
diff --git a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannels.tsx b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannels.tsx
index 288604727ef6..4d705823785b 100644
--- a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannels.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannels.tsx
@@ -7,6 +7,7 @@ import React, { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Virtuoso } from 'react-virtuoso';
 
+import TeamsChannelItem from './TeamsChannelItem';
 import {
 	ContextualbarHeader,
 	ContextualbarIcon,
@@ -19,7 +20,6 @@ import {
 } from '../../../../components/Contextualbar';
 import { VirtuosoScrollbars } from '../../../../components/CustomScrollbars';
 import InfiniteListAnchor from '../../../../components/InfiniteListAnchor';
-import TeamsChannelItem from './TeamsChannelItem';
 
 type TeamsChannelsProps = {
 	loading: boolean;
diff --git a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelsWithData.tsx b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelsWithData.tsx
index 731a4fbd1a6e..11f10674aa8f 100644
--- a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelsWithData.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannelsWithData.tsx
@@ -3,15 +3,15 @@ import { useLocalStorage, useDebouncedValue, useEffectEvent } from '@rocket.chat
 import { useSetModal, usePermission, useAtLeastOnePermission } from '@rocket.chat/ui-contexts';
 import React, { useCallback, useMemo, useState } from 'react';
 
+import AddExistingModal from './AddExistingModal';
+import TeamsChannels from './TeamsChannels';
+import { useTeamsChannelList } from './hooks/useTeamsChannelList';
 import { useRecordList } from '../../../../hooks/lists/useRecordList';
 import { AsyncStatePhase } from '../../../../lib/asyncState';
 import { roomCoordinator } from '../../../../lib/rooms/roomCoordinator';
 import CreateChannelWithData from '../../../../sidebar/header/CreateChannel';
 import { useRoom } from '../../../room/contexts/RoomContext';
 import { useRoomToolbox } from '../../../room/contexts/RoomToolboxContext';
-import AddExistingModal from './AddExistingModal';
-import TeamsChannels from './TeamsChannels';
-import { useTeamsChannelList } from './hooks/useTeamsChannelList';
 
 const TeamsChannelsWithData = () => {
 	const room = useRoom();
diff --git a/apps/meteor/client/views/teams/contextualBar/channels/hooks/useRemoveRoomFromTeam.tsx b/apps/meteor/client/views/teams/contextualBar/channels/hooks/useRemoveRoomFromTeam.tsx
index de68070d2061..548d95e6137f 100644
--- a/apps/meteor/client/views/teams/contextualBar/channels/hooks/useRemoveRoomFromTeam.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/channels/hooks/useRemoveRoomFromTeam.tsx
@@ -1,12 +1,13 @@
 import type { IRoom } from '@rocket.chat/core-typings';
-import { useEndpoint, usePermission, useSetModal, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts';
+import { useEndpoint, usePermission, useSetModal, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
 import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 import GenericModal from '../../../../../components/GenericModal';
 import { roomCoordinator } from '../../../../../lib/rooms/roomCoordinator';
 
 export const useRemoveRoomFromTeam = (room: IRoom, { reload }: { reload?: () => void }) => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const setModal = useSetModal();
 	const dispatchToastMessage = useToastMessageDispatch();
 	const canRemoveTeamChannel = usePermission('remove-team-channel', room._id);
diff --git a/apps/meteor/client/views/teams/contextualBar/channels/hooks/useToggleAutoJoin.tsx b/apps/meteor/client/views/teams/contextualBar/channels/hooks/useToggleAutoJoin.tsx
index 867225a1d5c0..3c8fc7f95bd8 100644
--- a/apps/meteor/client/views/teams/contextualBar/channels/hooks/useToggleAutoJoin.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/channels/hooks/useToggleAutoJoin.tsx
@@ -8,7 +8,7 @@ export const useToggleAutoJoin = (room: IRoom, { reload, mainRoom }: { reload?:
 	const dispatchToastMessage = useToastMessageDispatch();
 	const updateRoomEndpoint = useEndpoint('POST', '/v1/teams.updateRoom');
 	const canEditTeamChannel = usePermission('edit-team-channel', room._id);
-	const maxNumberOfAutoJoinMembers = useSetting<number>('API_User_Limit');
+	const maxNumberOfAutoJoinMembers = useSetting('API_User_Limit', 500);
 
 	const handleToggleAutoJoin = async () => {
 		// Sanity check, the setting has a default value, therefore it should always be defined
diff --git a/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/ChannelDeletionTable/ChannelDeletionTable.tsx b/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/ChannelDeletionTable/ChannelDeletionTable.tsx
index 24555a1fc9e0..8b4bdea31ffa 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/ChannelDeletionTable/ChannelDeletionTable.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/ChannelDeletionTable/ChannelDeletionTable.tsx
@@ -3,9 +3,9 @@ import { Box, CheckBox } from '@rocket.chat/fuselage';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
+import ChannelDeletionTableRow from './ChannelDeletionTableRow';
 import { GenericTable, GenericTableHeaderCell, GenericTableBody, GenericTableHeader } from '../../../../../../components/GenericTable';
 import { useSort } from '../../../../../../components/GenericTable/hooks/useSort';
-import ChannelDeletionTableRow from './ChannelDeletionTableRow';
 
 type ChannelDeletionTableProps = {
 	rooms: Serialized<IRoom>[];
diff --git a/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamChannels.tsx b/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamChannels.tsx
index e87eb5825af6..1c4ab63b8ffe 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamChannels.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamChannels.tsx
@@ -3,8 +3,8 @@ import { Box } from '@rocket.chat/fuselage';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
-import GenericModal from '../../../../../components/GenericModal';
 import ChannelDeletionTable from './ChannelDeletionTable';
+import GenericModal from '../../../../../components/GenericModal';
 
 type DeleteTeamChannelsProps = {
 	rooms: Serialized<IRoom>[];
diff --git a/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamConfirmation.tsx b/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamConfirmation.tsx
index 4eed097a4a3e..e0365f30941a 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamConfirmation.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamConfirmation.tsx
@@ -2,8 +2,8 @@ import type { IRoom, Serialized } from '@rocket.chat/core-typings';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 
-import GenericModal from '../../../../../components/GenericModal';
 import RoomLinkList from './RoomLinkList';
+import GenericModal from '../../../../../components/GenericModal';
 
 type DeleteTeamConfirmationProps = {
 	deletedRooms: { [key: string]: Serialized<IRoom> };
diff --git a/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamModalWithRooms.tsx b/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamModalWithRooms.tsx
index 1375ec532c91..b3eb92c435ea 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamModalWithRooms.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/DeleteTeam/DeleteTeamModalWithRooms.tsx
@@ -4,8 +4,8 @@ import { useQuery } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React, { useMemo } from 'react';
 
-import GenericModalSkeleton from '../../../../../components/GenericModal/GenericModalSkeleton';
 import DeleteTeamModal from './DeleteTeamModal';
+import GenericModalSkeleton from '../../../../../components/GenericModal/GenericModalSkeleton';
 
 type DeleteTeamModalWithRoomsProps = {
 	teamId: string;
diff --git a/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamWithData.tsx b/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamWithData.tsx
index 58f98705d2bb..19132b613803 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamWithData.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/LeaveTeam/LeaveTeamWithData.tsx
@@ -4,8 +4,8 @@ import { useQuery } from '@tanstack/react-query';
 import type { ReactElement } from 'react';
 import React from 'react';
 
-import GenericModalSkeleton from '../../../../../components/GenericModal/GenericModalSkeleton';
 import LeaveTeamModal from './LeaveTeamModal/LeaveTeamModal';
+import GenericModalSkeleton from '../../../../../components/GenericModal/GenericModalSkeleton';
 
 type LeaveTeamWithDataProps = {
 	teamId: ITeam['_id'];
diff --git a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.stories.tsx b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.stories.tsx
index b77b30c7ba2b..2292a0d96650 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.stories.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.stories.tsx
@@ -2,8 +2,8 @@ import type { IRoom } from '@rocket.chat/core-typings';
 import type { Meta, StoryFn } from '@storybook/react';
 import React from 'react';
 
-import { Contextualbar } from '../../../../components/Contextualbar';
 import TeamsInfo from './TeamsInfo';
+import { Contextualbar } from '../../../../components/Contextualbar';
 
 const room = {
 	_id: 'awdawd',
diff --git a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfoWithData.tsx b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfoWithData.tsx
index 2d3b2f542cb2..a90e5b98a3aa 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfoWithData.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfoWithData.tsx
@@ -5,6 +5,8 @@ import { useSetModal, useToastMessageDispatch, useUserId, usePermission, useMeth
 import React, { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 
+import LeaveTeam from './LeaveTeam';
+import TeamsInfo from './TeamsInfo';
 import { UiTextContext } from '../../../../../definition/IRoomTypeConfig';
 import { GenericModalDoNotAskAgain } from '../../../../components/GenericModal';
 import { useDontAskAgain } from '../../../../hooks/useDontAskAgain';
@@ -14,8 +16,6 @@ import { useDeleteRoom } from '../../../hooks/roomActions/useDeleteRoom';
 import { useRoom } from '../../../room/contexts/RoomContext';
 import { useRoomToolbox } from '../../../room/contexts/RoomToolboxContext';
 import ConvertToChannelModal from '../../ConvertToChannelModal';
-import LeaveTeam from './LeaveTeam';
-import TeamsInfo from './TeamsInfo';
 
 type TeamsInfoWithLogicProps = {
 	openEditing: () => void;
diff --git a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfoWithRooms.tsx b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfoWithRooms.tsx
index 6461e03d48ef..6f7b83eb395d 100644
--- a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfoWithRooms.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfoWithRooms.tsx
@@ -1,8 +1,8 @@
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import React, { useState } from 'react';
 
-import EditChannelWithData from '../../../room/contextualBar/Info/EditRoomInfo';
 import TeamsInfoWithData from './TeamsInfoWithData';
+import EditChannelWithData from '../../../room/contextualBar/Info/EditRoomInfo';
 
 const TeamsInfoWithRooms = () => {
 	const [editing, setEditing] = useState(false);
diff --git a/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersModal.tsx b/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersModal.tsx
index e5d97dcb7bd8..e4c61002941b 100644
--- a/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersModal.tsx
+++ b/apps/meteor/client/views/teams/contextualBar/members/RemoveUsersModal/RemoveUsersModal.tsx
@@ -1,10 +1,10 @@
 import type { Serialized, IRoom } from '@rocket.chat/core-typings';
 import React, { useMemo } from 'react';
 
+import BaseRemoveUsersModal from './BaseRemoveUsersModal';
 import GenericModalSkeleton from '../../../../../components/GenericModal/GenericModalSkeleton';
 import { useEndpointData } from '../../../../../hooks/useEndpointData';
 import { AsyncStatePhase } from '../../../../../lib/asyncState';
-import BaseRemoveUsersModal from './BaseRemoveUsersModal';
 
 type RemoveUsersModalProps = {
 	onClose: () => void;
diff --git a/apps/meteor/client/voip/components/modals/WrapUpCallModal.tsx b/apps/meteor/client/voip/components/modals/WrapUpCallModal.tsx
index 4291b9425d61..e078fddb49b3 100644
--- a/apps/meteor/client/voip/components/modals/WrapUpCallModal.tsx
+++ b/apps/meteor/client/voip/components/modals/WrapUpCallModal.tsx
@@ -1,9 +1,10 @@
 import { Box, Button, Field, FieldLabel, FieldRow, FieldHint, Modal, TextAreaInput } from '@rocket.chat/fuselage';
-import { useSetModal, useTranslation } from '@rocket.chat/ui-contexts';
+import { useSetModal } from '@rocket.chat/ui-contexts';
 import type { ReactElement } from 'react';
 import React, { useEffect } from 'react';
 import type { SubmitHandler } from 'react-hook-form';
 import { useForm } from 'react-hook-form';
+import { useTranslation } from 'react-i18next';
 
 import Tags from '../../../components/Omnichannel/Tags';
 
@@ -20,7 +21,7 @@ export const WrapUpCallModal = ({ closeRoom }: WrapUpCallModalProps): ReactEleme
 	const setModal = useSetModal();
 
 	const closeModal = (): void => setModal(null);
-	const t = useTranslation();
+	const { t } = useTranslation();
 
 	const { register, handleSubmit, setValue, watch } = useForm<WrapUpCallPayload>();
 
diff --git a/apps/meteor/definition/externals/global.d.ts b/apps/meteor/definition/externals/global.d.ts
index 52e9aa4b1f31..94ce146ae4d2 100644
--- a/apps/meteor/definition/externals/global.d.ts
+++ b/apps/meteor/definition/externals/global.d.ts
@@ -5,30 +5,6 @@ declare global {
 	interface Navigator {
 		/** @deprecated */
 		readonly userLanguage?: string;
-		getUserMedia?: (
-			this: Navigator,
-			constraints?: MediaStreamConstraints | undefined,
-			onSuccess?: (stream: MediaStream) => void,
-			onError?: (error: any) => void,
-		) => void;
-		webkitGetUserMedia?: (
-			this: Navigator,
-			constraints?: MediaStreamConstraints | undefined,
-			onSuccess?: (stream: MediaStream) => void,
-			onError?: (error: any) => void,
-		) => void;
-		mozGetUserMedia?: (
-			this: Navigator,
-			constraints?: MediaStreamConstraints | undefined,
-			onSuccess?: (stream: MediaStream) => void,
-			onError?: (error: any) => void,
-		) => void;
-		msGetUserMedia?: (
-			this: Navigator,
-			constraints?: MediaStreamConstraints | undefined,
-			onSuccess?: (stream: MediaStream) => void,
-			onError?: (error: any) => void,
-		) => void;
 	}
 
 	const __meteor_runtime_config__: {
diff --git a/apps/meteor/definition/externals/meteor/meteor.d.ts b/apps/meteor/definition/externals/meteor/meteor.d.ts
index 992595dc07bb..b7220937213f 100644
--- a/apps/meteor/definition/externals/meteor/meteor.d.ts
+++ b/apps/meteor/definition/externals/meteor/meteor.d.ts
@@ -60,6 +60,9 @@ declare module 'meteor/meteor' {
 		}
 
 		interface IMeteorConnection {
+			httpHeaders: Record<string, any>;
+			referer: string;
+			clientAddress: string;
 			_send(message: IDDPMessage): void;
 
 			_methodInvokers: Record<string, any>;
diff --git a/apps/meteor/definition/externals/meteor/meteorhacks-inject-initial.d.ts b/apps/meteor/definition/externals/meteor/meteorhacks-inject-initial.d.ts
index b0498aaf4a0d..df6118689a0d 100644
--- a/apps/meteor/definition/externals/meteor/meteorhacks-inject-initial.d.ts
+++ b/apps/meteor/definition/externals/meteor/meteorhacks-inject-initial.d.ts
@@ -1,5 +1,6 @@
 declare module 'meteor/meteorhacks:inject-initial' {
 	namespace Inject {
 		function rawBody(key: string, value: string): void;
+		function rawModHtml(key: string, value: (html: string) => string): void;
 	}
 }
diff --git a/apps/meteor/ee/app/api-enterprise/server/canned-responses.ts b/apps/meteor/ee/app/api-enterprise/server/canned-responses.ts
index 4d41e20ea0fc..089b26d79917 100644
--- a/apps/meteor/ee/app/api-enterprise/server/canned-responses.ts
+++ b/apps/meteor/ee/app/api-enterprise/server/canned-responses.ts
@@ -3,9 +3,9 @@ import { isPOSTCannedResponsesProps, isDELETECannedResponsesProps, isCannedRespo
 import type { PaginatedResult, PaginatedRequest } from '@rocket.chat/rest-typings';
 import { Meteor } from 'meteor/meteor';
 
+import { findAllCannedResponses, findAllCannedResponsesFilter, findOneCannedResponse } from './lib/canned-responses';
 import { API } from '../../../../app/api/server';
 import { getPaginationItems } from '../../../../app/api/server/helpers/getPaginationItems';
-import { findAllCannedResponses, findAllCannedResponsesFilter, findOneCannedResponse } from './lib/canned-responses';
 
 declare module '@rocket.chat/rest-typings' {
 	// eslint-disable-next-line @typescript-eslint/naming-convention
diff --git a/apps/meteor/ee/app/api-enterprise/server/lib/canned-responses.js b/apps/meteor/ee/app/api-enterprise/server/lib/canned-responses.js
index f4970914e31a..7bd1ad08c6b4 100644
--- a/apps/meteor/ee/app/api-enterprise/server/lib/canned-responses.js
+++ b/apps/meteor/ee/app/api-enterprise/server/lib/canned-responses.js
@@ -116,7 +116,7 @@ export async function findAllCannedResponsesFilter({ userId, shortcut, text, dep
 								$in: tags,
 							},
 						},
-				  ]
+					]
 				: []),
 			...extraFilter,
 		],
diff --git a/apps/meteor/ee/app/authorization/lib/addRoleRestrictions.ts b/apps/meteor/ee/app/authorization/lib/addRoleRestrictions.ts
index 453dd5354613..15f8525394cf 100644
--- a/apps/meteor/ee/app/authorization/lib/addRoleRestrictions.ts
+++ b/apps/meteor/ee/app/authorization/lib/addRoleRestrictions.ts
@@ -1,5 +1,5 @@
-import { AuthorizationUtils } from '../../../../app/authorization/lib/AuthorizationUtils';
 import { guestPermissions } from './guestPermissions';
+import { AuthorizationUtils } from '../../../../app/authorization/lib/AuthorizationUtils';
 
 export const addRoleRestrictions = function () {
 	AuthorizationUtils.addRolePermissionWhiteList('guest', guestPermissions);
diff --git a/apps/meteor/ee/app/authorization/server/callback.ts b/apps/meteor/ee/app/authorization/server/callback.ts
index 707d45d96e0e..d86df56c2ec6 100644
--- a/apps/meteor/ee/app/authorization/server/callback.ts
+++ b/apps/meteor/ee/app/authorization/server/callback.ts
@@ -1,9 +1,9 @@
 import { MeteorError } from '@rocket.chat/core-services';
 import { License } from '@rocket.chat/license';
 
+import { validateUserRoles } from './validateUserRoles';
 import { callbacks } from '../../../../lib/callbacks';
 import { i18n } from '../../../../server/lib/i18n';
-import { validateUserRoles } from './validateUserRoles';
 
 License.onInstall(() => {
 	callbacks.add(
diff --git a/apps/meteor/ee/app/license/server/airGappedRestrictions.ts b/apps/meteor/ee/app/license/server/airGappedRestrictions.ts
index 01a15e72e820..03bc38e46ef4 100644
--- a/apps/meteor/ee/app/license/server/airGappedRestrictions.ts
+++ b/apps/meteor/ee/app/license/server/airGappedRestrictions.ts
@@ -4,9 +4,12 @@ import { Settings, Statistics } from '@rocket.chat/models';
 import { notifyOnSettingChangedById } from '../../../../app/lib/server/lib/notifyListener';
 import { i18n } from '../../../../server/lib/i18n';
 import { sendMessagesToAdmins } from '../../../../server/lib/sendMessagesToAdmins';
+import { updateAuditedBySystem } from '../../../../server/settings/lib/auditedSettingUpdates';
 
 const updateRestrictionSetting = async (remainingDays: number) => {
-	await Settings.updateValueById('Cloud_Workspace_AirGapped_Restrictions_Remaining_Days', remainingDays);
+	await updateAuditedBySystem({
+		reason: 'updateRestrictionSetting',
+	})(Settings.updateValueById, 'Cloud_Workspace_AirGapped_Restrictions_Remaining_Days', remainingDays);
 	void notifyOnSettingChangedById('Cloud_Workspace_AirGapped_Restrictions_Remaining_Days');
 };
 
diff --git a/apps/meteor/ee/app/license/server/startup.ts b/apps/meteor/ee/app/license/server/startup.ts
index eb80fcaf771d..ba83e3a3c96d 100644
--- a/apps/meteor/ee/app/license/server/startup.ts
+++ b/apps/meteor/ee/app/license/server/startup.ts
@@ -5,11 +5,11 @@ import { Subscriptions, Users, Settings, LivechatVisitors } from '@rocket.chat/m
 import { wrapExceptions } from '@rocket.chat/tools';
 import moment from 'moment';
 
+import { getAppCount } from './lib/getAppCount';
 import { syncWorkspace } from '../../../../app/cloud/server/functions/syncWorkspace';
 import { notifyOnSettingChangedById } from '../../../../app/lib/server/lib/notifyListener';
 import { settings } from '../../../../app/settings/server';
 import { callbacks } from '../../../../lib/callbacks';
-import { getAppCount } from './lib/getAppCount';
 
 export const startLicense = async () => {
 	settings.watch<string>('Site_Url', (value) => {
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/api/contacts.ts b/apps/meteor/ee/app/livechat-enterprise/server/api/contacts.ts
new file mode 100644
index 000000000000..96d45de17955
--- /dev/null
+++ b/apps/meteor/ee/app/livechat-enterprise/server/api/contacts.ts
@@ -0,0 +1,88 @@
+import type { ILivechatContactVisitorAssociation } from '@rocket.chat/core-typings';
+import { ContactVisitorAssociationSchema } from '@rocket.chat/rest-typings';
+import Ajv from 'ajv';
+
+import { API } from '../../../../../app/api/server';
+import { logger } from '../lib/logger';
+import { changeContactBlockStatus, closeBlockedRoom, ensureSingleContactLicense } from './lib/contacts';
+
+const ajv = new Ajv({
+	coerceTypes: true,
+});
+
+type blockContactProps = {
+	visitor: ILivechatContactVisitorAssociation;
+};
+
+const blockContactSchema = {
+	type: 'object',
+	properties: {
+		visitor: ContactVisitorAssociationSchema,
+	},
+	required: ['visitor'],
+	additionalProperties: false,
+};
+
+const isBlockContactProps = ajv.compile<blockContactProps>(blockContactSchema);
+
+declare module '@rocket.chat/rest-typings' {
+	// eslint-disable-next-line @typescript-eslint/naming-convention
+	interface Endpoints {
+		'/v1/omnichannel/contacts.block': {
+			POST: (params: blockContactProps) => void;
+		};
+		'/v1/omnichannel/contacts.unblock': {
+			POST: (params: blockContactProps) => void;
+		};
+	}
+}
+
+API.v1.addRoute(
+	'omnichannel/contacts.block',
+	{
+		authRequired: true,
+		permissionsRequired: ['block-livechat-contact'],
+		validateParams: isBlockContactProps,
+	},
+	{
+		async post() {
+			ensureSingleContactLicense();
+			const { visitor } = this.bodyParams;
+			const { user } = this;
+
+			await changeContactBlockStatus({
+				visitor,
+				block: true,
+			});
+			logger.info(`Visitor with id ${visitor.visitorId} blocked by user with id ${user._id}`);
+
+			await closeBlockedRoom(visitor, user);
+
+			return API.v1.success();
+		},
+	},
+);
+
+API.v1.addRoute(
+	'omnichannel/contacts.unblock',
+	{
+		authRequired: true,
+		permissionsRequired: ['unblock-livechat-contact'],
+		validateParams: isBlockContactProps,
+	},
+	{
+		async post() {
+			ensureSingleContactLicense();
+			const { visitor } = this.bodyParams;
+			const { user } = this;
+
+			await changeContactBlockStatus({
+				visitor,
+				block: false,
+			});
+			logger.info(`Visitor with id ${visitor.visitorId} unblocked by user with id ${user._id}`);
+
+			return API.v1.success();
+		},
+	},
+);
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/api/index.ts b/apps/meteor/ee/app/livechat-enterprise/server/api/index.ts
index f76bfdf259c6..a8b28b491995 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/api/index.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/api/index.ts
@@ -11,3 +11,4 @@ import './rooms';
 import './transcript';
 import './reports';
 import './triggers';
+import './contacts';
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/api/inquiries.ts b/apps/meteor/ee/app/livechat-enterprise/server/api/inquiries.ts
index cd5b0b1c4c3b..667529bb10e1 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/api/inquiries.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/api/inquiries.ts
@@ -1,5 +1,5 @@
-import { API } from '../../../../../app/api/server';
 import { setSLAToInquiry } from './lib/inquiries';
+import { API } from '../../../../../app/api/server';
 
 API.v1.addRoute(
 	'livechat/inquiry.setSLA',
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/api/lib/contacts.ts b/apps/meteor/ee/app/livechat-enterprise/server/api/lib/contacts.ts
new file mode 100644
index 000000000000..cb8fd7e526e1
--- /dev/null
+++ b/apps/meteor/ee/app/livechat-enterprise/server/api/lib/contacts.ts
@@ -0,0 +1,36 @@
+import type { IUser, ILivechatContactVisitorAssociation } from '@rocket.chat/core-typings';
+import { License } from '@rocket.chat/license';
+import { LivechatContacts, LivechatRooms, LivechatVisitors } from '@rocket.chat/models';
+
+import { Livechat } from '../../../../../../app/livechat/server/lib/LivechatTyped';
+import { i18n } from '../../../../../../server/lib/i18n';
+
+export async function changeContactBlockStatus({ block, visitor }: { visitor: ILivechatContactVisitorAssociation; block: boolean }) {
+	const result = await LivechatContacts.updateContactChannel(visitor, { blocked: block });
+
+	if (!result.modifiedCount) {
+		throw new Error('error-contact-not-found');
+	}
+}
+
+export function ensureSingleContactLicense() {
+	if (!License.hasModule('contact-id-verification')) {
+		throw new Error('error-action-not-allowed');
+	}
+}
+
+export async function closeBlockedRoom(association: ILivechatContactVisitorAssociation, user: IUser) {
+	const visitor = await LivechatVisitors.findOneById(association.visitorId);
+
+	if (!visitor) {
+		throw new Error('error-visitor-not-found');
+	}
+
+	const room = await LivechatRooms.findOneOpenByContactChannelVisitor(association);
+
+	if (!room) {
+		return;
+	}
+
+	return Livechat.closeRoom({ room, visitor, comment: i18n.t('close-blocked-room-comment'), user });
+}
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/api/lib/tags.ts b/apps/meteor/ee/app/livechat-enterprise/server/api/lib/tags.ts
index 368130a58100..aff93e474bb5 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/api/lib/tags.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/api/lib/tags.ts
@@ -3,9 +3,9 @@ import { LivechatTag } from '@rocket.chat/models';
 import { escapeRegExp } from '@rocket.chat/string-helpers';
 import type { Filter, FindOptions } from 'mongodb';
 
+import { getDepartmentsWhichUserCanAccess } from './departments';
 import { hasPermissionAsync } from '../../../../../../app/authorization/server/functions/hasPermission';
 import { helperLogger } from '../../lib/logger';
-import { getDepartmentsWhichUserCanAccess } from './departments';
 
 type FindTagsParams = {
 	userId: string;
@@ -104,7 +104,7 @@ export async function findTags({
 								...(filteredDepartmentIds.length ? [{ departments: { $in: filteredDepartmentIds } }] : []),
 							],
 						},
-				  ]
+					]
 				: []),
 		],
 	};
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/api/monitors.ts b/apps/meteor/ee/app/livechat-enterprise/server/api/monitors.ts
index 63d848f85447..62293a87ea63 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/api/monitors.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/api/monitors.ts
@@ -1,8 +1,8 @@
 import type { ILivechatMonitor } from '@rocket.chat/core-typings';
 
+import { findMonitors, findMonitorByUsername } from './lib/monitors';
 import { API } from '../../../../../app/api/server';
 import { getPaginationItems } from '../../../../../app/api/server/helpers/getPaginationItems';
-import { findMonitors, findMonitorByUsername } from './lib/monitors';
 
 API.v1.addRoute(
 	'livechat/monitors',
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/api/priorities.ts b/apps/meteor/ee/app/livechat-enterprise/server/api/priorities.ts
index 11100367d4af..c3e2e84bb83d 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/api/priorities.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/api/priorities.ts
@@ -1,10 +1,10 @@
 import { LivechatPriority } from '@rocket.chat/models';
 import { isGETLivechatPrioritiesParams, isPUTLivechatPriority } from '@rocket.chat/rest-typings';
 
+import { findPriority, updatePriority } from './lib/priorities';
 import { API } from '../../../../../app/api/server';
 import { getPaginationItems } from '../../../../../app/api/server/helpers/getPaginationItems';
 import { notifyOnLivechatPriorityChanged } from '../../../../../app/lib/server/lib/notifyListener';
-import { findPriority, updatePriority } from './lib/priorities';
 
 API.v1.addRoute(
 	'livechat/priorities',
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/api/rooms.ts b/apps/meteor/ee/app/livechat-enterprise/server/api/rooms.ts
index 02887980ec5e..41c4d4b500f7 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/api/rooms.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/api/rooms.ts
@@ -3,10 +3,10 @@ import type { IOmnichannelRoom } from '@rocket.chat/core-typings';
 import { LivechatRooms, Subscriptions } from '@rocket.chat/models';
 import { isLivechatRoomOnHoldProps, isLivechatRoomResumeOnHoldProps, isPOSTLivechatRoomPriorityParams } from '@rocket.chat/rest-typings';
 
+import { removePriorityFromRoom, updateRoomPriority } from './lib/priorities';
 import { API } from '../../../../../app/api/server';
 import { hasPermissionAsync } from '../../../../../app/authorization/server/functions/hasPermission';
 import { i18n } from '../../../../../server/lib/i18n';
-import { removePriorityFromRoom, updateRoomPriority } from './lib/priorities';
 
 API.v1.addRoute(
 	'livechat/room.onHold',
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/api/tags.ts b/apps/meteor/ee/app/livechat-enterprise/server/api/tags.ts
index 4c84a42bd9e6..eb1d190977b3 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/api/tags.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/api/tags.ts
@@ -1,6 +1,6 @@
+import { findTags, findTagById } from './lib/tags';
 import { API } from '../../../../../app/api/server';
 import { getPaginationItems } from '../../../../../app/api/server/helpers/getPaginationItems';
-import { findTags, findTagById } from './lib/tags';
 
 API.v1.addRoute(
 	'livechat/tags',
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/api/triggers.ts b/apps/meteor/ee/app/livechat-enterprise/server/api/triggers.ts
index 1b066da0fa54..094c02d729c0 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/api/triggers.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/api/triggers.ts
@@ -3,9 +3,9 @@ import { LivechatTrigger } from '@rocket.chat/models';
 import { isLivechatTriggerWebhookCallParams } from '@rocket.chat/rest-typings';
 import { isLivechatTriggerWebhookTestParams } from '@rocket.chat/rest-typings/src/v1/omnichannel';
 
+import { callTriggerExternalService } from './lib/triggers';
 import { API } from '../../../../../app/api/server';
 import { settings } from '../../../../../app/settings/server';
-import { callTriggerExternalService } from './lib/triggers';
 
 API.v1.addRoute(
 	'livechat/triggers/external-service/test',
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/business-hour/Multiple.ts b/apps/meteor/ee/app/livechat-enterprise/server/business-hour/Multiple.ts
index f0a11d4de7f0..00f67d0d8fd0 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/business-hour/Multiple.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/business-hour/Multiple.ts
@@ -1,8 +1,9 @@
-import type { AtLeast } from '@rocket.chat/core-typings';
-import { type ILivechatDepartment, type ILivechatBusinessHour, LivechatBusinessHourTypes } from '@rocket.chat/core-typings';
+import { LivechatBusinessHourTypes } from '@rocket.chat/core-typings';
+import type { AtLeast, ILivechatDepartment, ILivechatBusinessHour } from '@rocket.chat/core-typings';
 import { LivechatDepartment, LivechatDepartmentAgents, Users } from '@rocket.chat/models';
 import moment from 'moment';
 
+import { openBusinessHour, removeBusinessHourByAgentIds } from './Helper';
 import { businessHourManager } from '../../../../../app/livechat/server/business-hour';
 import type { IBusinessHourBehavior } from '../../../../../app/livechat/server/business-hour/AbstractBusinessHour';
 import { AbstractBusinessHourBehavior } from '../../../../../app/livechat/server/business-hour/AbstractBusinessHour';
@@ -16,7 +17,6 @@ import { closeBusinessHour } from '../../../../../app/livechat/server/business-h
 import { settings } from '../../../../../app/settings/server';
 import { isTruthy } from '../../../../../lib/isTruthy';
 import { bhLogger } from '../lib/logger';
-import { openBusinessHour, removeBusinessHourByAgentIds } from './Helper';
 
 interface IBusinessHoursExtraProperties extends ILivechatBusinessHour {
 	timezoneName: string;
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/hooks/applySimultaneousChatsRestrictions.ts b/apps/meteor/ee/app/livechat-enterprise/server/hooks/applySimultaneousChatsRestrictions.ts
index 6489249d4e24..beca9eb385fb 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/hooks/applySimultaneousChatsRestrictions.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/hooks/applySimultaneousChatsRestrictions.ts
@@ -43,9 +43,9 @@ callbacks.add(
 							},
 							{ 'queueInfo.chats': { $gte: maxChatsPerSetting } },
 						],
-				  }
+					}
 				: // dummy filter meaning: don't match anything
-				  { _id: '' };
+					{ _id: '' };
 
 		return { $match: { $or: [agentFilter, globalFilter] } };
 	},
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/hooks/beforeRoutingChat.ts b/apps/meteor/ee/app/livechat-enterprise/server/hooks/beforeRoutingChat.ts
index a713255e20ba..444d310b3c5f 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/hooks/beforeRoutingChat.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/hooks/beforeRoutingChat.ts
@@ -4,8 +4,8 @@ import { LivechatDepartment, LivechatInquiry, LivechatRooms } from '@rocket.chat
 import { notifyOnLivechatInquiryChanged } from '../../../../../app/lib/server/lib/notifyListener';
 import { online } from '../../../../../app/livechat/server/api/lib/livechat';
 import { allowAgentSkipQueue } from '../../../../../app/livechat/server/lib/Helper';
-import { Livechat } from '../../../../../app/livechat/server/lib/LivechatTyped';
 import { saveQueueInquiry } from '../../../../../app/livechat/server/lib/QueueManager';
+import { setDepartmentForGuest } from '../../../../../app/livechat/server/lib/departmentsLib';
 import { settings } from '../../../../../app/settings/server';
 import { callbacks } from '../../../../../lib/callbacks';
 import { cbLogger } from '../lib/logger';
@@ -35,7 +35,7 @@ callbacks.add(
 				);
 
 				// update visitor
-				await Livechat.setDepartmentForGuest({
+				await setDepartmentForGuest({
 					token: inquiry?.v?.token,
 					department: department.fallbackForwardDepartment,
 				});
@@ -63,6 +63,8 @@ callbacks.add(
 		}
 
 		await saveQueueInquiry(inquiry);
+
+		return LivechatInquiry.findOneById(inquiry._id);
 	},
 	callbacks.priority.HIGH,
 	'livechat-before-routing-chat',
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/hooks/scheduleAutoTransfer.ts b/apps/meteor/ee/app/livechat-enterprise/server/hooks/scheduleAutoTransfer.ts
index c0f4b1b9da1d..3f0183687e84 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/hooks/scheduleAutoTransfer.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/hooks/scheduleAutoTransfer.ts
@@ -1,6 +1,6 @@
 import type { IMessage, IOmnichannelRoom } from '@rocket.chat/core-typings';
 
-import type { CloseRoomParams } from '../../../../../app/livechat/server/lib/LivechatTyped';
+import type { CloseRoomParams } from '../../../../../app/livechat/server/lib/localTypes';
 import { settings } from '../../../../../app/settings/server';
 import { callbacks } from '../../../../../lib/callbacks';
 import { AutoTransferChatScheduler } from '../lib/AutoTransferChatScheduler';
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/hooks/sendPdfTranscriptOnClose.ts b/apps/meteor/ee/app/livechat-enterprise/server/hooks/sendPdfTranscriptOnClose.ts
index ee7cfc6a4c2f..ee3fa414433c 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/hooks/sendPdfTranscriptOnClose.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/hooks/sendPdfTranscriptOnClose.ts
@@ -2,7 +2,7 @@ import { OmnichannelTranscript } from '@rocket.chat/core-services';
 import type { IOmnichannelRoom } from '@rocket.chat/core-typings';
 import { isOmnichannelRoom } from '@rocket.chat/core-typings';
 
-import type { CloseRoomParams } from '../../../../../app/livechat/server/lib/LivechatTyped';
+import type { CloseRoomParams } from '../../../../../app/livechat/server/lib/localTypes';
 import { callbacks } from '../../../../../lib/callbacks';
 
 type LivechatCloseCallbackParams = {
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/lib/AutoCloseOnHoldScheduler.ts b/apps/meteor/ee/app/livechat-enterprise/server/lib/AutoCloseOnHoldScheduler.ts
index e8402534e40a..eb7d1003ff15 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/lib/AutoCloseOnHoldScheduler.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/lib/AutoCloseOnHoldScheduler.ts
@@ -6,8 +6,8 @@ import { Meteor } from 'meteor/meteor';
 import { MongoInternals } from 'meteor/mongo';
 import moment from 'moment';
 
-import { Livechat } from '../../../../../app/livechat/server/lib/LivechatTyped';
 import { schedulerLogger } from './logger';
+import { Livechat } from '../../../../../app/livechat/server/lib/LivechatTyped';
 
 const SCHEDULER_NAME = 'omnichannel_auto_close_on_hold_scheduler';
 
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/lib/AutoTransferChatScheduler.ts b/apps/meteor/ee/app/livechat-enterprise/server/lib/AutoTransferChatScheduler.ts
index b3df0c322545..45b6a64ad1b0 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/lib/AutoTransferChatScheduler.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/lib/AutoTransferChatScheduler.ts
@@ -5,11 +5,11 @@ import { LivechatRooms, Users } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
 import { MongoInternals } from 'meteor/mongo';
 
+import { schedulerLogger } from './logger';
 import { forwardRoomToAgent } from '../../../../../app/livechat/server/lib/Helper';
 import { Livechat as LivechatTyped } from '../../../../../app/livechat/server/lib/LivechatTyped';
 import { RoutingManager } from '../../../../../app/livechat/server/lib/RoutingManager';
 import { settings } from '../../../../../app/settings/server';
-import { schedulerLogger } from './logger';
 
 const SCHEDULER_NAME = 'omnichannel_scheduler';
 
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/lib/Helper.ts b/apps/meteor/ee/app/livechat-enterprise/server/lib/Helper.ts
index 3206fe9f94cc..da78d351250b 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/lib/Helper.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/lib/Helper.ts
@@ -12,13 +12,13 @@ import {
 import moment from 'moment';
 import type { Document } from 'mongodb';
 
-import { getInquirySortMechanismSetting } from '../../../../../app/livechat/server/lib/settings';
-import { settings } from '../../../../../app/settings/server';
-import { callbacks } from '../../../../../lib/callbacks';
 import { OmnichannelQueueInactivityMonitor } from './QueueInactivityMonitor';
 import { updateInquiryQueueSla } from './SlaHelper';
 import { memoizeDebounce } from './debounceByParams';
 import { logger } from './logger';
+import { getInquirySortMechanismSetting } from '../../../../../app/livechat/server/lib/settings';
+import { settings } from '../../../../../app/settings/server';
+import { callbacks } from '../../../../../lib/callbacks';
 
 type QueueInfo = {
 	message: {
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/lib/LivechatEnterprise.ts b/apps/meteor/ee/app/livechat-enterprise/server/lib/LivechatEnterprise.ts
index 4cdd11c2e0c8..821d42b9db7d 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/lib/LivechatEnterprise.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/lib/LivechatEnterprise.ts
@@ -3,11 +3,11 @@ import { Users, OmnichannelServiceLevelAgreements, LivechatTag, LivechatUnitMoni
 import { Match, check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 
+import { updateSLAInquiries } from './Helper';
+import { removeSLAFromRooms } from './SlaHelper';
 import { callbacks } from '../../../../../lib/callbacks';
 import { addUserRolesAsync } from '../../../../../server/lib/roles/addUserRoles';
 import { removeUserFromRolesAsync } from '../../../../../server/lib/roles/removeUserFromRoles';
-import { updateSLAInquiries } from './Helper';
-import { removeSLAFromRooms } from './SlaHelper';
 
 export const LivechatEnterprise = {
 	async addMonitor(username: string) {
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/lib/QueueInactivityMonitor.ts b/apps/meteor/ee/app/livechat-enterprise/server/lib/QueueInactivityMonitor.ts
index a8ffabc1f9f6..31ac11f0c2b1 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/lib/QueueInactivityMonitor.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/lib/QueueInactivityMonitor.ts
@@ -6,10 +6,10 @@ import { Meteor } from 'meteor/meteor';
 import { MongoInternals } from 'meteor/mongo';
 import type { Db } from 'mongodb';
 
+import { schedulerLogger } from './logger';
 import { Livechat } from '../../../../../app/livechat/server/lib/LivechatTyped';
 import { settings } from '../../../../../app/settings/server';
 import { i18n } from '../../../../../server/lib/i18n';
-import { schedulerLogger } from './logger';
 
 const SCHEDULER_NAME = 'omnichannel_queue_inactivity_monitor';
 
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/lib/VisitorInactivityMonitor.ts b/apps/meteor/ee/app/livechat-enterprise/server/lib/VisitorInactivityMonitor.ts
index 57b77abd930b..7bfefe5db6ed 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/lib/VisitorInactivityMonitor.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/lib/VisitorInactivityMonitor.ts
@@ -4,12 +4,12 @@ import { cronJobs } from '@rocket.chat/cron';
 import type { MainLogger } from '@rocket.chat/logger';
 import { LivechatVisitors, LivechatRooms, LivechatDepartment, Users } from '@rocket.chat/models';
 
+import { schedulerLogger } from './logger';
 import { notifyOnRoomChangedById } from '../../../../../app/lib/server/lib/notifyListener';
 import { Livechat } from '../../../../../app/livechat/server/lib/LivechatTyped';
 import { settings } from '../../../../../app/settings/server';
 import { callbacks } from '../../../../../lib/callbacks';
 import { i18n } from '../../../../../server/lib/i18n';
-import { schedulerLogger } from './logger';
 
 const isPromiseRejectedResult = (result: any): result is PromiseRejectedResult => result && result.status === 'rejected';
 
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/lib/logger.ts b/apps/meteor/ee/app/livechat-enterprise/server/lib/logger.ts
index 4e7a8eab5932..5cb6a4624de9 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/lib/logger.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/lib/logger.ts
@@ -6,5 +6,6 @@ export const queriesLogger = logger.section('Queries');
 export const helperLogger = logger.section('Helper');
 export const cbLogger = logger.section('Callbacks');
 export const bhLogger = logger.section('Business-Hours');
+export const contactLogger = logger.section('Contacts');
 
 export const schedulerLogger = new Logger('Scheduler');
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/permissions.ts b/apps/meteor/ee/app/livechat-enterprise/server/permissions.ts
index 8c4ebfa124b0..03e43c07ced3 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/permissions.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/permissions.ts
@@ -18,6 +18,8 @@ export const omnichannelEEPermissions = [
 	{ _id: 'outbound-voip-calls', roles: [adminRole, livechatManagerRole] },
 	{ _id: 'request-pdf-transcript', roles: [adminRole, livechatManagerRole, livechatMonitorRole, livechatAgentRole] },
 	{ _id: 'view-livechat-reports', roles: [adminRole, livechatManagerRole, livechatMonitorRole] },
+	{ _id: 'block-livechat-contact', roles: [adminRole, livechatManagerRole, livechatMonitorRole, livechatAgentRole] },
+	{ _id: 'unblock-livechat-contact', roles: [adminRole, livechatManagerRole, livechatMonitorRole, livechatAgentRole] },
 ];
 
 export const createPermissions = async (): Promise<void> => {
diff --git a/apps/meteor/ee/app/livechat-enterprise/server/startup.ts b/apps/meteor/ee/app/livechat-enterprise/server/startup.ts
index 1b277d6fba52..1a0a5120002d 100644
--- a/apps/meteor/ee/app/livechat-enterprise/server/startup.ts
+++ b/apps/meteor/ee/app/livechat-enterprise/server/startup.ts
@@ -1,12 +1,12 @@
 import { Meteor } from 'meteor/meteor';
 
-import { businessHourManager } from '../../../../app/livechat/server/business-hour';
-import { SingleBusinessHourBehavior } from '../../../../app/livechat/server/business-hour/Single';
-import { settings } from '../../../../app/settings/server';
 import { MultipleBusinessHoursBehavior } from './business-hour/Multiple';
 import { updatePredictedVisitorAbandonment, updateQueueInactivityTimeout } from './lib/Helper';
 import { VisitorInactivityMonitor } from './lib/VisitorInactivityMonitor';
 import { logger } from './lib/logger';
+import { businessHourManager } from '../../../../app/livechat/server/business-hour';
+import { SingleBusinessHourBehavior } from '../../../../app/livechat/server/business-hour/Single';
+import { settings } from '../../../../app/settings/server';
 import './lib/query.helper';
 
 const visitorActivityMonitor = new VisitorInactivityMonitor();
diff --git a/apps/meteor/ee/app/settings/server/settings.ts b/apps/meteor/ee/app/settings/server/settings.ts
index 60c37e542914..451f22937d30 100644
--- a/apps/meteor/ee/app/settings/server/settings.ts
+++ b/apps/meteor/ee/app/settings/server/settings.ts
@@ -1,3 +1,4 @@
+/* eslint-disable react-hooks/rules-of-hooks */
 import type { ISetting, SettingValue, LicenseModule } from '@rocket.chat/core-typings';
 import { License } from '@rocket.chat/license';
 import { Settings } from '@rocket.chat/models';
diff --git a/apps/meteor/ee/server/api/api.ts b/apps/meteor/ee/server/api/api.ts
index ee2049bb70ae..c4aa8b64030e 100644
--- a/apps/meteor/ee/server/api/api.ts
+++ b/apps/meteor/ee/server/api/api.ts
@@ -1,3 +1,4 @@
+/* eslint-disable react-hooks/rules-of-hooks */
 import { License } from '@rocket.chat/license';
 
 import { API } from '../../../app/api/server/api';
diff --git a/apps/meteor/ee/server/api/licenses.ts b/apps/meteor/ee/server/api/licenses.ts
index 9d8d60c0be51..1e5a2a90575c 100644
--- a/apps/meteor/ee/server/api/licenses.ts
+++ b/apps/meteor/ee/server/api/licenses.ts
@@ -6,6 +6,7 @@ import { check } from 'meteor/check';
 import { API } from '../../../app/api/server/api';
 import { hasPermissionAsync } from '../../../app/authorization/server/functions/hasPermission';
 import { notifyOnSettingChangedById } from '../../../app/lib/server/lib/notifyListener';
+import { updateAuditedByUser } from '../../../server/settings/lib/auditedSettingUpdates';
 
 API.v1.addRoute(
 	'licenses.info',
@@ -36,7 +37,14 @@ API.v1.addRoute(
 				return API.v1.failure('Invalid license');
 			}
 
-			(await Settings.updateValueById('Enterprise_License', license)).modifiedCount &&
+			const auditSettingOperation = updateAuditedByUser({
+				_id: this.userId,
+				username: this.user.username!,
+				ip: this.requestIp,
+				useragent: this.request.headers['user-agent'] || '',
+			});
+
+			(await auditSettingOperation(Settings.updateValueById, 'Enterprise_License', license)).modifiedCount &&
 				void notifyOnSettingChangedById('Enterprise_License');
 
 			return API.v1.success();
diff --git a/apps/meteor/ee/server/apps/appRequestsCron.ts b/apps/meteor/ee/server/apps/appRequestsCron.ts
index 4fcd48d6f08f..5e23186baca8 100644
--- a/apps/meteor/ee/server/apps/appRequestsCron.ts
+++ b/apps/meteor/ee/server/apps/appRequestsCron.ts
@@ -1,10 +1,10 @@
 import { cronJobs } from '@rocket.chat/cron';
 import { serverFetch as fetch } from '@rocket.chat/server-fetch';
 
-import { getWorkspaceAccessToken } from '../../../app/cloud/server';
-import { settings } from '../../../app/settings/server';
 import { appRequestNotififyForUsers } from './marketplace/appRequestNotifyUsers';
 import { Apps } from './orchestrator';
+import { getWorkspaceAccessToken } from '../../../app/cloud/server';
+import { settings } from '../../../app/settings/server';
 
 const appsNotifyAppRequests = async function _appsNotifyAppRequests() {
 	try {
diff --git a/apps/meteor/ee/server/apps/communication/rest.ts b/apps/meteor/ee/server/apps/communication/rest.ts
index 0283f2eef783..9f18d1353d4e 100644
--- a/apps/meteor/ee/server/apps/communication/rest.ts
+++ b/apps/meteor/ee/server/apps/communication/rest.ts
@@ -2,6 +2,7 @@ import { AppStatus, AppStatusUtils } from '@rocket.chat/apps-engine/definition/A
 import type { IAppInfo } from '@rocket.chat/apps-engine/definition/metadata';
 import type { AppManager } from '@rocket.chat/apps-engine/server/AppManager';
 import type { IUser, IMessage } from '@rocket.chat/core-typings';
+import { License } from '@rocket.chat/license';
 import { Settings, Users } from '@rocket.chat/models';
 import { serverFetch as fetch } from '@rocket.chat/server-fetch';
 import { Meteor } from 'meteor/meteor';
@@ -748,6 +749,17 @@ export class AppsRestApi {
 						return API.v1.internalError('private_app_install_disabled');
 					}
 
+					const isCommunityWorkspace = !License.hasValidLicense();
+
+					// Note: exempt apps happen when a private app was uploaded to a community workspace before
+					//       the private app restriction was enforced. We still allow the users to use their
+					//       exempt apps, but they can't update them, since they could just upload a new version
+					//       containing a totally different app under the same id :(
+					const isExemptApp = isPrivateAppUpload && isCommunityWorkspace;
+					if (isExemptApp) {
+						return API.v1.failure({ error: 'Cannot_Update_Exempt_App' });
+					}
+
 					const user = orchestrator
 						?.getConverters()
 						?.get('users')
diff --git a/apps/meteor/ee/server/apps/cron.ts b/apps/meteor/ee/server/apps/cron.ts
index f904486bf610..7800d7077c2c 100644
--- a/apps/meteor/ee/server/apps/cron.ts
+++ b/apps/meteor/ee/server/apps/cron.ts
@@ -4,10 +4,10 @@ import { cronJobs } from '@rocket.chat/cron';
 import { Settings, Users } from '@rocket.chat/models';
 import { serverFetch as fetch } from '@rocket.chat/server-fetch';
 
+import { Apps } from './orchestrator';
 import { getWorkspaceAccessToken } from '../../../app/cloud/server';
 import { i18n } from '../../../server/lib/i18n';
 import { sendMessagesToAdmins } from '../../../server/lib/sendMessagesToAdmins';
-import { Apps } from './orchestrator';
 
 const notifyAdminsAboutInvalidApps = async function _notifyAdminsAboutInvalidApps(apps?: ProxiedApp[]) {
 	if (!apps) {
diff --git a/apps/meteor/ee/server/apps/orchestrator.js b/apps/meteor/ee/server/apps/orchestrator.js
index 9c1ea6397a76..4d292543b7c1 100644
--- a/apps/meteor/ee/server/apps/orchestrator.js
+++ b/apps/meteor/ee/server/apps/orchestrator.js
@@ -5,6 +5,8 @@ import { Logger } from '@rocket.chat/logger';
 import { AppLogs, Apps as AppsModel, AppsPersistence } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
 
+import { AppServerNotifier, AppsRestApi, AppUIKitInteractionApi } from './communication';
+import { AppRealLogStorage, AppRealStorage, ConfigurableAppSourceStorage } from './storage';
 import { RealAppBridges } from '../../../app/apps/server/bridges';
 import {
 	AppMessagesConverter,
@@ -16,12 +18,11 @@ import {
 	AppUploadsConverter,
 	AppVisitorsConverter,
 	AppRolesConverter,
+	AppContactsConverter,
 } from '../../../app/apps/server/converters';
 import { AppThreadsConverter } from '../../../app/apps/server/converters/threads';
 import { settings } from '../../../app/settings/server';
 import { canEnableApp } from '../../app/license/server/canEnableApp';
-import { AppServerNotifier, AppsRestApi, AppUIKitInteractionApi } from './communication';
-import { AppRealLogStorage, AppRealStorage, ConfigurableAppSourceStorage } from './storage';
 
 function isTesting() {
 	return process.env.TEST_MODE === 'true';
@@ -63,6 +64,7 @@ export class AppServerOrchestrator {
 		this._converters.set('settings', new AppSettingsConverter(this));
 		this._converters.set('users', new AppUsersConverter(this));
 		this._converters.set('visitors', new AppVisitorsConverter(this));
+		this._converters.set('contacts', new AppContactsConverter(this));
 		this._converters.set('departments', new AppDepartmentsConverter(this));
 		this._converters.set('uploads', new AppUploadsConverter(this));
 		this._converters.set('videoConferences', new AppVideoConferencesConverter());
diff --git a/apps/meteor/ee/server/apps/startup.ts b/apps/meteor/ee/server/apps/startup.ts
index a8bc78a184f1..323fcd007956 100644
--- a/apps/meteor/ee/server/apps/startup.ts
+++ b/apps/meteor/ee/server/apps/startup.ts
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 
-import { settings, settingsRegistry } from '../../../app/settings/server';
 import { Apps } from './orchestrator';
+import { settings, settingsRegistry } from '../../../app/settings/server';
 
 Meteor.startup(async function _appServerOrchestrator() {
 	await settingsRegistry.addGroup('General', async function () {
diff --git a/apps/meteor/ee/server/apps/storage/ConfigurableAppSourceStorage.ts b/apps/meteor/ee/server/apps/storage/ConfigurableAppSourceStorage.ts
index 42a0b5d3e40c..ee70cd38b409 100644
--- a/apps/meteor/ee/server/apps/storage/ConfigurableAppSourceStorage.ts
+++ b/apps/meteor/ee/server/apps/storage/ConfigurableAppSourceStorage.ts
@@ -11,7 +11,10 @@ export class ConfigurableAppSourceStorage extends AppSourceStorage {
 
 	private storage: AppSourceStorage;
 
-	constructor(readonly storageType: string, filesystemStoragePath: string) {
+	constructor(
+		readonly storageType: string,
+		filesystemStoragePath: string,
+	) {
 		super();
 
 		this.filesystem = new AppFileSystemSourceStorage();
diff --git a/apps/meteor/ee/server/apps/storage/index.js b/apps/meteor/ee/server/apps/storage/index.ts
similarity index 100%
rename from apps/meteor/ee/server/apps/storage/index.js
rename to apps/meteor/ee/server/apps/storage/index.ts
diff --git a/apps/meteor/ee/server/configuration/contact-verification.ts b/apps/meteor/ee/server/configuration/contact-verification.ts
new file mode 100644
index 000000000000..768942f4de92
--- /dev/null
+++ b/apps/meteor/ee/server/configuration/contact-verification.ts
@@ -0,0 +1,5 @@
+import { addSettings } from '../settings/contact-verification';
+
+Meteor.startup(async () => {
+	await addSettings();
+});
diff --git a/apps/meteor/ee/server/configuration/index.ts b/apps/meteor/ee/server/configuration/index.ts
index 09160ef39a26..6469ef287d83 100644
--- a/apps/meteor/ee/server/configuration/index.ts
+++ b/apps/meteor/ee/server/configuration/index.ts
@@ -1,3 +1,4 @@
+import './contact-verification';
 import './ldap';
 import './oauth';
 import './outlookCalendar';
diff --git a/apps/meteor/ee/server/configuration/videoConference.ts b/apps/meteor/ee/server/configuration/videoConference.ts
index 035110904840..2fd6e31fba95 100644
--- a/apps/meteor/ee/server/configuration/videoConference.ts
+++ b/apps/meteor/ee/server/configuration/videoConference.ts
@@ -38,7 +38,7 @@ Meteor.startup(async () => {
 				}
 			}
 
-			if ((await Subscriptions.findByRoomId(_id).count()) > 10) {
+			if ((await Subscriptions.countByRoomId(_id)) > 10) {
 				return false;
 			}
 
diff --git a/apps/meteor/ee/server/lib/engagementDashboard/channels.ts b/apps/meteor/ee/server/lib/engagementDashboard/channels.ts
index 7d08086ee1e9..b302f4c586ae 100644
--- a/apps/meteor/ee/server/lib/engagementDashboard/channels.ts
+++ b/apps/meteor/ee/server/lib/engagementDashboard/channels.ts
@@ -2,8 +2,8 @@ import type { IDirectMessageRoom, IRoom } from '@rocket.chat/core-typings';
 import { Analytics, Rooms } from '@rocket.chat/models';
 import moment from 'moment';
 
-import { roomCoordinator } from '../../../../server/lib/rooms/roomCoordinator';
 import { convertDateToInt, diffBetweenDaysInclusive } from './date';
+import { roomCoordinator } from '../../../../server/lib/rooms/roomCoordinator';
 
 export const findChannelsWithNumberOfMessages = async ({
 	start,
diff --git a/apps/meteor/ee/server/lib/engagementDashboard/messages.ts b/apps/meteor/ee/server/lib/engagementDashboard/messages.ts
index 2a4bf67c12c5..e3d99ac3039a 100644
--- a/apps/meteor/ee/server/lib/engagementDashboard/messages.ts
+++ b/apps/meteor/ee/server/lib/engagementDashboard/messages.ts
@@ -2,8 +2,8 @@ import type { IDirectMessageRoom, IRoom, IMessage } from '@rocket.chat/core-typi
 import { Messages, Analytics } from '@rocket.chat/models';
 import moment from 'moment';
 
-import { roomCoordinator } from '../../../../server/lib/rooms/roomCoordinator';
 import { convertDateToInt, diffBetweenDaysInclusive, convertIntToDate, getTotalOfWeekItems } from './date';
+import { roomCoordinator } from '../../../../server/lib/rooms/roomCoordinator';
 
 export const handleMessagesSent = async (message: IMessage, { room }: { room?: IRoom }): Promise<IMessage> => {
 	const roomTypesToShow = roomCoordinator.getTypesToShowOnDashboard();
diff --git a/apps/meteor/ee/server/lib/engagementDashboard/startup.ts b/apps/meteor/ee/server/lib/engagementDashboard/startup.ts
index 415e0323d525..264e19d907b1 100644
--- a/apps/meteor/ee/server/lib/engagementDashboard/startup.ts
+++ b/apps/meteor/ee/server/lib/engagementDashboard/startup.ts
@@ -1,6 +1,6 @@
-import { callbacks } from '../../../../lib/callbacks';
 import { fillFirstDaysOfMessagesIfNeeded, handleMessagesDeleted, handleMessagesSent } from './messages';
 import { fillFirstDaysOfUsersIfNeeded, handleUserCreated } from './users';
+import { callbacks } from '../../../../lib/callbacks';
 
 export const attachCallbacks = (): void => {
 	callbacks.add(
diff --git a/apps/meteor/ee/server/lib/ldap/copyCustomFieldsLDAP.ts b/apps/meteor/ee/server/lib/ldap/copyCustomFieldsLDAP.ts
index 5d8bf044bc28..3be64c25bffe 100644
--- a/apps/meteor/ee/server/lib/ldap/copyCustomFieldsLDAP.ts
+++ b/apps/meteor/ee/server/lib/ldap/copyCustomFieldsLDAP.ts
@@ -1,9 +1,9 @@
 import type { IImportUser, ILDAPEntry } from '@rocket.chat/core-typings';
 import type { Logger } from '@rocket.chat/logger';
 
+import { replacesNestedValues } from './replacesNestedValues';
 import { templateVarHandler } from '../../../../app/utils/lib/templateVarHandler';
 import { getNestedProp } from '../../../../server/lib/getNestedProp';
-import { replacesNestedValues } from './replacesNestedValues';
 
 export const copyCustomFieldsLDAP = (
 	{
diff --git a/apps/meteor/ee/server/local-services/federation/application/UserService.ts b/apps/meteor/ee/server/local-services/federation/application/UserService.ts
index 52e448f723cd..d2f3bbab382f 100644
--- a/apps/meteor/ee/server/local-services/federation/application/UserService.ts
+++ b/apps/meteor/ee/server/local-services/federation/application/UserService.ts
@@ -1,8 +1,8 @@
+import { AbstractFederationApplicationServiceEE } from './AbstractFederationApplicationServiceEE';
 import type { RocketChatFileAdapter } from '../../../../../server/services/federation/infrastructure/rocket-chat/adapters/File';
 import type { RocketChatSettingsAdapter } from '../../../../../server/services/federation/infrastructure/rocket-chat/adapters/Settings';
 import type { IFederationBridgeEE } from '../domain/IFederationBridge';
 import type { RocketChatUserAdapterEE } from '../infrastructure/rocket-chat/adapters/User';
-import { AbstractFederationApplicationServiceEE } from './AbstractFederationApplicationServiceEE';
 
 const DEFAULT_SERVERS = [
 	{
diff --git a/apps/meteor/ee/server/local-services/federation/infrastructure/matrix/Bridge.ts b/apps/meteor/ee/server/local-services/federation/infrastructure/matrix/Bridge.ts
index ed2ff2e95744..11bfa8e29228 100644
--- a/apps/meteor/ee/server/local-services/federation/infrastructure/matrix/Bridge.ts
+++ b/apps/meteor/ee/server/local-services/federation/infrastructure/matrix/Bridge.ts
@@ -11,7 +11,10 @@ import type { IFederationBridgeEE, IFederationPublicRoomsResult, IFederationSear
 const DEFAULT_TIMEOUT_IN_MS = 10000;
 
 export class MatrixBridgeEE extends MatrixBridge implements IFederationBridgeEE {
-	constructor(protected internalSettings: RocketChatSettingsAdapter, protected eventHandler: (event: AbstractMatrixEvent) => void) {
+	constructor(
+		protected internalSettings: RocketChatSettingsAdapter,
+		protected eventHandler: (event: AbstractMatrixEvent) => void,
+	) {
 		super(internalSettings, eventHandler);
 	}
 
diff --git a/apps/meteor/ee/server/local-services/federation/infrastructure/rocket-chat/slash-commands/index.ts b/apps/meteor/ee/server/local-services/federation/infrastructure/rocket-chat/slash-commands/index.ts
index 7e2bcd0ecf40..43fdba34cca8 100644
--- a/apps/meteor/ee/server/local-services/federation/infrastructure/rocket-chat/slash-commands/index.ts
+++ b/apps/meteor/ee/server/local-services/federation/infrastructure/rocket-chat/slash-commands/index.ts
@@ -1,8 +1,8 @@
 import { FederationEE } from '@rocket.chat/core-services';
 import type { SlashCommandCallbackParams } from '@rocket.chat/core-typings';
 
-import { slashCommands } from '../../../../../../../app/utils/server/slashCommand';
 import { executeSlashCommand } from './action';
+import { slashCommands } from '../../../../../../../app/utils/server/slashCommand';
 
 const EE_FEDERATION_COMMANDS = {
 	dm: async (currentUserId: string, _: string, invitees: string[]): Promise<void> =>
diff --git a/apps/meteor/ee/server/local-services/federation/service.ts b/apps/meteor/ee/server/local-services/federation/service.ts
index 5c6e210aefb8..5e813caf928a 100644
--- a/apps/meteor/ee/server/local-services/federation/service.ts
+++ b/apps/meteor/ee/server/local-services/federation/service.ts
@@ -6,7 +6,6 @@ import type {
 import type { IRoom } from '@rocket.chat/core-typings';
 import type { FederationPaginatedResult, IFederationPublicRooms } from '@rocket.chat/rest-typings';
 
-import { AbstractFederationService } from '../../../../server/services/federation/service';
 import type { FederationUserServiceEE } from './application/UserService';
 import type { FederationDirectMessageRoomServiceSender } from './application/room/sender/DirectMessageRoomServiceSender';
 import type { FederationRoomServiceSender } from './application/room/sender/RoomServiceSender';
@@ -16,6 +15,7 @@ import { FederationFactoryEE } from './infrastructure/Factory';
 import type { RocketChatRoomAdapterEE } from './infrastructure/rocket-chat/adapters/Room';
 import type { RocketChatUserAdapterEE } from './infrastructure/rocket-chat/adapters/User';
 import { FederationRoomSenderConverterEE } from './infrastructure/rocket-chat/converters/RoomSender';
+import { AbstractFederationService } from '../../../../server/services/federation/service';
 
 abstract class AbstractBaseFederationServiceEE extends AbstractFederationService {
 	protected internalUserServiceEE: FederationUserServiceEE;
diff --git a/apps/meteor/ee/server/local-services/instance/getLogger.ts b/apps/meteor/ee/server/local-services/instance/getLogger.ts
index bbab1ad28a6f..ef9cbad0aba6 100644
--- a/apps/meteor/ee/server/local-services/instance/getLogger.ts
+++ b/apps/meteor/ee/server/local-services/instance/getLogger.ts
@@ -25,7 +25,7 @@ export function getLogger({ MOLECULER_LOG_LEVEL: level, NODE_ENV: mode }: Record
 											colorize: true,
 										},
 									},
-							  }
+								}
 							: {}),
 					},
 				},
diff --git a/apps/meteor/ee/server/local-services/instance/service.ts b/apps/meteor/ee/server/local-services/instance/service.ts
index 5da11ede98d6..a7e921511a62 100644
--- a/apps/meteor/ee/server/local-services/instance/service.ts
+++ b/apps/meteor/ee/server/local-services/instance/service.ts
@@ -7,10 +7,10 @@ import EJSON from 'ejson';
 import type { BrokerNode } from 'moleculer';
 import { ServiceBroker, Transporters, Serializers } from 'moleculer';
 
-import { StreamerCentral } from '../../../../server/modules/streamer/streamer.module';
-import type { IInstanceService } from '../../sdk/types/IInstanceService';
 import { getLogger } from './getLogger';
 import { getTransporter } from './getTransporter';
+import { StreamerCentral } from '../../../../server/modules/streamer/streamer.module';
+import type { IInstanceService } from '../../sdk/types/IInstanceService';
 
 const hostIP = process.env.INSTANCE_IP ? String(process.env.INSTANCE_IP).trim() : 'localhost';
 
diff --git a/apps/meteor/ee/server/models/AuditLog.ts b/apps/meteor/ee/server/models/AuditLog.ts
index c03fa19a4e98..1091b5ee16d3 100644
--- a/apps/meteor/ee/server/models/AuditLog.ts
+++ b/apps/meteor/ee/server/models/AuditLog.ts
@@ -1,7 +1,7 @@
 import { registerModel } from '@rocket.chat/models';
 
+import { AuditLogRaw } from './raw/AuditLog';
 import { trashCollection } from '../../../server/database/trash';
 import { db } from '../../../server/database/utils';
-import { AuditLogRaw } from './raw/AuditLog';
 
 registerModel('IAuditLogModel', new AuditLogRaw(db, trashCollection));
diff --git a/apps/meteor/ee/server/models/CannedResponse.ts b/apps/meteor/ee/server/models/CannedResponse.ts
index 7d4fa2052d30..9c89c51aa8e9 100644
--- a/apps/meteor/ee/server/models/CannedResponse.ts
+++ b/apps/meteor/ee/server/models/CannedResponse.ts
@@ -1,6 +1,6 @@
 import { registerModel } from '@rocket.chat/models';
 
-import { db } from '../../../server/database/utils';
 import { CannedResponseRaw } from './raw/CannedResponse';
+import { db } from '../../../server/database/utils';
 
 registerModel('ICannedResponseModel', new CannedResponseRaw(db));
diff --git a/apps/meteor/ee/server/models/LivechatDepartment.ts b/apps/meteor/ee/server/models/LivechatDepartment.ts
index 19cc931644b6..ea1f5fe5f9c8 100644
--- a/apps/meteor/ee/server/models/LivechatDepartment.ts
+++ b/apps/meteor/ee/server/models/LivechatDepartment.ts
@@ -1,7 +1,7 @@
 import { registerModel } from '@rocket.chat/models';
 
+import { LivechatDepartmentEE } from './raw/LivechatDepartment';
 import { trashCollection } from '../../../server/database/trash';
 import { db } from '../../../server/database/utils';
-import { LivechatDepartmentEE } from './raw/LivechatDepartment';
 
 registerModel('ILivechatDepartmentModel', new LivechatDepartmentEE(db, trashCollection));
diff --git a/apps/meteor/ee/server/models/LivechatDepartmentAgents.ts b/apps/meteor/ee/server/models/LivechatDepartmentAgents.ts
index 0b521209a3a6..4365a750b010 100644
--- a/apps/meteor/ee/server/models/LivechatDepartmentAgents.ts
+++ b/apps/meteor/ee/server/models/LivechatDepartmentAgents.ts
@@ -1,7 +1,7 @@
 import { registerModel } from '@rocket.chat/models';
 
+import { LivechatDepartmentAgents } from './raw/LivechatDepartmentAgents';
 import { trashCollection } from '../../../server/database/trash';
 import { db } from '../../../server/database/utils';
-import { LivechatDepartmentAgents } from './raw/LivechatDepartmentAgents';
 
 registerModel('ILivechatDepartmentAgentsModel', new LivechatDepartmentAgents(db, trashCollection));
diff --git a/apps/meteor/ee/server/models/LivechatInquiry.ts b/apps/meteor/ee/server/models/LivechatInquiry.ts
index 73392b703794..9a5eef093555 100644
--- a/apps/meteor/ee/server/models/LivechatInquiry.ts
+++ b/apps/meteor/ee/server/models/LivechatInquiry.ts
@@ -1,7 +1,7 @@
 import { registerModel } from '@rocket.chat/models';
 
+import { LivechatInquiryRawEE } from './raw/LivechatInquiry';
 import { trashCollection } from '../../../server/database/trash';
 import { db } from '../../../server/database/utils';
-import { LivechatInquiryRawEE } from './raw/LivechatInquiry';
 
 registerModel('ILivechatInquiryModel', new LivechatInquiryRawEE(db, trashCollection));
diff --git a/apps/meteor/ee/server/models/LivechatPriority.ts b/apps/meteor/ee/server/models/LivechatPriority.ts
index 54ccce4886ce..c6d3b0ecf96a 100644
--- a/apps/meteor/ee/server/models/LivechatPriority.ts
+++ b/apps/meteor/ee/server/models/LivechatPriority.ts
@@ -1,6 +1,6 @@
 import { registerModel } from '@rocket.chat/models';
 
-import { db } from '../../../server/database/utils';
 import { LivechatPriorityRaw } from './raw/LivechatPriority';
+import { db } from '../../../server/database/utils';
 
 registerModel('ILivechatPriorityModel', new LivechatPriorityRaw(db));
diff --git a/apps/meteor/ee/server/models/LivechatRooms.ts b/apps/meteor/ee/server/models/LivechatRooms.ts
index 16395b7c8afd..1fbfca5ee907 100644
--- a/apps/meteor/ee/server/models/LivechatRooms.ts
+++ b/apps/meteor/ee/server/models/LivechatRooms.ts
@@ -1,7 +1,7 @@
 import { registerModel } from '@rocket.chat/models';
 
+import { LivechatRoomsRawEE } from './raw/LivechatRooms';
 import { trashCollection } from '../../../server/database/trash';
 import { db } from '../../../server/database/utils';
-import { LivechatRoomsRawEE } from './raw/LivechatRooms';
 
 registerModel('ILivechatRoomsModel', new LivechatRoomsRawEE(db, trashCollection));
diff --git a/apps/meteor/ee/server/models/LivechatTag.ts b/apps/meteor/ee/server/models/LivechatTag.ts
index 28203b151a6b..d443b53cb88f 100644
--- a/apps/meteor/ee/server/models/LivechatTag.ts
+++ b/apps/meteor/ee/server/models/LivechatTag.ts
@@ -1,6 +1,6 @@
 import { registerModel } from '@rocket.chat/models';
 
-import { db } from '../../../server/database/utils';
 import { LivechatTagRaw } from './raw/LivechatTag';
+import { db } from '../../../server/database/utils';
 
 registerModel('ILivechatTagModel', new LivechatTagRaw(db));
diff --git a/apps/meteor/ee/server/models/LivechatUnit.ts b/apps/meteor/ee/server/models/LivechatUnit.ts
index 223e77a24d1f..a80893d622c1 100644
--- a/apps/meteor/ee/server/models/LivechatUnit.ts
+++ b/apps/meteor/ee/server/models/LivechatUnit.ts
@@ -1,7 +1,7 @@
 import { registerModel } from '@rocket.chat/models';
 
-import { db } from '../../../server/database/utils';
 import { LivechatUnitRaw } from './raw/LivechatUnit';
+import { db } from '../../../server/database/utils';
 
 // @ts-expect-error - Overriding base types :)
 registerModel('ILivechatUnitModel', new LivechatUnitRaw(db));
diff --git a/apps/meteor/ee/server/models/LivechatUnitMonitors.ts b/apps/meteor/ee/server/models/LivechatUnitMonitors.ts
index 2c241048da79..aa0eeabe202b 100644
--- a/apps/meteor/ee/server/models/LivechatUnitMonitors.ts
+++ b/apps/meteor/ee/server/models/LivechatUnitMonitors.ts
@@ -1,6 +1,6 @@
 import { registerModel } from '@rocket.chat/models';
 
-import { db } from '../../../server/database/utils';
 import { LivechatUnitMonitorsRaw } from './raw/LivechatUnitMonitors';
+import { db } from '../../../server/database/utils';
 
 registerModel('ILivechatUnitMonitorsModel', new LivechatUnitMonitorsRaw(db));
diff --git a/apps/meteor/ee/server/models/OmnichannelServiceLevelAgreements.ts b/apps/meteor/ee/server/models/OmnichannelServiceLevelAgreements.ts
index 6960829c32ea..717415ed7431 100644
--- a/apps/meteor/ee/server/models/OmnichannelServiceLevelAgreements.ts
+++ b/apps/meteor/ee/server/models/OmnichannelServiceLevelAgreements.ts
@@ -1,6 +1,6 @@
 import { registerModel } from '@rocket.chat/models';
 
-import { db } from '../../../server/database/utils';
 import { ServiceLevelAgreements } from './raw/ServiceLevelAgreements';
+import { db } from '../../../server/database/utils';
 
 registerModel('IOmnichannelServiceLevelAgreementsModel', new ServiceLevelAgreements(db));
diff --git a/apps/meteor/ee/server/models/ReadReceipts.ts b/apps/meteor/ee/server/models/ReadReceipts.ts
index 079c7c34a6a8..63460131c3b9 100644
--- a/apps/meteor/ee/server/models/ReadReceipts.ts
+++ b/apps/meteor/ee/server/models/ReadReceipts.ts
@@ -1,6 +1,6 @@
 import { registerModel } from '@rocket.chat/models';
 
-import { db } from '../../../server/database/utils';
 import { ReadReceiptsRaw } from './raw/ReadReceipts';
+import { db } from '../../../server/database/utils';
 
 registerModel('IReadReceiptsModel', new ReadReceiptsRaw(db));
diff --git a/apps/meteor/ee/server/models/Users.ts b/apps/meteor/ee/server/models/Users.ts
index c1862d035911..3e0b558ec400 100644
--- a/apps/meteor/ee/server/models/Users.ts
+++ b/apps/meteor/ee/server/models/Users.ts
@@ -1,7 +1,7 @@
 import { registerModel } from '@rocket.chat/models';
 
+import { UsersEE } from './raw/Users';
 import { trashCollection } from '../../../server/database/trash';
 import { db } from '../../../server/database/utils';
-import { UsersEE } from './raw/Users';
 
 registerModel('IUsersModel', new UsersEE(db, trashCollection));
diff --git a/apps/meteor/ee/server/models/raw/LivechatRooms.ts b/apps/meteor/ee/server/models/raw/LivechatRooms.ts
index 5b89704a522c..9e8cdc0b8486 100644
--- a/apps/meteor/ee/server/models/raw/LivechatRooms.ts
+++ b/apps/meteor/ee/server/models/raw/LivechatRooms.ts
@@ -4,11 +4,13 @@ import type {
 	IOmnichannelServiceLevelAgreements,
 	RocketChatRecordDeleted,
 	ReportResult,
+	ILivechatContact,
 } from '@rocket.chat/core-typings';
 import { LivechatPriorityWeight, DEFAULT_SLA_CONFIG } from '@rocket.chat/core-typings';
-import type { ILivechatRoomsModel } from '@rocket.chat/model-typings';
+import type { FindPaginated, ILivechatRoomsModel } from '@rocket.chat/model-typings';
 import type { Updater } from '@rocket.chat/models';
-import type { FindCursor, UpdateResult, Document, FindOptions, Db, Collection, Filter, AggregationCursor } from 'mongodb';
+import { escapeRegExp } from '@rocket.chat/string-helpers';
+import type { FindCursor, UpdateResult, Document, FindOptions, Db, Collection, Filter, AggregationCursor, UpdateOptions } from 'mongodb';
 
 import { readSecondaryPreferred } from '../../../../server/database/readSecondaryPreferred';
 import { LivechatRoomsRaw } from '../../../../server/models/raw/LivechatRooms';
@@ -66,6 +68,11 @@ declare module '@rocket.chat/model-typings' {
 		getConversationsWithoutTagsBetweenDate(start: Date, end: Date, extraQuery: Filter<IOmnichannelRoom>): Promise<number>;
 		getTotalConversationsWithoutAgentsBetweenDate(start: Date, end: Date, extraQuery: Filter<IOmnichannelRoom>): Promise<number>;
 		getTotalConversationsWithoutDepartmentBetweenDates(start: Date, end: Date, extraQuery: Filter<IOmnichannelRoom>): Promise<number>;
+		updateMergedContactIds(
+			contactIdsThatWereMerged: ILivechatContact['_id'][],
+			newContactId: ILivechatContact['_id'],
+			options?: UpdateOptions,
+		): Promise<UpdateResult | Document>;
 	}
 }
 
@@ -726,4 +733,33 @@ export class LivechatRoomsRawEE extends LivechatRoomsRaw implements ILivechatRoo
 			...extraQuery,
 		});
 	}
+
+	updateMergedContactIds(
+		contactIdsThatWereMerged: ILivechatContact['_id'][],
+		newContactId: ILivechatContact['_id'],
+		options?: UpdateOptions,
+	): Promise<UpdateResult | Document> {
+		return this.updateMany({ contactId: { $in: contactIdsThatWereMerged } }, { $set: { contactId: newContactId } }, options);
+	}
+
+	findClosedRoomsByContactAndSourcePaginated({
+		contactId,
+		source,
+		options = {},
+	}: {
+		contactId: string;
+		source?: string;
+		options?: FindOptions;
+	}): FindPaginated<FindCursor<IOmnichannelRoom>> {
+		return this.findPaginated<IOmnichannelRoom>(
+			{
+				contactId,
+				closedAt: { $exists: true },
+				...(source && {
+					$or: [{ 'source.type': new RegExp(escapeRegExp(source), 'i') }, { 'source.alias': new RegExp(escapeRegExp(source), 'i') }],
+				}),
+			},
+			options,
+		);
+	}
 }
diff --git a/apps/meteor/ee/server/models/raw/Users.ts b/apps/meteor/ee/server/models/raw/Users.ts
index f7ff7af76c12..20e6e0eb7962 100644
--- a/apps/meteor/ee/server/models/raw/Users.ts
+++ b/apps/meteor/ee/server/models/raw/Users.ts
@@ -47,7 +47,7 @@ export class UsersEE extends UsersRaw {
 					{
 						$match: { department: { $size: 1 } },
 					},
-			  ]
+				]
 			: [];
 
 		return this.col
diff --git a/apps/meteor/ee/server/patches/fetchContactHistory.ts b/apps/meteor/ee/server/patches/fetchContactHistory.ts
new file mode 100644
index 000000000000..6eb288eed12d
--- /dev/null
+++ b/apps/meteor/ee/server/patches/fetchContactHistory.ts
@@ -0,0 +1,21 @@
+import { License } from '@rocket.chat/license';
+import { LivechatRooms } from '@rocket.chat/models';
+
+import { fetchContactHistory } from '../../../app/livechat/server/lib/contacts/getContactHistory';
+
+fetchContactHistory.patch(
+	async (next, params) => {
+		const { contactId, options, extraParams } = params;
+
+		if (!extraParams?.source || typeof extraParams.source !== 'string') {
+			return next(params);
+		}
+
+		return LivechatRooms.findClosedRoomsByContactAndSourcePaginated({
+			contactId,
+			source: extraParams.source,
+			options,
+		});
+	},
+	() => License.hasModule('contact-id-verification'),
+);
diff --git a/apps/meteor/ee/server/patches/index.ts b/apps/meteor/ee/server/patches/index.ts
index 9e6cab1e0924..644761a74da2 100644
--- a/apps/meteor/ee/server/patches/index.ts
+++ b/apps/meteor/ee/server/patches/index.ts
@@ -1,4 +1,7 @@
 import './closeBusinessHour';
 import './getInstanceList';
 import './isDepartmentCreationAvailable';
+import './verifyContactChannel';
+import './mergeContacts';
+import './isAgentAvailableToTakeContactInquiry';
 import './airGappedRestrictionsWrapper';
diff --git a/apps/meteor/ee/server/patches/isAgentAvailableToTakeContactInquiry.ts b/apps/meteor/ee/server/patches/isAgentAvailableToTakeContactInquiry.ts
new file mode 100644
index 000000000000..4f85d07f5b16
--- /dev/null
+++ b/apps/meteor/ee/server/patches/isAgentAvailableToTakeContactInquiry.ts
@@ -0,0 +1,41 @@
+import type { ILivechatContact, ILivechatVisitor, IOmnichannelSource } from '@rocket.chat/core-typings';
+import { License } from '@rocket.chat/license';
+import { LivechatContacts } from '@rocket.chat/models';
+
+import { isAgentAvailableToTakeContactInquiry } from '../../../app/livechat/server/lib/contacts/isAgentAvailableToTakeContactInquiry';
+import { isVerifiedChannelInSource } from '../../../app/livechat/server/lib/contacts/isVerifiedChannelInSource';
+import { settings } from '../../../app/settings/server';
+
+// If the contact is unknown and the setting to block unknown contacts is on, we must not allow the agent to take this inquiry
+// if the contact is not verified in this channel and the block unverified contacts setting is on, we should not allow the inquiry to be taken
+// otherwise, the contact is allowed to be taken
+export const runIsAgentAvailableToTakeContactInquiry = async (
+	_next: any,
+	visitorId: ILivechatVisitor['_id'],
+	source: IOmnichannelSource,
+	contactId: ILivechatContact['_id'],
+): Promise<{ error: string; value: false } | { value: true }> => {
+	const contact = await LivechatContacts.findOneById<Pick<ILivechatContact, '_id' | 'unknown' | 'channels'>>(contactId, {
+		projection: {
+			unknown: 1,
+			channels: 1,
+		},
+	});
+
+	if (!contact) {
+		return { value: false, error: 'error-invalid-contact' };
+	}
+
+	if (contact.unknown && settings.get<boolean>('Livechat_Block_Unknown_Contacts')) {
+		return { value: false, error: 'error-unknown-contact' };
+	}
+
+	const isContactVerified = (contact.channels.filter((channel) => isVerifiedChannelInSource(channel, visitorId, source)) || []).length > 0;
+	if (!isContactVerified && settings.get<boolean>('Livechat_Block_Unverified_Contacts')) {
+		return { value: false, error: 'error-unverified-contact' };
+	}
+
+	return { value: true };
+};
+
+isAgentAvailableToTakeContactInquiry.patch(runIsAgentAvailableToTakeContactInquiry, () => License.hasModule('contact-id-verification'));
diff --git a/apps/meteor/ee/server/patches/mergeContacts.ts b/apps/meteor/ee/server/patches/mergeContacts.ts
new file mode 100644
index 000000000000..1f93e1731a82
--- /dev/null
+++ b/apps/meteor/ee/server/patches/mergeContacts.ts
@@ -0,0 +1,56 @@
+import type { ILivechatContact, ILivechatContactChannel, ILivechatContactVisitorAssociation } from '@rocket.chat/core-typings';
+import { License } from '@rocket.chat/license';
+import { LivechatContacts, LivechatRooms } from '@rocket.chat/models';
+import type { ClientSession } from 'mongodb';
+
+import { isSameChannel } from '../../../app/livechat/lib/isSameChannel';
+import { ContactMerger } from '../../../app/livechat/server/lib/contacts/ContactMerger';
+import { mergeContacts } from '../../../app/livechat/server/lib/contacts/mergeContacts';
+import { contactLogger as logger } from '../../app/livechat-enterprise/server/lib/logger';
+
+export const runMergeContacts = async (
+	_next: any,
+	contactId: string,
+	visitor: ILivechatContactVisitorAssociation,
+	session?: ClientSession,
+): Promise<ILivechatContact | null> => {
+	const originalContact = await LivechatContacts.findOneById(contactId, { session });
+	if (!originalContact) {
+		throw new Error('error-invalid-contact');
+	}
+
+	const channel = originalContact.channels.find((channel: ILivechatContactChannel) => isSameChannel(channel.visitor, visitor));
+	if (!channel) {
+		throw new Error('error-invalid-channel');
+	}
+
+	logger.debug({ msg: 'Getting similar contacts', contactId });
+
+	const similarContacts: ILivechatContact[] = await LivechatContacts.findSimilarVerifiedContacts(channel, contactId, { session });
+
+	if (!similarContacts.length) {
+		logger.debug({ msg: 'No similar contacts found', contactId });
+		return originalContact;
+	}
+
+	logger.debug({ msg: `Found ${similarContacts.length} contacts to merge`, contactId });
+	for await (const similarContact of similarContacts) {
+		const fields = ContactMerger.getAllFieldsFromContact(similarContact);
+		await ContactMerger.mergeFieldsIntoContact({ fields, contact: originalContact, session });
+	}
+
+	const similarContactIds = similarContacts.map((c) => c._id);
+	const { deletedCount } = await LivechatContacts.deleteMany({ _id: { $in: similarContactIds } }, { session });
+	logger.info({
+		msg: `${deletedCount} contacts have been deleted and merged`,
+		deletedContactIds: similarContactIds,
+		contactId,
+	});
+
+	logger.debug({ msg: 'Updating rooms with new contact id', contactId });
+	await LivechatRooms.updateMergedContactIds(similarContactIds, contactId, { session });
+
+	return LivechatContacts.findOneById(contactId, { session });
+};
+
+mergeContacts.patch(runMergeContacts, () => License.hasModule('contact-id-verification'));
diff --git a/apps/meteor/ee/server/patches/verifyContactChannel.ts b/apps/meteor/ee/server/patches/verifyContactChannel.ts
new file mode 100644
index 000000000000..f26419d57e18
--- /dev/null
+++ b/apps/meteor/ee/server/patches/verifyContactChannel.ts
@@ -0,0 +1,116 @@
+import { LivechatInquiryStatus } from '@rocket.chat/core-typings';
+import type { ILivechatContact, IOmnichannelRoom } from '@rocket.chat/core-typings';
+import { License } from '@rocket.chat/license';
+import { LivechatContacts, LivechatInquiry, LivechatRooms } from '@rocket.chat/models';
+
+import { QueueManager } from '../../../app/livechat/server/lib/QueueManager';
+import { mergeContacts } from '../../../app/livechat/server/lib/contacts/mergeContacts';
+import { verifyContactChannel } from '../../../app/livechat/server/lib/contacts/verifyContactChannel';
+import { client, shouldRetryTransaction } from '../../../server/database/utils';
+import { contactLogger as logger } from '../../app/livechat-enterprise/server/lib/logger';
+
+type VerifyContactChannelParams = {
+	contactId: string;
+	field: string;
+	value: string;
+	visitorId: string;
+	roomId: string;
+};
+
+async function _verifyContactChannel(
+	params: VerifyContactChannelParams,
+	room: Pick<IOmnichannelRoom, '_id' | 'source'>,
+	attempts = 2,
+): Promise<ILivechatContact | null> {
+	const { contactId, field, value, visitorId, roomId } = params;
+
+	const session = client.startSession();
+	try {
+		session.startTransaction();
+		logger.debug({ msg: 'Start verifying contact channel', contactId, visitorId, roomId });
+
+		await LivechatContacts.updateContactChannel(
+			{
+				visitorId,
+				source: room.source,
+			},
+			{
+				verified: true,
+				verifiedAt: new Date(),
+				field,
+				value: value.toLowerCase(),
+			},
+			{},
+			{ session },
+		);
+
+		await LivechatRooms.update({ _id: roomId }, { $set: { verified: true } }, { session });
+		logger.debug({ msg: 'Merging contacts', contactId, visitorId, roomId });
+
+		const mergeContactsResult = await mergeContacts(contactId, { visitorId, source: room.source }, session);
+
+		await session.commitTransaction();
+
+		return mergeContactsResult;
+	} catch (e) {
+		await session.abortTransaction();
+		if (shouldRetryTransaction(e) && attempts > 0) {
+			logger.debug({ msg: 'Retrying to verify contact channel', contactId, visitorId, roomId });
+			return _verifyContactChannel(params, room, attempts - 1);
+		}
+
+		logger.error({ msg: 'Error verifying contact channel', contactId, visitorId, roomId, error: e });
+		throw new Error('error-verifying-contact-channel');
+	} finally {
+		await session.endSession();
+	}
+}
+
+export const runVerifyContactChannel = async (
+	_next: any,
+	params: {
+		contactId: string;
+		field: string;
+		value: string;
+		visitorId: string;
+		roomId: string;
+	},
+): Promise<ILivechatContact | null> => {
+	const { roomId, contactId, visitorId } = params;
+
+	const room = await LivechatRooms.findOneById(roomId);
+	if (!room) {
+		throw new Error('error-invalid-room');
+	}
+
+	const result = await _verifyContactChannel(params, room);
+
+	logger.debug({ msg: 'Finding inquiry', roomId });
+
+	// Note: we are not using the session here since allowing the transactional flow to be used inside the
+	//       saveQueueInquiry function would require a lot of changes across the codebase, so if we fail here we
+	//       will not be able to rollback the transaction. That is not a big deal since the contact will be properly
+	//       merged and the inquiry will be saved in the queue (will need to be taken manually by an agent though).
+	const inquiry = await LivechatInquiry.findOneByRoomId(roomId);
+	if (!inquiry) {
+		// Note: if this happens, something is really wrong with the queue, so we should throw an error to avoid
+		//       carrying on a weird state.
+		throw new Error('error-invalid-inquiry');
+	}
+
+	if (inquiry.status === LivechatInquiryStatus.VERIFYING) {
+		logger.debug({ msg: 'Verifying inquiry', roomId });
+		await QueueManager.verifyInquiry(inquiry, room);
+	}
+
+	logger.debug({
+		msg: 'Contact channel has been verified and merged successfully',
+		contactId,
+		visitorId,
+		roomId,
+	});
+
+	return result;
+};
+
+verifyContactChannel.patch(runVerifyContactChannel, () => License.hasModule('contact-id-verification'));
diff --git a/apps/meteor/ee/server/sdk/index.ts b/apps/meteor/ee/server/sdk/index.ts
index 5c0cea1b2fbf..f8b00779bff3 100644
--- a/apps/meteor/ee/server/sdk/index.ts
+++ b/apps/meteor/ee/server/sdk/index.ts
@@ -1,7 +1,7 @@
-import { proxifyWithWait } from '@rocket.chat/core-services';
+import { proxify } from '@rocket.chat/core-services';
 
 import type { IInstanceService } from './types/IInstanceService';
 import type { ILDAPEEService } from './types/ILDAPEEService';
 
-export const LDAPEE = proxifyWithWait<ILDAPEEService>('ldap-enterprise');
-export const Instance = proxifyWithWait<IInstanceService>('instance');
+export const LDAPEE = proxify<ILDAPEEService>('ldap-enterprise');
+export const Instance = proxify<IInstanceService>('instance');
diff --git a/apps/meteor/ee/server/services/CHANGELOG.md b/apps/meteor/ee/server/services/CHANGELOG.md
index 650b1ee76f6f..55dceb163759 100644
--- a/apps/meteor/ee/server/services/CHANGELOG.md
+++ b/apps/meteor/ee/server/services/CHANGELOG.md
@@ -1,5 +1,64 @@
 # rocketchat-services
 
+## 2.0.1-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.3
+  - @rocket.chat/rest-typings@7.1.0-rc.3
+  - @rocket.chat/core-services@0.7.2-rc.3
+  - @rocket.chat/model-typings@1.1.0-rc.3
+  - @rocket.chat/network-broker@0.1.2-rc.3
+  - @rocket.chat/models@1.0.1-rc.3
+  </details>
+
+## 2.0.1-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.2
+  - @rocket.chat/rest-typings@7.1.0-rc.2
+  - @rocket.chat/core-services@0.7.2-rc.2
+  - @rocket.chat/model-typings@1.1.0-rc.2
+  - @rocket.chat/network-broker@0.1.2-rc.2
+  - @rocket.chat/models@1.0.1-rc.2
+  </details>
+
+## 2.0.1-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.1
+  - @rocket.chat/rest-typings@7.1.0-rc.1
+  - @rocket.chat/core-services@0.7.2-rc.1
+  - @rocket.chat/model-typings@1.1.0-rc.1
+  - @rocket.chat/network-broker@0.1.2-rc.1
+  - @rocket.chat/models@1.0.1-rc.1
+  </details>
+
+## 2.0.1-rc.0
+
+### Patch Changes
+
+- ([#33596](https://github.com/RocketChat/Rocket.Chat/pull/33596)) Bump meteor to 3.0.4 and Node version to 20.18.0
+
+- <details><summary>Updated dependencies [82767d8fd8a52ac348e8aded1d238e688d36129b, 80e36bfc3938775eb26aa5576f1b9b98896e1cc4, e7edeac3bdd22da0a04b8e873d5a008e249fb4be, 3569b0a9c48f8b94ebaef2f8b607c52fdb8e570a, b4841cb7206d855d7a1bc7604683a5b4a48b7176, 32d93a0666fa1cbe857d02889e93d9bbf45bd4f0, 63ccadc012499e004445ad6bc6cd2ff777aecbd1, ce7024af36fcde97b1da5b2731f6edc4a4c236b8, d398866dba725918017e3609807f9d0ab9b89b72, d398866dba725918017e3609807f9d0ab9b89b72]:</summary>
+
+  - @rocket.chat/apps-engine@1.48.0-rc.0
+  - @rocket.chat/model-typings@1.1.0-rc.0
+  - @rocket.chat/core-typings@7.1.0-rc.0
+  - @rocket.chat/rest-typings@7.1.0-rc.0
+  - @rocket.chat/core-services@0.7.2-rc.0
+  - @rocket.chat/models@1.0.1-rc.0
+  - @rocket.chat/network-broker@0.1.2-rc.0
+  </details>
+
 ## 2.0.0
 
 ### Major Changes
diff --git a/apps/meteor/ee/server/services/Dockerfile b/apps/meteor/ee/server/services/Dockerfile
index 9846b4a86bb0..017a41dfd6d2 100644
--- a/apps/meteor/ee/server/services/Dockerfile
+++ b/apps/meteor/ee/server/services/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20.17.0 as build
+FROM node:20.18.0 as build
 
 WORKDIR /app
 
@@ -28,7 +28,7 @@ COPY ./tsconfig.base.json .
 RUN yarn workspace @rocket.chat/core-typings run build \
     && yarn workspace @rocket.chat/rest-typings run build
 
-FROM node:20.17.0-alpine3.20
+FROM node:20.18.0-alpine3.20
 
 ARG SERVICE
 
diff --git a/apps/meteor/ee/server/services/package.json b/apps/meteor/ee/server/services/package.json
index 4092bf5471c7..339d8f50a9ef 100644
--- a/apps/meteor/ee/server/services/package.json
+++ b/apps/meteor/ee/server/services/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "rocketchat-services",
 	"private": true,
-	"version": "2.0.0",
+	"version": "2.0.1-rc.3",
 	"description": "Rocket.Chat Authorization service",
 	"main": "index.js",
 	"scripts": {
@@ -27,35 +27,35 @@
 		"@rocket.chat/rest-typings": "workspace:^",
 		"@rocket.chat/string-helpers": "~0.31.25",
 		"@rocket.chat/ui-kit": "workspace:~",
-		"ajv": "^8.11.0",
-		"bcrypt": "^5.0.1",
+		"ajv": "^8.17.1",
+		"bcrypt": "^5.1.1",
 		"body-parser": "^1.20.3",
 		"colorette": "^2.0.20",
-		"cookie": "^0.5.0",
+		"cookie": "^0.7.2",
 		"cookie-parser": "^1.4.7",
 		"ejson": "^2.2.3",
-		"eventemitter3": "^4.0.7",
-		"express": "^4.17.3",
+		"eventemitter3": "^5.0.1",
+		"express": "^4.21.1",
 		"jaeger-client": "^3.19.0",
 		"mem": "^8.1.1",
-		"moleculer": "^0.14.34",
+		"moleculer": "^0.14.35",
 		"mongodb": "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch",
-		"nats": "^2.6.1",
-		"pino": "^8.15.0",
-		"sodium-native": "^3.3.0",
+		"nats": "^2.28.2",
+		"pino": "^8.21.0",
+		"sodium-native": "^4.3.1",
 		"sodium-plus": "^0.9.0",
-		"uuid": "^8.3.2",
+		"uuid": "^11.0.3",
 		"ws": "^8.18.0"
 	},
 	"devDependencies": {
-		"@rocket.chat/icons": "~0.38.0",
+		"@rocket.chat/icons": "~0.39.0",
 		"@types/cookie": "^0.5.4",
 		"@types/cookie-parser": "^1.4.7",
 		"@types/ejson": "^2.2.2",
 		"@types/express": "^4.17.21",
 		"@types/fibers": "^3.1.4",
-		"@types/node": "~20.16.12",
-		"@types/ws": "^8.5.12",
+		"@types/node": "~20.16.15",
+		"@types/ws": "^8.5.13",
 		"npm-run-all": "^4.1.5",
 		"pino-pretty": "^7.6.1",
 		"ts-node": "^10.9.2",
diff --git a/apps/meteor/ee/server/settings/contact-verification.ts b/apps/meteor/ee/server/settings/contact-verification.ts
new file mode 100644
index 000000000000..78d04b7dc1d7
--- /dev/null
+++ b/apps/meteor/ee/server/settings/contact-verification.ts
@@ -0,0 +1,38 @@
+import { settingsRegistry } from '../../../app/settings/server';
+
+export const addSettings = async (): Promise<void> => {
+	const omnichannelEnabledQuery = { _id: 'Livechat_enabled', value: true };
+
+	return settingsRegistry.addGroup('Omnichannel', async function () {
+		return this.with(
+			{
+				enterprise: true,
+				modules: ['livechat-enterprise', 'contact-id-verification'],
+				section: 'Contact_identification',
+				enableQuery: omnichannelEnabledQuery,
+				public: true,
+			},
+			async function () {
+				await this.add('Livechat_Block_Unknown_Contacts', false, {
+					type: 'boolean',
+					invalidValue: false,
+				});
+
+				await this.add('Livechat_Block_Unverified_Contacts', false, {
+					type: 'boolean',
+					invalidValue: false,
+				});
+
+				await this.add('Livechat_Require_Contact_Verification', 'never', {
+					type: 'select',
+					values: [
+						{ key: 'never', i18nLabel: 'Never' },
+						{ key: 'once', i18nLabel: 'Once' },
+						{ key: 'always', i18nLabel: 'On_All_Contacts' },
+					],
+					invalidValue: 'never',
+				});
+			},
+		);
+	});
+};
diff --git a/apps/meteor/ee/server/settings/video-conference.ts b/apps/meteor/ee/server/settings/video-conference.ts
index 358ceb260414..18d3108f57d0 100644
--- a/apps/meteor/ee/server/settings/video-conference.ts
+++ b/apps/meteor/ee/server/settings/video-conference.ts
@@ -44,10 +44,11 @@ export function addSettings(): Promise<void> {
 
 				const persistentChatEnabled = { _id: 'VideoConf_Enable_Persistent_Chat', value: true };
 
-				await this.add('VideoConf_Persistent_Chat_Discussion_Name', 'Conference Call Chat History', {
+				await this.add('VideoConf_Persistent_Chat_Discussion_Name', 'Video Call Chat', {
 					type: 'string',
 					public: true,
 					invalidValue: 'Conference Call Chat History',
+					i18nDescription: 'VideoConf_Persistent_Chat_Discussion_Name_Description',
 					enableQuery: [discussionsEnabled, persistentChatEnabled],
 				});
 			},
diff --git a/apps/meteor/ee/server/startup/upsell.ts b/apps/meteor/ee/server/startup/upsell.ts
index f2fdfc50ba29..751f921ea7b0 100644
--- a/apps/meteor/ee/server/startup/upsell.ts
+++ b/apps/meteor/ee/server/startup/upsell.ts
@@ -3,12 +3,16 @@ import { Settings } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
 
 import { notifyOnSettingChangedById } from '../../../app/lib/server/lib/notifyListener';
+import { updateAuditedBySystem } from '../../../server/settings/lib/auditedSettingUpdates';
 
 const handleHadTrial = (): void => {
 	if (License.getLicense()?.information.trial) {
 		void (async () => {
-			(await Settings.updateValueById('Cloud_Workspace_Had_Trial', true)).modifiedCount &&
-				void notifyOnSettingChangedById('Cloud_Workspace_Had_Trial');
+			(
+				await updateAuditedBySystem({
+					reason: 'handleHadTrial',
+				})(Settings.updateValueById, 'Cloud_Workspace_Had_Trial', true)
+			).modifiedCount && void notifyOnSettingChangedById('Cloud_Workspace_Had_Trial');
 		})();
 	}
 };
diff --git a/apps/meteor/ee/tests/unit/apps/livechat-enterprise/server/lib/isAgentAvailableToTakeContactInquiry.spec.ts b/apps/meteor/ee/tests/unit/apps/livechat-enterprise/server/lib/isAgentAvailableToTakeContactInquiry.spec.ts
new file mode 100644
index 000000000000..d2b104ea2922
--- /dev/null
+++ b/apps/meteor/ee/tests/unit/apps/livechat-enterprise/server/lib/isAgentAvailableToTakeContactInquiry.spec.ts
@@ -0,0 +1,118 @@
+import { expect } from 'chai';
+import proxyquire from 'proxyquire';
+import sinon from 'sinon';
+
+const modelsMock = {
+	LivechatContacts: {
+		findOneById: sinon.stub(),
+	},
+};
+
+const settingsMock = {
+	get: sinon.stub(),
+};
+
+const { runIsAgentAvailableToTakeContactInquiry } = proxyquire
+	.noCallThru()
+	.load('../../../../../../server/patches/isAgentAvailableToTakeContactInquiry', {
+		'@rocket.chat/models': modelsMock,
+		'../../../app/settings/server': {
+			settings: settingsMock,
+		},
+	});
+
+describe('isAgentAvailableToTakeContactInquiry', () => {
+	beforeEach(() => {
+		modelsMock.LivechatContacts.findOneById.reset();
+		settingsMock.get.reset();
+	});
+
+	afterEach(() => {
+		sinon.restore();
+	});
+
+	it('should return false if the contact is not found', async () => {
+		modelsMock.LivechatContacts.findOneById.resolves(undefined);
+		const { value, error } = await runIsAgentAvailableToTakeContactInquiry(() => undefined, 'visitorId', {}, 'rid');
+
+		expect(value).to.be.false;
+		expect(error).to.eq('error-invalid-contact');
+		expect(modelsMock.LivechatContacts.findOneById.calledOnceWith('contactId', sinon.match({ projection: { unknown: 1, channels: 1 } })));
+	});
+
+	it('should return false if the contact is unknown and Livechat_Block_Unknown_Contacts is true', async () => {
+		modelsMock.LivechatContacts.findOneById.resolves({ unknown: true });
+		settingsMock.get.withArgs('Livechat_Block_Unknown_Contacts').returns(true);
+		const { value, error } = await runIsAgentAvailableToTakeContactInquiry(() => undefined, 'visitorId', {}, 'rid');
+		expect(value).to.be.false;
+		expect(error).to.eq('error-unknown-contact');
+	});
+
+	it('should return false if the contact is not verified and Livechat_Block_Unverified_Contacts is true', async () => {
+		modelsMock.LivechatContacts.findOneById.resolves({
+			unknown: false,
+			channels: [
+				{ verified: false, visitor: { source: { type: 'channelName' }, visitorId: 'visitorId' } },
+				{ verified: true, visitor: { source: { type: 'othername' }, visitorId: 'visitorId' } },
+			],
+		});
+		settingsMock.get.withArgs('Livechat_Block_Unknown_Contacts').returns(true);
+		settingsMock.get.withArgs('Livechat_Block_Unverified_Contacts').returns(true);
+		const { value, error } = await runIsAgentAvailableToTakeContactInquiry(() => undefined, 'visitorId', { type: 'channelName' }, 'rid');
+		expect(value).to.be.false;
+		expect(error).to.eq('error-unverified-contact');
+	});
+
+	it('should return true if the contact has the verified channel', async () => {
+		modelsMock.LivechatContacts.findOneById.resolves({
+			unknown: false,
+			channels: [
+				{ verified: true, visitor: { source: { type: 'channelName' }, visitorId: 'visitorId' } },
+				{ verified: false, visitor: { source: { type: 'othername' }, visitorId: 'visitorId' } },
+			],
+		});
+		settingsMock.get.withArgs('Livechat_Block_Unknown_Contacts').returns(true);
+		settingsMock.get.withArgs('Livechat_Block_Unverified_Contacts').returns(true);
+		const { value } = await runIsAgentAvailableToTakeContactInquiry(() => undefined, 'visitorId', { type: 'channelName' }, 'rid');
+		expect(value).to.be.true;
+	});
+
+	it('should not look at the unknown field if the setting Livechat_Block_Unknown_Contacts is false', async () => {
+		modelsMock.LivechatContacts.findOneById.resolves({
+			unknown: true,
+			channels: [
+				{ verified: true, visitor: { source: { type: 'channelName' }, visitorId: 'visitorId' } },
+				{ verified: false, visitor: { source: { type: 'othername' }, visitorId: 'visitorId' } },
+			],
+		});
+		settingsMock.get.withArgs('Livechat_Block_Unknown_Contacts').returns(false);
+		settingsMock.get.withArgs('Livechat_Block_Unverified_Contacts').returns(true);
+		const { value } = await runIsAgentAvailableToTakeContactInquiry(() => undefined, 'visitorId', { type: 'channelName' }, 'rid');
+		expect(value).to.be.true;
+	});
+
+	it('should not look at the verified channels if Livechat_Block_Unverified_Contacts is false', async () => {
+		modelsMock.LivechatContacts.findOneById.resolves({
+			unknown: false,
+			channels: [
+				{ verified: false, visitor: { source: { type: 'channelName' }, visitorId: 'visitorId' } },
+				{ verified: false, visitor: { source: { type: 'othername' }, visitorId: 'visitorId' } },
+			],
+		});
+		settingsMock.get.withArgs('Livechat_Block_Unknown_Contacts').returns(true);
+		settingsMock.get.withArgs('Livechat_Block_Unverified_Contacts').returns(false);
+		const { value } = await runIsAgentAvailableToTakeContactInquiry(() => undefined, 'visitorId', { type: 'channelName' }, 'rid');
+		expect(value).to.be.true;
+	});
+
+	it('should return true if there is a contact and the settings are false', async () => {
+		modelsMock.LivechatContacts.findOneById.resolves({
+			unknown: false,
+			channels: [],
+		});
+		settingsMock.get.withArgs('Livechat_Block_Unknown_Contacts').returns(false);
+		settingsMock.get.withArgs('Livechat_Block_Unverified_Contacts').returns(false);
+		const { value } = await runIsAgentAvailableToTakeContactInquiry(() => undefined, 'visitorId', { type: 'channelName' }, 'rid');
+		expect(value).to.be.true;
+	});
+});
diff --git a/apps/meteor/ee/tests/unit/apps/livechat-enterprise/server/lib/mergeContacts.spec.ts b/apps/meteor/ee/tests/unit/apps/livechat-enterprise/server/lib/mergeContacts.spec.ts
new file mode 100644
index 000000000000..0fb40fa04bdd
--- /dev/null
+++ b/apps/meteor/ee/tests/unit/apps/livechat-enterprise/server/lib/mergeContacts.spec.ts
@@ -0,0 +1,118 @@
+import { expect } from 'chai';
+import proxyquire from 'proxyquire';
+import sinon from 'sinon';
+
+const modelsMock = {
+	LivechatContacts: {
+		findOneById: sinon.stub(),
+		findSimilarVerifiedContacts: sinon.stub(),
+		deleteMany: sinon.stub(),
+	},
+	LivechatRooms: {
+		updateMergedContactIds: sinon.stub(),
+	},
+};
+
+const contactMergerStub = {
+	getAllFieldsFromContact: sinon.stub(),
+	mergeFieldsIntoContact: sinon.stub(),
+};
+
+const { runMergeContacts } = proxyquire.noCallThru().load('../../../../../../server/patches/mergeContacts', {
+	'../../../app/livechat/server/lib/contacts/mergeContacts': { mergeContacts: { patch: sinon.stub() } },
+	'../../../app/livechat/server/lib/contacts/ContactMerger': { ContactMerger: contactMergerStub },
+	'../../../app/livechat-enterprise/server/lib/logger': { logger: { info: sinon.stub(), debug: sinon.stub() } },
+	'@rocket.chat/models': modelsMock,
+});
+
+describe('mergeContacts', () => {
+	const targetChannel = {
+		name: 'channelName',
+		visitor: {
+			visitorId: 'visitorId',
+			source: {
+				type: 'sms',
+			},
+		},
+		verified: true,
+		verifiedAt: new Date(),
+		field: 'field',
+		value: 'value',
+	};
+
+	beforeEach(() => {
+		modelsMock.LivechatContacts.findOneById.reset();
+		modelsMock.LivechatContacts.findSimilarVerifiedContacts.reset();
+		modelsMock.LivechatContacts.deleteMany.reset();
+		modelsMock.LivechatRooms.updateMergedContactIds.reset();
+		contactMergerStub.getAllFieldsFromContact.reset();
+		contactMergerStub.mergeFieldsIntoContact.reset();
+		modelsMock.LivechatContacts.deleteMany.resolves({ deletedCount: 0 });
+	});
+
+	afterEach(() => {
+		sinon.restore();
+	});
+
+	it('should throw an error if contact does not exist', async () => {
+		modelsMock.LivechatContacts.findOneById.resolves(undefined);
+
+		await expect(runMergeContacts(() => undefined, 'invalidId', { visitorId: 'visitorId', source: { type: 'sms' } })).to.be.rejectedWith(
+			'error-invalid-contact',
+		);
+	});
+
+	it('should throw an error if contact channel does not exist', async () => {
+		modelsMock.LivechatContacts.findOneById.resolves({
+			_id: 'contactId',
+			channels: [{ name: 'channelName', visitor: { visitorId: 'visitorId', source: { type: 'sms' } } }],
+		});
+
+		await expect(
+			runMergeContacts(() => undefined, 'contactId', { visitorId: 'invalidVisitorId', source: { type: 'sms' } }),
+		).to.be.rejectedWith('error-invalid-channel');
+	});
+
+	it('should do nothing if there are no similar verified contacts', async () => {
+		modelsMock.LivechatContacts.findOneById.resolves({ _id: 'contactId', channels: [targetChannel] });
+		modelsMock.LivechatContacts.findSimilarVerifiedContacts.resolves([]);
+
+		await runMergeContacts(() => undefined, 'contactId', { visitorId: 'visitorId', source: { type: 'sms' } });
+
+		expect(modelsMock.LivechatContacts.findOneById.calledOnceWith('contactId')).to.be.true;
+		expect(modelsMock.LivechatContacts.findSimilarVerifiedContacts.calledOnceWith(targetChannel, 'contactId')).to.be.true;
+		expect(modelsMock.LivechatContacts.deleteMany.notCalled).to.be.true;
+		expect(contactMergerStub.getAllFieldsFromContact.notCalled).to.be.true;
+		expect(contactMergerStub.mergeFieldsIntoContact.notCalled).to.be.true;
+	});
+
+	it('should be able to merge similar contacts', async () => {
+		const similarContact = {
+			_id: 'differentId',
+			emails: ['email2'],
+			phones: ['phone2'],
+			channels: [{ name: 'channelName2', visitorId: 'visitorId2', field: 'field', value: 'value' }],
+		};
+		const originalContact = {
+			_id: 'contactId',
+			emails: ['email1'],
+			phones: ['phone1'],
+			channels: [targetChannel],
+		};
+
+		modelsMock.LivechatContacts.findOneById.resolves(originalContact);
+		modelsMock.LivechatContacts.findSimilarVerifiedContacts.resolves([similarContact]);
+
+		await runMergeContacts(() => undefined, 'contactId', { visitorId: 'visitorId', source: { type: 'sms' } });
+
+		expect(modelsMock.LivechatContacts.findOneById.calledTwice).to.be.true;
+		expect(modelsMock.LivechatContacts.findOneById.calledWith('contactId')).to.be.true;
+		expect(modelsMock.LivechatContacts.findSimilarVerifiedContacts.calledOnceWith(targetChannel, 'contactId')).to.be.true;
+		expect(contactMergerStub.getAllFieldsFromContact.calledOnceWith(similarContact)).to.be.true;
+
+		expect(contactMergerStub.mergeFieldsIntoContact.getCall(0).args[0].contact).to.be.deep.equal(originalContact);
+
+		expect(modelsMock.LivechatContacts.deleteMany.calledOnceWith({ _id: { $in: ['differentId'] } })).to.be.true;
+		expect(modelsMock.LivechatRooms.updateMergedContactIds.calledOnceWith(['differentId'], 'contactId')).to.be.true;
+	});
+});
diff --git a/apps/meteor/ee/tests/unit/apps/livechat-enterprise/server/lib/verifyContactChannel.spec.ts b/apps/meteor/ee/tests/unit/apps/livechat-enterprise/server/lib/verifyContactChannel.spec.ts
new file mode 100644
index 000000000000..7e57f5d1a22a
--- /dev/null
+++ b/apps/meteor/ee/tests/unit/apps/livechat-enterprise/server/lib/verifyContactChannel.spec.ts
@@ -0,0 +1,231 @@
+import { expect } from 'chai';
+import proxyquire from 'proxyquire';
+import sinon from 'sinon';
+
+const modelsMock = {
+	LivechatContacts: {
+		updateContactChannel: sinon.stub(),
+	},
+	LivechatRooms: {
+		update: sinon.stub(),
+		findOneById: sinon.stub(),
+	},
+	LivechatInquiry: {
+		findOneByRoomId: sinon.stub(),
+		saveQueueInquiry: sinon.stub(),
+	},
+};
+
+const sessionMock = {
+	startTransaction: sinon.stub(),
+	commitTransaction: sinon.stub(),
+	abortTransaction: sinon.stub(),
+	endSession: sinon.stub(),
+};
+
+const clientMock = {
+	startSession: sinon.stub().returns(sessionMock),
+};
+
+const mergeContactsStub = sinon.stub();
+const queueManager = {
+	processNewInquiry: sinon.stub(),
+	verifyInquiry: sinon.stub(),
+};
+
+const { runVerifyContactChannel } = proxyquire.noCallThru().load('../../../../../../server/patches/verifyContactChannel', {
+	'../../../app/livechat/server/lib/contacts/mergeContacts': { mergeContacts: mergeContactsStub },
+	'../../../app/livechat/server/lib/contacts/verifyContactChannel': { verifyContactChannel: { patch: sinon.stub() } },
+	'../../../app/livechat/server/lib/QueueManager': { QueueManager: queueManager },
+	'../../../server/database/utils': { client: clientMock },
+	'../../../app/livechat-enterprise/server/lib/logger': { logger: { info: sinon.stub(), debug: sinon.stub() } },
+	'@rocket.chat/models': modelsMock,
+});
+
+describe('verifyContactChannel', () => {
+	beforeEach(() => {
+		modelsMock.LivechatContacts.updateContactChannel.reset();
+		modelsMock.LivechatRooms.update.reset();
+		modelsMock.LivechatInquiry.findOneByRoomId.reset();
+		modelsMock.LivechatRooms.findOneById.reset();
+		sessionMock.startTransaction.reset();
+		sessionMock.commitTransaction.reset();
+		sessionMock.abortTransaction.reset();
+		sessionMock.endSession.reset();
+		mergeContactsStub.reset();
+		queueManager.processNewInquiry.reset();
+		queueManager.verifyInquiry.reset();
+	});
+
+	afterEach(() => {
+		sinon.restore();
+	});
+
+	it('should be able to verify a contact channel', async () => {
+		modelsMock.LivechatInquiry.findOneByRoomId.resolves({ _id: 'inquiryId', status: 'verifying' });
+		modelsMock.LivechatRooms.findOneById.resolves({ _id: 'roomId', source: { type: 'sms' } });
+		mergeContactsStub.resolves({ _id: 'contactId' });
+		await runVerifyContactChannel(() => undefined, {
+			contactId: 'contactId',
+			field: 'field',
+			value: 'value',
+			visitorId: 'visitorId',
+			roomId: 'roomId',
+		});
+
+		expect(
+			modelsMock.LivechatContacts.updateContactChannel.calledOnceWith(
+				sinon.match({
+					visitorId: 'visitorId',
+					source: sinon.match({
+						type: 'sms',
+					}),
+				}),
+				sinon.match({
+					verified: true,
+					field: 'field',
+					value: 'value',
+				}),
+			),
+		).to.be.true;
+		expect(modelsMock.LivechatRooms.update.calledOnceWith({ _id: 'roomId' }, { $set: { verified: true } })).to.be.true;
+		expect(
+			mergeContactsStub.calledOnceWith(
+				'contactId',
+				sinon.match({
+					visitorId: 'visitorId',
+					source: sinon.match({
+						type: 'sms',
+					}),
+				}),
+			),
+		).to.be.true;
+		expect(queueManager.verifyInquiry.calledOnceWith({ _id: 'inquiryId', status: 'verifying' }, { _id: 'roomId', source: { type: 'sms' } }))
+			.to.be.true;
+	});
+
+	it('should not add inquiry if status is not ready', async () => {
+		modelsMock.LivechatInquiry.findOneByRoomId.resolves({ _id: 'inquiryId', status: 'taken' });
+		modelsMock.LivechatRooms.findOneById.resolves({ _id: 'roomId', source: { type: 'sms' } });
+		mergeContactsStub.resolves({ _id: 'contactId' });
+		await runVerifyContactChannel(() => undefined, {
+			contactId: 'contactId',
+			field: 'field',
+			value: 'value',
+			visitorId: 'visitorId',
+			roomId: 'roomId',
+		});
+
+		expect(
+			modelsMock.LivechatContacts.updateContactChannel.calledOnceWith(
+				sinon.match({
+					visitorId: 'visitorId',
+					source: sinon.match({
+						type: 'sms',
+					}),
+				}),
+				sinon.match({
+					verified: true,
+					field: 'field',
+					value: 'value',
+				}),
+			),
+		).to.be.true;
+		expect(modelsMock.LivechatRooms.update.calledOnceWith({ _id: 'roomId' }, { $set: { verified: true } })).to.be.true;
+		expect(
+			mergeContactsStub.calledOnceWith(
+				'contactId',
+				sinon.match({
+					visitorId: 'visitorId',
+					source: sinon.match({
+						type: 'sms',
+					}),
+				}),
+			),
+		).to.be.true;
+		expect(queueManager.verifyInquiry.calledOnceWith({ _id: 'inquiryId', status: 'ready' }, { _id: 'roomId', source: { type: 'sms' } })).to
+			.be.false;
+	});
+
+	it('should fail if no matching room is found', async () => {
+		modelsMock.LivechatInquiry.findOneByRoomId.resolves(undefined);
+		modelsMock.LivechatRooms.findOneById.resolves(undefined);
+		await expect(
+			runVerifyContactChannel(() => undefined, {
+				contactId: 'contactId',
+				field: 'field',
+				value: 'value',
+				visitorId: 'visitorId',
+				roomId: 'roomId',
+			}),
+		).to.be.rejectedWith('error-invalid-room');
+
+		expect(modelsMock.LivechatContacts.updateContactChannel.notCalled).to.be.true;
+		expect(modelsMock.LivechatRooms.update.notCalled).to.be.true;
+		expect(mergeContactsStub.notCalled).to.be.true;
+		expect(queueManager.verifyInquiry.notCalled).to.be.true;
+	});
+
+	it('should fail if no matching inquiry is found', async () => {
+		modelsMock.LivechatInquiry.findOneByRoomId.resolves(undefined);
+		modelsMock.LivechatRooms.findOneById.resolves({ _id: 'roomId', source: { type: 'sms' } });
+		mergeContactsStub.resolves({ _id: 'contactId' });
+		await expect(
+			runVerifyContactChannel(() => undefined, {
+				contactId: 'contactId',
+				field: 'field',
+				value: 'value',
+				visitorId: 'visitorId',
+				roomId: 'roomId',
+			}),
+		).to.be.rejectedWith('error-invalid-inquiry');
+
+		expect(
+			modelsMock.LivechatContacts.updateContactChannel.calledOnceWith(
+				sinon.match({
+					visitorId: 'visitorId',
+					source: sinon.match({
+						type: 'sms',
+					}),
+				}),
+				sinon.match({
+					verified: true,
+					field: 'field',
+					value: 'value',
+				}),
+			),
+		).to.be.true;
+		expect(modelsMock.LivechatRooms.update.calledOnceWith({ _id: 'roomId' }, { $set: { verified: true } })).to.be.true;
+		expect(
+			mergeContactsStub.calledOnceWith(
+				'contactId',
+				sinon.match({
+					visitorId: 'visitorId',
+					source: sinon.match({
+						type: 'sms',
+					}),
+				}),
+			),
+		).to.be.true;
+		expect(queueManager.verifyInquiry.notCalled).to.be.true;
+	});
+
+	it('should abort transaction if an error occurs', async () => {
+		modelsMock.LivechatInquiry.findOneByRoomId.resolves({ _id: 'inquiryId' });
+		modelsMock.LivechatRooms.findOneById.resolves({ _id: 'roomId', source: { type: 'sms' } });
+		mergeContactsStub.rejects();
+		await expect(
+			runVerifyContactChannel(() => undefined, {
+				contactId: 'contactId',
+				field: 'field',
+				value: 'value',
+				visitorId: 'visitorId',
+				roomId: 'roomId',
+			}),
+		).to.be.rejected;
+
+		expect(sessionMock.abortTransaction.calledOnce).to.be.true;
+		expect(sessionMock.commitTransaction.notCalled).to.be.true;
+		expect(sessionMock.endSession.calledOnce).to.be.true;
+	});
+});
diff --git a/apps/meteor/ee/tests/unit/server/airgappedRestrictions/airgappedRestrictions.spec.ts b/apps/meteor/ee/tests/unit/server/airgappedRestrictions/airgappedRestrictions.spec.ts
index a1aace7ae7dd..cf90a0c83463 100644
--- a/apps/meteor/ee/tests/unit/server/airgappedRestrictions/airgappedRestrictions.spec.ts
+++ b/apps/meteor/ee/tests/unit/server/airgappedRestrictions/airgappedRestrictions.spec.ts
@@ -1,4 +1,5 @@
 import { Emitter } from '@rocket.chat/emitter';
+import { registerModel } from '@rocket.chat/models';
 import { expect } from 'chai';
 import proxyquire from 'proxyquire';
 import sinon from 'sinon';
@@ -41,6 +42,11 @@ const licenseMock = {
 	},
 };
 
+registerModel('IServerEventsModel', {
+	insertOne: () => undefined,
+	createAuditServerEvent: () => undefined,
+} as any);
+
 proxyquire.noCallThru().load('../../../../app/license/server/airGappedRestrictions.ts', {
 	'@rocket.chat/license': {
 		AirGappedRestriction: airgappedRestrictionObj,
diff --git a/apps/meteor/lib/callbacks.ts b/apps/meteor/lib/callbacks.ts
index f8f5a324a638..ca82683a04ef 100644
--- a/apps/meteor/lib/callbacks.ts
+++ b/apps/meteor/lib/callbacks.ts
@@ -21,15 +21,17 @@ import type {
 	UserStatus,
 	ILivechatDepartment,
 	MessageMention,
-	OmnichannelSourceType,
+	IOmnichannelRoomInfo,
+	IOmnichannelInquiryExtraData,
+	IOmnichannelRoomExtraData,
 } from '@rocket.chat/core-typings';
 import type { Updater } from '@rocket.chat/models';
 import type { FilterOperators } from 'mongodb';
 
+import { Callbacks } from './callbacks/callbacksBase';
 import type { ILoginAttempt } from '../app/authentication/server/ILoginAttempt';
 import type { IBusinessHourBehavior } from '../app/livechat/server/business-hour/AbstractBusinessHour';
-import type { CloseRoomParams } from '../app/livechat/server/lib/LivechatTyped';
-import { Callbacks } from './callbacks/callbacksBase';
+import type { CloseRoomParams } from '../app/livechat/server/lib/localTypes';
 
 /**
  * Callbacks returning void, like event listeners.
@@ -108,10 +110,7 @@ interface EventLikeCallbackSignatures {
  * TODO: develop a middleware alternative and grant independence of execution order
  */
 type ChainedCallbackSignatures = {
-	'livechat.beforeRoom': (
-		roomInfo: Record<string, unknown>,
-		extraData?: Record<string, unknown> & { sla?: string },
-	) => Record<string, unknown>;
+	'livechat.beforeRoom': (roomInfo: IOmnichannelRoomInfo, extraData?: IOmnichannelRoomExtraData) => Partial<IOmnichannelRoom>;
 	'livechat.newRoom': (room: IOmnichannelRoom) => IOmnichannelRoom;
 
 	'livechat.beforeForwardRoomToDepartment': <T extends { room: IOmnichannelRoom; transferData?: { department: { _id: string } } }>(
@@ -207,15 +206,7 @@ type ChainedCallbackSignatures = {
 			options: { forwardingToDepartment?: { oldDepartmentId?: string; transferData?: any }; clientAction?: boolean };
 		},
 	) => Promise<(IOmnichannelRoom & { chatQueued: boolean }) | undefined>;
-	'livechat.beforeInquiry': (
-		data: Pick<ILivechatInquiryRecord, 'source'> & { sla?: string; priority?: string; [other: string]: unknown } & {
-			customFields?: Record<string, unknown>;
-			source?: OmnichannelSourceType;
-		},
-	) => Pick<ILivechatInquiryRecord, 'source'> & { sla?: string; priority?: string; [other: string]: unknown } & {
-		customFields?: Record<string, unknown>;
-		source?: OmnichannelSourceType;
-	};
+	'livechat.beforeInquiry': (data: IOmnichannelInquiryExtraData) => Partial<ILivechatInquiryRecord>;
 	'roomNameChanged': (room: IRoom) => void;
 	'roomTopicChanged': (room: IRoom) => void;
 	'roomAnnouncementChanged': (room: IRoom) => void;
diff --git a/apps/meteor/lib/getSubscriptionUnreadData.ts b/apps/meteor/lib/getSubscriptionUnreadData.ts
new file mode 100644
index 000000000000..1f0f977492b5
--- /dev/null
+++ b/apps/meteor/lib/getSubscriptionUnreadData.ts
@@ -0,0 +1,63 @@
+import type { SubscriptionWithRoom } from '@rocket.chat/ui-contexts';
+import type { TFunction } from 'i18next';
+
+const getUnreadTitle = (
+	{
+		mentions,
+		threads,
+		groupMentions,
+		total,
+	}: {
+		mentions: number;
+		threads: number;
+		groupMentions: number;
+		total: number;
+	},
+	t: TFunction,
+) => {
+	const title = [] as string[];
+	if (mentions) {
+		title.push(t('mentions_counter', { count: mentions }));
+	}
+	if (threads) {
+		title.push(t('threads_counter', { count: threads }));
+	}
+	if (groupMentions) {
+		title.push(t('group_mentions_counter', { count: groupMentions }));
+	}
+	const count = total - mentions - groupMentions - threads;
+	if (count > 0) {
+		title.push(t('unread_messages_counter', { count }));
+	}
+
+	return title.join(', ');
+};
+
+type UnreadData = Pick<
+	SubscriptionWithRoom,
+	'alert' | 'userMentions' | 'unread' | 'tunread' | 'tunreadUser' | 'groupMentions' | 'hideMentionStatus' | 'hideUnreadStatus'
+>;
+export const getSubscriptionUnreadData = (
+	{ userMentions, tunreadUser, tunread, unread, groupMentions, hideMentionStatus, hideUnreadStatus, alert }: UnreadData,
+	t: TFunction,
+) => {
+	const unreadCount = {
+		mentions: userMentions + (tunreadUser?.length || 0),
+		threads: tunread?.length || 0,
+		groupMentions,
+		total: unread + (tunread?.length || 0),
+	};
+
+	const unreadTitle = getUnreadTitle(unreadCount, t);
+
+	const unreadVariant: 'primary' | 'warning' | 'danger' | 'secondary' =
+		(unreadCount.mentions && 'danger') || (unreadCount.threads && 'primary') || (unreadCount.groupMentions && 'warning') || 'secondary';
+
+	const showUnread =
+		(!hideUnreadStatus || (!hideMentionStatus && (Boolean(unreadCount.mentions) || Boolean(unreadCount.groupMentions)))) &&
+		Boolean(unreadCount.total);
+
+	const highlightUnread = Boolean(!hideUnreadStatus && (alert || unread));
+
+	return { unreadTitle, unreadVariant, showUnread, unreadCount, highlightUnread };
+};
diff --git a/apps/meteor/lib/mapLivechatContactConflicts.spec.ts b/apps/meteor/lib/mapLivechatContactConflicts.spec.ts
new file mode 100644
index 000000000000..70e71bad6fc5
--- /dev/null
+++ b/apps/meteor/lib/mapLivechatContactConflicts.spec.ts
@@ -0,0 +1,132 @@
+import type { Serialized, ILivechatContact } from '@rocket.chat/core-typings';
+import { expect } from 'chai';
+
+import { mapLivechatContactConflicts } from './mapLivechatContactConflicts';
+
+const sampleContact: Serialized<ILivechatContact> = {
+	_id: 'any',
+	name: 'Contact Name',
+	createdAt: '',
+	_updatedAt: '',
+	channels: [],
+};
+
+describe('Map Livechat Contact Conflicts', () => {
+	it('should return an empty object when the contact has no conflicts', () => {
+		expect(mapLivechatContactConflicts({ ...sampleContact })).to.be.equal({});
+	});
+
+	it('should group conflicts of the same field in a single atribute', () => {
+		expect(
+			mapLivechatContactConflicts({
+				...sampleContact,
+				name: '',
+				conflictingFields: [
+					{
+						field: 'name',
+						value: 'First Name',
+					},
+					{
+						field: 'name',
+						value: 'Second Name',
+					},
+				],
+			}),
+		).to.be.deep.equal({
+			name: {
+				name: 'name',
+				label: 'Name',
+				values: ['First Name', 'Second Name'],
+			},
+		});
+	});
+
+	it('should include the current value from the contact on the list of values of the conflict', () => {
+		expect(
+			mapLivechatContactConflicts({
+				...sampleContact,
+				name: 'Current Name',
+				conflictingFields: [
+					{
+						field: 'name',
+						value: 'First Name',
+					},
+					{
+						field: 'name',
+						value: 'Second Name',
+					},
+				],
+			}),
+		).to.be.deep.equal({
+			name: {
+				name: 'name',
+				label: 'Name',
+				values: ['First Name', 'Second Name', 'Current Name'],
+			},
+		});
+	});
+
+	it('should have a separate attribute for each conflicting field', () => {
+		expect(
+			mapLivechatContactConflicts({
+				...sampleContact,
+				conflictingFields: [
+					{
+						field: 'name',
+						value: 'First Value',
+					},
+					{
+						field: 'name',
+						value: 'Second Value',
+					},
+					{
+						field: 'manager',
+						value: '1',
+					},
+					{
+						field: 'manager',
+						value: '2',
+					},
+				],
+			}),
+		).to.be.deep.equal({
+			name: {
+				name: 'name',
+				label: 'Name',
+				values: ['First Name', 'Second Name', 'Contact Name'],
+			},
+			contactManager: {
+				name: 'contactManager',
+				label: 'Manager',
+				values: ['1', '2'],
+			},
+		});
+	});
+
+	it('should map conflicts on custom fields too', () => {
+		expect(
+			mapLivechatContactConflicts(
+				{
+					...sampleContact,
+					conflictingFields: [
+						{
+							field: 'customFields.fullName',
+							value: 'Full Name 1',
+						},
+						{
+							field: 'customFields.fullName',
+							value: 'Full Name 2',
+						},
+					],
+				},
+				[{ name: 'fullName', type: 'text', label: 'Full Name' }],
+			),
+		).to.be.deep.equal({
+			fullName: {
+				name: 'fullName',
+				label: 'Full Name',
+				values: ['Full Name 1', 'Full Name 2'],
+			},
+		});
+	});
+});
diff --git a/apps/meteor/lib/mapLivechatContactConflicts.ts b/apps/meteor/lib/mapLivechatContactConflicts.ts
new file mode 100644
index 000000000000..93cbea9a8d89
--- /dev/null
+++ b/apps/meteor/lib/mapLivechatContactConflicts.ts
@@ -0,0 +1,46 @@
+import type { CustomFieldMetadata, ILivechatContact, Serialized } from '@rocket.chat/core-typings';
+import type { TranslationKey } from '@rocket.chat/ui-contexts';
+
+const fieldNameMap: { [key: string]: TranslationKey } = {
+	name: 'Name',
+	contactManager: 'Contact_Manager',
+};
+
+type MappedContactConflicts = Record<string, { name: string; label: string; values: string[] }>;
+
+export function mapLivechatContactConflicts(
+	contact: Serialized<ILivechatContact>,
+	metadata: CustomFieldMetadata[] = [],
+): MappedContactConflicts {
+	if (!contact.conflictingFields?.length) {
+		return {};
+	}
+
+	const conflicts = contact.conflictingFields.reduce((acc, current) => {
+		const fieldName = current.field === 'manager' ? 'contactManager' : current.field.replace('customFields.', '');
+
+		if (acc[fieldName]) {
+			acc[fieldName].values.push(current.value);
+		} else {
+			acc[fieldName] = {
+				name: fieldName,
+				label:
+					(current.field.startsWith('customFields.') && metadata.find(({ name }) => name === fieldName)?.label) || fieldNameMap[fieldName],
+				values: [current.value],
+			};
+		}
+		return acc;
+	}, {} as MappedContactConflicts);
+
+	// If there's a name conflict, add the current name to the conflict values as well
+	if (conflicts.name?.values.length && contact.name) {
+		conflicts.name.values.push(contact.name);
+	}
+
+	// If there's a manager conflict, add the current manager to the conflict values as well
+	if (conflicts.contactManager?.values.length && contact.contactManager) {
+		conflicts.contactManager.values.push(contact.contactManager);
+	}
+
+	return conflicts;
+}
diff --git a/apps/meteor/lib/publishFields.ts b/apps/meteor/lib/publishFields.ts
index b567711bdf76..c4965bb1c6b0 100644
--- a/apps/meteor/lib/publishFields.ts
+++ b/apps/meteor/lib/publishFields.ts
@@ -99,6 +99,8 @@ export const roomFields = {
 	slaId: 1,
 	estimatedWaitingTimeQueue: 1,
 	v: 1,
+	contactId: 1,
+	verified: 1,
 	departmentId: 1,
 	servedBy: 1,
 	source: 1,
diff --git a/apps/meteor/lib/utils/generatePath.ts b/apps/meteor/lib/utils/generatePath.ts
index 40c4bab1043c..6a4da96c6ac6 100644
--- a/apps/meteor/lib/utils/generatePath.ts
+++ b/apps/meteor/lib/utils/generatePath.ts
@@ -3,10 +3,10 @@ import { compile } from 'path-to-regexp';
 type PathParams<TPath extends string> = TPath extends `${string}:${infer TParam}/${infer TRest}`
 	? (TParam extends `${infer U}?` ? U : TParam) | PathParams<TRest>
 	: TPath extends `${string}:${infer TParam}`
-	? TParam extends `${infer U}?`
-		? U
-		: TParam
-	: never;
+		? TParam extends `${infer U}?`
+			? U
+			: TParam
+		: never;
 
 export function generatePath<TPath extends string>(path: TPath, params?: Partial<Record<PathParams<TPath>, string>>): string {
 	return compile(path, { encode: encodeURIComponent })(params);
diff --git a/apps/meteor/package.json b/apps/meteor/package.json
index e1845eef08fb..0ab44dbafaf9 100644
--- a/apps/meteor/package.json
+++ b/apps/meteor/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/meteor",
 	"description": "The Ultimate Open Source WebChat Platform",
-	"version": "7.0.0",
+	"version": "7.1.0-rc.3",
 	"private": true,
 	"author": {
 		"name": "Rocket.Chat",
@@ -15,7 +15,7 @@
 	"scripts": {
 		"start": "meteor",
 		"build:ci": "METEOR_DISABLE_OPTIMISTIC_CACHING=1 meteor build --server-only --directory /tmp/dist",
-		"dev": "meteor --exclude-archs \"web.browser.legacy, web.cordova\"",
+		"dev": "NODE_OPTIONS=\"--trace-warnings\" meteor --exclude-archs \"web.browser.legacy, web.cordova\"",
 		"dsv": "meteor npm run dev",
 		"ha": "meteor npm run ha:start",
 		"ms": "TRANSPORTER=${TRANSPORTER:-TCP} meteor npm run dev",
@@ -28,8 +28,8 @@
 		"eslint": "NODE_OPTIONS=\"--max-old-space-size=8192\" eslint --ext .js,.jsx,.ts,.tsx .  --cache",
 		"eslint:fix": "eslint --ext .js,.jsx,.ts,.tsx . --fix --cache",
 		"obj:dev": "TEST_MODE=true yarn dev",
-		"stylelint": "stylelint \"app/**/*.css\" \"client/**/*.css\" \"app/**/*.less\" \"client/**/*.less\" \"ee/**/*.less\"",
-		"stylelint:fix": "stylelint --fix \"app/**/*.css\" \"client/**/*.css\" \"app/**/*.less\" \"client/**/*.less\" \"ee/**/*.less\"",
+		"stylelint": "stylelint \"app/**/*.css\" \"client/**/*.css\"",
+		"stylelint:fix": "stylelint --fix \"app/**/*.css\" \"client/**/*.css\"",
 		"typecheck": "cross-env NODE_OPTIONS=\"--max-old-space-size=8192\" tsc -p tsconfig.typecheck.json",
 		"coverage": "TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\"}' nyc -r html mocha --config ./.mocharc.js",
 		"test:e2e": "playwright test",
@@ -63,35 +63,35 @@
 		"email": "support@rocket.chat"
 	},
 	"devDependencies": {
-		"@axe-core/playwright": "^4.7.3",
-		"@babel/core": "~7.25.8",
-		"@babel/eslint-parser": "~7.25.8",
-		"@babel/preset-env": "~7.25.8",
-		"@babel/preset-react": "~7.25.7",
-		"@babel/register": "~7.25.7",
+		"@axe-core/playwright": "^4.10.1",
+		"@babel/core": "~7.26.0",
+		"@babel/eslint-parser": "~7.25.9",
+		"@babel/preset-env": "~7.26.0",
+		"@babel/preset-react": "~7.25.9",
+		"@babel/register": "~7.25.9",
 		"@faker-js/faker": "~8.0.2",
-		"@playwright/test": "^1.40.1",
+		"@playwright/test": "^1.48.2",
 		"@rocket.chat/eslint-config": "workspace:^",
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@rocket.chat/livechat": "workspace:^",
 		"@rocket.chat/mock-providers": "workspace:^",
-		"@storybook/addon-a11y": "^8.3.5",
-		"@storybook/addon-essentials": "^8.3.5",
-		"@storybook/addon-interactions": "^8.3.5",
-		"@storybook/addon-styling-webpack": "^1.0.0",
+		"@storybook/addon-a11y": "^8.4.4",
+		"@storybook/addon-essentials": "^8.4.4",
+		"@storybook/addon-interactions": "^8.4.4",
+		"@storybook/addon-styling-webpack": "^1.0.1",
 		"@storybook/addon-webpack5-compiler-babel": "^3.0.3",
-		"@storybook/react": "^8.3.5",
-		"@storybook/react-webpack5": "^8.3.5",
-		"@tanstack/react-query-devtools": "^4.19.1",
+		"@storybook/react": "^8.4.4",
+		"@storybook/react-webpack5": "^8.4.4",
 		"@testing-library/react": "~16.0.1",
 		"@testing-library/user-event": "~14.5.2",
-		"@types/adm-zip": "^0.5.5",
+		"@types/adm-zip": "^0.5.6",
 		"@types/archiver": "^5.3.4",
 		"@types/bad-words": "^3.0.3",
 		"@types/bcrypt": "^5.0.2",
 		"@types/body-parser": "^1.19.5",
 		"@types/busboy": "^1.5.4",
-		"@types/chai": "~4.3.19",
+		"@types/bytebuffer": "~5.0.49",
+		"@types/chai": "~4.3.20",
 		"@types/chai-as-promised": "^7.1.8",
 		"@types/chai-datetime": "0.0.39",
 		"@types/chai-dom": "1.11.3",
@@ -101,39 +101,39 @@
 		"@types/cookie-parser": "^1.4.7",
 		"@types/cors": "^2.8.17",
 		"@types/cssom": "^0.4.3",
-		"@types/dompurify": "^2.3.3",
 		"@types/ejson": "^2.2.2",
 		"@types/express": "^4.17.21",
 		"@types/express-rate-limit": "^5.1.3",
 		"@types/google-libphonenumber": "^7.4.30",
 		"@types/gravatar": "^1.8.6",
-		"@types/he": "^1.1.2",
+		"@types/he": "^1.2.3",
 		"@types/i18next-sprintf-postprocessor": "^0.2.3",
-		"@types/imap": "^0.8.40",
-		"@types/jest": "~29.5.13",
+		"@types/imap": "^0.8.42",
+		"@types/jest": "~29.5.14",
 		"@types/jsdom": "^16.2.15",
 		"@types/jsdom-global": "^3.0.7",
 		"@types/jsrsasign": "^10.5.14",
-		"@types/katex": "^0.14.0",
+		"@types/katex": "^0.16.7",
 		"@types/later": "^1.2.9",
 		"@types/ldapjs": "^2.2.5",
 		"@types/less": "~3.0.6",
-		"@types/lodash": "^4.14.200",
+		"@types/lodash": "^4.17.13",
 		"@types/lodash.clonedeep": "^4.5.9",
 		"@types/lodash.debounce": "^4.0.9",
+		"@types/lodash.escape": "^4.0.9",
 		"@types/lodash.get": "^4.4.9",
-		"@types/mailparser": "^3.4.4",
-		"@types/marked": "^4.0.8",
+		"@types/mailparser": "^3.4.5",
+		"@types/marked": "^4.3.2",
 		"@types/meteor": "^2.9.8",
 		"@types/meteor-collection-hooks": "^0.8.9",
 		"@types/mkdirp": "^1.0.2",
 		"@types/mocha": "github:whitecolor/mocha-types",
 		"@types/moment-timezone": "^0.5.30",
-		"@types/node": "~20.16.12",
+		"@types/node": "~20.16.15",
 		"@types/node-gcm": "^1.0.5",
 		"@types/node-rsa": "^1.1.4",
-		"@types/nodemailer": "^6.4.15",
-		"@types/oauth2-server": "^3.0.17",
+		"@types/nodemailer": "^6.4.16",
+		"@types/oauth2-server": "^3.0.18",
 		"@types/object-path": "^0.11.4",
 		"@types/parseurl": "^1.3.3",
 		"@types/prometheus-gc-stats": "^0.6.4",
@@ -142,9 +142,9 @@
 		"@types/psl": "^1.1.3",
 		"@types/react": "~17.0.80",
 		"@types/react-dom": "~17.0.25",
-		"@types/sanitize-html": "^2.9.3",
-		"@types/semver": "^7.3.10",
-		"@types/sharp": "^0.30.5",
+		"@types/sanitize-html": "^2.13.0",
+		"@types/semver": "^7.5.8",
+		"@types/sharp": "^0.32.0",
 		"@types/sinon": "^10.0.20",
 		"@types/speakeasy": "^2.0.10",
 		"@types/strict-uri-encode": "^2.0.2",
@@ -153,37 +153,36 @@
 		"@types/supports-color": "~7.2.1",
 		"@types/textarea-caret": "^3.0.3",
 		"@types/ua-parser-js": "^0.7.39",
-		"@types/use-subscription": "^1.0.2",
 		"@types/use-sync-external-store": "^0.0.6",
-		"@types/uuid": "^8.3.4",
+		"@types/uuid": "^10.0.0",
 		"@types/xml-crypto": "~1.4.6",
 		"@types/xml-encryption": "~1.2.4",
 		"@typescript-eslint/eslint-plugin": "~5.60.1",
 		"@typescript-eslint/parser": "~5.60.1",
 		"autoprefixer": "^9.8.8",
-		"babel-loader": "^8.3.0",
+		"babel-loader": "^9.2.1",
 		"babel-plugin-array-includes": "^2.0.3",
 		"babel-plugin-istanbul": "^6.1.1",
-		"chai": "^4.3.10",
+		"chai": "^4.5.0",
 		"chai-as-promised": "^7.1.2",
 		"chai-datetime": "^1.8.1",
-		"chai-dom": "^1.11.0",
-		"chai-spies": "~1.0.0",
+		"chai-dom": "^1.12.0",
+		"chai-spies": "~1.1.0",
 		"cross-env": "^7.0.3",
 		"docker-compose": "^0.24.8",
 		"emojione-assets": "^4.5.0",
 		"eslint": "~8.45.0",
-		"eslint-config-prettier": "~8.8.0",
+		"eslint-config-prettier": "~9.1.0",
 		"eslint-plugin-anti-trojan-source": "~1.1.1",
-		"eslint-plugin-import": "~2.26.0",
-		"eslint-plugin-no-floating-promise": "~1.0.2",
-		"eslint-plugin-playwright": "~0.15.3",
-		"eslint-plugin-prettier": "~4.2.1",
-		"eslint-plugin-react": "~7.32.2",
-		"eslint-plugin-react-hooks": "~4.6.2",
-		"eslint-plugin-testing-library": "~6.2.2",
-		"eslint-plugin-you-dont-need-lodash-underscore": "~6.12.0",
-		"fast-glob": "^3.2.12",
+		"eslint-plugin-import": "~2.31.0",
+		"eslint-plugin-no-floating-promise": "~2.0.0",
+		"eslint-plugin-playwright": "~2.0.1",
+		"eslint-plugin-prettier": "~5.2.1",
+		"eslint-plugin-react": "~7.37.2",
+		"eslint-plugin-react-hooks": "~5.0.0",
+		"eslint-plugin-testing-library": "~6.4.0",
+		"eslint-plugin-you-dont-need-lodash-underscore": "~6.14.0",
+		"fast-glob": "^3.3.2",
 		"i18next": "~23.4.9",
 		"jest": "~29.7.0",
 		"jsdom-global": "^3.0.2",
@@ -192,22 +191,26 @@
 		"outdent": "~0.8.0",
 		"pino-pretty": "^7.6.1",
 		"playwright-qase-reporter": "^1.2.2",
-		"postcss": "~8.4.47",
-		"postcss-custom-properties": "^11.0.0",
-		"postcss-easy-import": "^3.0.0",
-		"postcss-load-config": "^3.1.4",
+		"postcss": "~8.4.49",
+		"postcss-custom-properties": "^14.0.4",
+		"postcss-easy-import": "^4.0.0",
+		"postcss-lit": "^1.1.1",
+		"postcss-load-config": "^6.0.1",
 		"postcss-media-minmax": "^5.0.0",
-		"postcss-nested": "^5.0.6",
+		"postcss-nested": "^7.0.2",
 		"postcss-url": "^10.1.3",
-		"prettier": "~2.8.8",
+		"prettier": "~3.3.3",
 		"proxyquire": "^2.1.3",
 		"raw-loader": "~4.0.2",
 		"react-docgen-typescript-plugin": "^1.0.8",
 		"sinon": "^19.0.2",
 		"source-map": "^0.7.4",
-		"storybook": "^8.3.5",
-		"stylelint": "^14.9.1",
-		"stylelint-order": "^5.0.0",
+		"storybook": "^8.4.4",
+		"stylelint": "^16.10.0",
+		"stylelint-config-rational-order": "^0.1.2",
+		"stylelint-config-standard": "^36.0.1",
+		"stylelint-order": "^6.0.4",
+		"stylelint-selector-bem-pattern": "^4.0.1",
 		"supertest": "^7.0.0",
 		"supports-color": "~7.2.0",
 		"template-file": "^6.0.1",
@@ -215,21 +218,21 @@
 		"typescript": "~5.6.3"
 	},
 	"dependencies": {
-		"@babel/runtime": "~7.25.7",
+		"@babel/runtime": "~7.26.0",
 		"@bugsnag/js": "~7.20.2",
 		"@bugsnag/plugin-react": "~7.19.0",
-		"@google-cloud/storage": "^6.11.0",
-		"@kaciras/deasync": "^1.0.4",
-		"@nivo/bar": "0.84.0",
-		"@nivo/core": "0.84.0",
-		"@nivo/heatmap": "0.84.0",
-		"@nivo/line": "0.84.0",
-		"@nivo/pie": "0.84.0",
+		"@google-cloud/storage": "^6.12.0",
+		"@kaciras/deasync": "^1.1.0",
+		"@nivo/bar": "0.88.0",
+		"@nivo/core": "0.88.0",
+		"@nivo/heatmap": "0.88.0",
+		"@nivo/line": "0.88.0",
+		"@nivo/pie": "0.88.0",
 		"@opentelemetry/api": "^1.9.0",
-		"@opentelemetry/exporter-trace-otlp-grpc": "^0.53.0",
-		"@opentelemetry/sdk-node": "^0.53.0",
+		"@opentelemetry/exporter-trace-otlp-grpc": "^0.54.2",
+		"@opentelemetry/sdk-node": "^0.54.2",
 		"@react-aria/color": "^3.0.0-beta.15",
-		"@react-aria/toolbar": "^3.0.0-beta.1",
+		"@react-aria/toolbar": "^3.0.0-nightly.5042",
 		"@react-pdf/renderer": "^3.4.5",
 		"@rocket.chat/account-utils": "workspace:^",
 		"@rocket.chat/agenda": "workspace:^",
@@ -253,7 +256,7 @@
 		"@rocket.chat/fuselage-ui-kit": "workspace:^",
 		"@rocket.chat/gazzodown": "workspace:^",
 		"@rocket.chat/i18n": "workspace:^",
-		"@rocket.chat/icons": "~0.38.0",
+		"@rocket.chat/icons": "~0.39.0",
 		"@rocket.chat/instance-status": "workspace:^",
 		"@rocket.chat/jwt": "workspace:^",
 		"@rocket.chat/layout": "~0.31.27",
@@ -268,7 +271,7 @@
 		"@rocket.chat/mp3-encoder": "0.24.0",
 		"@rocket.chat/network-broker": "workspace:^",
 		"@rocket.chat/omnichannel-services": "workspace:^",
-		"@rocket.chat/onboarding-ui": "~0.33.3",
+		"@rocket.chat/onboarding-ui": "~0.34.0",
 		"@rocket.chat/password-policies": "workspace:^",
 		"@rocket.chat/patch-injection": "workspace:^",
 		"@rocket.chat/pdf-worker": "workspace:^",
@@ -291,55 +294,55 @@
 		"@rocket.chat/ui-video-conf": "workspace:^",
 		"@rocket.chat/ui-voip": "workspace:^",
 		"@rocket.chat/web-ui-registration": "workspace:^",
-		"@slack/bolt": "^3.14.0",
-		"@slack/rtm-api": "^6.0.0",
-		"@tanstack/react-query": "^4.16.1",
+		"@slack/bolt": "^4.1.0",
+		"@slack/rtm-api": "^7.0.1",
+		"@tanstack/react-query": "^4.36.1",
 		"@vector-im/matrix-bot-sdk": "0.7.1-element.6",
 		"@xmldom/xmldom": "^0.8.10",
 		"adm-zip": "0.5.16",
-		"ajv": "^8.11.0",
-		"ajv-formats": "~2.1.1",
+		"ajv": "^8.17.1",
+		"ajv-formats": "~3.0.1",
 		"apn": "2.2.0",
-		"archiver": "^3.1.1",
+		"archiver": "^7.0.1",
 		"asterisk-manager": "^0.2.0",
 		"atlassian-crowd-patched": "^0.5.1",
-		"aws-sdk": "^2.1363.0",
+		"aws-sdk": "^2.1691.0",
 		"bad-words": "^3.0.4",
-		"bcrypt": "^5.0.1",
+		"bcrypt": "^5.1.1",
 		"body-parser": "1.20.3",
-		"bson": "^4.6.4",
+		"bson": "^4.7.2",
 		"busboy": "^1.6.0",
 		"bytebuffer": "5.0.1",
-		"chalk": "^4.0.0",
+		"chalk": "^4.1.2",
 		"change-case": "^4.1.2",
-		"chart.js": "^3.8.0",
+		"chart.js": "^3.9.1",
 		"codemirror": "^5.65.18",
 		"colorette": "^2.0.20",
 		"colors": "^1.4.0",
 		"connect": "^3.7.0",
-		"cookie": "^0.5.0",
+		"cookie": "^0.7.2",
 		"cookie-parser": "^1.4.7",
 		"cors": "^2.8.5",
 		"cron": "~1.8.2",
 		"cron-validator": "^1.3.1",
 		"css-vars-ponyfill": "^2.4.9",
-		"csv-parse": "^5.2.0",
-		"date-fns": "^2.28.0",
+		"csv-parse": "^5.5.6",
+		"date-fns": "^2.30.0",
 		"date.js": "~0.3.3",
-		"debug": "~4.1.1",
-		"dompurify": "^3.1.7",
+		"debug": "~4.3.7",
+		"dompurify": "^3.2.0",
 		"ejson": "^2.2.3",
 		"emailreplyparser": "^0.0.5",
 		"emoji-toolkit": "^7.0.1",
 		"emojione": "^4.5.0",
 		"esl": "^11.2.1",
-		"eventemitter3": "^4.0.7",
-		"exif-be-gone": "^1.3.2",
+		"eventemitter3": "^5.0.1",
+		"exif-be-gone": "^1.5.1",
 		"expiry-map": "^2.0.0",
-		"express": "^4.17.3",
+		"express": "^4.21.1",
 		"express-rate-limit": "^5.5.1",
-		"fastq": "^1.13.0",
-		"fflate": "^0.7.4",
+		"fastq": "^1.17.1",
+		"fflate": "^0.8.2",
 		"file-type": "^16.5.4",
 		"filenamify": "^4.3.0",
 		"filesize": "9.0.11",
@@ -347,22 +350,22 @@
 		"google-libphonenumber": "^3.2.38",
 		"gravatar": "^1.8.2",
 		"he": "^1.2.0",
-		"highlight.js": "^11.6.0",
+		"highlight.js": "^11.10.0",
 		"hljs9": "npm:highlight.js@^9.18.5",
-		"http-proxy-agent": "^5.0.0",
+		"http-proxy-agent": "^7.0.2",
 		"human-interval": "^2.0.1",
 		"i18next-http-backend": "^1.4.5",
 		"i18next-sprintf-postprocessor": "^0.2.2",
 		"iconv-lite": "^0.6.3",
-		"image-size": "^1.0.2",
+		"image-size": "^1.1.1",
 		"imap": "^0.8.19",
 		"ip-range-check": "^0.2.0",
-		"is-svg": "^4.3.2",
+		"is-svg": "^4.4.0",
 		"isolated-vm": "4.7.2",
-		"jschardet": "^3.0.0",
+		"jschardet": "^3.1.4",
 		"jsdom": "^16.7.0",
 		"jsrsasign": "^11.1.0",
-		"juice": "^8.0.0",
+		"juice": "^8.1.0",
 		"katex": "~0.16.11",
 		"ldap-escape": "^2.0.6",
 		"ldapjs": "^2.3.3",
@@ -370,25 +373,26 @@
 		"localforage": "^1.10.0",
 		"lodash.clonedeep": "^4.5.0",
 		"lodash.debounce": "^4.0.8",
+		"lodash.escape": "^4.0.1",
 		"lodash.get": "^4.4.2",
 		"mailparser": "^3.7.1",
-		"marked": "^4.2.5",
+		"marked": "^4.3.0",
 		"matrix-appservice": "^2.0.0",
 		"matrix-appservice-bridge": "^10.3.1",
 		"mem": "^8.1.1",
-		"meteor-node-stubs": "^1.2.10",
+		"meteor-node-stubs": "^1.2.12",
 		"mime-db": "^1.52.0",
 		"mime-type": "^4.0.0",
 		"mkdirp": "^1.0.4",
-		"moleculer": "^0.14.34",
+		"moleculer": "^0.14.35",
 		"moment": "^2.29.4",
 		"moment-timezone": "^0.5.46",
-		"mongo-message-queue": "^1.0.0",
+		"mongo-message-queue": "^1.1.0",
 		"mongodb": "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch",
-		"nats": "^2.6.1",
+		"nats": "^2.28.2",
 		"node-dogstatsd": "^0.0.7",
 		"node-fetch": "2.7.0",
-		"node-gcm": "1.0.5",
+		"node-gcm": "1.1.4",
 		"node-rsa": "^1.1.1",
 		"nodemailer": "^6.9.16",
 		"oauth2-server": "3.1.1",
@@ -396,48 +400,47 @@
 		"path": "^0.12.7",
 		"path-to-regexp": "^6.3.0",
 		"pdfjs-dist": "^2.16.105",
-		"pino": "^8.15.0",
+		"pino": "^8.21.0",
 		"postis": "^2.2.0",
 		"prom-client": "^14.2.0",
 		"prometheus-gc-stats": "^0.6.5",
 		"proxy-from-env": "^1.1.0",
-		"psl": "^1.8.0",
+		"psl": "^1.10.0",
 		"query-string": "^7.1.3",
 		"queue-fifo": "^0.2.6",
 		"rc-scrollbars": "^1.1.6",
-		"re-resizable": "^6.9.18",
+		"re-resizable": "^6.10.1",
 		"react": "~17.0.2",
 		"react-aria": "~3.23.1",
 		"react-dom": "~17.0.2",
 		"react-error-boundary": "^3.1.4",
 		"react-hook-form": "~7.45.4",
 		"react-i18next": "~13.2.2",
-		"react-keyed-flatten-children": "^1.3.0",
-		"react-virtuoso": "^4.7.1",
+		"react-keyed-flatten-children": "^3.0.2",
+		"react-virtuoso": "^4.12.0",
 		"sanitize-html": "^2.13.1",
 		"semver": "^7.6.3",
-		"sharp": "^0.32.6",
-		"sip.js": "^0.20.1",
-		"sodium-native": "^3.3.0",
+		"sharp": "^0.33.5",
+		"sip.js": "^0.21.2",
+		"sodium-native": "^4.3.1",
 		"sodium-plus": "^0.9.0",
 		"speakeasy": "^2.0.0",
 		"stream-buffers": "^3.0.3",
 		"strict-uri-encode": "^2.0.0",
 		"string-strip-html": "^7.0.3",
 		"suretype": "~2.4.1",
-		"swiper": "^9.4.1",
+		"swiper": "patch:swiper@npm%3A11.1.14#~/.yarn/patches/swiper-npm-11.1.14-8126fa478a.patch",
 		"textarea-caret": "^3.1.0",
 		"tinykeys": "^1.4.0",
-		"twilio": "^3.76.1",
+		"twilio": "^3.84.1",
 		"twit": "^2.2.11",
-		"typia": "~6.9.0",
+		"typia": "~6.11.4",
 		"ua-parser-js": "^1.0.39",
 		"underscore": "^1.13.7",
 		"universal-perf-hooks": "^1.0.1",
 		"url-polyfill": "^1.1.12",
-		"use-subscription": "~1.6.0",
 		"use-sync-external-store": "^1.2.2",
-		"uuid": "^8.3.2",
+		"uuid": "^11.0.3",
 		"webdav": "^4.11.4",
 		"xml-crypto": "~3.1.0",
 		"xml-encryption": "~3.0.2",
diff --git a/apps/meteor/playwright.config.ts b/apps/meteor/playwright.config.ts
index 822f78e28741..7f1c9dddf507 100644
--- a/apps/meteor/playwright.config.ts
+++ b/apps/meteor/playwright.config.ts
@@ -60,7 +60,7 @@ export default {
 				environmentId: '1',
 			},
 		],
-	].filter(Boolean),
+	].filter(Boolean) as unknown as PlaywrightTestConfig['reporter'],
 	testDir: 'tests/e2e',
 	testIgnore: 'tests/e2e/federation/**',
 	workers: 1,
diff --git a/apps/meteor/public/images/single-contact-id-upsell.png b/apps/meteor/public/images/single-contact-id-upsell.png
new file mode 100644
index 000000000000..c7fb7d3bbe81
Binary files /dev/null and b/apps/meteor/public/images/single-contact-id-upsell.png differ
diff --git a/apps/meteor/server/cron/federation.ts b/apps/meteor/server/cron/federation.ts
index 2bcd4ba27e9b..ea0b38de017f 100644
--- a/apps/meteor/server/cron/federation.ts
+++ b/apps/meteor/server/cron/federation.ts
@@ -16,6 +16,7 @@ async function updateSetting(id: string, value: SettingValue | null): Promise<vo
 		if (setting === undefined) {
 			await settingsRegistry.add(id, value);
 		} else {
+			// TODO: audit
 			(await Settings.updateValueById(id, value)).modifiedCount && void notifyOnSettingChangedById(id);
 		}
 	} else {
diff --git a/apps/meteor/server/database/trash.ts b/apps/meteor/server/database/trash.ts
index d08ac2ae6677..18c7161a3dc8 100644
--- a/apps/meteor/server/database/trash.ts
+++ b/apps/meteor/server/database/trash.ts
@@ -1,5 +1,5 @@
-import { TrashRaw } from '../models/raw/Trash';
 import { db } from './utils';
+import { TrashRaw } from '../models/raw/Trash';
 
 const Trash = new TrashRaw(db);
 export const trashCollection = Trash.col;
diff --git a/apps/meteor/server/database/utils.ts b/apps/meteor/server/database/utils.ts
index ec3864586924..37c5770dce41 100644
--- a/apps/meteor/server/database/utils.ts
+++ b/apps/meteor/server/database/utils.ts
@@ -1,3 +1,20 @@
 import { MongoInternals } from 'meteor/mongo';
+import type { MongoError } from 'mongodb';
 
 export const { db, client } = MongoInternals.defaultRemoteCollectionDriver().mongo;
+
+/**
+ * In MongoDB, errors like UnknownTransactionCommitResult and TransientTransactionError occur primarily in the context of distributed transactions
+ * and are often due to temporary network issues, server failures, or timeouts. Here’s what each error means and some common causes:
+ *
+ * 1. UnknownTransactionCommitResult: The client does not know if the transaction was committed successfully or not.
+ *   This error can occur when there’s a network disruption between the client and the MongoDB server during the transaction commit,
+ *   or when the primary node (which handles transaction commits) is unavailable, possibly due to a primary election or failover in a replica set.
+ *
+ * 2. TransientTransactionError: A temporary issue disrupts a transaction before it completes.
+ *
+ * Since these errors are transient, they may resolve on their own when retried after a short interval.
+ */
+export const shouldRetryTransaction = (e: unknown): boolean =>
+	(e as MongoError)?.errorLabels?.includes('UnknownTransactionCommitResult') ||
+	(e as MongoError)?.errorLabels?.includes('TransientTransactionError');
diff --git a/apps/meteor/server/email/IMAPInterceptor.ts b/apps/meteor/server/email/IMAPInterceptor.ts
index dd81006a39af..c0ec91681dc6 100644
--- a/apps/meteor/server/email/IMAPInterceptor.ts
+++ b/apps/meteor/server/email/IMAPInterceptor.ts
@@ -57,6 +57,9 @@ export class IMAPInterceptor extends EventEmitter {
 		});
 		this.retries = 0;
 		this.inboxId = id;
+		this.imap.on('error', async (err: Error) => {
+			logger.error({ msg: 'IMAP error', err });
+		});
 		void this.start();
 	}
 
@@ -88,8 +91,7 @@ export class IMAPInterceptor extends EventEmitter {
 			}
 		});
 
-		this.imap.on('error', async (err: Error) => {
-			logger.error({ msg: 'IMAP error', err });
+		this.imap.on('error', async () => {
 			this.retries++;
 			await this.reconnect();
 		});
@@ -106,6 +108,14 @@ export class IMAPInterceptor extends EventEmitter {
 	}
 
 	stop(callback = new Function()): void {
+		if (this.backoff) {
+			clearTimeout(this.backoff);
+			this.backoffDurationMS = 3000;
+		}
+		this.stopWithNoStopBackoff(callback);
+	}
+
+	private stopWithNoStopBackoff(callback = new Function()): void {
 		logger.debug('IMAP stop called');
 		this.imap.removeAllListeners();
 		this.imap.once('end', () => {
@@ -113,6 +123,9 @@ export class IMAPInterceptor extends EventEmitter {
 			callback?.();
 		});
 		this.imap.end();
+		this.imap.on('error', async (err: Error) => {
+			logger.error({ msg: 'IMAP error', err });
+		});
 	}
 
 	async reconnect(): Promise<void> {
@@ -121,26 +134,19 @@ export class IMAPInterceptor extends EventEmitter {
 			this.stop();
 			return this.selfDisable();
 		}
+
 		if (this.backoff) {
 			clearTimeout(this.backoff);
 			this.backoffDurationMS = 3000;
 		}
-		const loop = async (): Promise<void> => {
-			logger.debug(`Reconnecting to ${this.config.user}: ${this.retries}`);
-			if (this.canRetry()) {
-				this.backoffDurationMS *= 2;
-				this.backoff = setTimeout(loop, this.backoffDurationMS);
-			} else {
-				logger.info(`IMAP reconnection failed on inbox ${this.config.user}`);
-				clearTimeout(this.backoff);
-				this.stop();
-				await this.selfDisable();
-				return;
-			}
-			this.stop();
-			await this.start();
-		};
-		this.backoff = setTimeout(loop, this.backoffDurationMS);
+
+		this.backoff = setTimeout(
+			() => {
+				this.stopWithNoStopBackoff();
+				void this.start();
+			},
+			(this.backoffDurationMS += this.backoffDurationMS),
+		);
 	}
 
 	imapSearch(): Promise<number[]> {
diff --git a/apps/meteor/server/features/EmailInbox/EmailInbox.ts b/apps/meteor/server/features/EmailInbox/EmailInbox.ts
index f9c4422f88e0..d02397558cab 100644
--- a/apps/meteor/server/features/EmailInbox/EmailInbox.ts
+++ b/apps/meteor/server/features/EmailInbox/EmailInbox.ts
@@ -4,10 +4,10 @@ import { Meteor } from 'meteor/meteor';
 import nodemailer from 'nodemailer';
 import type Mail from 'nodemailer/lib/mailer';
 
-import { settings } from '../../../app/settings/server';
-import { IMAPInterceptor } from '../../email/IMAPInterceptor';
 import { onEmailReceived } from './EmailInbox_Incoming';
 import { logger } from './logger';
+import { settings } from '../../../app/settings/server';
+import { IMAPInterceptor } from '../../email/IMAPInterceptor';
 
 export type Inbox = {
 	imap: IMAPInterceptor;
@@ -43,7 +43,7 @@ export async function configureEmailInboxes(): Promise<void> {
 								tlsOptions: {
 									rejectUnauthorized: false,
 								},
-						  }
+							}
 						: {}),
 				},
 				{
diff --git a/apps/meteor/server/features/EmailInbox/EmailInbox_Incoming.ts b/apps/meteor/server/features/EmailInbox/EmailInbox_Incoming.ts
index 7ecb8f309b29..6acd23dd67f1 100644
--- a/apps/meteor/server/features/EmailInbox/EmailInbox_Incoming.ts
+++ b/apps/meteor/server/features/EmailInbox/EmailInbox_Incoming.ts
@@ -11,13 +11,14 @@ import { Random } from '@rocket.chat/random';
 import type { ParsedMail, Attachment } from 'mailparser';
 import stripHtml from 'string-strip-html';
 
+import { logger } from './logger';
 import { FileUpload } from '../../../app/file-upload/server';
 import { notifyOnMessageChange } from '../../../app/lib/server/lib/notifyListener';
 import { Livechat as LivechatTyped } from '../../../app/livechat/server/lib/LivechatTyped';
 import { QueueManager } from '../../../app/livechat/server/lib/QueueManager';
+import { setDepartmentForGuest } from '../../../app/livechat/server/lib/departmentsLib';
 import { settings } from '../../../app/settings/server';
 import { i18n } from '../../lib/i18n';
-import { logger } from './logger';
 
 type FileAttachment = VideoAttachmentProps & ImageAttachmentProps & AudioAttachmentProps;
 
@@ -34,7 +35,7 @@ async function getGuestByEmail(email: string, name: string, department = ''): Pr
 				delete guest.department;
 				return guest;
 			}
-			await LivechatTyped.setDepartmentForGuest({ token: guest.token, department });
+			await setDepartmentForGuest({ token: guest.token, department });
 			return LivechatVisitors.findOneEnabledById(guest._id, {});
 		}
 		return guest;
@@ -139,7 +140,7 @@ export async function onEmailReceived(email: ParsedMail, inbox: string, departme
 					wrapTails: ')',
 				},
 				skipHtmlDecoding: false,
-		  }).result
+			}).result
 		: email.text || '';
 
 	const rid = room?._id ?? Random.id();
diff --git a/apps/meteor/server/features/EmailInbox/EmailInbox_Outgoing.ts b/apps/meteor/server/features/EmailInbox/EmailInbox_Outgoing.ts
index 44a9e2cd6a15..79ebda20b38c 100644
--- a/apps/meteor/server/features/EmailInbox/EmailInbox_Outgoing.ts
+++ b/apps/meteor/server/features/EmailInbox/EmailInbox_Outgoing.ts
@@ -4,6 +4,9 @@ import { Messages, Uploads, LivechatRooms, Rooms, Users } from '@rocket.chat/mod
 import { Match } from 'meteor/check';
 import type Mail from 'nodemailer/lib/mailer';
 
+import { inboxes } from './EmailInbox';
+import type { Inbox } from './EmailInbox';
+import { logger } from './logger';
 import { FileUpload } from '../../../app/file-upload/server';
 import { sendMessage } from '../../../app/lib/server/functions/sendMessage';
 import { notifyOnMessageChange } from '../../../app/lib/server/lib/notifyListener';
@@ -11,9 +14,6 @@ import { settings } from '../../../app/settings/server';
 import { slashCommands } from '../../../app/utils/server/slashCommand';
 import { callbacks } from '../../../lib/callbacks';
 import { i18n } from '../../lib/i18n';
-import { inboxes } from './EmailInbox';
-import type { Inbox } from './EmailInbox';
-import { logger } from './logger';
 
 const livechatQuoteRegExp = /^\[\s\]\(https?:\/\/.+\/live\/.+\?msg=(?<id>.+?)\)\s(?<text>.+)/s;
 
@@ -71,7 +71,7 @@ async function sendEmail(inbox: Inbox, mail: Mail.Options, options?: any): Promi
 				? {
 						name: inbox.config.senderInfo,
 						address: inbox.config.email,
-				  }
+					}
 				: inbox.config.email,
 			...mail,
 		})
diff --git a/apps/meteor/server/importPackages.ts b/apps/meteor/server/importPackages.ts
index cab60d63a5c9..d22fdf275fec 100644
--- a/apps/meteor/server/importPackages.ts
+++ b/apps/meteor/server/importPackages.ts
@@ -26,6 +26,7 @@ import '../app/google-oauth/server';
 import '../app/iframe-login/server';
 import '../app/importer/server';
 import '../app/importer-csv/server';
+import '../app/importer-omnichannel-contacts/server';
 import '../app/importer-pending-files/server';
 import '../app/importer-pending-avatars/server';
 import '../app/importer-slack/server';
diff --git a/apps/meteor/server/lib/cas/createNewUser.ts b/apps/meteor/server/lib/cas/createNewUser.ts
index ebb4143b53be..62c50a283348 100644
--- a/apps/meteor/server/lib/cas/createNewUser.ts
+++ b/apps/meteor/server/lib/cas/createNewUser.ts
@@ -3,8 +3,8 @@ import { Rooms, Users } from '@rocket.chat/models';
 import { pick } from '@rocket.chat/tools';
 import { Accounts } from 'meteor/accounts-base';
 
-import { createRoom } from '../../../app/lib/server/functions/createRoom';
 import { logger } from './logger';
+import { createRoom } from '../../../app/lib/server/functions/createRoom';
 
 type CASUserOptions = {
 	attributes: Record<string, string | undefined>;
diff --git a/apps/meteor/server/lib/cas/loginHandler.ts b/apps/meteor/server/lib/cas/loginHandler.ts
index 80ce91350de8..239c9f8e6449 100644
--- a/apps/meteor/server/lib/cas/loginHandler.ts
+++ b/apps/meteor/server/lib/cas/loginHandler.ts
@@ -2,11 +2,11 @@ import { CredentialTokens, Users } from '@rocket.chat/models';
 import { getObjectKeys, wrapExceptions } from '@rocket.chat/tools';
 import { Accounts } from 'meteor/accounts-base';
 
-import { _setRealName } from '../../../app/lib/server/functions/setRealName';
-import { settings } from '../../../app/settings/server';
 import { createNewUser } from './createNewUser';
 import { findExistingCASUser } from './findExistingCASUser';
 import { logger } from './logger';
+import { _setRealName } from '../../../app/lib/server/functions/setRealName';
+import { settings } from '../../../app/settings/server';
 
 export const loginHandlerCAS = async (options: any): Promise<undefined | Accounts.LoginMethodResult> => {
 	if (!options.cas) {
diff --git a/apps/meteor/server/lib/cas/middleware.ts b/apps/meteor/server/lib/cas/middleware.ts
index 074177838f9a..f8c0de6945d4 100644
--- a/apps/meteor/server/lib/cas/middleware.ts
+++ b/apps/meteor/server/lib/cas/middleware.ts
@@ -6,8 +6,8 @@ import type { ICredentialToken } from '@rocket.chat/core-typings';
 import { CredentialTokens } from '@rocket.chat/models';
 import _ from 'underscore';
 
-import { settings } from '../../../app/settings/server';
 import { logger } from './logger';
+import { settings } from '../../../app/settings/server';
 
 const closePopup = function (res: ServerResponse): void {
 	res.writeHead(200, { 'Content-Type': 'text/html' });
diff --git a/apps/meteor/server/lib/cas/updateCasService.ts b/apps/meteor/server/lib/cas/updateCasService.ts
index 5583eda22f83..cd7b70257721 100644
--- a/apps/meteor/server/lib/cas/updateCasService.ts
+++ b/apps/meteor/server/lib/cas/updateCasService.ts
@@ -1,8 +1,8 @@
 import type { LoginServiceConfiguration } from '@rocket.chat/core-typings';
 import { ServiceConfiguration } from 'meteor/service-configuration';
 
-import { settings } from '../../../app/settings/server/cached';
 import { logger } from './logger';
+import { settings } from '../../../app/settings/server/cached';
 
 export async function updateCasServices(): Promise<void> {
 	const data: Partial<LoginServiceConfiguration> = {
diff --git a/apps/meteor/server/lib/dataExport/sendFile.ts b/apps/meteor/server/lib/dataExport/sendFile.ts
index 54c691127d9a..552e9f43ecc2 100644
--- a/apps/meteor/server/lib/dataExport/sendFile.ts
+++ b/apps/meteor/server/lib/dataExport/sendFile.ts
@@ -48,7 +48,7 @@ export const sendFile = async (data: ExportFile, user: IUser): Promise<void> =>
 						...(data.dateFrom && { $gte: data.dateFrom }),
 						...(data.dateTo && { $lte: data.dateTo }),
 					},
-			  };
+				};
 
 	const exportMessages = async (): Promise<void> => {
 		const { fileList } = await exportRoomMessagesToFile(exportPath, assetsPath, exportType, roomsToExport, user, filter, {}, false);
diff --git a/apps/meteor/server/lib/eraseRoom.ts b/apps/meteor/server/lib/eraseRoom.ts
index 143c0a31977d..9852daaf3c59 100644
--- a/apps/meteor/server/lib/eraseRoom.ts
+++ b/apps/meteor/server/lib/eraseRoom.ts
@@ -3,9 +3,9 @@ import { Message, Team } from '@rocket.chat/core-services';
 import { Rooms } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
 
+import { roomCoordinator } from './rooms/roomCoordinator';
 import { hasPermissionAsync } from '../../app/authorization/server/functions/hasPermission';
 import { deleteRoom } from '../../app/lib/server/functions/deleteRoom';
-import { roomCoordinator } from './rooms/roomCoordinator';
 
 export async function eraseRoom(rid: string, uid: string): Promise<void> {
 	const room = await Rooms.findOneById(rid);
diff --git a/apps/meteor/server/lib/i18n.ts b/apps/meteor/server/lib/i18n.ts
index 7b1d289462ae..0eb7dd6a5387 100644
--- a/apps/meteor/server/lib/i18n.ts
+++ b/apps/meteor/server/lib/i18n.ts
@@ -1,6 +1,4 @@
-import type { RocketchatI18nKeys } from '@rocket.chat/i18n';
 import i18nDict from '@rocket.chat/i18n';
-import type { TOptions } from 'i18next';
 
 import { availableTranslationNamespaces, defaultTranslationNamespace, extractTranslationNamespaces, i18n } from '../../app/utils/lib/i18n';
 
@@ -19,12 +17,4 @@ void i18n.init({
 	initImmediate: false,
 });
 
-declare module 'i18next' {
-	// eslint-disable-next-line @typescript-eslint/naming-convention
-	interface TFunction {
-		(key: RocketchatI18nKeys): string;
-		(key: RocketchatI18nKeys, options: TOptions): string;
-	}
-}
-
 export { i18n };
diff --git a/apps/meteor/server/lib/ldap/Connection.ts b/apps/meteor/server/lib/ldap/Connection.ts
index b753a2baa9dc..94c43a0d6620 100644
--- a/apps/meteor/server/lib/ldap/Connection.ts
+++ b/apps/meteor/server/lib/ldap/Connection.ts
@@ -8,10 +8,10 @@ import type {
 } from '@rocket.chat/core-typings';
 import ldapjs from 'ldapjs';
 
-import { settings } from '../../../app/settings/server';
-import { ensureArray } from '../../../lib/utils/arrayUtils';
 import { logger, connLogger, searchLogger, authLogger, bindLogger, mapLogger } from './Logger';
 import { getLDAPConditionalSetting } from './getLDAPConditionalSetting';
+import { settings } from '../../../app/settings/server';
+import { ensureArray } from '../../../lib/utils/arrayUtils';
 
 interface ILDAPEntryCallback<T> {
 	(entry: ldapjs.SearchEntry): T | undefined;
diff --git a/apps/meteor/server/lib/ldap/Manager.ts b/apps/meteor/server/lib/ldap/Manager.ts
index 8d2c6e9639b8..a0f474cfe5d8 100644
--- a/apps/meteor/server/lib/ldap/Manager.ts
+++ b/apps/meteor/server/lib/ldap/Manager.ts
@@ -8,15 +8,15 @@ import { Accounts } from 'meteor/accounts-base';
 import { Meteor } from 'meteor/meteor';
 import _ from 'underscore';
 
+import { LDAPConnection } from './Connection';
+import { logger, authLogger, connLogger } from './Logger';
+import { LDAPUserConverter } from './UserConverter';
+import { getLDAPConditionalSetting } from './getLDAPConditionalSetting';
 import type { UserConverterOptions } from '../../../app/importer/server/classes/converters/UserConverter';
 import { setUserAvatar } from '../../../app/lib/server/functions/setUserAvatar';
 import { settings } from '../../../app/settings/server';
 import { callbacks } from '../../../lib/callbacks';
 import { omit } from '../../../lib/utils/omit';
-import { LDAPConnection } from './Connection';
-import { logger, authLogger, connLogger } from './Logger';
-import { LDAPUserConverter } from './UserConverter';
-import { getLDAPConditionalSetting } from './getLDAPConditionalSetting';
 
 export class LDAPManager {
 	public static async login(username: string, password: string): Promise<LDAPLoginResult> {
diff --git a/apps/meteor/server/lib/logger/logPayloads.ts b/apps/meteor/server/lib/logger/logPayloads.ts
index 0e9a23a0a077..67d67b6a68bb 100644
--- a/apps/meteor/server/lib/logger/logPayloads.ts
+++ b/apps/meteor/server/lib/logger/logPayloads.ts
@@ -19,11 +19,11 @@ export const getMethodArgs =
 				return {
 					arguments: params.map((arg) => (typeof arg !== 'object' ? arg : omit(arg, 'password', 'msg', 'pass', 'username', 'message'))),
 				};
-		  };
+			};
 
 export const getRestPayload =
 	LOG_REST_PAYLOAD === 'false' && LOG_REST_METHOD_PAYLOADS === 'false'
 		? (): null => null
 		: (payload: unknown): { payload: unknown } => ({
 				payload,
-		  });
+			});
diff --git a/apps/meteor/server/lib/migrations.ts b/apps/meteor/server/lib/migrations.ts
index f70b5bcca9ff..8bb608ca05f1 100644
--- a/apps/meteor/server/lib/migrations.ts
+++ b/apps/meteor/server/lib/migrations.ts
@@ -2,9 +2,9 @@ import type { IControl } from '@rocket.chat/core-typings';
 import { Logger } from '@rocket.chat/logger';
 import { Migrations } from '@rocket.chat/models';
 
+import { showErrorBox } from './logger/showBox';
 import { Info } from '../../app/utils/rocketchat.info';
 import { sleep } from '../../lib/utils/sleep';
-import { showErrorBox } from './logger/showBox';
 
 type IMigration = {
 	name?: string;
diff --git a/apps/meteor/server/lib/moderation/deleteReportedMessages.ts b/apps/meteor/server/lib/moderation/deleteReportedMessages.ts
index 218714d5a8b0..204ae90d8c77 100644
--- a/apps/meteor/server/lib/moderation/deleteReportedMessages.ts
+++ b/apps/meteor/server/lib/moderation/deleteReportedMessages.ts
@@ -49,13 +49,16 @@ export async function deleteReportedMessages(messages: IMessage[], user: IUser):
 		await Messages.setAsDeletedByIdsAndUser(messageIds, user as any);
 	}
 
-	const transformed = messages.reduce((acc, { rid, _id }) => {
-		if (!acc[rid]) {
-			acc[rid] = [];
-		}
-		acc[rid].push(_id);
-		return acc;
-	}, {} as Record<string, string[]>);
+	const transformed = messages.reduce(
+		(acc, { rid, _id }) => {
+			if (!acc[rid]) {
+				acc[rid] = [];
+			}
+			acc[rid].push(_id);
+			return acc;
+		},
+		{} as Record<string, string[]>,
+	);
 
 	Object.entries(transformed).forEach(([rid, messageIds]) => {
 		void api.broadcast('notify.deleteMessageBulk', rid, {
diff --git a/apps/meteor/server/lib/oauth/updateOAuthServices.ts b/apps/meteor/server/lib/oauth/updateOAuthServices.ts
index f1df9fbb7aa9..784628cae44a 100644
--- a/apps/meteor/server/lib/oauth/updateOAuthServices.ts
+++ b/apps/meteor/server/lib/oauth/updateOAuthServices.ts
@@ -7,13 +7,13 @@ import type {
 } from '@rocket.chat/core-typings';
 import { LoginServiceConfiguration } from '@rocket.chat/models';
 
+import { logger } from './logger';
 import { CustomOAuth } from '../../../app/custom-oauth/server/custom_oauth_server';
 import {
 	notifyOnLoginServiceConfigurationChanged,
 	notifyOnLoginServiceConfigurationChangedByService,
 } from '../../../app/lib/server/lib/notifyListener';
 import { settings } from '../../../app/settings/server/cached';
-import { logger } from './logger';
 
 export async function updateOAuthServices(): Promise<void> {
 	const services = settings.getByRegexp(/^(Accounts_OAuth_|Accounts_OAuth_Custom-)[a-z0-9_]+$/i);
diff --git a/apps/meteor/server/lib/pushConfig.ts b/apps/meteor/server/lib/pushConfig.ts
index fb2f91c4b868..14f8c6b38ef3 100644
--- a/apps/meteor/server/lib/pushConfig.ts
+++ b/apps/meteor/server/lib/pushConfig.ts
@@ -3,12 +3,12 @@ import type { ServerMethods } from '@rocket.chat/ddp-client';
 import { AppsTokens } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
 
+import { i18n } from './i18n';
 import { hasPermissionAsync } from '../../app/authorization/server/functions/hasPermission';
 import { getWorkspaceAccessToken } from '../../app/cloud/server';
 import { RateLimiter } from '../../app/lib/server/lib';
 import { Push } from '../../app/push/server';
 import { settings } from '../../app/settings/server';
-import { i18n } from './i18n';
 
 export const executePushTest = async (userId: IUser['_id'], username: IUser['username']): Promise<number> => {
 	const tokens = await AppsTokens.countTokensByUserId(userId);
diff --git a/apps/meteor/server/lib/refreshLoginServices.ts b/apps/meteor/server/lib/refreshLoginServices.ts
index 41f3b647f05e..41c5691a6de8 100644
--- a/apps/meteor/server/lib/refreshLoginServices.ts
+++ b/apps/meteor/server/lib/refreshLoginServices.ts
@@ -1,8 +1,8 @@
 import { ServiceConfiguration } from 'meteor/service-configuration';
 
-import { loadSamlServiceProviders } from '../../app/meteor-accounts-saml/server/lib/settings';
 import { updateCasServices } from './cas/updateCasService';
 import { updateOAuthServices } from './oauth/updateOAuthServices';
+import { loadSamlServiceProviders } from '../../app/meteor-accounts-saml/server/lib/settings';
 
 export async function refreshLoginServices(): Promise<void> {
 	await ServiceConfiguration.configurations.removeAsync({});
diff --git a/apps/meteor/server/lib/resetUserE2EKey.ts b/apps/meteor/server/lib/resetUserE2EKey.ts
index 26ac78f30ad6..151916b9bab3 100644
--- a/apps/meteor/server/lib/resetUserE2EKey.ts
+++ b/apps/meteor/server/lib/resetUserE2EKey.ts
@@ -2,11 +2,11 @@ import { api } from '@rocket.chat/core-services';
 import { Subscriptions, Users, Rooms } from '@rocket.chat/models';
 import { Meteor } from 'meteor/meteor';
 
+import { i18n } from './i18n';
+import { isUserIdFederated } from './isUserIdFederated';
 import { notifyOnUserChange, notifyOnSubscriptionChangedByUserId } from '../../app/lib/server/lib/notifyListener';
 import * as Mailer from '../../app/mailer/server/api';
 import { settings } from '../../app/settings/server';
-import { i18n } from './i18n';
-import { isUserIdFederated } from './isUserIdFederated';
 
 const sendResetNotification = async function (uid: string): Promise<void> {
 	const user = await Users.findOneById(uid, {});
diff --git a/apps/meteor/server/main.ts b/apps/meteor/server/main.ts
index b5f34876c0bd..647f476587b8 100644
--- a/apps/meteor/server/main.ts
+++ b/apps/meteor/server/main.ts
@@ -7,13 +7,13 @@ import './models/startup';
 import './settings';
 import '../app/settings/server';
 
-import { startLicense } from '../ee/app/license/server/startup';
-import { registerEEBroker } from '../ee/server';
-import { startFederationService } from '../ee/server/startup/services';
 import { configureLoginServices } from './configuration';
 import { configureLogLevel } from './configureLogLevel';
 import { registerServices } from './services/startup';
 import { startup } from './startup';
+import { startLicense } from '../ee/app/license/server/startup';
+import { registerEEBroker } from '../ee/server';
+import { startFederationService } from '../ee/server/startup/services';
 
 import './routes';
 import '../app/lib/server/startup';
diff --git a/apps/meteor/server/methods/browseChannels.ts b/apps/meteor/server/methods/browseChannels.ts
index 965accc83954..5956fa4eaa8c 100644
--- a/apps/meteor/server/methods/browseChannels.ts
+++ b/apps/meteor/server/methods/browseChannels.ts
@@ -116,7 +116,7 @@ const getChannelsAndGroups = async (
 	};
 };
 
-const getChannelsCountForTeam = mem((teamId) => Rooms.findByTeamId(teamId, { projection: { _id: 1 } }).count(), {
+const getChannelsCountForTeam = mem((teamId) => Rooms.countByTeamId(teamId), {
 	maxAge: 2000,
 });
 
@@ -163,9 +163,7 @@ const getTeams = async (
 		},
 	);
 	const results = await Promise.all(
-		(
-			await cursor.toArray()
-		).map(async (room) => ({
+		(await cursor.toArray()).map(async (room) => ({
 			...room,
 			roomsCount: await getChannelsCountForTeam(room.teamId),
 		})),
diff --git a/apps/meteor/server/methods/removeRoomOwner.ts b/apps/meteor/server/methods/removeRoomOwner.ts
index 91046655a4a6..bc4ddf7964ee 100644
--- a/apps/meteor/server/methods/removeRoomOwner.ts
+++ b/apps/meteor/server/methods/removeRoomOwner.ts
@@ -1,11 +1,10 @@
 import { api, Message, Team } from '@rocket.chat/core-services';
 import { isRoomFederated } from '@rocket.chat/core-typings';
 import type { ServerMethods } from '@rocket.chat/ddp-client';
-import { Subscriptions, Rooms, Users } from '@rocket.chat/models';
+import { Subscriptions, Rooms, Users, Roles } from '@rocket.chat/models';
 import { check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 
-import { getUsersInRole } from '../../app/authorization/server';
 import { hasPermissionAsync } from '../../app/authorization/server/functions/hasPermission';
 import { notifyOnSubscriptionChangedById } from '../../app/lib/server/lib/notifyListener';
 import { settings } from '../../app/settings/server';
@@ -64,7 +63,7 @@ Meteor.methods<ServerMethods>({
 			});
 		}
 
-		const numOwners = await (await getUsersInRole('owner', rid)).count();
+		const numOwners = await Roles.countUsersInRole('owner', rid);
 
 		if (numOwners === 1) {
 			throw new Meteor.Error('error-remove-last-owner', 'This is the last owner. Please set a new owner before removing this one.', {
diff --git a/apps/meteor/server/methods/removeUserFromRoom.ts b/apps/meteor/server/methods/removeUserFromRoom.ts
index 781ffe3a2671..8d1cb2e2ba2b 100644
--- a/apps/meteor/server/methods/removeUserFromRoom.ts
+++ b/apps/meteor/server/methods/removeUserFromRoom.ts
@@ -2,11 +2,11 @@ import { Apps, AppEvents } from '@rocket.chat/apps';
 import { AppsEngineException } from '@rocket.chat/apps-engine/definition/exceptions';
 import { Message, Team, Room } from '@rocket.chat/core-services';
 import type { ServerMethods } from '@rocket.chat/ddp-client';
-import { Subscriptions, Rooms, Users } from '@rocket.chat/models';
+import { Subscriptions, Rooms, Users, Roles } from '@rocket.chat/models';
 import { Match, check } from 'meteor/check';
 import { Meteor } from 'meteor/meteor';
 
-import { canAccessRoomAsync, getUsersInRole } from '../../app/authorization/server';
+import { canAccessRoomAsync } from '../../app/authorization/server';
 import { hasPermissionAsync } from '../../app/authorization/server/functions/hasPermission';
 import { hasRoleAsync } from '../../app/authorization/server/functions/hasRole';
 import { notifyOnRoomChanged, notifyOnSubscriptionChanged } from '../../app/lib/server/lib/notifyListener';
@@ -70,7 +70,7 @@ export const removeUserFromRoomMethod = async (fromId: string, data: { rid: stri
 	}
 
 	if (await hasRoleAsync(removedUser._id, 'owner', room._id)) {
-		const numOwners = await (await getUsersInRole('owner', room._id)).count();
+		const numOwners = await Roles.countUsersInRole('owner', room._id);
 
 		if (numOwners === 1) {
 			throw new Meteor.Error('error-you-are-last-owner', 'You are the last owner. Please set new owner before leaving the room.', {
diff --git a/apps/meteor/server/methods/requestDataDownload.ts b/apps/meteor/server/methods/requestDataDownload.ts
index 80769aae6340..cf30a6768b7c 100644
--- a/apps/meteor/server/methods/requestDataDownload.ts
+++ b/apps/meteor/server/methods/requestDataDownload.ts
@@ -34,7 +34,7 @@ Meteor.methods<ServerMethods>({
 
 		const lastOperation = await ExportOperations.findLastOperationByUser(userId, fullExport);
 		const requestDay = lastOperation ? lastOperation.createdAt : new Date();
-		const pendingOperationsBeforeMyRequestCount = await ExportOperations.findAllPendingBeforeMyRequest(requestDay).count();
+		const pendingOperationsBeforeMyRequestCount = await ExportOperations.countAllPendingBeforeMyRequest(requestDay);
 
 		if (lastOperation) {
 			const yesterday = new Date();
diff --git a/apps/meteor/server/methods/saveUserPreferences.ts b/apps/meteor/server/methods/saveUserPreferences.ts
index 70e3a5cb9ea7..9f35abfc1440 100644
--- a/apps/meteor/server/methods/saveUserPreferences.ts
+++ b/apps/meteor/server/methods/saveUserPreferences.ts
@@ -25,7 +25,9 @@ type UserPreferences = {
 	autoImageLoad: boolean;
 	emailNotificationMode: string;
 	unreadAlert: boolean;
+	masterVolume: number;
 	notificationsSoundVolume: number;
+	voipRingerVolume: number;
 	desktopNotifications: string;
 	pushNotifications: string;
 	enableAutoAway: boolean;
@@ -97,7 +99,9 @@ export const saveUserPreferences = async (settings: Partial<UserPreferences>, us
 		autoImageLoad: Match.Optional(Boolean),
 		emailNotificationMode: Match.Optional(String),
 		unreadAlert: Match.Optional(Boolean),
+		masterVolume: Match.Optional(Number),
 		notificationsSoundVolume: Match.Optional(Number),
+		voipRingerVolume: Match.Optional(Number),
 		desktopNotifications: Match.Optional(String),
 		pushNotifications: Match.Optional(String),
 		enableAutoAway: Match.Optional(Boolean),
diff --git a/apps/meteor/server/models/raw/Analytics.ts b/apps/meteor/server/models/raw/Analytics.ts
index de4700834168..e7f5a57ec9f4 100644
--- a/apps/meteor/server/models/raw/Analytics.ts
+++ b/apps/meteor/server/models/raw/Analytics.ts
@@ -3,8 +3,8 @@ import type { IAnalyticsModel, IChannelsWithNumberOfMessagesBetweenDate } from '
 import { Random } from '@rocket.chat/random';
 import type { AggregationCursor, FindCursor, Db, IndexDescription, FindOptions, UpdateResult, Document, Collection } from 'mongodb';
 
-import { readSecondaryPreferred } from '../../database/readSecondaryPreferred';
 import { BaseRaw } from './BaseRaw';
+import { readSecondaryPreferred } from '../../database/readSecondaryPreferred';
 
 export class AnalyticsRaw extends BaseRaw<IAnalytic> implements IAnalyticsModel {
 	constructor(db: Db) {
diff --git a/apps/meteor/server/models/raw/Avatars.ts b/apps/meteor/server/models/raw/Avatars.ts
index 1e28c878848a..c4935c18d6be 100644
--- a/apps/meteor/server/models/raw/Avatars.ts
+++ b/apps/meteor/server/models/raw/Avatars.ts
@@ -1,6 +1,6 @@
-import type { IAvatar, RocketChatRecordDeleted } from '@rocket.chat/core-typings';
+import type { IAvatar, RocketChatRecordDeleted, IUser } from '@rocket.chat/core-typings';
 import type { IAvatarsModel } from '@rocket.chat/model-typings';
-import type { Collection, Db } from 'mongodb';
+import type { Collection, Db, FindOptions } from 'mongodb';
 
 import { BaseUploadModelRaw } from './BaseUploadModel';
 
@@ -8,4 +8,8 @@ export class AvatarsRaw extends BaseUploadModelRaw implements IAvatarsModel {
 	constructor(db: Db, trash?: Collection<RocketChatRecordDeleted<IAvatar>>) {
 		super(db, 'avatars', trash);
 	}
+
+	findOneByUserId(userId: IUser['_id'], options?: FindOptions<IAvatar>) {
+		return this.findOne({ userId }, options);
+	}
 }
diff --git a/apps/meteor/server/models/raw/BaseRaw.ts b/apps/meteor/server/models/raw/BaseRaw.ts
index 0a7fc56449b0..e1caf93cf3a2 100644
--- a/apps/meteor/server/models/raw/BaseRaw.ts
+++ b/apps/meteor/server/models/raw/BaseRaw.ts
@@ -28,6 +28,7 @@ import type {
 	DeleteResult,
 	DeleteOptions,
 	FindOneAndDeleteOptions,
+	CountDocumentsOptions,
 } from 'mongodb';
 
 import { setUpdatedAt } from './setUpdatedAt';
@@ -36,7 +37,7 @@ const warnFields =
 	process.env.NODE_ENV !== 'production' || process.env.SHOW_WARNINGS === 'true'
 		? (...rest: any): void => {
 				console.warn(...rest, new Error().stack);
-		  }
+			}
 		: new Function();
 
 type ModelOptions = {
@@ -69,7 +70,12 @@ export abstract class BaseRaw<
 	 * @param trash Trash collection instance
 	 * @param options Model options
 	 */
-	constructor(private db: Db, protected name: string, protected trash?: Collection<TDeleted>, private options?: ModelOptions) {
+	constructor(
+		private db: Db,
+		protected name: string,
+		protected trash?: Collection<TDeleted>,
+		private options?: ModelOptions,
+	) {
 		this.collectionName = options?.collectionNameResolver ? options.collectionNameResolver(name) : getCollectionName(name);
 
 		this.col = this.db.collection(this.collectionName, options?.collection || {});
@@ -497,7 +503,10 @@ export abstract class BaseRaw<
 		return this.col.watch(pipeline);
 	}
 
-	countDocuments(query: Filter<T>): Promise<number> {
+	countDocuments(query: Filter<T>, options?: CountDocumentsOptions): Promise<number> {
+		if (options) {
+			return this.col.countDocuments(query, options);
+		}
 		return this.col.countDocuments(query);
 	}
 
diff --git a/apps/meteor/server/models/raw/BaseUploadModel.ts b/apps/meteor/server/models/raw/BaseUploadModel.ts
index 4037566272b9..6d2760a19f78 100644
--- a/apps/meteor/server/models/raw/BaseUploadModel.ts
+++ b/apps/meteor/server/models/raw/BaseUploadModel.ts
@@ -19,6 +19,7 @@ type T = IUpload;
 export abstract class BaseUploadModelRaw extends BaseRaw<T> implements IBaseUploadsModel<T> {
 	protected modelIndexes(): IndexDescription[] {
 		return [
+			{ key: { userId: 1 }, sparse: true },
 			{ key: { name: 1 }, sparse: true },
 			{ key: { rid: 1 }, sparse: true },
 			{ key: { expiresAt: 1 }, sparse: true },
diff --git a/apps/meteor/server/models/raw/EmojiCustom.ts b/apps/meteor/server/models/raw/EmojiCustom.ts
index ec3c6390f64d..539f3b0f0b57 100644
--- a/apps/meteor/server/models/raw/EmojiCustom.ts
+++ b/apps/meteor/server/models/raw/EmojiCustom.ts
@@ -68,6 +68,16 @@ export class EmojiCustomRaw extends BaseRaw<IEmojiCustom> implements IEmojiCusto
 		return this.updateOne({ _id }, update);
 	}
 
+	setETagByName(name: string, etag: string): Promise<UpdateResult> {
+		const update = {
+			$set: {
+				etag,
+			},
+		};
+
+		return this.updateOne({ name }, update);
+	}
+
 	// INSERT
 	create(data: InsertionModel<IEmojiCustom>): Promise<InsertOneResult<WithId<IEmojiCustom>>> {
 		return this.insertOne(data);
diff --git a/apps/meteor/server/models/raw/ExportOperations.ts b/apps/meteor/server/models/raw/ExportOperations.ts
index d7afb8ad6010..0b544ddaa6c9 100644
--- a/apps/meteor/server/models/raw/ExportOperations.ts
+++ b/apps/meteor/server/models/raw/ExportOperations.ts
@@ -48,6 +48,15 @@ export class ExportOperationsRaw extends BaseRaw<IExportOperation> implements IE
 		return this.find(query);
 	}
 
+	countAllPendingBeforeMyRequest(requestDay: Date): Promise<number> {
+		const query = {
+			status: { $nin: ['completed', 'skipped'] },
+			createdAt: { $lt: requestDay },
+		};
+
+		return this.countDocuments(query);
+	}
+
 	updateOperation(data: IExportOperation): Promise<UpdateResult> {
 		const update = {
 			$set: {
diff --git a/apps/meteor/server/models/raw/FederationRoomEvents.ts b/apps/meteor/server/models/raw/FederationRoomEvents.ts
index 6c780a45ccba..161d4eb8fc22 100644
--- a/apps/meteor/server/models/raw/FederationRoomEvents.ts
+++ b/apps/meteor/server/models/raw/FederationRoomEvents.ts
@@ -3,8 +3,8 @@ import type { IRoom, ISubscription, IUser, IFederationEvent } from '@rocket.chat
 import type { IFederationRoomEventsModel } from '@rocket.chat/model-typings';
 import type { Db, DeleteResult, IndexDescription } from 'mongodb';
 
-import { contextDefinitions } from '../../../app/federation/server/lib/context';
 import { FederationEventsModel } from './FederationEvents';
+import { contextDefinitions } from '../../../app/federation/server/lib/context';
 
 const { type, contextQuery } = contextDefinitions.ROOM;
 
diff --git a/apps/meteor/server/models/raw/ImportData.ts b/apps/meteor/server/models/raw/ImportData.ts
index 19ec573fa239..9fc2febc3abd 100644
--- a/apps/meteor/server/models/raw/ImportData.ts
+++ b/apps/meteor/server/models/raw/ImportData.ts
@@ -3,6 +3,7 @@ import type {
 	IImportMessageRecord,
 	IImportRecord,
 	IImportUserRecord,
+	IImportContactRecord,
 	RocketChatRecordDeleted,
 } from '@rocket.chat/core-typings';
 import type { IImportDataModel } from '@rocket.chat/model-typings';
@@ -67,6 +68,22 @@ export class ImportDataRaw extends BaseRaw<IImportRecord> implements IImportData
 		).toArray();
 	}
 
+	getAllContactsForSelection(): Promise<IImportContactRecord[]> {
+		return this.find<IImportContactRecord>(
+			{
+				dataType: 'contact',
+			},
+			{
+				projection: {
+					'data.importIds': 1,
+					'data.name': 1,
+					'data.phones': 1,
+					'data.emails': 1,
+				},
+			},
+		).toArray();
+	}
+
 	async checkIfDirectMessagesExists(): Promise<boolean> {
 		return (
 			(await this.col.countDocuments({
diff --git a/apps/meteor/server/models/raw/Imports.ts b/apps/meteor/server/models/raw/Imports.ts
index b708c42e8119..2b0ce6c97a72 100644
--- a/apps/meteor/server/models/raw/Imports.ts
+++ b/apps/meteor/server/models/raw/Imports.ts
@@ -2,8 +2,8 @@ import type { IImport } from '@rocket.chat/core-typings';
 import type { IImportsModel } from '@rocket.chat/model-typings';
 import type { Db, Document, FindCursor, FindOptions, UpdateResult, IndexDescription } from 'mongodb';
 
-import { ensureArray } from '../../../lib/utils/arrayUtils';
 import { BaseRaw } from './BaseRaw';
+import { ensureArray } from '../../../lib/utils/arrayUtils';
 
 export class ImportsModel extends BaseRaw<IImport> implements IImportsModel {
 	constructor(db: Db) {
diff --git a/apps/meteor/server/models/raw/LivechatAgentActivity.ts b/apps/meteor/server/models/raw/LivechatAgentActivity.ts
index acf84bc39355..ec9215adf855 100644
--- a/apps/meteor/server/models/raw/LivechatAgentActivity.ts
+++ b/apps/meteor/server/models/raw/LivechatAgentActivity.ts
@@ -3,8 +3,8 @@ import type { ILivechatAgentActivityModel } from '@rocket.chat/model-typings';
 import moment from 'moment';
 import type { AggregationCursor, Collection, Document, FindCursor, Db, ModifyResult, IndexDescription, UpdateResult } from 'mongodb';
 
-import { readSecondaryPreferred } from '../../database/readSecondaryPreferred';
 import { BaseRaw } from './BaseRaw';
+import { readSecondaryPreferred } from '../../database/readSecondaryPreferred';
 
 export class LivechatAgentActivityRaw extends BaseRaw<ILivechatAgentActivity> implements ILivechatAgentActivityModel {
 	constructor(db: Db, trash?: Collection<RocketChatRecordDeleted<ILivechatAgentActivity>>) {
diff --git a/apps/meteor/server/models/raw/LivechatContacts.ts b/apps/meteor/server/models/raw/LivechatContacts.ts
index 5e0f9d6703ac..4e80f23956e6 100644
--- a/apps/meteor/server/models/raw/LivechatContacts.ts
+++ b/apps/meteor/server/models/raw/LivechatContacts.ts
@@ -1,7 +1,27 @@
-import type { ILivechatContact, ILivechatContactChannel, RocketChatRecordDeleted } from '@rocket.chat/core-typings';
-import type { FindPaginated, ILivechatContactsModel } from '@rocket.chat/model-typings';
+import type {
+	AtLeast,
+	ILivechatContact,
+	ILivechatContactChannel,
+	ILivechatContactVisitorAssociation,
+	ILivechatVisitor,
+	RocketChatRecordDeleted,
+} from '@rocket.chat/core-typings';
+import type { FindPaginated, ILivechatContactsModel, InsertionModel } from '@rocket.chat/model-typings';
 import { escapeRegExp } from '@rocket.chat/string-helpers';
-import type { Collection, Db, RootFilterOperators, Filter, FindOptions, FindCursor, IndexDescription, UpdateResult } from 'mongodb';
+import type {
+	Document,
+	Collection,
+	Db,
+	RootFilterOperators,
+	Filter,
+	FindOptions,
+	FindCursor,
+	IndexDescription,
+	UpdateResult,
+	UpdateFilter,
+	UpdateOptions,
+	FindOneAndUpdateOptions,
+} from 'mongodb';
 
 import { BaseRaw } from './BaseRaw';
 
@@ -30,19 +50,65 @@ export class LivechatContactsRaw extends BaseRaw<ILivechatContact> implements IL
 				partialFilterExpression: { phones: { $exists: true } },
 				unique: false,
 			},
+			{
+				key: {
+					'channels.visitor.visitorId': 1,
+					'channels.visitor.source.type': 1,
+					'channels.visitor.source.id': 1,
+				},
+				name: 'visitorAssociation',
+				unique: false,
+			},
+			{
+				key: {
+					'channels.field': 1,
+					'channels.value': 1,
+					'channels.verified': 1,
+				},
+				partialFilterExpression: { 'channels.verified': true },
+				name: 'verificationKey',
+				unique: false,
+			},
+			{
+				key: {
+					preRegistration: 1,
+				},
+				sparse: true,
+				unique: false,
+			},
 		];
 	}
 
-	async updateContact(contactId: string, data: Partial<ILivechatContact>): Promise<ILivechatContact> {
+	async insertContact(
+		data: InsertionModel<Omit<ILivechatContact, 'createdAt'>> & { createdAt?: ILivechatContact['createdAt'] },
+	): Promise<ILivechatContact['_id']> {
+		const result = await this.insertOne({
+			createdAt: new Date(),
+			...data,
+			preRegistration: !data.channels.length,
+		});
+
+		return result.insertedId;
+	}
+
+	async updateContact(contactId: string, data: Partial<ILivechatContact>, options?: FindOneAndUpdateOptions): Promise<ILivechatContact> {
 		const updatedValue = await this.findOneAndUpdate(
 			{ _id: contactId },
-			{ $set: { ...data, unknown: false } },
-			{ returnDocument: 'after' },
+			{ $set: { ...data, unknown: false, ...(data.channels && { preRegistration: !data.channels.length }) } },
+			{ returnDocument: 'after', ...options },
 		);
 		return updatedValue.value as ILivechatContact;
 	}
 
-	findPaginatedContacts(searchText?: string, options?: FindOptions): FindPaginated<FindCursor<ILivechatContact>> {
+	updateById(contactId: string, update: UpdateFilter<ILivechatContact>, options?: UpdateOptions): Promise<Document | UpdateResult> {
+		return this.updateOne({ _id: contactId }, update, options);
+	}
+
+	findPaginatedContacts(
+		search: { searchText?: string; unknown?: boolean },
+		options?: FindOptions,
+	): FindPaginated<FindCursor<ILivechatContact>> {
+		const { searchText, unknown = false } = search;
 		const searchRegex = escapeRegExp(searchText || '');
 		const match: Filter<ILivechatContact & RootFilterOperators<ILivechatContact>> = {
 			$or: [
@@ -50,6 +116,7 @@ export class LivechatContactsRaw extends BaseRaw<ILivechatContact> implements IL
 				{ 'emails.address': { $regex: searchRegex, $options: 'i' } },
 				{ 'phones.phoneNumber': { $regex: searchRegex, $options: 'i' } },
 			],
+			unknown,
 		};
 
 		return this.findPaginated(
@@ -61,11 +128,125 @@ export class LivechatContactsRaw extends BaseRaw<ILivechatContact> implements IL
 		);
 	}
 
+	async findContactMatchingVisitor(visitor: AtLeast<ILivechatVisitor, 'visitorEmails' | 'phone'>): Promise<ILivechatContact | null> {
+		const emails = visitor.visitorEmails?.map(({ address }) => address).filter((email) => Boolean(email)) || [];
+		const phoneNumbers = visitor.phone?.map(({ phoneNumber }) => phoneNumber).filter((phone) => Boolean(phone)) || [];
+
+		if (!emails?.length && !phoneNumbers?.length) {
+			return null;
+		}
+
+		const query = {
+			$and: [
+				{
+					$or: [
+						...emails?.map((email) => ({ 'emails.address': email })),
+						...phoneNumbers?.map((phone) => ({ 'phones.phoneNumber': phone })),
+					],
+				},
+				{
+					preRegistration: true,
+				},
+			],
+		};
+
+		return this.findOne(query);
+	}
+
+	private makeQueryForVisitor(
+		visitor: ILivechatContactVisitorAssociation,
+		extraFilters?: Filter<Required<ILivechatContact>['channels'][number]>,
+	): Filter<ILivechatContact> {
+		return {
+			channels: {
+				$elemMatch: {
+					'visitor.visitorId': visitor.visitorId,
+					'visitor.source.type': visitor.source.type,
+					...(visitor.source.id ? { 'visitor.source.id': visitor.source.id } : {}),
+					...extraFilters,
+				},
+			},
+		};
+	}
+
+	async findOneByVisitor<T extends Document = ILivechatContact>(
+		visitor: ILivechatContactVisitorAssociation,
+		options: FindOptions<ILivechatContact> = {},
+	): Promise<T | null> {
+		return this.findOne<T>(this.makeQueryForVisitor(visitor), options);
+	}
+
 	async addChannel(contactId: string, channel: ILivechatContactChannel): Promise<void> {
-		await this.updateOne({ _id: contactId }, { $push: { channels: channel } });
+		await this.updateOne({ _id: contactId }, { $push: { channels: channel }, $set: { preRegistration: false } });
+	}
+
+	async updateLastChatById(
+		contactId: string,
+		visitor: ILivechatContactVisitorAssociation,
+		lastChat: ILivechatContact['lastChat'],
+	): Promise<UpdateResult> {
+		return this.updateOne(
+			{
+				...this.makeQueryForVisitor(visitor),
+				_id: contactId,
+			},
+			{ $set: { lastChat, 'channels.$.lastChat': lastChat } },
+		);
 	}
 
-	updateLastChatById(contactId: string, lastChat: ILivechatContact['lastChat']): Promise<UpdateResult> {
-		return this.updateOne({ _id: contactId }, { $set: { lastChat } });
+	async isChannelBlocked(visitor: ILivechatContactVisitorAssociation): Promise<boolean> {
+		return Boolean(await this.findOne(this.makeQueryForVisitor(visitor, { blocked: true }), { projection: { _id: 1 } }));
+	}
+
+	async updateContactChannel(
+		visitor: ILivechatContactVisitorAssociation,
+		data: Partial<ILivechatContactChannel>,
+		contactData?: Partial<Omit<ILivechatContact, 'channels'>>,
+		options: UpdateOptions = {},
+	): Promise<UpdateResult> {
+		return this.updateOne(
+			this.makeQueryForVisitor(visitor),
+			{
+				$set: {
+					...contactData,
+					...(Object.fromEntries(
+						Object.keys(data).map((key) => [`channels.$.${key}`, data[key as keyof ILivechatContactChannel]]),
+					) as UpdateFilter<ILivechatContact>['$set']),
+				},
+			},
+			options,
+		);
+	}
+
+	async findSimilarVerifiedContacts(
+		{ field, value }: Pick<ILivechatContactChannel, 'field' | 'value'>,
+		originalContactId: string,
+		options?: FindOptions<ILivechatContact>,
+	): Promise<ILivechatContact[]> {
+		return this.find(
+			{
+				channels: {
+					$elemMatch: {
+						field,
+						value,
+						verified: true,
+					},
+				},
+				_id: { $ne: originalContactId },
+			},
+			options,
+		).toArray();
+	}
+
+	findAllByVisitorId(visitorId: string): FindCursor<ILivechatContact> {
+		return this.find({
+			'channels.visitor.visitorId': visitorId,
+		});
+	}
+
+	async addEmail(contactId: string, email: string): Promise<ILivechatContact | null> {
+		const updatedContact = await this.findOneAndUpdate({ _id: contactId }, { $addToSet: { emails: { address: email } } });
+
+		return updatedContact.value;
 	}
 }
diff --git a/apps/meteor/server/models/raw/LivechatDepartment.ts b/apps/meteor/server/models/raw/LivechatDepartment.ts
index 9ecee34df5e9..5ab3ab52be09 100644
--- a/apps/meteor/server/models/raw/LivechatDepartment.ts
+++ b/apps/meteor/server/models/raw/LivechatDepartment.ts
@@ -16,8 +16,8 @@ import type {
 	AggregationCursor,
 } from 'mongodb';
 
-import { notifyOnLivechatDepartmentAgentChangedByDepartmentId } from '../../../app/lib/server/lib/notifyListener';
 import { BaseRaw } from './BaseRaw';
+import { notifyOnLivechatDepartmentAgentChangedByDepartmentId } from '../../../app/lib/server/lib/notifyListener';
 
 export class LivechatDepartmentRaw extends BaseRaw<ILivechatDepartment> implements ILivechatDepartmentModel {
 	constructor(db: Db, trash?: Collection<RocketChatRecordDeleted<ILivechatDepartment>>) {
diff --git a/apps/meteor/server/models/raw/LivechatDepartmentAgents.ts b/apps/meteor/server/models/raw/LivechatDepartmentAgents.ts
index 891542f03e7a..6d7ec76222db 100644
--- a/apps/meteor/server/models/raw/LivechatDepartmentAgents.ts
+++ b/apps/meteor/server/models/raw/LivechatDepartmentAgents.ts
@@ -267,6 +267,19 @@ export class LivechatDepartmentAgentsRaw extends BaseRaw<ILivechatDepartmentAgen
 		return this.find(query);
 	}
 
+	async countOnlineForDepartment(departmentId: string, isLivechatEnabledWhenAgentIdle?: boolean): Promise<number> {
+		const agents = await this.findByDepartmentId(departmentId, { projection: { username: 1 } }).toArray();
+
+		if (agents.length === 0) {
+			return 0;
+		}
+
+		return Users.countOnlineUserFromList(
+			agents.map((a) => a.username),
+			isLivechatEnabledWhenAgentIdle,
+		);
+	}
+
 	async getBotsForDepartment(departmentId: string): Promise<undefined | FindCursor<ILivechatDepartmentAgents>> {
 		const agents = await this.findByDepartmentId(departmentId).toArray();
 
@@ -287,6 +300,16 @@ export class LivechatDepartmentAgentsRaw extends BaseRaw<ILivechatDepartmentAgen
 		return this.find(query);
 	}
 
+	async countBotsForDepartment(departmentId: string): Promise<number> {
+		const agents = await this.findByDepartmentId(departmentId, { projection: { username: 1 } }).toArray();
+
+		if (agents.length === 0) {
+			return 0;
+		}
+
+		return Users.countBotAgents(agents.map((a) => a.username));
+	}
+
 	async getNextBotForDepartment(
 		departmentId: ILivechatDepartmentAgents['departmentId'],
 		ignoreAgentId?: ILivechatDepartmentAgents['agentId'],
diff --git a/apps/meteor/server/models/raw/LivechatInquiry.ts b/apps/meteor/server/models/raw/LivechatInquiry.ts
index 6746d6f87926..ec5ad430b160 100644
--- a/apps/meteor/server/models/raw/LivechatInquiry.ts
+++ b/apps/meteor/server/models/raw/LivechatInquiry.ts
@@ -23,9 +23,9 @@ import type {
 	DeleteOptions,
 } from 'mongodb';
 
+import { BaseRaw } from './BaseRaw';
 import { getOmniChatSortQuery } from '../../../app/livechat/lib/inquiries';
 import { readSecondaryPreferred } from '../../database/readSecondaryPreferred';
-import { BaseRaw } from './BaseRaw';
 
 export class LivechatInquiryRaw extends BaseRaw<ILivechatInquiryRecord> implements ILivechatInquiryModel {
 	constructor(db: Db, trash?: Collection<RocketChatRecordDeleted<ILivechatInquiryRecord>>) {
@@ -102,6 +102,7 @@ export class LivechatInquiryRaw extends BaseRaw<ILivechatInquiryRecord> implemen
 				},
 				sparse: true,
 			},
+			{ key: { 'v._id': 1 } },
 		];
 	}
 
@@ -123,6 +124,18 @@ export class LivechatInquiryRaw extends BaseRaw<ILivechatInquiryRecord> implemen
 		return this.findOne(query, options);
 	}
 
+	findOneReadyByRoomId<T extends Document = ILivechatInquiryRecord>(
+		rid: string,
+		options?: FindOptions<T extends ILivechatInquiryRecord ? ILivechatInquiryRecord : T>,
+	): Promise<T | null> {
+		const query = {
+			rid,
+			status: LivechatInquiryStatus.READY,
+		};
+
+		return this.findOne(query, options);
+	}
+
 	findIdsByVisitorToken(token: ILivechatInquiryRecord['v']['token']): FindCursor<ILivechatInquiryRecord> {
 		return this.find({ 'v.token': token }, { projection: { _id: 1 } });
 	}
@@ -391,6 +404,23 @@ export class LivechatInquiryRaw extends BaseRaw<ILivechatInquiryRecord> implemen
 		);
 	}
 
+	async setStatusById(inquiryId: string, status: LivechatInquiryStatus): Promise<ILivechatInquiryRecord> {
+		const result = await this.findOneAndUpdate(
+			{ _id: inquiryId },
+			{ $set: { status } },
+			{
+				upsert: true,
+				returnDocument: 'after',
+			},
+		);
+
+		if (!result.value) {
+			throw new Error('error-failed-to-set-inquiry-status');
+		}
+
+		return result.value;
+	}
+
 	setNameByRoomId(rid: string, name: string): Promise<UpdateResult> {
 		const query = { rid };
 
@@ -434,4 +464,18 @@ export class LivechatInquiryRaw extends BaseRaw<ILivechatInquiryRecord> implemen
 		const updated = await this.findOneAndUpdate({ rid }, { $addToSet: { 'v.activity': period } });
 		return updated?.value;
 	}
+
+	updateNameByVisitorIds(visitorIds: string[], name: string): Promise<UpdateResult | Document> {
+		const query = { 'v._id': { $in: visitorIds } };
+
+		const update = {
+			$set: { name },
+		};
+
+		return this.updateMany(query, update);
+	}
+
+	findByVisitorIds(visitorIds: string[], options?: FindOptions<ILivechatInquiryRecord>): FindCursor<ILivechatInquiryRecord> {
+		return this.find({ 'v._id': { $in: visitorIds } }, options);
+	}
 }
diff --git a/apps/meteor/server/models/raw/LivechatRooms.ts b/apps/meteor/server/models/raw/LivechatRooms.ts
index 303ee16a8dd3..e422615fecbd 100644
--- a/apps/meteor/server/models/raw/LivechatRooms.ts
+++ b/apps/meteor/server/models/raw/LivechatRooms.ts
@@ -8,6 +8,9 @@ import type {
 	IOmnichannelServiceLevelAgreements,
 	ReportResult,
 	MACStats,
+	ILivechatContactVisitorAssociation,
+	ILivechatContact,
+	AtLeast,
 } from '@rocket.chat/core-typings';
 import { UserStatus } from '@rocket.chat/core-typings';
 import type { FindPaginated, ILivechatRoomsModel } from '@rocket.chat/model-typings';
@@ -29,9 +32,9 @@ import type {
 	UpdateOptions,
 } from 'mongodb';
 
+import { BaseRaw } from './BaseRaw';
 import { getValue } from '../../../app/settings/server/raw';
 import { readSecondaryPreferred } from '../../database/readSecondaryPreferred';
-import { BaseRaw } from './BaseRaw';
 
 /**
  * @extends BaseRaw<ILivechatRoom>
@@ -77,6 +80,7 @@ export class LivechatRoomsRaw extends BaseRaw<IOmnichannelRoom> implements ILive
 			{ key: { 'tags.0': 1, 'ts': 1 }, partialFilterExpression: { 'tags.0': { $exists: true }, 't': 'l' } },
 			{ key: { servedBy: 1, ts: 1 }, partialFilterExpression: { servedBy: { $exists: true }, t: 'l' } },
 			{ key: { 'v.activity': 1, 'ts': 1 }, partialFilterExpression: { 'v.activity': { $exists: true }, 't': 'l' } },
+			{ key: { contactId: 1 }, partialFilterExpression: { contactId: { $exists: true }, t: 'l' } },
 		];
 	}
 
@@ -1221,21 +1225,17 @@ export class LivechatRoomsRaw extends BaseRaw<IOmnichannelRoom> implements ILive
 		return this.col.aggregate(params, { readPreference: readSecondaryPreferred() });
 	}
 
-	findPaginatedRoomsByVisitorsIdsAndSource({
-		visitorsIds,
-		source,
+	findClosedRoomsByContactPaginated({
+		contactId,
 		options = {},
 	}: {
-		visitorsIds: string[];
-		source?: string;
+		contactId: string;
 		options?: FindOptions;
 	}): FindPaginated<FindCursor<IOmnichannelRoom>> {
 		return this.findPaginated<IOmnichannelRoom>(
 			{
-				'v._id': { $in: visitorsIds },
-				...(source && {
-					$or: [{ 'source.type': new RegExp(escapeRegExp(source), 'i') }, { 'source.alias': new RegExp(escapeRegExp(source), 'i') }],
-				}),
+				contactId,
+				closedAt: { $exists: true },
 			},
 			options,
 		);
@@ -1921,6 +1921,21 @@ export class LivechatRoomsRaw extends BaseRaw<IOmnichannelRoom> implements ILive
 		return this.find(query, options);
 	}
 
+	findOneOpenByContactChannelVisitor(
+		association: ILivechatContactVisitorAssociation,
+		options: FindOptions<IOmnichannelRoom> = {},
+	): Promise<IOmnichannelRoom | null> {
+		const query: Filter<IOmnichannelRoom> = {
+			't': 'l',
+			'open': true,
+			'v._id': association.visitorId,
+			'source.type': association.source.type,
+			...(association.source.id ? { 'source.id': association.source.id } : {}),
+		};
+
+		return this.findOne(query, options);
+	}
+
 	findOneOpenByVisitorToken(visitorToken: string, options: FindOptions<IOmnichannelRoom> = {}) {
 		const query: Filter<IOmnichannelRoom> = {
 			't': 'l',
@@ -1991,6 +2006,23 @@ export class LivechatRoomsRaw extends BaseRaw<IOmnichannelRoom> implements ILive
 		return this.find(query, options);
 	}
 
+	async findNewestByContactVisitorAssociation<T extends Document = IOmnichannelRoom>(
+		association: ILivechatContactVisitorAssociation,
+		options: Omit<FindOptions<IOmnichannelRoom>, 'sort' | 'limit'> = {},
+	): Promise<T | null> {
+		const query: Filter<IOmnichannelRoom> = {
+			't': 'l',
+			'v._id': association.visitorId,
+			'source.type': association.source.type,
+			...(association.source.id ? { 'source.id': association.source.id } : {}),
+		};
+
+		return this.findOne<T>(query, {
+			...options,
+			sort: { _updatedAt: -1 },
+		});
+	}
+
 	findOneOpenByRoomIdAndVisitorToken(roomId: string, visitorToken: string, options: FindOptions<IOmnichannelRoom> = {}) {
 		const query: Filter<IOmnichannelRoom> = {
 			't': 'l',
@@ -2726,4 +2758,68 @@ export class LivechatRoomsRaw extends BaseRaw<IOmnichannelRoom> implements ILive
 	getTotalConversationsWithoutDepartmentBetweenDates(_start: Date, _end: Date, _extraQuery: Filter<IOmnichannelRoom>): Promise<number> {
 		throw new Error('Method not implemented.');
 	}
+
+	setContactByVisitorAssociation(
+		association: ILivechatContactVisitorAssociation,
+		contact: Pick<AtLeast<ILivechatContact, '_id'>, '_id' | 'name'>,
+	): Promise<UpdateResult | Document> {
+		return this.updateMany(
+			{
+				't': 'l',
+				'v._id': association.visitorId,
+				'source.type': association.source.type,
+				...(association.source.id ? { 'source.id': association.source.id } : {}),
+			},
+			{
+				$set: {
+					contactId: contact._id,
+					...(contact.name ? { fname: contact.name } : {}),
+				},
+			},
+		);
+	}
+
+	updateContactDataByContactId(
+		oldContactId: ILivechatContact['_id'],
+		contact: Partial<Pick<ILivechatContact, '_id' | 'name'>>,
+	): Promise<UpdateResult | Document> {
+		const update = {
+			...(contact._id ? { contactId: contact._id } : {}),
+			...(contact.name ? { fname: contact.name } : {}),
+		};
+
+		if (!Object.keys(update).length) {
+			throw new Error('error-invalid-operation');
+		}
+
+		return this.updateMany(
+			{
+				t: 'l',
+				contactId: oldContactId,
+			},
+			{
+				$set: update,
+			},
+		);
+	}
+
+	updateMergedContactIds(
+		_contactIdsThatWereMerged: ILivechatContact['_id'][],
+		_newContactId: ILivechatContact['_id'],
+		_options?: UpdateOptions,
+	): Promise<UpdateResult | Document> {
+		throw new Error('Method not implemented.');
+	}
+
+	findClosedRoomsByContactAndSourcePaginated(_params: {
+		contactId: string;
+		source?: string;
+		options?: FindOptions;
+	}): FindPaginated<FindCursor<IOmnichannelRoom>> {
+		throw new Error('Method not implemented.');
+	}
+
+	findOpenByContactId(contactId: ILivechatContact['_id'], options?: FindOptions<IOmnichannelRoom>): FindCursor<IOmnichannelRoom> {
+		return this.find({ open: true, contactId }, options);
+	}
 }
diff --git a/apps/meteor/server/models/raw/LivechatVisitors.ts b/apps/meteor/server/models/raw/LivechatVisitors.ts
index 396b728159ff..9f8a28e41f84 100644
--- a/apps/meteor/server/models/raw/LivechatVisitors.ts
+++ b/apps/meteor/server/models/raw/LivechatVisitors.ts
@@ -19,8 +19,8 @@ import type {
 } from 'mongodb';
 import { ObjectId } from 'mongodb';
 
-import { notifyOnSettingChanged } from '../../../app/lib/server/lib/notifyListener';
 import { BaseRaw } from './BaseRaw';
+import { notifyOnSettingChanged } from '../../../app/lib/server/lib/notifyListener';
 
 export class LivechatVisitorsRaw extends BaseRaw<ILivechatVisitor> implements ILivechatVisitorsModel {
 	constructor(db: Db, trash?: Collection<RocketChatRecordDeleted<ILivechatVisitor>>) {
@@ -49,7 +49,11 @@ export class LivechatVisitorsRaw extends BaseRaw<ILivechatVisitor> implements IL
 		return this.findOne(query);
 	}
 
-	findOneGuestByEmailAddress(emailAddress: string): Promise<ILivechatVisitor | null> {
+	async findOneGuestByEmailAddress(emailAddress: string): Promise<ILivechatVisitor | null> {
+		if (!emailAddress) {
+			return null;
+		}
+
 		const query = {
 			'visitorEmails.address': String(emailAddress).toLowerCase(),
 		};
@@ -105,7 +109,7 @@ export class LivechatVisitorsRaw extends BaseRaw<ILivechatVisitor> implements IL
 		return this.findOne(query, options);
 	}
 
-	getVisitorsBetweenDate({ start, end, department }: { start: Date; end: Date; department?: string }): FindCursor<ILivechatVisitor> {
+	countVisitorsBetweenDate({ start, end, department }: { start: Date; end: Date; department?: string }): Promise<number> {
 		const query = {
 			disabled: { $ne: true },
 			_updatedAt: {
@@ -115,7 +119,7 @@ export class LivechatVisitorsRaw extends BaseRaw<ILivechatVisitor> implements IL
 			...(department && department !== 'undefined' && { department }),
 		};
 
-		return this.find(query, { projection: { _id: 1 } });
+		return this.countDocuments(query);
 	}
 
 	async getNextVisitorUsername(): Promise<string> {
@@ -197,7 +201,7 @@ export class LivechatVisitorsRaw extends BaseRaw<ILivechatVisitor> implements IL
 							{
 								'phone.phoneNumber': emailOrPhone,
 							},
-					  ]
+						]
 					: []),
 				...(nameOrUsername
 					? [
@@ -207,7 +211,7 @@ export class LivechatVisitorsRaw extends BaseRaw<ILivechatVisitor> implements IL
 							{
 								username: nameOrUsername,
 							},
-					  ]
+						]
 					: []),
 				...allowedCustomFields.map((c: string) => ({ [`livechatData.${c}`]: nameOrUsername })),
 			],
diff --git a/apps/meteor/server/models/raw/Messages.ts b/apps/meteor/server/models/raw/Messages.ts
index 3f79e174fec0..e84abc3ed481 100644
--- a/apps/meteor/server/models/raw/Messages.ts
+++ b/apps/meteor/server/models/raw/Messages.ts
@@ -29,15 +29,15 @@ import type {
 	ModifyResult,
 } from 'mongodb';
 
+import { BaseRaw } from './BaseRaw';
 import { otrSystemMessages } from '../../../app/otr/lib/constants';
 import { readSecondaryPreferred } from '../../database/readSecondaryPreferred';
-import { BaseRaw } from './BaseRaw';
 
 type DeepWritable<T> = T extends (...args: any) => any
 	? T
 	: {
 			-readonly [P in keyof T]: DeepWritable<T[P]>;
-	  };
+		};
 
 export class MessagesRaw extends BaseRaw<IMessage> implements IMessagesModel {
 	constructor(db: Db, trash?: Collection<RocketChatRecordDeleted<IMessage>>) {
@@ -539,6 +539,16 @@ export class MessagesRaw extends BaseRaw<IMessage> implements IMessagesModel {
 		return this.find(query, options);
 	}
 
+	countPinned(options?: CountDocumentsOptions): Promise<number> {
+		const query: Filter<IMessage> = {
+			t: { $ne: 'rm' as MessageTypesValues },
+			_hidden: { $ne: true },
+			pinned: true,
+		};
+
+		return this.countDocuments(query, options);
+	}
+
 	findPaginatedPinnedByRoom(roomId: IMessage['rid'], options?: FindOptions<IMessage>): FindPaginated<FindCursor<IMessage>> {
 		const query: Filter<IMessage> = {
 			t: { $ne: 'rm' },
@@ -559,6 +569,15 @@ export class MessagesRaw extends BaseRaw<IMessage> implements IMessagesModel {
 		return this.find(query, options);
 	}
 
+	countStarred(options?: CountDocumentsOptions): Promise<number> {
+		const query: Filter<IMessage> = {
+			'_hidden': { $ne: true },
+			'starred._id': { $exists: true },
+		};
+
+		return this.countDocuments(query, options);
+	}
+
 	async setFederationReactionEventId(username: string, _id: string, reaction: string, federationEventId: string): Promise<void> {
 		await this.updateOne(
 			{ _id },
@@ -879,16 +898,13 @@ export class MessagesRaw extends BaseRaw<IMessage> implements IMessagesModel {
 		return this.find(query, options);
 	}
 
-	findForUpdates(roomId: string, timestamp: Date, options?: FindOptions<IMessage>): FindCursor<IMessage> {
+	findForUpdates(roomId: IMessage['rid'], timestamp: { $lt: Date } | { $gt: Date }, options?: FindOptions<IMessage>): FindCursor<IMessage> {
 		const query = {
-			_hidden: {
-				$ne: true,
-			},
 			rid: roomId,
-			_updatedAt: {
-				$gt: timestamp,
-			},
+			_hidden: { $ne: true },
+			_updatedAt: timestamp,
 		};
+
 		return this.find(query, options);
 	}
 
diff --git a/apps/meteor/server/models/raw/ModerationReports.ts b/apps/meteor/server/models/raw/ModerationReports.ts
index 065f6ec18070..b50057a389fd 100644
--- a/apps/meteor/server/models/raw/ModerationReports.ts
+++ b/apps/meteor/server/models/raw/ModerationReports.ts
@@ -9,8 +9,8 @@ import type {
 import type { FindPaginated, IModerationReportsModel, PaginationParams } from '@rocket.chat/model-typings';
 import type { AggregationCursor, Collection, Db, Document, FindCursor, FindOptions, IndexDescription, UpdateResult } from 'mongodb';
 
-import { readSecondaryPreferred } from '../../database/readSecondaryPreferred';
 import { BaseRaw } from './BaseRaw';
+import { readSecondaryPreferred } from '../../database/readSecondaryPreferred';
 
 export class ModerationReportsRaw extends BaseRaw<IModerationReport> implements IModerationReportsModel {
 	constructor(db: Db, trash?: Collection<RocketChatRecordDeleted<IModerationReport>>) {
@@ -243,7 +243,7 @@ export class ModerationReportsRaw extends BaseRaw<IModerationReport> implements
 						$regex: selector,
 						$options: 'i',
 					},
-			  }
+				}
 			: {};
 
 		const params = {
diff --git a/apps/meteor/server/models/raw/NpsVote.ts b/apps/meteor/server/models/raw/NpsVote.ts
index 508c6302c596..1559444fe631 100644
--- a/apps/meteor/server/models/raw/NpsVote.ts
+++ b/apps/meteor/server/models/raw/NpsVote.ts
@@ -97,4 +97,17 @@ export class NpsVoteRaw extends BaseRaw<INpsVote> implements INpsVoteModel {
 		};
 		return this.updateMany(query, update);
 	}
+
+	countByNpsId(npsId: string): Promise<number> {
+		return this.countDocuments({ npsId });
+	}
+
+	countByNpsIdAndStatus(npsId: string, status: INpsVoteStatus): Promise<number> {
+		const query = {
+			npsId,
+			status,
+		};
+
+		return this.countDocuments(query);
+	}
 }
diff --git a/apps/meteor/server/models/raw/Roles.ts b/apps/meteor/server/models/raw/Roles.ts
index 4e1cb09348c4..36fc7674416f 100644
--- a/apps/meteor/server/models/raw/Roles.ts
+++ b/apps/meteor/server/models/raw/Roles.ts
@@ -1,10 +1,10 @@
 import type { IRole, IRoom, IUser, RocketChatRecordDeleted } from '@rocket.chat/core-typings';
 import type { IRolesModel } from '@rocket.chat/model-typings';
 import { Subscriptions, Users } from '@rocket.chat/models';
-import type { Collection, FindCursor, Db, Filter, FindOptions, Document } from 'mongodb';
+import type { Collection, FindCursor, Db, Filter, FindOptions, Document, CountDocumentsOptions } from 'mongodb';
 
-import { notifyOnSubscriptionChangedByRoomIdAndUserId } from '../../../app/lib/server/lib/notifyListener';
 import { BaseRaw } from './BaseRaw';
+import { notifyOnSubscriptionChangedByRoomIdAndUserId } from '../../../app/lib/server/lib/notifyListener';
 
 export class RolesRaw extends BaseRaw<IRole> implements IRolesModel {
 	constructor(db: Db, trash?: Collection<RocketChatRecordDeleted<IRole>>) {
@@ -184,6 +184,14 @@ export class RolesRaw extends BaseRaw<IRole> implements IRolesModel {
 		return this.find(query, options || {});
 	}
 
+	countByScope(scope: IRole['scope'], options?: CountDocumentsOptions): Promise<number> {
+		const query = {
+			scope,
+		};
+
+		return this.countDocuments(query, options);
+	}
+
 	findCustomRoles(options?: FindOptions<IRole>): FindCursor<IRole> {
 		const query: Filter<IRole> = {
 			protected: false,
@@ -192,6 +200,14 @@ export class RolesRaw extends BaseRaw<IRole> implements IRolesModel {
 		return this.find(query, options || {});
 	}
 
+	countCustomRoles(options?: CountDocumentsOptions): Promise<number> {
+		const query: Filter<IRole> = {
+			protected: false,
+		};
+
+		return this.countDocuments(query, options || {});
+	}
+
 	async updateById(
 		_id: IRole['_id'],
 		name: IRole['name'],
@@ -254,6 +270,22 @@ export class RolesRaw extends BaseRaw<IRole> implements IRolesModel {
 		}
 	}
 
+	async countUsersInRole(roleId: IRole['_id'], scope?: IRoom['_id']): Promise<number> {
+		const role = await this.findOneById<Pick<IRole, '_id' | 'scope'>>(roleId, { projection: { scope: 1 } });
+
+		if (!role) {
+			throw new Error('RolesRaw.countUsersInRole: role not found');
+		}
+
+		switch (role.scope) {
+			case 'Subscriptions':
+				return Subscriptions.countUsersInRoles([role._id], scope);
+			case 'Users':
+			default:
+				return Users.countUsersInRoles([role._id]);
+		}
+	}
+
 	async createWithRandomId(
 		name: IRole['name'],
 		scope: IRole['scope'] = 'Users',
diff --git a/apps/meteor/server/models/raw/Rooms.ts b/apps/meteor/server/models/raw/Rooms.ts
index 05afc102d164..d35033ad90f3 100644
--- a/apps/meteor/server/models/raw/Rooms.ts
+++ b/apps/meteor/server/models/raw/Rooms.ts
@@ -26,10 +26,11 @@ import type {
 	UpdateOptions,
 	UpdateResult,
 	ModifyResult,
+	CountDocumentsOptions,
 } from 'mongodb';
 
-import { readSecondaryPreferred } from '../../database/readSecondaryPreferred';
 import { BaseRaw } from './BaseRaw';
+import { readSecondaryPreferred } from '../../database/readSecondaryPreferred';
 
 export class RoomsRaw extends BaseRaw<IRoom> implements IRoomsModel {
 	constructor(db: Db, trash?: Collection<RocketChatRecordDeleted<IRoom>>) {
@@ -203,7 +204,7 @@ export class RoomsRaw extends BaseRaw<IRoom> implements IRoomsModel {
 								...(discussion ? [{ prid: { $exists: true } }] : []),
 								...(teams ? [{ teamMain: { $exists: true } }] : []),
 							],
-					  }
+						}
 					: {},
 			],
 			...(!discussion ? { prid: { $exists: false } } : {}),
@@ -224,6 +225,17 @@ export class RoomsRaw extends BaseRaw<IRoom> implements IRoomsModel {
 		return this.find(query, options);
 	}
 
+	countByTeamId(teamId: ITeam['_id']): Promise<number> {
+		const query: Filter<IRoom> = {
+			teamId,
+			teamMain: {
+				$exists: false,
+			},
+		};
+
+		return this.countDocuments(query);
+	}
+
 	findPaginatedByTeamIdContainingNameAndDefault(
 		teamId: ITeam['_id'],
 		name: IRoom['name'],
@@ -643,6 +655,15 @@ export class RoomsRaw extends BaseRaw<IRoom> implements IRoomsModel {
 		);
 	}
 
+	countByBroadcast(options?: CountDocumentsOptions): Promise<number> {
+		return this.countDocuments(
+			{
+				broadcast: true,
+			},
+			options,
+		);
+	}
+
 	setAsFederated(roomId: IRoom['_id']): Promise<UpdateResult> {
 		return this.updateOne({ _id: roomId }, { $set: { federated: true } });
 	}
@@ -684,6 +705,15 @@ export class RoomsRaw extends BaseRaw<IRoom> implements IRoomsModel {
 		);
 	}
 
+	countByE2E(options?: CountDocumentsOptions): Promise<number> {
+		return this.countDocuments(
+			{
+				encrypted: true,
+			},
+			options,
+		);
+	}
+
 	findE2ERoomById(roomId: IRoom['_id'], options: FindOptions<IRoom> = {}): Promise<IRoom | null> {
 		return this.findOne(
 			{
@@ -702,6 +732,14 @@ export class RoomsRaw extends BaseRaw<IRoom> implements IRoomsModel {
 		});
 	}
 
+	countRoomsInsideTeams(autoJoin = false): Promise<number> {
+		return this.countDocuments({
+			teamId: { $exists: true },
+			teamMain: { $exists: false },
+			...(autoJoin && { teamDefault: true }),
+		});
+	}
+
 	countByType(t: IRoom['t']): Promise<number> {
 		return this.col.countDocuments({ t });
 	}
@@ -733,7 +771,7 @@ export class RoomsRaw extends BaseRaw<IRoom> implements IRoomsModel {
 											$in: roomIds,
 										},
 									},
-							  ]
+								]
 							: []),
 					],
 				},
@@ -749,7 +787,7 @@ export class RoomsRaw extends BaseRaw<IRoom> implements IRoomsModel {
 									},
 								],
 							},
-					  ]
+						]
 					: []),
 			],
 		};
@@ -1115,12 +1153,12 @@ export class RoomsRaw extends BaseRaw<IRoom> implements IRoomsModel {
 						$set: {
 							sysMes: systemMessages,
 						},
-				  }
+					}
 				: {
 						$unset: {
 							sysMes: '',
 						},
-				  };
+					};
 
 		return this.updateOne(query, update);
 	}
@@ -1293,7 +1331,7 @@ export class RoomsRaw extends BaseRaw<IRoom> implements IRoomsModel {
 				includeFederatedRooms
 					? {
 							$or: [{ $and: [{ $or: [{ federated: { $exists: false } }, { federated: false }], name }] }, { federated: true, fname: name }],
-					  }
+						}
 					: { $or: [{ federated: { $exists: false } }, { federated: false }], name },
 			],
 		};
@@ -1350,7 +1388,7 @@ export class RoomsRaw extends BaseRaw<IRoom> implements IRoomsModel {
 								{ $and: [{ $or: [{ federated: { $exists: false } }, { federated: false }] }, nameCondition] },
 								{ federated: true, fname: name },
 							],
-					  }
+						}
 					: { $and: [{ $or: [{ federated: { $exists: false } }, { federated: false }] }, nameCondition] },
 			],
 		};
@@ -1445,6 +1483,13 @@ export class RoomsRaw extends BaseRaw<IRoom> implements IRoomsModel {
 		);
 	}
 
+	countGroupDMsByUids(uids: NonNullable<IRoom['uids']>): Promise<number> {
+		return this.countDocuments({
+			usersCount: { $gt: 2 },
+			uids: { $in: uids },
+		});
+	}
+
 	find1On1ByUserId(userId: IRoom['_id'], options: FindOptions<IRoom> = {}): FindCursor<IRoom> {
 		return this.find(
 			{
@@ -1459,6 +1504,10 @@ export class RoomsRaw extends BaseRaw<IRoom> implements IRoomsModel {
 		return this.find({ createdOTR: true });
 	}
 
+	countByCreatedOTR(options?: CountDocumentsOptions): Promise<number> {
+		return this.countDocuments({ createdOTR: true }, options);
+	}
+
 	findByUsernamesOrUids(uids: IRoom['u']['_id'][], usernames: IRoom['u']['username'][]): FindCursor<IRoom> {
 		return this.find({ $or: [{ usernames: { $in: usernames } }, { uids: { $in: uids } }] });
 	}
diff --git a/apps/meteor/server/models/raw/ServerEvents.ts b/apps/meteor/server/models/raw/ServerEvents.ts
index ef6365c9609b..50722d690993 100644
--- a/apps/meteor/server/models/raw/ServerEvents.ts
+++ b/apps/meteor/server/models/raw/ServerEvents.ts
@@ -1,4 +1,10 @@
-import type { IServerEvent, RocketChatRecordDeleted } from '@rocket.chat/core-typings';
+import type {
+	ExtractDataToParams,
+	IAuditServerActor,
+	IServerEvent,
+	IServerEvents,
+	RocketChatRecordDeleted,
+} from '@rocket.chat/core-typings';
 import { ServerEventType } from '@rocket.chat/core-typings';
 import type { IServerEventsModel } from '@rocket.chat/model-typings';
 import type { Collection, Db, IndexDescription } from 'mongodb';
@@ -55,36 +61,52 @@ export class ServerEventsRaw extends BaseRaw<IServerEvent> implements IServerEve
 	}
 
 	async countFailedAttemptsByUsernameSince(username: string, since: Date): Promise<number> {
-		return this.find({
+		return this.countDocuments({
 			'u.username': username,
 			't': ServerEventType.FAILED_LOGIN_ATTEMPT,
 			'ts': {
 				$gte: since,
 			},
-		}).count();
+		});
 	}
 
 	countFailedAttemptsByIpSince(ip: string, since: Date): Promise<number> {
-		return this.find({
+		return this.countDocuments({
 			ip,
 			t: ServerEventType.FAILED_LOGIN_ATTEMPT,
 			ts: {
 				$gte: since,
 			},
-		}).count();
+		});
 	}
 
 	countFailedAttemptsByIp(ip: string): Promise<number> {
-		return this.find({
+		return this.countDocuments({
 			ip,
 			t: ServerEventType.FAILED_LOGIN_ATTEMPT,
-		}).count();
+		});
 	}
 
 	countFailedAttemptsByUsername(username: string): Promise<number> {
-		return this.find({
+		return this.countDocuments({
 			'u.username': username,
 			't': ServerEventType.FAILED_LOGIN_ATTEMPT,
-		}).count();
+		});
+	}
+
+	async createAuditServerEvent<K extends keyof IServerEvents, E extends IServerEvents[K]>(
+		key: K,
+		data: ExtractDataToParams<E>,
+		actor: IAuditServerActor,
+	): Promise<void> {
+		await this.insertOne({
+			t: key,
+			ts: new Date(),
+			actor,
+			data: Object.entries(data).map(([key, value]) => ({ key, value })) as E['data'],
+			// deprecated just to keep backward compatibility
+			ip: '0.0.0.0',
+			...(actor.type === 'user' && { ip: actor?.ip || '0.0.0.0', u: { _id: actor._id, username: actor.username } }),
+		});
 	}
 }
diff --git a/apps/meteor/server/models/raw/Sessions.ts b/apps/meteor/server/models/raw/Sessions.ts
index 96f6a596ddb8..4a0b72646c77 100644
--- a/apps/meteor/server/models/raw/Sessions.ts
+++ b/apps/meteor/server/models/raw/Sessions.ts
@@ -28,8 +28,8 @@ import type {
 	OptionalId,
 } from 'mongodb';
 
-import { readSecondaryPreferred } from '../../database/readSecondaryPreferred';
 import { BaseRaw } from './BaseRaw';
+import { readSecondaryPreferred } from '../../database/readSecondaryPreferred';
 
 type DestructuredDate = { year: number; month: number; day: number };
 type DestructuredDateWithType = {
diff --git a/apps/meteor/server/models/raw/Subscriptions.ts b/apps/meteor/server/models/raw/Subscriptions.ts
index 829261e7f94a..7b8de27693b5 100644
--- a/apps/meteor/server/models/raw/Subscriptions.ts
+++ b/apps/meteor/server/models/raw/Subscriptions.ts
@@ -33,8 +33,8 @@ import type {
 	ModifyResult,
 } from 'mongodb';
 
-import { getDefaultSubscriptionPref } from '../../../app/utils/lib/getDefaultSubscriptionPref';
 import { BaseRaw } from './BaseRaw';
+import { getDefaultSubscriptionPref } from '../../../app/utils/lib/getDefaultSubscriptionPref';
 
 export class SubscriptionsRaw extends BaseRaw<ISubscription> implements ISubscriptionsModel {
 	constructor(db: Db, trash?: Collection<RocketChatRecordDeleted<ISubscription>>) {
@@ -66,6 +66,7 @@ export class SubscriptionsRaw extends BaseRaw<ISubscription> implements ISubscri
 			{ key: { 'u._id': 1, 'open': 1, 'department': 1 } },
 			{ key: { rid: 1, ls: 1 } },
 			{ key: { 'u._id': 1, 'autotranslate': 1 } },
+			{ key: { 'v._id': 1, 'open': 1 } },
 		];
 	}
 
@@ -264,6 +265,17 @@ export class SubscriptionsRaw extends BaseRaw<ISubscription> implements ISubscri
 		return Users.find<P>({ _id: { $in: users } }, options || {});
 	}
 
+	async countUsersInRoles(roles: IRole['_id'][], rid: IRoom['_id'] | undefined): Promise<number> {
+		const query = {
+			roles: { $in: roles },
+			...(rid && { rid }),
+		};
+
+		// Ideally, the count of subscriptions would be the same (or really similar) to the count in users
+		// As sub/user/room is a 1:1 relation.
+		return this.countDocuments(query);
+	}
+
 	addRolesByUserId(uid: IUser['_id'], roles: IRole['_id'][], rid?: IRoom['_id']): Promise<UpdateResult> {
 		if (!Array.isArray(roles)) {
 			roles = [roles];
@@ -330,6 +342,15 @@ export class SubscriptionsRaw extends BaseRaw<ISubscription> implements ISubscri
 		return this.find(query, options || {});
 	}
 
+	findOpenByVisitorIds(visitorIds: string[], options?: FindOptions<ISubscription>): FindCursor<ISubscription> {
+		const query = {
+			'open': true,
+			'v._id': { $in: visitorIds },
+		};
+
+		return this.find(query, options || {});
+	}
+
 	findByRoomIdAndNotAlertOrOpenExcludingUserIds(
 		{
 			roomId,
@@ -403,10 +424,13 @@ export class SubscriptionsRaw extends BaseRaw<ISubscription> implements ISubscri
 		options: AggregateOptions = {},
 	): Promise<SpotlightUser[]> {
 		const termRegex = new RegExp((startsWith ? '^' : '') + escapeRegExp(searchTerm) + (endsWith ? '$' : ''), 'i');
-		const orStatement = searchFields.reduce((acc, el) => {
-			acc.push({ [el.trim()]: termRegex });
-			return acc;
-		}, [] as { [x: string]: RegExp }[]);
+		const orStatement = searchFields.reduce(
+			(acc, el) => {
+				acc.push({ [el.trim()]: termRegex });
+				return acc;
+			},
+			[] as { [x: string]: RegExp }[],
+		);
 
 		return this.col
 			.aggregate<SpotlightUser>(
@@ -580,6 +604,19 @@ export class SubscriptionsRaw extends BaseRaw<ISubscription> implements ISubscri
 		return this.updateMany(query, update);
 	}
 
+	updateNameAndFnameByVisitorIds(visitorIds: string[], name: string): Promise<UpdateResult | Document> {
+		const query = { 'v._id': { $in: visitorIds } };
+
+		const update = {
+			$set: {
+				name,
+				fname: name,
+			},
+		};
+
+		return this.updateMany(query, update);
+	}
+
 	async setGroupE2EKeyAndOldRoomKeys(_id: string, key: string, oldRoomKeys?: ISubscription['oldRoomKeys']): Promise<UpdateResult> {
 		const query = { _id };
 		const update = { $set: { E2EKey: key, ...(oldRoomKeys && { oldRoomKeys }) } };
@@ -924,12 +961,12 @@ export class SubscriptionsRaw extends BaseRaw<ISubscription> implements ISubscri
 						$set: {
 							hideMentionStatus,
 						},
-				  }
+					}
 				: {
 						$unset: {
 							hideMentionStatus: 1,
 						},
-				  };
+					};
 
 		return this.updateOne(query, update);
 	}
diff --git a/apps/meteor/server/models/raw/TeamMember.ts b/apps/meteor/server/models/raw/TeamMember.ts
index 53c19b0c2fef..0a5b2a2755f4 100644
--- a/apps/meteor/server/models/raw/TeamMember.ts
+++ b/apps/meteor/server/models/raw/TeamMember.ts
@@ -72,6 +72,10 @@ export class TeamMemberRaw extends BaseRaw<ITeamMember> implements ITeamMemberMo
 		return options ? this.col.find({ teamId }, options) : this.col.find({ teamId }, options);
 	}
 
+	countByTeamId(teamId: string): Promise<number> {
+		return this.countDocuments({ teamId });
+	}
+
 	findByTeamIds(teamIds: Array<string>): FindCursor<ITeamMember>;
 
 	findByTeamIds(teamIds: Array<string>, options: FindOptions<ITeamMember>): FindCursor<ITeamMember>;
@@ -99,6 +103,10 @@ export class TeamMemberRaw extends BaseRaw<ITeamMember> implements ITeamMemberMo
 		return options ? this.col.find({ teamId, roles: role }, options) : this.col.find({ teamId, roles: role });
 	}
 
+	countByTeamIdAndRole(teamId: string, role: IRole['_id']): Promise<number> {
+		return this.countDocuments({ teamId, roles: role });
+	}
+
 	findByUserIdAndTeamIds(userId: string, teamIds: Array<string>, options: FindOptions<ITeamMember> = {}): FindCursor<ITeamMember> {
 		const query = {
 			userId,
diff --git a/apps/meteor/server/models/raw/Users.js b/apps/meteor/server/models/raw/Users.js
index a5bd1d4fc16b..0e5832b2aad9 100644
--- a/apps/meteor/server/models/raw/Users.js
+++ b/apps/meteor/server/models/raw/Users.js
@@ -95,6 +95,10 @@ export class UsersRaw extends BaseRaw {
 				name: 'username_insensitive',
 				collation: { locale: 'en', strength: 2, caseLevel: false },
 			},
+			{
+				key: { active: 1, lastLogin: 1 },
+				partialFilterExpression: { active: true, lastLogin: { $exists: true } },
+			},
 		];
 	}
 
@@ -135,6 +139,16 @@ export class UsersRaw extends BaseRaw {
 		return this.find(query, options);
 	}
 
+	countUsersInRoles(roles) {
+		roles = [].concat(roles);
+
+		const query = {
+			roles: { $in: roles },
+		};
+
+		return this.countDocuments(query);
+	}
+
 	findPaginatedUsersInRoles(roles, options) {
 		roles = [].concat(roles);
 
@@ -1439,6 +1453,17 @@ export class UsersRaw extends BaseRaw {
 		return this.find(query);
 	}
 
+	countOnlineUserFromList(userList, isLivechatEnabledWhenAgentIdle) {
+		// TODO: Create class Agent
+		const username = {
+			$in: [].concat(userList),
+		};
+
+		const query = queryStatusAgentOnline({ username }, isLivechatEnabledWhenAgentIdle);
+
+		return this.countDocuments(query);
+	}
+
 	findOneOnlineAgentByUserList(userList, options, isLivechatEnabledWhenAgentIdle) {
 		// TODO:: Create class Agent
 		const username = {
@@ -1470,6 +1495,22 @@ export class UsersRaw extends BaseRaw {
 		return this.find(query);
 	}
 
+	countBotAgents(usernameList) {
+		// TODO:: Create class Agent
+		const query = {
+			roles: {
+				$all: ['bot', 'livechat-agent'],
+			},
+			...(usernameList && {
+				username: {
+					$in: [].concat(usernameList),
+				},
+			}),
+		};
+
+		return this.countDocuments(query);
+	}
+
 	removeAllRoomsByUserId(_id) {
 		return this.updateOne(
 			{
@@ -2715,12 +2756,12 @@ export class UsersRaw extends BaseRaw {
 						$set: {
 							bio,
 						},
-				  }
+					}
 				: {
 						$unset: {
 							bio: 1,
 						},
-				  }),
+					}),
 		};
 		return this.updateOne({ _id }, update);
 	}
@@ -2732,12 +2773,12 @@ export class UsersRaw extends BaseRaw {
 						$set: {
 							nickname,
 						},
-				  }
+					}
 				: {
 						$unset: {
 							nickname: 1,
 						},
-				  }),
+					}),
 		};
 		return this.updateOne({ _id }, update);
 	}
@@ -3074,6 +3115,16 @@ export class UsersRaw extends BaseRaw {
 		return this.find(query, options);
 	}
 
+	countAllUsersWithPendingAvatar() {
+		const query = {
+			_pendingAvatarUrl: {
+				$exists: true,
+			},
+		};
+
+		return this.countDocuments(query);
+	}
+
 	updateCustomFieldsById(userId, customFields) {
 		return this.updateOne(
 			{ _id: userId },
diff --git a/apps/meteor/server/models/raw/VideoConference.ts b/apps/meteor/server/models/raw/VideoConference.ts
index 73080ac7b41e..5d18d9892038 100644
--- a/apps/meteor/server/models/raw/VideoConference.ts
+++ b/apps/meteor/server/models/raw/VideoConference.ts
@@ -8,7 +8,16 @@ import type {
 } from '@rocket.chat/core-typings';
 import { VideoConferenceStatus } from '@rocket.chat/core-typings';
 import type { FindPaginated, InsertionModel, IVideoConferenceModel } from '@rocket.chat/model-typings';
-import type { FindCursor, UpdateOptions, UpdateFilter, UpdateResult, IndexDescription, Collection, Db, FindOptions } from 'mongodb';
+import type {
+	FindCursor,
+	UpdateOptions,
+	UpdateFilter,
+	UpdateResult,
+	IndexDescription,
+	Collection,
+	Db,
+	CountDocumentsOptions,
+} from 'mongodb';
 
 import { BaseRaw } from './BaseRaw';
 
@@ -63,15 +72,15 @@ export class VideoConferenceRaw extends BaseRaw<VideoConference> implements IVid
 	public async countByTypeAndStatus(
 		type: VideoConference['type'],
 		status: VideoConferenceStatus,
-		options: FindOptions<VideoConference>,
+		options: CountDocumentsOptions,
 	): Promise<number> {
-		return this.find(
+		return this.countDocuments(
 			{
 				type,
 				status,
 			},
 			options,
-		).count();
+		);
 	}
 
 	public async createDirect({
@@ -181,12 +190,12 @@ export class VideoConferenceRaw extends BaseRaw<VideoConference> implements IVid
 						$set: {
 							providerData,
 						},
-				  }
+					}
 				: {
 						$unset: {
 							providerData: 1 as const,
 						},
-				  }),
+					}),
 		});
 	}
 
diff --git a/apps/meteor/server/publications/messages.ts b/apps/meteor/server/publications/messages.ts
index ebf813a637d0..21fcfd3524c0 100644
--- a/apps/meteor/server/publications/messages.ts
+++ b/apps/meteor/server/publications/messages.ts
@@ -7,29 +7,188 @@ import type { FindOptions } from 'mongodb';
 
 import { canAccessRoomIdAsync } from '../../app/authorization/server/functions/canAccessRoom';
 
+type CursorPaginationType = 'UPDATED' | 'DELETED';
+
 declare module '@rocket.chat/ddp-client' {
 	// eslint-disable-next-line @typescript-eslint/naming-convention
 	interface ServerMethods {
 		'messages/get': (
 			rid: IRoom['_id'],
-			options: { lastUpdate?: Date; latestDate?: Date; oldestDate?: Date; inclusive?: boolean; count?: number; unreads?: boolean },
+			options: {
+				lastUpdate?: Date;
+				latestDate?: Date;
+				oldestDate?: Date;
+				inclusive?: boolean;
+				count?: number;
+				unreads?: boolean;
+				next?: string;
+				previous?: string;
+				type?: CursorPaginationType;
+			},
 		) => Promise<{
 			updated: IMessage[];
 			deleted: IMessage[];
+			cursor: {
+				next: string | null;
+				previous: string | null;
+			};
 		}>;
 	}
 }
 
+export function extractTimestampFromCursor(cursor: string): Date {
+	const timestamp = parseInt(cursor, 10);
+
+	if (isNaN(timestamp) || new Date(timestamp).toString() === 'Invalid Date') {
+		throw new Error('Invalid Date');
+	}
+
+	return new Date(timestamp);
+}
+
+export function mountCursorQuery({ next, previous, count }: { next?: string; previous?: string; count: number }): {
+	query: { $gt: Date } | { $lt: Date };
+	options: FindOptions<IMessage>;
+} {
+	const options: FindOptions<IMessage> = {
+		sort: { _updatedAt: 1 },
+		...(next || previous ? { limit: count + 1 } : {}),
+	};
+
+	if (next) {
+		return { query: { $gt: extractTimestampFromCursor(next) }, options };
+	}
+
+	if (previous) {
+		return { query: { $lt: extractTimestampFromCursor(previous) }, options: { ...options, sort: { _updatedAt: -1 } } };
+	}
+
+	return { query: { $gt: new Date(0) }, options };
+}
+
+export function mountCursorFromMessage(message: IMessage & { _deletedAt?: Date }, type: 'UPDATED' | 'DELETED'): string {
+	if (type === 'UPDATED' && message._updatedAt) {
+		return `${message._updatedAt.getTime()}`;
+	}
+
+	if (type === 'DELETED' && message._deletedAt) {
+		return `${message._deletedAt.getTime()}`;
+	}
+
+	throw new Meteor.Error('error-cursor-not-found', 'Cursor not found', { method: 'messages/get' });
+}
+
+export function mountNextCursor(
+	messages: IMessage[],
+	count: number,
+	type: CursorPaginationType,
+	next?: string,
+	previous?: string,
+): string | null {
+	if (messages.length === 0) {
+		return null;
+	}
+
+	if (previous) {
+		return mountCursorFromMessage(messages[0], type);
+	}
+
+	if (messages.length <= count && next) {
+		return null;
+	}
+
+	if (messages.length > count && next) {
+		return mountCursorFromMessage(messages[messages.length - 2], type);
+	}
+
+	return mountCursorFromMessage(messages[messages.length - 1], type);
+}
+
+export function mountPreviousCursor(
+	messages: IMessage[],
+	count: number,
+	type: CursorPaginationType,
+	next?: string,
+	previous?: string,
+): string | null {
+	if (messages.length === 0) {
+		return null;
+	}
+
+	if (messages.length <= count && next) {
+		return mountCursorFromMessage(messages[0], type);
+	}
+
+	if (messages.length > count && next) {
+		return mountCursorFromMessage(messages[0], type);
+	}
+
+	if (messages.length <= count && previous) {
+		return null;
+	}
+
+	if (messages.length > count && previous) {
+		return mountCursorFromMessage(messages[messages.length - 2], type);
+	}
+
+	return mountCursorFromMessage(messages[0], type);
+}
+
+export async function handleWithoutPagination(rid: IRoom['_id'], lastUpdate: Date) {
+	const query = { $gt: lastUpdate };
+	const options: FindOptions<IMessage> = { sort: { ts: -1 } };
+
+	const [updatedMessages, deletedMessages] = await Promise.all([
+		Messages.findForUpdates(rid, query, options).toArray(),
+		Messages.trashFindDeletedAfter(lastUpdate, { rid }, { projection: { _id: 1, _deletedAt: 1 }, ...options }).toArray(),
+	]);
+
+	return {
+		updated: updatedMessages,
+		deleted: deletedMessages,
+	};
+}
+
+export async function handleCursorPagination(
+	type: CursorPaginationType,
+	rid: IRoom['_id'],
+	count: number,
+	next?: string,
+	previous?: string,
+) {
+	const { query, options } = mountCursorQuery({ next, previous, count });
+
+	const response =
+		type === 'UPDATED'
+			? await Messages.findForUpdates(rid, query, options).toArray()
+			: ((await Messages.trashFind({ rid, _deletedAt: query }, { projection: { _id: 1, _deletedAt: 1 }, ...options })!.toArray()) ?? []);
+
+	const cursor = {
+		next: mountNextCursor(response, count, type, next, previous),
+		previous: mountPreviousCursor(response, count, type, next, previous),
+	};
+
+	if (response.length > count) {
+		response.pop();
+	}
+
+	return {
+		[type.toLowerCase()]: response,
+		cursor,
+	};
+}
+
 Meteor.methods<ServerMethods>({
-	async 'messages/get'(rid, { lastUpdate, latestDate = new Date(), oldestDate, inclusive = false, count = 20, unreads = false }) {
+	async 'messages/get'(
+		rid,
+		{ lastUpdate, latestDate = new Date(), oldestDate, inclusive = false, count = 20, unreads = false, next, previous, type },
+	) {
 		check(rid, String);
 
 		const fromId = Meteor.userId();
 
 		if (!fromId) {
-			throw new Meteor.Error('error-invalid-user', 'Invalid user', {
-				method: 'messages/get',
-			});
+			throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'messages/get' });
 		}
 
 		if (!rid) {
@@ -37,35 +196,52 @@ Meteor.methods<ServerMethods>({
 		}
 
 		if (!(await canAccessRoomIdAsync(rid, fromId))) {
-			throw new Meteor.Error('error-not-allowed', 'Not allowed', {
-				method: 'messages/get',
+			throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'messages/get' });
+		}
+
+		if (type && !['UPDATED', 'DELETED'].includes(type)) {
+			throw new Meteor.Error('error-type-param-not-supported', 'The "type" parameter must be either "UPDATED" or "DELETED"');
+		}
+
+		if ((next || previous) && !type) {
+			throw new Meteor.Error(
+				'error-type-param-required',
+				'The "type" parameter is required when using the "next" or "previous" parameters',
+			);
+		}
+
+		if (next && previous) {
+			throw new Meteor.Error('error-cursor-conflict', 'You cannot provide both "next" and "previous" parameters');
+		}
+
+		if ((next || previous) && lastUpdate) {
+			throw new Meteor.Error(
+				'error-cursor-and-lastUpdate-conflict',
+				'The attributes "next", "previous" and "lastUpdate" cannot be used together',
+			);
+		}
+
+		const hasCursorPagination = !!((next || previous) && count !== null && type);
+
+		if (!hasCursorPagination && !lastUpdate) {
+			return Meteor.callAsync('getChannelHistory', {
+				rid,
+				latest: latestDate,
+				oldest: oldestDate,
+				inclusive,
+				count,
+				unreads,
 			});
 		}
 
-		const options: FindOptions<IMessage> = {
-			sort: {
-				ts: -1,
-			},
-		};
-
-		if (lastUpdate instanceof Date) {
-			return {
-				updated: await Messages.findForUpdates(rid, lastUpdate, {
-					sort: {
-						ts: -1,
-					},
-				}).toArray(),
-				deleted: await Messages.trashFindDeletedAfter(lastUpdate, { rid }, { ...options, projection: { _id: 1, _deletedAt: 1 } }).toArray(),
-			};
+		if (lastUpdate) {
+			return handleWithoutPagination(rid, lastUpdate);
+		}
+
+		if (!type) {
+			throw new Meteor.Error('error-param-required', 'The "type" or "lastUpdate" parameters must be provided');
 		}
 
-		return Meteor.callAsync('getChannelHistory', {
-			rid,
-			latest: latestDate,
-			oldest: oldestDate,
-			inclusive,
-			count,
-			unreads,
-		});
+		return handleCursorPagination(type, rid, count, next, previous);
 	},
 });
diff --git a/apps/meteor/server/routes/avatar/index.js b/apps/meteor/server/routes/avatar/index.js
deleted file mode 100644
index 994fad6821e1..000000000000
--- a/apps/meteor/server/routes/avatar/index.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import { WebApp } from 'meteor/webapp';
-
-import { roomAvatar } from './room';
-import { userAvatar } from './user';
-
-import './middlewares';
-
-WebApp.connectHandlers.use('/avatar/room/', roomAvatar);
-WebApp.connectHandlers.use('/avatar/', userAvatar);
diff --git a/apps/meteor/server/routes/avatar/index.ts b/apps/meteor/server/routes/avatar/index.ts
new file mode 100644
index 000000000000..5a6adfffdd2a
--- /dev/null
+++ b/apps/meteor/server/routes/avatar/index.ts
@@ -0,0 +1,10 @@
+import { WebApp } from 'meteor/webapp';
+
+import { roomAvatar } from './room';
+import { userAvatarByUsername, userAvatarById } from './user';
+
+import './middlewares';
+
+WebApp.connectHandlers.use('/avatar/room/', roomAvatar);
+WebApp.connectHandlers.use('/avatar/uid/', userAvatarById);
+WebApp.connectHandlers.use('/avatar/', userAvatarByUsername);
diff --git a/apps/meteor/server/routes/avatar/middlewares/auth.js b/apps/meteor/server/routes/avatar/middlewares/auth.js
deleted file mode 100644
index 5a4ead7ed048..000000000000
--- a/apps/meteor/server/routes/avatar/middlewares/auth.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import { userCanAccessAvatar, renderSVGLetters } from '../utils';
-
-// protect all avatar endpoints
-export const protectAvatars = async (req, res, next) => {
-	if (!(await userCanAccessAvatar(req))) {
-		let roomOrUsername;
-
-		if (req.url.startsWith('/room')) {
-			roomOrUsername = req.url.split('/')[2] || 'Room';
-		} else {
-			roomOrUsername = req.url.split('/')[1] || 'Anonymous';
-		}
-
-		res.writeHead(200, { 'Content-Type': 'image/svg+xml' });
-		res.write(renderSVGLetters(roomOrUsername, 200));
-		res.end();
-
-		return;
-	}
-
-	return next();
-};
diff --git a/apps/meteor/server/routes/avatar/middlewares/auth.spec.ts b/apps/meteor/server/routes/avatar/middlewares/auth.spec.ts
new file mode 100644
index 000000000000..05292fb16c48
--- /dev/null
+++ b/apps/meteor/server/routes/avatar/middlewares/auth.spec.ts
@@ -0,0 +1,124 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import proxyquire from 'proxyquire';
+import sinon from 'sinon';
+
+const mocks = {
+	utils: {
+		userCanAccessAvatar: sinon.stub(),
+		renderSVGLetters: sinon.stub(),
+	},
+};
+
+const { protectAvatarsWithFallback, protectAvatars } = proxyquire.noCallThru().load('./auth.ts', {
+	'../utils': mocks.utils,
+});
+
+describe('#protectAvatarsWithFallback()', () => {
+	const response = {
+		setHeader: sinon.spy(),
+		writeHead: sinon.spy(),
+		write: sinon.spy(),
+		end: sinon.spy(),
+	};
+	const next = sinon.spy();
+
+	afterEach(() => {
+		response.setHeader.resetHistory();
+		response.writeHead.resetHistory();
+		response.end.resetHistory();
+		next.resetHistory();
+
+		Object.values(mocks.utils).forEach((mock) => mock.reset());
+	});
+
+	it(`should write 404 to head if no url provided`, async () => {
+		await protectAvatarsWithFallback({}, response, next);
+		expect(next.called).to.be.false;
+		expect(response.setHeader.called).to.be.false;
+		expect(response.writeHead.calledWith(404)).to.be.true;
+		expect(response.end.calledOnce).to.be.true;
+	});
+
+	it(`should write 200 to head and write fallback to body (user avatar)`, async () => {
+		mocks.utils.renderSVGLetters.returns('fallback');
+
+		await protectAvatarsWithFallback({ url: '/jon' }, response, next);
+		expect(next.called).to.be.false;
+		expect(response.setHeader.called).to.be.false;
+
+		expect(response.writeHead.calledWith(200, { 'Content-Type': 'image/svg+xml' })).to.be.true;
+		expect(mocks.utils.renderSVGLetters.calledWith('jon')).to.be.true;
+		expect(response.write.calledWith('fallback')).to.be.true;
+
+		expect(response.end.calledOnce).to.be.true;
+	});
+
+	it(`should write 200 to head and write fallback to body (room avatar)`, async () => {
+		mocks.utils.renderSVGLetters.returns('fallback');
+
+		await protectAvatarsWithFallback({ url: '/room/jon' }, response, next);
+		expect(next.called).to.be.false;
+		expect(response.setHeader.called).to.be.false;
+		expect(response.writeHead.calledWith(200, { 'Content-Type': 'image/svg+xml' })).to.be.true;
+		expect(response.write.calledWith('fallback')).to.be.true;
+		expect(response.end.calledOnce).to.be.true;
+	});
+
+	it(`should call next if user can access avatar`, async () => {
+		mocks.utils.userCanAccessAvatar.returns(true);
+		const request = { url: '/jon' };
+
+		await protectAvatarsWithFallback(request, response, next);
+		expect(mocks.utils.userCanAccessAvatar.calledWith(request)).to.be.true;
+		expect(next.called).to.be.true;
+	});
+});
+
+describe('#protectAvatars()', () => {
+	const response = {
+		setHeader: sinon.spy(),
+		writeHead: sinon.spy(),
+		write: sinon.spy(),
+		end: sinon.spy(),
+	};
+	const next = sinon.spy();
+
+	afterEach(() => {
+		response.setHeader.resetHistory();
+		response.writeHead.resetHistory();
+		response.end.resetHistory();
+		next.resetHistory();
+
+		Object.values(mocks.utils).forEach((mock) => mock.reset());
+	});
+
+	it(`should write 404 to head if no url provided`, async () => {
+		await protectAvatars({}, response, next);
+
+		expect(next.called).to.be.false;
+		expect(response.setHeader.called).to.be.false;
+		expect(response.writeHead.calledWith(404)).to.be.true;
+		expect(response.end.calledOnce).to.be.true;
+	});
+
+	it(`should write 404 to head if access is denied`, async () => {
+		mocks.utils.userCanAccessAvatar.returns(false);
+
+		await protectAvatars({ url: '/room/jon' }, response, next);
+
+		expect(next.called).to.be.false;
+		expect(response.setHeader.called).to.be.false;
+		expect(response.writeHead.calledWith(404)).to.be.true;
+		expect(response.end.calledOnce).to.be.true;
+	});
+
+	it(`should call next if user can access avatar`, async () => {
+		mocks.utils.userCanAccessAvatar.returns(true);
+		const request = { url: '/jon' };
+
+		await protectAvatars(request, response, next);
+		expect(mocks.utils.userCanAccessAvatar.calledWith(request)).to.be.true;
+		expect(next.called).to.be.true;
+	});
+});
diff --git a/apps/meteor/server/routes/avatar/middlewares/auth.ts b/apps/meteor/server/routes/avatar/middlewares/auth.ts
new file mode 100644
index 000000000000..958e05379c88
--- /dev/null
+++ b/apps/meteor/server/routes/avatar/middlewares/auth.ts
@@ -0,0 +1,47 @@
+import type { IncomingMessage, ServerResponse } from 'http';
+
+import type { IIncomingMessage } from '@rocket.chat/core-typings';
+import type { NextFunction } from 'connect';
+
+import { userCanAccessAvatar, renderSVGLetters } from '../utils';
+
+const renderFallback = (req: IncomingMessage, res: ServerResponse) => {
+	if (!req.url) {
+		res.writeHead(404);
+		res.end();
+		return;
+	}
+
+	let roomOrUsername;
+
+	if (req.url.startsWith('/room')) {
+		roomOrUsername = req.url.split('/')[2] || 'Room';
+	} else {
+		roomOrUsername = req.url.split('/')[1] || 'Anonymous';
+	}
+
+	res.writeHead(200, { 'Content-Type': 'image/svg+xml' });
+	res.write(renderSVGLetters(roomOrUsername, 200));
+	res.end();
+};
+
+const getProtectAvatars = (callback?: typeof renderFallback) => async (req: IncomingMessage, res: ServerResponse, next: NextFunction) => {
+	if (!(await userCanAccessAvatar(req as IIncomingMessage))) {
+		if (callback) {
+			callback(req, res);
+			return;
+		}
+
+		res.writeHead(404);
+		res.end();
+		return;
+	}
+
+	return next();
+};
+
+// If unauthorized returns the SVG fallback (letter avatar)
+export const protectAvatarsWithFallback = getProtectAvatars(renderFallback);
+
+// Just returns 404
+export const protectAvatars = getProtectAvatars();
diff --git a/apps/meteor/server/routes/avatar/middlewares/browserVersion.spec.ts b/apps/meteor/server/routes/avatar/middlewares/browserVersion.spec.ts
new file mode 100644
index 000000000000..6b627cb3b224
--- /dev/null
+++ b/apps/meteor/server/routes/avatar/middlewares/browserVersion.spec.ts
@@ -0,0 +1,87 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import proxyquire from 'proxyquire';
+import sinon from 'sinon';
+
+// const getCookie = sinon.stub();
+class CookiesMock {
+	public get = (_key: any, value: any) => value;
+}
+const { handleBrowserVersionCheck, isIEOlderThan11 } = proxyquire.noCallThru().load('./browserVersion', {
+	'meteor/ostrio:cookies': {
+		Cookies: CookiesMock,
+	},
+	'../../../../app/utils/server/getURL': {
+		getURL: () => '',
+	},
+});
+
+describe('#isIEOlderThan11()', () => {
+	it('should return false if user agent is IE11', () => {
+		const userAgent = {
+			browser: {
+				name: 'IE',
+				version: '11.0',
+			},
+		};
+		expect(isIEOlderThan11(userAgent)).to.be.false;
+	});
+
+	it('should return true if user agent is IE < 11', () => {
+		const userAgent = {
+			browser: {
+				name: 'IE',
+				version: '10.0',
+			},
+		};
+		expect(isIEOlderThan11(userAgent)).to.be.true;
+	});
+});
+
+describe('#handleBrowserVersionCheck()', () => {
+	it('should call next if browser_version_check cookie is set to "bypass"', async () => {
+		const next = sinon.spy();
+		const request = {
+			headers: {
+				cookie: 'bypass',
+			},
+		};
+		handleBrowserVersionCheck(request as any, {} as any, next);
+
+		expect(next.calledOnce).to.be.true;
+	});
+
+	it('should call next if browser_version_check cookie is not set to "force" and user agent is not IE < 11', async () => {
+		const next = sinon.spy();
+		const request = {
+			headers: {
+				'cookie': 'anything',
+				'user-agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/129.0.0.0 Safari/537.36',
+			},
+		};
+		handleBrowserVersionCheck(request as any, {} as any, next);
+
+		expect(next.calledOnce).to.be.true;
+	});
+
+	it('should respond with Browser not supported', async () => {
+		const next = sinon.spy();
+		const request = {
+			headers: {
+				'cookie': 'anything',
+				'user-agent': 'Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 7.0; InfoPath.3; .NET CLR 3.1.40767; Trident/6.0; en-IN)',
+			},
+		};
+
+		const response = {
+			setHeader: sinon.spy(),
+			write: sinon.spy(),
+			end: sinon.spy(),
+		};
+		handleBrowserVersionCheck(request as any, response as any, next);
+
+		expect(response.setHeader.calledWith('content-type', 'text/html; charset=utf-8')).to.be.true;
+		expect(response.write.calledWith(sinon.match('Browser not supported'))).to.be.true;
+		expect(response.end.calledOnce).to.be.true;
+	});
+});
diff --git a/apps/meteor/server/routes/avatar/middlewares/browserVersion.js b/apps/meteor/server/routes/avatar/middlewares/browserVersion.ts
similarity index 81%
rename from apps/meteor/server/routes/avatar/middlewares/browserVersion.js
rename to apps/meteor/server/routes/avatar/middlewares/browserVersion.ts
index 1358e4b1d71b..a0095581240e 100644
--- a/apps/meteor/server/routes/avatar/middlewares/browserVersion.js
+++ b/apps/meteor/server/routes/avatar/middlewares/browserVersion.ts
@@ -1,18 +1,31 @@
-import { WebApp } from 'meteor/webapp';
+import type { IncomingMessage, ServerResponse } from 'http';
+
+import type { IIncomingMessage } from '@rocket.chat/core-typings';
+import type { NextFunction } from 'connect';
+import { Cookies } from 'meteor/ostrio:cookies';
 import parser from 'ua-parser-js';
 
 import { getURL } from '../../../../app/utils/server/getURL';
 
-WebApp.connectHandlers.use((req, res, next) => {
-	if (req.cookies.browser_version_check === 'bypass') {
+const cookies = new Cookies();
+
+export const isIEOlderThan11 = (userAgent: ReturnType<typeof parser>) => {
+	if (!userAgent?.browser.name || !userAgent?.browser.version) {
+		return false;
+	}
+	return userAgent.browser.name === 'IE' && parseInt(userAgent.browser.version) < 11;
+};
+
+export const handleBrowserVersionCheck = (request: IncomingMessage, res: ServerResponse, next: NextFunction) => {
+	const req = request as IIncomingMessage;
+
+	const browserVersionCheck = cookies.get('browser_version_check', req.headers.cookie);
+	if (browserVersionCheck === 'bypass') {
 		return next();
 	}
 
-	const result = parser(req.headers['user-agent']);
-	if (
-		req.cookies.browser_version_check !== 'force' &&
-		(!result || result.browser.name !== 'IE' || parseInt(result.browser.version) >= 11)
-	) {
+	const userAgent = parser(req.headers['user-agent']);
+	if (browserVersionCheck !== 'force' && !isIEOlderThan11(userAgent)) {
 		return next();
 	}
 
@@ -129,4 +142,4 @@ WebApp.connectHandlers.use((req, res, next) => {
 	`);
 
 	return res.end();
-});
+};
diff --git a/apps/meteor/server/routes/avatar/middlewares/index.js b/apps/meteor/server/routes/avatar/middlewares/index.js
deleted file mode 100644
index 9b55e2e53e74..000000000000
--- a/apps/meteor/server/routes/avatar/middlewares/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import { WebApp } from 'meteor/webapp';
-
-import { protectAvatars } from './auth';
-
-import './browserVersion';
-
-WebApp.connectHandlers.use('/avatar/', protectAvatars);
diff --git a/apps/meteor/server/routes/avatar/middlewares/index.ts b/apps/meteor/server/routes/avatar/middlewares/index.ts
new file mode 100644
index 000000000000..659c6e926624
--- /dev/null
+++ b/apps/meteor/server/routes/avatar/middlewares/index.ts
@@ -0,0 +1,8 @@
+import { WebApp } from 'meteor/webapp';
+
+import { protectAvatarsWithFallback, protectAvatars } from './auth';
+import { handleBrowserVersionCheck } from './browserVersion';
+
+WebApp.connectHandlers.use(handleBrowserVersionCheck);
+WebApp.connectHandlers.use('/avatar/uid/', protectAvatars);
+WebApp.connectHandlers.use('/avatar/', protectAvatarsWithFallback);
diff --git a/apps/meteor/server/routes/avatar/room.js b/apps/meteor/server/routes/avatar/room.js
deleted file mode 100644
index 3482253d57d8..000000000000
--- a/apps/meteor/server/routes/avatar/room.js
+++ /dev/null
@@ -1,78 +0,0 @@
-import { Avatars, Rooms } from '@rocket.chat/models';
-import { Cookies } from 'meteor/ostrio:cookies';
-
-import { FileUpload } from '../../../app/file-upload/server';
-import { roomCoordinator } from '../../lib/rooms/roomCoordinator';
-import { renderSVGLetters, serveAvatar, wasFallbackModified, setCacheAndDispositionHeaders } from './utils';
-
-const MAX_ROOM_SVG_AVATAR_SIZE = 1024;
-const MIN_ROOM_SVG_AVATAR_SIZE = 16;
-
-const cookie = new Cookies();
-const getRoomAvatar = async (roomId) => {
-	const room = await Rooms.findOneById(roomId, { projection: { t: 1, prid: 1, name: 1, fname: 1, federated: 1 } });
-	if (!room) {
-		return {};
-	}
-
-	const file = await Avatars.findOneByRoomId(room._id);
-
-	// if it is a discussion that doesn't have it's own avatar, returns the parent's room avatar
-	if (room.prid && !file) {
-		return getRoomAvatar(room.prid);
-	}
-
-	return { room, file };
-};
-
-export const roomAvatar = async function (req, res /* , next*/) {
-	const roomId = decodeURIComponent(req.url.substr(1).replace(/\?.*$/, ''));
-
-	const { room, file } = await getRoomAvatar(roomId);
-	if (!room) {
-		res.writeHead(404);
-		res.end();
-		return;
-	}
-
-	const uid = req.headers.cookie && cookie.get('rc_uid', req.headers.cookie);
-
-	const reqModifiedHeader = req.headers['if-modified-since'];
-	if (file) {
-		res.setHeader('Content-Security-Policy', "default-src 'none'");
-
-		if (reqModifiedHeader && reqModifiedHeader === file.uploadedAt?.toUTCString()) {
-			res.setHeader('Last-Modified', reqModifiedHeader);
-			res.writeHead(304);
-			res.end();
-			return;
-		}
-
-		if (file.uploadedAt) {
-			res.setHeader('Last-Modified', file.uploadedAt.toUTCString());
-		}
-		res.setHeader('Content-Type', file.type);
-		res.setHeader('Content-Length', file.size);
-
-		return FileUpload.get(file, req, res);
-	}
-
-	const roomName = await roomCoordinator.getRoomName(room.t, room, uid);
-
-	setCacheAndDispositionHeaders(req, res);
-
-	if (!wasFallbackModified(reqModifiedHeader, res)) {
-		res.writeHead(304);
-		res.end();
-		return;
-	}
-
-	let avatarSize = req.query.size && parseInt(req.query.size);
-	if (avatarSize) {
-		avatarSize = Math.min(Math.max(avatarSize, MIN_ROOM_SVG_AVATAR_SIZE), MAX_ROOM_SVG_AVATAR_SIZE);
-	}
-
-	const svg = renderSVGLetters(roomName, avatarSize);
-
-	return serveAvatar(svg, req.query.format, res);
-};
diff --git a/apps/meteor/server/routes/avatar/room.spec.ts b/apps/meteor/server/routes/avatar/room.spec.ts
new file mode 100644
index 000000000000..1b2fd71e95d9
--- /dev/null
+++ b/apps/meteor/server/routes/avatar/room.spec.ts
@@ -0,0 +1,139 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import proxyquire from 'proxyquire';
+import sinon from 'sinon';
+
+const mocks = {
+	settingsGet: sinon.stub(),
+	findOneById: sinon.stub(),
+	utils: {
+		serveSvgAvatarInRequestedFormat: sinon.spy(),
+		wasFallbackModified: sinon.stub(),
+		setCacheAndDispositionHeaders: sinon.spy(),
+		serveAvatarFile: sinon.spy(),
+	},
+	avatarFindOneByRoomId: sinon.stub(),
+	getRoomName: sinon.stub(),
+};
+
+class CookiesMock {
+	public get = (_key: any, value: any) => value;
+}
+
+const { roomAvatar } = proxyquire.noCallThru().load('./room', {
+	'@rocket.chat/models': {
+		Rooms: {
+			findOneById: mocks.findOneById,
+		},
+		Avatars: {
+			findOneByRoomId: mocks.avatarFindOneByRoomId,
+		},
+	},
+	'../../../app/settings/server': {
+		settings: {
+			get: mocks.settingsGet,
+		},
+	},
+	'./utils': mocks.utils,
+	'../../lib/rooms/roomCoordinator': {
+		roomCoordinator: {
+			getRoomName: mocks.getRoomName,
+		},
+	},
+	'meteor/ostrio:cookies': {
+		Cookies: CookiesMock,
+	},
+});
+
+describe('#roomAvatar()', () => {
+	const response = {
+		setHeader: sinon.spy(),
+		writeHead: sinon.spy(),
+		end: sinon.spy(),
+	};
+	const next = sinon.spy();
+
+	afterEach(() => {
+		mocks.settingsGet.reset();
+		mocks.avatarFindOneByRoomId.reset();
+		mocks.findOneById.reset();
+
+		response.setHeader.resetHistory();
+		response.writeHead.resetHistory();
+		response.end.resetHistory();
+		next.resetHistory();
+
+		Object.values(mocks.utils).forEach((mock) => ('reset' in mock ? mock.reset() : mock.resetHistory()));
+	});
+
+	it(`should do nothing if url is not in request object`, async () => {
+		await roomAvatar({}, response, next);
+		expect(next.called).to.be.false;
+		expect(response.setHeader.called).to.be.false;
+		expect(response.writeHead.called).to.be.false;
+		expect(response.end.called).to.be.false;
+	});
+
+	it(`should write 404 if room is not found`, async () => {
+		mocks.findOneById.returns(null);
+		await roomAvatar({ url: '/' }, response, next);
+		expect(next.called).to.be.false;
+		expect(response.setHeader.called).to.be.false;
+		expect(response.writeHead.calledWith(404)).to.be.true;
+		expect(response.end.calledOnce).to.be.true;
+	});
+
+	it(`should serve avatar file if found`, async () => {
+		const request = { url: '/roomId' };
+
+		const file = { uploadedAt: new Date(0), type: 'image/png', size: 100 };
+
+		mocks.findOneById.withArgs('roomId').returns({ _id: 'roomId' });
+		mocks.avatarFindOneByRoomId.withArgs('roomId').returns(file);
+
+		await roomAvatar(request, response, next);
+
+		expect(mocks.utils.setCacheAndDispositionHeaders.calledWith(request, response)).to.be.true;
+		expect(mocks.utils.serveAvatarFile.calledWith(file, request, response, next)).to.be.true;
+	});
+
+	it(`should serve parent room avatar file if current room avatar is not found`, async () => {
+		const request = { url: '/roomId' };
+
+		const file = { uploadedAt: new Date(0), type: 'image/png', size: 100 };
+
+		mocks.findOneById.withArgs('roomId').returns({ _id: 'roomId', prid: 'roomId2' });
+		mocks.findOneById.withArgs('roomId2').returns({ _id: 'roomId2' });
+		mocks.avatarFindOneByRoomId.withArgs('roomId2').returns(file);
+
+		await roomAvatar(request, response, next);
+
+		expect(mocks.utils.setCacheAndDispositionHeaders.calledWith(request, response)).to.be.true;
+		expect(mocks.utils.serveAvatarFile.calledWith(file, request, response, next)).to.be.true;
+	});
+
+	it(`should write 304 if fallback content is not modified`, async () => {
+		const request = { url: '/roomId', headers: {} };
+
+		mocks.findOneById.withArgs('roomId').returns({ _id: 'roomId' });
+		mocks.utils.wasFallbackModified.returns(false);
+		await roomAvatar(request, response, next);
+
+		expect(mocks.utils.setCacheAndDispositionHeaders.calledWith(request, response)).to.be.true;
+		expect(response.writeHead.calledWith(304)).to.be.true;
+		expect(response.end.calledOnce).to.be.true;
+	});
+
+	it(`should serve svg fallback if no file found`, async () => {
+		const request = { url: '/roomId', headers: { cookie: 'userId' } };
+
+		mocks.utils.wasFallbackModified.returns(true);
+		mocks.findOneById.withArgs('roomId').returns({ _id: 'roomId' });
+		mocks.getRoomName.returns('roomName');
+
+		await roomAvatar(request, response, next);
+
+		expect(mocks.utils.setCacheAndDispositionHeaders.calledWith(request, response)).to.be.true;
+		expect(mocks.utils.serveSvgAvatarInRequestedFormat.calledWith({ nameOrUsername: 'roomName', req: request, res: response })).to.be.true;
+	});
+});
diff --git a/apps/meteor/server/routes/avatar/room.ts b/apps/meteor/server/routes/avatar/room.ts
new file mode 100644
index 000000000000..4737d607d1b8
--- /dev/null
+++ b/apps/meteor/server/routes/avatar/room.ts
@@ -0,0 +1,61 @@
+import type { IncomingMessage, ServerResponse } from 'http';
+
+import type { IIncomingMessage, IRoom, IUpload } from '@rocket.chat/core-typings';
+import { Avatars, Rooms } from '@rocket.chat/models';
+import type { NextFunction } from 'connect';
+import { Cookies } from 'meteor/ostrio:cookies';
+
+import { serveSvgAvatarInRequestedFormat, wasFallbackModified, setCacheAndDispositionHeaders, serveAvatarFile } from './utils';
+import { roomCoordinator } from '../../lib/rooms/roomCoordinator';
+
+const cookie = new Cookies();
+const getRoomAndAvatarFile = async (roomId: IRoom['_id']): Promise<{ room: IRoom; file: IUpload | null } | void> => {
+	const room = await Rooms.findOneById(roomId);
+	if (!room) {
+		return;
+	}
+
+	const file = await Avatars.findOneByRoomId(room._id);
+
+	// if it is a discussion that doesn't have it's own avatar, returns the parent's room avatar
+	if (room.prid && !file) {
+		return getRoomAndAvatarFile(room.prid);
+	}
+
+	return { room, file };
+};
+
+export const roomAvatar = async function (request: IncomingMessage, res: ServerResponse, next: NextFunction) {
+	const req = request as IIncomingMessage;
+
+	if (!req.url) {
+		return;
+	}
+
+	const roomId = decodeURIComponent(req.url.slice(1).replace(/\?.*$/, ''));
+
+	const { room, file } = (await getRoomAndAvatarFile(roomId)) || {};
+	if (!room) {
+		res.writeHead(404);
+		res.end();
+		return;
+	}
+
+	setCacheAndDispositionHeaders(req, res);
+
+	if (file) {
+		void serveAvatarFile(file, req, res, next);
+		return;
+	}
+
+	if (!wasFallbackModified(req.headers['if-modified-since'])) {
+		res.writeHead(304);
+		res.end();
+		return;
+	}
+
+	const uid = req.headers.cookie && cookie.get('rc_uid', req.headers.cookie);
+	const roomName = await roomCoordinator.getRoomName(room.t, room, uid);
+
+	serveSvgAvatarInRequestedFormat({ nameOrUsername: roomName, req, res });
+};
diff --git a/apps/meteor/server/routes/avatar/user.js b/apps/meteor/server/routes/avatar/user.js
deleted file mode 100644
index 1c92d24fe300..000000000000
--- a/apps/meteor/server/routes/avatar/user.js
+++ /dev/null
@@ -1,84 +0,0 @@
-import { Avatars, Users } from '@rocket.chat/models';
-import { serverFetch as fetch } from '@rocket.chat/server-fetch';
-
-import { FileUpload } from '../../../app/file-upload/server';
-import { settings } from '../../../app/settings/server';
-import { renderSVGLetters, serveAvatar, wasFallbackModified, setCacheAndDispositionHeaders } from './utils';
-
-const MAX_USER_SVG_AVATAR_SIZE = 1024;
-const MIN_USER_SVG_AVATAR_SIZE = 16;
-
-// request /avatar/@name forces returning the svg
-export const userAvatar = async function (req, res) {
-	const requestUsername = decodeURIComponent(req.url.substr(1).replace(/\?.*$/, ''));
-
-	if (!requestUsername) {
-		res.writeHead(404);
-		res.end();
-		return;
-	}
-
-	let avatarSize = req.query.size && parseInt(req.query.size);
-	if (avatarSize) {
-		avatarSize = Math.min(Math.max(avatarSize, MIN_USER_SVG_AVATAR_SIZE), MAX_USER_SVG_AVATAR_SIZE);
-	}
-
-	setCacheAndDispositionHeaders(req, res);
-
-	// if request starts with @ always return the svg letters
-	if (requestUsername[0] === '@') {
-		const svg = renderSVGLetters(requestUsername.substr(1), avatarSize);
-		serveAvatar(svg, req.query.format, res);
-		return;
-	}
-
-	if (settings.get('Accounts_AvatarExternalProviderUrl')) {
-		const response = await fetch(settings.get('Accounts_AvatarExternalProviderUrl').replace('{username}', requestUsername));
-		response.headers.forEach((value, key) => res.setHeader(key, value));
-		response.body.pipe(res);
-		return;
-	}
-
-	const reqModifiedHeader = req.headers['if-modified-since'];
-
-	const file = await Avatars.findOneByName(requestUsername);
-	if (file) {
-		res.setHeader('Content-Security-Policy', "default-src 'none'");
-
-		if (reqModifiedHeader && reqModifiedHeader === (file.uploadedAt && file.uploadedAt.toUTCString())) {
-			res.setHeader('Last-Modified', reqModifiedHeader);
-			res.writeHead(304);
-			res.end();
-			return;
-		}
-
-		res.setHeader('Last-Modified', file.uploadedAt.toUTCString());
-		res.setHeader('Content-Type', file.type);
-		res.setHeader('Content-Length', file.size);
-
-		return FileUpload.get(file, req, res);
-	}
-
-	// if still using "letters fallback"
-	if (!wasFallbackModified(reqModifiedHeader, res)) {
-		res.writeHead(304);
-		res.end();
-		return;
-	}
-
-	let svg = renderSVGLetters(requestUsername, avatarSize);
-
-	if (settings.get('UI_Use_Name_Avatar')) {
-		const user = await Users.findOneByUsernameIgnoringCase(requestUsername, {
-			projection: {
-				name: 1,
-			},
-		});
-
-		if (user && user.name) {
-			svg = renderSVGLetters(user.name, avatarSize);
-		}
-	}
-
-	serveAvatar(svg, req.query.format, res);
-};
diff --git a/apps/meteor/server/routes/avatar/user.spec.ts b/apps/meteor/server/routes/avatar/user.spec.ts
new file mode 100644
index 000000000000..f5e6d87dbb63
--- /dev/null
+++ b/apps/meteor/server/routes/avatar/user.spec.ts
@@ -0,0 +1,291 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import { Headers } from 'node-fetch';
+import proxyquire from 'proxyquire';
+import sinon from 'sinon';
+
+const mocks = {
+	settingsGet: sinon.stub(),
+	findOneByUsernameIgnoringCase: sinon.stub(),
+	findOneById: sinon.stub(),
+	utils: {
+		serveSvgAvatarInRequestedFormat: sinon.spy(),
+		wasFallbackModified: sinon.stub(),
+		setCacheAndDispositionHeaders: sinon.spy(),
+		serveAvatarFile: sinon.spy(),
+	},
+	serverFetch: sinon.stub(),
+	avatarFindOneByName: sinon.stub(),
+	avatarFindOneByUserId: sinon.stub(),
+};
+
+const { userAvatarById, userAvatarByUsername } = proxyquire.noCallThru().load('./user', {
+	'@rocket.chat/models': {
+		Users: {
+			findOneByUsernameIgnoringCase: mocks.findOneByUsernameIgnoringCase,
+			findOneById: mocks.findOneById,
+		},
+		Avatars: {
+			findOneByName: mocks.avatarFindOneByName,
+			findOneByUserId: mocks.avatarFindOneByUserId,
+		},
+	},
+	'../../../app/settings/server': {
+		settings: {
+			get: mocks.settingsGet,
+		},
+	},
+	'./utils': mocks.utils,
+	'@rocket.chat/server-fetch': {
+		serverFetch: mocks.serverFetch,
+	},
+});
+
+describe('#userAvatarById()', () => {
+	const response = {
+		setHeader: sinon.spy(),
+		writeHead: sinon.spy(),
+		end: sinon.spy(),
+	};
+	const next = sinon.spy();
+
+	afterEach(() => {
+		mocks.settingsGet.reset();
+		mocks.avatarFindOneByUserId.reset();
+
+		response.setHeader.resetHistory();
+		response.writeHead.resetHistory();
+		response.end.resetHistory();
+		next.resetHistory();
+
+		Object.values(mocks.utils).forEach((mock) => ('reset' in mock ? mock.reset() : mock.resetHistory()));
+	});
+
+	it(`should do nothing if url is not in request object`, async () => {
+		await userAvatarById({}, response, next);
+		expect(next.called).to.be.false;
+		expect(response.setHeader.called).to.be.false;
+		expect(response.writeHead.called).to.be.false;
+		expect(response.end.called).to.be.false;
+	});
+
+	it(`should write 404 if Id is not provided`, async () => {
+		await userAvatarById({ url: '/' }, response, next);
+		expect(next.called).to.be.false;
+		expect(response.setHeader.called).to.be.false;
+		expect(response.writeHead.calledWith(404)).to.be.true;
+		expect(response.end.calledOnce).to.be.true;
+	});
+
+	it(`should call external provider`, async () => {
+		const userId = 'xvf5Tr34';
+		const request = { url: `/${userId}` };
+
+		const pipe = sinon.spy();
+		const mockResponseHeaders = new Headers();
+		mockResponseHeaders.set('header1', 'true');
+		mockResponseHeaders.set('header2', 'false');
+
+		mocks.serverFetch.returns({
+			headers: mockResponseHeaders,
+			body: { pipe },
+		});
+
+		mocks.settingsGet.returns('test123/{username}');
+
+		mocks.findOneById.returns({ username: 'jon' });
+
+		await userAvatarById(request, response, next);
+
+		expect(mocks.utils.setCacheAndDispositionHeaders.calledWith(request, response)).to.be.true;
+		expect(mocks.findOneById.calledWith(userId)).to.be.true;
+		expect(mocks.serverFetch.calledWith('test123/jon')).to.be.true;
+		expect(response.setHeader.calledTwice).to.be.true;
+		expect(response.setHeader.getCall(0).calledWith('header1', 'true')).to.be.true;
+		expect(response.setHeader.getCall(1).calledWith('header2', 'false')).to.be.true;
+		expect(pipe.calledWith(response)).to.be.true;
+	});
+
+	it(`should serve avatar file if found`, async () => {
+		const request = { url: '/jon' };
+
+		const file = { uploadedAt: new Date(0), type: 'image/png', size: 100 };
+		mocks.avatarFindOneByUserId.returns(file);
+
+		await userAvatarById(request, response, next);
+
+		expect(mocks.utils.setCacheAndDispositionHeaders.calledWith(request, response)).to.be.true;
+		expect(mocks.utils.serveAvatarFile.calledWith(file, request, response, next)).to.be.true;
+	});
+
+	it(`should write 304 to head if content is not modified`, async () => {
+		const request = { url: '/xyzabc', headers: {} };
+
+		mocks.utils.wasFallbackModified.returns(false);
+
+		await userAvatarById(request, response, next);
+
+		expect(mocks.utils.setCacheAndDispositionHeaders.calledWith(request, response)).to.be.true;
+		expect(response.writeHead.calledWith(304)).to.be.true;
+		expect(response.end.calledOnce).to.be.true;
+	});
+
+	it(`should write 404 if userId is not found`, async () => {
+		mocks.utils.wasFallbackModified.returns(true);
+		mocks.findOneById.returns(null);
+
+		const userId = 'awdasdaw';
+		const request = { url: `/${userId}`, headers: {} };
+
+		await userAvatarById(request, response, next);
+		expect(mocks.utils.setCacheAndDispositionHeaders.calledWith(request, response)).to.be.true;
+
+		expect(response.writeHead.calledWith(404)).to.be.true;
+		expect(response.end.calledOnce).to.be.true;
+	});
+
+	it(`should fallback to SVG if no avatar found`, async () => {
+		const userId = '2apso9283';
+		const request = { url: `/${userId}`, headers: {} };
+
+		mocks.findOneById.returns({ username: 'jon' });
+		mocks.utils.wasFallbackModified.returns(true);
+
+		await userAvatarById(request, response, next);
+
+		expect(mocks.findOneById.calledWith(userId)).to.be.true;
+		expect(mocks.utils.setCacheAndDispositionHeaders.calledWith(request, response)).to.be.true;
+		expect(mocks.utils.serveSvgAvatarInRequestedFormat.calledWith({ nameOrUsername: 'jon', req: request, res: response })).to.be.true;
+	});
+
+	it(`should fallback to SVG with user name if UI_Use_Name_Avatar is true`, async () => {
+		const userId = '2apso9283';
+		const request = { url: `/${userId}`, headers: {} };
+
+		mocks.findOneById.returns({ username: 'jon', name: 'Doe' });
+		mocks.utils.wasFallbackModified.returns(true);
+		mocks.settingsGet.withArgs('UI_Use_Name_Avatar').returns(true);
+
+		await userAvatarById(request, response, next);
+
+		expect(mocks.utils.setCacheAndDispositionHeaders.calledWith(request, response)).to.be.true;
+		expect(mocks.utils.serveSvgAvatarInRequestedFormat.calledWith({ nameOrUsername: 'Doe', req: request, res: response })).to.be.true;
+	});
+});
+
+describe('#userAvatarByUsername()', () => {
+	const response = {
+		setHeader: sinon.spy(),
+		writeHead: sinon.spy(),
+		end: sinon.spy(),
+	};
+	const next = sinon.spy();
+
+	afterEach(() => {
+		mocks.settingsGet.reset();
+		mocks.avatarFindOneByName.reset();
+
+		response.setHeader.resetHistory();
+		response.writeHead.resetHistory();
+		response.end.resetHistory();
+		next.resetHistory();
+
+		Object.values(mocks.utils).forEach((mock) => ('reset' in mock ? mock.reset() : mock.resetHistory()));
+	});
+
+	it(`should do nothing if url is not in request object`, async () => {
+		await userAvatarByUsername({}, response, next);
+		expect(next.called).to.be.false;
+		expect(response.setHeader.called).to.be.false;
+		expect(response.writeHead.called).to.be.false;
+		expect(response.end.called).to.be.false;
+	});
+
+	it(`should write 404 if username is not provided`, async () => {
+		await userAvatarByUsername({ url: '/' }, response, next);
+		expect(next.called).to.be.false;
+		expect(response.setHeader.called).to.be.false;
+		expect(response.writeHead.calledWith(404)).to.be.true;
+		expect(response.end.calledOnce).to.be.true;
+	});
+
+	it(`should call external provider`, async () => {
+		const request = { url: '/jon' };
+
+		const pipe = sinon.spy();
+		const mockResponseHeaders = new Headers();
+		mockResponseHeaders.set('header1', 'true');
+		mockResponseHeaders.set('header2', 'false');
+
+		mocks.serverFetch.returns({
+			headers: mockResponseHeaders,
+			body: { pipe },
+		});
+
+		mocks.settingsGet.returns('test123/{username}');
+
+		await userAvatarByUsername(request, response, next);
+
+		expect(mocks.serverFetch.calledWith('test123/jon')).to.be.true;
+		expect(mocks.utils.setCacheAndDispositionHeaders.calledWith(request, response)).to.be.true;
+		expect(response.setHeader.calledTwice).to.be.true;
+		expect(response.setHeader.getCall(0).calledWith('header1', 'true')).to.be.true;
+		expect(response.setHeader.getCall(1).calledWith('header2', 'false')).to.be.true;
+		expect(pipe.calledWith(response)).to.be.true;
+	});
+
+	it(`should serve svg if requestUsername starts with @`, async () => {
+		const request = { url: '/@jon' };
+
+		await userAvatarByUsername(request, response, next);
+
+		expect(mocks.utils.setCacheAndDispositionHeaders.calledWith(request, response)).to.be.true;
+		expect(mocks.utils.serveSvgAvatarInRequestedFormat.calledWith({ nameOrUsername: 'jon', req: request, res: response })).to.be.true;
+	});
+
+	it(`should serve avatar file if found`, async () => {
+		const request = { url: '/jon' };
+
+		const file = { uploadedAt: new Date(0), type: 'image/png', size: 100 };
+		mocks.avatarFindOneByName.returns(file);
+
+		await userAvatarByUsername(request, response, next);
+
+		expect(mocks.utils.setCacheAndDispositionHeaders.calledWith(request, response)).to.be.true;
+		expect(mocks.utils.serveAvatarFile.calledWith(file, request, response, next)).to.be.true;
+	});
+
+	it(`should write 304 to head if content is not modified`, async () => {
+		const request = { url: '/jon', headers: {} };
+
+		mocks.utils.wasFallbackModified.returns(false);
+		await userAvatarByUsername(request, response, next);
+
+		expect(mocks.utils.setCacheAndDispositionHeaders.calledWith(request, response)).to.be.true;
+		expect(response.writeHead.calledWith(304)).to.be.true;
+		expect(response.end.calledOnce).to.be.true;
+	});
+
+	it(`should fallback to SVG if no avatar found`, async () => {
+		const request = { url: '/jon', headers: {} };
+
+		mocks.utils.wasFallbackModified.returns(true);
+		await userAvatarByUsername(request, response, next);
+
+		expect(mocks.utils.setCacheAndDispositionHeaders.calledWith(request, response)).to.be.true;
+		expect(mocks.utils.serveSvgAvatarInRequestedFormat.calledWith({ nameOrUsername: 'jon', req: request, res: response })).to.be.true;
+	});
+
+	it(`should fallback to SVG with user name if UI_Use_Name_Avatar is true`, async () => {
+		const request = { url: '/jon', headers: {} };
+
+		mocks.utils.wasFallbackModified.returns(true);
+		mocks.settingsGet.withArgs('UI_Use_Name_Avatar').returns(true);
+		mocks.findOneByUsernameIgnoringCase.returns({ name: 'Doe' });
+
+		await userAvatarByUsername(request, response, next);
+
+		expect(mocks.utils.setCacheAndDispositionHeaders.calledWith(request, response)).to.be.true;
+		expect(mocks.utils.serveSvgAvatarInRequestedFormat.calledWith({ nameOrUsername: 'Doe', req: request, res: response })).to.be.true;
+	});
+});
diff --git a/apps/meteor/server/routes/avatar/user.ts b/apps/meteor/server/routes/avatar/user.ts
new file mode 100644
index 000000000000..7b20287ddac3
--- /dev/null
+++ b/apps/meteor/server/routes/avatar/user.ts
@@ -0,0 +1,134 @@
+import type { IncomingMessage, ServerResponse } from 'http';
+
+import type { IUser } from '@rocket.chat/apps-engine/definition/users';
+import type { IIncomingMessage } from '@rocket.chat/core-typings';
+import { Avatars, Users } from '@rocket.chat/models';
+import { serverFetch as fetch } from '@rocket.chat/server-fetch';
+import type { NextFunction } from 'connect';
+
+import { serveSvgAvatarInRequestedFormat, wasFallbackModified, setCacheAndDispositionHeaders, serveAvatarFile } from './utils';
+import { settings } from '../../../app/settings/server';
+
+const handleExternalProvider = async (externalProviderUrl: string, username: string, res: ServerResponse): Promise<void> => {
+	const response = await fetch(externalProviderUrl.replace('{username}', username));
+	response.headers.forEach((value, key) => res.setHeader(key, value));
+	response.body.pipe(res);
+};
+// request /avatar/@name forces returning the svg
+export const userAvatarByUsername = async function (request: IncomingMessage, res: ServerResponse, next: NextFunction) {
+	const req = request as IIncomingMessage;
+
+	if (!req.url) {
+		return;
+	}
+
+	// replace removes the query string
+	const requestUsername = decodeURIComponent(req.url.slice(1).replace(/\?.*$/, ''));
+	if (!requestUsername) {
+		res.writeHead(404);
+		res.end();
+		return;
+	}
+
+	setCacheAndDispositionHeaders(req, res);
+
+	const externalProviderUrl = settings.get<string>('Accounts_AvatarExternalProviderUrl');
+	if (externalProviderUrl) {
+		void handleExternalProvider(externalProviderUrl, requestUsername, res);
+		return;
+	}
+
+	// if request starts with @ always return the svg letters
+	if (requestUsername[0] === '@') {
+		serveSvgAvatarInRequestedFormat({ nameOrUsername: requestUsername.slice(1), req, res });
+		return;
+	}
+
+	const file = await Avatars.findOneByName(requestUsername);
+	if (file) {
+		void serveAvatarFile(file, req, res, next);
+		return;
+	}
+
+	// if still using "letters fallback"
+	if (!wasFallbackModified(req.headers['if-modified-since'])) {
+		res.writeHead(304);
+		res.end();
+		return;
+	}
+
+	// Use real name for SVG letters
+	if (settings.get('UI_Use_Name_Avatar')) {
+		const user = await Users.findOneByUsernameIgnoringCase(requestUsername, {
+			projection: {
+				name: 1,
+			},
+		});
+
+		if (user?.name) {
+			serveSvgAvatarInRequestedFormat({ nameOrUsername: user.name, req, res });
+			return;
+		}
+	}
+
+	serveSvgAvatarInRequestedFormat({ nameOrUsername: requestUsername, req, res });
+};
+
+export const userAvatarById = async function (request: IncomingMessage, res: ServerResponse, next: NextFunction) {
+	const req = request as IIncomingMessage;
+
+	if (!req.url) {
+		return;
+	}
+
+	// replace removes the query string
+	const requestUserId = decodeURIComponent(req.url.slice(1).replace(/\?.*$/, ''));
+	if (!requestUserId) {
+		res.writeHead(404);
+		res.end();
+		return;
+	}
+
+	setCacheAndDispositionHeaders(req, res);
+
+	const externalProviderUrl = settings.get<string>('Accounts_AvatarExternalProviderUrl');
+	if (externalProviderUrl) {
+		const user = await Users.findOneById<Pick<IUser, 'username'>>(requestUserId, { projection: { username: 1 } });
+
+		if (!user?.username) {
+			res.writeHead(404);
+			res.end();
+			return;
+		}
+
+		void handleExternalProvider(externalProviderUrl, user.username, res);
+		return;
+	}
+
+	const file = await Avatars.findOneByUserId(requestUserId);
+	if (file) {
+		void serveAvatarFile(file, req, res, next);
+		return;
+	}
+
+	if (!wasFallbackModified(req.headers['if-modified-since'])) {
+		res.writeHead(304);
+		res.end();
+		return;
+	}
+
+	const user = await Users.findOneById<Pick<IUser, 'name' | 'username'>>(requestUserId, { projection: { username: 1, name: 1 } });
+	if (!user?.username) {
+		res.writeHead(404);
+		res.end();
+		return;
+	}
+
+	// Use real name for SVG letters
+	if (settings.get('UI_Use_Name_Avatar') && user?.name) {
+		serveSvgAvatarInRequestedFormat({ nameOrUsername: user.name, req, res });
+		return;
+	}
+
+	serveSvgAvatarInRequestedFormat({ nameOrUsername: user.username, req, res });
+};
diff --git a/apps/meteor/server/routes/avatar/utils.spec.ts b/apps/meteor/server/routes/avatar/utils.spec.ts
new file mode 100644
index 000000000000..3822ac8caa90
--- /dev/null
+++ b/apps/meteor/server/routes/avatar/utils.spec.ts
@@ -0,0 +1,231 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import proxyquire from 'proxyquire';
+import sinon from 'sinon';
+
+class CookiesMock {
+	public get = (_key: any, value: any) => value;
+}
+
+const mocks = {
+	settingsGet: sinon.stub(),
+	findOneByIdAndLoginToken: sinon.stub(),
+	fileUploadGet: sinon.spy(),
+};
+
+const {
+	getAvatarSizeFromRequest,
+	MIN_SVG_AVATAR_SIZE,
+	MAX_SVG_AVATAR_SIZE,
+	renderSVGLetters,
+	setCacheAndDispositionHeaders,
+	userCanAccessAvatar,
+	wasFallbackModified,
+	serveSvgAvatarInRequestedFormat,
+	serveAvatarFile,
+} = proxyquire.noCallThru().load('./utils', {
+	'meteor/ostrio:cookies': {
+		Cookies: CookiesMock,
+	},
+	'../../../../app/utils/server/getURL': {
+		getURL: () => '',
+	},
+	'@rocket.chat/models': {
+		Users: {
+			findOneByIdAndLoginToken: mocks.findOneByIdAndLoginToken,
+		},
+	},
+	'../../../app/file-upload/server': {
+		FileUpload: {
+			get: mocks.fileUploadGet,
+		},
+	},
+	'../../../app/settings/server': {
+		settings: {
+			get: mocks.settingsGet,
+		},
+	},
+	'sharp': () => ({ toFormat: (format: any) => ({ pipe: (res: any) => res.write(format) }) }),
+});
+
+describe('#serveAvatarFile()', () => {
+	const file = { uploadedAt: new Date(0), type: 'image/png', size: 100 };
+	const response = {
+		setHeader: sinon.spy(),
+		writeHead: sinon.spy(),
+		end: sinon.spy(),
+	};
+	const next = sinon.spy();
+
+	afterEach(() => {
+		response.setHeader.resetHistory();
+		response.writeHead.resetHistory();
+		response.end.resetHistory();
+		next.resetHistory();
+	});
+
+	it(`should return code 304 if avatar was not modified`, () => {
+		serveAvatarFile(file, { headers: { 'if-modified-since': new Date(0).toUTCString() } }, response, next);
+		expect(response.setHeader.getCall(0).calledWith('Content-Security-Policy', "default-src 'none'")).to.be.true;
+		expect(response.setHeader.getCall(1).calledWith('Last-Modified', new Date(0).toUTCString())).to.be.true;
+		expect(response.writeHead.calledWith(304)).to.be.true;
+		expect(response.end.calledOnce).to.be.true;
+	});
+
+	it('should serve avatar', () => {
+		const request = { headers: { 'if-modified-since': new Date(200000).toUTCString() } };
+		serveAvatarFile(file, request, response, next);
+		expect(response.setHeader.getCall(0).calledWith('Content-Security-Policy', "default-src 'none'")).to.be.true;
+		expect(response.setHeader.getCall(1).calledWith('Last-Modified', new Date(0).toUTCString())).to.be.true;
+		expect(response.setHeader.getCall(2).calledWith('Content-Type', file.type)).to.be.true;
+		expect(response.setHeader.getCall(3).calledWith('Content-Length', file.size)).to.be.true;
+		expect(mocks.fileUploadGet.calledWith(file, request, response, next)).to.be.true;
+	});
+});
+
+describe('#serveSvgAvatarInRequestedFormat()', () => {
+	it('should serve SVG avatar in requested format', () => {
+		['png', 'jpg', 'jpeg'].forEach((format) => {
+			const response = {
+				setHeader: sinon.spy(),
+				write: sinon.spy(),
+				end: sinon.spy(),
+			};
+			serveSvgAvatarInRequestedFormat({ req: { query: { format, size: 100 } }, res: response, nameOrUsername: 'name' });
+
+			expect(response.setHeader.getCall(0).calledWith('Last-Modified', 'Thu, 01 Jan 2015 00:00:00 GMT')).to.be.true;
+			expect(response.setHeader.getCall(1).calledWith('Content-Type', `image/${format}`)).to.be.true;
+			expect(response.write.calledWith(format)).to.be.true;
+		});
+	});
+	it(`should serve avatar in SVG format if requested format is not png, jpg or jpeg`, () => {
+		const response = {
+			setHeader: sinon.spy(),
+			write: sinon.spy(),
+			end: sinon.spy(),
+		};
+		serveSvgAvatarInRequestedFormat({ req: { query: { format: 'anythingElse', size: 100 } }, res: response, nameOrUsername: 'name' });
+
+		expect(response.setHeader.getCall(0).calledWith('Last-Modified', 'Thu, 01 Jan 2015 00:00:00 GMT')).to.be.true;
+		expect(response.setHeader.getCall(1).calledWith('Content-Type', 'image/svg+xml')).to.be.true;
+		expect(response.write.called).to.be.true;
+		expect(response.end.calledOnce).to.be.true;
+	});
+	it(`should default size to 200 if not provided in query`, () => {
+		const response = {
+			setHeader: sinon.spy(),
+			write: sinon.spy(),
+			end: sinon.spy(),
+		};
+		serveSvgAvatarInRequestedFormat({ req: { query: {} }, res: response, nameOrUsername: 'name' });
+
+		expect(response.setHeader.getCall(0).calledWith('Last-Modified', 'Thu, 01 Jan 2015 00:00:00 GMT')).to.be.true;
+		expect(response.setHeader.getCall(1).calledWith('Content-Type', 'image/svg+xml')).to.be.true;
+		expect(response.write.called).to.be.true;
+		expect(response.write.getCall(0).args[0]).to.include('viewBox="0 0 200 200"');
+		expect(response.end.calledOnce).to.be.true;
+	});
+});
+
+describe('#getAvatarSizeFromRequest()', () => {
+	it('should return undefined if size is not provided', () => {
+		expect(getAvatarSizeFromRequest({ query: {} })).to.equal(undefined);
+	});
+	it('should return value passed in the request if it falls in the range limit', () => {
+		expect(getAvatarSizeFromRequest({ query: { size: 100 } })).to.equal(100);
+	});
+	it(`should return ${MIN_SVG_AVATAR_SIZE} if requested size is smaller than the limit`, () => {
+		expect(getAvatarSizeFromRequest({ query: { size: 2 } })).to.equal(16);
+	});
+	it(`should return ${MAX_SVG_AVATAR_SIZE} if requested size is bigger than the limit`, () => {
+		expect(getAvatarSizeFromRequest({ query: { size: 2000 } })).to.equal(1024);
+	});
+});
+
+describe('#wasFallbackModified()', () => {
+	it('should return true if reqModifiedHeader is different from FALLBACK_LAST_MODIFIED', () => {
+		expect(wasFallbackModified('')).to.equal(true);
+	});
+	it('should false if reqModifiedHeader is the same as FALLBACK_LAST_MODIFIED', () => {
+		expect(wasFallbackModified('Thu, 01 Jan 2015 00:00:00 GMT')).to.equal(false);
+	});
+});
+
+describe('#renderSvgLetters', () => {
+	it('should show capitalized initial letter in the svg', () => {
+		expect(renderSVGLetters('arthur', 16)).to.include('>\nA\n</text>');
+		expect(renderSVGLetters('Bob', 16)).to.include('>\nB\n</text>');
+		expect(renderSVGLetters('yan', 16)).to.include('>\nY\n</text>');
+	});
+	it('should render question mark with color #000', () => {
+		expect(renderSVGLetters('?', 16)).to.include('>\n?\n</text>').and.to.include('fill="#000"');
+	});
+	it('should include size in viewBox property', () => {
+		expect(renderSVGLetters('arthur', 16)).to.include('viewBox="0 0 16 16"');
+		expect(renderSVGLetters('Bob', 32)).to.include('viewBox="0 0 32 32"');
+		expect(renderSVGLetters('yan', 64)).to.include('viewBox="0 0 64 64"');
+	});
+});
+
+describe('#setCacheAndDispositionHeaders', () => {
+	it('should set the Cache-Control header based on the query cacheTime', () => {
+		const request = {
+			query: {
+				cacheTime: 100,
+			},
+		};
+
+		const response = {
+			setHeader: sinon.spy(),
+		};
+		setCacheAndDispositionHeaders(request as any, response as any);
+		expect(response.setHeader.calledWith('Cache-Control', 'public, max-age=100')).to.be.true;
+		expect(response.setHeader.calledWith('Content-Disposition', 'inline')).to.be.true;
+	});
+
+	it('should set the Cache-Control header based on the setting if the query cacheTime is not set', () => {
+		const request = {
+			query: {},
+		};
+
+		const response = {
+			setHeader: sinon.spy(),
+		};
+
+		mocks.settingsGet.returns(100);
+		setCacheAndDispositionHeaders(request as any, response as any);
+		expect(response.setHeader.calledWith('Cache-Control', 'public, max-age=100')).to.be.true;
+		expect(response.setHeader.calledWith('Content-Disposition', 'inline')).to.be.true;
+	});
+});
+
+describe('#userCanAccessAvatar()', async () => {
+	beforeEach(() => {
+		mocks.findOneByIdAndLoginToken.reset();
+		mocks.settingsGet.reset();
+	});
+	it('should return true if setting is set to not block avatars', async () => {
+		await expect(userCanAccessAvatar({})).to.eventually.equal(true);
+	});
+	it('should return true if user is authenticated', async () => {
+		mocks.settingsGet.returns(true);
+		mocks.findOneByIdAndLoginToken.returns({ _id: 'id' });
+
+		await expect(userCanAccessAvatar({ query: { rc_token: 'token', rc_uid: 'id' } })).to.eventually.equal(true);
+		await expect(userCanAccessAvatar({ headers: { cookie: 'rc_token=token; rc_uid=id' } })).to.eventually.equal(true);
+	});
+	it('should return false and warn if user is unauthenticated', async () => {
+		console.warn = sinon.spy();
+		mocks.findOneByIdAndLoginToken.returns(undefined);
+		mocks.settingsGet.returns(true);
+
+		await expect(userCanAccessAvatar({})).to.eventually.equal(false);
+		expect((console.warn as sinon.SinonSpy).calledWith(sinon.match('unauthenticated'))).to.be.true;
+
+		await expect(userCanAccessAvatar({ headers: { cookie: 'rc_token=token; rc_uid=id' } })).to.eventually.equal(false);
+		expect((console.warn as sinon.SinonSpy).calledWith(sinon.match('unauthenticated'))).to.be.true;
+
+		await expect(userCanAccessAvatar({ query: { rc_token: 'token', rc_uid: 'id' } })).to.eventually.equal(false);
+		expect((console.warn as sinon.SinonSpy).calledWith(sinon.match('unauthenticated'))).to.be.true;
+	});
+});
diff --git a/apps/meteor/server/routes/avatar/utils.js b/apps/meteor/server/routes/avatar/utils.ts
similarity index 56%
rename from apps/meteor/server/routes/avatar/utils.js
rename to apps/meteor/server/routes/avatar/utils.ts
index 50376bf5f7e9..892bd959558d 100644
--- a/apps/meteor/server/routes/avatar/utils.js
+++ b/apps/meteor/server/routes/avatar/utils.ts
@@ -1,9 +1,14 @@
+import type { ServerResponse } from 'http';
+
 import { hashLoginToken } from '@rocket.chat/account-utils';
+import type { IIncomingMessage, IUpload } from '@rocket.chat/core-typings';
 import { Users } from '@rocket.chat/models';
+import type { NextFunction } from 'connect';
 import { Cookies } from 'meteor/ostrio:cookies';
 import sharp from 'sharp';
 import { throttle } from 'underscore';
 
+import { FileUpload } from '../../../app/file-upload/server';
 import { settings } from '../../../app/settings/server';
 import { getAvatarColor } from '../../../app/utils/lib/getAvatarColor';
 
@@ -11,9 +16,57 @@ const FALLBACK_LAST_MODIFIED = 'Thu, 01 Jan 2015 00:00:00 GMT';
 
 const cookie = new Cookies();
 
-export const serveAvatar = (avatar, format, res) => {
+export const MAX_SVG_AVATAR_SIZE = 1024;
+export const MIN_SVG_AVATAR_SIZE = 16;
+
+export const serveAvatarFile = (file: IUpload, req: IIncomingMessage, res: ServerResponse, next: NextFunction) => {
+	res.setHeader('Content-Security-Policy', "default-src 'none'");
+	const reqModifiedHeader = req.headers['if-modified-since'];
+
+	if (reqModifiedHeader && reqModifiedHeader === file.uploadedAt?.toUTCString()) {
+		res.setHeader('Last-Modified', reqModifiedHeader);
+		res.writeHead(304);
+		res.end();
+		return;
+	}
+
+	if (file.uploadedAt) {
+		res.setHeader('Last-Modified', file.uploadedAt?.toUTCString());
+	}
+
+	if (file.type) {
+		res.setHeader('Content-Type', file.type);
+	}
+
+	if (file.size) {
+		res.setHeader('Content-Length', file.size);
+	}
+
+	return FileUpload.get(file, req, res, next);
+};
+
+export const getAvatarSizeFromRequest = (req: IIncomingMessage) => {
+	const requestSize = req.query.size && parseInt(req.query.size);
+	if (!requestSize) {
+		return;
+	}
+	return Math.min(Math.max(requestSize, MIN_SVG_AVATAR_SIZE), MAX_SVG_AVATAR_SIZE);
+};
+export const serveSvgAvatarInRequestedFormat = ({
+	nameOrUsername,
+	req,
+	res,
+}: {
+	nameOrUsername: string;
+	req: IIncomingMessage;
+	res: ServerResponse;
+}) => {
+	const size = getAvatarSizeFromRequest(req);
+	const avatar = renderSVGLetters(nameOrUsername, size);
 	res.setHeader('Last-Modified', FALLBACK_LAST_MODIFIED);
 
+	const { format } = req.query;
+
 	if (['png', 'jpg', 'jpeg'].includes(format)) {
 		res.setHeader('Content-Type', `image/${format}`);
 		sharp(Buffer.from(avatar)).toFormat(format).pipe(res);
@@ -25,14 +78,14 @@ export const serveAvatar = (avatar, format, res) => {
 	res.end();
 };
 
-export const wasFallbackModified = (reqModifiedHeader) => {
+export const wasFallbackModified = (reqModifiedHeader?: string) => {
 	if (!reqModifiedHeader || reqModifiedHeader !== FALLBACK_LAST_MODIFIED) {
 		return true;
 	}
 	return false;
 };
 
-async function isUserAuthenticated({ headers, query }) {
+async function isUserAuthenticated({ headers, query }: Pick<IIncomingMessage, 'headers' | 'query'>) {
 	let { rc_uid, rc_token } = query;
 
 	if (!rc_uid && headers.cookie) {
@@ -53,7 +106,7 @@ const warnUnauthenticatedAccess = throttle(() => {
 	console.warn('The server detected an unauthenticated access to an user avatar. This type of request will soon be blocked by default.');
 }, 60000 * 30); // 30 minutes
 
-export async function userCanAccessAvatar({ headers = {}, query = {} }) {
+export async function userCanAccessAvatar({ headers = {}, query = {} }: IIncomingMessage) {
 	if (!settings.get('Accounts_AvatarBlockUnauthenticatedAccess')) {
 		return true;
 	}
@@ -66,13 +119,13 @@ export async function userCanAccessAvatar({ headers = {}, query = {} }) {
 	return isAuthenticated;
 }
 
-const getFirstLetter = (name) =>
+const getFirstLetter = (name: string) =>
 	name
 		.replace(/[^A-Za-z0-9]/g, '')
 		.substr(0, 1)
 		.toUpperCase();
 
-export const renderSVGLetters = (username, viewSize = 200) => {
+export const renderSVGLetters = (username: string, viewSize = 200) => {
 	let color = '';
 	let initials = '';
 
@@ -89,9 +142,9 @@ export const renderSVGLetters = (username, viewSize = 200) => {
 	return `<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 ${viewSize} ${viewSize}\">\n<rect width=\"100%\" height=\"100%\" fill=\"${color}\"/>\n<text x=\"50%\" y=\"50%\" dy=\"0.36em\" text-anchor=\"middle\" pointer-events=\"none\" fill=\"#ffffff\" font-family=\"'Helvetica', 'Arial', 'Lucida Grande', 'sans-serif'\" font-size="${fontSize}">\n${initials}\n</text>\n</svg>`;
 };
 
-const getCacheTime = (cacheTime) => cacheTime || settings.get('Accounts_AvatarCacheTime');
+const getCacheTime = (cacheTime: number) => cacheTime || settings.get('Accounts_AvatarCacheTime');
 
-export function setCacheAndDispositionHeaders(req, res) {
+export function setCacheAndDispositionHeaders(req: IIncomingMessage, res: ServerResponse) {
 	const cacheTime = getCacheTime(req.query.cacheTime);
 	res.setHeader('Cache-Control', `public, max-age=${cacheTime}`);
 	res.setHeader('Content-Disposition', 'inline');
diff --git a/apps/meteor/server/services/authorization/canAccessRoomLivechat.ts b/apps/meteor/server/services/authorization/canAccessRoomLivechat.ts
index d326ddbea0b4..9a3d7d9be9f8 100644
--- a/apps/meteor/server/services/authorization/canAccessRoomLivechat.ts
+++ b/apps/meteor/server/services/authorization/canAccessRoomLivechat.ts
@@ -1,9 +1,9 @@
 import type { IAuthorizationLivechat, RoomAccessValidator } from '@rocket.chat/core-services';
-import { proxifyWithWait } from '@rocket.chat/core-services';
+import { proxify } from '@rocket.chat/core-services';
 import type { IOmnichannelRoom } from '@rocket.chat/core-typings';
 import { Rooms } from '@rocket.chat/models';
 
-const AuthorizationLivechat = proxifyWithWait<IAuthorizationLivechat>('authorization-livechat');
+const AuthorizationLivechat = proxify<IAuthorizationLivechat>('authorization-livechat');
 
 export const canAccessRoomLivechat: RoomAccessValidator = async (room, user, extraData): Promise<boolean> => {
 	// If we received a partial room and its type is not `l` or `v`, skip all checks.
diff --git a/apps/meteor/server/services/authorization/canAccessRoomVoip.ts b/apps/meteor/server/services/authorization/canAccessRoomVoip.ts
index 81c9a5702f78..9720910b96a6 100644
--- a/apps/meteor/server/services/authorization/canAccessRoomVoip.ts
+++ b/apps/meteor/server/services/authorization/canAccessRoomVoip.ts
@@ -1,8 +1,8 @@
 import type { IAuthorizationVoip, RoomAccessValidator } from '@rocket.chat/core-services';
-import { proxifyWithWait } from '@rocket.chat/core-services';
+import { proxify } from '@rocket.chat/core-services';
 import { Rooms } from '@rocket.chat/models';
 
-const AuthorizationVoip = proxifyWithWait<IAuthorizationVoip>('authorization-livechat');
+const AuthorizationVoip = proxify<IAuthorizationVoip>('authorization-livechat');
 
 export const canAccessRoomVoip: RoomAccessValidator = async (room, user, extraData): Promise<boolean> => {
 	// room can be sent as `null` but in that case a `rid` is also sent on extraData
diff --git a/apps/meteor/server/services/authorization/service.ts b/apps/meteor/server/services/authorization/service.ts
index 075fe569bfff..5e67cf87b372 100644
--- a/apps/meteor/server/services/authorization/service.ts
+++ b/apps/meteor/server/services/authorization/service.ts
@@ -4,8 +4,8 @@ import type { IUser, IRole, IRoom, ISubscription, IRocketChatRecord } from '@roc
 import { Subscriptions, Rooms, Users, Roles, Permissions } from '@rocket.chat/models';
 import mem from 'mem';
 
-import { AuthorizationUtils } from '../../../app/authorization/lib/AuthorizationUtils';
 import { canAccessRoom } from './canAccessRoom';
+import { AuthorizationUtils } from '../../../app/authorization/lib/AuthorizationUtils';
 
 import './canAccessRoomLivechat';
 
diff --git a/apps/meteor/server/services/federation/infrastructure/matrix/Bridge.ts b/apps/meteor/server/services/federation/infrastructure/matrix/Bridge.ts
index bd30f23ed095..d89da959e5a3 100644
--- a/apps/meteor/server/services/federation/infrastructure/matrix/Bridge.ts
+++ b/apps/meteor/server/services/federation/infrastructure/matrix/Bridge.ts
@@ -33,7 +33,10 @@ export class MatrixBridge implements IFederationBridge {
 
 	protected isUpdatingBridgeStatus = false;
 
-	constructor(protected internalSettings: RocketChatSettingsAdapter, protected eventHandler: (event: AbstractMatrixEvent) => void) {} // eslint-disable-line no-empty-function
+	constructor(
+		protected internalSettings: RocketChatSettingsAdapter,
+		protected eventHandler: (event: AbstractMatrixEvent) => void,
+	) {} // eslint-disable-line no-empty-function
 
 	public async start(): Promise<void> {
 		if (this.isUpdatingBridgeStatus) {
@@ -102,7 +105,7 @@ export class MatrixBridge implements IFederationBridge {
 				...(externalInformation.avatar_url
 					? {
 							avatarUrl: externalInformation.avatar_url,
-					  }
+						}
 					: {}),
 			};
 		} catch (err) {
@@ -777,7 +780,7 @@ export class MatrixBridge implements IFederationBridge {
 								const event = request.getData() as unknown as AbstractMatrixEvent;
 								this.eventHandler(event);
 							},
-					  }
+						}
 					: {}),
 			},
 		});
diff --git a/apps/meteor/server/services/federation/infrastructure/matrix/converters/room/MessageReceiver.ts b/apps/meteor/server/services/federation/infrastructure/matrix/converters/room/MessageReceiver.ts
index f67870834b4b..033acb67fdf1 100644
--- a/apps/meteor/server/services/federation/infrastructure/matrix/converters/room/MessageReceiver.ts
+++ b/apps/meteor/server/services/federation/infrastructure/matrix/converters/room/MessageReceiver.ts
@@ -1,8 +1,8 @@
 import emojione from 'emojione';
 
+import { convertExternalRoomIdToInternalRoomIdFormat } from './RoomReceiver';
 import { FederationMessageReactionEventDto } from '../../../../application/room/input/MessageReceiverDto';
 import type { MatrixEventMessageReact } from '../../definitions/events/MessageReacted';
-import { convertExternalRoomIdToInternalRoomIdFormat } from './RoomReceiver';
 
 const convertEmojisMatrixFormatToRCFormat = (emoji: string): string => emojione.toShort(emoji);
 export const convertEmojisFromRCFormatToMatrixFormat = (emoji: string): string => emojione.shortnameToUnicode(emoji);
diff --git a/apps/meteor/server/services/federation/infrastructure/matrix/converters/room/RoomReceiver.ts b/apps/meteor/server/services/federation/infrastructure/matrix/converters/room/RoomReceiver.ts
index 38423ec3ed4e..1a5e444c6e90 100644
--- a/apps/meteor/server/services/federation/infrastructure/matrix/converters/room/RoomReceiver.ts
+++ b/apps/meteor/server/services/federation/infrastructure/matrix/converters/room/RoomReceiver.ts
@@ -181,11 +181,11 @@ const createExternalRolesChangesActions = (
 			? [
 					{ action: 'add', role: ROCKET_CHAT_FEDERATION_ROLES.OWNER },
 					{ action: 'remove', role: ROCKET_CHAT_FEDERATION_ROLES.MODERATOR },
-			  ]
+				]
 			: [
 					{ action: 'add', role: ROCKET_CHAT_FEDERATION_ROLES.MODERATOR },
 					{ action: 'remove', role: ROCKET_CHAT_FEDERATION_ROLES.OWNER },
-			  ];
+				];
 
 		return externalRolesChangesByUser;
 	}, {} as IExternalRolesChangesToApplyInputDto);
@@ -291,10 +291,10 @@ export class MatrixRoomReceiverConverter {
 						replyToEventId: !externalEvent.content?.['m.relates_to']?.is_falling_back
 							? externalEvent.content?.['m.relates_to']?.['m.in_reply_to']?.event_id
 							: undefined,
-				  }
+					}
 				: {
 						replyToEventId: externalEvent.content?.['m.relates_to']?.['m.in_reply_to']?.event_id,
-				  }),
+					}),
 		});
 	}
 
@@ -343,10 +343,10 @@ export class MatrixRoomReceiverConverter {
 						replyToEventId: !externalEvent.content?.['m.relates_to']?.is_falling_back
 							? externalEvent.content?.['m.relates_to']?.['m.in_reply_to']?.event_id
 							: undefined,
-				  }
+					}
 				: {
 						replyToEventId: externalEvent.content?.['m.relates_to']?.['m.in_reply_to']?.event_id,
-				  }),
+					}),
 		});
 	}
 
diff --git a/apps/meteor/server/services/federation/infrastructure/matrix/handlers/Message.ts b/apps/meteor/server/services/federation/infrastructure/matrix/handlers/Message.ts
index ff3c69323955..7249c3368914 100644
--- a/apps/meteor/server/services/federation/infrastructure/matrix/handlers/Message.ts
+++ b/apps/meteor/server/services/federation/infrastructure/matrix/handlers/Message.ts
@@ -1,8 +1,8 @@
+import { MatrixBaseEventHandler } from './BaseEvent';
 import type { FederationMessageServiceReceiver } from '../../../application/room/message/receiver/MessageServiceReceiver';
 import { MatrixMessageReceiverConverter } from '../converters/room/MessageReceiver';
 import { MatrixEventType } from '../definitions/MatrixEventType';
 import type { MatrixEventMessageReact } from '../definitions/events/MessageReacted';
-import { MatrixBaseEventHandler } from './BaseEvent';
 
 export class MatrixMessageReactedHandler extends MatrixBaseEventHandler {
 	public eventType: string = MatrixEventType.MESSAGE_REACTED;
diff --git a/apps/meteor/server/services/federation/infrastructure/matrix/handlers/Room.ts b/apps/meteor/server/services/federation/infrastructure/matrix/handlers/Room.ts
index 94a4efa4caeb..325488af971b 100644
--- a/apps/meteor/server/services/federation/infrastructure/matrix/handlers/Room.ts
+++ b/apps/meteor/server/services/federation/infrastructure/matrix/handlers/Room.ts
@@ -1,3 +1,4 @@
+import { MatrixBaseEventHandler } from './BaseEvent';
 import type { FederationRoomServiceReceiver } from '../../../application/room/receiver/RoomServiceReceiver';
 import type { RocketChatSettingsAdapter } from '../../rocket-chat/adapters/Settings';
 import { MatrixRoomReceiverConverter } from '../converters/room/RoomReceiver';
@@ -11,7 +12,6 @@ import { MatrixEnumRelatesToRelType, MatrixEnumSendMessageType } from '../defini
 import type { MatrixEventRoomNameChanged } from '../definitions/events/RoomNameChanged';
 import type { MatrixEventRoomRoomPowerLevelsChanged } from '../definitions/events/RoomPowerLevelsChanged';
 import type { MatrixEventRoomTopicChanged } from '../definitions/events/RoomTopicChanged';
-import { MatrixBaseEventHandler } from './BaseEvent';
 
 export class MatrixRoomCreatedHandler extends MatrixBaseEventHandler {
 	public eventType: string = MatrixEventType.ROOM_CREATED;
@@ -28,7 +28,10 @@ export class MatrixRoomCreatedHandler extends MatrixBaseEventHandler {
 export class MatrixRoomMembershipChangedHandler extends MatrixBaseEventHandler {
 	public eventType: string = MatrixEventType.ROOM_MEMBERSHIP_CHANGED;
 
-	constructor(private roomService: FederationRoomServiceReceiver, private rocketSettingsAdapter: RocketChatSettingsAdapter) {
+	constructor(
+		private roomService: FederationRoomServiceReceiver,
+		private rocketSettingsAdapter: RocketChatSettingsAdapter,
+	) {
 		super();
 	}
 
diff --git a/apps/meteor/server/services/federation/infrastructure/matrix/handlers/User.ts b/apps/meteor/server/services/federation/infrastructure/matrix/handlers/User.ts
index 3d2aa82414e0..19e955b6f02f 100644
--- a/apps/meteor/server/services/federation/infrastructure/matrix/handlers/User.ts
+++ b/apps/meteor/server/services/federation/infrastructure/matrix/handlers/User.ts
@@ -1,8 +1,8 @@
+import { MatrixBaseEventHandler } from './BaseEvent';
 import type { FederationUserServiceReceiver } from '../../../application/user/receiver/UserServiceReceiver';
 import { MatrixUserReceiverConverter } from '../converters/user/UserReceiver';
 import { MatrixEventType } from '../definitions/MatrixEventType';
 import type { MatrixEventUserTypingStatusChanged } from '../definitions/events/UserTypingStatusChanged';
-import { MatrixBaseEventHandler } from './BaseEvent';
 
 export class MatrixUserTypingStatusChangedHandler extends MatrixBaseEventHandler {
 	public eventType: string = MatrixEventType.USER_TYPING_STATUS_CHANGED;
diff --git a/apps/meteor/server/services/federation/infrastructure/matrix/handlers/index.ts b/apps/meteor/server/services/federation/infrastructure/matrix/handlers/index.ts
index 47469b74320b..2da830c7e862 100644
--- a/apps/meteor/server/services/federation/infrastructure/matrix/handlers/index.ts
+++ b/apps/meteor/server/services/federation/infrastructure/matrix/handlers/index.ts
@@ -1,5 +1,5 @@
-import type { AbstractMatrixEvent } from '../definitions/AbstractMatrixEvent';
 import type { MatrixBaseEventHandler } from './BaseEvent';
+import type { AbstractMatrixEvent } from '../definitions/AbstractMatrixEvent';
 
 export class MatrixEventsHandler {
 	// eslint-disable-next-line no-empty-function
diff --git a/apps/meteor/server/services/federation/infrastructure/rocket-chat/adapters/Message.ts b/apps/meteor/server/services/federation/infrastructure/rocket-chat/adapters/Message.ts
index 461aaae379fe..35a5320810cf 100644
--- a/apps/meteor/server/services/federation/infrastructure/rocket-chat/adapters/Message.ts
+++ b/apps/meteor/server/services/federation/infrastructure/rocket-chat/adapters/Message.ts
@@ -2,6 +2,7 @@ import type { IMessage } from '@rocket.chat/core-typings';
 import { isQuoteAttachment } from '@rocket.chat/core-typings';
 import { Messages } from '@rocket.chat/models';
 
+import { escapeExternalFederationEventId } from './federation-id-escape-helper';
 import { deleteMessage } from '../../../../../../app/lib/server/functions/deleteMessage';
 import { sendMessage } from '../../../../../../app/lib/server/functions/sendMessage';
 import { updateMessage } from '../../../../../../app/lib/server/functions/updateMessage';
@@ -11,7 +12,6 @@ import { roomCoordinator } from '../../../../../lib/rooms/roomCoordinator';
 import type { FederatedRoom } from '../../../domain/FederatedRoom';
 import type { FederatedUser } from '../../../domain/FederatedUser';
 import { toInternalMessageFormat, toInternalQuoteMessageFormat } from '../converters/to-external-parser-formatter';
-import { escapeExternalFederationEventId } from './federation-id-escape-helper';
 
 const DEFAULT_EMOJI_TO_REACT_WHEN_RECEIVED_EMOJI_DOES_NOT_EXIST = ':grey_question:';
 
diff --git a/apps/meteor/server/services/federation/infrastructure/rocket-chat/adapters/Room.ts b/apps/meteor/server/services/federation/infrastructure/rocket-chat/adapters/Room.ts
index 9deabb53006e..7a4d3c406db2 100644
--- a/apps/meteor/server/services/federation/infrastructure/rocket-chat/adapters/Room.ts
+++ b/apps/meteor/server/services/federation/infrastructure/rocket-chat/adapters/Room.ts
@@ -3,6 +3,7 @@ import type { IDirectMessageRoom, IRoom, IUser } from '@rocket.chat/core-typings
 import { isDirectMessageRoom } from '@rocket.chat/core-typings';
 import { Rooms, Subscriptions, MatrixBridgedRoom, Users } from '@rocket.chat/models';
 
+import { getFederatedUserByInternalUsername } from './User';
 import { saveRoomTopic } from '../../../../../../app/channel-settings/server';
 import { addUserToRoom } from '../../../../../../app/lib/server/functions/addUserToRoom';
 import { createRoom } from '../../../../../../app/lib/server/functions/createRoom';
@@ -20,7 +21,6 @@ import { DirectMessageFederatedRoom, FederatedRoom } from '../../../domain/Feder
 import type { FederatedUser } from '../../../domain/FederatedUser';
 import { extractServerNameFromExternalIdentifier } from '../../matrix/converters/room/RoomReceiver';
 import type { ROCKET_CHAT_FEDERATION_ROLES } from '../definitions/FederatedRoomInternalRoles';
-import { getFederatedUserByInternalUsername } from './User';
 
 type WithRequiredProperty<Type, Key extends keyof Type> = Type & {
 	[Property in Key]-?: Type[Property];
diff --git a/apps/meteor/server/services/federation/infrastructure/rocket-chat/adapters/Settings.ts b/apps/meteor/server/services/federation/infrastructure/rocket-chat/adapters/Settings.ts
index 861137f15e47..443dfe883a4f 100644
--- a/apps/meteor/server/services/federation/infrastructure/rocket-chat/adapters/Settings.ts
+++ b/apps/meteor/server/services/federation/infrastructure/rocket-chat/adapters/Settings.ts
@@ -56,6 +56,7 @@ export class RocketChatSettingsAdapter {
 	}
 
 	public async disableFederation(): Promise<void> {
+		// TODO: audit
 		(await Settings.updateValueById('Federation_Matrix_enabled', false)).modifiedCount &&
 			void notifyOnSettingChangedById('Federation_Matrix_enabled');
 	}
@@ -73,7 +74,8 @@ export class RocketChatSettingsAdapter {
 	}
 
 	public async setConfigurationStatus(status: 'Valid' | 'Invalid'): Promise<void> {
-		const { modifiedCount } = await Settings.updateOne({ _id: 'Federation_Matrix_configuration_status' }, { $set: { value: status } });
+		// TODO: audit
+		const { modifiedCount } = await Settings.updateValueById('Federation_Matrix_configuration_status', status);
 		if (modifiedCount) {
 			void notifyOnSettingChangedById('Federation_Matrix_configuration_status');
 		}
diff --git a/apps/meteor/server/services/federation/infrastructure/rocket-chat/slash-commands/index.ts b/apps/meteor/server/services/federation/infrastructure/rocket-chat/slash-commands/index.ts
index 5389cf3cf4d9..102f3dce342d 100644
--- a/apps/meteor/server/services/federation/infrastructure/rocket-chat/slash-commands/index.ts
+++ b/apps/meteor/server/services/federation/infrastructure/rocket-chat/slash-commands/index.ts
@@ -1,8 +1,8 @@
 import { Federation } from '@rocket.chat/core-services';
 import type { SlashCommandCallbackParams } from '@rocket.chat/core-typings';
 
-import { slashCommands } from '../../../../../../app/utils/server/slashCommand';
 import { executeSlashCommand } from './action';
+import { slashCommands } from '../../../../../../app/utils/server/slashCommand';
 
 const FEDERATION_COMMANDS: Record<string, (currentUserId: string, roomId: string, invitee: string) => Promise<void>> = {
 	dm: async (currentUserId: string, roomId: string, invitee: string) =>
diff --git a/apps/meteor/server/services/import/service.ts b/apps/meteor/server/services/import/service.ts
index 3b6986f7ef50..7ea51fb4506b 100644
--- a/apps/meteor/server/services/import/service.ts
+++ b/apps/meteor/server/services/import/service.ts
@@ -55,6 +55,7 @@ export class ImportService extends ServiceClassInternal implements IImportServic
 			case 'importer_preparing_users':
 			case 'importer_preparing_channels':
 			case 'importer_preparing_messages':
+			case 'importer_preparing_contacts':
 				return 'loading';
 			case 'importer_user_selection':
 				return 'ready';
@@ -62,6 +63,7 @@ export class ImportService extends ServiceClassInternal implements IImportServic
 			case 'importer_importing_users':
 			case 'importer_importing_channels':
 			case 'importer_importing_messages':
+			case 'importer_importing_contacts':
 			case 'importer_importing_files':
 			case 'importer_finishing':
 				return 'importing';
diff --git a/apps/meteor/server/services/messages/hooks/BeforeFederationActions.ts b/apps/meteor/server/services/messages/hooks/BeforeFederationActions.ts
index 19f42626c216..b28485889539 100644
--- a/apps/meteor/server/services/messages/hooks/BeforeFederationActions.ts
+++ b/apps/meteor/server/services/messages/hooks/BeforeFederationActions.ts
@@ -1,5 +1,5 @@
-import type { AtLeast } from '@rocket.chat/core-typings';
-import { type IMessage, type IRoom, isMessageFromMatrixFederation, isRoomFederated } from '@rocket.chat/core-typings';
+import { isMessageFromMatrixFederation, isRoomFederated } from '@rocket.chat/core-typings';
+import type { AtLeast, IMessage, IRoom } from '@rocket.chat/core-typings';
 
 import { isFederationEnabled, isFederationReady } from '../../federation/utils';
 
diff --git a/apps/meteor/server/services/messages/hooks/BeforeSaveCheckMAC.ts b/apps/meteor/server/services/messages/hooks/BeforeSaveCheckMAC.ts
index 6ba276971e6b..bf97252b1b96 100644
--- a/apps/meteor/server/services/messages/hooks/BeforeSaveCheckMAC.ts
+++ b/apps/meteor/server/services/messages/hooks/BeforeSaveCheckMAC.ts
@@ -1,6 +1,6 @@
 import { MeteorError, Omnichannel } from '@rocket.chat/core-services';
-import type { IRoom } from '@rocket.chat/core-typings';
-import { isOmnichannelRoom, type IMessage } from '@rocket.chat/core-typings';
+import { isOmnichannelRoom } from '@rocket.chat/core-typings';
+import type { IRoom, IMessage } from '@rocket.chat/core-typings';
 
 export class BeforeSaveCheckMAC {
 	async isWithinLimits({ message, room }: { message: IMessage; room: IRoom }): Promise<void> {
diff --git a/apps/meteor/server/services/meteor/service.ts b/apps/meteor/server/services/meteor/service.ts
index 075807ac31da..9cdb01169f79 100644
--- a/apps/meteor/server/services/meteor/service.ts
+++ b/apps/meteor/server/services/meteor/service.ts
@@ -1,3 +1,4 @@
+/* eslint-disable react-hooks/rules-of-hooks */
 import { api, ServiceClassInternal } from '@rocket.chat/core-services';
 import type { AutoUpdateRecord, IMeteor } from '@rocket.chat/core-services';
 import type { ILivechatAgent, LoginServiceConfiguration, UserStatus } from '@rocket.chat/core-typings';
diff --git a/apps/meteor/server/services/nps/service.ts b/apps/meteor/server/services/nps/service.ts
index be5b44582a5a..68d94a821997 100644
--- a/apps/meteor/server/services/nps/service.ts
+++ b/apps/meteor/server/services/nps/service.ts
@@ -6,9 +6,9 @@ import type { INpsVote, INps } from '@rocket.chat/core-typings';
 import { NPSStatus, INpsVoteStatus } from '@rocket.chat/core-typings';
 import { Nps, NpsVote, Settings } from '@rocket.chat/models';
 
-import { SystemLogger } from '../../lib/logger/system';
 import { getBannerForAdmins, notifyAdmins } from './notification';
 import { sendNpsResults } from './sendNpsResults';
+import { SystemLogger } from '../../lib/logger/system';
 
 export class NPSService extends ServiceClassInternal implements INPSService {
 	protected name = 'nps';
@@ -60,14 +60,14 @@ export class NPSService extends ServiceClassInternal implements INPSService {
 			return;
 		}
 
-		const total = await NpsVote.findByNpsId(nps._id).count();
+		const total = await NpsVote.countByNpsId(nps._id);
 
 		const votesToSend = await NpsVote.findNotSentByNpsId(nps._id).toArray();
 
 		// if there is nothing to sent, check if something gone wrong
 		if (votesToSend.length === 0) {
 			// check if still has votes left to send
-			const totalSent = await NpsVote.findByNpsIdAndStatus(nps._id, INpsVoteStatus.SENT).count();
+			const totalSent = await NpsVote.countByNpsIdAndStatus(nps._id, INpsVoteStatus.SENT);
 			if (totalSent === total) {
 				await Nps.updateStatusById(nps._id, NPSStatus.SENT);
 				return;
@@ -130,7 +130,7 @@ export class NPSService extends ServiceClassInternal implements INPSService {
 			await NpsVote.updateVotesToSent(voteIds);
 		}
 
-		const totalSent = await NpsVote.findByNpsIdAndStatus(nps._id, INpsVoteStatus.SENT).count();
+		const totalSent = await NpsVote.countByNpsIdAndStatus(nps._id, INpsVoteStatus.SENT);
 		if (totalSent < total) {
 			// send more in five minutes
 			setTimeout(() => NPS.sendResults(), 5 * 60 * 1000);
diff --git a/apps/meteor/server/services/omnichannel-analytics/service.ts b/apps/meteor/server/services/omnichannel-analytics/service.ts
index 8b27ed4b9f57..2739dee4ea67 100644
--- a/apps/meteor/server/services/omnichannel-analytics/service.ts
+++ b/apps/meteor/server/services/omnichannel-analytics/service.ts
@@ -9,14 +9,14 @@ import type {
 import { LivechatRooms } from '@rocket.chat/models';
 import moment from 'moment-timezone';
 
-import { getTimezone } from '../../../app/utils/server/lib/getTimezone';
-import { callbacks } from '../../../lib/callbacks';
-import { i18n } from '../../lib/i18n';
 import { AgentOverviewData } from './AgentData';
 import { ChartData } from './ChartData';
 import { OverviewData } from './OverviewData';
 import { serviceLogger } from './logger';
 import { dayIterator } from './utils';
+import { getTimezone } from '../../../app/utils/server/lib/getTimezone';
+import { callbacks } from '../../../lib/callbacks';
+import { i18n } from '../../lib/i18n';
 
 const HOURS_IN_DAY = 24;
 
diff --git a/apps/meteor/server/services/omnichannel-voip/service.ts b/apps/meteor/server/services/omnichannel-voip/service.ts
index 6d9f70044644..9c30202045cf 100644
--- a/apps/meteor/server/services/omnichannel-voip/service.ts
+++ b/apps/meteor/server/services/omnichannel-voip/service.ts
@@ -18,8 +18,8 @@ import type { PaginatedResult } from '@rocket.chat/rest-typings';
 import type { FindOptions } from 'mongodb';
 import _ from 'underscore';
 
-import { sendMessage } from '../../../app/lib/server/functions/sendMessage';
 import type { IOmniRoomClosingMessage } from './internalTypes';
+import { sendMessage } from '../../../app/lib/server/functions/sendMessage';
 
 export class OmnichannelVoipService extends ServiceClassInternal implements IOmnichannelVoipService {
 	protected name = 'omnichannel-voip';
diff --git a/apps/meteor/server/services/omnichannel/queue.ts b/apps/meteor/server/services/omnichannel/queue.ts
index 0fae14ce4a20..8db6eedd386b 100644
--- a/apps/meteor/server/services/omnichannel/queue.ts
+++ b/apps/meteor/server/services/omnichannel/queue.ts
@@ -2,11 +2,11 @@ import { type InquiryWithAgentInfo, type IOmnichannelQueue } from '@rocket.chat/
 import { License } from '@rocket.chat/license';
 import { LivechatInquiry, LivechatRooms } from '@rocket.chat/models';
 
+import { queueLogger } from './logger';
 import { dispatchAgentDelegated } from '../../../app/livechat/server/lib/Helper';
 import { RoutingManager } from '../../../app/livechat/server/lib/RoutingManager';
 import { getInquirySortMechanismSetting } from '../../../app/livechat/server/lib/settings';
 import { settings } from '../../../app/settings/server';
-import { queueLogger } from './logger';
 
 const DEFAULT_RACE_TIMEOUT = 5000;
 
diff --git a/apps/meteor/server/services/omnichannel/service.ts b/apps/meteor/server/services/omnichannel/service.ts
index 34599cbc7a33..ccfe2026b2ba 100644
--- a/apps/meteor/server/services/omnichannel/service.ts
+++ b/apps/meteor/server/services/omnichannel/service.ts
@@ -4,10 +4,10 @@ import type { AtLeast, IOmnichannelQueue, IOmnichannelRoom } from '@rocket.chat/
 import { License } from '@rocket.chat/license';
 import moment from 'moment';
 
+import { OmnichannelQueue } from './queue';
 import { Livechat } from '../../../app/livechat/server/lib/LivechatTyped';
 import { RoutingManager } from '../../../app/livechat/server/lib/RoutingManager';
 import { settings } from '../../../app/settings/server';
-import { OmnichannelQueue } from './queue';
 
 export class OmnichannelService extends ServiceClassInternal implements IOmnichannelService {
 	protected name = 'omnichannel';
@@ -37,6 +37,10 @@ export class OmnichannelService extends ServiceClassInternal implements IOmnicha
 			void (enabled && RoutingManager.isMethodSet() ? this.queueWorker.shouldStart() : this.queueWorker.stop());
 		});
 
+		settings.watch<string>('Livechat_Routing_Method', async () => {
+			this.queueWorker.shouldStart();
+		});
+
 		License.onLimitReached('monthlyActiveContacts', async (): Promise<void> => {
 			this.queueWorker.isRunning() && (await this.queueWorker.stop());
 		});
@@ -52,10 +56,6 @@ export class OmnichannelService extends ServiceClassInternal implements IOmnicha
 		});
 	}
 
-	getQueueWorker(): IOmnichannelQueue {
-		return this.queueWorker;
-	}
-
 	async isWithinMACLimit(room: AtLeast<IOmnichannelRoom, 'v'>): Promise<boolean> {
 		const currentMonth = moment.utc().format('YYYY-MM');
 		return room.v?.activity?.includes(currentMonth) || !(await License.shouldPreventAction('monthlyActiveContacts'));
diff --git a/apps/meteor/server/services/room/service.ts b/apps/meteor/server/services/room/service.ts
index 5bbde4a2814e..8afc133f1cc5 100644
--- a/apps/meteor/server/services/room/service.ts
+++ b/apps/meteor/server/services/room/service.ts
@@ -3,6 +3,7 @@ import type { ICreateRoomParams, IRoomService } from '@rocket.chat/core-services
 import { type AtLeast, type IRoom, type IUser, isRoomWithJoinCode } from '@rocket.chat/core-typings';
 import { Rooms, Users } from '@rocket.chat/models';
 
+import { FederationActions } from './hooks/BeforeFederationActions';
 import { saveRoomTopic } from '../../../app/channel-settings/server/functions/saveRoomTopic';
 import { addUserToRoom } from '../../../app/lib/server/functions/addUserToRoom';
 import { createRoom } from '../../../app/lib/server/functions/createRoom'; // TODO remove this import
@@ -11,7 +12,6 @@ import { getValidRoomName } from '../../../app/utils/server/lib/getValidRoomName
 import { RoomMemberActions } from '../../../definition/IRoomTypeConfig';
 import { roomCoordinator } from '../../lib/rooms/roomCoordinator';
 import { createDirectMessage } from '../../methods/createDirectMessage';
-import { FederationActions } from './hooks/BeforeFederationActions';
 
 export class RoomService extends ServiceClassInternal implements IRoomService {
 	protected name = 'room';
diff --git a/apps/meteor/server/services/startup.ts b/apps/meteor/server/services/startup.ts
index 05a095279855..643f755e861b 100644
--- a/apps/meteor/server/services/startup.ts
+++ b/apps/meteor/server/services/startup.ts
@@ -16,10 +16,10 @@ import { LDAPService } from './ldap/service';
 import { MessageService } from './messages/service';
 import { MeteorService } from './meteor/service';
 import { NPSService } from './nps/service';
+import { OmnichannelService } from './omnichannel/service';
 import { OmnichannelAnalyticsService } from './omnichannel-analytics/service';
 import { OmnichannelIntegrationService } from './omnichannel-integrations/service';
 import { OmnichannelVoipService } from './omnichannel-voip/service';
-import { OmnichannelService } from './omnichannel/service';
 import { PushService } from './push/service';
 import { RoomService } from './room/service';
 import { SAUMonitorService } from './sauMonitor/service';
diff --git a/apps/meteor/server/services/team/service.ts b/apps/meteor/server/services/team/service.ts
index bdca222b246c..ef02a664bc4a 100644
--- a/apps/meteor/server/services/team/service.ts
+++ b/apps/meteor/server/services/team/service.ts
@@ -33,7 +33,7 @@ import { addUserToRoom } from '../../../app/lib/server/functions/addUserToRoom';
 import { checkUsernameAvailability } from '../../../app/lib/server/functions/checkUsernameAvailability';
 import { getSubscribedRoomsForUserWithDetails } from '../../../app/lib/server/functions/getRoomsWithSingleOwner';
 import { removeUserFromRoom } from '../../../app/lib/server/functions/removeUserFromRoom';
-import { notifyOnSubscriptionChangedByRoomIdAndUserId } from '../../../app/lib/server/lib/notifyListener';
+import { notifyOnSubscriptionChangedByRoomIdAndUserId, notifyOnRoomChangedById } from '../../../app/lib/server/lib/notifyListener';
 import { settings } from '../../../app/settings/server';
 
 export class TeamService extends ServiceClassInternal implements ITeamService {
@@ -66,7 +66,7 @@ export class TeamService extends ServiceClassInternal implements ITeamService {
 				? []
 				: await Users.findActiveByIdsOrUsernames(members, {
 						projection: { username: 1 },
-				  }).toArray();
+					}).toArray();
 		const memberUsernames = membersResult.map(({ username }) => username);
 		const memberIds = membersResult.map(({ _id }) => _id);
 
@@ -131,6 +131,8 @@ export class TeamService extends ServiceClassInternal implements ITeamService {
 				await Message.saveSystemMessage('user-converted-to-team', roomId, team.name, createdBy);
 			}
 
+			void notifyOnRoomChangedById(roomId, 'inserted');
+
 			return {
 				_id: teamId,
 				...teamData,
@@ -251,12 +253,10 @@ export class TeamService extends ServiceClassInternal implements ITeamService {
 
 		const results: ITeamInfo[] = [];
 		for await (const record of records) {
-			const rooms = Rooms.findByTeamId(record._id);
-			const users = TeamMember.findByTeamId(record._id);
 			results.push({
 				...record,
-				rooms: await rooms.count(),
-				numberOfUsers: await users.count(),
+				rooms: await Rooms.countByTeamId(record._id),
+				numberOfUsers: await TeamMember.countByTeamId(record._id),
 			});
 		}
 
@@ -279,12 +279,10 @@ export class TeamService extends ServiceClassInternal implements ITeamService {
 
 		const results: ITeamInfo[] = [];
 		for await (const record of records) {
-			const rooms = Rooms.findByTeamId(record._id);
-			const users = TeamMember.findByTeamId(record._id);
 			results.push({
 				...record,
-				rooms: await rooms.count(),
-				numberOfUsers: await users.count(),
+				rooms: await Rooms.countByTeamId(record._id),
+				numberOfUsers: await TeamMember.countByTeamId(record._id),
 			});
 		}
 
@@ -797,8 +795,7 @@ export class TeamService extends ServiceClassInternal implements ITeamService {
 
 			if (existingMember) {
 				if (existingMember.roles?.includes('owner')) {
-					const owners = TeamMember.findByTeamIdAndRole(team._id, 'owner');
-					const totalOwners = await owners.count();
+					const totalOwners = await TeamMember.countByTeamIdAndRole(team._id, 'owner');
 					if (totalOwners === 1) {
 						throw new Error('last-owner-can-not-be-removed');
 					}
@@ -815,7 +812,7 @@ export class TeamService extends ServiceClassInternal implements ITeamService {
 					uid !== member.userId && byUser
 						? {
 								byUser,
-						  }
+							}
 						: undefined,
 				);
 			}
@@ -1002,9 +999,9 @@ export class TeamService extends ServiceClassInternal implements ITeamService {
 
 	async getStatistics(): Promise<ITeamStats> {
 		return {
-			totalTeams: await Team.find({}).count(),
-			totalRoomsInsideTeams: await Rooms.findRoomsInsideTeams().count(),
-			totalDefaultRoomsInsideTeams: await Rooms.findRoomsInsideTeams(true).count(),
+			totalTeams: await Team.estimatedDocumentCount(),
+			totalRoomsInsideTeams: await Rooms.countRoomsInsideTeams(),
+			totalDefaultRoomsInsideTeams: await Rooms.countRoomsInsideTeams(true),
 		};
 	}
 
diff --git a/apps/meteor/server/services/video-conference/service.ts b/apps/meteor/server/services/video-conference/service.ts
index a26e947b6b80..4b1456f37774 100644
--- a/apps/meteor/server/services/video-conference/service.ts
+++ b/apps/meteor/server/services/video-conference/service.ts
@@ -42,8 +42,8 @@ import { createRoom } from '../../../app/lib/server/functions/createRoom';
 import { sendMessage } from '../../../app/lib/server/functions/sendMessage';
 import { notifyOnMessageChange } from '../../../app/lib/server/lib/notifyListener';
 import { metrics } from '../../../app/metrics/server/lib/metrics';
-import PushNotification from '../../../app/push-notifications/server/lib/PushNotification';
 import { Push } from '../../../app/push/server/push';
+import PushNotification from '../../../app/push-notifications/server/lib/PushNotification';
 import { settings } from '../../../app/settings/server';
 import { updateCounter } from '../../../app/statistics/server/functions/updateStatsCounter';
 import { getUserAvatarURL } from '../../../app/utils/server/getUserAvatarURL';
@@ -1097,8 +1097,15 @@ export class VideoConfService extends ServiceClassInternal implements IVideoConf
 			return;
 		}
 
-		const name = settings.get<string>('VideoConf_Persistent_Chat_Discussion_Name') || i18n.t('Conference Call Chat History');
-		const displayName = `${name} - ${new Date().toISOString().substring(0, 10)}`;
+		const name = settings.get<string>('VideoConf_Persistent_Chat_Discussion_Name') || i18n.t('[date] Video Call Chat');
+		let displayName;
+		const date = new Date().toISOString().substring(0, 10);
+
+		if (name.includes('[date]')) {
+			displayName = name.replace('[date]', date);
+		} else {
+			displayName = `${date} ${name}`;
+		}
 
 		await this.createDiscussionForConference(displayName, call, createdBy);
 	}
diff --git a/apps/meteor/server/services/voip-asterisk/connector/asterisk/CommandHandler.ts b/apps/meteor/server/services/voip-asterisk/connector/asterisk/CommandHandler.ts
index 93448da657db..fc04eb478622 100644
--- a/apps/meteor/server/services/voip-asterisk/connector/asterisk/CommandHandler.ts
+++ b/apps/meteor/server/services/voip-asterisk/connector/asterisk/CommandHandler.ts
@@ -17,12 +17,12 @@ import type { IVoipConnectorResult, IManagementServerConnectionStatus, IManageme
 import { Logger } from '@rocket.chat/logger';
 import type { Db } from 'mongodb';
 
-import { getManagementServerConfig } from '../../lib/Helper';
-import { WebsocketConnection } from '../websocket/WebsocketConnection';
 import type { Command } from './Command';
 import { CommandType } from './Command';
 import { Commands } from './Commands';
 import type { IConnection } from './IConnection';
+import { getManagementServerConfig } from '../../lib/Helper';
+import { WebsocketConnection } from '../websocket/WebsocketConnection';
 import { AMIConnection } from './ami/AMIConnection';
 import { CommandFactory } from './ami/CommandFactory';
 
diff --git a/apps/meteor/server/settings/accounts.ts b/apps/meteor/server/settings/accounts.ts
index 81166af5c200..fea95815e441 100644
--- a/apps/meteor/server/settings/accounts.ts
+++ b/apps/meteor/server/settings/accounts.ts
@@ -698,10 +698,22 @@ export const createAccountSettings = () =>
 				i18nLabel: 'Mute_Focused_Conversations',
 			});
 
+			await this.add('Accounts_Default_User_Preferences_masterVolume', 100, {
+				type: 'int',
+				public: true,
+				i18nLabel: 'Master_volume',
+			});
+
 			await this.add('Accounts_Default_User_Preferences_notificationsSoundVolume', 100, {
 				type: 'int',
 				public: true,
-				i18nLabel: 'Notifications_Sound_Volume',
+				i18nLabel: 'Notification_volume',
+			});
+
+			await this.add('Accounts_Default_User_Preferences_voipRingerVolume', 100, {
+				type: 'int',
+				public: true,
+				i18nLabel: 'Call_ringer_volume',
 			});
 
 			await this.add('Accounts_Default_User_Preferences_omnichannelTranscriptEmail', false, {
diff --git a/apps/meteor/server/settings/lib/auditedSettingUpdates.ts b/apps/meteor/server/settings/lib/auditedSettingUpdates.ts
new file mode 100644
index 000000000000..19f646641eaa
--- /dev/null
+++ b/apps/meteor/server/settings/lib/auditedSettingUpdates.ts
@@ -0,0 +1,100 @@
+import type { IAuditServerAppActor, IAuditServerSystemActor, IAuditServerUserActor, ISetting } from '@rocket.chat/core-typings';
+import { ServerEvents } from '@rocket.chat/models';
+
+import { settings } from '../../../app/settings/server/cached';
+
+export const resetAuditedSettingByUser =
+	(actor: Omit<IAuditServerUserActor, 'type'>) =>
+	<F extends (key: ISetting['_id']) => any>(fn: F, key: ISetting['_id']): ReturnType<F> => {
+		const { value, packageValue } = settings.getSetting(key) ?? {};
+
+		void ServerEvents.createAuditServerEvent(
+			'settings.changed',
+			{
+				id: key,
+				previous: value,
+				current: packageValue,
+			},
+			{
+				type: 'user',
+				...actor,
+			},
+		);
+		return fn(key);
+	};
+
+export const updateAuditedByUser =
+	(actor: Omit<IAuditServerUserActor, 'type'>) =>
+	<K extends ISetting['_id'], T extends ISetting['value'], F extends (_id: K, value: T, ...args: any[]) => any>(
+		fn: F,
+		...args: Parameters<F>
+	): ReturnType<F> => {
+		const [key, value, ...rest] = args;
+		const setting = settings.getSetting(key);
+
+		const previous = setting?.value;
+
+		void ServerEvents.createAuditServerEvent(
+			'settings.changed',
+			{
+				id: key,
+				previous,
+				current: value,
+			},
+			{
+				type: 'user',
+				...actor,
+			},
+		);
+		return fn(key, value, ...rest);
+	};
+
+export const updateAuditedBySystem =
+	(actor: Omit<IAuditServerSystemActor, 'type'>) =>
+	<T extends ISetting['value'], F extends (_id: ISetting['_id'], value: T, ...args: any[]) => any>(
+		fn: F,
+		...args: Parameters<F>
+	): ReturnType<F> => {
+		const [key, value, ...rest] = args;
+		const setting = settings.getSetting(key);
+
+		const previous = setting?.value;
+
+		void ServerEvents.createAuditServerEvent(
+			'settings.changed',
+			{
+				id: key,
+				previous,
+				current: value,
+			},
+			{
+				type: 'system',
+				...actor,
+			},
+		);
+		return fn(key, value, ...rest);
+	};
+
+export const updateAuditedByApp =
+	<T extends ISetting['value'], F extends (_id: ISetting['_id'], value: T, ...args: any[]) => any>(
+		actor: Omit<IAuditServerAppActor, 'type'>,
+	) =>
+	(fn: F, ...args: Parameters<F>): ReturnType<F> => {
+		const [key, value, ...rest] = args;
+		const setting = settings.getSetting(key);
+
+		const previous = setting?.value;
+		void ServerEvents.createAuditServerEvent(
+			'settings.changed',
+			{
+				id: key,
+				previous,
+				current: value,
+			},
+			{
+				type: 'app',
+				...actor,
+			},
+		);
+		return fn(key, value, ...rest);
+	};
diff --git a/apps/meteor/server/settings/misc.ts b/apps/meteor/server/settings/misc.ts
index af2725628ec3..46b809171c1c 100644
--- a/apps/meteor/server/settings/misc.ts
+++ b/apps/meteor/server/settings/misc.ts
@@ -4,6 +4,7 @@ import { Logger } from '@rocket.chat/logger';
 import { Settings } from '@rocket.chat/models';
 import { v4 as uuidv4 } from 'uuid';
 
+import { updateAuditedBySystem } from './lib/auditedSettingUpdates';
 import { settingsRegistry, settings } from '../../app/settings/server';
 
 const logger = new Logger('FingerPrint');
@@ -17,10 +18,13 @@ const generateFingerprint = function () {
 };
 
 const updateFingerprint = async function (fingerprint: string, verified: boolean) {
+	const auditedSettingBySystem = updateAuditedBySystem({
+		reason: 'updateFingerprint',
+	});
 	// No need to call ws listener because current function is called on startup
 	await Promise.all([
-		Settings.updateValueById('Deployment_FingerPrint_Hash', fingerprint),
-		Settings.updateValueById('Deployment_FingerPrint_Verified', verified),
+		auditedSettingBySystem(Settings.updateValueById, 'Deployment_FingerPrint_Hash', fingerprint),
+		auditedSettingBySystem(Settings.updateValueById, 'Deployment_FingerPrint_Verified', verified),
 	]);
 };
 
diff --git a/apps/meteor/server/startup/index.ts b/apps/meteor/server/startup/index.ts
index ccbd621025c5..001af2c12be5 100644
--- a/apps/meteor/server/startup/index.ts
+++ b/apps/meteor/server/startup/index.ts
@@ -8,8 +8,8 @@ import './presenceTroubleshoot';
 import '../hooks';
 import '../lib/rooms/roomTypes';
 import '../lib/settingsRegenerator';
-import { isRunningMs } from '../lib/isRunningMs';
 import { performMigrationProcedure } from './migrations';
+import { isRunningMs } from '../lib/isRunningMs';
 
 export const startup = async () => {
 	await performMigrationProcedure();
diff --git a/apps/meteor/server/startup/initialData.js b/apps/meteor/server/startup/initialData.js
index cefed3eef922..30415e8b2022 100644
--- a/apps/meteor/server/startup/initialData.js
+++ b/apps/meteor/server/startup/initialData.js
@@ -1,11 +1,10 @@
-import { Settings, Rooms, Users } from '@rocket.chat/models';
+import { Settings, Rooms, Users, Roles } from '@rocket.chat/models';
 import colors from 'colors/safe';
 import { Accounts } from 'meteor/accounts-base';
 import { Meteor } from 'meteor/meteor';
 
-import { getUsersInRole } from '../../app/authorization/server';
-import { FileUpload } from '../../app/file-upload/server';
 import { RocketChatFile } from '../../app/file/server';
+import { FileUpload } from '../../app/file-upload/server';
 import { addUserToDefaultChannels } from '../../app/lib/server/functions/addUserToDefaultChannels';
 import { checkUsernameAvailability } from '../../app/lib/server/functions/checkUsernameAvailability';
 import { notifyOnSettingChangedById } from '../../app/lib/server/lib/notifyListener';
@@ -15,7 +14,7 @@ import { addUserRolesAsync } from '../lib/roles/addUserRoles';
 
 export async function insertAdminUserFromEnv() {
 	if (process.env.ADMIN_PASS) {
-		if ((await (await getUsersInRole('admin')).count()) === 0) {
+		if ((await Roles.countUsersInRole('admin')) === 0) {
 			const adminUser = {
 				name: 'Administrator',
 				username: 'admin',
@@ -188,7 +187,7 @@ Meteor.startup(async () => {
 		}
 	}
 
-	if ((await (await getUsersInRole('admin')).count()) === 0) {
+	if ((await Roles.countUsersInRole('admin')) === 0) {
 		const oldestUser = await Users.getOldest({ projection: { _id: 1, username: 1, name: 1 } });
 
 		if (oldestUser) {
@@ -197,7 +196,7 @@ Meteor.startup(async () => {
 		}
 	}
 
-	if ((await (await getUsersInRole('admin')).count()) !== 0) {
+	if ((await Roles.countUsersInRole('admin')) !== 0) {
 		if (settings.get('Show_Setup_Wizard') === 'pending') {
 			console.log('Setting Setup Wizard to "in_progress" because, at least, one admin was found');
 
diff --git a/apps/meteor/server/startup/migrations/v295.ts b/apps/meteor/server/startup/migrations/v295.ts
index 484d0ddd9850..7e09a9538bc9 100644
--- a/apps/meteor/server/startup/migrations/v295.ts
+++ b/apps/meteor/server/startup/migrations/v295.ts
@@ -3,6 +3,7 @@ import { Settings } from '@rocket.chat/models';
 
 import { SystemLogger } from '../../lib/logger/system';
 import { addMigration } from '../../lib/migrations';
+import { updateAuditedBySystem } from '../../settings/lib/auditedSettingUpdates';
 
 addMigration({
 	version: 295,
@@ -20,8 +21,12 @@ addMigration({
 		const crowdSyncInterval = await Settings.findOneById<Pick<ISetting, 'value'>>('CROWD_Sync_Interval', { projection: { value: 1 } });
 
 		// update setting values
-		await Settings.updateOne({ _id: 'LDAP_Background_Sync_Interval' }, { $set: { value: newLdapDefault } });
-		await Settings.updateOne({ _id: 'CROWD_Sync_Interval' }, { $set: { value: newCrowdDefault } });
+		await updateAuditedBySystem({
+			reason: 'Migration 295',
+		})(Settings.updateValueById, 'LDAP_Background_Sync_Interval', newLdapDefault);
+		await updateAuditedBySystem({
+			reason: 'Migration 295',
+		})(Settings.updateValueById, 'CROWD_Sync_Interval', newCrowdDefault);
 
 		// notify user about the changes if the value was different from the default
 
diff --git a/apps/meteor/server/startup/migrations/v296.ts b/apps/meteor/server/startup/migrations/v296.ts
index b301549ea29d..1cc00d8aa225 100644
--- a/apps/meteor/server/startup/migrations/v296.ts
+++ b/apps/meteor/server/startup/migrations/v296.ts
@@ -14,6 +14,7 @@ addMigration({
 		const loginTermsValue = settings.get('Layout_Login_Terms');
 
 		if (loginTermsValue === oldLoginTermsValue) {
+			// TODO: audit
 			await Settings.updateOne({ _id: 'Layout_Login_Terms' }, { $set: { value: '', packageValue: '' } });
 			SystemLogger.warn(`The default value of the setting 'Login Terms' has changed to an empty string. Please review your settings.`);
 		}
diff --git a/apps/meteor/server/startup/migrations/v308.ts b/apps/meteor/server/startup/migrations/v308.ts
index fc27fdd31868..d1c97c532414 100644
--- a/apps/meteor/server/startup/migrations/v308.ts
+++ b/apps/meteor/server/startup/migrations/v308.ts
@@ -19,6 +19,7 @@ addMigration({
 		const isValidAvatarSyncInterval = ldapAvatarSyncInterval && isValidCron(ldapAvatarSyncInterval.value as string);
 		const isValidAutoLogoutInterval = ldapAutoLogoutInterval && isValidCron(ldapAutoLogoutInterval.value as string);
 
+		// TODO audit
 		await Settings.updateOne(
 			{ _id: 'LDAP_Background_Sync_Avatars_Interval' },
 			{ $set: { packageValue: newAvatarSyncPackageValue, ...(!isValidAvatarSyncInterval && { value: newAvatarSyncPackageValue }) } },
diff --git a/apps/meteor/server/startup/migrations/v310.ts b/apps/meteor/server/startup/migrations/v310.ts
index 6905b37293d3..75a7738959d8 100644
--- a/apps/meteor/server/startup/migrations/v310.ts
+++ b/apps/meteor/server/startup/migrations/v310.ts
@@ -14,6 +14,8 @@ addMigration({
 		const newPackageValue =
 			'<h2>{Forgot_password}</h2><p>{Lets_get_you_new_one_}</p><a class="btn" href="[Forgot_Password_Url]">{Reset}</a><p class="advice">{If_you_didnt_ask_for_reset_ignore_this_email}</p>';
 
+		// TODO: audit
+
 		await Settings.updateOne(
 			{ _id: 'Forgot_Password_Email' },
 			{
diff --git a/apps/meteor/server/startup/migrations/v311.ts b/apps/meteor/server/startup/migrations/v311.ts
index 3e131d81b812..ca77630d017c 100644
--- a/apps/meteor/server/startup/migrations/v311.ts
+++ b/apps/meteor/server/startup/migrations/v311.ts
@@ -6,6 +6,7 @@ addMigration({
 	version: 311,
 	name: 'Update default behavior of E2E_Enabled_Mentions setting, to allow mentions in encrypted messages by default.',
 	async up() {
+		// TODO: audit
 		await Settings.updateOne(
 			{
 				_id: 'E2E_Enabled_Mentions',
diff --git a/apps/meteor/server/startup/migrations/v314.ts b/apps/meteor/server/startup/migrations/v314.ts
index 0b46cc42838a..e7b4ef9555c4 100644
--- a/apps/meteor/server/startup/migrations/v314.ts
+++ b/apps/meteor/server/startup/migrations/v314.ts
@@ -6,6 +6,7 @@ addMigration({
 	version: 314,
 	name: 'Update default behavior of E2E_Allow_Unencrypted_Messages setting, to not allow un-encrypted messages by default.',
 	async up() {
+		// TODO: audit
 		await Settings.updateOne(
 			{
 				_id: 'E2E_Allow_Unencrypted_Messages',
diff --git a/apps/meteor/server/startup/migrations/v317.ts b/apps/meteor/server/startup/migrations/v317.ts
index 0a7905bf32fd..d114b0aa7221 100644
--- a/apps/meteor/server/startup/migrations/v317.ts
+++ b/apps/meteor/server/startup/migrations/v317.ts
@@ -61,6 +61,7 @@ addMigration({
 	version: 317,
 	name: 'Change default color of OAuth login services buttons',
 	async up() {
+		// TODO: audit
 		const promises = settingsToUpdate
 			.map(async ({ key, defaultValue, newValue }) => {
 				const oldSettingValue = await getSettingValue(key);
diff --git a/apps/meteor/server/startup/migrations/v319.ts b/apps/meteor/server/startup/migrations/v319.ts
index ec7b948685bf..996190ce112d 100644
--- a/apps/meteor/server/startup/migrations/v319.ts
+++ b/apps/meteor/server/startup/migrations/v319.ts
@@ -29,6 +29,8 @@ addMigration({
 
 			const newValue = convertDaysToMs(Number(value));
 
+			// TODO: audit
+
 			promises.push(
 				Settings.updateOne(
 					{
diff --git a/apps/meteor/server/startup/serverRunning.js b/apps/meteor/server/startup/serverRunning.js
index d642c006c4d2..f3c2cd5684bd 100644
--- a/apps/meteor/server/startup/serverRunning.js
+++ b/apps/meteor/server/startup/serverRunning.js
@@ -79,7 +79,7 @@ Meteor.startup(async () => {
 		}
 
 		if (semver.satisfies(semver.coerce(mongoVersion), '<5.0.0')) {
-			msg += ['', '', 'YOUR CURRENT MONGODB VERSION IS NOT SUPPORTED,', 'PLEASE UPGRADE TO VERSION 5.0 OR LATER'].join('\n');
+			msg += ['', '', 'YOUR CURRENT MONGODB VERSION IS NOT SUPPORTED BY ROCKET.CHAT,', 'PLEASE UPGRADE TO VERSION 5.0 OR LATER'].join('\n');
 			showErrorBox('SERVER ERROR', msg);
 
 			exitIfNotBypassed(process.env.BYPASS_MONGO_VALIDATION);
diff --git a/apps/meteor/tests/data/livechat/rooms.ts b/apps/meteor/tests/data/livechat/rooms.ts
index a41b19ff9a8d..ade5cfbe7101 100644
--- a/apps/meteor/tests/data/livechat/rooms.ts
+++ b/apps/meteor/tests/data/livechat/rooms.ts
@@ -55,11 +55,16 @@ export const createLivechatRoomWidget = async (
 	return response.body.room;
 };
 
-export const createVisitor = (department?: string, visitorName?: string, customEmail?: string): Promise<ILivechatVisitor> =>
+export const createVisitor = (
+	department?: string,
+	visitorName?: string,
+	customEmail?: string,
+	customPhone?: string,
+): Promise<ILivechatVisitor> =>
 	new Promise((resolve, reject) => {
 		const token = getRandomVisitorToken();
 		const email = customEmail || `${token}@${token}.com`;
-		const phone = `${Math.floor(Math.random() * 10000000000)}`;
+		const phone = customPhone || `${Math.floor(Math.random() * 10000000000)}`;
 		void request.get(api(`livechat/visitor/${token}`)).end((err: Error, res: DummyResponse<ILivechatVisitor>) => {
 			if (!err && res && res.body && res.body.visitor) {
 				return resolve(res.body.visitor);
diff --git a/apps/meteor/tests/data/permissions.helper.ts b/apps/meteor/tests/data/permissions.helper.ts
index 535c1d404b6e..8069b44fea11 100644
--- a/apps/meteor/tests/data/permissions.helper.ts
+++ b/apps/meteor/tests/data/permissions.helper.ts
@@ -1,9 +1,9 @@
 import type { ISetting } from '@rocket.chat/core-typings';
 
+import { api, credentials, request } from './api-data';
 import { permissions } from '../../app/authorization/server/constant/permissions';
 import { omnichannelEEPermissions } from '../../ee/app/livechat-enterprise/server/permissions';
 import { IS_EE } from '../e2e/config/constants';
-import { api, credentials, request } from './api-data';
 
 export const updatePermission = (permission: string, roles: string[]): Promise<void | Error> =>
 	new Promise((resolve, reject) => {
@@ -68,7 +68,7 @@ export const updateEESetting = (setting: string, value: ISetting['value']): Prom
 					.expect('Content-Type', 'application/json')
 					.expect(200)
 					.end((err?: Error) => setTimeout(() => (!err && resolve()) || reject(err), 100));
-		  })
+			})
 		: Promise.resolve();
 
 export const removePermissions = async (perms: string[]) => {
diff --git a/apps/meteor/tests/data/validation.helper.ts b/apps/meteor/tests/data/validation.helper.ts
new file mode 100644
index 000000000000..08aa539011b7
--- /dev/null
+++ b/apps/meteor/tests/data/validation.helper.ts
@@ -0,0 +1,11 @@
+import { expect } from 'chai';
+
+import type { request } from './api-data';
+
+export function expectInvalidParams(res: Awaited<ReturnType<(typeof request)['post']>>, expectedErrors: string[]): void {
+	expect(res.body).to.have.property('success', false);
+	expect(res.body).to.have.property('error');
+	expect(res.body.error).to.be.a('string');
+	expect(res.body.errorType).to.be.equal('invalid-params');
+	expect((res.body.error as string).split('\n').map((line) => line.trim())).to.be.deep.equal(expectedErrors);
+}
diff --git a/apps/meteor/tests/e2e/administration.spec.ts b/apps/meteor/tests/e2e/administration.spec.ts
index 808c7e719faa..dde8bfe392d0 100644
--- a/apps/meteor/tests/e2e/administration.spec.ts
+++ b/apps/meteor/tests/e2e/administration.spec.ts
@@ -175,6 +175,7 @@ test.describe.parallel('administration', () => {
 				await poAdmin.getRoomRow(targetChannel).click();
 				await poAdmin.favoriteLabel.click();
 				await poAdmin.btnSave.click();
+				await expect(poAdmin.btnSave).not.toBeVisible();
 
 				await poAdmin.getRoomRow(targetChannel).click();
 				await expect(poAdmin.favoriteInput).toBeChecked();
diff --git a/apps/meteor/tests/e2e/apps/private-apps-upload.spec.ts b/apps/meteor/tests/e2e/apps/private-apps-upload.spec.ts
index ec5fd95b111b..e90e38ffa09b 100644
--- a/apps/meteor/tests/e2e/apps/private-apps-upload.spec.ts
+++ b/apps/meteor/tests/e2e/apps/private-apps-upload.spec.ts
@@ -112,28 +112,5 @@ test.describe.serial('Private apps upload', () => {
 			await poMarketplace.appMenu.click();
 			await expect(poMarketplace.btnEnableApp).toBeDisabled();
 		});
-
-		test('expect updated private app in CE to be kept as disabled', async ({ page }) => {
-			const fileChooserPromise = page.waitForEvent('filechooser');
-
-			await poMarketplace.btnUploadPrivateApp.click();
-			await expect(poMarketplace.btnConfirmAppUploadModal).toBeEnabled();
-			await poMarketplace.btnConfirmAppUploadModal.click();
-
-			await expect(poMarketplace.btnInstallPrivateApp).toBeDisabled();
-			await poMarketplace.btnUploadPrivateAppFile.click();
-			const fileChooser = await fileChooserPromise;
-			await fileChooser.setFiles('./tests/e2e/fixtures/files/test-app_0.0.1.zip');
-
-			await expect(poMarketplace.btnInstallPrivateApp).toBeEnabled();
-			await poMarketplace.btnInstallPrivateApp.click();
-
-			await poMarketplace.btnConfirmAppUpdate.click();
-
-			await page.getByRole('button', { name: 'Agree' }).click();
-			await page.goto('/marketplace/private');
-			await poMarketplace.lastAppRow.click();
-			await expect(poMarketplace.appStatusTag).toHaveText('Disabled');
-		});
 	});
 });
diff --git a/apps/meteor/tests/e2e/e2e-encryption.spec.ts b/apps/meteor/tests/e2e/e2e-encryption.spec.ts
index 4446422d295a..04d01d5a7c71 100644
--- a/apps/meteor/tests/e2e/e2e-encryption.spec.ts
+++ b/apps/meteor/tests/e2e/e2e-encryption.spec.ts
@@ -14,24 +14,21 @@ test.describe.serial('e2e-encryption initial setup', () => {
 	let poAccountProfile: AccountProfile;
 	let poHomeChannel: HomeChannel;
 	let password: string;
+	const newPassword = 'new password';
 
 	test.beforeEach(async ({ page }) => {
 		poAccountProfile = new AccountProfile(page);
 		poHomeChannel = new HomeChannel(page);
-
-		await page.goto('/account/security');
 	});
 
 	test.beforeAll(async ({ api }) => {
-		const statusCode = (await api.post('/settings/E2E_Enable', { value: true })).status();
-
-		expect(statusCode).toBe(200);
+		await api.post('/settings/E2E_Enable', { value: true });
+		await api.post('/settings/E2E_Allow_Unencrypted_Messages', { value: true });
 	});
 
 	test.afterAll(async ({ api }) => {
-		const statusCode = (await api.post('/settings/E2E_Enable', { value: false })).status();
-
-		expect(statusCode).toBe(200);
+		await api.post('/settings/E2E_Enable', { value: false });
+		await api.post('/settings/E2E_Allow_Unencrypted_Messages', { value: false });
 	});
 
 	test.afterEach(async ({ api }) => {
@@ -39,6 +36,8 @@ test.describe.serial('e2e-encryption initial setup', () => {
 	});
 
 	test("expect reset user's e2e encryption key", async ({ page }) => {
+		await page.goto('/account/security');
+
 		// Reset key to start the flow from the beginning
 		// It will execute a logout
 		await poAccountProfile.securityE2EEncryptionSection.click();
@@ -81,8 +80,7 @@ test.describe.serial('e2e-encryption initial setup', () => {
 	});
 
 	test('expect change the e2ee password', async ({ page }) => {
-		// Change the password to a new one and test it
-		const newPassword = 'new password';
+		await page.goto('/account/security');
 
 		await restoreState(page, Users.admin);
 
@@ -117,27 +115,143 @@ test.describe.serial('e2e-encryption initial setup', () => {
 		await expect(page.locator('role=banner >> text="Wasn\'t possible to decode your encryption key to be imported."')).not.toBeVisible();
 		await expect(page.locator('role=banner >> text="Enter your E2E password"')).not.toBeVisible();
 	});
+
+	test('expect placeholder text in place of encrypted message', async ({ page }) => {
+		await page.goto('/home');
+
+		const channelName = faker.string.uuid();
+
+		await poHomeChannel.sidenav.createEncryptedChannel(channelName);
+
+		await expect(page).toHaveURL(`/group/${channelName}`);
+
+		await poHomeChannel.dismissToast();
+
+		await expect(poHomeChannel.content.encryptedRoomHeaderIcon).toBeVisible();
+
+		await poHomeChannel.content.sendMessage('This is an encrypted message.');
+
+		await expect(poHomeChannel.content.lastUserMessageBody).toHaveText('This is an encrypted message.');
+		await expect(poHomeChannel.content.lastUserMessage.locator('.rcx-icon--name-key')).toBeVisible();
+
+		// Logout and login
+		await poHomeChannel.sidenav.logout();
+		await page.locator('role=button[name="Login"]').waitFor();
+		await injectInitialData();
+		await restoreState(page, Users.admin, { except: ['private_key', 'public_key'] });
+
+		await poHomeChannel.sidenav.openChat(channelName);
+
+		await expect(poHomeChannel.content.encryptedRoomHeaderIcon).toBeVisible();
+
+		await expect(poHomeChannel.content.lastUserMessage).toContainText(
+			'This message is end-to-end encrypted. To view it, you must enter your encryption key in your account settings.',
+		);
+		await expect(poHomeChannel.content.lastUserMessage.locator('.rcx-icon--name-key')).toBeVisible();
+
+		await poHomeChannel.content.lastUserMessage.hover();
+		await expect(page.locator('[role=toolbar][aria-label="Message actions"]')).not.toBeVisible();
+	});
+
+	test('expect placeholder text in place of encrypted file description, when non-encrypted files upload in disabled e2ee room', async ({
+		page,
+	}) => {
+		await page.goto('/home');
+
+		const channelName = faker.string.uuid();
+
+		await poHomeChannel.sidenav.createEncryptedChannel(channelName);
+
+		await poHomeChannel.sidenav.openChat(channelName);
+
+		await poHomeChannel.content.dragAndDropTxtFile();
+		await poHomeChannel.content.descriptionInput.fill('any_description');
+		await poHomeChannel.content.fileNameInput.fill('any_file1.txt');
+		await poHomeChannel.content.btnModalConfirm.click();
+
+		await expect(poHomeChannel.content.lastUserMessage.locator('.rcx-icon--name-key')).toBeVisible();
+
+		await expect(poHomeChannel.content.getFileDescription).toHaveText('any_description');
+		await expect(poHomeChannel.content.lastMessageFileName).toContainText('any_file1.txt');
+
+		await test.step('disable E2EE in the room', async () => {
+			await poHomeChannel.tabs.kebab.click();
+
+			await expect(poHomeChannel.tabs.btnDisableE2E).toBeVisible();
+			await poHomeChannel.tabs.btnDisableE2E.click();
+			await expect(page.getByRole('dialog', { name: 'Disable encryption' })).toBeVisible();
+			await page.getByRole('button', { name: 'Disable encryption' }).click();
+			await poHomeChannel.dismissToast();
+			// will wait till the key icon in header goes away
+			await expect(poHomeChannel.content.encryptedRoomHeaderIcon).toHaveCount(0);
+		});
+
+		await page.reload();
+
+		await test.step('upload the file in disabled E2EE room', async () => {
+			await expect(poHomeChannel.content.encryptedRoomHeaderIcon).not.toBeVisible();
+
+			await poHomeChannel.content.dragAndDropTxtFile();
+			await poHomeChannel.content.descriptionInput.fill('any_description');
+			await poHomeChannel.content.fileNameInput.fill('any_file1.txt');
+			await poHomeChannel.content.btnModalConfirm.click();
+
+			await expect(poHomeChannel.content.lastUserMessage.locator('.rcx-icon--name-key')).not.toBeVisible();
+
+			await expect(poHomeChannel.content.getFileDescription).toHaveText('any_description');
+			await expect(poHomeChannel.content.lastMessageFileName).toContainText('any_file1.txt');
+		});
+
+		await test.step('Enable E2EE in the room', async () => {
+			await poHomeChannel.tabs.kebab.click();
+
+			await expect(poHomeChannel.tabs.btnEnableE2E).toBeVisible();
+			await poHomeChannel.tabs.btnEnableE2E.click();
+			await expect(page.getByRole('dialog', { name: 'Enable encryption' })).toBeVisible();
+			await page.getByRole('button', { name: 'Enable encryption' }).click();
+			await poHomeChannel.dismissToast();
+			// will wait till the key icon in header appears
+			await expect(poHomeChannel.content.encryptedRoomHeaderIcon).toHaveCount(1);
+		});
+
+		// Logout to remove e2ee keys
+		await poHomeChannel.sidenav.logout();
+
+		// Login again
+		await page.locator('role=button[name="Login"]').waitFor();
+		await injectInitialData();
+		await restoreState(page, Users.admin, { except: ['private_key', 'public_key'] });
+
+		await poHomeChannel.sidenav.openChat(channelName);
+
+		await expect(poHomeChannel.content.encryptedRoomHeaderIcon).toBeVisible();
+
+		await expect(poHomeChannel.content.nthMessage(0)).toContainText(
+			'This message is end-to-end encrypted. To view it, you must enter your encryption key in your account settings.',
+		);
+		await expect(poHomeChannel.content.nthMessage(0).locator('.rcx-icon--name-key')).toBeVisible();
+	});
 });
 
 test.describe.serial('e2e-encryption', () => {
 	let poHomeChannel: HomeChannel;
 
-	test.beforeEach(async ({ page, api }) => {
-		const statusCode = (await api.post('/settings/E2E_Enable', { value: true })).status();
+	test.use({ storageState: Users.userE2EE.state });
 
-		expect(statusCode).toBe(200);
+	test.beforeEach(async ({ page, api }) => {
+		await api.post('/settings/E2E_Enable', { value: true });
 
 		poHomeChannel = new HomeChannel(page);
 		await page.goto('/home');
 	});
 
 	test.beforeAll(async ({ api }) => {
-		expect((await api.post('/settings/E2E_Allow_Unencrypted_Messages', { value: true })).status()).toBe(200);
+		await api.post('/settings/E2E_Allow_Unencrypted_Messages', { value: true });
 	});
 
 	test.afterAll(async ({ api }) => {
-		expect((await api.post('/settings/E2E_Enable', { value: false })).status()).toBe(200);
-		expect((await api.post('/settings/E2E_Allow_Unencrypted_Messages', { value: false })).status()).toBe(200);
+		await api.post('/settings/E2E_Enable', { value: false });
+		await api.post('/settings/E2E_Allow_Unencrypted_Messages', { value: false });
 	});
 
 	test('expect create a private channel encrypted and send an encrypted message', async ({ page }) => {
@@ -368,7 +482,7 @@ test.describe.serial('e2e-encryption', () => {
 		await page.keyboard.press('Enter');
 		await poHomeChannel.sidenav.btnCreate.click();
 
-		await expect(page).toHaveURL(`/direct/rocketchat.internal.admin.testuser2`);
+		await expect(page).toHaveURL(`/direct/user2${Users.userE2EE.data.username}`);
 
 		await poHomeChannel.tabs.kebab.click({ force: true });
 		await expect(poHomeChannel.tabs.btnEnableE2E).toBeVisible();
@@ -388,132 +502,10 @@ test.describe.serial('e2e-encryption', () => {
 		await expect(page.getByText('OTR not available')).toBeVisible();
 	});
 
-	test('expect placeholder text in place of encrypted message, when E2EE is not setup', async ({ page }) => {
-		const channelName = faker.string.uuid();
-
-		await poHomeChannel.sidenav.createEncryptedChannel(channelName);
-
-		await expect(page).toHaveURL(`/group/${channelName}`);
-
-		await poHomeChannel.dismissToast();
-
-		await expect(poHomeChannel.content.encryptedRoomHeaderIcon).toBeVisible();
-
-		await poHomeChannel.content.sendMessage('This is an encrypted message.');
-
-		await expect(poHomeChannel.content.lastUserMessageBody).toHaveText('This is an encrypted message.');
-		await expect(poHomeChannel.content.lastUserMessage.locator('.rcx-icon--name-key')).toBeVisible();
-
-		// Logout to remove e2ee keys
-		await poHomeChannel.sidenav.logout();
-
-		// Login again
-		await page.locator('role=button[name="Login"]').waitFor();
-		await injectInitialData();
-		await restoreState(page, Users.admin, { except: ['private_key', 'public_key'] });
-
-		await poHomeChannel.sidenav.openChat(channelName);
-
-		await expect(poHomeChannel.content.encryptedRoomHeaderIcon).toBeVisible();
-
-		await expect(poHomeChannel.content.lastUserMessage).toContainText(
-			'This message is end-to-end encrypted. To view it, you must enter your encryption key in your account settings.',
-		);
-		await expect(poHomeChannel.content.lastUserMessage.locator('.rcx-icon--name-key')).toBeVisible();
-
-		await poHomeChannel.content.lastUserMessage.hover();
-		await expect(page.locator('[role=toolbar][aria-label="Message actions"]')).not.toBeVisible();
-	});
-
-	test('expect placeholder text in place of encrypted file description, when E2EE is not setup and non-encrypted files upload in disabled e2ee room', async ({
-		page,
-	}) => {
-		const channelName = faker.string.uuid();
-
-		await poHomeChannel.sidenav.openNewByLabel('Channel');
-		await poHomeChannel.sidenav.inputChannelName.fill(channelName);
-		await poHomeChannel.sidenav.advancedSettingsAccordion.click();
-		await poHomeChannel.sidenav.checkboxEncryption.click();
-		await poHomeChannel.sidenav.btnCreate.click();
-
-		await expect(page).toHaveURL(`/group/${channelName}`);
-
-		await poHomeChannel.dismissToast();
-
-		await expect(poHomeChannel.content.encryptedRoomHeaderIcon).toBeVisible();
-
-		await poHomeChannel.content.dragAndDropTxtFile();
-		await poHomeChannel.content.descriptionInput.fill('any_description');
-		await poHomeChannel.content.fileNameInput.fill('any_file1.txt');
-		await poHomeChannel.content.btnModalConfirm.click();
-
-		await expect(poHomeChannel.content.lastUserMessage.locator('.rcx-icon--name-key')).toBeVisible();
-
-		await expect(poHomeChannel.content.getFileDescription).toHaveText('any_description');
-		await expect(poHomeChannel.content.lastMessageFileName).toContainText('any_file1.txt');
-
-		await test.step('disable E2EE in the room', async () => {
-			await poHomeChannel.tabs.kebab.click();
-
-			await expect(poHomeChannel.tabs.btnDisableE2E).toBeVisible();
-			await poHomeChannel.tabs.btnDisableE2E.click();
-			await expect(page.getByRole('dialog', { name: 'Disable encryption' })).toBeVisible();
-			await page.getByRole('button', { name: 'Disable encryption' }).click();
-			await poHomeChannel.dismissToast();
-			// will wait till the key icon in header goes away
-			await expect(poHomeChannel.content.encryptedRoomHeaderIcon).toHaveCount(0);
-		});
-
-		await page.reload();
-
-		await test.step('upload the file in disabled E2EE room', async () => {
-			await expect(poHomeChannel.content.encryptedRoomHeaderIcon).not.toBeVisible();
-
-			await poHomeChannel.content.dragAndDropTxtFile();
-			await poHomeChannel.content.descriptionInput.fill('any_description');
-			await poHomeChannel.content.fileNameInput.fill('any_file1.txt');
-			await poHomeChannel.content.btnModalConfirm.click();
-
-			await expect(poHomeChannel.content.lastUserMessage.locator('.rcx-icon--name-key')).not.toBeVisible();
-
-			await expect(poHomeChannel.content.getFileDescription).toHaveText('any_description');
-			await expect(poHomeChannel.content.lastMessageFileName).toContainText('any_file1.txt');
-		});
-
-		await test.step('Enable E2EE in the room', async () => {
-			await poHomeChannel.tabs.kebab.click();
-
-			await expect(poHomeChannel.tabs.btnEnableE2E).toBeVisible();
-			await poHomeChannel.tabs.btnEnableE2E.click();
-			await expect(page.getByRole('dialog', { name: 'Enable encryption' })).toBeVisible();
-			await page.getByRole('button', { name: 'Enable encryption' }).click();
-			await poHomeChannel.dismissToast();
-			// will wait till the key icon in header appears
-			await expect(poHomeChannel.content.encryptedRoomHeaderIcon).toHaveCount(1);
-		});
-
-		// Logout to remove e2ee keys
-		await poHomeChannel.sidenav.logout();
-
-		// Login again
-		await page.locator('role=button[name="Login"]').waitFor();
-		await injectInitialData();
-		await restoreState(page, Users.admin, { except: ['private_key', 'public_key'] });
-
-		await poHomeChannel.sidenav.openChat(channelName);
-
-		await expect(poHomeChannel.content.encryptedRoomHeaderIcon).toBeVisible();
-
-		await expect(poHomeChannel.content.nthMessage(0)).toContainText(
-			'This message is end-to-end encrypted. To view it, you must enter your encryption key in your account settings.',
-		);
-		await expect(poHomeChannel.content.nthMessage(0).locator('.rcx-icon--name-key')).toBeVisible();
-	});
-
 	test.describe('File Encryption', async () => {
 		test.afterAll(async ({ api }) => {
-			expect((await api.post('/settings/FileUpload_MediaTypeWhiteList', { value: '' })).status()).toBe(200);
-			expect((await api.post('/settings/FileUpload_MediaTypeBlackList', { value: 'image/svg+xml' })).status()).toBe(200);
+			await api.post('/settings/FileUpload_MediaTypeWhiteList', { value: '' });
+			await api.post('/settings/FileUpload_MediaTypeBlackList', { value: 'image/svg+xml' });
 		});
 
 		test('File and description encryption', async ({ page }) => {
@@ -574,7 +566,7 @@ test.describe.serial('e2e-encryption', () => {
 			});
 
 			await test.step('set whitelisted media type setting', async () => {
-				expect((await api.post('/settings/FileUpload_MediaTypeWhiteList', { value: 'text/plain' })).status()).toBe(200);
+				await api.post('/settings/FileUpload_MediaTypeWhiteList', { value: 'text/plain' });
 			});
 
 			await test.step('send text file again with whitelist setting set', async () => {
@@ -589,7 +581,7 @@ test.describe.serial('e2e-encryption', () => {
 			});
 
 			await test.step('set blacklisted media type setting to not accept application/octet-stream media type', async () => {
-				expect((await api.post('/settings/FileUpload_MediaTypeBlackList', { value: 'application/octet-stream' })).status()).toBe(200);
+				await api.post('/settings/FileUpload_MediaTypeBlackList', { value: 'application/octet-stream' });
 			});
 
 			await test.step('send text file again with blacklisted setting set, file upload should fail', async () => {
@@ -606,13 +598,13 @@ test.describe.serial('e2e-encryption', () => {
 
 		test.describe('File encryption setting disabled', async () => {
 			test.beforeAll(async ({ api }) => {
-				expect((await api.post('/settings/E2E_Enable_Encrypt_Files', { value: false })).status()).toBe(200);
-				expect((await api.post('/settings/FileUpload_MediaTypeBlackList', { value: 'application/octet-stream' })).status()).toBe(200);
+				await api.post('/settings/E2E_Enable_Encrypt_Files', { value: false });
+				await api.post('/settings/FileUpload_MediaTypeBlackList', { value: 'application/octet-stream' });
 			});
 
 			test.afterAll(async ({ api }) => {
-				expect((await api.post('/settings/E2E_Enable_Encrypt_Files', { value: true })).status()).toBe(200);
-				expect((await api.post('/settings/FileUpload_MediaTypeBlackList', { value: 'image/svg+xml' })).status()).toBe(200);
+				await api.post('/settings/E2E_Enable_Encrypt_Files', { value: true });
+				await api.post('/settings/FileUpload_MediaTypeBlackList', { value: 'image/svg+xml' });
 			});
 
 			test('Upload file without encryption in e2ee room', async ({ page }) => {
@@ -690,11 +682,11 @@ test.describe.serial('e2e-encryption', () => {
 			await page.goto('/home');
 		});
 		test.beforeAll(async ({ api }) => {
-			expect((await api.post('/settings/E2E_Allow_Unencrypted_Messages', { value: false })).status()).toBe(200);
+			await api.post('/settings/E2E_Allow_Unencrypted_Messages', { value: false });
 		});
 
 		test.afterAll(async ({ api }) => {
-			expect((await api.post('/settings/E2E_Allow_Unencrypted_Messages', { value: true })).status()).toBe(200);
+			await api.post('/settings/E2E_Allow_Unencrypted_Messages', { value: true });
 		});
 
 		test('expect slash commands to be disabled in an e2ee room', async ({ page }) => {
@@ -713,7 +705,7 @@ test.describe.serial('e2e-encryption', () => {
 			await expect(poHomeChannel.content.lastUserMessageBody).toHaveText('This is an encrypted message.');
 			await expect(poHomeChannel.content.lastUserMessage.locator('.rcx-icon--name-key')).toBeVisible();
 
-			await page.locator('[name="msg"]').type('/');
+			await page.locator('[name="msg"]').pressSequentially('/');
 			await expect(page.locator('#popup-item-contextualbar')).toHaveClass(/disabled/);
 		});
 	});
@@ -821,20 +813,15 @@ test.describe.serial('e2e-encryption', () => {
 		let anotherClientPage: Page;
 
 		test.beforeEach(async ({ browser }) => {
-			anotherClientPage = (await createAuxContext(browser, Users.admin)).page;
+			anotherClientPage = (await createAuxContext(browser, Users.userE2EE)).page;
 		});
 
 		test.afterEach(async () => {
 			await anotherClientPage.close();
 		});
-		test.afterAll(async () => {
-			// inject initial data, so that tokens are restored after forced logout
-			await injectInitialData();
-		});
 
 		test('expect force logout on e2e keys reset', async ({ page }) => {
 			const poAccountProfile = new AccountProfile(page);
-			// creating another logged in client, to check force logout
 
 			await page.goto('/account/security');
 
@@ -843,11 +830,6 @@ test.describe.serial('e2e-encryption', () => {
 
 			await expect(page.locator('role=button[name="Login"]')).toBeVisible();
 			await expect(anotherClientPage.locator('role=button[name="Login"]')).toBeVisible();
-
-			// await expect(page.locator('role=banner')).toContainText('Your session was ended on this device, please log in again to continue.');
-			// await expect(anotherClientPage.locator('role=banner')).toContainText(
-			// 	'Your session was ended on this device, please log in again to continue.',
-			// );
 		});
 	});
 });
@@ -863,13 +845,13 @@ test.describe.serial('e2ee room setup', () => {
 	});
 
 	test.beforeAll(async ({ api }) => {
-		expect((await api.post('/settings/E2E_Enable', { value: true })).status()).toBe(200);
-		expect((await api.post('/settings/E2E_Allow_Unencrypted_Messages', { value: false })).status()).toBe(200);
+		await api.post('/settings/E2E_Enable', { value: true });
+		await api.post('/settings/E2E_Allow_Unencrypted_Messages', { value: false });
 	});
 
 	test.afterAll(async ({ api }) => {
-		expect((await api.post('/settings/E2E_Enable', { value: false })).status()).toBe(200);
-		expect((await api.post('/settings/E2E_Allow_Unencrypted_Messages', { value: false })).status()).toBe(200);
+		await api.post('/settings/E2E_Enable', { value: false });
+		await api.post('/settings/E2E_Allow_Unencrypted_Messages', { value: false });
 	});
 
 	test.afterEach(async ({ api }) => {
@@ -1042,7 +1024,7 @@ test.describe.serial('e2ee room setup', () => {
 	});
 });
 
-test.describe.serial('e2ee support legacy formats', () => {
+test.describe('e2ee support legacy formats', () => {
 	test.use({ storageState: Users.userE2EE.state });
 
 	let poHomeChannel: HomeChannel;
@@ -1052,8 +1034,8 @@ test.describe.serial('e2ee support legacy formats', () => {
 	});
 
 	test.beforeAll(async ({ api }) => {
-		expect((await api.post('/settings/E2E_Enable', { value: true })).status()).toBe(200);
-		expect((await api.post('/settings/E2E_Allow_Unencrypted_Messages', { value: false })).status()).toBe(200);
+		await api.post('/settings/E2E_Enable', { value: true });
+		await api.post('/settings/E2E_Allow_Unencrypted_Messages', { value: false });
 	});
 
 	test.afterAll(async ({ api }) => {
diff --git a/apps/meteor/tests/e2e/feature-preview.spec.ts b/apps/meteor/tests/e2e/feature-preview.spec.ts
new file mode 100644
index 000000000000..c19e894e3811
--- /dev/null
+++ b/apps/meteor/tests/e2e/feature-preview.spec.ts
@@ -0,0 +1,162 @@
+import { Users } from './fixtures/userStates';
+import { AccountProfile, HomeChannel } from './page-objects';
+import { createTargetChannel, setSettingValueById } from './utils';
+import { setUserPreferences } from './utils/setUserPreferences';
+import { test, expect } from './utils/test';
+
+test.use({ storageState: Users.admin.state });
+
+test.describe.serial('feature preview', () => {
+	let poHomeChannel: HomeChannel;
+	let poAccountProfile: AccountProfile;
+	let targetChannel: string;
+
+	test.beforeAll(async ({ api }) => {
+		await setSettingValueById(api, 'Accounts_AllowFeaturePreview', true);
+		targetChannel = await createTargetChannel(api);
+	});
+
+	test.afterAll(async ({ api }) => {
+		await setSettingValueById(api, 'Accounts_AllowFeaturePreview', false);
+		await api.post('/channels.delete', { roomName: targetChannel });
+	});
+
+	test.beforeEach(async ({ page }) => {
+		poHomeChannel = new HomeChannel(page);
+		poAccountProfile = new AccountProfile(page);
+	});
+
+	test('should show "Message" and "Navigation" feature sections', async ({ page }) => {
+		await page.goto('/account/feature-preview');
+
+		await expect(page.getByRole('button', { name: 'Message' })).toBeVisible();
+		await expect(page.getByRole('button', { name: 'Navigation' })).toBeVisible();
+	});
+
+	test.describe('Enhanced navigation', () => {
+		test.beforeAll(async ({ api }) => {
+			await setUserPreferences(api, {
+				featuresPreview: [
+					{
+						name: 'newNavigation',
+						value: true,
+					},
+				],
+			});
+		});
+
+		test.afterAll(async ({ api }) => {
+			await setUserPreferences(api, {
+				featuresPreview: [
+					{
+						name: 'newNavigation',
+						value: false,
+					},
+				],
+			});
+		});
+
+		// After moving `Enhanced navigation` out of feature preview, move these tests to sidebar.spec.ts
+		test('should be able to toggle "Enhanced navigation" feature', async ({ page }) => {
+			await page.goto('/account/feature-preview');
+
+			await poAccountProfile.getAccordionItemByName('Navigation').click();
+			const newNavigationCheckbox = poAccountProfile.getCheckboxByLabelText('Enhanced navigation');
+			await expect(newNavigationCheckbox).toBeChecked();
+			await newNavigationCheckbox.click();
+			await expect(newNavigationCheckbox).not.toBeChecked();
+		});
+
+		test('should be rendering new UI with "Enhanced navigation"', async ({ page }) => {
+			await page.goto('/account/feature-preview');
+
+			await expect(poHomeChannel.navbar.navbar).toBeVisible();
+		});
+
+		test('should display "Recent" button on sidebar search section, and display recent chats when clicked', async ({ page }) => {
+			await page.goto('/home');
+
+			await poHomeChannel.sidebar.btnRecent.click();
+			await expect(poHomeChannel.sidebar.sidebar.getByRole('heading', { name: 'Recent' })).toBeVisible();
+		});
+
+		test('should expand/collapse sidebar groups', async ({ page }) => {
+			await page.goto('/home');
+			const collapser = poHomeChannel.sidebar.firstCollapser;
+			let isExpanded: boolean;
+
+			await collapser.click();
+			isExpanded = (await collapser.getAttribute('aria-expanded')) === 'true';
+			expect(isExpanded).toBeFalsy();
+
+			await collapser.click();
+			isExpanded = (await collapser.getAttribute('aria-expanded')) === 'true';
+			expect(isExpanded).toBeTruthy();
+		});
+
+		test('should expand/collapse sidebar groups with keyboard', async ({ page }) => {
+			await page.goto('/home');
+
+			const collapser = poHomeChannel.sidebar.firstCollapser;
+
+			await expect(async () => {
+				await collapser.focus();
+				await expect(collapser).toBeFocused();
+				await page.keyboard.press('Enter');
+				const isExpanded = (await collapser.getAttribute('aria-expanded')) === 'true';
+				expect(isExpanded).toBeFalsy();
+			}).toPass();
+
+			await expect(async () => {
+				await collapser.focus();
+				await page.keyboard.press('Space');
+				const isExpanded = (await collapser.getAttribute('aria-expanded')) === 'true';
+				expect(isExpanded).toBeTruthy();
+			}).toPass();
+		});
+
+		test('should be able to use keyboard to navigate through sidebar items', async ({ page }) => {
+			await page.goto('/home');
+
+			const collapser = poHomeChannel.sidebar.firstCollapser;
+			const dataIndex = await collapser.locator('../..').getAttribute('data-index');
+			const nextItem = page.locator(`[data-index="${Number(dataIndex) + 1}"]`).getByRole('link');
+
+			await expect(async () => {
+				await collapser.focus();
+				await page.keyboard.press('ArrowDown');
+				await expect(nextItem).toBeFocused();
+			}).toPass();
+		});
+
+		test('should persist collapsed/expanded groups after page reload', async ({ page }) => {
+			await page.goto('/home');
+
+			const collapser = poHomeChannel.sidebar.firstCollapser;
+			await collapser.click();
+			const isExpanded = await collapser.getAttribute('aria-expanded');
+
+			await page.reload();
+
+			const isExpandedAfterReload = await collapser.getAttribute('aria-expanded');
+			expect(isExpanded).toEqual(isExpandedAfterReload);
+		});
+
+		test('should show unread badge on collapser when group is collapsed and has unread items', async ({ page }) => {
+			await page.goto('/home');
+
+			await poHomeChannel.sidebar.openChat(targetChannel);
+			await poHomeChannel.content.sendMessage('hello world');
+
+			await poHomeChannel.sidebar.typeSearch(targetChannel);
+			const item = poHomeChannel.sidebar.getSearchRoomByName(targetChannel);
+			await poHomeChannel.sidebar.markItemAsUnread(item);
+			await poHomeChannel.sidebar.escSearch();
+
+			const collapser = poHomeChannel.sidebar.firstCollapser;
+			await collapser.click();
+
+			await expect(poHomeChannel.sidebar.getItemUnreadBadge(collapser)).toBeVisible();
+		});
+	});
+});
diff --git a/apps/meteor/tests/e2e/federation/utils/channel.ts b/apps/meteor/tests/e2e/federation/utils/channel.ts
index b5a81d2686f6..c3dbd21acfc9 100644
--- a/apps/meteor/tests/e2e/federation/utils/channel.ts
+++ b/apps/meteor/tests/e2e/federation/utils/channel.ts
@@ -1,9 +1,9 @@
 import { faker } from '@faker-js/faker';
 import type { Page } from '@playwright/test';
 
-import type { FederationChannel } from '../page-objects/channel';
 import { doLogin } from './auth';
 import type { API } from './test';
+import type { FederationChannel } from '../page-objects/channel';
 
 const doLoginAndGoToHome = async (
 	page: Page,
diff --git a/apps/meteor/tests/e2e/federation/utils/register-user.ts b/apps/meteor/tests/e2e/federation/utils/register-user.ts
index 765d017e2ed9..aac75a58924c 100644
--- a/apps/meteor/tests/e2e/federation/utils/register-user.ts
+++ b/apps/meteor/tests/e2e/federation/utils/register-user.ts
@@ -1,7 +1,7 @@
 import { faker } from '@faker-js/faker';
 
-import * as constants from '../config/constants';
 import type { API } from './test';
+import * as constants from '../config/constants';
 
 export async function registerUser(api: API): Promise<string> {
 	const username = faker.string.uuid();
diff --git a/apps/meteor/tests/e2e/federation/utils/test.ts b/apps/meteor/tests/e2e/federation/utils/test.ts
index e5ca5c0e71ec..01b237610b58 100644
--- a/apps/meteor/tests/e2e/federation/utils/test.ts
+++ b/apps/meteor/tests/e2e/federation/utils/test.ts
@@ -1,3 +1,4 @@
+/* eslint-disable react-hooks/rules-of-hooks */
 import type { APIResponse } from '@playwright/test';
 import { test as baseTest } from '@playwright/test';
 
diff --git a/apps/meteor/tests/e2e/file-upload.spec.ts b/apps/meteor/tests/e2e/file-upload.spec.ts
index 159b2650ac16..626162df47d3 100644
--- a/apps/meteor/tests/e2e/file-upload.spec.ts
+++ b/apps/meteor/tests/e2e/file-upload.spec.ts
@@ -76,6 +76,7 @@ test.describe.serial('file-upload', () => {
 		await expect(poHomeChannel.content.btnModalConfirm).not.toBeVisible();
 	});
 });
+
 test.describe('file-upload-not-member', () => {
 	let poHomeChannel: HomeChannel;
 	let targetChannel: string;
diff --git a/apps/meteor/tests/e2e/fixtures/addCustomOAuth.ts b/apps/meteor/tests/e2e/fixtures/addCustomOAuth.ts
index 10a80a7710a9..462a8c7c4679 100644
--- a/apps/meteor/tests/e2e/fixtures/addCustomOAuth.ts
+++ b/apps/meteor/tests/e2e/fixtures/addCustomOAuth.ts
@@ -1,7 +1,7 @@
 import { request } from '@playwright/test';
 
-import { BASE_API_URL } from '../config/constants';
 import { Users } from './userStates';
+import { BASE_API_URL } from '../config/constants';
 
 export default async function addCustomOAuth(): Promise<void> {
 	const api = await request.newContext();
diff --git a/apps/meteor/tests/e2e/fixtures/inject-initial-data.ts b/apps/meteor/tests/e2e/fixtures/inject-initial-data.ts
index 192b0ea66937..38659303903c 100644
--- a/apps/meteor/tests/e2e/fixtures/inject-initial-data.ts
+++ b/apps/meteor/tests/e2e/fixtures/inject-initial-data.ts
@@ -66,6 +66,10 @@ export default async function injectInitialData() {
 				_id: 'Accounts_OAuth_Google',
 				value: false,
 			},
+			{
+				_id: 'Livechat_Require_Contact_Verification',
+				value: 'never',
+			},
 		].map((setting) =>
 			connection
 				.db()
diff --git a/apps/meteor/tests/e2e/fixtures/insert-apps.ts b/apps/meteor/tests/e2e/fixtures/insert-apps.ts
index fd88714daa3b..80214074049b 100644
--- a/apps/meteor/tests/e2e/fixtures/insert-apps.ts
+++ b/apps/meteor/tests/e2e/fixtures/insert-apps.ts
@@ -1,7 +1,7 @@
 import { request } from '@playwright/test';
 
-import { BASE_API_URL, BASE_URL } from '../config/constants';
 import { Users } from './userStates';
+import { BASE_API_URL, BASE_URL } from '../config/constants';
 
 const APP_URL = 'https://github.com/RocketChat/Apps.RocketChat.Tester/blob/master/dist/appsrocketchattester_0.1.0.zip?raw=true';
 
diff --git a/apps/meteor/tests/e2e/fixtures/userStates.ts b/apps/meteor/tests/e2e/fixtures/userStates.ts
index 252023eae73c..5b42551c65f8 100644
--- a/apps/meteor/tests/e2e/fixtures/userStates.ts
+++ b/apps/meteor/tests/e2e/fixtures/userStates.ts
@@ -107,7 +107,7 @@ function generateContext(username: string): IUserState {
 										name: 'private_key',
 										value: e2eeData[username]?.client.private_key,
 									},
-							  ]
+								]
 							: []),
 					],
 				},
diff --git a/apps/meteor/tests/e2e/message-actions.spec.ts b/apps/meteor/tests/e2e/message-actions.spec.ts
index 8c84d6205e8c..1dbaf04b3b9b 100644
--- a/apps/meteor/tests/e2e/message-actions.spec.ts
+++ b/apps/meteor/tests/e2e/message-actions.spec.ts
@@ -1,6 +1,6 @@
 import { ADMIN_CREDENTIALS } from './config/constants';
 import { Users } from './fixtures/userStates';
-import { HomeChannel } from './page-objects';
+import { HomeChannel, HomeDiscussion } from './page-objects';
 import { createTargetChannel, createTargetTeam } from './utils';
 import { setUserPreferences } from './utils/setUserPreferences';
 import { expect, test } from './utils/test';
@@ -8,6 +8,7 @@ import { expect, test } from './utils/test';
 test.use({ storageState: Users.admin.state });
 test.describe.serial('message-actions', () => {
 	let poHomeChannel: HomeChannel;
+	let poHomeDiscussion: HomeDiscussion;
 	let targetChannel: string;
 	let forwardChannel: string;
 	let forwardTeam: string;
@@ -18,6 +19,7 @@ test.describe.serial('message-actions', () => {
 	});
 	test.beforeEach(async ({ page }) => {
 		poHomeChannel = new HomeChannel(page);
+		poHomeDiscussion = new HomeDiscussion(page);
 		await page.goto('/home');
 		await poHomeChannel.sidenav.openChat(targetChannel);
 	});
@@ -137,15 +139,20 @@ test.describe.serial('message-actions', () => {
 
 	test('expect create a discussion from message', async ({ page }) => {
 		const message = `Message for discussion - ${Date.now()}`;
+		const discussionName = `Discussion Name - ${Date.now()}`;
 
 		await poHomeChannel.content.sendMessage(message);
 		await poHomeChannel.content.openLastMessageMenu();
 		await page.locator('role=menuitem[name="Start a Discussion"]').click();
-		const createButton = page.getByRole('dialog').getByRole('button', { name: 'create' });
+		const createButton = poHomeDiscussion.btnCreate;
 		// Name should be prefilled thus making the create button enabled
 		await expect(createButton).not.toBeDisabled();
+		await poHomeDiscussion.inputName.fill(discussionName);
 		await createButton.click();
-		await expect(page.locator('header h1')).toHaveText(message);
+		await expect(page.locator('header h1')).toHaveText(discussionName);
+		await poHomeChannel.sidenav.openChat(targetChannel);
+		// Should fail if more than one discussion has been created
+		await expect(poHomeChannel.content.getMessageByText(discussionName)).toHaveCount(1);
 	});
 
 	test('expect star the message', async ({ page }) => {
diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-chat-history.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-chat-history.spec.ts
index 2be6347a3e0e..e718cc0a5e44 100644
--- a/apps/meteor/tests/e2e/omnichannel/omnichannel-chat-history.spec.ts
+++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-chat-history.spec.ts
@@ -6,7 +6,7 @@ import { Users } from '../fixtures/userStates';
 import { OmnichannelLiveChat, HomeOmnichannel } from '../page-objects';
 import { test, expect } from '../utils/test';
 
-test.describe('Omnichannel chat histr', () => {
+test.describe('Omnichannel chat history', () => {
 	let poLiveChat: OmnichannelLiveChat;
 	let newVisitor: { email: string; name: string };
 
@@ -18,9 +18,11 @@ test.describe('Omnichannel chat histr', () => {
 		// Set user user 1 as manager and agent
 		await api.post('/livechat/users/agent', { username: 'user1' });
 		await api.post('/livechat/users/manager', { username: 'user1' });
+
 		const { page } = await createAuxContext(browser, Users.user1);
 		agent = { page, poHomeOmnichannel: new HomeOmnichannel(page) };
 	});
+
 	test.beforeEach(async ({ page, api }) => {
 		poLiveChat = new OmnichannelLiveChat(page, api);
 	});
@@ -63,10 +65,12 @@ test.describe('Omnichannel chat histr', () => {
 		});
 
 		await test.step('Expect to be able to see conversation history', async () => {
-			await agent.poHomeOmnichannel.btnCurrentChats.click();
-			await expect(agent.poHomeOmnichannel.historyItem).toBeVisible();
-			await agent.poHomeOmnichannel.historyItem.click();
-			await expect(agent.poHomeOmnichannel.historyMessage).toBeVisible();
+			await agent.poHomeOmnichannel.btnContactInfo.click();
+			await agent.poHomeOmnichannel.contacts.contactInfo.tabHistory.click();
+			await expect(agent.poHomeOmnichannel.contacts.contactInfo.historyItem).toBeVisible();
+
+			await agent.poHomeOmnichannel.contacts.contactInfo.historyItem.click();
+			await expect(agent.poHomeOmnichannel.contacts.contactInfo.historyMessage).toBeVisible();
 		});
 	});
 });
diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-contact-center.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-contact-center.spec.ts
index d3c667e20f82..1225d2355f1a 100644
--- a/apps/meteor/tests/e2e/omnichannel/omnichannel-contact-center.spec.ts
+++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-contact-center.spec.ts
@@ -37,15 +37,15 @@ const URL = {
 		return `${this.contactCenter}/edit/${NEW_CONTACT.id}`;
 	},
 	get contactInfo() {
-		return `${this.contactCenter}/info/${NEW_CONTACT.id}`;
+		return `${this.contactCenter}/details/${NEW_CONTACT.id}`;
 	},
 };
 
 const ERROR = {
 	nameRequired: 'Name required',
 	invalidEmail: 'Invalid email address',
-	existingEmail: 'Email already exists',
-	existingPhone: 'Phone already exists',
+	emailRequired: 'Email required',
+	phoneRequired: 'Phone required',
 };
 
 test.use({ storageState: Users.admin.state });
@@ -57,7 +57,7 @@ test.describe('Omnichannel Contact Center', () => {
 	test.beforeAll(async ({ api }) => {
 		// Add a contact
 		const { id: _, ...data } = EXISTING_CONTACT;
-		await api.post('/omnichannel/contact', data);
+		await api.post('/omnichannel/contacts', data);
 
 		if (IS_EE) {
 			await api.post('/livechat/custom.field', NEW_CUSTOM_FIELD);
@@ -80,17 +80,18 @@ test.describe('Omnichannel Contact Center', () => {
 
 	test.afterEach(async ({ api }) => {
 		await api
-			.get('/omnichannel/contact.search', { phone: NEW_CONTACT.phone })
+			.get('/omnichannel/contacts.search', { searchText: NEW_CONTACT.phone })
 			.then((res) => res.json())
 			.then((res) => {
-				NEW_CONTACT.token = res.contact?.token;
-				NEW_CONTACT.id = res.contact?._id;
+				NEW_CONTACT.token = res.contacts?.[0]?.token;
+				NEW_CONTACT.id = res.contacts?.[0]?._id;
 			});
 	});
 
 	test.beforeEach(async ({ page }) => {
 		await page.goto('/');
 		await poOmniSection.btnContactCenter.click();
+		await poOmniSection.tabContacts.click();
 		await page.waitForURL(URL.contactCenter);
 	});
 
@@ -108,69 +109,45 @@ test.describe('Omnichannel Contact Center', () => {
 			await poContacts.btnNewContact.click();
 			await page.waitForURL(URL.newContact);
 			await expect(poContacts.newContact.inputName).toBeVisible();
-			await expect(poContacts.newContact.btnSave).toBeDisabled();
 		});
 
 		await test.step('input name', async () => {
-			await poContacts.newContact.inputName.type(NEW_CONTACT.name);
+			await poContacts.newContact.inputName.fill(NEW_CONTACT.name);
 		});
 
 		await test.step('validate email format', async () => {
-			await poContacts.newContact.inputEmail.type('invalidemail');
-			await expect(poContacts.newContact.errorMessage(ERROR.invalidEmail)).toBeVisible();
+			await poContacts.newContact.btnAddEmail.click();
+			await poContacts.newContact.inputEmail.fill('invalidemail');
+			await page.keyboard.press('Tab');
+			await expect(poContacts.newContact.getErrorMessage(ERROR.invalidEmail)).toBeVisible();
 		});
 
-		await test.step('input existing email', async () => {
-			await poContacts.newContact.inputEmail.selectText();
-			await poContacts.newContact.inputEmail.type(EXISTING_CONTACT.email);
-			await expect(poContacts.newContact.errorMessage(ERROR.invalidEmail)).not.toBeVisible();
-			await expect(poContacts.newContact.errorMessage(ERROR.existingEmail)).not.toBeVisible();
-		});
-
-		await test.step('input existing phone ', async () => {
-			await poContacts.newContact.inputPhone.selectText();
-			await poContacts.newContact.inputPhone.type(EXISTING_CONTACT.phone);
-			await expect(poContacts.newContact.errorMessage(ERROR.existingPhone)).not.toBeVisible();
-		});
-
-		await test.step('run async validations ', async () => {
-			await expect(poContacts.newContact.btnSave).toBeEnabled();
-			await poContacts.newContact.btnSave.click();
-
-			await expect(poContacts.newContact.errorMessage(ERROR.existingEmail)).toBeVisible();
-			await expect(poContacts.newContact.btnSave).toBeDisabled();
-
-			await expect(poContacts.newContact.errorMessage(ERROR.existingPhone)).toBeVisible();
-			await expect(poContacts.newContact.btnSave).toBeDisabled();
-		});
-
-		await test.step('input phone ', async () => {
-			await poContacts.newContact.inputPhone.selectText();
-			await poContacts.newContact.inputPhone.type(NEW_CONTACT.phone);
-			await expect(poContacts.newContact.errorMessage(ERROR.existingPhone)).not.toBeVisible();
+		await test.step('input email', async () => {
+			await poContacts.newContact.inputEmail.fill(NEW_CONTACT.email);
+			await page.keyboard.press('Tab');
+			await expect(poContacts.newContact.getErrorMessage(ERROR.invalidEmail)).not.toBeVisible();
+			await expect(poContacts.newContact.getErrorMessage(ERROR.emailRequired)).not.toBeVisible();
 		});
 
-		await test.step('input email', async () => {
-			await poContacts.newContact.inputEmail.selectText();
-			await poContacts.newContact.inputEmail.type(NEW_CONTACT.email);
-			await expect(poContacts.newContact.errorMessage(ERROR.invalidEmail)).not.toBeVisible();
-			await expect(poContacts.newContact.errorMessage(ERROR.existingEmail)).not.toBeVisible();
+		await test.step('input phone', async () => {
+			await poContacts.newContact.btnAddPhone.click();
+			await poContacts.newContact.inputPhone.fill(NEW_CONTACT.phone);
+			await page.keyboard.press('Tab');
+			await expect(poContacts.newContact.getErrorMessage(ERROR.phoneRequired)).not.toBeVisible();
 		});
 
-		await test.step('save new contact ', async () => {
+		await test.step('save new contact', async () => {
 			await expect(poContacts.newContact.btnSave).toBeEnabled();
 			await poContacts.newContact.btnSave.click();
-			await page.waitForURL(URL.contactCenter);
-			await expect(poContacts.toastSuccess).toBeVisible();
 
-			await poContacts.inputSearch.type(NEW_CONTACT.name);
+			await poContacts.inputSearch.fill(NEW_CONTACT.name);
 			await expect(poContacts.findRowByName(NEW_CONTACT.name)).toBeVisible();
 		});
 	});
 
 	test('Edit new contact', async ({ page }) => {
 		await test.step('search contact and open contextual bar', async () => {
-			await poContacts.inputSearch.type(NEW_CONTACT.name);
+			await poContacts.inputSearch.fill(NEW_CONTACT.name);
 			const row = poContacts.findRowByName(NEW_CONTACT.name);
 			await expect(row).toBeVisible();
 			await row.click();
@@ -196,69 +173,38 @@ test.describe('Omnichannel Contact Center', () => {
 		});
 
 		await test.step('validate email format', async () => {
-			await poContacts.contactInfo.inputEmail.selectText();
-			await poContacts.contactInfo.inputEmail.type('invalidemail');
-			await expect(poContacts.contactInfo.errorMessage(ERROR.invalidEmail)).toBeVisible();
-		});
-
-		await test.step('input existing email', async () => {
-			await poContacts.contactInfo.inputEmail.selectText();
-			await poContacts.contactInfo.inputEmail.type(EXISTING_CONTACT.email);
-			await expect(poContacts.contactInfo.errorMessage(ERROR.invalidEmail)).not.toBeVisible();
-			await expect(poContacts.contactInfo.errorMessage(ERROR.existingEmail)).not.toBeVisible();
-			await expect(poContacts.contactInfo.btnSave).toBeEnabled();
-		});
-
-		await test.step('input existing phone ', async () => {
-			await poContacts.contactInfo.inputPhone.selectText();
-			await poContacts.contactInfo.inputPhone.type(EXISTING_CONTACT.phone);
-			await expect(poContacts.contactInfo.errorMessage(ERROR.existingPhone)).not.toBeVisible();
-			await expect(poContacts.contactInfo.btnSave).toBeEnabled();
+			await poContacts.contactInfo.inputEmail.fill('invalidemail');
+			await page.keyboard.press('Tab');
+			await expect(poContacts.contactInfo.getErrorMessage(ERROR.invalidEmail)).toBeVisible();
 		});
 
 		await test.step('validate name is required', async () => {
-			await poContacts.contactInfo.inputName.selectText();
-			await poContacts.contactInfo.inputName.type(' ');
-			await expect(poContacts.contactInfo.errorMessage(ERROR.nameRequired)).toBeVisible();
-
-			await expect(poContacts.contactInfo.btnSave).not.toBeEnabled();
+			await poContacts.contactInfo.inputName.clear();
+			await page.keyboard.press('Tab');
+			await expect(poContacts.contactInfo.getErrorMessage(ERROR.nameRequired)).toBeVisible();
 		});
 
 		await test.step('edit name', async () => {
-			await poContacts.contactInfo.inputName.selectText();
-			await poContacts.contactInfo.inputName.type(EDIT_CONTACT.name);
-		});
-
-		await test.step('run async validations ', async () => {
-			await expect(poContacts.newContact.btnSave).toBeEnabled();
-			await poContacts.newContact.btnSave.click();
-
-			await expect(poContacts.newContact.errorMessage(ERROR.existingEmail)).toBeVisible();
-			await expect(poContacts.newContact.btnSave).toBeDisabled();
-
-			await expect(poContacts.newContact.errorMessage(ERROR.existingPhone)).toBeVisible();
-			await expect(poContacts.newContact.btnSave).toBeDisabled();
+			await poContacts.contactInfo.inputName.fill(EDIT_CONTACT.name);
 		});
 
 		await test.step('input phone ', async () => {
-			await poContacts.newContact.inputPhone.selectText();
-			await poContacts.newContact.inputPhone.type(EDIT_CONTACT.phone);
-			await expect(poContacts.newContact.errorMessage(ERROR.existingPhone)).not.toBeVisible();
+			await poContacts.newContact.inputPhone.fill(EDIT_CONTACT.phone);
+			await page.keyboard.press('Tab');
+			await expect(poContacts.newContact.getErrorMessage(ERROR.phoneRequired)).not.toBeVisible();
 		});
 
 		await test.step('input email', async () => {
-			await poContacts.newContact.inputEmail.selectText();
-			await poContacts.newContact.inputEmail.type(EDIT_CONTACT.email);
-			await expect(poContacts.newContact.errorMessage(ERROR.invalidEmail)).not.toBeVisible();
-			await expect(poContacts.newContact.errorMessage(ERROR.existingEmail)).not.toBeVisible();
+			await poContacts.newContact.inputEmail.fill(EDIT_CONTACT.email);
+			await page.keyboard.press('Tab');
+			await expect(poContacts.newContact.getErrorMessage(ERROR.invalidEmail)).not.toBeVisible();
+			await expect(poContacts.newContact.getErrorMessage(ERROR.emailRequired)).not.toBeVisible();
 		});
 
 		await test.step('save new contact ', async () => {
 			await poContacts.contactInfo.btnSave.click();
-			await expect(poContacts.toastSuccess).toBeVisible();
 
-			await poContacts.inputSearch.selectText();
-			await poContacts.inputSearch.type(EDIT_CONTACT.name);
+			await poContacts.inputSearch.fill(EDIT_CONTACT.name);
 			await expect(poContacts.findRowByName(EDIT_CONTACT.name)).toBeVisible();
 		});
 	});
diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-contact-info.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-contact-info.spec.ts
index 76b8ac386ef7..7d06da790bcf 100644
--- a/apps/meteor/tests/e2e/omnichannel/omnichannel-contact-info.spec.ts
+++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-contact-info.spec.ts
@@ -4,13 +4,14 @@ import { createFakeVisitor } from '../../mocks/data';
 import { createAuxContext } from '../fixtures/createAuxContext';
 import { Users } from '../fixtures/userStates';
 import { OmnichannelLiveChat, HomeChannel } from '../page-objects';
-import { test } from '../utils/test';
+import { OmnichannelContacts } from '../page-objects/omnichannel-contacts-list';
+import { expect, test } from '../utils/test';
 
 test.describe('Omnichannel contact info', () => {
 	let poLiveChat: OmnichannelLiveChat;
 	let newVisitor: { email: string; name: string };
 
-	let agent: { page: Page; poHomeChannel: HomeChannel };
+	let agent: { page: Page; poHomeChannel: HomeChannel; poContacts: OmnichannelContacts };
 
 	test.beforeAll(async ({ api, browser }) => {
 		newVisitor = createFakeVisitor();
@@ -20,7 +21,7 @@ test.describe('Omnichannel contact info', () => {
 		await api.post('/livechat/users/manager', { username: 'user1' });
 
 		const { page } = await createAuxContext(browser, Users.user1);
-		agent = { page, poHomeChannel: new HomeChannel(page) };
+		agent = { page, poHomeChannel: new HomeChannel(page), poContacts: new OmnichannelContacts(page) };
 	});
 	test.beforeEach(async ({ page, api }) => {
 		poLiveChat = new OmnichannelLiveChat(page, api);
@@ -45,9 +46,16 @@ test.describe('Omnichannel contact info', () => {
 			await agent.poHomeChannel.sidenav.openChat(newVisitor.name);
 		});
 
-		await test.step('Expect to be see contact information and edit', async () => {
+		await test.step('Expect to be able to see contact information and edit', async () => {
 			await agent.poHomeChannel.content.btnContactInformation.click();
 			await agent.poHomeChannel.content.btnContactEdit.click();
 		});
+
+		await test.step('Expect to update room name and subscription when updating contact name', async () => {
+			await agent.poContacts.newContact.inputName.fill('Edited Contact Name');
+			await agent.poContacts.newContact.btnSave.click();
+			await expect(agent.poHomeChannel.sidenav.sidebarChannelsList.getByText('Edited Contact Name')).toBeVisible();
+			await expect(agent.poHomeChannel.content.channelHeader.getByText('Edited Contact Name')).toBeVisible();
+		});
 	});
 });
diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat-api.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat-api.spec.ts
index e529746def9e..e14e3b43fbe3 100644
--- a/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat-api.spec.ts
+++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat-api.spec.ts
@@ -588,7 +588,7 @@ test.describe('OC - Livechat API', () => {
 			});
 		});
 
-		test('OC - Livechat API - setGuestEmail', async () => {
+		test.skip('OC - Livechat API - setGuestEmail', async () => {
 			const registerGuestVisitor = createFakeVisitorRegistration();
 			// Start Chat
 			await poLiveChat.page.evaluate(() => window.RocketChat.livechat.maximizeWidget());
diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat-queue-management-autoselection.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat-queue-management-autoselection.spec.ts
new file mode 100644
index 000000000000..62bf3111cab7
--- /dev/null
+++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat-queue-management-autoselection.spec.ts
@@ -0,0 +1,118 @@
+import { createFakeVisitor } from '../../mocks/data';
+import { IS_EE } from '../config/constants';
+import { createAuxContext } from '../fixtures/createAuxContext';
+import { Users } from '../fixtures/userStates';
+import { HomeOmnichannel, OmnichannelLiveChat } from '../page-objects';
+import { test, expect } from '../utils/test';
+
+const firstVisitor = createFakeVisitor();
+
+const secondVisitor = createFakeVisitor();
+
+test.use({ storageState: Users.user1.state });
+
+test.describe('OC - Livechat - Queue Management', () => {
+	test.skip(!IS_EE, 'Enterprise Only');
+
+	let poHomeOmnichannel: HomeOmnichannel;
+	let poLiveChat: OmnichannelLiveChat;
+
+	const waitingQueueMessage = 'This is a message from Waiting Queue';
+
+	test.beforeAll(async ({ api, browser }) => {
+		await Promise.all([
+			api.post('/settings/Livechat_Routing_Method', { value: 'Auto_Selection' }),
+			api.post('/settings/Livechat_accept_chats_with_no_agents', { value: true }),
+			api.post('/settings/Livechat_waiting_queue', { value: true }),
+			api.post('/settings/Livechat_waiting_queue_message', { value: waitingQueueMessage }),
+			api.post('/livechat/users/agent', { username: 'user1' }),
+		]);
+
+		const { page: omniPage } = await createAuxContext(browser, Users.user1, '/', true);
+		poHomeOmnichannel = new HomeOmnichannel(omniPage);
+
+		// Agent will be offline for these tests
+		await poHomeOmnichannel.sidenav.switchOmnichannelStatus('offline');
+	});
+
+	test.beforeEach(async ({ browser, api }) => {
+		const context = await browser.newContext();
+		const page2 = await context.newPage();
+
+		poLiveChat = new OmnichannelLiveChat(page2, api);
+		await poLiveChat.page.goto('/livechat');
+	});
+
+	test.afterAll(async ({ api }) => {
+		await Promise.all([
+			api.post('/settings/Livechat_waiting_queue', { value: false }),
+			api.post('/settings/Livechat_waiting_queue_message', { value: '' }),
+			api.delete('/livechat/users/agent/user1'),
+		]);
+		await poHomeOmnichannel.page.close();
+	});
+
+	test.describe('OC - Queue Management - Auto Selection', () => {
+		let poLiveChat2: OmnichannelLiveChat;
+
+		test.beforeEach(async ({ browser, api }) => {
+			const context = await browser.newContext();
+			const page = await context.newPage();
+			poLiveChat2 = new OmnichannelLiveChat(page, api);
+			await poLiveChat2.page.goto('/livechat');
+		});
+
+		test.afterEach(async () => {
+			await poLiveChat2.closeChat();
+			await poLiveChat2.page.close();
+			await poLiveChat.closeChat();
+			await poLiveChat.page.close();
+		});
+
+		test('Update user position on Queue', async () => {
+			await test.step('should start livechat session', async () => {
+				await poLiveChat.openAnyLiveChatAndSendMessage({
+					liveChatUser: firstVisitor,
+					message: 'Test message',
+					isOffline: false,
+				});
+			});
+
+			await test.step('expect to receive Waiting Queue message on chat', async () => {
+				await expect(poLiveChat.page.locator(`div >> text=${waitingQueueMessage}`)).toBeVisible();
+			});
+
+			await test.step('expect to be on spot #1', async () => {
+				await expect(poLiveChat.queuePosition(1)).toBeVisible();
+			});
+
+			await test.step('should start secondary livechat session', async () => {
+				await poLiveChat2.openAnyLiveChatAndSendMessage({
+					liveChatUser: secondVisitor,
+					message: 'Test message',
+					isOffline: false,
+				});
+			});
+
+			await test.step('should start secondary livechat on spot #2', async () => {
+				await expect(poLiveChat2.queuePosition(2)).toBeVisible();
+			});
+
+			await test.step('should start the queue by making the agent available again', async () => {
+				await poHomeOmnichannel.sidenav.switchOmnichannelStatus('online');
+			});
+
+			await test.step('user1 should get assigned to the first chat', async () => {
+				await expect(poLiveChat.queuePosition(1)).not.toBeVisible();
+			});
+
+			await test.step('secondary session should be on position #1', async () => {
+				await expect(poLiveChat2.queuePosition(1)).toBeVisible();
+			});
+
+			await test.step('secondary session should be taken by user1', async () => {
+				await expect(poLiveChat2.queuePosition(1)).not.toBeVisible();
+			});
+		});
+	});
+});
diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat-tab-communication.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat-tab-communication.spec.ts
index 59d42dfe1e10..5f3a35004a8d 100644
--- a/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat-tab-communication.spec.ts
+++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-livechat-tab-communication.spec.ts
@@ -51,12 +51,11 @@ test.describe('OC - Livechat - Cross Tab Communication', () => {
 			await pageLivechat1.onlineAgentMessage.fill('this_a_test_message_from_user');
 			await pageLivechat1.btnSendMessageToOnlineAgent.click();
 
-			await expect(pageLivechat1.page.locator('div >> text="this_a_test_message_from_user"')).toBeVisible();
-
-			await expect(pageLivechat2.page.locator('div >> text="this_a_test_message_from_user"')).toBeVisible();
+			await expect(pageLivechat1.txtChatMessage('this_a_test_message_from_user')).toBeVisible();
+			await expect(pageLivechat2.txtChatMessage('this_a_test_message_from_user')).toBeVisible();
 		});
 
-		await test.step('expect to restart a livechat conversation and tabs to be synced', async () => {
+		await test.step('expect to close livechat conversation', async () => {
 			await expect(pageLivechat1.btnOptions).toBeVisible();
 			await pageLivechat1.btnOptions.click();
 
@@ -64,21 +63,33 @@ test.describe('OC - Livechat - Cross Tab Communication', () => {
 			await pageLivechat1.btnCloseChat.click();
 
 			await pageLivechat1.btnCloseChatConfirm.click();
+		});
 
+		await test.step('expect to restart a livechat conversation and tabs to be synced', async () => {
 			await expect(pageLivechat1.btnNewChat).toBeVisible();
 			await pageLivechat1.startNewChat();
 
 			await pageLivechat1.onlineAgentMessage.fill('this_a_test_message_from_user_after_close');
 			await pageLivechat1.btnSendMessageToOnlineAgent.click();
 
-			await pageLivechat1.page.locator('div >> text="this_a_test_message_from_user"').waitFor({ state: 'hidden' });
-			await pageLivechat2.page.locator('div >> text="this_a_test_message_from_user"').waitFor({ state: 'hidden' });
+			await pageLivechat1.txtChatMessage('this_a_test_message_from_user').waitFor({ state: 'hidden' });
+			await pageLivechat2.txtChatMessage('this_a_test_message_from_user').waitFor({ state: 'hidden' });
 
-			await expect(pageLivechat1.page.locator('div >> text="this_a_test_message_from_user"')).not.toBeVisible();
-			await expect(pageLivechat2.page.locator('div >> text="this_a_test_message_from_user"')).not.toBeVisible();
+			await expect(pageLivechat1.txtChatMessage('this_a_test_message_from_user')).not.toBeVisible();
+			await expect(pageLivechat2.txtChatMessage('this_a_test_message_from_user')).not.toBeVisible();
 
-			await expect(pageLivechat1.page.locator('div >> text="this_a_test_message_from_user_after_close"')).toBeVisible();
-			await expect(pageLivechat2.page.locator('div >> text="this_a_test_message_from_user_after_close"')).toBeVisible();
+			await expect(pageLivechat1.txtChatMessage('this_a_test_message_from_user_after_close')).toBeVisible();
+			await expect(pageLivechat2.txtChatMessage('this_a_test_message_from_user_after_close')).toBeVisible();
+		});
+
+		await test.step('expect to close livechat conversation', async () => {
+			await expect(pageLivechat1.btnOptions).toBeVisible();
+			await pageLivechat1.btnOptions.click();
+
+			await expect(pageLivechat1.btnCloseChat).toBeVisible();
+			await pageLivechat1.btnCloseChat.click();
+
+			await pageLivechat1.btnCloseChatConfirm.click();
 		});
 	});
 });
diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-send-pdf-transcript.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-send-pdf-transcript.spec.ts
index a6bd8640749d..75c06efc7507 100644
--- a/apps/meteor/tests/e2e/omnichannel/omnichannel-send-pdf-transcript.spec.ts
+++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-send-pdf-transcript.spec.ts
@@ -76,7 +76,7 @@ test.describe('omnichannel- export chat transcript as PDF', () => {
 			await agent.poHomeChannel.transcript.contactCenterSearch.type(newVisitor.name);
 			await page.waitForTimeout(3000);
 			await agent.poHomeChannel.transcript.firstRow.click();
-			await agent.poHomeChannel.transcript.viewFullConversation.click();
+			await agent.poHomeChannel.transcript.btnOpenChat.click();
 			await agent.poHomeChannel.content.btnSendTranscript.click();
 			await expect(agent.poHomeChannel.content.btnSendTranscriptAsPDF).toHaveAttribute('aria-disabled', 'false');
 			await agent.poHomeChannel.content.btnSendTranscriptAsPDF.click();
diff --git a/apps/meteor/tests/e2e/omnichannel/omnichannel-units.spec.ts b/apps/meteor/tests/e2e/omnichannel/omnichannel-units.spec.ts
index cd33a56caa04..2cd06285b17a 100644
--- a/apps/meteor/tests/e2e/omnichannel/omnichannel-units.spec.ts
+++ b/apps/meteor/tests/e2e/omnichannel/omnichannel-units.spec.ts
@@ -75,10 +75,8 @@ test.describe('OC - Manage Units', () => {
 			await poOmnichannelUnits.btnSave.click();
 			await expect(poOmnichannelUnits.contextualBar).not.toBeVisible();
 
-			await test.step('expect unit to have been created', async () => {
-				await poOmnichannelUnits.search(unitName);
-				await expect(poOmnichannelUnits.findRowByName(unitName)).toBeVisible();
-			});
+			await poOmnichannelUnits.search(unitName);
+			await expect(poOmnichannelUnits.findRowByName(unitName)).toBeVisible();
 		});
 
 		await test.step('expect to delete unit', async () => {
@@ -114,9 +112,7 @@ test.describe('OC - Manage Units', () => {
 			await expect(poOmnichannelUnits.contextualBar).toBeVisible();
 			await poOmnichannelUnits.inputName.fill(editedUnitName);
 			await poOmnichannelUnits.btnSave.click();
-		});
-
-		await test.step('expect unit to have been edited', async () => {
+			await expect(poOmnichannelUnits.contextualBar).not.toBeVisible();
 			await expect(poOmnichannelUnits.inputSearch).toBeVisible();
 			await poOmnichannelUnits.search(editedUnitName);
 			await expect(poOmnichannelUnits.findRowByName(editedUnitName)).toBeVisible();
@@ -126,9 +122,8 @@ test.describe('OC - Manage Units', () => {
 			await poOmnichannelUnits.findRowByName(editedUnitName).click();
 			await poOmnichannelUnits.selectMonitor('user3');
 			await poOmnichannelUnits.btnSave.click();
-		});
+			await expect(poOmnichannelUnits.contextualBar).not.toBeVisible();
 
-		await test.step('expect unit to have been edited with 2 monitors', async () => {
 			await poOmnichannelUnits.search(editedUnitName);
 			await poOmnichannelUnits.findRowByName(editedUnitName).click();
 
@@ -141,6 +136,7 @@ test.describe('OC - Manage Units', () => {
 			await poOmnichannelUnits.findRowByName(editedUnitName).click();
 			await poOmnichannelUnits.selectMonitor('user2');
 			await poOmnichannelUnits.btnSave.click();
+			await expect(poOmnichannelUnits.contextualBar).not.toBeVisible();
 
 			await poOmnichannelUnits.search(editedUnitName);
 			await poOmnichannelUnits.findRowByName(editedUnitName).click();
@@ -160,6 +156,7 @@ test.describe('OC - Manage Units', () => {
 			});
 
 			await expect(poOmnichannelUnits.contextualBar).not.toBeVisible();
+			await expect(poOmnichannelUnits.findRowByName(editedUnitName)).not.toBeVisible();
 		});
 	});
 
@@ -183,9 +180,8 @@ test.describe('OC - Manage Units', () => {
 			await expect(poOmnichannelUnits.contextualBar).toBeVisible();
 			await poOmnichannelUnits.selectDepartment({ name: department2.data.name, _id: department2.data._id });
 			await poOmnichannelUnits.btnSave.click();
-		});
+			await expect(poOmnichannelUnits.contextualBar).not.toBeVisible();
 
-		await test.step('expect department to be in the chosen departments list and have title', async () => {
 			await poOmnichannelUnits.search(unit.name);
 			await poOmnichannelUnits.findRowByName(unit.name).click();
 			await expect(poOmnichannelUnits.contextualBar).toBeVisible();
@@ -201,11 +197,9 @@ test.describe('OC - Manage Units', () => {
 			await poOmnichannelUnits.findRowByName(unit.name).click();
 			await expect(poOmnichannelUnits.contextualBar).toBeVisible();
 			await poOmnichannelUnits.selectDepartment({ name: department2.data.name, _id: department2.data._id });
-			await poOmnichannelUnits.selectMonitor('user2');
 			await poOmnichannelUnits.btnSave.click();
-		});
+			await expect(poOmnichannelUnits.contextualBar).not.toBeVisible();
 
-		await test.step('expect department to not be in the chosen departments list', async () => {
 			await poOmnichannelUnits.search(unit.name);
 			await poOmnichannelUnits.findRowByName(unit.name).click();
 			await expect(poOmnichannelUnits.contextualBar).toBeVisible();
@@ -224,6 +218,7 @@ test.describe('OC - Manage Units', () => {
 			});
 
 			await expect(poOmnichannelUnits.contextualBar).not.toBeVisible();
+			await expect(poOmnichannelUnits.findRowByName(unit.name)).not.toBeVisible();
 		});
 	});
 });
diff --git a/apps/meteor/tests/e2e/page-objects/account-profile.ts b/apps/meteor/tests/e2e/page-objects/account-profile.ts
index 971b6dffc86e..f7f41911e6d3 100644
--- a/apps/meteor/tests/e2e/page-objects/account-profile.ts
+++ b/apps/meteor/tests/e2e/page-objects/account-profile.ts
@@ -111,4 +111,12 @@ export class AccountProfile {
 	get securityE2EEncryptionSavePasswordButton(): Locator {
 		return this.page.locator("role=button[name='Save changes']");
 	}
+
+	getAccordionItemByName(name: string): Locator {
+		return this.page.getByRole('button', { name, exact: true });
+	}
+
+	getCheckboxByLabelText(name: string): Locator {
+		return this.page.locator('label', { has: this.page.getByRole('checkbox', { name }) });
+	}
 }
diff --git a/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts b/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts
index 2fe12cab570c..0c77364ed57a 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/home-content.ts
@@ -85,7 +85,7 @@ export class HomeContent {
 		await this.joinRoomIfNeeded();
 		await this.page.waitForSelector('[name="msg"]:not([disabled])');
 		await this.page.locator('[name="msg"]').fill(text);
-		await this.page.getByLabel('Send').click();
+		await this.page.getByRole('button', { name: 'Send', exact: true }).click();
 	}
 
 	async dispatchSlashCommand(text: string): Promise<void> {
@@ -211,7 +211,7 @@ export class HomeContent {
 	}
 
 	get btnContactEdit(): Locator {
-		return this.page.locator('.rcx-vertical-bar button:has-text("Edit")');
+		return this.page.getByRole('dialog').getByRole('button', { name: 'Edit', exact: true });
 	}
 
 	get inputModalClosingComment(): Locator {
@@ -391,6 +391,10 @@ export class HomeContent {
 		return this.page.locator('[aria-roledescription="system message"]', { hasText: text });
 	}
 
+	getMessageByText(text: string): Locator {
+		return this.page.locator('[role="listitem"][aria-roledescription="message"]', { hasText: text });
+	}
+
 	async waitForChannel(): Promise<void> {
 		await this.page.locator('role=main').waitFor();
 		await this.page.locator('role=main >> role=heading[level=1]').waitFor();
diff --git a/apps/meteor/tests/e2e/page-objects/fragments/home-omnichannel-content.ts b/apps/meteor/tests/e2e/page-objects/fragments/home-omnichannel-content.ts
index cb2172d6fa48..8df460cdb211 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/home-omnichannel-content.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/home-omnichannel-content.ts
@@ -52,7 +52,7 @@ export class HomeOmnichannelContent extends HomeContent {
 	}
 
 	get infoContactEmail(): Locator {
-		return this.page.locator('[data-qa-id="contactInfo-email"]');
+		return this.page.getByRole('dialog').locator('p[data-type="email"]');
 	}
 
 	get infoContactName(): Locator {
diff --git a/apps/meteor/tests/e2e/page-objects/fragments/home-sidenav.ts b/apps/meteor/tests/e2e/page-objects/fragments/home-sidenav.ts
index 823469d02a96..46f806104420 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/home-sidenav.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/home-sidenav.ts
@@ -61,7 +61,7 @@ export class HomeSidenav {
 
 	// Note: this is different from openChat because queued chats are not searchable
 	getQueuedChat(name: string): Locator {
-		return this.page.locator('[data-qa="sidebar-item-title"]', { hasText: name }).first();
+		return this.page.locator('[data-qa="sidebar-item-title"]', { hasText: new RegExp(`^${name}$`) }).first();
 	}
 
 	get accountProfileOption(): Locator {
@@ -175,7 +175,7 @@ export class HomeSidenav {
 
 	async createEncryptedChannel(name: string) {
 		await this.openNewByLabel('Channel');
-		await this.inputChannelName.type(name);
+		await this.inputChannelName.fill(name);
 		await this.advancedSettingsAccordion.click();
 		await this.checkboxEncryption.click();
 		await this.btnCreate.click();
diff --git a/apps/meteor/tests/e2e/page-objects/fragments/index.ts b/apps/meteor/tests/e2e/page-objects/fragments/index.ts
index e0d7c8e45d9a..fc5ab5e62385 100644
--- a/apps/meteor/tests/e2e/page-objects/fragments/index.ts
+++ b/apps/meteor/tests/e2e/page-objects/fragments/index.ts
@@ -4,3 +4,5 @@ export * from './home-flextab';
 export * from './home-sidenav';
 export * from './omnichannel-sidenav';
 export * from './omnichannel-close-chat-modal';
+export * from './navbar';
+export * from './sidebar';
diff --git a/apps/meteor/tests/e2e/page-objects/fragments/navbar.ts b/apps/meteor/tests/e2e/page-objects/fragments/navbar.ts
new file mode 100644
index 000000000000..55cda22ed09e
--- /dev/null
+++ b/apps/meteor/tests/e2e/page-objects/fragments/navbar.ts
@@ -0,0 +1,21 @@
+import type { Locator, Page } from '@playwright/test';
+
+export class Navbar {
+	private readonly page: Page;
+
+	constructor(page: Page) {
+		this.page = page;
+	}
+
+	get navbar(): Locator {
+		return this.page.getByRole('navigation', { name: 'header' });
+	}
+
+	get pagesToolbar(): Locator {
+		return this.navbar.getByRole('toolbar', { name: 'Pages' });
+	}
+
+	get homeButton(): Locator {
+		return this.pagesToolbar.getByRole('button', { name: 'Home' });
+	}
+}
diff --git a/apps/meteor/tests/e2e/page-objects/fragments/sidebar.ts b/apps/meteor/tests/e2e/page-objects/fragments/sidebar.ts
new file mode 100644
index 000000000000..b19fccd141a7
--- /dev/null
+++ b/apps/meteor/tests/e2e/page-objects/fragments/sidebar.ts
@@ -0,0 +1,85 @@
+import type { Locator, Page } from '@playwright/test';
+
+import { expect } from '../../utils/test';
+
+export class Sidebar {
+	private readonly page: Page;
+
+	constructor(page: Page) {
+		this.page = page;
+	}
+
+	// New navigation locators
+	get sidebar(): Locator {
+		return this.page.getByRole('navigation', { name: 'sidebar' });
+	}
+
+	get sidebarSearchSection(): Locator {
+		return this.sidebar.getByRole('search');
+	}
+
+	get btnRecent(): Locator {
+		return this.sidebarSearchSection.getByRole('button', { name: 'Recent' });
+	}
+
+	get channelsList(): Locator {
+		return this.sidebar.getByRole('list', { name: 'Channels' });
+	}
+
+	get searchList(): Locator {
+		return this.sidebar.getByRole('search').getByRole('list', { name: 'Channels' });
+	}
+
+	get firstCollapser(): Locator {
+		return this.channelsList.getByRole('button').first();
+	}
+
+	get firstChannelFromList(): Locator {
+		return this.channelsList.getByRole('listitem').first();
+	}
+
+	get searchInput(): Locator {
+		return this.sidebarSearchSection.getByRole('searchbox');
+	}
+
+	async escSearch(): Promise<void> {
+		await this.page.keyboard.press('Escape');
+	}
+
+	async waitForChannel(): Promise<void> {
+		await this.page.locator('role=main').waitFor();
+		await this.page.locator('role=main >> role=heading[level=1]').waitFor();
+		await this.page.locator('role=main >> role=list').waitFor();
+
+		await expect(this.page.locator('role=main >> role=list')).not.toHaveAttribute('aria-busy', 'true');
+	}
+
+	async typeSearch(name: string): Promise<void> {
+		return this.searchInput.fill(name);
+	}
+
+	getSearchRoomByName(name: string): Locator {
+		return this.searchList.getByRole('link', { name });
+	}
+
+	async openChat(name: string): Promise<void> {
+		await this.typeSearch(name);
+		await this.getSearchRoomByName(name).click();
+		await this.waitForChannel();
+	}
+
+	async markItemAsUnread(item: Locator): Promise<void> {
+		await item.hover();
+		await item.focus();
+		await item.locator('.rcx-sidebar-item__menu').click();
+		await this.page.getByRole('option', { name: 'Mark Unread' }).click();
+	}
+
+	getCollapseGroupByName(name: string): Locator {
+		return this.channelsList.getByRole('button', { name, exact: true });
+	}
+
+	getItemUnreadBadge(item: Locator): Locator {
+		return item.getByRole('status', { name: 'unread' });
+	}
+}
diff --git a/apps/meteor/tests/e2e/page-objects/home-channel.ts b/apps/meteor/tests/e2e/page-objects/home-channel.ts
index ce51896eb449..76929b6c2dcf 100644
--- a/apps/meteor/tests/e2e/page-objects/home-channel.ts
+++ b/apps/meteor/tests/e2e/page-objects/home-channel.ts
@@ -1,6 +1,6 @@
 import type { Locator, Page } from '@playwright/test';
 
-import { HomeContent, HomeSidenav, HomeFlextab } from './fragments';
+import { HomeContent, HomeSidenav, HomeFlextab, Navbar, Sidebar } from './fragments';
 
 export class HomeChannel {
 	public readonly page: Page;
@@ -9,12 +9,18 @@ export class HomeChannel {
 
 	readonly sidenav: HomeSidenav;
 
+	readonly sidebar: Sidebar;
+
+	readonly navbar: Navbar;
+
 	readonly tabs: HomeFlextab;
 
 	constructor(page: Page) {
 		this.page = page;
 		this.content = new HomeContent(page);
 		this.sidenav = new HomeSidenav(page);
+		this.sidebar = new Sidebar(page);
+		this.navbar = new Navbar(page);
 		this.tabs = new HomeFlextab(page);
 	}
 
diff --git a/apps/meteor/tests/e2e/page-objects/home-omnichannel.ts b/apps/meteor/tests/e2e/page-objects/home-omnichannel.ts
index 9111df7080ab..89fde4b5a904 100644
--- a/apps/meteor/tests/e2e/page-objects/home-omnichannel.ts
+++ b/apps/meteor/tests/e2e/page-objects/home-omnichannel.ts
@@ -3,6 +3,7 @@ import type { Locator, Page } from '@playwright/test';
 import { HomeOmnichannelContent, HomeSidenav, HomeFlextab, OmnichannelSidenav } from './fragments';
 import { OmnichannelAgents } from './omnichannel-agents';
 import { OmnichannelCannedResponses } from './omnichannel-canned-responses';
+import { OmnichannelContacts } from './omnichannel-contacts-list';
 import { OmnichannelCurrentChats } from './omnichannel-current-chats';
 import { OmnichannelManager } from './omnichannel-manager';
 import { OmnichannelMonitors } from './omnichannel-monitors';
@@ -34,6 +35,8 @@ export class HomeOmnichannel {
 
 	readonly monitors: OmnichannelMonitors;
 
+	readonly contacts: OmnichannelContacts;
+
 	constructor(page: Page) {
 		this.page = page;
 		this.content = new HomeOmnichannelContent(page);
@@ -47,6 +50,7 @@ export class HomeOmnichannel {
 		this.agents = new OmnichannelAgents(page);
 		this.managers = new OmnichannelManager(page);
 		this.monitors = new OmnichannelMonitors(page);
+		this.contacts = new OmnichannelContacts(page);
 	}
 
 	get toastSuccess(): Locator {
@@ -57,15 +61,7 @@ export class HomeOmnichannel {
 		return this.page.locator('[data-qa="ContextualbarActionClose"]');
 	}
 
-	get btnCurrentChats(): Locator {
-		return this.page.locator('[data-qa-id="ToolBoxAction-clock"]');
-	}
-
-	get historyItem(): Locator {
-		return this.page.locator('[data-qa="chat-history-item"]').first();
-	}
-
-	get historyMessage(): Locator {
-		return this.page.locator('[data-qa="chat-history-message"]').first();
+	get btnContactInfo(): Locator {
+		return this.page.getByRole('button', { name: 'Contact Information' });
 	}
 }
diff --git a/apps/meteor/tests/e2e/page-objects/omnichannel-contacts-list.ts b/apps/meteor/tests/e2e/page-objects/omnichannel-contacts-list.ts
index f5d863590bfa..da732e0a2200 100644
--- a/apps/meteor/tests/e2e/page-objects/omnichannel-contacts-list.ts
+++ b/apps/meteor/tests/e2e/page-objects/omnichannel-contacts-list.ts
@@ -27,8 +27,4 @@ export class OmnichannelContacts {
 	findRowByName(contactName: string) {
 		return this.page.locator(`td >> text="${contactName}"`);
 	}
-
-	get toastSuccess(): Locator {
-		return this.page.locator('.rcx-toastbar.rcx-toastbar--success');
-	}
 }
diff --git a/apps/meteor/tests/e2e/page-objects/omnichannel-info.ts b/apps/meteor/tests/e2e/page-objects/omnichannel-info.ts
index a56c2e54f1ea..f7e9cf94e506 100644
--- a/apps/meteor/tests/e2e/page-objects/omnichannel-info.ts
+++ b/apps/meteor/tests/e2e/page-objects/omnichannel-info.ts
@@ -3,6 +3,10 @@ import type { Locator } from '@playwright/test';
 import { OmnichannelManageContact } from './omnichannel-manage-contact';
 
 export class OmnichannelContactInfo extends OmnichannelManageContact {
+	get dialogContactInfo(): Locator {
+		return this.page.getByRole('dialog', { name: 'Contact' });
+	}
+
 	get btnEdit(): Locator {
 		return this.page.locator('role=button[name="Edit"]');
 	}
@@ -10,4 +14,16 @@ export class OmnichannelContactInfo extends OmnichannelManageContact {
 	get btnCall(): Locator {
 		return this.page.locator('role=button[name=Call"]');
 	}
+
+	get tabHistory(): Locator {
+		return this.dialogContactInfo.getByRole('tab', { name: 'History' });
+	}
+
+	get historyItem(): Locator {
+		return this.dialogContactInfo.getByRole('listitem').first();
+	}
+
+	get historyMessage(): Locator {
+		return this.dialogContactInfo.getByRole('listitem').first();
+	}
 }
diff --git a/apps/meteor/tests/e2e/page-objects/omnichannel-livechat.ts b/apps/meteor/tests/e2e/page-objects/omnichannel-livechat.ts
index e52ae45782c8..b8cf77d63f71 100644
--- a/apps/meteor/tests/e2e/page-objects/omnichannel-livechat.ts
+++ b/apps/meteor/tests/e2e/page-objects/omnichannel-livechat.ts
@@ -7,7 +7,10 @@ import { expect } from '../utils/test';
 export class OmnichannelLiveChat {
 	readonly page: Page;
 
-	constructor(page: Page, private readonly api: { get(url: string): Promise<APIResponse> }) {
+	constructor(
+		page: Page,
+		private readonly api: { get(url: string): Promise<APIResponse> },
+	) {
 		this.page = page;
 	}
 
@@ -64,7 +67,7 @@ export class OmnichannelLiveChat {
 	}
 
 	txtChatMessage(message: string): Locator {
-		return this.page.locator(`text="${message}"`);
+		return this.page.locator(`[data-qa="message-bubble"] >> text="${message}"`);
 	}
 
 	async closeChat(): Promise<void> {
@@ -220,4 +223,8 @@ export class OmnichannelLiveChat {
 
 		await this.fileUploadTarget.dispatchEvent('drop', { dataTransfer });
 	}
+
+	queuePosition(position: number): Locator {
+		return this.page.locator(`div[role='alert'] >> text=Your spot is #${position}`);
+	}
 }
diff --git a/apps/meteor/tests/e2e/page-objects/omnichannel-manage-contact.ts b/apps/meteor/tests/e2e/page-objects/omnichannel-manage-contact.ts
index 8f41d535ad65..6d87af0d52b8 100644
--- a/apps/meteor/tests/e2e/page-objects/omnichannel-manage-contact.ts
+++ b/apps/meteor/tests/e2e/page-objects/omnichannel-manage-contact.ts
@@ -12,11 +12,11 @@ export class OmnichannelManageContact {
 	}
 
 	get inputEmail(): Locator {
-		return this.page.locator('input[name=email]');
+		return this.page.locator('input[name="emails.0.address"]');
 	}
 
 	get inputPhone(): Locator {
-		return this.page.locator('input[name=phone]');
+		return this.page.locator('input[name="phones.0.phoneNumber"]');
 	}
 
 	get inputContactManager(): Locator {
@@ -31,7 +31,15 @@ export class OmnichannelManageContact {
 		return this.page.locator('button >> text="Cancel"');
 	}
 
-	errorMessage(message: string): Locator {
-		return this.page.locator(`.rcx-field__error >> text="${message}"`);
+	get btnAddEmail(): Locator {
+		return this.page.locator('role=button[name="Add email"]');
+	}
+
+	get btnAddPhone(): Locator {
+		return this.page.locator('role=button[name="Add phone"]');
+	}
+
+	getErrorMessage(message: string): Locator {
+		return this.page.locator(`role=alert >> text="${message}"`);
 	}
 }
diff --git a/apps/meteor/tests/e2e/page-objects/omnichannel-section.ts b/apps/meteor/tests/e2e/page-objects/omnichannel-section.ts
index 87a34a66356e..e1f2cfb23de2 100644
--- a/apps/meteor/tests/e2e/page-objects/omnichannel-section.ts
+++ b/apps/meteor/tests/e2e/page-objects/omnichannel-section.ts
@@ -22,4 +22,8 @@ export class OmnichannelSection {
 	get btnContactCenter(): Locator {
 		return this.page.locator('role=button[name="Contact Center"]');
 	}
+
+	get tabContacts(): Locator {
+		return this.page.locator('role=tab[name="Contacts"]');
+	}
 }
diff --git a/apps/meteor/tests/e2e/page-objects/omnichannel-tags.ts b/apps/meteor/tests/e2e/page-objects/omnichannel-tags.ts
index f283473505cf..48e724d217bf 100644
--- a/apps/meteor/tests/e2e/page-objects/omnichannel-tags.ts
+++ b/apps/meteor/tests/e2e/page-objects/omnichannel-tags.ts
@@ -44,11 +44,11 @@ export class OmnichannelTags extends OmnichannelAdministration {
 	}
 
 	btnDeleteByName(name: string): Locator {
-		return this.page.locator(`role=link[name="${name} Remove"] >> role=button`);
+		return this.page.getByRole('link', { name }).getByRole('button');
 	}
 
 	findRowByName(name: string): Locator {
-		return this.page.locator(`tr:has-text("${name}")`);
+		return this.page.getByRole('link', { name });
 	}
 
 	get inputDepartments(): Locator {
diff --git a/apps/meteor/tests/e2e/page-objects/omnichannel-transcript.ts b/apps/meteor/tests/e2e/page-objects/omnichannel-transcript.ts
index d0249933d438..d7ece60a5ef6 100644
--- a/apps/meteor/tests/e2e/page-objects/omnichannel-transcript.ts
+++ b/apps/meteor/tests/e2e/page-objects/omnichannel-transcript.ts
@@ -36,8 +36,8 @@ export class OmnichannelTranscript {
 		return this.page.locator('//tr[1]//td[1]');
 	}
 
-	get viewFullConversation(): Locator {
-		return this.page.locator('//button[@title="View full conversation"]/i');
+	get btnOpenChat(): Locator {
+		return this.page.getByRole('dialog').getByRole('button', { name: 'Open chat', exact: true });
 	}
 
 	get DownloadedPDF(): Locator {
diff --git a/apps/meteor/tests/e2e/retention-policy.spec.ts b/apps/meteor/tests/e2e/retention-policy.spec.ts
index 9d6dab66448d..25962d2aae16 100644
--- a/apps/meteor/tests/e2e/retention-policy.spec.ts
+++ b/apps/meteor/tests/e2e/retention-policy.spec.ts
@@ -1,12 +1,12 @@
 import { faker } from '@faker-js/faker';
 import type { Page } from '@playwright/test';
 
-import { timeUnitToMs, TIMEUNIT } from '../../client/lib/convertTimeUnit';
 import { createAuxContext } from './fixtures/createAuxContext';
 import { Users } from './fixtures/userStates';
 import { HomeChannel } from './page-objects';
 import { createTargetTeam, createTargetPrivateChannel, getSettingValueById, setSettingValueById } from './utils';
 import { test, expect } from './utils/test';
+import { timeUnitToMs, TIMEUNIT } from '../../client/lib/convertTimeUnit';
 
 test.use({ storageState: Users.admin.state });
 
@@ -104,17 +104,10 @@ test.describe.serial('retention-policy', () => {
 				await auxContext.page.close();
 			});
 			test('should not show prune section in edit channel for users without permission', async () => {
-				await auxContext.poHomeChannel.sidenav.openChat(targetChannel);
-				await auxContext.poHomeChannel.tabs.btnRoomInfo.click();
-				await auxContext.poHomeChannel.tabs.room.btnEdit.click();
-
 				await expect(poHomeChannel.tabs.room.pruneAccordion).not.toBeVisible();
 			});
 
 			test('users without permission should be able to edit the channel', async () => {
-				await auxContext.poHomeChannel.sidenav.openChat(targetChannel);
-				await auxContext.poHomeChannel.tabs.btnRoomInfo.click();
-				await auxContext.poHomeChannel.tabs.room.btnEdit.click();
 				await auxContext.poHomeChannel.tabs.room.advancedSettingsAccordion.click();
 				await auxContext.poHomeChannel.tabs.room.checkboxReadOnly.check();
 				await auxContext.poHomeChannel.tabs.room.btnSave.click();
@@ -174,21 +167,20 @@ test.describe.serial('retention-policy', () => {
 				expect((await setSettingValueById(api, 'RetentionPolicy_TTL_Channels', timeUnitToMs(TIMEUNIT.days, 15))).status()).toBe(200);
 			});
 
-			test('should display the default max age in edit channel', async () => {
+			test.beforeEach(async () => {
 				await poHomeChannel.sidenav.openChat(targetChannel);
 				await poHomeChannel.tabs.btnRoomInfo.click();
 				await poHomeChannel.tabs.room.btnEdit.click();
 				await poHomeChannel.tabs.room.pruneAccordion.click();
+			});
+
+			test('should display the default max age in edit channel', async () => {
 				await poHomeChannel.tabs.room.checkboxOverrideGlobalRetention.click();
 
 				await expect(poHomeChannel.tabs.room.getMaxAgeLabel('15')).toBeVisible();
 			});
 
 			test('should display overridden retention max age value', async () => {
-				await poHomeChannel.sidenav.openChat(targetChannel);
-				await poHomeChannel.tabs.btnRoomInfo.click();
-				await poHomeChannel.tabs.room.btnEdit.click();
-				await poHomeChannel.tabs.room.pruneAccordion.click();
 				await poHomeChannel.tabs.room.checkboxOverrideGlobalRetention.click();
 				await poHomeChannel.tabs.room.inputRetentionMaxAge.fill('365');
 				await poHomeChannel.tabs.room.btnSave.click();
@@ -203,19 +195,10 @@ test.describe.serial('retention-policy', () => {
 			});
 
 			test('should ignore threads be checked accordingly with the global default value', async () => {
-				await poHomeChannel.sidenav.openChat(targetChannel);
-				await poHomeChannel.tabs.btnRoomInfo.click();
-				await poHomeChannel.tabs.room.btnEdit.click();
-				await poHomeChannel.tabs.room.pruneAccordion.click();
-
 				await expect(poHomeChannel.tabs.room.checkboxIgnoreThreads).toBeChecked({ checked: ignoreThreadsSetting });
 			});
 
 			test('should override ignore threads default value', async () => {
-				await poHomeChannel.sidenav.openChat(targetChannel);
-				await poHomeChannel.tabs.btnRoomInfo.click();
-				await poHomeChannel.tabs.room.btnEdit.click();
-				await poHomeChannel.tabs.room.pruneAccordion.click();
 				await poHomeChannel.tabs.room.checkboxIgnoreThreads.click();
 				await poHomeChannel.tabs.room.btnSave.click();
 				await poHomeChannel.dismissToast();
diff --git a/apps/meteor/tests/e2e/utils/omnichannel/rooms.ts b/apps/meteor/tests/e2e/utils/omnichannel/rooms.ts
index feec31e2a819..e34353672fe1 100644
--- a/apps/meteor/tests/e2e/utils/omnichannel/rooms.ts
+++ b/apps/meteor/tests/e2e/utils/omnichannel/rooms.ts
@@ -1,5 +1,6 @@
 import { faker } from '@faker-js/faker';
 
+import { createFakeVisitor } from '../../../mocks/data';
 import type { BaseTest } from '../test';
 
 type UpdateRoomParams = { roomId: string; visitorId: string; tags: string[] };
@@ -66,10 +67,11 @@ export const createRoom = async (api: BaseTest['api'], { visitorToken, agentId }
 };
 
 export const createVisitor = async (api: BaseTest['api'], { name, token, departmentId }: CreateVisitorParams) => {
+	const fakeVisitor = createFakeVisitor();
 	const response = await api.post('/livechat/visitor', {
 		visitor: {
-			name: name || faker.person.fullName(),
-			email: faker.internet.email(),
+			name: name || fakeVisitor.name,
+			email: fakeVisitor.email,
 			token,
 			...(departmentId && { department: departmentId }),
 		},
diff --git a/apps/meteor/tests/e2e/utils/test.ts b/apps/meteor/tests/e2e/utils/test.ts
index 798b224e438a..716c91d25aaf 100644
--- a/apps/meteor/tests/e2e/utils/test.ts
+++ b/apps/meteor/tests/e2e/utils/test.ts
@@ -1,3 +1,4 @@
+/* eslint-disable react-hooks/rules-of-hooks */
 import * as fs from 'fs';
 import * as path from 'path';
 
diff --git a/apps/meteor/tests/end-to-end/api/chat.ts b/apps/meteor/tests/end-to-end/api/chat.ts
index 9e55fb168e4c..2e23e2613779 100644
--- a/apps/meteor/tests/end-to-end/api/chat.ts
+++ b/apps/meteor/tests/end-to-end/api/chat.ts
@@ -515,6 +515,179 @@ describe('[Chat]', () => {
 				})
 				.end(done);
 		});
+
+		describe('text message allowed size', () => {
+			before(async () => {
+				await updateSetting('Message_MaxAllowedSize', 10);
+			});
+
+			after(async () => {
+				await updateSetting('Message_MaxAllowedSize', 5000);
+			});
+
+			it('should return an error if text parameter surpasses the maximum allowed size', (done) => {
+				void request
+					.post(api('chat.postMessage'))
+					.set(credentials)
+					.send({
+						channel: '#general',
+						text: 'Text to test max limit allowed',
+						alias: 'Gruggy',
+						emoji: ':smirk:',
+						avatar: 'http://res.guggy.com/logo_128.png',
+					})
+					.expect('Content-Type', 'application/json')
+					.expect(400)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', false);
+						expect(res.body).to.have.property('error', 'error-message-size-exceeded');
+					})
+					.end(done);
+			});
+
+			it('should return an error if text parameter in the first attachment surpasses the maximum allowed size', (done) => {
+				void request
+					.post(api('chat.postMessage'))
+					.set(credentials)
+					.send({
+						channel: testChannel.name,
+						text: 'Yay!',
+						emoji: ':smirk:',
+						attachments: [
+							{
+								color: '#ff0000',
+								text: 'Text to test max limit allowed',
+								ts: '2016-12-09T16:53:06.761Z',
+								thumb_url: 'http://res.guggy.com/logo_128.png',
+								message_link: 'https://google.com',
+								collapsed: false,
+								author_name: 'Bradley Hilton',
+								author_link: 'https://rocket.chat/',
+								author_icon: 'https://avatars.githubusercontent.com/u/850391?v=3',
+								title: 'Attachment Example',
+								title_link: 'https://youtube.com',
+								title_link_download: true,
+								image_url: 'http://res.guggy.com/logo_128.png',
+								audio_url: 'http://www.w3schools.com/tags/horse.mp3',
+								video_url: 'http://www.w3schools.com/tags/movie.mp4',
+								fields: [],
+							},
+						],
+					})
+					.expect('Content-Type', 'application/json')
+					.expect(400)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', false);
+						expect(res.body).to.have.property('error', 'error-message-size-exceeded');
+					})
+					.end(done);
+			});
+
+			it('should return an error if text parameter in any of the attachments surpasses the maximum allowed size', (done) => {
+				void request
+					.post(api('chat.postMessage'))
+					.set(credentials)
+					.send({
+						channel: testChannel.name,
+						text: 'Yay!',
+						emoji: ':smirk:',
+						attachments: [
+							{
+								color: '#ff0000',
+								text: 'Yay!',
+								ts: '2016-12-09T16:53:06.761Z',
+								thumb_url: 'http://res.guggy.com/logo_128.png',
+								message_link: 'https://google.com',
+								collapsed: false,
+								author_name: 'Bradley Hilton',
+								author_link: 'https://rocket.chat/',
+								author_icon: 'https://avatars.githubusercontent.com/u/850391?v=3',
+								title: 'Attachment Example',
+								title_link: 'https://youtube.com',
+								title_link_download: true,
+								image_url: 'http://res.guggy.com/logo_128.png',
+								audio_url: 'http://www.w3schools.com/tags/horse.mp3',
+								video_url: 'http://www.w3schools.com/tags/movie.mp4',
+								fields: [],
+							},
+							{
+								color: '#ff0000',
+								text: 'Text to large to test max limit allowed',
+								ts: '2016-12-09T16:53:06.761Z',
+								thumb_url: 'http://res.guggy.com/logo_128.png',
+								message_link: 'https://google.com',
+								collapsed: false,
+								author_name: 'Bradley Hilton',
+								author_link: 'https://rocket.chat/',
+								author_icon: 'https://avatars.githubusercontent.com/u/850391?v=3',
+								title: 'Attachment Example',
+								title_link: 'https://youtube.com',
+								title_link_download: true,
+								image_url: 'http://res.guggy.com/logo_128.png',
+								audio_url: 'http://www.w3schools.com/tags/horse.mp3',
+								video_url: 'http://www.w3schools.com/tags/movie.mp4',
+								fields: [],
+							},
+						],
+					})
+					.expect('Content-Type', 'application/json')
+					.expect(400)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', false);
+						expect(res.body).to.have.property('error', 'error-message-size-exceeded');
+					})
+					.end(done);
+			});
+
+			it('should pass if any text parameter length does not surpasses the maximum allowed size', (done) => {
+				void request
+					.post(api('chat.postMessage'))
+					.set(credentials)
+					.send({
+						channel: testChannel.name,
+						text: 'Sample',
+						emoji: ':smirk:',
+						attachments: [
+							{
+								color: '#ff0000',
+								text: 'Sample',
+								ts: '2016-12-09T16:53:06.761Z',
+								thumb_url: 'http://res.guggy.com/logo_128.png',
+								message_link: 'https://google.com',
+								collapsed: false,
+								author_name: 'Bradley Hilton',
+								author_link: 'https://rocket.chat/',
+								author_icon: 'https://avatars.githubusercontent.com/u/850391?v=3',
+								title: 'Attachment Example',
+								title_link: 'https://youtube.com',
+								title_link_download: true,
+								image_url: 'http://res.guggy.com/logo_128.png',
+								audio_url: 'http://www.w3schools.com/tags/horse.mp3',
+								video_url: 'http://www.w3schools.com/tags/movie.mp4',
+								fields: [
+									{
+										short: true,
+										title: 'Test',
+										value: 'Testing out something or other',
+									},
+									{
+										short: true,
+										title: 'Another Test',
+										value: '[Link](https://google.com/) something and this and that.',
+									},
+								],
+							},
+						],
+					})
+					.expect('Content-Type', 'application/json')
+					.expect(200)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', true);
+						expect(res.body).to.have.nested.property('message.msg', 'Sample');
+					})
+					.end(done);
+			});
+		});
 	});
 
 	describe('/chat.getMessage', () => {
@@ -1197,9 +1370,10 @@ describe('[Chat]', () => {
 					.expect(statusCode)
 					.expect(testCb);
 
-				await (customFields
-					? request.post(api(`rooms.upload/${testChannel._id}`)).field('customFields', JSON.stringify(customFields))
-					: request.post(api(`rooms.upload/${testChannel._id}`))
+				await (
+					customFields
+						? request.post(api(`rooms.upload/${testChannel._id}`)).field('customFields', JSON.stringify(customFields))
+						: request.post(api(`rooms.upload/${testChannel._id}`))
 				)
 					.set(credentials)
 					.attach('file', imgURL)
@@ -2333,6 +2507,21 @@ describe('[Chat]', () => {
 			});
 		});
 
+		it('should return an error when messageId does not exist', async () => {
+			await request
+				.post(api('chat.pinMessage'))
+				.set(credentials)
+				.send({
+					messageId: 'test',
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(400)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body).to.have.property('error');
+				});
+		});
+
 		it('should pin Message successfully', (done) => {
 			void updatePermission('pin-message', ['admin']).then(() => {
 				void request
@@ -2350,6 +2539,21 @@ describe('[Chat]', () => {
 					.end(done);
 			});
 		});
+
+		it('should return message when its already pinned', async () => {
+			await request
+				.post(api('chat.pinMessage'))
+				.set(credentials)
+				.send({
+					messageId: message._id,
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body).to.not.have.property('error');
+				});
+		});
 	});
 
 	describe('[/chat.unPinMessage]', () => {
@@ -2945,6 +3149,305 @@ describe('[Chat]', () => {
 			filterDiscussionsByText(text);
 		});
 	});
+
+	describe('[/chat.syncMessages]', () => {
+		let testChannel: IRoom;
+
+		before(async () => {
+			testChannel = (await createRoom({ type: 'c', name: `channel.test.syncMessages.${Date.now()}` })).body.channel;
+		});
+
+		after(() => deleteRoom({ type: 'c', roomId: testChannel._id }));
+
+		it('should return an error when the required "roomId" parameter is not sent', (done) => {
+			void request
+				.get(api('chat.syncMessages'))
+				.set(credentials)
+				.expect('Content-Type', 'application/json')
+				.expect(400)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body.errorType).to.be.equal('invalid-params');
+					expect(res.body.error).to.include(`must have required property 'roomId'`);
+				})
+				.end(done);
+		});
+
+		it('should return an error when the neither "lastUpdate" or "type" parameter is sent', (done) => {
+			void request
+				.get(api('chat.syncMessages'))
+				.set(credentials)
+				.query({ roomId: testChannel._id })
+				.expect('Content-Type', 'application/json')
+				.expect(400)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body.errorType).to.be.equal('error-param-required');
+					expect(res.body.error).to.include('The "type" or "lastUpdate" parameters must be provided');
+				})
+				.end(done);
+		});
+
+		it('should return an error when the "lastUpdate" parameter is invalid', (done) => {
+			void request
+				.get(api('chat.syncMessages'))
+				.set(credentials)
+				.query({ roomId: 'invalid-room', lastUpdate: 'invalid-date' })
+				.expect('Content-Type', 'application/json')
+				.expect(400)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body.errorType).to.be.equal('error-lastUpdate-param-invalid');
+					expect(res.body.error).to.include('The "lastUpdate" query parameter must be a valid date');
+				})
+				.end(done);
+		});
+
+		it('should return an error when user provides an invalid roomId', (done) => {
+			void request
+				.get(api('chat.syncMessages'))
+				.set(credentials)
+				.query({ roomId: 'invalid-room', lastUpdate: new Date().toISOString() })
+				.expect('Content-Type', 'application/json')
+				.expect(400)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body.errorType).to.be.equal('error-not-allowed');
+					expect(res.body.error).to.include('Not allowed');
+				})
+				.end(done);
+		});
+
+		it('should return an error when the "type" parameter is not supported', (done) => {
+			void request
+				.get(api('chat.syncMessages'))
+				.set(credentials)
+				.query({ roomId: testChannel._id, type: 'invalid-type', next: new Date().toISOString() })
+				.expect('Content-Type', 'application/json')
+				.expect(400)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body.errorType).to.be.equal('invalid-params');
+					expect(res.body.error).to.include('must be equal to one of the allowed values');
+				})
+				.end(done);
+		});
+
+		it('should return an error when the "next" or "previous" parameter is sent without the "type" parameter', async () => {
+			const nextResponse = await request
+				.get(api('chat.syncMessages'))
+				.set(credentials)
+				.query({ roomId: testChannel._id, next: new Date().toISOString() });
+
+			const previousResponse = await request
+				.get(api('chat.syncMessages'))
+				.set(credentials)
+				.query({ roomId: testChannel._id, previous: new Date().toISOString() });
+
+			expect(nextResponse.statusCode).to.equal(400);
+			expect(nextResponse.body).to.have.property('success', false);
+			expect(nextResponse.body.errorType).to.be.equal('error-param-required');
+			expect(nextResponse.body.error).to.include('The "type" or "lastUpdate" parameters must be provided');
+
+			expect(previousResponse.statusCode).to.equal(400);
+			expect(previousResponse.body).to.have.property('success', false);
+			expect(previousResponse.body.errorType).to.be.equal('error-param-required');
+			expect(previousResponse.body.error).to.include('The "type" or "lastUpdate" parameters must be provided');
+		});
+
+		it('should return an error when both "next" and "previous" are sent', (done) => {
+			void request
+				.get(api('chat.syncMessages'))
+				.set(credentials)
+				.query({ roomId: testChannel._id, type: 'UPDATED', next: new Date().toISOString(), previous: new Date().toISOString() })
+				.expect('Content-Type', 'application/json')
+				.expect(400)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body.errorType).to.be.equal('error-cursor-conflict');
+					expect(res.body.error).to.include('You cannot provide both "next" and "previous" parameters');
+				})
+				.end(done);
+		});
+
+		it('should return an error when both "next" or "previous" and "lastUpdate" are sent', (done) => {
+			void request
+				.get(api('chat.syncMessages'))
+				.set(credentials)
+				.query({ roomId: testChannel._id, type: 'UPDATED', next: new Date().toISOString(), lastUpdate: new Date().toISOString() })
+				.expect('Content-Type', 'application/json')
+				.expect(400)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body.errorType).to.be.equal('error-cursor-and-lastUpdate-conflict');
+					expect(res.body.error).to.include('The attributes "next", "previous" and "lastUpdate" cannot be used together');
+				})
+				.end(done);
+		});
+
+		it('should return an error when neither "type" or "lastUpdate" are sent', (done) => {
+			void request
+				.get(api('chat.syncMessages'))
+				.set(credentials)
+				.query({ roomId: testChannel._id })
+				.expect('Content-Type', 'application/json')
+				.expect(400)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', false);
+					expect(res.body.errorType).to.be.equal('error-param-required');
+					expect(res.body.error).to.include('The "type" or "lastUpdate" parameters must be provided');
+				})
+				.end(done);
+		});
+
+		it('should return an empty response when there are no messages to sync', (done) => {
+			void request
+				.get(api('chat.syncMessages'))
+				.set(credentials)
+				.query({ roomId: testChannel._id, lastUpdate: new Date().toISOString() })
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					expect(res.body.result).to.have.property('updated').and.to.be.an('array');
+					expect(res.body.result).to.have.property('deleted').and.to.be.an('array');
+					expect(res.body.result.updated).to.have.lengthOf(0);
+					expect(res.body.result.deleted).to.have.lengthOf(0);
+				})
+				.end(done);
+		});
+
+		it('should return all updated and deleted messages since "lastUpdate" parameter date', async () => {
+			const lastUpdate = new Date().toISOString();
+
+			// Create two messages isolated to avoid ts conflict
+			const firstMessage = await sendSimpleMessage({ roomId: testChannel._id, text: 'First Message' });
+			const secondMessage = await sendSimpleMessage({ roomId: testChannel._id, text: 'Second Message' });
+
+			const response = await request.get(api('chat.syncMessages')).set(credentials).query({ roomId: testChannel._id, lastUpdate });
+
+			expect(response.body.result.updated).to.have.lengthOf(2);
+			expect(response.body.result.updated[0]._id).to.be.equal(secondMessage.body.message._id);
+			expect(response.body.result.updated[1]._id).to.be.equal(firstMessage.body.message._id);
+			expect(response.body.result.deleted).to.have.lengthOf(0);
+
+			await deleteMessage({ roomId: testChannel._id, msgId: firstMessage.body.message._id });
+
+			const responseAfterDelete = await request
+				.get(api('chat.syncMessages'))
+				.set(credentials)
+				.query({ roomId: testChannel._id, lastUpdate });
+
+			expect(responseAfterDelete.body.result.updated).to.have.lengthOf(1);
+			expect(responseAfterDelete.body.result.updated[0]._id).to.be.equal(secondMessage.body.message._id);
+			expect(responseAfterDelete.body.result.deleted).to.have.lengthOf(1);
+			expect(responseAfterDelete.body.result.deleted[0]._id).to.be.equal(firstMessage.body.message._id);
+
+			await deleteMessage({ roomId: testChannel._id, msgId: secondMessage.body.message._id });
+		});
+
+		it('should return all updated messages with a cursor when "type" parameter is "UPDATED"', async () => {
+			const lastUpdate = new Date();
+			const firstMessage = await sendSimpleMessage({ roomId: testChannel._id, text: 'First Message' });
+			const secondMessage = await sendSimpleMessage({ roomId: testChannel._id, text: 'Second Message' });
+			const thirdMessage = await sendSimpleMessage({ roomId: testChannel._id, text: 'Third Message' });
+
+			const response = await request
+				.get(api('chat.syncMessages'))
+				.set(credentials)
+				.query({
+					roomId: testChannel._id,
+					next: new Date(lastUpdate).getTime().toString(),
+					type: 'UPDATED',
+					count: 2,
+				});
+
+			expect(response.body.result.updated).to.have.lengthOf(2);
+			expect(response.body.result.updated[0]._id).to.be.equal(firstMessage.body.message._id);
+			expect(response.body.result.updated[1]._id).to.be.equal(secondMessage.body.message._id);
+			expect(response.body.result.cursor)
+				.to.have.property('next')
+				.and.to.equal(new Date(response.body.result.updated[response.body.result.updated.length - 1]._updatedAt).getTime().toString());
+			expect(response.body.result.cursor)
+				.to.have.property('previous')
+				.and.to.equal(new Date(response.body.result.updated[0]._updatedAt).getTime().toString());
+			expect(response.body.result.cursor)
+				.to.have.property('previous')
+				.and.to.equal(new Date(firstMessage.body.message._updatedAt).getTime().toString());
+
+			const responseWithNext = await request
+				.get(api('chat.syncMessages'))
+				.set(credentials)
+				.query({ roomId: testChannel._id, next: response.body.result.cursor.next, type: 'UPDATED', count: 2 });
+
+			expect(responseWithNext.body.result.updated).to.have.lengthOf(1);
+			expect(responseWithNext.body.result.updated[0]._id).to.be.equal(thirdMessage.body.message._id);
+			expect(responseWithNext.body.result.cursor).to.have.property('next').and.to.be.null;
+			expect(responseWithNext.body.result.cursor)
+				.to.have.property('previous')
+				.and.to.equal(new Date(thirdMessage.body.message._updatedAt).getTime().toString());
+
+			await Promise.all([
+				deleteMessage({ roomId: testChannel._id, msgId: firstMessage.body.message._id }),
+				deleteMessage({ roomId: testChannel._id, msgId: secondMessage.body.message._id }),
+				deleteMessage({ roomId: testChannel._id, msgId: thirdMessage.body.message._id }),
+			]);
+		});
+
+		it('should return all deleted messages with a cursor when "type" parameter is "DELETED"', async () => {
+			const newChannel = (await createRoom({ type: 'c', name: `channel.test.syncMessages.${Date.now()}` })).body.channel;
+			const lastUpdate = new Date();
+			const firstMessage = (await sendSimpleMessage({ roomId: newChannel._id, text: 'First Message' })).body.message;
+			const secondMessage = (await sendSimpleMessage({ roomId: newChannel._id, text: 'Second Message' })).body.message;
+			const thirdMessage = (await sendSimpleMessage({ roomId: newChannel._id, text: 'Third Message' })).body.message;
+
+			const response = await request
+				.get(api('chat.syncMessages'))
+				.set(credentials)
+				.query({ roomId: newChannel._id, next: lastUpdate.getTime().toString(), type: 'DELETED', count: 2 });
+
+			expect(response.body.result.deleted).to.have.lengthOf(0);
+			expect(response.body.result.cursor).to.have.property('next').and.to.be.null;
+			expect(response.body.result.cursor).to.have.property('previous').and.to.be.null;
+
+			const firstDeletedMessage = (await deleteMessage({ roomId: newChannel._id, msgId: firstMessage._id })).body.message;
+			const secondDeletedMessage = (await deleteMessage({ roomId: newChannel._id, msgId: secondMessage._id })).body.message;
+			const thirdDeletedMessage = (await deleteMessage({ roomId: newChannel._id, msgId: thirdMessage._id })).body.message;
+
+			const responseAfterDelete = await request
+				.get(api('chat.syncMessages'))
+				.set(credentials)
+				.query({ roomId: newChannel._id, next: lastUpdate.getTime().toString(), type: 'DELETED', count: 2 });
+
+			expect(responseAfterDelete.body.result.deleted).to.have.lengthOf(2);
+			expect(responseAfterDelete.body.result.deleted[0]._id).to.be.equal(firstDeletedMessage._id);
+			expect(responseAfterDelete.body.result.deleted[1]._id).to.be.equal(secondDeletedMessage._id);
+			expect(responseAfterDelete.body.result.cursor)
+				.to.have.property('next')
+				.and.to.equal(
+					new Date(responseAfterDelete.body.result.deleted[responseAfterDelete.body.result.deleted.length - 1]._deletedAt)
+						.getTime()
+						.toString(),
+				);
+			expect(responseAfterDelete.body.result.cursor)
+				.to.have.property('previous')
+				.and.to.equal(new Date(responseAfterDelete.body.result.deleted[0]._deletedAt).getTime().toString());
+
+			const responseAfterDeleteWithPrevious = await request
+				.get(api('chat.syncMessages'))
+				.set(credentials)
+				.query({ roomId: newChannel._id, next: responseAfterDelete.body.result.cursor.next, type: 'DELETED', count: 2 });
+
+			expect(responseAfterDeleteWithPrevious.body.result.deleted).to.have.lengthOf(1);
+			expect(responseAfterDeleteWithPrevious.body.result.deleted[0]._id).to.be.equal(thirdDeletedMessage._id);
+			expect(responseAfterDeleteWithPrevious.body.result.cursor).to.have.property('next').and.to.be.null;
+			expect(responseAfterDeleteWithPrevious.body.result.cursor)
+				.to.have.property('previous')
+				.and.to.equal(new Date(responseAfterDeleteWithPrevious.body.result.deleted[0]._deletedAt).getTime().toString());
+
+			await deleteRoom({ type: 'c', roomId: newChannel._id });
+		});
+	});
 });
 
 describe('Threads', () => {
diff --git a/apps/meteor/tests/end-to-end/api/emoji-custom.ts b/apps/meteor/tests/end-to-end/api/emoji-custom.ts
index 091b24452446..07285b928f8f 100644
--- a/apps/meteor/tests/end-to-end/api/emoji-custom.ts
+++ b/apps/meteor/tests/end-to-end/api/emoji-custom.ts
@@ -1,4 +1,4 @@
-import type { ICustomEmojiDescriptor } from '@rocket.chat/core-typings';
+import type { IEmojiCustom } from '@rocket.chat/core-typings';
 import { assert, expect } from 'chai';
 import { before, describe, it, after } from 'mocha';
 
@@ -8,7 +8,7 @@ import { imgURL } from '../../data/interactions';
 describe('[EmojiCustom]', () => {
 	const customEmojiName = `my-custom-emoji-${Date.now()}`;
 
-	let withoutAliases: ICustomEmojiDescriptor;
+	let withoutAliases: IEmojiCustom;
 
 	before((done) => getCredentials(done));
 
@@ -69,7 +69,7 @@ describe('[EmojiCustom]', () => {
 		});
 	});
 
-	let createdCustomEmoji: ICustomEmojiDescriptor;
+	let createdCustomEmoji: IEmojiCustom;
 
 	describe('[/emoji-custom.update]', () => {
 		before((done) => {
@@ -82,8 +82,8 @@ describe('[EmojiCustom]', () => {
 					expect(res.body.emojis).to.have.property('update').and.to.be.a('array').and.to.not.have.lengthOf(0);
 					expect(res.body.emojis).to.have.property('remove').and.to.be.a('array').and.to.have.lengthOf(0);
 
-					const _createdCustomEmoji = (res.body.emojis.update as ICustomEmojiDescriptor[]).find((emoji) => emoji.name === customEmojiName);
-					const _withoutAliases = (res.body.emojis.update as ICustomEmojiDescriptor[]).find(
+					const _createdCustomEmoji = (res.body.emojis.update as IEmojiCustom[]).find((emoji) => emoji.name === customEmojiName);
+					const _withoutAliases = (res.body.emojis.update as IEmojiCustom[]).find(
 						(emoji) => emoji.name === `${customEmojiName}-without-aliases`,
 					);
 
@@ -95,7 +95,7 @@ describe('[EmojiCustom]', () => {
 				})
 				.end(done);
 		});
-		it('successfully:', () => {
+		describe('successfully:', () => {
 			it('should update the custom emoji without a file', (done) => {
 				void request
 					.post(api('emoji-custom.update'))
@@ -143,8 +143,31 @@ describe('[EmojiCustom]', () => {
 					})
 					.end(done);
 			});
+
+			it('should change the etag when the custom emoji image is updated', async () => {
+				const prevEtag = createdCustomEmoji.etag;
+
+				await request
+					.post(api('emoji-custom.update'))
+					.set(credentials)
+					.attach('emoji', imgURL)
+					.field({
+						_id: createdCustomEmoji._id,
+						name: customEmojiName,
+					})
+					.expect('Content-Type', 'application/json')
+					.expect(200)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', true);
+					});
+
+				const emojis = await request.get(api(`emoji-custom.all`)).set(credentials).expect(200);
+				const updatedCustomEmoji = emojis.body.emojis.find((emoji: IEmojiCustom) => emoji._id === createdCustomEmoji._id);
+				expect(updatedCustomEmoji.etag).not.to.be.equal(prevEtag);
+			});
 		});
-		it('should throw error when:', () => {
+
+		describe('should throw error when:', () => {
 			it('the fields does not include "_id"', (done) => {
 				void request
 					.post(api('emoji-custom.update'))
@@ -178,13 +201,13 @@ describe('[EmojiCustom]', () => {
 					})
 					.end(done);
 			});
-			it('the filename is wrong', (done) => {
+			it('the emoji file field is wrong', (done) => {
 				void request
 					.post(api('emoji-custom.update'))
 					.set(credentials)
 					.attach('emojiwrong', imgURL)
 					.field({
-						_id: 'invalid-id',
+						_id: createdCustomEmoji._id,
 						name: 'my-custom-emoji-without-aliases',
 					})
 					.expect('Content-Type', 'application/json')
@@ -374,6 +397,28 @@ describe('[EmojiCustom]', () => {
 				})
 				.end(done);
 		});
+
+		it('should return the emoji even when no etag is passed (for old emojis)', async () => {
+			const res = await request.get(`/emoji-custom/${createdCustomEmoji.name}.png`).set(credentials).expect(200);
+
+			expect(res.headers).to.have.property('content-type', 'image/png');
+			expect(res.headers).to.have.property('cache-control', 'public, max-age=31536000');
+			expect(res.headers).to.have.property('content-disposition', 'inline');
+		});
+
+		it('should return success if the etag is invalid', async () => {
+			const res = await request
+				.get(`/emoji-custom/${createdCustomEmoji.name}.png?etag=1234`)
+				.set(credentials)
+				.set({
+					'if-none-match': 'invalid-etag',
+				})
+				.expect(200);
+
+			expect(res.headers).to.have.property('content-type', 'image/png');
+			expect(res.headers).to.have.property('cache-control', 'public, max-age=31536000');
+			expect(res.headers).to.have.property('content-disposition', 'inline');
+		});
 	});
 
 	describe('[/emoji-custom.delete]', () => {
diff --git a/apps/meteor/tests/end-to-end/api/import.spec.ts b/apps/meteor/tests/end-to-end/api/import.spec.ts
index a3db33efff0d..90019ffdba52 100644
--- a/apps/meteor/tests/end-to-end/api/import.spec.ts
+++ b/apps/meteor/tests/end-to-end/api/import.spec.ts
@@ -111,4 +111,36 @@ describe('Imports', () => {
 				});
 		});
 	});
+
+	describe('[/uploadImportFile]', () => {
+		let testUser: any = {};
+		before(async () => {
+			testUser = await createUser();
+		});
+		let testCredentials: any = {};
+		before(async () => {
+			testCredentials = await login(testUser.username, password);
+		});
+		after(async () => {
+			await deleteUser(testUser);
+			testUser = undefined;
+		});
+
+		it('should fail if the user is not authorized', async () => {
+			await request
+				.post(api('uploadImportFile'))
+				.set(testCredentials)
+				.send({
+					binaryContent: 'ZXJzLmNzdlBLBQYAAAAAAQABADcAAAAmAQAAAAA=',
+					contentType: 'application/zip',
+					fileName: 'users11.zip',
+					importerKey: 'csv',
+				})
+				.expect(403)
+				.expect((res: Response) => {
+					expect(res.body.success).to.be.false;
+					expect(res.body.error).to.equal('User does not have the permissions required for this action [error-unauthorized]');
+				});
+		});
+	});
 });
diff --git a/apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts b/apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts
index 43454c5115dc..a2ea92add96e 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/00-rooms.ts
@@ -13,7 +13,7 @@ import type {
 } from '@rocket.chat/core-typings';
 import { LivechatPriorityWeight } from '@rocket.chat/core-typings';
 import { expect } from 'chai';
-import { after, before, describe, it } from 'mocha';
+import { after, afterEach, before, describe, it } from 'mocha';
 import type { Response } from 'supertest';
 
 import type { SuccessResult } from '../../../../app/api/server/definition';
@@ -48,6 +48,7 @@ import {
 	updateEEPermission,
 	updatePermission,
 	updateSetting,
+	updateEESetting,
 } from '../../../data/permissions.helper';
 import { adminUsername, password } from '../../../data/user';
 import { createUser, deleteUser, login } from '../../../data/users.helper';
@@ -74,6 +75,7 @@ describe('LIVECHAT - rooms', () => {
 
 	before(async () => {
 		await updateSetting('Livechat_enabled', true);
+		await updateEESetting('Livechat_Require_Contact_Verification', 'never');
 		await createAgent();
 		await makeAgentAvailable();
 		visitor = await createVisitor();
@@ -1150,6 +1152,19 @@ describe('LIVECHAT - rooms', () => {
 	});
 
 	describe('livechat/upload/:rid', () => {
+		let visitor: ILivechatVisitor | undefined;
+
+		afterEach(() => {
+			if (visitor?.token) {
+				return deleteVisitor(visitor.token);
+			}
+		});
+
+		after(async () => {
+			await updateSetting('FileUpload_Enabled', true);
+			await updateSetting('Livechat_fileupload_enabled', true);
+		});
+
 		it('should throw an error if x-visitor-token header is not present', async () => {
 			await request
 				.post(api('livechat/upload/test'))
@@ -1170,7 +1185,7 @@ describe('LIVECHAT - rooms', () => {
 		});
 
 		it('should throw unauthorized if visitor with token exists but room is invalid', async () => {
-			const visitor = await createVisitor();
+			visitor = await createVisitor();
 			await request
 				.post(api('livechat/upload/test'))
 				.set(credentials)
@@ -1178,11 +1193,10 @@ describe('LIVECHAT - rooms', () => {
 				.attach('file', fs.createReadStream(path.join(__dirname, '../../../data/livechat/sample.png')))
 				.expect('Content-Type', 'application/json')
 				.expect(403);
-			await deleteVisitor(visitor.token);
 		});
 
 		it('should throw an error if the file is not attached', async () => {
-			const visitor = await createVisitor();
+			visitor = await createVisitor();
 			const room = await createLivechatRoom(visitor.token);
 			await request
 				.post(api(`livechat/upload/${room._id}`))
@@ -1190,12 +1204,11 @@ describe('LIVECHAT - rooms', () => {
 				.set('x-visitor-token', visitor.token)
 				.expect('Content-Type', 'application/json')
 				.expect(400);
-			await deleteVisitor(visitor.token);
 		});
 
 		it('should throw and error if file uploads are enabled but livechat file uploads are disabled', async () => {
 			await updateSetting('Livechat_fileupload_enabled', false);
-			const visitor = await createVisitor();
+			visitor = await createVisitor();
 			const room = await createLivechatRoom(visitor.token);
 			await request
 				.post(api(`livechat/upload/${room._id}`))
@@ -1205,12 +1218,11 @@ describe('LIVECHAT - rooms', () => {
 				.expect('Content-Type', 'application/json')
 				.expect(400);
 			await updateSetting('Livechat_fileupload_enabled', true);
-			await deleteVisitor(visitor.token);
 		});
 
 		it('should throw and error if livechat file uploads are enabled but file uploads are disabled', async () => {
 			await updateSetting('FileUpload_Enabled', false);
-			const visitor = await createVisitor();
+			visitor = await createVisitor();
 			const room = await createLivechatRoom(visitor.token);
 			await request
 				.post(api(`livechat/upload/${room._id}`))
@@ -1220,13 +1232,12 @@ describe('LIVECHAT - rooms', () => {
 				.expect('Content-Type', 'application/json')
 				.expect(400);
 			await updateSetting('FileUpload_Enabled', true);
-			await deleteVisitor(visitor.token);
 		});
 
 		it('should throw and error if both file uploads are disabled', async () => {
 			await updateSetting('Livechat_fileupload_enabled', false);
 			await updateSetting('FileUpload_Enabled', false);
-			const visitor = await createVisitor();
+			visitor = await createVisitor();
 			const room = await createLivechatRoom(visitor.token);
 			await request
 				.post(api(`livechat/upload/${room._id}`))
@@ -1237,14 +1248,12 @@ describe('LIVECHAT - rooms', () => {
 				.expect(400);
 			await updateSetting('FileUpload_Enabled', true);
 			await updateSetting('Livechat_fileupload_enabled', true);
-
-			await deleteVisitor(visitor.token);
 		});
 
 		it('should upload an image on the room if all params are valid', async () => {
 			await updateSetting('FileUpload_Enabled', true);
 			await updateSetting('Livechat_fileupload_enabled', true);
-			const visitor = await createVisitor();
+			visitor = await createVisitor();
 			const room = await createLivechatRoom(visitor.token);
 			await request
 				.post(api(`livechat/upload/${room._id}`))
@@ -1253,11 +1262,10 @@ describe('LIVECHAT - rooms', () => {
 				.attach('file', fs.createReadStream(path.join(__dirname, '../../../data/livechat/sample.png')))
 				.expect('Content-Type', 'application/json')
 				.expect(200);
-			await deleteVisitor(visitor.token);
 		});
 
 		it('should allow visitor to download file', async () => {
-			const visitor = await createVisitor();
+			visitor = await createVisitor();
 			const room = await createLivechatRoom(visitor.token);
 
 			const { body } = await request
@@ -1272,12 +1280,11 @@ describe('LIVECHAT - rooms', () => {
 			} = body;
 			const imageUrl = `/file-upload/${_id}/${name}`;
 			await request.get(imageUrl).query({ rc_token: visitor.token, rc_room_type: 'l', rc_rid: room._id }).expect(200);
-			await deleteVisitor(visitor.token);
 			await closeOmnichannelRoom(room._id);
 		});
 
 		it('should allow visitor to download file even after room is closed', async () => {
-			const visitor = await createVisitor();
+			visitor = await createVisitor();
 			const room = await createLivechatRoom(visitor.token);
 			const { body } = await request
 				.post(api(`livechat/upload/${room._id}`))
@@ -1292,11 +1299,10 @@ describe('LIVECHAT - rooms', () => {
 			} = body;
 			const imageUrl = `/file-upload/${_id}/${name}`;
 			await request.get(imageUrl).query({ rc_token: visitor.token, rc_room_type: 'l', rc_rid: room._id }).expect(200);
-			await deleteVisitor(visitor.token);
 		});
 
 		it('should not allow visitor to download a file from a room he didnt create', async () => {
-			const visitor = await createVisitor();
+			visitor = await createVisitor();
 			const visitor2 = await createVisitor();
 			const room = await createLivechatRoom(visitor.token);
 			const { body } = await request
@@ -1313,7 +1319,6 @@ describe('LIVECHAT - rooms', () => {
 			} = body;
 			const imageUrl = `/file-upload/${_id}/${name}`;
 			await request.get(imageUrl).query({ rc_token: visitor2.token, rc_room_type: 'l', rc_rid: room._id }).expect(403);
-			await deleteVisitor(visitor.token);
 			await deleteVisitor(visitor2.token);
 		});
 	});
diff --git a/apps/meteor/tests/end-to-end/api/livechat/01-agents.ts b/apps/meteor/tests/end-to-end/api/livechat/01-agents.ts
index d8cd23d97752..3ff3eeb291d9 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/01-agents.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/01-agents.ts
@@ -20,7 +20,7 @@ import {
 	moveBackToQueue,
 	closeOmnichannelRoom,
 } from '../../../data/livechat/rooms';
-import { updatePermission, updateSetting } from '../../../data/permissions.helper';
+import { updateEESetting, updatePermission, updateSetting } from '../../../data/permissions.helper';
 import { password } from '../../../data/user';
 import { createUser, deleteUser, getMe, login, setUserStatus } from '../../../data/users.helper';
 import { IS_EE } from '../../../e2e/config/constants';
@@ -36,6 +36,7 @@ describe('LIVECHAT - Agents', () => {
 	before(async () => {
 		await updateSetting('Livechat_enabled', true);
 		await updateSetting('Livechat_Routing_Method', 'Manual_Selection');
+		await updateEESetting('Livechat_Require_Contact_Verification', 'never');
 		agent = await createAgent();
 		manager = await createManager();
 	});
diff --git a/apps/meteor/tests/end-to-end/api/livechat/04-dashboards.ts b/apps/meteor/tests/end-to-end/api/livechat/04-dashboards.ts
index 416e117d06e1..33cb2f1f26b0 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/04-dashboards.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/04-dashboards.ts
@@ -18,7 +18,7 @@ import {
 } from '../../../data/livechat/rooms';
 import { createAnOnlineAgent } from '../../../data/livechat/users';
 import { sleep } from '../../../data/livechat/utils';
-import { removePermissionFromAllRoles, restorePermissionToRoles, updateSetting } from '../../../data/permissions.helper';
+import { removePermissionFromAllRoles, restorePermissionToRoles, updateEESetting, updateSetting } from '../../../data/permissions.helper';
 import { deleteUser } from '../../../data/users.helper';
 import { IS_EE } from '../../../e2e/config/constants';
 
@@ -30,6 +30,7 @@ describe('LIVECHAT - dashboards', function () {
 
 	before(async () => {
 		await updateSetting('Livechat_enabled', true);
+		await updateEESetting('Livechat_Require_Contact_Verification', 'never');
 	});
 
 	let department: ILivechatDepartment;
diff --git a/apps/meteor/tests/end-to-end/api/livechat/05-inquiries.ts b/apps/meteor/tests/end-to-end/api/livechat/05-inquiries.ts
index 45f20686f80e..05702deaaf70 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/05-inquiries.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/05-inquiries.ts
@@ -17,7 +17,13 @@ import {
 	takeInquiry,
 } from '../../../data/livechat/rooms';
 import { parseMethodResponse } from '../../../data/livechat/utils';
-import { removePermissionFromAllRoles, restorePermissionToRoles, updatePermission, updateSetting } from '../../../data/permissions.helper';
+import {
+	removePermissionFromAllRoles,
+	restorePermissionToRoles,
+	updateEESetting,
+	updatePermission,
+	updateSetting,
+} from '../../../data/permissions.helper';
 import { password } from '../../../data/user';
 import { createUser, login, deleteUser } from '../../../data/users.helper';
 import { IS_EE } from '../../../e2e/config/constants';
@@ -28,6 +34,7 @@ describe('LIVECHAT - inquiries', () => {
 	before(async () => {
 		await updateSetting('Livechat_enabled', true);
 		await updateSetting('Livechat_Routing_Method', 'Manual_Selection');
+		await updateEESetting('Livechat_Require_Contact_Verification', 'never');
 	});
 
 	describe('livechat/inquiries.list', () => {
diff --git a/apps/meteor/tests/end-to-end/api/livechat/06-integrations.ts b/apps/meteor/tests/end-to-end/api/livechat/06-integrations.ts
index bc4d6fa04dc4..de4ca08b045a 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/06-integrations.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/06-integrations.ts
@@ -1,9 +1,10 @@
 import type { ISetting } from '@rocket.chat/core-typings';
 import { expect } from 'chai';
-import { before, describe, it } from 'mocha';
+import { after, before, describe, it } from 'mocha';
 import type { Response } from 'supertest';
 
 import { getCredentials, api, request, credentials } from '../../../data/api-data';
+import { deleteVisitor } from '../../../data/livechat/rooms';
 import { updatePermission, updateSetting } from '../../../data/permissions.helper';
 
 describe('LIVECHAT - Integrations', () => {
@@ -49,11 +50,19 @@ describe('LIVECHAT - Integrations', () => {
 	});
 
 	describe('Incoming SMS', () => {
+		const visitorTokens: string[] = [];
+
 		before(async () => {
 			await updateSetting('SMS_Enabled', true);
 			await updateSetting('SMS_Service', '');
 		});
 
+		after(async () => {
+			await updateSetting('SMS_Default_Omnichannel_Department', '');
+			await updateSetting('SMS_Service', 'twilio');
+			return Promise.all(visitorTokens.map((token) => deleteVisitor(token)));
+		});
+
 		describe('POST livechat/sms-incoming/:service', () => {
 			it('should throw an error if SMS is disabled', async () => {
 				await updateSetting('SMS_Enabled', false);
diff --git a/apps/meteor/tests/end-to-end/api/livechat/07-queue.ts b/apps/meteor/tests/end-to-end/api/livechat/07-queue.ts
index 4e2128b682a6..d6bb66be4d86 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/07-queue.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/07-queue.ts
@@ -10,7 +10,7 @@ import { getCredentials, api, request, credentials } from '../../../data/api-dat
 import { createDepartmentWithAnOnlineAgent, deleteDepartment, addOrRemoveAgentFromDepartment } from '../../../data/livechat/department';
 import { createVisitor, createLivechatRoom, closeOmnichannelRoom, deleteVisitor } from '../../../data/livechat/rooms';
 import { createAnOnlineAgent } from '../../../data/livechat/users';
-import { updatePermission, updateSetting } from '../../../data/permissions.helper';
+import { updateEESetting, updatePermission, updateSetting } from '../../../data/permissions.helper';
 import { deleteUser } from '../../../data/users.helper';
 import { IS_EE } from '../../../e2e/config/constants';
 
@@ -39,6 +39,7 @@ describe('LIVECHAT - Queue', () => {
 		Promise.all([
 			updateSetting('Livechat_enabled', true),
 			updateSetting('Livechat_Routing_Method', 'Auto_Selection'),
+			updateEESetting('Livechat_Require_Contact_Verification', 'never'),
 
 			// this cleanup is required since previous tests left the DB dirty
 			cleanupRooms(),
diff --git a/apps/meteor/tests/end-to-end/api/livechat/09-visitors.ts b/apps/meteor/tests/end-to-end/api/livechat/09-visitors.ts
index 7fe093d708a3..834d4ef4334f 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/09-visitors.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/09-visitors.ts
@@ -17,7 +17,13 @@ import {
 } from '../../../data/livechat/rooms';
 import { getRandomVisitorToken } from '../../../data/livechat/users';
 import { getLivechatVisitorByToken } from '../../../data/livechat/visitor';
-import { updatePermission, updateSetting, removePermissionFromAllRoles, restorePermissionToRoles } from '../../../data/permissions.helper';
+import {
+	updatePermission,
+	updateSetting,
+	removePermissionFromAllRoles,
+	restorePermissionToRoles,
+	updateEESetting,
+} from '../../../data/permissions.helper';
 import { adminUsername } from '../../../data/user';
 import { IS_EE } from '../../../e2e/config/constants';
 
@@ -33,6 +39,7 @@ describe('LIVECHAT - visitors', () => {
 	before(async () => {
 		await updateSetting('Livechat_enabled', true);
 		await updatePermission('view-livechat-manager', ['admin']);
+		await updateEESetting('Livechat_Require_Contact_Verification', 'never');
 		await createAgent();
 		await makeAgentAvailable();
 		visitor = await createVisitor();
@@ -56,7 +63,6 @@ describe('LIVECHAT - visitors', () => {
 			expect(body).to.have.property('success', true);
 			expect(body).to.have.property('visitor');
 			expect(body.visitor).to.have.property('token', 'test');
-			expect(body.visitor).to.have.property('contactId');
 
 			// Ensure all new visitors are created as online :)
 			expect(body.visitor).to.have.property('status', 'online');
diff --git a/apps/meteor/tests/end-to-end/api/livechat/11-livechat.ts b/apps/meteor/tests/end-to-end/api/livechat/11-livechat.ts
index 7ce582025538..f57f7df9489c 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/11-livechat.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/11-livechat.ts
@@ -516,6 +516,10 @@ describe('LIVECHAT - Utils', () => {
 	});
 
 	describe('livechat/message', () => {
+		const visitorTokens: string[] = [];
+
+		after(() => Promise.all(visitorTokens.map((token) => deleteVisitor(token))));
+
 		it('should fail if no token', async () => {
 			await request.post(api('livechat/message')).set(credentials).send({}).expect(400);
 		});
@@ -530,22 +534,29 @@ describe('LIVECHAT - Utils', () => {
 		});
 		it('should fail if rid is invalid', async () => {
 			const visitor = await createVisitor();
+			visitorTokens.push(visitor.token);
 			await request.post(api('livechat/message')).set(credentials).send({ token: visitor.token, rid: 'test', msg: 'test' }).expect(400);
 		});
 		it('should fail if rid belongs to another visitor', async () => {
 			const visitor = await createVisitor();
 			const visitor2 = await createVisitor();
+			visitorTokens.push(visitor.token, visitor2.token);
+
 			const room = await createLivechatRoom(visitor2.token);
 			await request.post(api('livechat/message')).set(credentials).send({ token: visitor.token, rid: room._id, msg: 'test' }).expect(400);
 		});
 		it('should fail if room is closed', async () => {
 			const visitor = await createVisitor();
+			visitorTokens.push(visitor.token);
+
 			const room = await createLivechatRoom(visitor.token);
 			await closeOmnichannelRoom(room._id);
 			await request.post(api('livechat/message')).set(credentials).send({ token: visitor.token, rid: room._id, msg: 'test' }).expect(400);
 		});
 		it('should fail if message is greater than Livechat_enable_message_character_limit setting', async () => {
 			const visitor = await createVisitor();
+			visitorTokens.push(visitor.token);
+
 			const room = await createLivechatRoom(visitor.token);
 			await updateSetting('Livechat_enable_message_character_limit', true);
 			await updateSetting('Livechat_message_character_limit', 1);
@@ -555,6 +566,8 @@ describe('LIVECHAT - Utils', () => {
 		});
 		it('should send a message', async () => {
 			const visitor = await createVisitor();
+			visitorTokens.push(visitor.token);
+
 			const room = await createLivechatRoom(visitor.token);
 			await request.post(api('livechat/message')).set(credentials).send({ token: visitor.token, rid: room._id, msg: 'test' }).expect(200);
 		});
diff --git a/apps/meteor/tests/end-to-end/api/livechat/12-priorites.ts b/apps/meteor/tests/end-to-end/api/livechat/12-priorites.ts
index 7b80e2528629..644092c82d72 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/12-priorites.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/12-priorites.ts
@@ -38,6 +38,7 @@ import { generateRandomSLAData } from '../../../e2e/utils/omnichannel/sla';
 	before(async () => {
 		await updateSetting('Livechat_enabled', true);
 		await updateSetting('Livechat_Routing_Method', 'Manual_Selection');
+		await updateEESetting('Livechat_Require_Contact_Verification', 'never');
 	});
 
 	after(async () => {
diff --git a/apps/meteor/tests/end-to-end/api/livechat/17-dashboards-ee.ts b/apps/meteor/tests/end-to-end/api/livechat/17-dashboards-ee.ts
index dc379eea9212..ee2e102b099b 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/17-dashboards-ee.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/17-dashboards-ee.ts
@@ -14,7 +14,7 @@ import {
 	sendMessage,
 	fetchInquiry,
 } from '../../../data/livechat/rooms';
-import { updatePermission, updateSetting } from '../../../data/permissions.helper';
+import { updateEESetting, updatePermission, updateSetting } from '../../../data/permissions.helper';
 import { IS_EE } from '../../../e2e/config/constants';
 
 (IS_EE ? describe : describe.skip)('[EE] LIVECHAT - dashboards', () => {
@@ -22,6 +22,7 @@ import { IS_EE } from '../../../e2e/config/constants';
 
 	before(async () => {
 		await updateSetting('Livechat_enabled', true);
+		await updateEESetting('Livechat_Require_Contact_Verification', 'never');
 		await createAgent();
 	});
 
diff --git a/apps/meteor/tests/end-to-end/api/livechat/18-rooms-ee.ts b/apps/meteor/tests/end-to-end/api/livechat/18-rooms-ee.ts
index 43282ef9c79b..9f9a854b7ea2 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/18-rooms-ee.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/18-rooms-ee.ts
@@ -18,7 +18,7 @@ import {
 	fetchMessages,
 } from '../../../data/livechat/rooms';
 import { sleep } from '../../../data/livechat/utils';
-import { updatePermission, updateSetting } from '../../../data/permissions.helper';
+import { updateEESetting, updatePermission, updateSetting } from '../../../data/permissions.helper';
 import { password } from '../../../data/user';
 import { createUser, deleteUser, login } from '../../../data/users.helper';
 import { IS_EE } from '../../../e2e/config/constants';
@@ -31,6 +31,7 @@ import { IS_EE } from '../../../e2e/config/constants';
 	before(async () => {
 		await updateSetting('Livechat_enabled', true);
 		await updateSetting('Livechat_Routing_Method', 'Manual_Selection');
+		await updateEESetting('Livechat_Require_Contact_Verification', 'never');
 		await createAgent();
 		await makeAgentAvailable();
 	});
diff --git a/apps/meteor/tests/end-to-end/api/livechat/20-messages.ts b/apps/meteor/tests/end-to-end/api/livechat/20-messages.ts
index ead41ffafd41..a247280422cc 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/20-messages.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/20-messages.ts
@@ -15,7 +15,7 @@ import {
 	closeOmnichannelRoom,
 } from '../../../data/livechat/rooms';
 import { removeAgent } from '../../../data/livechat/users';
-import { updateSetting } from '../../../data/permissions.helper';
+import { updateEESetting, updateSetting } from '../../../data/permissions.helper';
 import { createRoom, deleteRoom } from '../../../data/rooms.helper';
 
 describe('LIVECHAT - messages', () => {
@@ -26,6 +26,7 @@ describe('LIVECHAT - messages', () => {
 		agent = await createAgent();
 		await makeAgentAvailable();
 		await updateSetting('Livechat_Routing_Method', 'Manual_Selection');
+		await updateEESetting('Livechat_Require_Contact_Verification', 'never');
 	});
 
 	after(() => Promise.all([updateSetting('Livechat_Routing_Method', 'Auto_Selection'), removeAgent(agent._id)]));
diff --git a/apps/meteor/tests/end-to-end/api/livechat/21-reports.ts b/apps/meteor/tests/end-to-end/api/livechat/21-reports.ts
index 2de552b7d8e1..ead15a3bfefb 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/21-reports.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/21-reports.ts
@@ -7,7 +7,7 @@ import { api, request, credentials, getCredentials } from '../../../data/api-dat
 import { createDepartment, addOrRemoveAgentFromDepartment } from '../../../data/livechat/department';
 import { startANewLivechatRoomAndTakeIt, createAgent } from '../../../data/livechat/rooms';
 import { createMonitor, createUnit } from '../../../data/livechat/units';
-import { restorePermissionToRoles, updatePermission } from '../../../data/permissions.helper';
+import { restorePermissionToRoles, updateEESetting, updatePermission } from '../../../data/permissions.helper';
 import { password } from '../../../data/user';
 import { createUser, deleteUser, login } from '../../../data/users.helper';
 import { IS_EE } from '../../../e2e/config/constants';
@@ -19,6 +19,7 @@ import { IS_EE } from '../../../e2e/config/constants';
 	let agent3: { user: IUser; credentials: Credentials };
 
 	before(async () => {
+		await updateEESetting('Livechat_Require_Contact_Verification', 'never');
 		const user = await createUser();
 		const userCredentials = await login(user.username, password);
 		if (!user.username) {
diff --git a/apps/meteor/tests/end-to-end/api/livechat/contacts.ts b/apps/meteor/tests/end-to-end/api/livechat/contacts.ts
index 4c6222ffe74e..4095e7df8b23 100644
--- a/apps/meteor/tests/end-to-end/api/livechat/contacts.ts
+++ b/apps/meteor/tests/end-to-end/api/livechat/contacts.ts
@@ -1,5 +1,12 @@
 import { faker } from '@faker-js/faker';
-import type { ILivechatAgent, ILivechatVisitor, IOmnichannelRoom, IUser } from '@rocket.chat/core-typings';
+import type { Credentials } from '@rocket.chat/api-client';
+import type {
+	ILivechatAgent,
+	ILivechatVisitor,
+	IOmnichannelRoom,
+	IUser,
+	ILivechatContactVisitorAssociation,
+} from '@rocket.chat/core-typings';
 import { expect } from 'chai';
 import { before, after, describe, it } from 'mocha';
 
@@ -12,10 +19,15 @@ import {
 	createLivechatRoomWidget,
 	createVisitor,
 	deleteVisitor,
+	fetchInquiry,
+	getLivechatRoomInfo,
+	startANewLivechatRoomAndTakeIt,
 } from '../../../data/livechat/rooms';
-import { removeAgent } from '../../../data/livechat/users';
+import { createAnOnlineAgent, removeAgent } from '../../../data/livechat/users';
 import { removePermissionFromAllRoles, restorePermissionToRoles, updatePermission, updateSetting } from '../../../data/permissions.helper';
 import { createUser, deleteUser } from '../../../data/users.helper';
+import { expectInvalidParams } from '../../../data/validation.helper';
+import { IS_EE } from '../../../e2e/config/constants';
 
 describe('LIVECHAT - contacts', () => {
 	let agentUser: IUser;
@@ -585,12 +597,127 @@ describe('LIVECHAT - contacts', () => {
 		});
 	});
 
+	describe('Contact Rooms', () => {
+		let agent: { credentials: Credentials; user: IUser & { username: string } };
+
+		before(async () => {
+			await updatePermission('view-livechat-contact', ['admin']);
+			agent = await createAnOnlineAgent();
+		});
+
+		after(async () => {
+			await restorePermissionToRoles('view-livechat-contact');
+			await deleteUser(agent.user);
+		});
+
+		it('should create a contact and assign it to the room', async () => {
+			const visitor = await createVisitor();
+			const room = await createLivechatRoom(visitor.token);
+			expect(room).to.have.property('contactId').that.is.a('string');
+		});
+
+		it('should create a room using the pre-created contact', async () => {
+			const email = faker.internet.email().toLowerCase();
+			const phone = faker.phone.number();
+
+			const contact = {
+				name: 'Contact Name',
+				emails: [email],
+				phones: [phone],
+				contactManager: agentUser?._id,
+			};
+
+			const { body } = await request
+				.post(api('omnichannel/contacts'))
+				.set(credentials)
+				.send({ ...contact });
+			const { contactId } = body;
+
+			const visitor = await createVisitor(undefined, 'Visitor Name', email, phone);
+
+			const room = await createLivechatRoom(visitor.token);
+
+			expect(room).to.have.property('contactId', contactId);
+			expect(room).to.have.property('fname', 'Contact Name');
+		});
+
+		it('should update room names when a contact name changes', async () => {
+			const visitor = await createVisitor();
+			const room = await createLivechatRoom(visitor.token);
+			expect(room).to.have.property('contactId').that.is.a('string');
+			expect(room.fname).to.not.be.equal('New Contact Name');
+
+			const res = await request.post(api('omnichannel/contacts.update')).set(credentials).send({
+				contactId: room.contactId,
+				name: 'New Contact Name',
+			});
+
+			expect(res.status).to.be.equal(200);
+
+			const sameRoom = await createLivechatRoom(visitor.token, { rid: room._id });
+			expect(sameRoom._id).to.be.equal(room._id);
+			expect(sameRoom.fname).to.be.equal('New Contact Name');
+		});
+
+		it('should update room subscriptions when a contact name changes', async () => {
+			const response = await startANewLivechatRoomAndTakeIt({ agent: agent.credentials });
+			const { room, visitor } = response;
+			const newName = faker.person.fullName();
+
+			expect(room).to.have.property('contactId').that.is.a('string');
+			expect(room.fname).to.be.equal(visitor.name);
+
+			const res = await request.post(api('omnichannel/contacts.update')).set(credentials).send({
+				contactId: room.contactId,
+				name: newName,
+			});
+
+			expect(res.status).to.be.equal(200);
+
+			const sameRoom = await createLivechatRoom(visitor.token, { rid: room._id });
+			expect(sameRoom._id).to.be.equal(room._id);
+			expect(sameRoom.fname).to.be.equal(newName);
+
+			const subscriptionResponse = await request
+				.get(api('subscriptions.getOne'))
+				.set(agent.credentials)
+				.query({ roomId: room._id })
+				.expect('Content-Type', 'application/json');
+			const { subscription } = subscriptionResponse.body;
+			expect(subscription).to.have.property('v').that.is.an('object');
+			expect(subscription.v).to.have.property('_id', visitor._id);
+			expect(subscription).to.have.property('name', newName);
+			expect(subscription).to.have.property('fname', newName);
+		});
+
+		it('should update inquiry when a contact name changes', async () => {
+			const visitor = await createVisitor();
+			const room = await createLivechatRoom(visitor.token);
+			expect(room).to.have.property('contactId').that.is.a('string');
+			expect(room.fname).to.not.be.equal('New Contact Name');
+
+			const res = await request.post(api('omnichannel/contacts.update')).set(credentials).send({
+				contactId: room.contactId,
+				name: 'Edited Contact Name Inquiry',
+			});
+			expect(res.status).to.be.equal(200);
+
+			const roomInquiry = await fetchInquiry(room._id);
+			expect(roomInquiry).to.have.property('name', 'Edited Contact Name Inquiry');
+		});
+	});
+
 	describe('[GET] omnichannel/contacts.get', () => {
 		let contactId: string;
+		let contactId2: string;
+
+		const email = faker.internet.email().toLowerCase();
+		const phone = faker.phone.number();
+
 		const contact = {
 			name: faker.person.fullName(),
-			emails: [faker.internet.email().toLowerCase()],
-			phones: [faker.phone.number()],
+			emails: [email],
+			phones: [phone],
 			contactManager: agentUser?._id,
 		};
 
@@ -601,6 +728,21 @@ describe('LIVECHAT - contacts', () => {
 				.set(credentials)
 				.send({ ...contact });
 			contactId = body.contactId;
+
+			const { body: contact2Body } = await request
+				.post(api('omnichannel/contacts'))
+				.set(credentials)
+				.send({
+					name: faker.person.fullName(),
+					emails: [faker.internet.email().toLowerCase()],
+					phones: [faker.phone.number()],
+					contactManager: agentUser?._id,
+				});
+			contactId2 = contact2Body.contactId;
+
+			const visitor = await createVisitor(undefined, contact.name, email, phone);
+
+			await createLivechatRoom(visitor.token);
 		});
 
 		after(async () => {
@@ -624,12 +766,12 @@ describe('LIVECHAT - contacts', () => {
 			expect(res.body.contact.contactManager).to.be.equal(contact.contactManager);
 		});
 
-		it('should return null if contact does not exist', async () => {
+		it('should return 404 if contact does not exist using contactId', async () => {
 			const res = await request.get(api(`omnichannel/contacts.get`)).set(credentials).query({ contactId: 'invalid' });
 
-			expect(res.status).to.be.equal(200);
-			expect(res.body).to.have.property('success', true);
-			expect(res.body.contact).to.be.null;
+			expect(res.status).to.be.equal(404);
+			expect(res.body).to.have.property('success', false);
+			expect(res.body).to.have.property('error', 'Resource not found');
 		});
 
 		it("should return an error if user doesn't have 'view-livechat-contact' permission", async () => {
@@ -643,13 +785,67 @@ describe('LIVECHAT - contacts', () => {
 			await restorePermissionToRoles('view-livechat-contact');
 		});
 
-		it('should return an error if contactId is missing', async () => {
+		it('should return an error if contactId and visitor association is missing', async () => {
 			const res = await request.get(api(`omnichannel/contacts.get`)).set(credentials);
 
-			expect(res.body).to.have.property('success', false);
-			expect(res.body).to.have.property('error');
-			expect(res.body.error).to.be.equal("must have required property 'contactId' [invalid-params]");
-			expect(res.body.errorType).to.be.equal('invalid-params');
+			expectInvalidParams(res, ["must have required property 'contactId' [invalid-params]"]);
+		});
+
+		describe('Contact Channels', () => {
+			let visitor: ILivechatVisitor;
+
+			beforeEach(async () => {
+				visitor = await createVisitor();
+			});
+
+			afterEach(async () => {
+				await deleteVisitor(visitor.token);
+			});
+
+			it('should add a channel to a contact when creating a new room', async () => {
+				const room = await createLivechatRoom(visitor.token);
+
+				expect(room.contactId).to.be.a('string');
+
+				const res = await request.get(api(`omnichannel/contacts.get`)).set(credentials).query({ contactId: room.contactId });
+
+				expect(res.status).to.be.equal(200);
+				expect(res.body).to.have.property('success', true);
+				expect(res.body.contact.channels).to.be.an('array');
+				expect(res.body.contact.channels.length).to.be.equal(1);
+				expect(res.body.contact.channels[0].name).to.be.equal('api');
+				expect(res.body.contact.channels[0].verified).to.be.false;
+				expect(res.body.contact.channels[0].blocked).to.be.false;
+				expect(res.body.contact.channels[0].visitor)
+					.to.be.an('object')
+					.that.is.deep.equal({
+						visitorId: visitor._id,
+						source: {
+							type: 'api',
+						},
+					});
+			});
+
+			it('should not add a channel if visitor already has one with same type', async () => {
+				const room = await createLivechatRoom(visitor.token);
+
+				const res = await request.get(api(`omnichannel/contacts.get`)).set(credentials).query({ contactId: room.contactId });
+
+				expect(res.status).to.be.equal(200);
+				expect(res.body).to.have.property('success', true);
+				expect(res.body.contact.channels).to.be.an('array');
+				expect(res.body.contact.channels.length).to.be.equal(1);
+
+				await closeOmnichannelRoom(room._id);
+				await request.get(api('livechat/room')).query({ token: visitor.token });
+
+				const secondResponse = await request.get(api(`omnichannel/contacts.get`)).set(credentials).query({ contactId: room.contactId });
+
+				expect(secondResponse.status).to.be.equal(200);
+				expect(secondResponse.body).to.have.property('success', true);
+				expect(secondResponse.body.contact.channels).to.be.an('array');
+				expect(secondResponse.body.contact.channels.length).to.be.equal(1);
+			});
 		});
 
 		describe('Last Chat', () => {
@@ -666,22 +862,28 @@ describe('LIVECHAT - contacts', () => {
 				await deleteVisitor(visitor._id);
 			});
 
+			it('should have assigned a contactId to the new room', async () => {
+				expect(room.contactId).to.be.a('string');
+			});
+
 			it('should return the last chat', async () => {
-				const res = await request.get(api(`omnichannel/contacts.get`)).set(credentials).query({ contactId: visitor.contactId });
+				const res = await request.get(api(`omnichannel/contacts.get`)).set(credentials).query({ contactId: room.contactId });
 
 				expect(res.status).to.be.equal(200);
 				expect(res.body).to.have.property('success', true);
 				expect(res.body.contact).to.have.property('lastChat');
 				expect(res.body.contact.lastChat).to.have.property('ts');
 				expect(res.body.contact.lastChat._id).to.be.equal(room._id);
+				expect(res.body.contact.channels[0].lastChat).to.have.property('ts');
+				expect(res.body.contact.channels[0].lastChat._id).to.be.equal(room._id);
 			});
 
 			it('should not return the last chat if contact never chatted', async () => {
-				const res = await request.get(api(`omnichannel/contacts.get`)).set(credentials).query({ contactId });
+				const res = await request.get(api(`omnichannel/contacts.get`)).set(credentials).query({ contactId: contactId2 });
 
 				expect(res.status).to.be.equal(200);
 				expect(res.body).to.have.property('success', true);
-				expect(res.body.contact).to.have.property('_id', contactId);
+				expect(res.body.contact).to.have.property('_id', contactId2);
 				expect(res.body.contact).to.not.have.property('lastChat');
 			});
 		});
@@ -689,6 +891,8 @@ describe('LIVECHAT - contacts', () => {
 
 	describe('[GET] omnichannel/contacts.search', () => {
 		let contactId: string;
+		let visitor: ILivechatVisitor;
+		let room: IOmnichannelRoom;
 		const contact = {
 			name: faker.person.fullName(),
 			emails: [faker.internet.email().toLowerCase()],
@@ -700,10 +904,14 @@ describe('LIVECHAT - contacts', () => {
 			await updatePermission('view-livechat-contact', ['admin']);
 			const { body } = await request.post(api('omnichannel/contacts')).set(credentials).send(contact);
 			contactId = body.contactId;
+			visitor = await createVisitor();
+			room = await createLivechatRoom(visitor.token);
 		});
 
 		after(async () => {
 			await restorePermissionToRoles('view-livechat-contact');
+			await closeOmnichannelRoom(room._id);
+			await deleteVisitor(visitor._id);
 		});
 
 		it('should be able to list all contacts', async () => {
@@ -718,6 +926,24 @@ describe('LIVECHAT - contacts', () => {
 			expect(res.body.offset).to.be.an('number');
 		});
 
+		it('should return only known contacts by default', async () => {
+			const res = await request.get(api(`omnichannel/contacts.search`)).set(credentials);
+
+			expect(res.status).to.be.equal(200);
+			expect(res.body).to.have.property('success', true);
+			expect(res.body.contacts).to.be.an('array');
+			expect(res.body.contacts[0].unknown).to.be.false;
+		});
+
+		it('should be able to filter contacts by unknown field', async () => {
+			const res = await request.get(api(`omnichannel/contacts.search`)).set(credentials).query({ unknown: true });
+
+			expect(res.status).to.be.equal(200);
+			expect(res.body).to.have.property('success', true);
+			expect(res.body.contacts).to.be.an('array');
+			expect(res.body.contacts[0].unknown).to.be.true;
+		});
+
 		it('should return only contacts that match the searchText using email', async () => {
 			const res = await request.get(api(`omnichannel/contacts.search`)).set(credentials).query({ searchText: contact.emails[0] });
 			expect(res.status).to.be.equal(200);
@@ -781,54 +1007,6 @@ describe('LIVECHAT - contacts', () => {
 		});
 	});
 
-	describe('Contact Channels', () => {
-		let visitor: ILivechatVisitor;
-
-		beforeEach(async () => {
-			visitor = await createVisitor();
-		});
-
-		afterEach(async () => {
-			await deleteVisitor(visitor.token);
-		});
-
-		it('should add a channel to a contact when creating a new room', async () => {
-			await request.get(api('livechat/room')).query({ token: visitor.token });
-
-			const res = await request.get(api(`omnichannel/contacts.get`)).set(credentials).query({ contactId: visitor.contactId });
-
-			expect(res.status).to.be.equal(200);
-			expect(res.body).to.have.property('success', true);
-			expect(res.body.contact.channels).to.be.an('array');
-			expect(res.body.contact.channels.length).to.be.equal(1);
-			expect(res.body.contact.channels[0].name).to.be.equal('api');
-			expect(res.body.contact.channels[0].verified).to.be.false;
-			expect(res.body.contact.channels[0].blocked).to.be.false;
-			expect(res.body.contact.channels[0].visitorId).to.be.equal(visitor._id);
-		});
-
-		it('should not add a channel if visitor already has one with same type', async () => {
-			const roomResult = await request.get(api('livechat/room')).query({ token: visitor.token });
-
-			const res = await request.get(api(`omnichannel/contacts.get`)).set(credentials).query({ contactId: visitor.contactId });
-
-			expect(res.status).to.be.equal(200);
-			expect(res.body).to.have.property('success', true);
-			expect(res.body.contact.channels).to.be.an('array');
-			expect(res.body.contact.channels.length).to.be.equal(1);
-
-			await closeOmnichannelRoom(roomResult.body.room._id);
-			await request.get(api('livechat/room')).query({ token: visitor.token });
-
-			const secondResponse = await request.get(api(`omnichannel/contacts.get`)).set(credentials).query({ contactId: visitor.contactId });
-
-			expect(secondResponse.status).to.be.equal(200);
-			expect(secondResponse.body).to.have.property('success', true);
-			expect(secondResponse.body.contact.channels).to.be.an('array');
-			expect(secondResponse.body.contact.channels.length).to.be.equal(1);
-		});
-	});
-
 	describe('[GET] omnichannel/contacts.history', () => {
 		let visitor: ILivechatVisitor;
 		let room1: IOmnichannelRoom;
@@ -847,33 +1025,28 @@ describe('LIVECHAT - contacts', () => {
 		});
 
 		it('should be able to list a contact history', async () => {
-			const res = await request.get(api(`omnichannel/contacts.history`)).set(credentials).query({ contactId: visitor.contactId });
+			const res = await request.get(api(`omnichannel/contacts.history`)).set(credentials).query({ contactId: room1.contactId });
 
 			expect(res.status).to.be.equal(200);
 			expect(res.body).to.have.property('success', true);
 			expect(res.body.history).to.be.an('array');
-			expect(res.body.history.length).to.be.equal(2);
-			expect(res.body.total).to.be.equal(2);
+			expect(res.body.history.length).to.be.equal(1);
+			expect(res.body.total).to.be.equal(1);
 			expect(res.body.count).to.be.an('number');
 			expect(res.body.offset).to.be.an('number');
 
-			expect(res.body.history[0]).to.have.property('_id', room2._id);
-			expect(res.body.history[0]).to.not.have.property('closedAt');
-			expect(res.body.history[0]).to.have.property('fname', visitor.name);
-			expect(res.body.history[0].source).to.have.property('type', 'widget');
-
-			expect(res.body.history[1]).to.have.property('_id', room1._id);
-			expect(res.body.history[1]).to.have.property('closedAt');
-			expect(res.body.history[1]).to.have.property('closedBy');
-			expect(res.body.history[1]).to.have.property('closer', 'user');
-			expect(res.body.history[1].source).to.have.property('type', 'api');
+			expect(res.body.history[0]).to.have.property('_id', room1._id);
+			expect(res.body.history[0]).to.have.property('closedAt');
+			expect(res.body.history[0]).to.have.property('closedBy');
+			expect(res.body.history[0]).to.have.property('closer', 'user');
+			expect(res.body.history[0].source).to.have.property('type', 'api');
 		});
 
 		it('should be able to filter a room by the source', async () => {
 			const res = await request
 				.get(api(`omnichannel/contacts.history`))
 				.set(credentials)
-				.query({ contactId: visitor.contactId, source: 'api' });
+				.query({ contactId: room1.contactId, source: 'api' });
 
 			expect(res.status).to.be.equal(200);
 			expect(res.body).to.have.property('success', true);
@@ -886,16 +1059,22 @@ describe('LIVECHAT - contacts', () => {
 		});
 
 		it('should return an empty list if contact does not have history', async () => {
-			const emptyVisitor = await createVisitor();
-			const res = await request.get(api(`omnichannel/contacts.history`)).set(credentials).query({ contactId: emptyVisitor.contactId });
+			const { body } = await request
+				.post(api('omnichannel/contacts'))
+				.set(credentials)
+				.send({
+					name: faker.person.fullName(),
+					emails: [faker.internet.email().toLowerCase()],
+					phones: [faker.phone.number()],
+				});
+
+			const res = await request.get(api(`omnichannel/contacts.history`)).set(credentials).query({ contactId: body.contactId });
 
 			expect(res.status).to.be.equal(200);
 			expect(res.body).to.have.property('success', true);
 			expect(res.body.history).to.be.an('array');
 			expect(res.body.history.length).to.be.equal(0);
 			expect(res.body.total).to.be.equal(0);
-
-			await deleteVisitor(emptyVisitor.token);
 		});
 
 		it('should return an error if contacts not exists', async () => {
@@ -906,4 +1085,344 @@ describe('LIVECHAT - contacts', () => {
 			expect(res.body.error).to.be.equal('error-contact-not-found');
 		});
 	});
+
+	describe('[GET] omnichannel/contacts.channels', () => {
+		let contactId: string;
+		let visitor: ILivechatVisitor;
+		let room: IOmnichannelRoom;
+
+		before(async () => {
+			await updatePermission('view-livechat-contact', ['admin']);
+			visitor = await createVisitor();
+			room = await createLivechatRoom(visitor.token);
+			await closeOmnichannelRoom(room._id);
+			contactId = room.contactId as string;
+		});
+
+		after(async () => {
+			await deleteVisitor(visitor._id);
+			await restorePermissionToRoles('view-livechat-contact');
+		});
+
+		it('should be able get the channels of a contact by his id', async () => {
+			const res = await request.get(api(`omnichannel/contacts.channels`)).set(credentials).query({ contactId });
+
+			expect(res.status).to.be.equal(200);
+			expect(res.body).to.have.property('success', true);
+			expect(res.body.channels).to.be.an('array');
+			expect(res.body.channels.length).to.be.equal(1);
+			expect(res.body.channels[0]).to.have.property('name', 'api');
+			expect(res.body.channels[0])
+				.to.have.property('visitor')
+				.that.is.an('object')
+				.and.deep.equal({
+					visitorId: visitor._id,
+					source: {
+						type: 'api',
+					},
+				});
+			expect(res.body.channels[0]).to.have.property('verified', false);
+			expect(res.body.channels[0]).to.have.property('blocked', false);
+			expect(res.body.channels[0]).to.have.property('lastChat');
+		});
+
+		it('should return an empty array if contact does not have channels', async () => {
+			const { body } = await request
+				.post(api('omnichannel/contacts'))
+				.set(credentials)
+				.send({ name: faker.person.fullName(), emails: [faker.internet.email().toLowerCase()], phones: [faker.phone.number()] });
+			const res = await request.get(api(`omnichannel/contacts.channels`)).set(credentials).query({ contactId: body.contactId });
+
+			expect(res.status).to.be.equal(200);
+			expect(res.body).to.have.property('success', true);
+			expect(res.body.channels).to.be.an('array');
+			expect(res.body.channels.length).to.be.equal(0);
+		});
+
+		it('should return an empty array if contact does not exist', async () => {
+			const res = await request.get(api(`omnichannel/contacts.channels`)).set(credentials).query({ contactId: 'invalid' });
+
+			expect(res.status).to.be.equal(200);
+			expect(res.body).to.have.property('success', true);
+			expect(res.body.channels).to.be.an('array');
+			expect(res.body.channels.length).to.be.equal(0);
+		});
+
+		it("should return an error if user doesn't have 'view-livechat-contact' permission", async () => {
+			await removePermissionFromAllRoles('view-livechat-contact');
+
+			const res = await request.get(api(`omnichannel/contacts.channels`)).set(credentials).query({ contactId });
+
+			expect(res.body).to.have.property('success', false);
+			expect(res.body.error).to.be.equal('User does not have the permissions required for this action [error-unauthorized]');
+
+			await restorePermissionToRoles('view-livechat-contact');
+		});
+
+		it('should return an error if contactId is missing', async () => {
+			const res = await request.get(api(`omnichannel/contacts.channels`)).set(credentials);
+
+			expect(res.body).to.have.property('success', false);
+			expect(res.body).to.have.property('error');
+			expect(res.body.error).to.be.equal("must have required property 'contactId' [invalid-params]");
+			expect(res.body.errorType).to.be.equal('invalid-params');
+		});
+	});
+
+	(IS_EE ? describe : describe.skip)('[POST] omnichannel/contacts.block', async () => {
+		let visitor: ILivechatVisitor;
+		let room: IOmnichannelRoom;
+		let association: ILivechatContactVisitorAssociation;
+
+		before(async () => {
+			visitor = await createVisitor();
+			room = await createLivechatRoom(visitor.token);
+
+			association = {
+				visitorId: visitor._id,
+				source: {
+					type: room.source.type,
+					id: room.source.id,
+				},
+			};
+		});
+
+		after(async () => {
+			await deleteVisitor(visitor.token);
+		});
+
+		it('should be able to block a contact channel', async () => {
+			const res = await request.post(api('omnichannel/contacts.block')).set(credentials).send({ visitor: association });
+
+			expect(res.status).to.be.equal(200);
+			expect(res.body).to.have.property('success', true);
+
+			const { body } = await request.get(api('omnichannel/contacts.get')).set(credentials).query({ contactId: room.contactId });
+
+			expect(body.contact.channels).to.be.an('array');
+			expect(body.contact.channels.length).to.be.equal(1);
+			expect(body.contact.channels[0].blocked).to.be.true;
+		});
+
+		it('should return an error if contact does not exist', async () => {
+			const res = await request
+				.post(api('omnichannel/contacts.block'))
+				.set(credentials)
+				.send({ visitor: { ...association, visitorId: 'invalid' } });
+
+			expect(res.status).to.be.equal(400);
+			expect(res.body).to.have.property('success', false);
+			expect(res.body.error).to.be.equal('error-contact-not-found');
+		});
+
+		it('should return an error if contact does not exist 2', async () => {
+			const res = await request
+				.post(api('omnichannel/contacts.block'))
+				.set(credentials)
+				.send({ visitor: { ...association, source: { type: 'sms' } } });
+
+			expect(res.status).to.be.equal(400);
+			expect(res.body).to.have.property('success', false);
+			expect(res.body.error).to.be.equal('error-contact-not-found');
+		});
+
+		it('should close room when contact is blocked', async () => {
+			const res = await request.post(api('omnichannel/contacts.block')).set(credentials).send({ visitor: association });
+
+			expect(res.status).to.be.equal(200);
+			expect(res.body).to.have.property('success', true);
+
+			const closedRoom = await getLivechatRoomInfo(room._id);
+
+			expect(closedRoom).to.have.property('closedAt');
+			expect(closedRoom).to.have.property('closedBy');
+			expect(closedRoom.lastMessage?.msg).to.be.equal('This channel has been blocked');
+		});
+
+		it('should not be able to open a room when contact is blocked', async () => {
+			await request.post(api('omnichannel/contacts.block')).set(credentials).send({ visitor: association });
+
+			const createRoomResponse = await request.get(api('livechat/room')).query({ token: visitor.token }).set(credentials);
+
+			expect(createRoomResponse.status).to.be.equal(400);
+			expect(createRoomResponse.body).to.have.property('success', false);
+			expect(createRoomResponse.body).to.have.property('error', 'error-contact-channel-blocked');
+		});
+
+		it('should return an error if visitor is missing', async () => {
+			const res = await request.post(api('omnichannel/contacts.block')).set(credentials).send({});
+
+			expect(res.status).to.be.equal(400);
+			expect(res.body).to.have.property('success', false);
+			expect(res.body.error).to.be.equal("must have required property 'visitor' [invalid-params]");
+		});
+
+		it('should return an error if visitorId is missing', async () => {
+			const res = await request
+				.post(api('omnichannel/contacts.block'))
+				.set(credentials)
+				.send({ visitor: { source: association.source } });
+
+			expect(res.status).to.be.equal(400);
+			expect(res.body).to.have.property('success', false);
+			expect(res.body.error).to.be.equal("must have required property 'visitorId' [invalid-params]");
+		});
+
+		it('should return an error if source is missing', async () => {
+			const res = await request
+				.post(api('omnichannel/contacts.block'))
+				.set(credentials)
+				.send({ visitor: { visitorId: association.visitorId } });
+
+			expect(res.status).to.be.equal(400);
+			expect(res.body).to.have.property('success', false);
+			expect(res.body.error).to.be.equal("must have required property 'source' [invalid-params]");
+		});
+
+		it('should return an error if source type is missing', async () => {
+			const res = await request
+				.post(api('omnichannel/contacts.block'))
+				.set(credentials)
+				.send({ visitor: { visitorId: association.visitorId, source: { id: association.source.id } } });
+
+			expect(res.status).to.be.equal(400);
+			expect(res.body).to.have.property('success', false);
+			expect(res.body.error).to.be.equal("must have required property 'type' [invalid-params]");
+		});
+
+		describe('Permissions', () => {
+			before(async () => {
+				await removePermissionFromAllRoles('block-livechat-contact');
+			});
+
+			after(async () => {
+				await restorePermissionToRoles('block-livechat-contact');
+			});
+
+			it("should return an error if user doesn't have 'block-livechat-contact' permission", async () => {
+				const res = await request.post(api('omnichannel/contacts.block')).set(credentials).send({ visitor: association });
+
+				expect(res.body).to.have.property('success', false);
+				expect(res.body.error).to.be.equal('User does not have the permissions required for this action [error-unauthorized]');
+			});
+		});
+	});
+
+	(IS_EE ? describe : describe.skip)('[POST] omnichannel/contacts.unblock', async () => {
+		let visitor: ILivechatVisitor;
+		let room: IOmnichannelRoom;
+		let association: ILivechatContactVisitorAssociation;
+
+		before(async () => {
+			visitor = await createVisitor();
+			room = await createLivechatRoom(visitor.token);
+			await closeOmnichannelRoom(room._id);
+			association = { visitorId: visitor._id, source: { type: room.source.type, id: room.source.id } };
+		});
+
+		after(async () => {
+			await deleteVisitor(visitor.token);
+		});
+
+		it('should be able to unblock a contact channel', async () => {
+			await request.post(api('omnichannel/contacts.block')).set(credentials).send({ visitor: association });
+
+			const { body } = await request.get(api('omnichannel/contacts.get')).set(credentials).query({ contactId: room.contactId });
+
+			expect(body.contact.channels).to.be.an('array');
+			expect(body.contact.channels.length).to.be.equal(1);
+			expect(body.contact.channels[0].blocked).to.be.true;
+
+			const res = await request.post(api('omnichannel/contacts.unblock')).set(credentials).send({ visitor: association });
+
+			expect(res.status).to.be.equal(200);
+			expect(res.body).to.have.property('success', true);
+
+			const { body: body2 } = await request.get(api('omnichannel/contacts.get')).set(credentials).query({ contactId: room.contactId });
+
+			expect(body2.contact.channels).to.be.an('array');
+			expect(body2.contact.channels.length).to.be.equal(1);
+			expect(body2.contact.channels[0].blocked).to.be.false;
+		});
+
+		it('should return an error if contact does not exist', async () => {
+			const res = await request
+				.post(api('omnichannel/contacts.block'))
+				.set(credentials)
+				.send({ visitor: { ...association, visitorId: 'invalid' } });
+
+			expect(res.status).to.be.equal(400);
+			expect(res.body).to.have.property('success', false);
+			expect(res.body.error).to.be.equal('error-contact-not-found');
+		});
+
+		it('should return an error if contact does not exist 2', async () => {
+			const res = await request
+				.post(api('omnichannel/contacts.block'))
+				.set(credentials)
+				.send({ visitor: { ...association, source: { type: 'sms', id: room.source.id } } });
+
+			expect(res.status).to.be.equal(400);
+			expect(res.body).to.have.property('success', false);
+			expect(res.body.error).to.be.equal('error-contact-not-found');
+		});
+
+		it('should return an error if visitor is missing', async () => {
+			const res = await request.post(api('omnichannel/contacts.unblock')).set(credentials).send({});
+
+			expect(res.status).to.be.equal(400);
+			expect(res.body).to.have.property('success', false);
+			expect(res.body.error).to.be.equal("must have required property 'visitor' [invalid-params]");
+		});
+
+		it('should return an error if visitorId is missing', async () => {
+			const res = await request
+				.post(api('omnichannel/contacts.unblock'))
+				.set(credentials)
+				.send({ visitor: { source: association.source } });
+
+			expect(res.status).to.be.equal(400);
+			expect(res.body).to.have.property('success', false);
+			expect(res.body.error).to.be.equal("must have required property 'visitorId' [invalid-params]");
+		});
+
+		it('should return an error if source is missing', async () => {
+			const res = await request
+				.post(api('omnichannel/contacts.unblock'))
+				.set(credentials)
+				.send({ visitor: { visitorId: association.visitorId } });
+
+			expect(res.status).to.be.equal(400);
+			expect(res.body).to.have.property('success', false);
+			expect(res.body.error).to.be.equal("must have required property 'source' [invalid-params]");
+		});
+
+		it('should return an error if source type is missing', async () => {
+			const res = await request
+				.post(api('omnichannel/contacts.unblock'))
+				.set(credentials)
+				.send({ visitor: { visitorId: association.visitorId, source: { id: association.source.id } } });
+
+			expect(res.status).to.be.equal(400);
+			expect(res.body).to.have.property('success', false);
+			expect(res.body.error).to.be.equal("must have required property 'type' [invalid-params]");
+		});
+
+		describe('Permissions', () => {
+			before(async () => {
+				await removePermissionFromAllRoles('unblock-livechat-contact');
+			});
+
+			after(async () => {
+				await restorePermissionToRoles('unblock-livechat-contact');
+			});
+
+			it("should return an error if user doesn't have 'unblock-livechat-contact' permission", async () => {
+				const res = await request.post(api('omnichannel/contacts.unblock')).set(credentials).send({ visitor: association });
+
+				expect(res.body).to.have.property('success', false);
+				expect(res.body.error).to.be.equal('User does not have the permissions required for this action [error-unauthorized]');
+			});
+		});
+	});
 });
diff --git a/apps/meteor/tests/end-to-end/api/methods.ts b/apps/meteor/tests/end-to-end/api/methods.ts
index 9e05fba88b4c..e3e8a193d799 100644
--- a/apps/meteor/tests/end-to-end/api/methods.ts
+++ b/apps/meteor/tests/end-to-end/api/methods.ts
@@ -2059,6 +2059,29 @@ describe('Meteor.methods', () => {
 					expect(res.body).to.have.property('success', false);
 				});
 		});
+
+		it('should return an error if request includes unallowed parameters', (done) => {
+			void request
+				.post(methodCall('sendMessage'))
+				.set(credentials)
+				.send({
+					message: JSON.stringify({
+						method: 'sendMessage',
+						params: [{ _id: `${Date.now() + Math.random()}`, rid, msg: 'test message', _notAllowed: '1' }],
+						id: 1000,
+						msg: 'method',
+					}),
+				})
+				.expect('Content-Type', 'application/json')
+				.expect(200)
+				.expect((res) => {
+					expect(res.body).to.have.property('success', true);
+					const data = JSON.parse(res.body.message);
+					expect(data).to.have.a.property('error').that.is.an('object');
+					expect(data.error.sanitizedError).to.have.a.property('reason', 'Match failed');
+				})
+				.end(done);
+		});
 	});
 
 	describe('[@updateMessage]', () => {
diff --git a/apps/meteor/tests/end-to-end/api/miscellaneous.ts b/apps/meteor/tests/end-to-end/api/miscellaneous.ts
index b6abac4f2014..69832805d8ea 100644
--- a/apps/meteor/tests/end-to-end/api/miscellaneous.ts
+++ b/apps/meteor/tests/end-to-end/api/miscellaneous.ts
@@ -161,7 +161,9 @@ describe('miscellaneous', () => {
 					'autoImageLoad',
 					'emailNotificationMode',
 					'unreadAlert',
+					'masterVolume',
 					'notificationsSoundVolume',
+					'voipRingerVolume',
 					'omnichannelTranscriptEmail',
 					IS_EE ? 'omnichannelTranscriptPDF' : false,
 					'desktopNotifications',
diff --git a/apps/meteor/tests/end-to-end/api/rooms.ts b/apps/meteor/tests/end-to-end/api/rooms.ts
index 712e1917441d..ca033ef88bf8 100644
--- a/apps/meteor/tests/end-to-end/api/rooms.ts
+++ b/apps/meteor/tests/end-to-end/api/rooms.ts
@@ -550,7 +550,81 @@ describe('[Rooms]', () => {
 					expect(res.body.message.files[0]).to.have.property('name', 'lst-test.lst');
 				});
 		});
+		describe('/rooms.media - Max allowed size', () => {
+			before(async () => updateSetting('Message_MaxAllowedSize', 10));
+			after(async () => updateSetting('Message_MaxAllowedSize', 5000));
+			it('should allow uploading a file with description under the max character limit', async () => {
+				await request
+					.post(api(`rooms.media/${testChannel._id}`))
+					.set(credentials)
+					.attach('file', imgURL)
+					.expect('Content-Type', 'application/json')
+					.expect(200)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', true);
+						expect(res.body).to.have.property('file');
+						expect(res.body.file).to.have.property('_id');
+						expect(res.body.file).to.have.property('url');
+
+						fileNewUrl = res.body.file.url;
+						fileOldUrl = res.body.file.url.replace('/file-upload/', '/ufs/GridFS:Uploads/');
+						fileId = res.body.file._id;
+					});
+
+				await request
+					.post(api(`rooms.mediaConfirm/${testChannel._id}/${fileId}`))
+					.set(credentials)
+					.send({
+						description: '123456789',
+					})
+					.expect('Content-Type', 'application/json')
+					.expect(200)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', true);
+						expect(res.body).to.have.property('message');
+						expect(res.body.message).to.have.property('attachments');
+						expect(res.body.message.attachments).to.be.an('array').of.length(1);
+						expect(res.body.message.attachments[0]).to.have.property('image_type', 'image/png');
+						expect(res.body.message.attachments[0]).to.have.property('title', '1024x1024.png');
+						expect(res.body.message).to.have.property('files');
+						expect(res.body.message.files).to.be.an('array').of.length(2);
+						expect(res.body.message.files[0]).to.have.property('type', 'image/png');
+						expect(res.body.message.files[0]).to.have.property('name', '1024x1024.png');
+					});
+			});
 
+			it('should not allow uploading a file with description over the max character limit', async () => {
+				await request
+					.post(api(`rooms.media/${testChannel._id}`))
+					.set(credentials)
+					.attach('file', imgURL)
+					.expect('Content-Type', 'application/json')
+					.expect(200)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', true);
+						expect(res.body).to.have.property('file');
+						expect(res.body.file).to.have.property('_id');
+						expect(res.body.file).to.have.property('url');
+
+						fileNewUrl = res.body.file.url;
+						fileOldUrl = res.body.file.url.replace('/file-upload/', '/ufs/GridFS:Uploads/');
+						fileId = res.body.file._id;
+					});
+
+				await request
+					.post(api(`rooms.mediaConfirm/${testChannel._id}/${fileId}`))
+					.set(credentials)
+					.send({
+						description: '12345678910',
+					})
+					.expect('Content-Type', 'application/json')
+					.expect(400)
+					.expect((res) => {
+						expect(res.body).to.have.property('success', false);
+						expect(res.body).to.have.property('errorType', 'error-message-size-exceeded');
+					});
+			});
+		});
 		it('should not allow uploading a blocked media type to a room', async () => {
 			await updateSetting('FileUpload_MediaTypeBlackList', 'text/plain');
 			await request
diff --git a/apps/meteor/tests/end-to-end/api/users.ts b/apps/meteor/tests/end-to-end/api/users.ts
index 87a27ecedfb4..87e4bd673323 100644
--- a/apps/meteor/tests/end-to-end/api/users.ts
+++ b/apps/meteor/tests/end-to-end/api/users.ts
@@ -91,7 +91,7 @@ const setRoomConfig = ({ roomId, favorite, isDefault }: { roomId: IRoom['_id'];
 				? {
 						defaultValue: true,
 						favorite: false,
-				  }
+					}
 				: undefined,
 		});
 };
diff --git a/apps/meteor/tests/end-to-end/apps/video-conferences.ts b/apps/meteor/tests/end-to-end/apps/video-conferences.ts
index 80813603d3be..230ee8e9f80c 100644
--- a/apps/meteor/tests/end-to-end/apps/video-conferences.ts
+++ b/apps/meteor/tests/end-to-end/apps/video-conferences.ts
@@ -81,7 +81,7 @@ describe('Apps - Video Conferences', () => {
 			}
 
 			await updateSetting('VideoConf_Enable_Persistent_Chat', false);
-			await updateSetting('VideoConf_Persistent_Chat_Discussion_Name', 'Conference Call Chat History');
+			await updateSetting('VideoConf_Persistent_Chat_Discussion_Name', '[date] - Video Call Persisted Chat');
 		});
 
 		describe('[/video-conference.capabilities]', () => {
@@ -577,7 +577,80 @@ describe('Apps - Video Conferences', () => {
 							expect(res.body.room)
 								.to.have.a.property('fname')
 								.that.is.a('string')
-								.that.satisfies((msg: string) => msg.startsWith('Chat History'));
+								.that.satisfies((msg: string) => !msg.startsWith('Chat History'))
+								.that.satisfies((msg: string) => msg.includes('Chat History'));
+						});
+				});
+			});
+
+			describe('[Persistent Chat provider with the persistent chat feature enabled and custom discussion names]', () => {
+				let callId: string | undefined;
+				let discussionRid: string | undefined;
+				let chatDate: string;
+
+				before(async () => {
+					if (!process.env.IS_EE) {
+						return;
+					}
+
+					await updateSetting('VideoConf_Default_Provider', 'persistentchat');
+					await updateSetting('Discussion_enabled', true);
+					await updateSetting('VideoConf_Enable_Persistent_Chat', true);
+					await updateSetting('VideoConf_Persistent_Chat_Discussion_Name', 'Date [date] between');
+					chatDate = new Date().toISOString().substring(0, 10);
+					const res = await request.post(api('video-conference.start')).set(credentials).send({
+						roomId,
+					});
+
+					callId = res.body.data.callId;
+				});
+
+				it('should include a discussion room id on the response', async function () {
+					if (!process.env.IS_EE) {
+						this.skip();
+						return;
+					}
+
+					await request
+						.get(api('video-conference.info'))
+						.set(credentials)
+						.query({
+							callId,
+						})
+						.expect(200)
+						.expect((res: Response) => {
+							expect(res.body.success).to.be.equal(true);
+							expect(res.body).to.have.a.property('providerName').equal('persistentchat');
+							expect(res.body).to.not.have.a.property('providerData');
+							expect(res.body).to.have.a.property('_id').equal(callId);
+							expect(res.body).to.have.a.property('discussionRid').that.is.a('string');
+
+							discussionRid = res.body.discussionRid;
+							expect(res.body).to.have.a.property('url').equal(`pchat/videoconference/${callId}/${discussionRid}`);
+						});
+				});
+
+				it('should have created the discussion room using the configured name', async function () {
+					if (!process.env.IS_EE) {
+						this.skip();
+						return;
+					}
+
+					await request
+						.get(api('rooms.info'))
+						.set(credentials)
+						.query({
+							roomId: discussionRid,
+						})
+						.expect(200)
+						.expect((res) => {
+							expect(res.body).to.have.property('success', true);
+							expect(res.body).to.have.property('room').and.to.be.an('object');
+							expect(res.body.room).to.have.a.property('_id').equal(discussionRid);
+							expect(res.body.room)
+								.to.have.a.property('fname')
+								.that.is.a('string')
+								.that.satisfies((msg: string) => msg.includes(`Date ${chatDate} between`));
 						});
 				});
 			});
diff --git a/apps/meteor/tests/mocks/data.ts b/apps/meteor/tests/mocks/data.ts
index 777fe1967837..26dbdca25179 100644
--- a/apps/meteor/tests/mocks/data.ts
+++ b/apps/meteor/tests/mocks/data.ts
@@ -1,7 +1,7 @@
 import { faker } from '@faker-js/faker';
 import type { IExternalComponentRoomInfo, IExternalComponentUserInfo } from '@rocket.chat/apps-engine/client/definition';
-import type { LicenseInfo } from '@rocket.chat/core-typings';
-import { AppSubscriptionStatus, type App, type IMessage, type IRoom, type ISubscription, type IUser } from '@rocket.chat/core-typings';
+import { AppSubscriptionStatus } from '@rocket.chat/core-typings';
+import type { LicenseInfo, App, IMessage, IRoom, ISubscription, IUser } from '@rocket.chat/core-typings';
 import { parse } from '@rocket.chat/message-parser';
 
 import type { MessageWithMdEnforced } from '../../client/lib/parseMessageTextToAstMarkdown';
diff --git a/apps/meteor/tests/mocks/server/BrokerMocked.ts b/apps/meteor/tests/mocks/server/BrokerMocked.ts
index fd89044bc781..bf8ed617da22 100644
--- a/apps/meteor/tests/mocks/server/BrokerMocked.ts
+++ b/apps/meteor/tests/mocks/server/BrokerMocked.ts
@@ -15,10 +15,6 @@ export class BrokerMocked {
 		return this.actions[method](data);
 	}
 
-	async waitAndCall(method: string, data: any): Promise<any> {
-		return this.actions[method](data);
-	}
-
 	async broadcastToServices(): Promise<void> {
 		// no op
 	}
diff --git a/apps/meteor/tests/mocks/utils/createDeferredMockFn.ts b/apps/meteor/tests/mocks/utils/createDeferredMockFn.ts
new file mode 100644
index 000000000000..d70e0083c0be
--- /dev/null
+++ b/apps/meteor/tests/mocks/utils/createDeferredMockFn.ts
@@ -0,0 +1,19 @@
+function createDeferredPromise<R = void>() {
+	let resolve!: (value: R | PromiseLike<R>) => void;
+	let reject!: (reason?: unknown) => void;
+
+	const promise = new Promise<R>((res, rej) => {
+		resolve = res;
+		reject = rej;
+	});
+
+	return { promise, resolve, reject };
+}
+
+function createDeferredMockFn<R = void>() {
+	const deferred = createDeferredPromise<R>();
+	const fn = jest.fn(() => deferred.promise);
+	return { ...deferred, fn };
+}
+
+export default createDeferredMockFn;
diff --git a/apps/meteor/tests/unit/app/emoji/helpers.spec.ts b/apps/meteor/tests/unit/app/emoji/helpers.spec.ts
new file mode 100644
index 000000000000..c7d83b5a36c2
--- /dev/null
+++ b/apps/meteor/tests/unit/app/emoji/helpers.spec.ts
@@ -0,0 +1,51 @@
+import { expect } from 'chai';
+import { describe, it, beforeEach } from 'mocha';
+
+import { updateRecent, removeFromRecent, replaceEmojiInRecent } from '../../../../app/emoji/client/helpers';
+import { emoji } from '../../../../app/emoji/client/lib';
+
+describe('Emoji Client Helpers', () => {
+	beforeEach(() => {
+		emoji.packages.base.emojisByCategory.recent = [];
+	});
+
+	describe('updateRecent', () => {
+		it('should update recent emojis with the provided emojis', () => {
+			const recentEmojis = ['emoji1', 'emoji2'];
+			updateRecent(recentEmojis);
+			expect(emoji.packages.base.emojisByCategory.recent).to.contain('emoji1');
+			expect(emoji.packages.base.emojisByCategory.recent).to.contain('emoji2');
+		});
+	});
+
+	describe('removeFromRecent', () => {
+		it('should remove a specific emoji from recent emojis', () => {
+			emoji.packages.base.emojisByCategory.recent = ['emoji1', 'emoji2', 'emoji3'];
+			removeFromRecent('emoji2', emoji.packages.base.emojisByCategory.recent);
+			expect(emoji.packages.base.emojisByCategory.recent).to.not.include('emoji2');
+			expect(emoji.packages.base.emojisByCategory.recent).to.deep.equal(['emoji1', 'emoji3']);
+		});
+
+		it('should do nothing if the emoji is not in the recent list', () => {
+			emoji.packages.base.emojisByCategory.recent = ['emoji1', 'emoji2'];
+			removeFromRecent('emoji3', emoji.packages.base.emojisByCategory.recent);
+			expect(emoji.packages.base.emojisByCategory.recent).to.deep.equal(['emoji1', 'emoji2']);
+		});
+	});
+
+	describe('replaceEmojiInRecent', () => {
+		it('should replace an existing emoji with a new one in recent emojis', () => {
+			emoji.packages.base.emojisByCategory.recent = ['emoji1', 'emoji2', 'emoji3'];
+			replaceEmojiInRecent({ oldEmoji: 'emoji2', newEmoji: 'emoji4' });
+			expect(emoji.packages.base.emojisByCategory.recent).to.not.include('emoji2');
+			expect(emoji.packages.base.emojisByCategory.recent).to.include('emoji4');
+			expect(emoji.packages.base.emojisByCategory.recent).to.deep.equal(['emoji1', 'emoji4', 'emoji3']);
+		});
+
+		it('should do nothing if the emoji to replace is not in the recent list', () => {
+			emoji.packages.base.emojisByCategory.recent = ['emoji1', 'emoji2'];
+			replaceEmojiInRecent({ oldEmoji: 'emoji3', newEmoji: 'emoji4' });
+			expect(emoji.packages.base.emojisByCategory.recent).to.deep.equal(['emoji1', 'emoji2']);
+		});
+	});
+});
diff --git a/apps/meteor/tests/unit/app/importer/server/userConverter.spec.ts b/apps/meteor/tests/unit/app/importer/server/userConverter.spec.ts
index 3dd5a8a5e3c9..b263042e23b8 100644
--- a/apps/meteor/tests/unit/app/importer/server/userConverter.spec.ts
+++ b/apps/meteor/tests/unit/app/importer/server/userConverter.spec.ts
@@ -16,6 +16,9 @@ const insertUserDoc = sinon.stub();
 const callbacks = {
 	run: sinon.stub(),
 };
+const bcryptHash = sinon.stub();
+const sha = sinon.stub();
+const generateTempPassword = sinon.stub();
 
 const { UserConverter } = proxyquire.noCallThru().load('../../../../../app/importer/server/classes/converters/UserConverter', {
 	'../../../../../lib/callbacks': {
@@ -39,8 +42,19 @@ const { UserConverter } = proxyquire.noCallThru().load('../../../../../app/impor
 	'../../../../lib/server/lib/notifyListener': {
 		notifyOnUserChange: sinon.stub(),
 	},
+	'./generateTempPassword': {
+		generateTempPassword,
+		'@global': true,
+	},
+	'bcrypt': {
+		'hash': bcryptHash,
+		'@global': true,
+	},
 	'meteor/check': sinon.stub(),
 	'meteor/meteor': sinon.stub(),
+	'@rocket.chat/sha256': {
+		SHA256: sha,
+	},
 	'meteor/accounts-base': {
 		Accounts: {
 			insertUserDoc,
@@ -122,14 +136,16 @@ describe('User Converter', () => {
 		});
 
 		const converter = new UserConverter({ workInMemory: true });
-		sinon.stub(converter, 'generateTempPassword');
-		sinon.stub(converter, 'hashPassword');
-		converter.generateTempPassword.returns('tempPassword');
-		converter.hashPassword.callsFake((pass: string) => `hashed=${pass}`);
+		const hashPassword = sinon.stub(converter, 'hashPassword');
+
+		generateTempPassword.returns('tempPassword');
+		hashPassword.callsFake(async (pass) => `hashed=${pass}`);
+		bcryptHash.callsFake((pass: string) => `hashed=${pass}`);
+		sha.callsFake((pass: string) => pass);
 
 		it('should map an empty object', async () => {
 			expect(
-				await (converter as any).buildNewUserObject({
+				await converter.buildNewUserObject({
 					emails: [],
 					importIds: [],
 				}),
@@ -138,7 +154,7 @@ describe('User Converter', () => {
 
 		it('should map the name and username', async () => {
 			expect(
-				await (converter as any).buildNewUserObject({
+				await converter.buildNewUserObject({
 					emails: [],
 					importIds: [],
 					name: 'name1',
@@ -154,7 +170,7 @@ describe('User Converter', () => {
 
 		it('should map optional fields', async () => {
 			expect(
-				await (converter as any).buildNewUserObject({
+				await converter.buildNewUserObject({
 					emails: [],
 					importIds: [],
 					statusText: 'statusText1',
@@ -194,7 +210,7 @@ describe('User Converter', () => {
 
 		it('should not map roles', async () => {
 			expect(
-				await (converter as any).buildNewUserObject({
+				await converter.buildNewUserObject({
 					emails: [],
 					importIds: [],
 					roles: ['role1'],
@@ -204,7 +220,7 @@ describe('User Converter', () => {
 
 		it('should map identifiers', async () => {
 			expect(
-				await (converter as any).buildNewUserObject({
+				await converter.buildNewUserObject({
 					name: 'user1',
 					emails: ['user1@domain.com'],
 					importIds: ['importId1'],
@@ -222,7 +238,7 @@ describe('User Converter', () => {
 
 		it('should map password', async () => {
 			expect(
-				await (converter as any).buildNewUserObject({
+				await converter.buildNewUserObject({
 					emails: [],
 					importIds: [],
 					password: 'batata',
@@ -240,7 +256,7 @@ describe('User Converter', () => {
 
 		it('should map ldap service data', async () => {
 			expect(
-				await (converter as any).buildNewUserObject({
+				await converter.buildNewUserObject({
 					emails: [],
 					importIds: [],
 					services: {
@@ -263,7 +279,7 @@ describe('User Converter', () => {
 
 		it('should map deleted users', async () => {
 			expect(
-				await (converter as any).buildNewUserObject({
+				await converter.buildNewUserObject({
 					emails: [],
 					importIds: [],
 					deleted: true,
@@ -277,7 +293,7 @@ describe('User Converter', () => {
 
 		it('should map restored users', async () => {
 			expect(
-				await (converter as any).buildNewUserObject({
+				await converter.buildNewUserObject({
 					emails: [],
 					importIds: [],
 					deleted: false,
@@ -291,7 +307,7 @@ describe('User Converter', () => {
 
 		it('should map user type', async () => {
 			expect(
-				await (converter as any).buildNewUserObject({
+				await converter.buildNewUserObject({
 					emails: [],
 					importIds: [],
 					type: 'user',
@@ -301,7 +317,7 @@ describe('User Converter', () => {
 
 		it('should map bot type', async () => {
 			expect(
-				await (converter as any).buildNewUserObject({
+				await converter.buildNewUserObject({
 					emails: [],
 					importIds: [],
 					type: 'bot',
diff --git a/apps/meteor/tests/unit/app/lib/server/functions/notifications/messageContainsHighlight.tests.ts b/apps/meteor/tests/unit/app/lib/server/functions/notifications/messageContainsHighlight.tests.ts
new file mode 100644
index 000000000000..2cc8a9248c34
--- /dev/null
+++ b/apps/meteor/tests/unit/app/lib/server/functions/notifications/messageContainsHighlight.tests.ts
@@ -0,0 +1,69 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+
+import { messageContainsHighlight } from '../../../../../../../app/lib/server/functions/notifications/messageContainsHighlight';
+
+describe('messageContainsHighlight', () => {
+	it('should return false for no highlights', async () => {
+		const message = {
+			msg: 'regular message',
+		};
+		expect(messageContainsHighlight(message, [])).to.be.false;
+	});
+
+	it('should return true when find a highlight in the beggining of the message', async () => {
+		const message = {
+			msg: 'highlighted regular message',
+		};
+		expect(messageContainsHighlight(message, ['highlighted'])).to.be.true;
+	});
+
+	it('should return true when find a highlight in the end of the message', async () => {
+		const message = {
+			msg: 'highlighted regular message',
+		};
+		expect(messageContainsHighlight(message, ['message'])).to.be.true;
+	});
+
+	it('should return false if the highlight is just part of the word', async () => {
+		const message = {
+			msg: 'highlighted regular message',
+		};
+		expect(messageContainsHighlight(message, ['light'])).to.be.false;
+	});
+
+	it('should return true if find one of the multiple highlights', async () => {
+		const message = {
+			msg: 'highlighted regular message',
+		};
+		expect(messageContainsHighlight(message, ['high', 'ssage', 'regular', 'light'])).to.be.true;
+	});
+
+	it('should return true if highlight case not match', async () => {
+		const message = {
+			msg: 'highlighted regular message',
+		};
+		expect(messageContainsHighlight(message, ['ReGuLaR'])).to.be.true;
+	});
+
+	it('should return false if the highlight word is an emoji', async () => {
+		const message = {
+			msg: 'highlighted :thumbsup: message',
+		};
+		expect(messageContainsHighlight(message, ['thumbsup'])).to.be.false;
+	});
+
+	it('should return true for a highlight word beggining with :', async () => {
+		const message = {
+			msg: 'highlighted :thumbsup message',
+		};
+		expect(messageContainsHighlight(message, ['thumbsup'])).to.be.true;
+	});
+
+	it('should return true for a highlight word ending with :', async () => {
+		const message = {
+			msg: 'highlighted thumbsup: message',
+		};
+		expect(messageContainsHighlight(message, ['thumbsup'])).to.be.true;
+	});
+});
diff --git a/apps/meteor/tests/unit/app/livechat/server/lib/Contacts.spec.ts b/apps/meteor/tests/unit/app/livechat/server/lib/Contacts.spec.ts
deleted file mode 100644
index fef3c59469f8..000000000000
--- a/apps/meteor/tests/unit/app/livechat/server/lib/Contacts.spec.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-import { expect } from 'chai';
-import proxyquire from 'proxyquire';
-import sinon from 'sinon';
-
-const modelsMock = {
-	Users: {
-		findOneAgentById: sinon.stub(),
-	},
-	LivechatContacts: {
-		findOneById: sinon.stub(),
-		updateContact: sinon.stub(),
-	},
-};
-const { validateCustomFields, validateContactManager, updateContact } = proxyquire
-	.noCallThru()
-	.load('../../../../../../app/livechat/server/lib/Contacts', {
-		'meteor/check': sinon.stub(),
-		'meteor/meteor': sinon.stub(),
-		'@rocket.chat/models': modelsMock,
-	});
-
-describe('[OC] Contacts', () => {
-	describe('validateCustomFields', () => {
-		const mockCustomFields = [{ _id: 'cf1', label: 'Custom Field 1', regexp: '^[0-9]+$', required: true }];
-
-		it('should validate custom fields correctly', () => {
-			expect(() => validateCustomFields(mockCustomFields, { cf1: '123' })).to.not.throw();
-		});
-
-		it('should throw an error if a required custom field is missing', () => {
-			expect(() => validateCustomFields(mockCustomFields, {})).to.throw();
-		});
-
-		it('should NOT throw an error when a non-required custom field is missing', () => {
-			const allowedCustomFields = [{ _id: 'field1', label: 'Field 1', required: false }];
-			const customFields = {};
-
-			expect(() => validateCustomFields(allowedCustomFields, customFields)).not.to.throw();
-		});
-
-		it('should throw an error if a custom field value does not match the regexp', () => {
-			expect(() => validateCustomFields(mockCustomFields, { cf1: 'invalid' })).to.throw();
-		});
-
-		it('should handle an empty customFields input without throwing an error', () => {
-			const allowedCustomFields = [{ _id: 'field1', label: 'Field 1', required: false }];
-			const customFields = {};
-
-			expect(() => validateCustomFields(allowedCustomFields, customFields)).not.to.throw();
-		});
-
-		it('should throw an error if a extra custom field is passed', () => {
-			const allowedCustomFields = [{ _id: 'field1', label: 'Field 1', required: false }];
-			const customFields = { field2: 'value' };
-
-			expect(() => validateCustomFields(allowedCustomFields, customFields)).to.throw();
-		});
-	});
-
-	describe('validateContactManager', () => {
-		beforeEach(() => {
-			modelsMock.Users.findOneAgentById.reset();
-		});
-
-		it('should throw an error if the user does not exist', async () => {
-			modelsMock.Users.findOneAgentById.resolves(undefined);
-			await expect(validateContactManager('any_id')).to.be.rejectedWith('error-contact-manager-not-found');
-		});
-
-		it('should not throw an error if the user has the "livechat-agent" role', async () => {
-			const user = { _id: 'userId' };
-			modelsMock.Users.findOneAgentById.resolves(user);
-
-			await expect(validateContactManager('userId')).to.not.be.rejected;
-			expect(modelsMock.Users.findOneAgentById.getCall(0).firstArg).to.be.equal('userId');
-		});
-	});
-
-	describe('updateContact', () => {
-		beforeEach(() => {
-			modelsMock.LivechatContacts.findOneById.reset();
-			modelsMock.LivechatContacts.updateContact.reset();
-		});
-
-		it('should throw an error if the contact does not exist', async () => {
-			modelsMock.LivechatContacts.findOneById.resolves(undefined);
-			await expect(updateContact('any_id')).to.be.rejectedWith('error-contact-not-found');
-			expect(modelsMock.LivechatContacts.updateContact.getCall(0)).to.be.null;
-		});
-
-		it('should update the contact with correct params', async () => {
-			modelsMock.LivechatContacts.findOneById.resolves({ _id: 'contactId' });
-			modelsMock.LivechatContacts.updateContact.resolves({ _id: 'contactId', name: 'John Doe' } as any);
-
-			const updatedContact = await updateContact({ contactId: 'contactId', name: 'John Doe' });
-
-			expect(modelsMock.LivechatContacts.updateContact.getCall(0).args[0]).to.be.equal('contactId');
-			expect(modelsMock.LivechatContacts.updateContact.getCall(0).args[1]).to.be.deep.contain({ name: 'John Doe' });
-			expect(updatedContact).to.be.deep.equal({ _id: 'contactId', name: 'John Doe' });
-		});
-	});
-});
diff --git a/apps/meteor/tests/unit/app/meteor-accounts-saml/server.tests.ts b/apps/meteor/tests/unit/app/meteor-accounts-saml/server.tests.ts
index 1aee98bd7441..2b79daca1f15 100644
--- a/apps/meteor/tests/unit/app/meteor-accounts-saml/server.tests.ts
+++ b/apps/meteor/tests/unit/app/meteor-accounts-saml/server.tests.ts
@@ -1,14 +1,6 @@
 import { expect } from 'chai';
 import proxyquire from 'proxyquire';
 
-import { SAMLUtils } from '../../../../app/meteor-accounts-saml/server/lib/Utils';
-import { AuthorizeRequest } from '../../../../app/meteor-accounts-saml/server/lib/generators/AuthorizeRequest';
-import { LogoutRequest } from '../../../../app/meteor-accounts-saml/server/lib/generators/LogoutRequest';
-import { LogoutResponse } from '../../../../app/meteor-accounts-saml/server/lib/generators/LogoutResponse';
-import { LogoutRequestParser } from '../../../../app/meteor-accounts-saml/server/lib/parsers/LogoutRequest';
-import { LogoutResponseParser } from '../../../../app/meteor-accounts-saml/server/lib/parsers/LogoutResponse';
-import { ResponseParser } from '../../../../app/meteor-accounts-saml/server/lib/parsers/Response';
-import { isTruthy } from '../../../../lib/isTruthy';
 import {
 	serviceProviderOptions,
 	simpleMetadata,
@@ -35,6 +27,14 @@ import {
 	privateKeyCert,
 	privateKey,
 } from './data';
+import { SAMLUtils } from '../../../../app/meteor-accounts-saml/server/lib/Utils';
+import { AuthorizeRequest } from '../../../../app/meteor-accounts-saml/server/lib/generators/AuthorizeRequest';
+import { LogoutRequest } from '../../../../app/meteor-accounts-saml/server/lib/generators/LogoutRequest';
+import { LogoutResponse } from '../../../../app/meteor-accounts-saml/server/lib/generators/LogoutResponse';
+import { LogoutRequestParser } from '../../../../app/meteor-accounts-saml/server/lib/parsers/LogoutRequest';
+import { LogoutResponseParser } from '../../../../app/meteor-accounts-saml/server/lib/parsers/LogoutResponse';
+import { ResponseParser } from '../../../../app/meteor-accounts-saml/server/lib/parsers/Response';
+import { isTruthy } from '../../../../lib/isTruthy';
 
 const { ServiceProviderMetadata } = proxyquire
 	.noCallThru()
diff --git a/apps/meteor/tests/unit/app/settings/server/functions/settings.tests.ts b/apps/meteor/tests/unit/app/settings/server/functions/settings.tests.ts
index 5f5001c0251d..9775e36da035 100644
--- a/apps/meteor/tests/unit/app/settings/server/functions/settings.tests.ts
+++ b/apps/meteor/tests/unit/app/settings/server/functions/settings.tests.ts
@@ -586,13 +586,16 @@ describe('Settings', () => {
 			settings.watch('setting_callback', spiedCallback1, { debounce: 10 });
 			settings.watchByRegex(/setting_callback/, spiedCallback2, { debounce: 10 });
 
-			setTimeout(() => {
-				expect(spiedCallback1).to.have.been.called.exactly(1);
-				expect(spiedCallback2).to.have.been.called.exactly(1);
-				expect(spiedCallback1).to.have.been.called.always.with('value1');
-				expect(spiedCallback2).to.have.been.called.always.with('setting_callback', 'value1');
-				resolve();
-			}, settings.getConfig({ debounce: 10 }).debounce);
+			setTimeout(
+				() => {
+					expect(spiedCallback1).to.have.been.called.exactly(1);
+					expect(spiedCallback2).to.have.been.called.exactly(1);
+					expect(spiedCallback1).to.have.been.called.always.with('value1');
+					expect(spiedCallback2).to.have.been.called.always.with('setting_callback', 'value1');
+					resolve();
+				},
+				settings.getConfig({ debounce: 10 }).debounce,
+			);
 		});
 	});
 
@@ -615,16 +618,22 @@ describe('Settings', () => {
 					});
 				});
 			});
-			setTimeout(() => {
-				Settings.updateValueById('setting_callback', 'value3');
-				setTimeout(() => {
-					expect(spiedCallback1).to.have.been.called.exactly(2);
-					expect(spiedCallback2).to.have.been.called.exactly(2);
-					expect(spiedCallback1).to.have.been.called.with('value2');
-					expect(spiedCallback1).to.have.been.called.with('value3');
-					resolve();
-				}, settings.getConfig({ debounce: 10 }).debounce);
-			}, settings.getConfig({ debounce: 10 }).debounce);
+			setTimeout(
+				() => {
+					Settings.updateValueById('setting_callback', 'value3');
+					setTimeout(
+						() => {
+							expect(spiedCallback1).to.have.been.called.exactly(2);
+							expect(spiedCallback2).to.have.been.called.exactly(2);
+							expect(spiedCallback1).to.have.been.called.with('value2');
+							expect(spiedCallback1).to.have.been.called.with('value3');
+							resolve();
+						},
+						settings.getConfig({ debounce: 10 }).debounce,
+					);
+				},
+				settings.getConfig({ debounce: 10 }).debounce,
+			);
 		});
 	});
 
diff --git a/apps/meteor/tests/unit/server/publications/messages.spec.ts b/apps/meteor/tests/unit/server/publications/messages.spec.ts
new file mode 100644
index 000000000000..cb4a86b6cb55
--- /dev/null
+++ b/apps/meteor/tests/unit/server/publications/messages.spec.ts
@@ -0,0 +1,275 @@
+import type { IMessage } from '@rocket.chat/core-typings';
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import proxyquire from 'proxyquire';
+import sinon from 'sinon';
+
+const mockMeteorError = class extends Error {
+	constructor(
+		public error: string,
+		public reason: string,
+		public details: any,
+	) {
+		super(reason);
+		this.name = 'Meteor.Error';
+	}
+};
+
+const messagesMock = {
+	findForUpdates: sinon.stub(),
+	trashFindDeletedAfter: sinon.stub(),
+	trashFind: sinon.stub(),
+};
+
+const {
+	extractTimestampFromCursor,
+	mountCursorQuery,
+	mountCursorFromMessage,
+	mountNextCursor,
+	mountPreviousCursor,
+	handleWithoutPagination,
+	handleCursorPagination,
+} = proxyquire.noCallThru().load('../../../../server/publications/messages', {
+	'meteor/check': {
+		check: sinon.stub(),
+	},
+	'meteor/meteor': {
+		'Meteor': {
+			methods: sinon.stub(),
+			Error: mockMeteorError,
+		},
+		'@global': true,
+	},
+	'@rocket.chat/models': {
+		Messages: messagesMock,
+	},
+});
+
+describe('extractTimestampFromCursor', () => {
+	it('should return the correct timestamp', () => {
+		const cursor = new Date('2024-01-01T00:00:00.000Z').getTime().toString();
+		const timestamp = extractTimestampFromCursor(cursor);
+		expect(timestamp).to.be.an.instanceOf(Date);
+		expect(timestamp.getTime()).to.equal(parseInt(cursor, 10));
+	});
+
+	it('should handle non-date compliant string', () => {
+		expect(() => extractTimestampFromCursor('not-a-date')).to.throw(Error, 'Invalid Date');
+	});
+});
+
+describe('mountCursorQuery', () => {
+	const mockDate = new Date('2024-01-01T00:00:00.000Z').getTime();
+
+	it('should return a query with $gt when next is provided', () => {
+		const result = mountCursorQuery({ next: mockDate.toString() });
+		expect(result.query).to.deep.equal({ $gt: new Date(mockDate) });
+	});
+
+	it('should return a query with $lt when previous is provided', () => {
+		const result = mountCursorQuery({ previous: mockDate.toString() });
+		expect(result.query).to.deep.equal({ $lt: new Date(mockDate) });
+	});
+
+	it('should return a query with $gt and sort when neither next nor previous is provided', () => {
+		const result = mountCursorQuery({ count: 10 });
+		expect(result.query).to.deep.equal({ $gt: new Date(0) });
+		expect(result.options).to.deep.equal({ sort: { _updatedAt: 1 } });
+	});
+
+	it('should return a query with $gt and ascending sort when next is provided', () => {
+		const result = mountCursorQuery({ next: mockDate.toString(), count: 10 });
+		expect(result.query).to.deep.equal({ $gt: new Date(mockDate) });
+		expect(result.options).to.deep.equal({ sort: { _updatedAt: 1 }, limit: 10 + 1 });
+	});
+
+	it('should return a query with $gt and descending sort when previous is provided', () => {
+		const result = mountCursorQuery({ previous: mockDate.toString(), count: 10 });
+		expect(result.query).to.deep.equal({ $lt: new Date(mockDate) });
+		expect(result.options).to.deep.equal({ sort: { _updatedAt: -1 }, limit: 10 + 1 });
+	});
+});
+
+describe('mountCursorFromMessage', () => {
+	it('should return the updated timestamp for UPDATED type', () => {
+		const message: Pick<IMessage, '_updatedAt'> = {
+			_updatedAt: new Date('2024-01-01T00:00:00Z'),
+		};
+
+		const result = mountCursorFromMessage(message, 'UPDATED');
+		expect(result).to.equal(`${message._updatedAt.getTime()}`);
+	});
+
+	it('should return the deleted timestamp for DELETED type', () => {
+		const message: Partial<IMessage> & { _deletedAt: Date } = {
+			_deletedAt: new Date('2024-01-01T00:00:00Z'),
+		};
+
+		const result = mountCursorFromMessage(message, 'DELETED');
+		expect(result).to.equal(`${message._deletedAt.getTime()}`);
+	});
+
+	it('should throw an error if DELETED type and _deletedAt is not present', () => {
+		const message: Pick<IMessage, '_updatedAt'> = {
+			_updatedAt: new Date('2024-01-01T00:00:00Z'),
+		};
+
+		expect(() => mountCursorFromMessage(message, 'DELETED')).to.throw(mockMeteorError, 'Cursor not found');
+	});
+});
+
+describe('mountNextCursor', () => {
+	const mockMessage = (timestamp: number): Pick<IMessage, '_id' | 'ts' | '_updatedAt'> => ({
+		_id: '1',
+		ts: new Date(timestamp),
+		_updatedAt: new Date(timestamp),
+	});
+
+	it('should return null if messages array is empty', () => {
+		expect(mountNextCursor([], 10, 'UPDATED')).to.be.null;
+	});
+
+	it('should return the first message cursor if previous is provided', () => {
+		const messages = [mockMessage(1000), mockMessage(2000)];
+		expect(mountNextCursor(messages, 10, 'UPDATED', undefined, 'prev')).to.equal('1000');
+	});
+
+	it('should return null if messages length is less than or equal to count and next is provided', () => {
+		const messages = [mockMessage(1000), mockMessage(2000)];
+		expect(mountNextCursor(messages, 2, 'UPDATED', 'next')).to.be.null;
+	});
+
+	it('should return the second last message cursor if messages length is greater than count and next is provided', () => {
+		const messages = [mockMessage(1000), mockMessage(2000), mockMessage(3000)];
+		expect(mountNextCursor(messages, 2, 'UPDATED', 'next')).to.equal('2000');
+	});
+
+	it('should return the last message cursor if no next or previous is provided', () => {
+		const messages = [mockMessage(1000), mockMessage(2000)];
+		expect(mountNextCursor(messages, 10, 'UPDATED')).to.equal('2000');
+	});
+});
+
+describe('mountPreviousCursor', () => {
+	const mockMessage = (timestamp: number): Pick<IMessage, '_id' | 'ts' | '_updatedAt'> => ({
+		_id: '1',
+		ts: new Date(timestamp),
+		_updatedAt: new Date(timestamp),
+	});
+
+	it('should return null if messages array is empty', () => {
+		expect(mountPreviousCursor([], 10, 'UPDATED')).to.be.null;
+	});
+
+	it('should return the first message cursor if messages length is less than or equal to count and next is provided', () => {
+		const messages = [mockMessage(1000)];
+		expect(mountPreviousCursor(messages, 1, 'UPDATED', 'nextCursor')).to.equal('1000');
+	});
+
+	it('should return the first message cursor if messages length is greater than count and next is provided', () => {
+		const messages = [mockMessage(1000), mockMessage(2000)];
+		expect(mountPreviousCursor(messages, 1, 'UPDATED', 'nextCursor')).to.equal('1000');
+	});
+
+	it('should return null if messages length is less than or equal to count and previous is provided', () => {
+		const messages = [mockMessage(1000)];
+		expect(mountPreviousCursor(messages, 1, 'UPDATED', undefined, 'previousCursor')).to.be.null;
+	});
+
+	it('should return the second last message cursor if messages length is greater than count and previous is provided', () => {
+		const messages = [mockMessage(1000), mockMessage(2000), mockMessage(3000)];
+		expect(mountPreviousCursor(messages, 2, 'UPDATED', undefined, 'previousCursor')).to.equal('2000');
+	});
+
+	it('should return the first message cursor if no next or previous is provided', () => {
+		const messages = [mockMessage(1000)];
+		expect(mountPreviousCursor(messages, 1, 'UPDATED')).to.equal('1000');
+	});
+});
+
+describe('handleWithoutPagination', () => {
+	afterEach(() => {
+		messagesMock.findForUpdates.reset();
+		messagesMock.trashFindDeletedAfter.reset();
+	});
+
+	it('should return updated and deleted messages', async () => {
+		const rid = 'roomId';
+		const lastUpdate = new Date();
+
+		const updatedMessages = [{ _id: '1', text: 'Hello' }];
+		const deletedMessages = [{ _id: '2', _deletedAt: new Date() }];
+
+		messagesMock.findForUpdates.returns({ toArray: sinon.stub().resolves(updatedMessages) });
+		messagesMock.trashFindDeletedAfter.returns({ toArray: sinon.stub().resolves(deletedMessages) });
+
+		const result = await handleWithoutPagination(rid, lastUpdate);
+
+		expect(result).to.deep.equal({
+			updated: updatedMessages,
+			deleted: deletedMessages,
+		});
+
+		sinon.assert.calledWith(messagesMock.findForUpdates, rid, { $gt: lastUpdate }, { sort: { ts: -1 } });
+		sinon.assert.calledWith(
+			messagesMock.trashFindDeletedAfter,
+			lastUpdate,
+			{ rid },
+			{ projection: { _id: 1, _deletedAt: 1 }, sort: { ts: -1 } },
+		);
+	});
+
+	it('should handle empty results', async () => {
+		const rid = 'roomId';
+		const lastUpdate = new Date();
+
+		messagesMock.findForUpdates.returns({ toArray: sinon.stub().resolves([]) });
+		messagesMock.trashFindDeletedAfter.returns({ toArray: sinon.stub().resolves([]) });
+
+		const result = await handleWithoutPagination(rid, lastUpdate);
+
+		expect(result).to.deep.equal({
+			updated: [],
+			deleted: [],
+		});
+	});
+});
+
+describe('handleCursorPagination', () => {
+	it('should return updated messages and cursor when type is UPDATED', async () => {
+		const rid = 'roomId';
+		const count = 10;
+		const messages = [{ _id: 'msg1', _updatedAt: new Date('2024-01-01T00:00:00Z') }];
+		messagesMock.findForUpdates.returns({ toArray: sinon.stub().resolves(messages) });
+
+		const result = await handleCursorPagination('UPDATED', rid, count);
+
+		expect(messagesMock.findForUpdates.calledOnce).to.be.true;
+		expect(result.updated).to.deep.equal(messages);
+		expect(result.cursor).to.have.keys(['next', 'previous']);
+	});
+
+	it('should return deleted messages and cursor when type is DELETED', async () => {
+		const rid = 'roomId';
+		const count = 10;
+		const messages = [{ _id: 'msg1', _deletedAt: new Date() }];
+		messagesMock.trashFind.returns({ toArray: sinon.stub().resolves(messages) });
+
+		const result = await handleCursorPagination('DELETED', rid, count);
+
+		expect(messagesMock.trashFind.calledOnce).to.be.true;
+		expect(result.deleted).to.deep.equal(messages);
+		expect(result.cursor).to.have.keys(['next', 'previous']);
+	});
+
+	it('should handle empty response correctly', async () => {
+		const rid = 'roomId';
+		const count = 10;
+		messagesMock.findForUpdates.returns({ toArray: sinon.stub().resolves([]) });
+
+		const result = await handleCursorPagination('UPDATED', rid, count);
+
+		expect(result.updated).to.deep.equal([]);
+		expect(result.cursor).to.deep.equal({ next: null, previous: null });
+	});
+});
diff --git a/apps/meteor/tests/unit/server/services/omnichannel-analytics/OverviewData.tests.ts b/apps/meteor/tests/unit/server/services/omnichannel-analytics/OverviewData.tests.ts
index d5ca07ec83d6..08fd30530690 100644
--- a/apps/meteor/tests/unit/server/services/omnichannel-analytics/OverviewData.tests.ts
+++ b/apps/meteor/tests/unit/server/services/omnichannel-analytics/OverviewData.tests.ts
@@ -3,8 +3,8 @@ import { expect } from 'chai';
 import moment from 'moment';
 import sinon from 'sinon';
 
-import { OverviewData } from '../../../../../server/services/omnichannel-analytics/OverviewData';
 import { conversations } from './mockData';
+import { OverviewData } from '../../../../../server/services/omnichannel-analytics/OverviewData';
 
 const analytics = (date: { gte: Date; lte: Date }) => {
 	// filter the mockData array with the date param with moment
diff --git a/apps/meteor/tests/unit/server/startup/initialData.tests.ts b/apps/meteor/tests/unit/server/startup/initialData.tests.ts
index c9980db5ba3e..b139ea571e1a 100644
--- a/apps/meteor/tests/unit/server/startup/initialData.tests.ts
+++ b/apps/meteor/tests/unit/server/startup/initialData.tests.ts
@@ -3,7 +3,6 @@ import { beforeEach, it } from 'mocha';
 import proxyquire from 'proxyquire';
 import sinon from 'sinon';
 
-const getUsersInRole = sinon.stub();
 const checkUsernameAvailability = sinon.stub();
 const validateEmail = sinon.stub();
 const addUserRolesAsync = sinon.stub();
@@ -14,6 +13,9 @@ const models = {
 		create: sinon.stub(),
 		findOneByEmailAddress: sinon.stub(),
 	},
+	Roles: {
+		countUsersInRole: sinon.stub(),
+	},
 };
 const setPasswordAsync = sinon.stub();
 const settingsGet = sinon.stub();
@@ -29,9 +31,6 @@ const { insertAdminUserFromEnv } = proxyquire.noCallThru().load('../../../../ser
 			startup: sinon.stub(),
 		},
 	},
-	'../../app/authorization/server': {
-		getUsersInRole,
-	},
 	'../../app/file-upload/server': {},
 	'../../app/file/server': {},
 	'../../app/lib/server/functions/addUserToDefaultChannels': {},
@@ -52,7 +51,6 @@ const { insertAdminUserFromEnv } = proxyquire.noCallThru().load('../../../../ser
 
 describe('insertAdminUserFromEnv', () => {
 	beforeEach(() => {
-		getUsersInRole.reset();
 		checkUsernameAvailability.reset();
 		validateEmail.reset();
 		addUserRolesAsync.reset();
@@ -61,30 +59,30 @@ describe('insertAdminUserFromEnv', () => {
 		setPasswordAsync.reset();
 		settingsGet.reset();
 		process.env.ADMIN_PASS = 'pass';
+		models.Roles.countUsersInRole.reset();
 	});
 
 	it('should do nothing if process.env.ADMIN_PASS is empty', async () => {
 		process.env.ADMIN_PASS = '';
 		const result = await insertAdminUserFromEnv();
-		expect(getUsersInRole.called).to.be.false;
 		expect(result).to.be.undefined;
 	});
 	it('should do nothing if theres already an admin user', async () => {
-		getUsersInRole.returns({ count: () => 1 });
+		models.Roles.countUsersInRole.resolves(1);
 
 		const result = await insertAdminUserFromEnv();
-		expect(getUsersInRole.called).to.be.true;
+		expect(models.Roles.countUsersInRole.called).to.be.true;
 		expect(validateEmail.called).to.be.false;
 		expect(result).to.be.undefined;
 	});
 	it('should try to validate an email when process.env.ADMIN_EMAIL is set', async () => {
 		process.env.ADMIN_EMAIL = 'email';
-		getUsersInRole.returns({ count: () => 0 });
+		models.Roles.countUsersInRole.resolves(0);
 		validateEmail.returns(false);
 		models.Users.create.returns({ insertedId: 'newuserid' });
 
 		const result = await insertAdminUserFromEnv();
-		expect(getUsersInRole.called).to.be.true;
+		expect(models.Roles.countUsersInRole.called).to.be.true;
 		expect(validateEmail.called).to.be.true;
 		expect(validateEmail.calledWith('email')).to.be.true;
 		expect(models.Users.create.called).to.be.true;
@@ -94,7 +92,7 @@ describe('insertAdminUserFromEnv', () => {
 	it('should override the admins name when process.env.ADMIN_NAME is set', async () => {
 		process.env.ADMIN_EMAIL = 'email';
 		process.env.ADMIN_NAME = 'name';
-		getUsersInRole.returns({ count: () => 0 });
+		models.Roles.countUsersInRole.resolves(0);
 		validateEmail.returns(true);
 		validateEmail.returns(false);
 		models.Users.create.returns({ insertedId: 'newuserid' });
@@ -117,7 +115,7 @@ describe('insertAdminUserFromEnv', () => {
 	});
 	it('should ignore the admin email when another user already has it set', async () => {
 		process.env.ADMIN_EMAIL = 'email';
-		getUsersInRole.returns({ count: () => 0 });
+		models.Roles.countUsersInRole.resolves(0);
 		validateEmail.returns(true);
 		models.Users.create.returns({ insertedId: 'newuserid' });
 		models.Users.findOneByEmailAddress.returns({ _id: 'someuser' });
@@ -128,7 +126,7 @@ describe('insertAdminUserFromEnv', () => {
 	});
 	it('should add the email from env when its valid and no users are using it', async () => {
 		process.env.ADMIN_EMAIL = 'email';
-		getUsersInRole.returns({ count: () => 0 });
+		models.Roles.countUsersInRole.resolves(0);
 		validateEmail.returns(true);
 		models.Users.create.returns({ insertedId: 'newuserid' });
 		models.Users.findOneByEmailAddress.returns(undefined);
@@ -142,7 +140,7 @@ describe('insertAdminUserFromEnv', () => {
 	it('should mark the admin email as verified when process.env.ADMIN_EMAIL_VERIFIED is set to true', async () => {
 		process.env.ADMIN_EMAIL = 'email';
 		process.env.ADMIN_EMAIL_VERIFIED = 'true';
-		getUsersInRole.returns({ count: () => 0 });
+		models.Roles.countUsersInRole.resolves(0);
 		validateEmail.returns(true);
 		models.Users.create.returns({ insertedId: 'newuserid' });
 		models.Users.findOneByEmailAddress.returns(undefined);
@@ -155,7 +153,7 @@ describe('insertAdminUserFromEnv', () => {
 	});
 	it('should validate a username with setting UTF8_User_Names_Validation when process.env.ADMIN_USERNAME is set', async () => {
 		process.env.ADMIN_USERNAME = '1234';
-		getUsersInRole.returns({ count: () => 0 });
+		models.Roles.countUsersInRole.resolves(0);
 		validateEmail.returns(true);
 		settingsGet.returns('[0-9]+');
 		models.Users.create.returns({ insertedId: 'newuserid' });
@@ -166,7 +164,7 @@ describe('insertAdminUserFromEnv', () => {
 	});
 	it('should override the username from admin if the env ADMIN_USERNAME is set, is valid and the username is available', async () => {
 		process.env.ADMIN_USERNAME = '1234';
-		getUsersInRole.returns({ count: () => 0 });
+		models.Roles.countUsersInRole.resolves(0);
 		validateEmail.returns(true);
 		settingsGet.returns('[0-9]+');
 		checkUsernameAvailability.returns(true);
@@ -178,7 +176,7 @@ describe('insertAdminUserFromEnv', () => {
 	});
 	it('should ignore the username when it does not pass setting regexp validation', async () => {
 		process.env.ADMIN_USERNAME = '1234';
-		getUsersInRole.returns({ count: () => 0 });
+		models.Roles.countUsersInRole.resolves(0);
 		validateEmail.returns(true);
 		settingsGet.returns('[A-Z]+');
 		checkUsernameAvailability.returns(true);
@@ -194,7 +192,7 @@ describe('insertAdminUserFromEnv', () => {
 		process.env.ADMIN_USERNAME = '1234';
 		process.env.ADMIN_EMAIL_VERIFIED = 'true';
 
-		getUsersInRole.returns({ count: () => 0 });
+		models.Roles.countUsersInRole.resolves(0);
 		validateEmail.returns(true);
 		settingsGet.returns('[0-9]+');
 		checkUsernameAvailability.returns(true);
@@ -212,7 +210,7 @@ describe('insertAdminUserFromEnv', () => {
 		process.env.ADMIN_NAME = 'name';
 		process.env.ADMIN_USERNAME = '$$$$$$';
 
-		getUsersInRole.returns({ count: () => 0 });
+		models.Roles.countUsersInRole.resolves(0);
 		settingsGet.returns('[');
 		checkUsernameAvailability.returns(true);
 		models.Users.create.returns({ insertedId: 'newuserid' });
@@ -224,7 +222,7 @@ describe('insertAdminUserFromEnv', () => {
 	it('should ignore the username when is not available', async () => {
 		process.env.ADMIN_USERNAME = '1234';
 
-		getUsersInRole.returns({ count: () => 0 });
+		models.Roles.countUsersInRole.resolves(0);
 		checkUsernameAvailability.throws('some error');
 		models.Users.create.returns({ insertedId: 'newuserid' });
 
diff --git a/apps/uikit-playground/CHANGELOG.md b/apps/uikit-playground/CHANGELOG.md
index 42ed20320de1..3af65479230f 100644
--- a/apps/uikit-playground/CHANGELOG.md
+++ b/apps/uikit-playground/CHANGELOG.md
@@ -1,5 +1,53 @@
 # @rocket.chat/uikit-playground
 
+## 0.6.1-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.3
+  - @rocket.chat/fuselage-ui-kit@13.0.0-rc.3
+  - @rocket.chat/ui-contexts@13.0.0-rc.3
+  - @rocket.chat/ui-avatar@9.0.0-rc.3
+  </details>
+
+## 0.6.1-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.2
+  - @rocket.chat/fuselage-ui-kit@13.0.0-rc.2
+  - @rocket.chat/ui-contexts@13.0.0-rc.2
+  - @rocket.chat/ui-avatar@9.0.0-rc.2
+  </details>
+
+## 0.6.1-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.1
+  - @rocket.chat/fuselage-ui-kit@13.0.0-rc.1
+  - @rocket.chat/ui-contexts@13.0.0-rc.1
+  - @rocket.chat/ui-avatar@9.0.0-rc.1
+  </details>
+
+## 0.6.1-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [80e36bfc3938775eb26aa5576f1b9b98896e1cc4, 32d93a0666fa1cbe857d02889e93d9bbf45bd4f0]:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.0
+  - @rocket.chat/fuselage-ui-kit@13.0.0-rc.0
+  - @rocket.chat/ui-contexts@13.0.0-rc.0
+  - @rocket.chat/ui-avatar@9.0.0-rc.0
+  </details>
+
 ## 0.6.0
 
 ### Minor Changes
diff --git a/apps/uikit-playground/package.json b/apps/uikit-playground/package.json
index 12c3f6539d0d..d5f547378eb6 100644
--- a/apps/uikit-playground/package.json
+++ b/apps/uikit-playground/package.json
@@ -1,19 +1,20 @@
 {
   "name": "@rocket.chat/uikit-playground",
   "private": true,
-  "version": "0.6.0",
+  "version": "0.6.1-rc.3",
   "type": "module",
   "scripts": {
     "dev": "vite",
     "build-preview": "tsc && vite build",
     ".:build-preview-move": "mkdir -p ../../.preview/ && cp -r ./dist ../../.preview/uikit-playground",
     "lint": "eslint src --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
-    "preview": "vite preview"
+    "preview": "vite preview",
+    "typecheck": "tsc --noEmit"
   },
   "dependencies": {
-    "@codemirror/lang-javascript": "^6.1.9",
+    "@codemirror/lang-javascript": "^6.2.2",
     "@codemirror/lang-json": "^6.0.1",
-    "@lezer/highlight": "^1.1.6",
+    "@lezer/highlight": "^1.2.1",
     "@rocket.chat/core-typings": "workspace:^",
     "@rocket.chat/css-in-js": "~0.31.25",
     "@rocket.chat/fuselage": "^0.59.4",
@@ -22,7 +23,7 @@
     "@rocket.chat/fuselage-toastbar": "^0.33.0",
     "@rocket.chat/fuselage-tokens": "^0.33.2",
     "@rocket.chat/fuselage-ui-kit": "workspace:~",
-    "@rocket.chat/icons": "~0.38.0",
+    "@rocket.chat/icons": "~0.39.0",
     "@rocket.chat/logo": "^0.31.30",
     "@rocket.chat/styled": "~0.31.25",
     "@rocket.chat/ui-avatar": "workspace:^",
@@ -34,25 +35,24 @@
     "react": "^17.0.2",
     "react-beautiful-dnd": "^13.1.1",
     "react-dom": "^17.0.2",
-    "react-router-dom": "^6.11.2",
+    "react-router-dom": "^6.28.0",
     "react-split-pane": "^0.1.92",
-    "react-virtuoso": "^4.7.1",
-    "reactflow": "^11.7.2",
-    "use-subscription": "^1.8.2"
+    "react-virtuoso": "^4.12.0",
+    "reactflow": "^11.11.4"
   },
   "devDependencies": {
+    "@types/lodash": "~4.17.13",
     "@types/react": "~17.0.80",
     "@types/react-beautiful-dnd": "^13.1.8",
     "@types/react-dom": "~17.0.25",
-    "@types/use-subscription": "^1.0.2",
     "@typescript-eslint/eslint-plugin": "~5.60.1",
     "@typescript-eslint/parser": "~5.60.1",
-    "@vitejs/plugin-react": "^4.0.0",
+    "@vitejs/plugin-react": "^4.3.3",
     "eslint": "~8.45.0",
-    "eslint-plugin-react-hooks": "^4.6.2",
-    "eslint-plugin-react-refresh": "^0.4.12",
+    "eslint-plugin-react-hooks": "^5.0.0",
+    "eslint-plugin-react-refresh": "^0.4.14",
     "typescript": "~5.6.3",
-    "vite": "^4.5.5"
+    "vite": "^5.4.11"
   },
   "volta": {
     "extends": "../../package.json"
diff --git a/apps/uikit-playground/src/Components/CodeEditor/index.tsx b/apps/uikit-playground/src/Components/CodeEditor/index.tsx
index a5237dd93279..8a5b7e40848b 100644
--- a/apps/uikit-playground/src/Components/CodeEditor/index.tsx
+++ b/apps/uikit-playground/src/Components/CodeEditor/index.tsx
@@ -20,7 +20,7 @@ const CodeEditor = ({ extensions }: CodeMirrorProps) => {
   } = useContext(context);
   const { editor, changes, setValue } = useCodeMirror(
     extensions,
-    json5.stringify(screens[activeScreen].payload, undefined, 4)
+    json5.stringify(screens[activeScreen].payload, undefined, 4),
   );
   const debounceValue = useDebouncedValue(changes?.value, 1500);
 
@@ -32,7 +32,7 @@ const CodeEditor = ({ extensions }: CodeMirrorProps) => {
           updatePayloadAction({
             blocks: parsedCode,
             changedByEditor: false,
-          })
+          }),
         );
 
         dispatch(updatePayloadAction({ blocks: parsedCode }));
@@ -45,14 +45,11 @@ const CodeEditor = ({ extensions }: CodeMirrorProps) => {
 
   useEffect(() => {
     if (!changes?.isDispatch) {
-      try {
-        const prettierCode = codePrettier(changes.value, changes.cursor || 0);
+      codePrettier(changes.value, changes.cursor || 0).then((prettierCode) => {
         setValue(prettierCode.formatted, {
           cursor: prettierCode.cursorOffset,
         });
-      } catch (e) {
-        // do nothing
-      }
+      });
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [debounceValue]);
diff --git a/apps/uikit-playground/src/hooks/useFormatCodeMirrorValue.ts b/apps/uikit-playground/src/hooks/useFormatCodeMirrorValue.ts
index e781c8eb94a7..ee4acce29c73 100644
--- a/apps/uikit-playground/src/hooks/useFormatCodeMirrorValue.ts
+++ b/apps/uikit-playground/src/hooks/useFormatCodeMirrorValue.ts
@@ -12,9 +12,9 @@ function isILayoutblock(obj: object): obj is IPayload {
 const useFormatCodeMirrorValue = (
   callback: (
     parsedCode: IPayload,
-    prettierCode: ReturnType<typeof codePrettier>
+    prettierCode: Awaited<ReturnType<typeof codePrettier>>,
   ) => void,
-  changes: ICodeMirrorChanges
+  changes: ICodeMirrorChanges,
 ) => {
   useEffect(() => {
     if (changes?.isDispatch) return;
@@ -23,8 +23,9 @@ const useFormatCodeMirrorValue = (
       const parsedCode = json5.parse(changes.value);
       if (!isILayoutblock(parsedCode))
         throw new Error('Please enter a valid LayoutBlock');
-      const prettierCode = codePrettier(changes.value, changes.cursor || 0);
-      callback(parsedCode, prettierCode);
+      codePrettier(changes.value, changes.cursor || 0).then((prettierCode) => {
+        callback(parsedCode, prettierCode);
+      });
     } catch (e) {
       // do nothing
     }
diff --git a/ee/apps/account-service/CHANGELOG.md b/ee/apps/account-service/CHANGELOG.md
index 5f8ee0550c5c..4b9a270e6eb8 100644
--- a/ee/apps/account-service/CHANGELOG.md
+++ b/ee/apps/account-service/CHANGELOG.md
@@ -1,5 +1,63 @@
 # @rocket.chat/account-service
 
+## 0.4.10-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.3
+  - @rocket.chat/rest-typings@7.1.0-rc.3
+  - @rocket.chat/core-services@0.7.2-rc.3
+  - @rocket.chat/model-typings@1.1.0-rc.3
+  - @rocket.chat/network-broker@0.1.2-rc.3
+  - @rocket.chat/models@1.0.1-rc.3
+  </details>
+
+## 0.4.10-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.2
+  - @rocket.chat/rest-typings@7.1.0-rc.2
+  - @rocket.chat/core-services@0.7.2-rc.2
+  - @rocket.chat/model-typings@1.1.0-rc.2
+  - @rocket.chat/network-broker@0.1.2-rc.2
+  - @rocket.chat/models@1.0.1-rc.2
+  </details>
+
+## 0.4.10-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.1
+  - @rocket.chat/rest-typings@7.1.0-rc.1
+  - @rocket.chat/core-services@0.7.2-rc.1
+  - @rocket.chat/model-typings@1.1.0-rc.1
+  - @rocket.chat/network-broker@0.1.2-rc.1
+  - @rocket.chat/models@1.0.1-rc.1
+  </details>
+
+## 0.4.10-rc.0
+
+### Patch Changes
+
+- ([#33596](https://github.com/RocketChat/Rocket.Chat/pull/33596)) Bump meteor to 3.0.4 and Node version to 20.18.0
+
+- <details><summary>Updated dependencies [80e36bfc3938775eb26aa5576f1b9b98896e1cc4, e7edeac3bdd22da0a04b8e873d5a008e249fb4be, 32d93a0666fa1cbe857d02889e93d9bbf45bd4f0, 63ccadc012499e004445ad6bc6cd2ff777aecbd1]:</summary>
+
+  - @rocket.chat/model-typings@1.1.0-rc.0
+  - @rocket.chat/core-typings@7.1.0-rc.0
+  - @rocket.chat/rest-typings@7.1.0-rc.0
+  - @rocket.chat/core-services@0.7.2-rc.0
+  - @rocket.chat/models@1.0.1-rc.0
+  - @rocket.chat/network-broker@0.1.2-rc.0
+  </details>
+
 ## 0.4.9
 
 ### Patch Changes
diff --git a/ee/apps/account-service/Dockerfile b/ee/apps/account-service/Dockerfile
index 7c7f4f5ebb3d..272a781ce5b0 100644
--- a/ee/apps/account-service/Dockerfile
+++ b/ee/apps/account-service/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20.17.0-alpine3.20
+FROM node:20.18.0-alpine3.20
 
 ARG SERVICE
 
diff --git a/ee/apps/account-service/package.json b/ee/apps/account-service/package.json
index c57726bb99ff..4425ed94ce0f 100644
--- a/ee/apps/account-service/package.json
+++ b/ee/apps/account-service/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/account-service",
 	"private": true,
-	"version": "0.4.9",
+	"version": "0.4.10-rc.3",
 	"description": "Rocket.Chat Account service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",
@@ -25,19 +25,19 @@
 		"@rocket.chat/string-helpers": "~0.31.25",
 		"@rocket.chat/tools": "workspace:^",
 		"@rocket.chat/tracing": "workspace:^",
-		"@types/node": "~20.16.12",
-		"bcrypt": "^5.0.1",
+		"@types/node": "~20.16.15",
+		"bcrypt": "^5.1.1",
 		"ejson": "^2.2.3",
 		"event-loop-stats": "^1.4.1",
-		"eventemitter3": "^4.0.7",
+		"eventemitter3": "^5.0.1",
 		"gc-stats": "^1.4.1",
 		"mem": "^8.1.1",
-		"moleculer": "^0.14.34",
+		"moleculer": "^0.14.35",
 		"mongodb": "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch",
-		"nats": "^2.4.0",
-		"pino": "^8.15.0",
+		"nats": "^2.28.2",
+		"pino": "^8.21.0",
 		"polka": "^0.5.2",
-		"uuid": "^9.0.1"
+		"uuid": "^11.0.3"
 	},
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
diff --git a/ee/apps/authorization-service/CHANGELOG.md b/ee/apps/authorization-service/CHANGELOG.md
index 33676aaaa7fa..8e4e066af759 100644
--- a/ee/apps/authorization-service/CHANGELOG.md
+++ b/ee/apps/authorization-service/CHANGELOG.md
@@ -1,5 +1,63 @@
 # @rocket.chat/authorization-service
 
+## 0.4.10-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.3
+  - @rocket.chat/rest-typings@7.1.0-rc.3
+  - @rocket.chat/core-services@0.7.2-rc.3
+  - @rocket.chat/model-typings@1.1.0-rc.3
+  - @rocket.chat/network-broker@0.1.2-rc.3
+  - @rocket.chat/models@1.0.1-rc.3
+  </details>
+
+## 0.4.10-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.2
+  - @rocket.chat/rest-typings@7.1.0-rc.2
+  - @rocket.chat/core-services@0.7.2-rc.2
+  - @rocket.chat/model-typings@1.1.0-rc.2
+  - @rocket.chat/network-broker@0.1.2-rc.2
+  - @rocket.chat/models@1.0.1-rc.2
+  </details>
+
+## 0.4.10-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.1
+  - @rocket.chat/rest-typings@7.1.0-rc.1
+  - @rocket.chat/core-services@0.7.2-rc.1
+  - @rocket.chat/model-typings@1.1.0-rc.1
+  - @rocket.chat/network-broker@0.1.2-rc.1
+  - @rocket.chat/models@1.0.1-rc.1
+  </details>
+
+## 0.4.10-rc.0
+
+### Patch Changes
+
+- ([#33596](https://github.com/RocketChat/Rocket.Chat/pull/33596)) Bump meteor to 3.0.4 and Node version to 20.18.0
+
+- <details><summary>Updated dependencies [80e36bfc3938775eb26aa5576f1b9b98896e1cc4, e7edeac3bdd22da0a04b8e873d5a008e249fb4be, 32d93a0666fa1cbe857d02889e93d9bbf45bd4f0, 63ccadc012499e004445ad6bc6cd2ff777aecbd1]:</summary>
+
+  - @rocket.chat/model-typings@1.1.0-rc.0
+  - @rocket.chat/core-typings@7.1.0-rc.0
+  - @rocket.chat/rest-typings@7.1.0-rc.0
+  - @rocket.chat/core-services@0.7.2-rc.0
+  - @rocket.chat/models@1.0.1-rc.0
+  - @rocket.chat/network-broker@0.1.2-rc.0
+  </details>
+
 ## 0.4.9
 
 ### Patch Changes
diff --git a/ee/apps/authorization-service/Dockerfile b/ee/apps/authorization-service/Dockerfile
index 792afc778088..de7b41913a20 100644
--- a/ee/apps/authorization-service/Dockerfile
+++ b/ee/apps/authorization-service/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20.17.0-alpine3.20
+FROM node:20.18.0-alpine3.20
 
 ARG SERVICE
 
diff --git a/ee/apps/authorization-service/package.json b/ee/apps/authorization-service/package.json
index 54f6edccd331..b4af6946364c 100644
--- a/ee/apps/authorization-service/package.json
+++ b/ee/apps/authorization-service/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/authorization-service",
 	"private": true,
-	"version": "0.4.9",
+	"version": "0.4.10-rc.3",
 	"description": "Rocket.Chat Authorization service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",
@@ -24,16 +24,16 @@
 		"@rocket.chat/rest-typings": "workspace:^",
 		"@rocket.chat/string-helpers": "~0.31.25",
 		"@rocket.chat/tracing": "workspace:^",
-		"@types/node": "~20.16.12",
+		"@types/node": "~20.16.15",
 		"ejson": "^2.2.3",
 		"event-loop-stats": "^1.4.1",
-		"eventemitter3": "^4.0.7",
+		"eventemitter3": "^5.0.1",
 		"gc-stats": "^1.4.1",
 		"mem": "^8.1.1",
-		"moleculer": "^0.14.34",
+		"moleculer": "^0.14.35",
 		"mongodb": "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch",
-		"nats": "^2.4.0",
-		"pino": "^8.15.0",
+		"nats": "^2.28.2",
+		"pino": "^8.21.0",
 		"polka": "^0.5.2"
 	},
 	"devDependencies": {
diff --git a/ee/apps/ddp-streamer/CHANGELOG.md b/ee/apps/ddp-streamer/CHANGELOG.md
index 5968ded71517..daa8503dd331 100644
--- a/ee/apps/ddp-streamer/CHANGELOG.md
+++ b/ee/apps/ddp-streamer/CHANGELOG.md
@@ -1,5 +1,67 @@
 # @rocket.chat/ddp-streamer
 
+## 0.3.10-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.3
+  - @rocket.chat/rest-typings@7.1.0-rc.3
+  - @rocket.chat/core-services@0.7.2-rc.3
+  - @rocket.chat/model-typings@1.1.0-rc.3
+  - @rocket.chat/network-broker@0.1.2-rc.3
+  - @rocket.chat/models@1.0.1-rc.3
+  - @rocket.chat/instance-status@0.1.10-rc.3
+  </details>
+
+## 0.3.10-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.2
+  - @rocket.chat/rest-typings@7.1.0-rc.2
+  - @rocket.chat/core-services@0.7.2-rc.2
+  - @rocket.chat/model-typings@1.1.0-rc.2
+  - @rocket.chat/network-broker@0.1.2-rc.2
+  - @rocket.chat/models@1.0.1-rc.2
+  - @rocket.chat/instance-status@0.1.10-rc.2
+  </details>
+
+## 0.3.10-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.1
+  - @rocket.chat/rest-typings@7.1.0-rc.1
+  - @rocket.chat/core-services@0.7.2-rc.1
+  - @rocket.chat/model-typings@1.1.0-rc.1
+  - @rocket.chat/network-broker@0.1.2-rc.1
+  - @rocket.chat/models@1.0.1-rc.1
+  - @rocket.chat/instance-status@0.1.10-rc.1
+  </details>
+
+## 0.3.10-rc.0
+
+### Patch Changes
+
+- ([#33596](https://github.com/RocketChat/Rocket.Chat/pull/33596)) Bump meteor to 3.0.4 and Node version to 20.18.0
+
+- <details><summary>Updated dependencies [80e36bfc3938775eb26aa5576f1b9b98896e1cc4, e7edeac3bdd22da0a04b8e873d5a008e249fb4be, 32d93a0666fa1cbe857d02889e93d9bbf45bd4f0, 63ccadc012499e004445ad6bc6cd2ff777aecbd1]:</summary>
+
+  - @rocket.chat/model-typings@1.1.0-rc.0
+  - @rocket.chat/core-typings@7.1.0-rc.0
+  - @rocket.chat/rest-typings@7.1.0-rc.0
+  - @rocket.chat/core-services@0.7.2-rc.0
+  - @rocket.chat/models@1.0.1-rc.0
+  - @rocket.chat/network-broker@0.1.2-rc.0
+  - @rocket.chat/instance-status@0.1.10-rc.0
+  </details>
+
 ## 0.3.9
 
 ### Patch Changes
diff --git a/ee/apps/ddp-streamer/Dockerfile b/ee/apps/ddp-streamer/Dockerfile
index e2106da66a5b..e0ff3620e17d 100644
--- a/ee/apps/ddp-streamer/Dockerfile
+++ b/ee/apps/ddp-streamer/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20.17.0-alpine3.20
+FROM node:20.18.0-alpine3.20
 
 ARG SERVICE
 
diff --git a/ee/apps/ddp-streamer/package.json b/ee/apps/ddp-streamer/package.json
index feffc90d09b3..7e321734b8a2 100644
--- a/ee/apps/ddp-streamer/package.json
+++ b/ee/apps/ddp-streamer/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/ddp-streamer",
 	"private": true,
-	"version": "0.3.9",
+	"version": "0.3.10-rc.3",
 	"description": "Rocket.Chat DDP-Streamer service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",
@@ -29,18 +29,18 @@
 		"colorette": "^1.4.0",
 		"ejson": "^2.2.3",
 		"event-loop-stats": "^1.4.1",
-		"eventemitter3": "^4.0.7",
+		"eventemitter3": "^5.0.1",
 		"gc-stats": "^1.4.1",
 		"jaeger-client": "^3.19.0",
 		"mem": "^8.1.1",
-		"moleculer": "^0.14.34",
+		"moleculer": "^0.14.35",
 		"mongodb": "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch",
-		"nats": "^2.4.0",
-		"pino": "^8.15.0",
+		"nats": "^2.28.2",
+		"pino": "^8.21.0",
 		"polka": "^0.5.2",
-		"sharp": "^0.32.6",
+		"sharp": "^0.33.5",
 		"underscore": "^1.13.7",
-		"uuid": "^7.0.3",
+		"uuid": "^11.0.3",
 		"ws": "^8.18.0"
 	},
 	"devDependencies": {
@@ -50,11 +50,10 @@
 		"@types/ejson": "^2.2.2",
 		"@types/gc-stats": "^1.4.3",
 		"@types/meteor": "^2.9.8",
-		"@types/node": "~20.16.12",
+		"@types/node": "~20.16.15",
 		"@types/polka": "^0.5.7",
-		"@types/sharp": "^0.30.5",
-		"@types/uuid": "^8.3.4",
-		"@types/ws": "^8.5.12",
+		"@types/uuid": "^10.0.0",
+		"@types/ws": "^8.5.13",
 		"eslint": "~8.45.0",
 		"pino-pretty": "^7.6.1",
 		"ts-node": "^10.9.2",
diff --git a/ee/apps/ddp-streamer/src/Client.ts b/ee/apps/ddp-streamer/src/Client.ts
index 83bc851bd485..fb75af64b3da 100644
--- a/ee/apps/ddp-streamer/src/Client.ts
+++ b/ee/apps/ddp-streamer/src/Client.ts
@@ -73,7 +73,11 @@ export class Client extends EventEmitter {
 
 	public userToken?: string;
 
-	constructor(public ws: WebSocket, public meteorClient = false, req: IncomingMessage) {
+	constructor(
+		public ws: WebSocket,
+		public meteorClient = false,
+		req: IncomingMessage,
+	) {
 		super();
 
 		this.connection = {
diff --git a/ee/apps/ddp-streamer/src/DDPStreamer.ts b/ee/apps/ddp-streamer/src/DDPStreamer.ts
index 2ba89ced7138..1c880929650d 100644
--- a/ee/apps/ddp-streamer/src/DDPStreamer.ts
+++ b/ee/apps/ddp-streamer/src/DDPStreamer.ts
@@ -7,14 +7,14 @@ import polka from 'polka';
 import { throttle } from 'underscore';
 import WebSocket from 'ws';
 
-import { ListenersModule } from '../../../../apps/meteor/server/modules/listeners/listeners.module';
-import type { NotificationsModule } from '../../../../apps/meteor/server/modules/notifications/notifications.module';
-import { StreamerCentral } from '../../../../apps/meteor/server/modules/streamer/streamer.module';
 import { Client, clientMap } from './Client';
 import { events, server } from './configureServer';
 import { DDP_EVENTS } from './constants';
 import { Autoupdate } from './lib/Autoupdate';
 import { proxy } from './proxy';
+import { ListenersModule } from '../../../../apps/meteor/server/modules/listeners/listeners.module';
+import type { NotificationsModule } from '../../../../apps/meteor/server/modules/notifications/notifications.module';
+import { StreamerCentral } from '../../../../apps/meteor/server/modules/streamer/streamer.module';
 
 const { PORT = 4000 } = process.env;
 
diff --git a/ee/apps/ddp-streamer/src/Publication.ts b/ee/apps/ddp-streamer/src/Publication.ts
index 71874b942ee4..d9d890027ad6 100644
--- a/ee/apps/ddp-streamer/src/Publication.ts
+++ b/ee/apps/ddp-streamer/src/Publication.ts
@@ -11,7 +11,11 @@ export class Publication extends EventEmitter implements IPublication {
 
 	connection: IPublication['connection'];
 
-	constructor(public client: Client, private packet: IPacket, private server: Server) {
+	constructor(
+		public client: Client,
+		private packet: IPacket,
+		private server: Server,
+	) {
 		super();
 		this.packet = packet;
 		client.subscriptions.set(packet.id, this);
diff --git a/ee/apps/ddp-streamer/src/Streamer.ts b/ee/apps/ddp-streamer/src/Streamer.ts
index 686e3224d7ef..aa689dfb1f8f 100644
--- a/ee/apps/ddp-streamer/src/Streamer.ts
+++ b/ee/apps/ddp-streamer/src/Streamer.ts
@@ -3,10 +3,10 @@ import type { StreamNames } from '@rocket.chat/ddp-client';
 import type { DDPSubscription, Connection, TransformMessage } from 'meteor/rocketchat:streamer';
 import WebSocket from 'ws';
 
-import { Streamer, StreamerCentral } from '../../../../apps/meteor/server/modules/streamer/streamer.module';
 import { server } from './configureServer';
 import { DDP_EVENTS } from './constants';
 import { isEmpty } from './lib/utils';
+import { Streamer, StreamerCentral } from '../../../../apps/meteor/server/modules/streamer/streamer.module';
 
 StreamerCentral.on('broadcast', (name, eventName, args) => {
 	void api.broadcast('stream', [name, eventName, args]);
diff --git a/ee/apps/omnichannel-transcript/CHANGELOG.md b/ee/apps/omnichannel-transcript/CHANGELOG.md
index 6d2943c0efdd..42ebfe1d5d2b 100644
--- a/ee/apps/omnichannel-transcript/CHANGELOG.md
+++ b/ee/apps/omnichannel-transcript/CHANGELOG.md
@@ -1,5 +1,67 @@
 # @rocket.chat/omnichannel-transcript
 
+## 0.4.10-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.3
+  - @rocket.chat/omnichannel-services@0.3.7-rc.3
+  - @rocket.chat/pdf-worker@0.2.7-rc.3
+  - @rocket.chat/core-services@0.7.2-rc.3
+  - @rocket.chat/model-typings@1.1.0-rc.3
+  - @rocket.chat/network-broker@0.1.2-rc.3
+  - @rocket.chat/models@1.0.1-rc.3
+  </details>
+
+## 0.4.10-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.2
+  - @rocket.chat/omnichannel-services@0.3.7-rc.2
+  - @rocket.chat/pdf-worker@0.2.7-rc.2
+  - @rocket.chat/core-services@0.7.2-rc.2
+  - @rocket.chat/model-typings@1.1.0-rc.2
+  - @rocket.chat/network-broker@0.1.2-rc.2
+  - @rocket.chat/models@1.0.1-rc.2
+  </details>
+
+## 0.4.10-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.1
+  - @rocket.chat/omnichannel-services@0.3.7-rc.1
+  - @rocket.chat/pdf-worker@0.2.7-rc.1
+  - @rocket.chat/core-services@0.7.2-rc.1
+  - @rocket.chat/model-typings@1.1.0-rc.1
+  - @rocket.chat/network-broker@0.1.2-rc.1
+  - @rocket.chat/models@1.0.1-rc.1
+  </details>
+
+## 0.4.10-rc.0
+
+### Patch Changes
+
+- ([#33596](https://github.com/RocketChat/Rocket.Chat/pull/33596)) Bump meteor to 3.0.4 and Node version to 20.18.0
+
+- <details><summary>Updated dependencies [80e36bfc3938775eb26aa5576f1b9b98896e1cc4, 32d93a0666fa1cbe857d02889e93d9bbf45bd4f0, 63ccadc012499e004445ad6bc6cd2ff777aecbd1]:</summary>
+
+  - @rocket.chat/model-typings@1.1.0-rc.0
+  - @rocket.chat/core-typings@7.1.0-rc.0
+  - @rocket.chat/core-services@0.7.2-rc.0
+  - @rocket.chat/omnichannel-services@0.3.7-rc.0
+  - @rocket.chat/models@1.0.1-rc.0
+  - @rocket.chat/pdf-worker@0.2.7-rc.0
+  - @rocket.chat/network-broker@0.1.2-rc.0
+  </details>
+
 ## 0.4.9
 
 ### Patch Changes
diff --git a/ee/apps/omnichannel-transcript/Dockerfile b/ee/apps/omnichannel-transcript/Dockerfile
index b2595b06f1fe..daf27317e554 100644
--- a/ee/apps/omnichannel-transcript/Dockerfile
+++ b/ee/apps/omnichannel-transcript/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20.17.0-alpine3.20
+FROM node:20.18.0-alpine3.20
 
 ARG SERVICE
 
diff --git a/ee/apps/omnichannel-transcript/package.json b/ee/apps/omnichannel-transcript/package.json
index ba01609beb88..3624056fc253 100644
--- a/ee/apps/omnichannel-transcript/package.json
+++ b/ee/apps/omnichannel-transcript/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/omnichannel-transcript",
 	"private": true,
-	"version": "0.4.9",
+	"version": "0.4.10-rc.3",
 	"description": "Rocket.Chat service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",
@@ -27,19 +27,19 @@
 		"@rocket.chat/pdf-worker": "workspace:^",
 		"@rocket.chat/tools": "workspace:^",
 		"@rocket.chat/tracing": "workspace:^",
-		"@types/node": "~20.16.12",
+		"@types/node": "~20.16.15",
 		"ejson": "^2.2.3",
 		"emoji-toolkit": "^7.0.1",
 		"event-loop-stats": "^1.4.1",
-		"eventemitter3": "^4.0.7",
+		"eventemitter3": "^5.0.1",
 		"gc-stats": "^1.4.1",
 		"mem": "^8.1.1",
-		"moleculer": "^0.14.34",
+		"moleculer": "^0.14.35",
 		"moment-timezone": "^0.5.46",
-		"mongo-message-queue": "^1.0.0",
+		"mongo-message-queue": "^1.1.0",
 		"mongodb": "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch",
-		"nats": "^2.4.0",
-		"pino": "^8.15.0",
+		"nats": "^2.28.2",
+		"pino": "^8.21.0",
 		"polka": "^0.5.2"
 	},
 	"devDependencies": {
diff --git a/ee/apps/presence-service/CHANGELOG.md b/ee/apps/presence-service/CHANGELOG.md
index da0afb7ae37a..9b9711302002 100644
--- a/ee/apps/presence-service/CHANGELOG.md
+++ b/ee/apps/presence-service/CHANGELOG.md
@@ -1,5 +1,63 @@
 # @rocket.chat/presence-service
 
+## 0.4.10-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.3
+  - @rocket.chat/presence@0.2.10-rc.3
+  - @rocket.chat/core-services@0.7.2-rc.3
+  - @rocket.chat/model-typings@1.1.0-rc.3
+  - @rocket.chat/network-broker@0.1.2-rc.3
+  - @rocket.chat/models@1.0.1-rc.3
+  </details>
+
+## 0.4.10-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.2
+  - @rocket.chat/presence@0.2.10-rc.2
+  - @rocket.chat/core-services@0.7.2-rc.2
+  - @rocket.chat/model-typings@1.1.0-rc.2
+  - @rocket.chat/network-broker@0.1.2-rc.2
+  - @rocket.chat/models@1.0.1-rc.2
+  </details>
+
+## 0.4.10-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.1
+  - @rocket.chat/presence@0.2.10-rc.1
+  - @rocket.chat/core-services@0.7.2-rc.1
+  - @rocket.chat/model-typings@1.1.0-rc.1
+  - @rocket.chat/network-broker@0.1.2-rc.1
+  - @rocket.chat/models@1.0.1-rc.1
+  </details>
+
+## 0.4.10-rc.0
+
+### Patch Changes
+
+- ([#33596](https://github.com/RocketChat/Rocket.Chat/pull/33596)) Bump meteor to 3.0.4 and Node version to 20.18.0
+
+- <details><summary>Updated dependencies [80e36bfc3938775eb26aa5576f1b9b98896e1cc4, 32d93a0666fa1cbe857d02889e93d9bbf45bd4f0, 63ccadc012499e004445ad6bc6cd2ff777aecbd1]:</summary>
+
+  - @rocket.chat/model-typings@1.1.0-rc.0
+  - @rocket.chat/core-typings@7.1.0-rc.0
+  - @rocket.chat/core-services@0.7.2-rc.0
+  - @rocket.chat/presence@0.2.10-rc.0
+  - @rocket.chat/models@1.0.1-rc.0
+  - @rocket.chat/network-broker@0.1.2-rc.0
+  </details>
+
 ## 0.4.9
 
 ### Patch Changes
diff --git a/ee/apps/presence-service/Dockerfile b/ee/apps/presence-service/Dockerfile
index ce1977fd3c87..cf7bc5577700 100644
--- a/ee/apps/presence-service/Dockerfile
+++ b/ee/apps/presence-service/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20.17.0-alpine3.20
+FROM node:20.18.0-alpine3.20
 
 ARG SERVICE
 
diff --git a/ee/apps/presence-service/package.json b/ee/apps/presence-service/package.json
index 13b8624a72c3..f9cd272e3ea9 100644
--- a/ee/apps/presence-service/package.json
+++ b/ee/apps/presence-service/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/presence-service",
 	"private": true,
-	"version": "0.4.9",
+	"version": "0.4.10-rc.3",
 	"description": "Rocket.Chat Presence service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",
@@ -24,16 +24,16 @@
 		"@rocket.chat/presence": "workspace:^",
 		"@rocket.chat/string-helpers": "~0.31.25",
 		"@rocket.chat/tracing": "workspace:^",
-		"@types/node": "~20.16.12",
+		"@types/node": "~20.16.15",
 		"ejson": "^2.2.3",
 		"event-loop-stats": "^1.4.1",
-		"eventemitter3": "^4.0.7",
+		"eventemitter3": "^5.0.1",
 		"gc-stats": "^1.4.1",
 		"mem": "^8.1.1",
-		"moleculer": "^0.14.34",
+		"moleculer": "^0.14.35",
 		"mongodb": "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch",
-		"nats": "^2.4.0",
-		"pino": "^8.15.0",
+		"nats": "^2.28.2",
+		"pino": "^8.21.0",
 		"polka": "^0.5.2"
 	},
 	"devDependencies": {
diff --git a/ee/apps/queue-worker/CHANGELOG.md b/ee/apps/queue-worker/CHANGELOG.md
index fe05d424bc2b..ca08d11b9cce 100644
--- a/ee/apps/queue-worker/CHANGELOG.md
+++ b/ee/apps/queue-worker/CHANGELOG.md
@@ -1,5 +1,63 @@
 # @rocket.chat/queue-worker
 
+## 0.4.10-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.3
+  - @rocket.chat/omnichannel-services@0.3.7-rc.3
+  - @rocket.chat/core-services@0.7.2-rc.3
+  - @rocket.chat/model-typings@1.1.0-rc.3
+  - @rocket.chat/network-broker@0.1.2-rc.3
+  - @rocket.chat/models@1.0.1-rc.3
+  </details>
+
+## 0.4.10-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.2
+  - @rocket.chat/omnichannel-services@0.3.7-rc.2
+  - @rocket.chat/core-services@0.7.2-rc.2
+  - @rocket.chat/model-typings@1.1.0-rc.2
+  - @rocket.chat/network-broker@0.1.2-rc.2
+  - @rocket.chat/models@1.0.1-rc.2
+  </details>
+
+## 0.4.10-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.1
+  - @rocket.chat/omnichannel-services@0.3.7-rc.1
+  - @rocket.chat/core-services@0.7.2-rc.1
+  - @rocket.chat/model-typings@1.1.0-rc.1
+  - @rocket.chat/network-broker@0.1.2-rc.1
+  - @rocket.chat/models@1.0.1-rc.1
+  </details>
+
+## 0.4.10-rc.0
+
+### Patch Changes
+
+- ([#33596](https://github.com/RocketChat/Rocket.Chat/pull/33596)) Bump meteor to 3.0.4 and Node version to 20.18.0
+
+- <details><summary>Updated dependencies [80e36bfc3938775eb26aa5576f1b9b98896e1cc4, 32d93a0666fa1cbe857d02889e93d9bbf45bd4f0, 63ccadc012499e004445ad6bc6cd2ff777aecbd1]:</summary>
+
+  - @rocket.chat/model-typings@1.1.0-rc.0
+  - @rocket.chat/core-typings@7.1.0-rc.0
+  - @rocket.chat/core-services@0.7.2-rc.0
+  - @rocket.chat/omnichannel-services@0.3.7-rc.0
+  - @rocket.chat/models@1.0.1-rc.0
+  - @rocket.chat/network-broker@0.1.2-rc.0
+  </details>
+
 ## 0.4.9
 
 ### Patch Changes
diff --git a/ee/apps/queue-worker/Dockerfile b/ee/apps/queue-worker/Dockerfile
index b2595b06f1fe..daf27317e554 100644
--- a/ee/apps/queue-worker/Dockerfile
+++ b/ee/apps/queue-worker/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20.17.0-alpine3.20
+FROM node:20.18.0-alpine3.20
 
 ARG SERVICE
 
diff --git a/ee/apps/queue-worker/package.json b/ee/apps/queue-worker/package.json
index 0107ae2c3b40..1dbbc7e9cefc 100644
--- a/ee/apps/queue-worker/package.json
+++ b/ee/apps/queue-worker/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/queue-worker",
 	"private": true,
-	"version": "0.4.9",
+	"version": "0.4.10-rc.3",
 	"description": "Rocket.Chat service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",
@@ -24,19 +24,19 @@
 		"@rocket.chat/network-broker": "workspace:^",
 		"@rocket.chat/omnichannel-services": "workspace:^",
 		"@rocket.chat/tracing": "workspace:^",
-		"@types/node": "~20.16.12",
+		"@types/node": "~20.16.15",
 		"ejson": "^2.2.3",
 		"emoji-toolkit": "^7.0.1",
 		"event-loop-stats": "^1.4.1",
-		"eventemitter3": "^4.0.7",
+		"eventemitter3": "^5.0.1",
 		"gc-stats": "^1.4.1",
 		"mem": "^8.1.1",
-		"moleculer": "^0.14.34",
+		"moleculer": "^0.14.35",
 		"moment-timezone": "^0.5.46",
-		"mongo-message-queue": "^1.0.0",
+		"mongo-message-queue": "^1.1.0",
 		"mongodb": "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch",
-		"nats": "^2.4.0",
-		"pino": "^8.15.0",
+		"nats": "^2.28.2",
+		"pino": "^8.21.0",
 		"polka": "^0.5.2"
 	},
 	"devDependencies": {
diff --git a/ee/apps/stream-hub-service/CHANGELOG.md b/ee/apps/stream-hub-service/CHANGELOG.md
index 00ef7243afcf..e34f438955b1 100644
--- a/ee/apps/stream-hub-service/CHANGELOG.md
+++ b/ee/apps/stream-hub-service/CHANGELOG.md
@@ -1,5 +1,59 @@
 # @rocket.chat/stream-hub-service
 
+## 0.4.10-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.3
+  - @rocket.chat/core-services@0.7.2-rc.3
+  - @rocket.chat/model-typings@1.1.0-rc.3
+  - @rocket.chat/network-broker@0.1.2-rc.3
+  - @rocket.chat/models@1.0.1-rc.3
+  </details>
+
+## 0.4.10-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.2
+  - @rocket.chat/core-services@0.7.2-rc.2
+  - @rocket.chat/model-typings@1.1.0-rc.2
+  - @rocket.chat/network-broker@0.1.2-rc.2
+  - @rocket.chat/models@1.0.1-rc.2
+  </details>
+
+## 0.4.10-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.1
+  - @rocket.chat/core-services@0.7.2-rc.1
+  - @rocket.chat/model-typings@1.1.0-rc.1
+  - @rocket.chat/network-broker@0.1.2-rc.1
+  - @rocket.chat/models@1.0.1-rc.1
+  </details>
+
+## 0.4.10-rc.0
+
+### Patch Changes
+
+- ([#33596](https://github.com/RocketChat/Rocket.Chat/pull/33596)) Bump meteor to 3.0.4 and Node version to 20.18.0
+
+- <details><summary>Updated dependencies [80e36bfc3938775eb26aa5576f1b9b98896e1cc4, 32d93a0666fa1cbe857d02889e93d9bbf45bd4f0, 63ccadc012499e004445ad6bc6cd2ff777aecbd1]:</summary>
+
+  - @rocket.chat/model-typings@1.1.0-rc.0
+  - @rocket.chat/core-typings@7.1.0-rc.0
+  - @rocket.chat/core-services@0.7.2-rc.0
+  - @rocket.chat/models@1.0.1-rc.0
+  - @rocket.chat/network-broker@0.1.2-rc.0
+  </details>
+
 ## 0.4.9
 
 ### Patch Changes
diff --git a/ee/apps/stream-hub-service/Dockerfile b/ee/apps/stream-hub-service/Dockerfile
index 792afc778088..de7b41913a20 100644
--- a/ee/apps/stream-hub-service/Dockerfile
+++ b/ee/apps/stream-hub-service/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20.17.0-alpine3.20
+FROM node:20.18.0-alpine3.20
 
 ARG SERVICE
 
diff --git a/ee/apps/stream-hub-service/package.json b/ee/apps/stream-hub-service/package.json
index d7a8aefc6ff2..1916b0ee0be0 100644
--- a/ee/apps/stream-hub-service/package.json
+++ b/ee/apps/stream-hub-service/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "@rocket.chat/stream-hub-service",
 	"private": true,
-	"version": "0.4.9",
+	"version": "0.4.10-rc.3",
 	"description": "Rocket.Chat Stream Hub service",
 	"scripts": {
 		"build": "tsc -p tsconfig.json",
@@ -24,16 +24,16 @@
 		"@rocket.chat/network-broker": "workspace:^",
 		"@rocket.chat/string-helpers": "~0.31.25",
 		"@rocket.chat/tracing": "workspace:^",
-		"@types/node": "~20.16.12",
+		"@types/node": "~20.16.15",
 		"ejson": "^2.2.3",
 		"event-loop-stats": "^1.4.1",
-		"eventemitter3": "^4.0.7",
+		"eventemitter3": "^5.0.1",
 		"gc-stats": "^1.4.1",
 		"mem": "^8.1.1",
-		"moleculer": "^0.14.34",
+		"moleculer": "^0.14.35",
 		"mongodb": "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch",
-		"nats": "^2.4.0",
-		"pino": "^8.15.0",
+		"nats": "^2.28.2",
+		"pino": "^8.21.0",
 		"polka": "^0.5.2"
 	},
 	"devDependencies": {
diff --git a/ee/apps/stream-hub-service/src/StreamHub.ts b/ee/apps/stream-hub-service/src/StreamHub.ts
index a1316200ca5a..4d0fffb57049 100755
--- a/ee/apps/stream-hub-service/src/StreamHub.ts
+++ b/ee/apps/stream-hub-service/src/StreamHub.ts
@@ -10,7 +10,10 @@ export class StreamHub extends ServiceClass implements IServiceClass {
 
 	private logger: Logger;
 
-	constructor(private watcher: DatabaseWatcher, loggerClass: typeof Logger) {
+	constructor(
+		private watcher: DatabaseWatcher,
+		loggerClass: typeof Logger,
+	) {
 		super();
 
 		// eslint-disable-next-line new-cap
diff --git a/ee/apps/stream-hub-service/src/service.ts b/ee/apps/stream-hub-service/src/service.ts
index 84567026733c..07baf5923f01 100755
--- a/ee/apps/stream-hub-service/src/service.ts
+++ b/ee/apps/stream-hub-service/src/service.ts
@@ -4,9 +4,9 @@ import { broker } from '@rocket.chat/network-broker';
 import { startTracing } from '@rocket.chat/tracing';
 import polka from 'polka';
 
+import { StreamHub } from './StreamHub';
 import { registerServiceModels } from '../../../../apps/meteor/ee/server/lib/registerServiceModels';
 import { DatabaseWatcher } from '../../../../apps/meteor/server/database/DatabaseWatcher';
-import { StreamHub } from './StreamHub';
 
 const PORT = process.env.PORT || 3035;
 
diff --git a/ee/packages/license/CHANGELOG.md b/ee/packages/license/CHANGELOG.md
index 414d6283dcec..41df0b012794 100644
--- a/ee/packages/license/CHANGELOG.md
+++ b/ee/packages/license/CHANGELOG.md
@@ -1,5 +1,41 @@
 # @rocket.chat/license
 
+## 1.0.1-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.3
+  </details>
+
+## 1.0.1-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.2
+  </details>
+
+## 1.0.1-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.1
+  </details>
+
+## 1.0.1-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [80e36bfc3938775eb26aa5576f1b9b98896e1cc4, 32d93a0666fa1cbe857d02889e93d9bbf45bd4f0]:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.0
+  </details>
+
 ## 1.0.0
 
 ### Major Changes
diff --git a/ee/packages/license/__tests__/setLicense.spec.ts b/ee/packages/license/__tests__/setLicense.spec.ts
index 41785c756cc0..b2bb5d0e2540 100644
--- a/ee/packages/license/__tests__/setLicense.spec.ts
+++ b/ee/packages/license/__tests__/setLicense.spec.ts
@@ -3,10 +3,10 @@
  */
 
 import { LicenseImp } from '../src';
+import { MockedLicenseBuilder, getReadyLicenseManager } from './MockedLicenseBuilder';
 import { DuplicatedLicenseError } from '../src/errors/DuplicatedLicenseError';
 import { InvalidLicenseError } from '../src/errors/InvalidLicenseError';
 import { NotReadyForValidation } from '../src/errors/NotReadyForValidation';
-import { MockedLicenseBuilder, getReadyLicenseManager } from './MockedLicenseBuilder';
 
 // Same license used on ci tasks so no I didnt leak it
 const VALID_LICENSE =
diff --git a/ee/packages/license/package.json b/ee/packages/license/package.json
index 16cdc5f92786..b6e49aed9f7e 100644
--- a/ee/packages/license/package.json
+++ b/ee/packages/license/package.json
@@ -1,12 +1,12 @@
 {
 	"name": "@rocket.chat/license",
-	"version": "1.0.0",
+	"version": "1.0.1-rc.3",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@types/bcrypt": "^5.0.2",
-		"@types/jest": "~29.5.13",
-		"@types/ws": "^8.5.12",
+		"@types/jest": "~29.5.14",
+		"@types/ws": "^8.5.13",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"jest-websocket-mock": "~2.5.0",
@@ -32,6 +32,6 @@
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/jwt": "workspace:^",
 		"@rocket.chat/logger": "workspace:^",
-		"bcrypt": "^5.0.1"
+		"bcrypt": "^5.1.1"
 	}
 }
diff --git a/ee/packages/license/src/MockedLicenseBuilder.ts b/ee/packages/license/src/MockedLicenseBuilder.ts
index a0ae1a37f9a3..d61c41f30454 100644
--- a/ee/packages/license/src/MockedLicenseBuilder.ts
+++ b/ee/packages/license/src/MockedLicenseBuilder.ts
@@ -1,13 +1,13 @@
-import type { InternalModuleName } from '@rocket.chat/core-typings';
-import {
-	CoreModules,
-	type GrantedModules,
-	type ILicenseTag,
-	type ILicenseV3,
-	type LicenseLimit,
-	type LicenseModule,
-	type LicensePeriod,
-	type Timestamp,
+import { CoreModules } from '@rocket.chat/core-typings';
+import type {
+	InternalModuleName,
+	GrantedModules,
+	ILicenseTag,
+	ILicenseV3,
+	LicenseLimit,
+	LicenseModule,
+	LicensePeriod,
+	Timestamp,
 } from '@rocket.chat/core-typings';
 
 import { encrypt, encryptStatsToken } from './token';
diff --git a/ee/packages/license/src/getLicenseLimit.spec.ts b/ee/packages/license/src/getLicenseLimit.spec.ts
index 84e9590861e8..2879371e5517 100644
--- a/ee/packages/license/src/getLicenseLimit.spec.ts
+++ b/ee/packages/license/src/getLicenseLimit.spec.ts
@@ -1,6 +1,6 @@
 import { LicenseImp } from '.';
-import { MockedLicenseBuilder, getReadyLicenseManager } from '../__tests__/MockedLicenseBuilder';
 import { getAppsConfig } from './deprecated';
+import { MockedLicenseBuilder, getReadyLicenseManager } from '../__tests__/MockedLicenseBuilder';
 
 describe('Marketplace Restrictions', () => {
 	it('should respect the default if there is no license applied', async () => {
diff --git a/ee/packages/license/src/license.ts b/ee/packages/license/src/license.ts
index beb13a63e83d..99433ca1a8e1 100644
--- a/ee/packages/license/src/license.ts
+++ b/ee/packages/license/src/license.ts
@@ -357,10 +357,10 @@ export class LicenseManager extends Emitter<LicenseEvents> {
 								limits: [limit],
 							}),
 							['prevent_action'],
-					  )
+						)
 					: isBehaviorsInResult(await validateDefaultLimits.call(this, { behaviors: ['prevent_action'], limits: [limit] }), [
 							'prevent_action',
-					  ]);
+						]);
 
 				this.shouldPreventActionResults.set(limit as LicenseLimitKind, fresh);
 
@@ -434,7 +434,7 @@ export class LicenseManager extends Emitter<LicenseEvents> {
 						reason: 'limit',
 						limit: action,
 					} as BehaviorWithContext,
-			  ];
+				];
 
 		if (this.consolidateBehaviorState(action, 'prevent_action', shouldPreventAction)) {
 			this.triggerBehaviorEventsToggled(eventsToEmit);
diff --git a/ee/packages/license/src/v2/convertToV3.ts b/ee/packages/license/src/v2/convertToV3.ts
index 539bf10062e3..cf135452ed8c 100644
--- a/ee/packages/license/src/v2/convertToV3.ts
+++ b/ee/packages/license/src/v2/convertToV3.ts
@@ -29,7 +29,7 @@ export const convertToV3 = (v2: ILicenseV2): ILicenseV3 => {
 							name: tag,
 							color: getTagColor(tag),
 						})),
-				  ],
+					],
 		},
 		validation: {
 			serverUrls: [
@@ -65,7 +65,7 @@ export const convertToV3 = (v2: ILicenseV2): ILicenseV3 => {
 								behavior: 'prevent_action',
 							},
 						],
-				  }
+					}
 				: {}),
 			...(v2.maxGuestUsers
 				? {
@@ -75,7 +75,7 @@ export const convertToV3 = (v2: ILicenseV2): ILicenseV3 => {
 								behavior: 'prevent_action',
 							},
 						],
-				  }
+					}
 				: {}),
 			...(v2.maxRoomsPerGuest
 				? {
@@ -85,7 +85,7 @@ export const convertToV3 = (v2: ILicenseV2): ILicenseV3 => {
 								behavior: 'prevent_action',
 							},
 						],
-				  }
+					}
 				: {}),
 			...(v2.apps?.maxPrivateApps
 				? {
@@ -95,7 +95,7 @@ export const convertToV3 = (v2: ILicenseV2): ILicenseV3 => {
 								behavior: 'prevent_action',
 							},
 						],
-				  }
+					}
 				: {}),
 			...(v2.apps?.maxMarketplaceApps
 				? {
@@ -105,7 +105,7 @@ export const convertToV3 = (v2: ILicenseV2): ILicenseV3 => {
 								behavior: 'prevent_action',
 							},
 						],
-				  }
+					}
 				: {}),
 		},
 		cloudMeta: v2.meta,
diff --git a/ee/packages/license/src/validation/runValidation.spec.ts b/ee/packages/license/src/validation/runValidation.spec.ts
index 523090acd63a..73250b6af374 100644
--- a/ee/packages/license/src/validation/runValidation.spec.ts
+++ b/ee/packages/license/src/validation/runValidation.spec.ts
@@ -2,8 +2,8 @@
  * @jest-environment node
  */
 
-import { MockedLicenseBuilder, getReadyLicenseManager } from '../../__tests__/MockedLicenseBuilder';
 import { runValidation } from './runValidation';
+import { MockedLicenseBuilder, getReadyLicenseManager } from '../../__tests__/MockedLicenseBuilder';
 
 describe('Validation behaviors', () => {
 	it('should return a behavior if the license period is invalid', async () => {
diff --git a/ee/packages/license/src/validation/validateLicenseUrl.spec.ts b/ee/packages/license/src/validation/validateLicenseUrl.spec.ts
index 9047876f8fbc..4b305c595902 100644
--- a/ee/packages/license/src/validation/validateLicenseUrl.spec.ts
+++ b/ee/packages/license/src/validation/validateLicenseUrl.spec.ts
@@ -4,8 +4,8 @@
 
 import crypto from 'crypto';
 
-import { MockedLicenseBuilder, getReadyLicenseManager } from '../../__tests__/MockedLicenseBuilder';
 import { validateLicenseUrl } from './validateLicenseUrl';
+import { MockedLicenseBuilder, getReadyLicenseManager } from '../../__tests__/MockedLicenseBuilder';
 
 describe('Url Validation', () => {
 	describe('url method', () => {
diff --git a/ee/packages/network-broker/CHANGELOG.md b/ee/packages/network-broker/CHANGELOG.md
index a58c1e810e7b..aa35a40400ce 100644
--- a/ee/packages/network-broker/CHANGELOG.md
+++ b/ee/packages/network-broker/CHANGELOG.md
@@ -1,5 +1,41 @@
 # @rocket.chat/network-broker
 
+## 0.1.2-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-services@0.7.2-rc.3
+  </details>
+
+## 0.1.2-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-services@0.7.2-rc.2
+  </details>
+
+## 0.1.2-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-services@0.7.2-rc.1
+  </details>
+
+## 0.1.2-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [63ccadc012499e004445ad6bc6cd2ff777aecbd1]:</summary>
+
+  - @rocket.chat/core-services@0.7.2-rc.0
+  </details>
+
 ## 0.1.1
 
 ### Patch Changes
diff --git a/ee/packages/network-broker/package.json b/ee/packages/network-broker/package.json
index a62ba2f80440..593086c6201b 100644
--- a/ee/packages/network-broker/package.json
+++ b/ee/packages/network-broker/package.json
@@ -1,14 +1,14 @@
 {
 	"name": "@rocket.chat/network-broker",
-	"version": "0.1.1",
+	"version": "0.1.2-rc.3",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
-		"@types/chai": "~4.3.19",
+		"@types/chai": "~4.3.20",
 		"@types/ejson": "^2.2.2",
-		"@types/node": "~20.16.12",
+		"@types/node": "~20.16.15",
 		"@types/sinon": "^10.0.20",
-		"chai": "^4.3.10",
+		"chai": "^4.5.0",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"sinon": "^19.0.2",
@@ -33,7 +33,7 @@
 	"dependencies": {
 		"@rocket.chat/core-services": "workspace:^",
 		"ejson": "^2.2.3",
-		"moleculer": "^0.14.34",
-		"pino": "^8.15.0"
+		"moleculer": "^0.14.35",
+		"pino": "^8.21.0"
 	}
 }
diff --git a/ee/packages/network-broker/src/EnterpriseCheck.ts b/ee/packages/network-broker/src/EnterpriseCheck.ts
index ca8cd1e25b10..5f849a4d193b 100644
--- a/ee/packages/network-broker/src/EnterpriseCheck.ts
+++ b/ee/packages/network-broker/src/EnterpriseCheck.ts
@@ -39,25 +39,28 @@ export const EnterpriseCheck: ServiceSchema = {
 		},
 	},
 	async started(): Promise<void> {
-		setInterval(async () => {
-			try {
-				const hasLicense = await this.broker.call('license.hasValidLicense', ['scalability']);
-				if (hasLicense) {
-					checkFails = 0;
-					return;
+		setInterval(
+			async () => {
+				try {
+					const hasLicense = await this.broker.call('license.hasValidLicense', ['scalability']);
+					if (hasLicense) {
+						checkFails = 0;
+						return;
+					}
+				} catch (e: unknown) {
+					// check failed, so continue
 				}
-			} catch (e: unknown) {
-				// check failed, so continue
-			}
 
-			if (++checkFails < maxFails) {
-				return;
-			}
+				if (++checkFails < maxFails) {
+					return;
+				}
 
-			const shouldShutdown = await this.shouldShutdown();
-			if (shouldShutdown) {
-				this.broker.fatal('Enterprise license not found. Shutting down...');
-			}
-		}, (parseInt(LICENSE_CHECK_INTERVAL) || 20) * 1000);
+				const shouldShutdown = await this.shouldShutdown();
+				if (shouldShutdown) {
+					this.broker.fatal('Enterprise license not found. Shutting down...');
+				}
+			},
+			(parseInt(LICENSE_CHECK_INTERVAL) || 20) * 1000,
+		);
 	},
 };
diff --git a/ee/packages/network-broker/src/NetworkBroker.test.ts b/ee/packages/network-broker/src/NetworkBroker.test.ts
index c79fb12e7049..afb9bfc444e3 100644
--- a/ee/packages/network-broker/src/NetworkBroker.test.ts
+++ b/ee/packages/network-broker/src/NetworkBroker.test.ts
@@ -2,8 +2,8 @@ import { ServiceClass } from '@rocket.chat/core-services';
 import { expect } from 'chai';
 import sinon from 'sinon';
 
-import { BrokerMocked } from '../../../../apps/meteor/tests/mocks/server/BrokerMocked';
 import { NetworkBroker } from './NetworkBroker';
+import { BrokerMocked } from '../../../../apps/meteor/tests/mocks/server/BrokerMocked';
 
 class DelayedStopBroker extends BrokerMocked {
 	async destroyService(name: string) {
diff --git a/ee/packages/network-broker/src/NetworkBroker.ts b/ee/packages/network-broker/src/NetworkBroker.ts
index 64b690c3eff6..e6e1cdf3a2e2 100644
--- a/ee/packages/network-broker/src/NetworkBroker.ts
+++ b/ee/packages/network-broker/src/NetworkBroker.ts
@@ -17,12 +17,6 @@ const lifecycle: { [k: string]: string } = {
 	stopped: 'stopped',
 };
 
-const {
-	WAIT_FOR_SERVICES_TIMEOUT = '10000', // 10 seconds
-} = process.env;
-
-const waitForServicesTimeout = parseInt(WAIT_FOR_SERVICES_TIMEOUT, 10) || 10000;
-
 export class NetworkBroker implements IBroker {
 	private broker: ServiceBroker;
 
@@ -61,30 +55,6 @@ export class NetworkBroker implements IBroker {
 		});
 	}
 
-	async waitAndCall(method: string, data: any): Promise<any> {
-		if (!(await this.started)) {
-			return;
-		}
-
-		try {
-			await this.broker.waitForServices(method.split('.')[0], waitForServicesTimeout);
-		} catch (err) {
-			console.error(err);
-			throw new Error('Dependent services not available');
-		}
-
-		const context = asyncLocalStorage.getStore();
-		if (context?.ctx?.call) {
-			return context.ctx.call(method, data);
-		}
-
-		return this.broker.call(method, data, {
-			meta: {
-				optl: injectCurrentContext(),
-			},
-		});
-	}
-
 	async destroyService(instance: IServiceClass): Promise<void> {
 		const name = instance.getName();
 		if (!name) {
@@ -125,10 +95,10 @@ export class NetworkBroker implements IBroker {
 					? (ctx: Context): void => {
 							// internal events params are not an array
 							instance.emit(eventName, ctx.params as Parameters<EventSignatures[typeof eventName]>);
-					  }
+						}
 					: (ctx: Context): void => {
 							instance.emit(eventName, ...(ctx.params as Parameters<EventSignatures[typeof eventName]>));
-					  };
+						};
 				return map;
 			}, {}),
 		};
diff --git a/ee/packages/network-broker/src/index.ts b/ee/packages/network-broker/src/index.ts
index 8dcd99dac07d..4424c084bdaa 100644
--- a/ee/packages/network-broker/src/index.ts
+++ b/ee/packages/network-broker/src/index.ts
@@ -102,7 +102,7 @@ const network = new ServiceBroker({
 										colorize: true,
 									},
 								},
-						  }
+							}
 						: {}),
 				},
 			},
diff --git a/ee/packages/omnichannel-services/CHANGELOG.md b/ee/packages/omnichannel-services/CHANGELOG.md
index e3d8918d9479..c5fda02c03f6 100644
--- a/ee/packages/omnichannel-services/CHANGELOG.md
+++ b/ee/packages/omnichannel-services/CHANGELOG.md
@@ -1,5 +1,61 @@
 # @rocket.chat/omnichannel-services
 
+## 0.3.7-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.3
+  - @rocket.chat/rest-typings@7.1.0-rc.3
+  - @rocket.chat/pdf-worker@0.2.7-rc.3
+  - @rocket.chat/core-services@0.7.2-rc.3
+  - @rocket.chat/model-typings@1.1.0-rc.3
+  - @rocket.chat/models@1.0.1-rc.3
+  </details>
+
+## 0.3.7-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.2
+  - @rocket.chat/rest-typings@7.1.0-rc.2
+  - @rocket.chat/pdf-worker@0.2.7-rc.2
+  - @rocket.chat/core-services@0.7.2-rc.2
+  - @rocket.chat/model-typings@1.1.0-rc.2
+  - @rocket.chat/models@1.0.1-rc.2
+  </details>
+
+## 0.3.7-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.1
+  - @rocket.chat/rest-typings@7.1.0-rc.1
+  - @rocket.chat/pdf-worker@0.2.7-rc.1
+  - @rocket.chat/core-services@0.7.2-rc.1
+  - @rocket.chat/model-typings@1.1.0-rc.1
+  - @rocket.chat/models@1.0.1-rc.1
+  </details>
+
+## 0.3.7-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [80e36bfc3938775eb26aa5576f1b9b98896e1cc4, e7edeac3bdd22da0a04b8e873d5a008e249fb4be, 32d93a0666fa1cbe857d02889e93d9bbf45bd4f0, 63ccadc012499e004445ad6bc6cd2ff777aecbd1]:</summary>
+
+  - @rocket.chat/model-typings@1.1.0-rc.0
+  - @rocket.chat/core-typings@7.1.0-rc.0
+  - @rocket.chat/rest-typings@7.1.0-rc.0
+  - @rocket.chat/core-services@0.7.2-rc.0
+  - @rocket.chat/models@1.0.1-rc.0
+  - @rocket.chat/pdf-worker@0.2.7-rc.0
+  </details>
+
 ## 0.3.6
 
 ### Patch Changes
diff --git a/ee/packages/omnichannel-services/package.json b/ee/packages/omnichannel-services/package.json
index d453af20228e..22eb0253e43b 100644
--- a/ee/packages/omnichannel-services/package.json
+++ b/ee/packages/omnichannel-services/package.json
@@ -1,11 +1,11 @@
 {
 	"name": "@rocket.chat/omnichannel-services",
-	"version": "0.3.6",
+	"version": "0.3.7-rc.3",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@types/jest": "~29.5.13",
+		"@types/jest": "~29.5.14",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"typescript": "~5.6.3"
@@ -21,16 +21,16 @@
 		"@rocket.chat/rest-typings": "workspace:^",
 		"@rocket.chat/string-helpers": "~0.31.25",
 		"@rocket.chat/tools": "workspace:^",
-		"@types/node": "~20.16.12",
-		"date-fns": "^2.28.0",
+		"@types/node": "~20.16.15",
+		"date-fns": "^2.30.0",
 		"ejson": "^2.2.3",
 		"emoji-toolkit": "^7.0.1",
-		"eventemitter3": "^4.0.7",
+		"eventemitter3": "^5.0.1",
 		"mem": "^8.1.1",
 		"moment-timezone": "^0.5.46",
-		"mongo-message-queue": "^1.0.0",
+		"mongo-message-queue": "^1.1.0",
 		"mongodb": "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch",
-		"pino": "^8.15.0"
+		"pino": "^8.21.0"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
diff --git a/ee/packages/omnichannel-services/src/QueueWorker.ts b/ee/packages/omnichannel-services/src/QueueWorker.ts
index 23604c46eca4..5908512404a2 100644
--- a/ee/packages/omnichannel-services/src/QueueWorker.ts
+++ b/ee/packages/omnichannel-services/src/QueueWorker.ts
@@ -19,7 +19,10 @@ export class QueueWorker extends ServiceClass implements IQueueWorkerService {
 
 	private queueStarted = false;
 
-	constructor(private readonly db: Db, loggerClass: typeof Logger) {
+	constructor(
+		private readonly db: Db,
+		loggerClass: typeof Logger,
+	) {
 		super();
 
 		// eslint-disable-next-line new-cap
@@ -76,7 +79,7 @@ export class QueueWorker extends ServiceClass implements IQueueWorkerService {
 		this.logger.info(`Processing queue item ${queueItem._id} for work`);
 		this.logger.info(`Queue item is trying to call ${queueItem.message.to}`);
 		try {
-			await api.waitAndCall(queueItem.message.to, [queueItem.message]);
+			await api.call(queueItem.message.to, [queueItem.message]);
 			this.logger.info(`Queue item ${queueItem._id} completed`);
 			return 'Completed' as const;
 		} catch (err: unknown) {
diff --git a/ee/packages/pdf-worker/.storybook/preview.tsx b/ee/packages/pdf-worker/.storybook/preview.tsx
index 37ea1bcd0119..35e3dfb157b7 100644
--- a/ee/packages/pdf-worker/.storybook/preview.tsx
+++ b/ee/packages/pdf-worker/.storybook/preview.tsx
@@ -15,7 +15,7 @@ export const parameters: Parameters = {
 export const decorators: Decorator[] = [
 	// eslint-disable-next-line @typescript-eslint/naming-convention
 	(Story) => (
-		<div className='rc-old'>
+		<div>
 			<style>{`
 				body {
 					background-color: white;
diff --git a/ee/packages/pdf-worker/CHANGELOG.md b/ee/packages/pdf-worker/CHANGELOG.md
index 07d01643c69a..329418c2c806 100644
--- a/ee/packages/pdf-worker/CHANGELOG.md
+++ b/ee/packages/pdf-worker/CHANGELOG.md
@@ -1,5 +1,41 @@
 # @rocket.chat/pdf-worker
 
+## 0.2.7-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.3
+  </details>
+
+## 0.2.7-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.2
+  </details>
+
+## 0.2.7-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.1
+  </details>
+
+## 0.2.7-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [80e36bfc3938775eb26aa5576f1b9b98896e1cc4, 32d93a0666fa1cbe857d02889e93d9bbf45bd4f0]:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.0
+  </details>
+
 ## 0.2.6
 
 ### Patch Changes
diff --git a/ee/packages/pdf-worker/package.json b/ee/packages/pdf-worker/package.json
index 0d1d7d0f2253..0156178796cd 100644
--- a/ee/packages/pdf-worker/package.json
+++ b/ee/packages/pdf-worker/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/pdf-worker",
-	"version": "0.2.6",
+	"version": "0.2.7-rc.3",
 	"private": true,
 	"main": "./dist/index.js",
 	"typings": "./dist/index.d.ts",
@@ -29,20 +29,20 @@
 	},
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@storybook/addon-essentials": "^8.3.5",
+		"@storybook/addon-essentials": "^8.4.4",
 		"@storybook/addon-webpack5-compiler-babel": "^3.0.3",
-		"@storybook/react": "^8.3.5",
-		"@storybook/react-webpack5": "^8.3.5",
+		"@storybook/react": "^8.4.4",
+		"@storybook/react-webpack5": "^8.4.4",
 		"@testing-library/react": "~16.0.1",
 		"@types/emojione": "^2.2.9",
-		"@types/jest": "~29.5.13",
+		"@types/jest": "~29.5.14",
 		"@types/react": "~17.0.80",
 		"@types/react-dom": "~17.0.25",
 		"buffer": "~6.0.3",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"react-dom": "~18.3.1",
-		"storybook": "^8.3.5",
+		"storybook": "^8.4.4",
 		"typescript": "~5.6.3"
 	},
 	"volta": {
diff --git a/ee/packages/pdf-worker/src/strategies/ChatTranscript.spec.ts b/ee/packages/pdf-worker/src/strategies/ChatTranscript.spec.ts
index 8e425c014ec7..03e132e3dde3 100644
--- a/ee/packages/pdf-worker/src/strategies/ChatTranscript.spec.ts
+++ b/ee/packages/pdf-worker/src/strategies/ChatTranscript.spec.ts
@@ -1,7 +1,7 @@
 import moment from 'moment-timezone';
 
-import { invalidData, validData, newDayData, sameDayData, translationsData } from '../templates/ChatTranscript/ChatTranscript.fixtures';
 import { ChatTranscript } from './ChatTranscript';
+import { invalidData, validData, newDayData, sameDayData, translationsData } from '../templates/ChatTranscript/ChatTranscript.fixtures';
 
 jest.mock('../templates/ChatTranscript', () => {
 	return {
diff --git a/ee/packages/pdf-worker/src/strategies/ChatTranscript.ts b/ee/packages/pdf-worker/src/strategies/ChatTranscript.ts
index e7cb12d0f418..3a6567509615 100644
--- a/ee/packages/pdf-worker/src/strategies/ChatTranscript.ts
+++ b/ee/packages/pdf-worker/src/strategies/ChatTranscript.ts
@@ -22,7 +22,7 @@ export class ChatTranscript implements IStrategy {
 							...quote,
 							ts: moment(quote.ts).tz(timezone).format(timeAndDateFormat),
 						};
-				  })
+					})
 				: undefined;
 
 			if (isDivider) {
diff --git a/ee/packages/pdf-worker/src/templates/ChatTranscript/ChatTranscript.stories.tsx b/ee/packages/pdf-worker/src/templates/ChatTranscript/ChatTranscript.stories.tsx
index 1f26aae08973..99dab0ef2c73 100644
--- a/ee/packages/pdf-worker/src/templates/ChatTranscript/ChatTranscript.stories.tsx
+++ b/ee/packages/pdf-worker/src/templates/ChatTranscript/ChatTranscript.stories.tsx
@@ -3,8 +3,8 @@ import type { Meta, StoryFn } from '@storybook/react';
 
 import type { ChatTranscriptData } from '.';
 import { ChatTranscriptPDF } from '.';
-import { ChatTranscript } from '../../strategies/ChatTranscript';
 import { exampleData } from './ChatTranscript.fixtures';
+import { ChatTranscript } from '../../strategies/ChatTranscript';
 
 Font.register({
 	family: 'Inter',
diff --git a/ee/packages/presence/CHANGELOG.md b/ee/packages/presence/CHANGELOG.md
index 0aa8c214b86c..29b2e44c0469 100644
--- a/ee/packages/presence/CHANGELOG.md
+++ b/ee/packages/presence/CHANGELOG.md
@@ -1,5 +1,49 @@
 # @rocket.chat/presence
 
+## 0.2.10-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.3
+  - @rocket.chat/core-services@0.7.2-rc.3
+  - @rocket.chat/models@1.0.1-rc.3
+  </details>
+
+## 0.2.10-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.2
+  - @rocket.chat/core-services@0.7.2-rc.2
+  - @rocket.chat/models@1.0.1-rc.2
+  </details>
+
+## 0.2.10-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.1
+  - @rocket.chat/core-services@0.7.2-rc.1
+  - @rocket.chat/models@1.0.1-rc.1
+  </details>
+
+## 0.2.10-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [80e36bfc3938775eb26aa5576f1b9b98896e1cc4, 32d93a0666fa1cbe857d02889e93d9bbf45bd4f0, 63ccadc012499e004445ad6bc6cd2ff777aecbd1]:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.0
+  - @rocket.chat/core-services@0.7.2-rc.0
+  - @rocket.chat/models@1.0.1-rc.0
+  </details>
+
 ## 0.2.9
 
 ### Patch Changes
diff --git a/ee/packages/presence/package.json b/ee/packages/presence/package.json
index 4b5d97bdb574..785d897a2ae8 100644
--- a/ee/packages/presence/package.json
+++ b/ee/packages/presence/package.json
@@ -1,16 +1,16 @@
 {
 	"name": "@rocket.chat/presence",
-	"version": "0.2.9",
+	"version": "0.2.10-rc.3",
 	"private": true,
 	"devDependencies": {
-		"@babel/core": "~7.25.8",
-		"@babel/preset-env": "~7.25.8",
-		"@babel/preset-typescript": "~7.25.7",
+		"@babel/core": "~7.26.0",
+		"@babel/preset-env": "~7.26.0",
+		"@babel/preset-typescript": "~7.26.0",
 		"@rocket.chat/apps-engine": "workspace:^",
 		"@rocket.chat/eslint-config": "workspace:^",
 		"@rocket.chat/rest-typings": "workspace:^",
-		"@types/node": "~20.16.12",
-		"babel-jest": "^29.0.3",
+		"@types/node": "~20.16.15",
+		"babel-jest": "^29.7.0",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"typescript": "~5.6.3"
diff --git a/ee/packages/ui-theming/package.json b/ee/packages/ui-theming/package.json
index ca16473ee5e3..5076015e6787 100644
--- a/ee/packages/ui-theming/package.json
+++ b/ee/packages/ui-theming/package.json
@@ -6,14 +6,14 @@
 		"@rocket.chat/css-in-js": "~0.31.25",
 		"@rocket.chat/fuselage": "^0.59.4",
 		"@rocket.chat/fuselage-hooks": "^0.33.1",
-		"@rocket.chat/icons": "~0.38.0",
+		"@rocket.chat/icons": "~0.39.0",
 		"@rocket.chat/ui-contexts": "workspace:~",
 		"@types/react": "~17.0.80",
 		"eslint": "~8.45.0",
 		"eslint-plugin-anti-trojan-source": "~1.1.1",
-		"eslint-plugin-react": "~7.32.2",
-		"eslint-plugin-react-hooks": "~4.6.2",
-		"eslint-plugin-testing-library": "^5.11.1",
+		"eslint-plugin-react": "~7.37.2",
+		"eslint-plugin-react-hooks": "~5.0.0",
+		"eslint-plugin-testing-library": "^6.4.0",
 		"react": "~17.0.2",
 		"react-docgen-typescript-plugin": "~1.0.8",
 		"typescript": "~5.6.3"
diff --git a/package.json b/package.json
index 9e977a9fcf6b..6f714c6ba20d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "rocket.chat",
-	"version": "7.0.0",
+	"version": "7.1.0-rc.3",
 	"description": "Rocket.Chat Monorepo",
 	"main": "index.js",
 	"private": true,
@@ -17,11 +17,11 @@
 		"fossify": "TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\"}' ts-node scripts/fossify.ts"
 	},
 	"devDependencies": {
-		"@changesets/cli": "^2.26.2",
+		"@changesets/cli": "^2.27.9",
 		"@types/chart.js": "^2.9.41",
 		"@types/js-yaml": "^4.0.9",
 		"ts-node": "^10.9.2",
-		"turbo": "^2.1.3"
+		"turbo": "^2.2.3"
 	},
 	"workspaces": [
 		"apps/*",
@@ -42,7 +42,7 @@
 	"homepage": "https://github.com/RocketChat/Rocket.Chat#readme",
 	"engines": {
 		"yarn": "4.5.0",
-		"node": "20.17.0",
+		"node": "20.18.0",
 		"npm": "Use yarn instead"
 	},
 	"packageManager": "yarn@4.5.0",
@@ -54,7 +54,7 @@
 		]
 	},
 	"volta": {
-		"node": "20.17.0",
+		"node": "20.18.0",
 		"yarn": "1.22.18"
 	},
 	"resolutions": {
@@ -68,6 +68,7 @@
 		"mongodb@npm:^4.3.1": "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch"
 	},
 	"dependencies": {
-		"node-gyp": "^9.4.1"
+		"@types/stream-buffers": "^3.0.7",
+		"node-gyp": "^10.2.0"
 	}
 }
diff --git a/packages/agenda/package.json b/packages/agenda/package.json
index 1bcaef3dd5e8..7fdd8f298897 100644
--- a/packages/agenda/package.json
+++ b/packages/agenda/package.json
@@ -6,7 +6,7 @@
 	"dependencies": {
 		"cron": "~1.8.2",
 		"date.js": "~0.3.3",
-		"debug": "~4.1.1",
+		"debug": "~4.3.7",
 		"human-interval": "^2.0.1",
 		"moment-timezone": "~0.5.46",
 		"mongodb": "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch"
diff --git a/packages/api-client/CHANGELOG.md b/packages/api-client/CHANGELOG.md
index be8f3ee581e8..19aa5dcf3999 100644
--- a/packages/api-client/CHANGELOG.md
+++ b/packages/api-client/CHANGELOG.md
@@ -1,5 +1,45 @@
 # @rocket.chat/api-client
 
+## 0.2.10-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.3
+  - @rocket.chat/rest-typings@7.1.0-rc.3
+  </details>
+
+## 0.2.10-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.2
+  - @rocket.chat/rest-typings@7.1.0-rc.2
+  </details>
+
+## 0.2.10-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.1
+  - @rocket.chat/rest-typings@7.1.0-rc.1
+  </details>
+
+## 0.2.10-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [80e36bfc3938775eb26aa5576f1b9b98896e1cc4, e7edeac3bdd22da0a04b8e873d5a008e249fb4be, 32d93a0666fa1cbe857d02889e93d9bbf45bd4f0]:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.0
+  - @rocket.chat/rest-typings@7.1.0-rc.0
+  </details>
+
 ## 0.2.9
 
 ### Patch Changes
diff --git a/packages/api-client/package.json b/packages/api-client/package.json
index ee98a6fff1ce..ce927f338b9c 100644
--- a/packages/api-client/package.json
+++ b/packages/api-client/package.json
@@ -1,9 +1,9 @@
 {
 	"name": "@rocket.chat/api-client",
-	"version": "0.2.9",
+	"version": "0.2.10-rc.3",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@types/jest": "~29.5.13",
+		"@types/jest": "~29.5.14",
 		"@types/strict-uri-encode": "^2.0.2",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
diff --git a/packages/api-client/src/index.ts b/packages/api-client/src/index.ts
index a11e032e91b2..8771176ecff1 100644
--- a/packages/api-client/src/index.ts
+++ b/packages/api-client/src/index.ts
@@ -201,7 +201,7 @@ export class RestClient implements RestClientInterface {
 			? {
 					'X-User-Id': credentials['X-User-Id'],
 					'X-Auth-Token': credentials['X-Auth-Token'],
-			  }
+				}
 			: {};
 	}
 
diff --git a/packages/apps-engine/CHANGELOG.md b/packages/apps-engine/CHANGELOG.md
index 2bc85a1bc7a7..3d661f0a3599 100644
--- a/packages/apps-engine/CHANGELOG.md
+++ b/packages/apps-engine/CHANGELOG.md
@@ -1,25 +1,51 @@
 # @rocket.chat/apps-engine
 
+## 1.48.0-rc.0
+
+### Minor Changes
+
+-   ([#32727](https://github.com/RocketChat/Rocket.Chat/pull/32727)) These changes aims to add:
+    -   A brand-new omnichannel contact profile
+    -   The ability to communicate with known contacts only
+    -   Communicate with verified contacts only
+    -   Merge verified contacts across different channels
+    -   Block contact channels
+    -   Resolve conflicting contact information when registered via different channels
+    -   An advanced contact center filters
+-   ([#33997](https://github.com/RocketChat/Rocket.Chat/pull/33997)) Prevent apps' subprocesses from crashing on unhandled rejections or uncaught exceptions
+
+-   ([#33690](https://github.com/RocketChat/Rocket.Chat/pull/33690)) Add support to configure apps runtime timeout via the APPS_ENGINE_RUNTIME_TIMEOUT environment variable
+
+### Patch Changes
+
+-   ([#33713](https://github.com/RocketChat/Rocket.Chat/pull/33713)) Deprecated the `from` field in the apps email bridge and made it optional, using the server's settings when the field is omitted
+
+-   ([#33786](https://github.com/RocketChat/Rocket.Chat/pull/33786)) Fixed an issue that would grant network permission to app's processes in wrong cases
+
+-   ([#33865](https://github.com/RocketChat/Rocket.Chat/pull/33865)) Fixes an issue that would cause apps to appear disabled after a subprocess restart
+
+-   ([#33690](https://github.com/RocketChat/Rocket.Chat/pull/33690)) Removed the 1 second timeout of `Pre` app events. Now they will follow the "global" configuration
+
 ## 1.47.0
 
 ### Minor Changes
 
-- ([#33433](https://github.com/RocketChat/Rocket.Chat/pull/33433)) Added support for interacting with add-ons issued in the license
+-   ([#33433](https://github.com/RocketChat/Rocket.Chat/pull/33433)) Added support for interacting with add-ons issued in the license
 
 ### Patch Changes
 
-- ([#33494](https://github.com/RocketChat/Rocket.Chat/pull/33494)) Fixed a problem in the deno runtime controller where it would not handle undefined child process references correctly
+-   ([#33494](https://github.com/RocketChat/Rocket.Chat/pull/33494)) Fixed a problem in the deno runtime controller where it would not handle undefined child process references correctly
 
-- ([#33417](https://github.com/RocketChat/Rocket.Chat/pull/33417)) Fixes issue with previously disabled private apps being auto enabled on update
+-   ([#33417](https://github.com/RocketChat/Rocket.Chat/pull/33417)) Fixes issue with previously disabled private apps being auto enabled on update
 
 ## 1.47.0-rc.0
 
 ### Minor Changes
 
-- ([#33433](https://github.com/RocketChat/Rocket.Chat/pull/33433)) Added support for interacting with add-ons issued in the license
+-   ([#33433](https://github.com/RocketChat/Rocket.Chat/pull/33433)) Added support for interacting with add-ons issued in the license
 
 ### Patch Changes
 
-- ([#33494](https://github.com/RocketChat/Rocket.Chat/pull/33494)) Fixed a problem in the deno runtime controller where it would not handle undefined child process references correctly
+-   ([#33494](https://github.com/RocketChat/Rocket.Chat/pull/33494)) Fixed a problem in the deno runtime controller where it would not handle undefined child process references correctly
 
-- ([#33417](https://github.com/RocketChat/Rocket.Chat/pull/33417)) Fixes issue with previously disabled private apps being auto enabled on update
+-   ([#33417](https://github.com/RocketChat/Rocket.Chat/pull/33417)) Fixes issue with previously disabled private apps being auto enabled on update
diff --git a/packages/apps-engine/deno-runtime/error-handlers.ts b/packages/apps-engine/deno-runtime/error-handlers.ts
new file mode 100644
index 000000000000..1e042e0f2c62
--- /dev/null
+++ b/packages/apps-engine/deno-runtime/error-handlers.ts
@@ -0,0 +1,33 @@
+import * as Messenger from './lib/messenger.ts';
+
+export function unhandledRejectionListener(event: PromiseRejectionEvent) {
+    event.preventDefault();
+
+    const { type, reason } = event;
+
+    Messenger.sendNotification({
+        method: 'unhandledRejection',
+        params: [
+            {
+                type,
+                reason: reason instanceof Error ? reason.message : reason,
+                timestamp: new Date(),
+            },
+        ],
+    });
+}
+
+export function unhandledExceptionListener(event: ErrorEvent) {
+    event.preventDefault();
+
+    const { type, message, filename, lineno, colno } = event;
+    Messenger.sendNotification({
+        method: 'uncaughtException',
+        params: [{ type, message, filename, lineno, colno }],
+    });
+}
+
+export default function registerErrorListeners() {
+    addEventListener('unhandledrejection', unhandledRejectionListener);
+    addEventListener('error', unhandledExceptionListener);
+}
diff --git a/packages/apps-engine/deno-runtime/lib/accessors/mod.ts b/packages/apps-engine/deno-runtime/lib/accessors/mod.ts
index e71f014421ab..6cf4e38dbc6d 100644
--- a/packages/apps-engine/deno-runtime/lib/accessors/mod.ts
+++ b/packages/apps-engine/deno-runtime/lib/accessors/mod.ts
@@ -234,6 +234,7 @@ export class AppAccessors {
                 getOAuthAppsReader: () => this.proxify('getReader:getOAuthAppsReader'),
                 getThreadReader: () => this.proxify('getReader:getThreadReader'),
                 getRoleReader: () => this.proxify('getReader:getRoleReader'),
+                getContactReader: () => this.proxify('getReader:getContactReader'),
             };
         }
 
diff --git a/packages/apps-engine/deno-runtime/lib/accessors/modify/ModifyCreator.ts b/packages/apps-engine/deno-runtime/lib/accessors/modify/ModifyCreator.ts
index 06797551a621..00b4640295e5 100644
--- a/packages/apps-engine/deno-runtime/lib/accessors/modify/ModifyCreator.ts
+++ b/packages/apps-engine/deno-runtime/lib/accessors/modify/ModifyCreator.ts
@@ -1,6 +1,7 @@
 import type { IModifyCreator } from '@rocket.chat/apps-engine/definition/accessors/IModifyCreator.ts';
 import type { IUploadCreator } from '@rocket.chat/apps-engine/definition/accessors/IUploadCreator.ts';
 import type { IEmailCreator } from '@rocket.chat/apps-engine/definition/accessors/IEmailCreator.ts';
+import type { IContactCreator } from '@rocket.chat/apps-engine/definition/accessors/IContactCreator.ts';
 import type { ILivechatCreator } from '@rocket.chat/apps-engine/definition/accessors/ILivechatCreator.ts';
 import type { IMessage } from '@rocket.chat/apps-engine/definition/messages/IMessage.ts';
 import type { IRoom } from '@rocket.chat/apps-engine/definition/rooms/IRoom.ts';
@@ -106,6 +107,26 @@ export class ModifyCreator implements IModifyCreator {
         )
     }
 
+    getContactCreator(): IContactCreator {
+        return new Proxy(
+            { __kind: 'getContactCreator' },
+            {
+                get: (_target: unknown, prop: string) => 
+                        (...params: unknown[]) =>
+                            prop === 'toJSON'
+                                ? {}
+                                : this.senderFn({
+                                    method: `accessor:getModifier:getCreator:getContactCreator:${prop}`,
+                                    params
+                                })
+                                    .then((response) => response.result)
+                                    .catch((err) => {
+                                        throw new Error(err.error);
+                                    }),
+            }
+        )
+    }
+
     getBlockBuilder() {
         return new BlockBuilder();
     }
diff --git a/packages/apps-engine/deno-runtime/main.ts b/packages/apps-engine/deno-runtime/main.ts
index 09be5258ecd0..fa2822908954 100644
--- a/packages/apps-engine/deno-runtime/main.ts
+++ b/packages/apps-engine/deno-runtime/main.ts
@@ -21,6 +21,7 @@ import videoConferenceHandler from './handlers/videoconference-handler.ts';
 import apiHandler from './handlers/api-handler.ts';
 import handleApp from './handlers/app/handler.ts';
 import handleScheduler from './handlers/scheduler-handler.ts';
+import registerErrorListeners from './error-handlers.ts';
 
 type Handlers = {
     app: typeof handleApp;
@@ -126,4 +127,6 @@ async function main() {
     }
 }
 
+registerErrorListeners();
+
 main();
diff --git a/packages/apps-engine/package.json b/packages/apps-engine/package.json
index 5a3304b61fd6..3df4727f9caa 100644
--- a/packages/apps-engine/package.json
+++ b/packages/apps-engine/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@rocket.chat/apps-engine",
-    "version": "1.47.0",
+    "version": "1.48.0-rc.0",
     "description": "The engine code for the Rocket.Chat Apps which manages, runs, translates, coordinates and all of that.",
     "main": "index",
     "typings": "index",
@@ -9,7 +9,6 @@
         "testunit": "run-p .:test:node .:test:deno",
         ".:test:node": "NODE_ENV=test ts-node ./tests/runner.ts",
         ".:test:deno": "cd deno-runtime && deno task test",
-        "lint": "run-p .:lint:eslint .:lint:deno",
         ".:lint:eslint": "eslint .",
         ".:lint:deno": "deno lint --ignore=deno-runtime/.deno deno-runtime/",
         "fix-lint": "eslint . --fix",
@@ -69,14 +68,14 @@
     "devDependencies": {
         "@rocket.chat/eslint-config": "workspace:~",
         "@rocket.chat/ui-kit": "workspace:~",
-        "@types/adm-zip": "^0.5.0",
+        "@types/adm-zip": "^0.5.6",
         "@types/debug": "^4.1.12",
-        "@types/lodash.clonedeep": "^4.5.7",
-        "@types/nedb": "^1.8.12",
-        "@types/node": "~20.16.12",
-        "@types/semver": "^5.5.0",
-        "@types/stack-trace": "0.0.29",
-        "@types/uuid": "~8.3.4",
+        "@types/lodash.clonedeep": "^4.5.9",
+        "@types/nedb": "^1.8.16",
+        "@types/node": "~20.16.15",
+        "@types/semver": "^7.5.8",
+        "@types/stack-trace": "0.0.33",
+        "@types/uuid": "~10.0.0",
         "@typescript-eslint/eslint-plugin": "~5.60.1",
         "@typescript-eslint/parser": "~5.60.1",
         "alsatian": "^2.4.0",
@@ -89,20 +88,20 @@
         "tap-bark": "^1.0.0",
         "ts-node": "^6.2.0",
         "typedoc": "~0.24.8",
-        "typescript": "~5.1.6",
+        "typescript": "~5.6.3",
         "uglify-es": "^3.3.10"
     },
     "dependencies": {
         "@msgpack/msgpack": "3.0.0-beta2",
         "adm-zip": "^0.5.16",
         "debug": "^4.3.7",
-        "esbuild": "^0.20.2",
+        "esbuild": "^0.24.0",
         "jose": "^4.15.9",
         "jsonrpc-lite": "^2.2.0",
         "lodash.clonedeep": "^4.5.0",
         "semver": "^7.6.3",
         "stack-trace": "0.0.10",
-        "uuid": "~8.3.2"
+        "uuid": "~11.0.3"
     },
     "nyc": {
         "include": [
diff --git a/packages/apps-engine/src/client/AppClientManager.ts b/packages/apps-engine/src/client/AppClientManager.ts
index 5d409f148f5f..1bd89cfde8a1 100644
--- a/packages/apps-engine/src/client/AppClientManager.ts
+++ b/packages/apps-engine/src/client/AppClientManager.ts
@@ -1,11 +1,14 @@
-import type { IAppInfo } from '../definition/metadata';
 import { AppServerCommunicator } from './AppServerCommunicator';
 import { AppsEngineUIHost } from './AppsEngineUIHost';
+import type { IAppInfo } from '../definition/metadata';
 
 export class AppClientManager {
     private apps: Array<IAppInfo>;
 
-    constructor(private readonly appsEngineUIHost: AppsEngineUIHost, private readonly communicator?: AppServerCommunicator) {
+    constructor(
+        private readonly appsEngineUIHost: AppsEngineUIHost,
+        private readonly communicator?: AppServerCommunicator,
+    ) {
         if (!(appsEngineUIHost instanceof AppsEngineUIHost)) {
             throw new Error('The appClientUIHost must extend appClientUIHost');
         }
diff --git a/packages/apps-engine/src/client/definition/IExternalComponentRoomInfo.ts b/packages/apps-engine/src/client/definition/IExternalComponentRoomInfo.ts
index 32ca449e9650..6f08b425c378 100644
--- a/packages/apps-engine/src/client/definition/IExternalComponentRoomInfo.ts
+++ b/packages/apps-engine/src/client/definition/IExternalComponentRoomInfo.ts
@@ -1,5 +1,5 @@
-import type { IRoom } from '../../definition/rooms';
 import type { IExternalComponentUserInfo } from './IExternalComponentUserInfo';
+import type { IRoom } from '../../definition/rooms';
 
 type ClientRoomInfo = Pick<IRoom, 'id' | 'slugifiedName'>;
 
diff --git a/packages/apps-engine/src/definition/App.ts b/packages/apps-engine/src/definition/App.ts
index 0044f35134b6..dd93ba984b74 100644
--- a/packages/apps-engine/src/definition/App.ts
+++ b/packages/apps-engine/src/definition/App.ts
@@ -28,7 +28,11 @@ export abstract class App implements IApp {
      * Also, please use the `initialize()` method to do items instead of the constructor as the constructor
      * *might* be called more than once but the `initialize()` will only be called once.
      */
-    public constructor(private readonly info: IAppInfo, private readonly logger: ILogger, private readonly accessors?: IAppAccessors) {
+    public constructor(
+        private readonly info: IAppInfo,
+        private readonly logger: ILogger,
+        private readonly accessors?: IAppAccessors,
+    ) {
         this.logger.debug(
             `Constructed the App ${this.info.name} (${this.info.id})`,
             `v${this.info.version} which depends on the API v${this.info.requiredApiVersion}!`,
diff --git a/packages/apps-engine/src/definition/accessors/IContactCreator.ts b/packages/apps-engine/src/definition/accessors/IContactCreator.ts
new file mode 100644
index 000000000000..d2d13c4d6bf1
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IContactCreator.ts
@@ -0,0 +1,7 @@
+import type { ILivechatContact } from '../livechat';
+
+export interface IContactCreator {
+    verifyContact(verifyContactChannelParams: { contactId: string; field: string; value: string; visitorId: string; roomId: string }): Promise<void>;
+
+    addContactEmail(contactId: ILivechatContact['_id'], email: string): Promise<ILivechatContact>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/IContactRead.ts b/packages/apps-engine/src/definition/accessors/IContactRead.ts
new file mode 100644
index 000000000000..efc0c2c49d66
--- /dev/null
+++ b/packages/apps-engine/src/definition/accessors/IContactRead.ts
@@ -0,0 +1,5 @@
+import type { ILivechatContact } from '../livechat';
+
+export interface IContactRead {
+    getById(contactId: ILivechatContact['_id']): Promise<ILivechatContact | null>;
+}
diff --git a/packages/apps-engine/src/definition/accessors/ILogger.ts b/packages/apps-engine/src/definition/accessors/ILogger.ts
index eac6e531802d..227cb617fa77 100644
--- a/packages/apps-engine/src/definition/accessors/ILogger.ts
+++ b/packages/apps-engine/src/definition/accessors/ILogger.ts
@@ -1,5 +1,5 @@
-import type { AppMethod } from '../metadata/AppMethod';
 import type { ILogEntry } from './ILogEntry';
+import type { AppMethod } from '../metadata/AppMethod';
 
 /**
  * This logger provides a way to log various levels to the entire system.
diff --git a/packages/apps-engine/src/definition/accessors/IModifyCreator.ts b/packages/apps-engine/src/definition/accessors/IModifyCreator.ts
index 6c2acd50493c..27033b2cf354 100644
--- a/packages/apps-engine/src/definition/accessors/IModifyCreator.ts
+++ b/packages/apps-engine/src/definition/accessors/IModifyCreator.ts
@@ -4,6 +4,7 @@ import type { IRoom } from '../rooms';
 import type { BlockBuilder } from '../uikit';
 import type { IBotUser } from '../users/IBotUser';
 import type { AppVideoConference } from '../videoConferences';
+import type { IContactCreator } from './IContactCreator';
 import type { IDiscussionBuilder } from './IDiscussionBuilder';
 import type { IEmailCreator } from './IEmailCreator';
 import type { ILivechatCreator } from './ILivechatCreator';
@@ -31,6 +32,11 @@ export interface IModifyCreator {
      */
     getEmailCreator(): IEmailCreator;
 
+    /**
+     * Gets the creator object responsible for contact related operations.
+     */
+    getContactCreator(): IContactCreator;
+
     /**
      * @deprecated please prefer the rocket.chat/ui-kit components
      *
diff --git a/packages/apps-engine/src/definition/accessors/IRead.ts b/packages/apps-engine/src/definition/accessors/IRead.ts
index 17f66d6218dc..2f5c55baf258 100644
--- a/packages/apps-engine/src/definition/accessors/IRead.ts
+++ b/packages/apps-engine/src/definition/accessors/IRead.ts
@@ -1,4 +1,5 @@
 import type { ICloudWorkspaceRead } from './ICloudWorkspaceRead';
+import type { IContactRead } from './IContactRead';
 import type { IEnvironmentRead } from './IEnvironmentRead';
 import type { ILivechatRead } from './ILivechatRead';
 import type { IMessageRead } from './IMessageRead';
@@ -49,4 +50,5 @@ export interface IRead {
     getOAuthAppsReader(): IOAuthAppsReader;
 
     getRoleReader(): IRoleRead;
+    getContactReader(): IContactRead;
 }
diff --git a/packages/apps-engine/src/definition/email/IEmail.ts b/packages/apps-engine/src/definition/email/IEmail.ts
index ca81b23e5bcc..27acdc085971 100644
--- a/packages/apps-engine/src/definition/email/IEmail.ts
+++ b/packages/apps-engine/src/definition/email/IEmail.ts
@@ -1,6 +1,9 @@
 export interface IEmail {
     to: string | string[];
-    from: string;
+    /**
+     * @deprecated this will be inferred from the settings
+     */
+    from?: string;
     replyTo?: string;
     subject: string;
     html?: string;
diff --git a/packages/apps-engine/src/definition/livechat/ILivechatContact.ts b/packages/apps-engine/src/definition/livechat/ILivechatContact.ts
new file mode 100644
index 000000000000..20577ac97fea
--- /dev/null
+++ b/packages/apps-engine/src/definition/livechat/ILivechatContact.ts
@@ -0,0 +1,50 @@
+import type { IOmnichannelSource, OmnichannelSourceType } from './ILivechatRoom';
+import type { IVisitorEmail } from './IVisitorEmail';
+import type { IVisitorPhone } from './IVisitorPhone';
+
+export interface ILivechatContactVisitorAssociation {
+    visitorId: string;
+    source: {
+        type: OmnichannelSourceType;
+        id?: IOmnichannelSource['id'];
+    };
+}
+
+export interface ILivechatContactChannel {
+    name: string;
+    verified: boolean;
+    visitor: ILivechatContactVisitorAssociation;
+    blocked: boolean;
+    field?: string;
+    value?: string;
+    verifiedAt?: Date;
+    details: IOmnichannelSource;
+    lastChat?: {
+        _id: string;
+        ts: Date;
+    };
+}
+
+export interface ILivechatContactConflictingField {
+    field: 'name' | 'manager' | `customFields.${string}`;
+    value: string;
+}
+
+export interface ILivechatContact {
+    _id: string;
+    _updatedAt: Date;
+    name: string;
+    phones?: IVisitorPhone[];
+    emails?: IVisitorEmail[];
+    contactManager?: string;
+    unknown?: boolean;
+    conflictingFields?: ILivechatContactConflictingField[];
+    customFields?: Record<string, string | unknown>;
+    channels: ILivechatContactChannel[];
+    createdAt: Date;
+    lastChat?: {
+        _id: string;
+        ts: Date;
+    };
+    importIds?: string[];
+}
diff --git a/packages/apps-engine/src/definition/livechat/ILivechatMessage.ts b/packages/apps-engine/src/definition/livechat/ILivechatMessage.ts
index d7cc5497d70e..af5a4423eb96 100644
--- a/packages/apps-engine/src/definition/livechat/ILivechatMessage.ts
+++ b/packages/apps-engine/src/definition/livechat/ILivechatMessage.ts
@@ -1,5 +1,5 @@
-import type { IMessage } from '../messages/IMessage';
 import type { IVisitor } from './IVisitor';
+import type { IMessage } from '../messages/IMessage';
 
 export interface ILivechatMessage extends IMessage {
     visitor?: IVisitor;
diff --git a/packages/apps-engine/src/definition/livechat/ILivechatRoom.ts b/packages/apps-engine/src/definition/livechat/ILivechatRoom.ts
index bebbcb54f054..d4b2be7d0cfb 100644
--- a/packages/apps-engine/src/definition/livechat/ILivechatRoom.ts
+++ b/packages/apps-engine/src/definition/livechat/ILivechatRoom.ts
@@ -2,6 +2,7 @@ import { RoomType } from '../rooms';
 import type { IRoom } from '../rooms/IRoom';
 import type { IUser } from '../users';
 import type { IDepartment } from './IDepartment';
+import type { ILivechatContact } from './ILivechatContact';
 import type { IVisitor } from './IVisitor';
 
 export enum OmnichannelSourceType {
@@ -9,22 +10,43 @@ export enum OmnichannelSourceType {
     EMAIL = 'email',
     SMS = 'sms',
     APP = 'app',
+    API = 'api',
     OTHER = 'other',
 }
 
+export interface IOmnichannelSource {
+    type: OmnichannelSourceType;
+    // An optional identification of external sources, such as an App
+    id?: string;
+    // A human readable alias that goes with the ID, for post analytical purposes
+    alias?: string;
+    // A label to be shown in the room info
+    label?: string;
+    // The sidebar icon
+    sidebarIcon?: string;
+    // The default sidebar icon
+    defaultIcon?: string;
+    // The destination of the message (e.g widget host, email address, whatsapp number, etc)
+    destination?: string;
+}
+
 interface IOmnichannelSourceApp {
     type: 'app';
-    id: string;
+    // An optional identification of external sources, such as an App
+    id?: string;
     // A human readable alias that goes with the ID, for post analytical purposes
     alias?: string;
     // A label to be shown in the room info
     label?: string;
+    // The sidebar icon
     sidebarIcon?: string;
+    // The default sidebar icon
     defaultIcon?: string;
     // The destination of the message (e.g widget host, email address, whatsapp number, etc)
     destination?: string;
 }
-type OmnichannelSource =
+
+export type OmnichannelSource =
     | {
           type: Exclude<OmnichannelSourceType, 'app'>;
       }
@@ -47,6 +69,7 @@ export interface ILivechatRoom extends IRoom {
     isOpen: boolean;
     closedAt?: Date;
     source?: OmnichannelSource;
+    contact?: ILivechatContact;
 }
 
 export const isLivechatRoom = (room: IRoom): room is ILivechatRoom => {
diff --git a/packages/apps-engine/src/definition/livechat/index.ts b/packages/apps-engine/src/definition/livechat/index.ts
index 5ea8d9f42885..7cc5a3d1c004 100644
--- a/packages/apps-engine/src/definition/livechat/index.ts
+++ b/packages/apps-engine/src/definition/livechat/index.ts
@@ -1,4 +1,5 @@
 import { IDepartment } from './IDepartment';
+import { ILivechatContact } from './ILivechatContact';
 import { ILivechatEventContext } from './ILivechatEventContext';
 import { ILivechatMessage } from './ILivechatMessage';
 import { ILivechatRoom } from './ILivechatRoom';
@@ -21,6 +22,7 @@ export {
     ILivechatMessage,
     ILivechatRoom,
     IPostLivechatAgentAssigned,
+    ILivechatContact,
     IPostLivechatAgentUnassigned,
     IPostLivechatGuestSaved,
     IPostLivechatRoomStarted,
diff --git a/packages/apps-engine/src/definition/metadata/AppMethod.ts b/packages/apps-engine/src/definition/metadata/AppMethod.ts
index 71a6d0e914cc..b7fcf306f6aa 100644
--- a/packages/apps-engine/src/definition/metadata/AppMethod.ts
+++ b/packages/apps-engine/src/definition/metadata/AppMethod.ts
@@ -99,4 +99,8 @@ export enum AppMethod {
     EXECUTE_POST_USER_LOGGED_IN = 'executePostUserLoggedIn',
     EXECUTE_POST_USER_LOGGED_OUT = 'executePostUserLoggedOut',
     EXECUTE_POST_USER_STATUS_CHANGED = 'executePostUserStatusChanged',
+    // Runtime specific methods
+    RUNTIME_RESTART = 'runtime:restart',
+    RUNTIME_UNCAUGHT_EXCEPTION = 'runtime:uncaughtException',
+    RUNTIME_UNHANDLED_REJECTION = 'runtime:unhandledRejection',
 }
diff --git a/packages/apps-engine/src/definition/metadata/IAppInfo.ts b/packages/apps-engine/src/definition/metadata/IAppInfo.ts
index 6cb7515ea6d4..ffa2d8ffc47b 100644
--- a/packages/apps-engine/src/definition/metadata/IAppInfo.ts
+++ b/packages/apps-engine/src/definition/metadata/IAppInfo.ts
@@ -1,6 +1,6 @@
-import type { IPermission } from '../permissions/IPermission';
 import type { AppInterface } from './AppInterface';
 import type { IAppAuthorInfo } from './IAppAuthorInfo';
+import type { IPermission } from '../permissions/IPermission';
 
 export interface IAppInfo {
     id: string;
diff --git a/packages/apps-engine/src/definition/metadata/RocketChatAssociations.ts b/packages/apps-engine/src/definition/metadata/RocketChatAssociations.ts
index 7568488546b6..5191882cf3ae 100644
--- a/packages/apps-engine/src/definition/metadata/RocketChatAssociations.ts
+++ b/packages/apps-engine/src/definition/metadata/RocketChatAssociations.ts
@@ -10,7 +10,10 @@ export enum RocketChatAssociationModel {
 }
 
 export class RocketChatAssociationRecord {
-    constructor(private model: RocketChatAssociationModel, private id: string) {}
+    constructor(
+        private model: RocketChatAssociationModel,
+        private id: string,
+    ) {}
 
     public getModel() {
         return this.model;
diff --git a/packages/apps-engine/src/definition/slashcommands/SlashCommandContext.ts b/packages/apps-engine/src/definition/slashcommands/SlashCommandContext.ts
index c5d96e613f4d..106b87cc7405 100644
--- a/packages/apps-engine/src/definition/slashcommands/SlashCommandContext.ts
+++ b/packages/apps-engine/src/definition/slashcommands/SlashCommandContext.ts
@@ -6,7 +6,13 @@ import type { IUser } from '../users';
  * executes a slash command.
  */
 export class SlashCommandContext {
-    constructor(private sender: IUser, private room: IRoom, private params: Array<string>, private threadId?: string, private triggerId?: string) {}
+    constructor(
+        private sender: IUser,
+        private room: IRoom,
+        private params: Array<string>,
+        private threadId?: string,
+        private triggerId?: string,
+    ) {}
 
     /** The user who sent the command. */
     public getSender(): IUser {
diff --git a/packages/apps-engine/src/definition/uikit/UIKitInteractionPayloadFormatter.ts b/packages/apps-engine/src/definition/uikit/UIKitInteractionPayloadFormatter.ts
index 983228f70250..b836b8024695 100644
--- a/packages/apps-engine/src/definition/uikit/UIKitInteractionPayloadFormatter.ts
+++ b/packages/apps-engine/src/definition/uikit/UIKitInteractionPayloadFormatter.ts
@@ -1,11 +1,11 @@
 import { v1 as uuid } from 'uuid';
 
-import type { IUIKitErrorInteractionParam } from '../accessors/IUIController';
 import type { IUIKitContextualBarInteraction, IUIKitErrorInteraction, IUIKitInteraction, IUIKitModalInteraction } from './IUIKitInteractionType';
 import { UIKitInteractionType } from './IUIKitInteractionType';
 import type { IUIKitSurface } from './IUIKitSurface';
 import { UIKitSurfaceType } from './IUIKitSurface';
 import type { IUIKitContextualBarViewParam, IUIKitModalViewParam } from './UIKitInteractionResponder';
+import type { IUIKitErrorInteractionParam } from '../accessors/IUIController';
 
 function isModalInteraction(type: IUIKitInteraction['type']): type is IUIKitModalInteraction['type'] {
     return [UIKitInteractionType.MODAL_OPEN, UIKitInteractionType.MODAL_UPDATE, UIKitInteractionType.MODAL_CLOSE].includes(type);
diff --git a/packages/apps-engine/src/definition/uikit/UIKitInteractionResponder.ts b/packages/apps-engine/src/definition/uikit/UIKitInteractionResponder.ts
index dca9782dbd47..2e0e6c4961d7 100644
--- a/packages/apps-engine/src/definition/uikit/UIKitInteractionResponder.ts
+++ b/packages/apps-engine/src/definition/uikit/UIKitInteractionResponder.ts
@@ -1,10 +1,10 @@
-import type { Omit } from '../../lib/utils';
-import type { IUIKitErrorInteractionParam } from '../accessors/IUIController';
 import type { IUIKitContextualBarResponse, IUIKitErrorResponse, IUIKitModalResponse, IUIKitResponse } from './IUIKitInteractionType';
 import { UIKitInteractionType } from './IUIKitInteractionType';
 import type { IUIKitSurface } from './IUIKitSurface';
 import type { IUIKitBaseIncomingInteraction } from './UIKitIncomingInteractionTypes';
 import { formatContextualBarInteraction, formatModalInteraction } from './UIKitInteractionPayloadFormatter';
+import type { Omit } from '../../lib/utils';
+import type { IUIKitErrorInteractionParam } from '../accessors/IUIController';
 
 export type IUIKitModalViewParam = Omit<IUIKitSurface, 'appId' | 'id' | 'type'> & Partial<Pick<IUIKitSurface, 'id'>>;
 export type IUIKitContextualBarViewParam = Omit<IUIKitSurface, 'appId' | 'id' | 'type'> & Partial<Pick<IUIKitSurface, 'id'>>;
diff --git a/packages/apps-engine/src/definition/uikit/blocks/BlockBuilder.ts b/packages/apps-engine/src/definition/uikit/blocks/BlockBuilder.ts
index 4bee521518de..61520a7820b7 100644
--- a/packages/apps-engine/src/definition/uikit/blocks/BlockBuilder.ts
+++ b/packages/apps-engine/src/definition/uikit/blocks/BlockBuilder.ts
@@ -1,6 +1,5 @@
 import { v1 as uuid } from 'uuid';
 
-import type { Omit } from '../../../lib/utils';
 import type { IActionsBlock, IBlock, IConditionalBlock, IConditionalBlockFilters, IContextBlock, IImageBlock, IInputBlock, ISectionBlock } from './Blocks';
 import { BlockType } from './Blocks';
 import type {
@@ -18,6 +17,7 @@ import type {
 import { BlockElementType } from './Elements';
 import type { ITextObject } from './Objects';
 import { TextObjectType } from './Objects';
+import type { Omit } from '../../../lib/utils';
 
 type BlockFunctionParameter<T extends IBlock> = Omit<T, 'type'>;
 type ElementFunctionParameter<T extends IBlockElement> = T extends IInteractiveElement
diff --git a/packages/apps-engine/src/definition/videoConfProviders/IVideoConfProvider.ts b/packages/apps-engine/src/definition/videoConfProviders/IVideoConfProvider.ts
index 00ca57de8966..c3f66d51c149 100644
--- a/packages/apps-engine/src/definition/videoConfProviders/IVideoConfProvider.ts
+++ b/packages/apps-engine/src/definition/videoConfProviders/IVideoConfProvider.ts
@@ -1,9 +1,9 @@
 import type { IHttp, IModify, IPersistence, IRead } from '../accessors';
 import type { IBlock } from '../uikit';
-import type { VideoConference } from '../videoConferences/IVideoConference';
-import type { IVideoConferenceUser } from '../videoConferences/IVideoConferenceUser';
 import type { IVideoConferenceOptions } from './IVideoConferenceOptions';
 import type { VideoConfData, VideoConfDataExtended } from './VideoConfData';
+import type { VideoConference } from '../videoConferences/IVideoConference';
+import type { IVideoConferenceUser } from '../videoConferences/IVideoConferenceUser';
 
 /**
  * Represents a video conference provider
diff --git a/packages/apps-engine/src/server/AppManager.ts b/packages/apps-engine/src/server/AppManager.ts
index aac30d865015..95eaa645cc4b 100644
--- a/packages/apps-engine/src/server/AppManager.ts
+++ b/packages/apps-engine/src/server/AppManager.ts
@@ -1,15 +1,15 @@
 import { Buffer } from 'buffer';
 
+import type { IGetAppsFilter } from './IGetAppsFilter';
+import { ProxiedApp } from './ProxiedApp';
+import type { PersistenceBridge, UserBridge } from './bridges';
+import { AppBridges } from './bridges';
 import { AppStatus, AppStatusUtils } from '../definition/AppStatus';
 import type { IAppInfo } from '../definition/metadata';
 import { AppMethod } from '../definition/metadata';
 import type { IPermission } from '../definition/permissions/IPermission';
 import type { IUser } from '../definition/users';
 import { UserType } from '../definition/users';
-import type { IGetAppsFilter } from './IGetAppsFilter';
-import { ProxiedApp } from './ProxiedApp';
-import type { PersistenceBridge, UserBridge } from './bridges';
-import { AppBridges } from './bridges';
 import type { IInternalPersistenceBridge } from './bridges/IInternalPersistenceBridge';
 import type { IInternalUserBridge } from './bridges/IInternalUserBridge';
 import { AppCompiler, AppFabricationFulfillment, AppPackageParser } from './compiler';
diff --git a/packages/apps-engine/src/server/ProxiedApp.ts b/packages/apps-engine/src/server/ProxiedApp.ts
index e2605c8375de..4307f9c9fc93 100644
--- a/packages/apps-engine/src/server/ProxiedApp.ts
+++ b/packages/apps-engine/src/server/ProxiedApp.ts
@@ -1,8 +1,8 @@
+import type { AppManager } from './AppManager';
 import type { AppStatus } from '../definition/AppStatus';
 import { AppsEngineException } from '../definition/exceptions';
 import type { IAppAuthorInfo, IAppInfo } from '../definition/metadata';
 import { AppMethod } from '../definition/metadata';
-import type { AppManager } from './AppManager';
 import { InvalidInstallationError } from './errors/InvalidInstallationError';
 import { AppConsole } from './logging';
 import { AppLicenseValidationResult } from './marketplace/license';
@@ -15,7 +15,11 @@ export class ProxiedApp {
 
     private latestLicenseValidationResult: AppLicenseValidationResult;
 
-    constructor(private readonly manager: AppManager, private storageItem: IAppStorageItem, private readonly appRuntime: DenoRuntimeSubprocessController) {
+    constructor(
+        private readonly manager: AppManager,
+        private storageItem: IAppStorageItem,
+        private readonly appRuntime: DenoRuntimeSubprocessController,
+    ) {
         this.previousStatus = storageItem.status;
     }
 
@@ -53,11 +57,6 @@ export class ProxiedApp {
     public async call(method: `${AppMethod}`, ...args: Array<any>): Promise<any> {
         let options;
 
-        // Pre events need to be fast as they block the user
-        if (method.startsWith('checkPre') || method.startsWith('executePre')) {
-            options = { timeout: 1000 };
-        }
-
         try {
             return await this.appRuntime.sendRequest({ method: `app:${method}`, params: args }, options);
         } catch (e) {
diff --git a/packages/apps-engine/src/server/accessors/ApiExtend.ts b/packages/apps-engine/src/server/accessors/ApiExtend.ts
index 4c8951338a90..001fc36d8028 100644
--- a/packages/apps-engine/src/server/accessors/ApiExtend.ts
+++ b/packages/apps-engine/src/server/accessors/ApiExtend.ts
@@ -3,7 +3,10 @@ import type { IApi } from '../../definition/api';
 import type { AppApiManager } from '../managers/AppApiManager';
 
 export class ApiExtend implements IApiExtend {
-    constructor(private readonly manager: AppApiManager, private readonly appId: string) {}
+    constructor(
+        private readonly manager: AppApiManager,
+        private readonly appId: string,
+    ) {}
 
     public provideApi(api: IApi): Promise<void> {
         return Promise.resolve(this.manager.addApi(this.appId, api));
diff --git a/packages/apps-engine/src/server/accessors/AppAccessors.ts b/packages/apps-engine/src/server/accessors/AppAccessors.ts
index 911087df4332..31f5dad3ef02 100644
--- a/packages/apps-engine/src/server/accessors/AppAccessors.ts
+++ b/packages/apps-engine/src/server/accessors/AppAccessors.ts
@@ -9,7 +9,10 @@ export class AppAccessors implements IAppAccessors {
 
     private apiManager: AppApiManager;
 
-    constructor(manager: AppManager, private readonly appId: string) {
+    constructor(
+        manager: AppManager,
+        private readonly appId: string,
+    ) {
         this.accessorManager = manager.getAccessorManager();
         this.apiManager = manager.getApiManager();
     }
diff --git a/packages/apps-engine/src/server/accessors/CloudWorkspaceRead.ts b/packages/apps-engine/src/server/accessors/CloudWorkspaceRead.ts
index fc0e7ba1b8ad..881113f2c09e 100644
--- a/packages/apps-engine/src/server/accessors/CloudWorkspaceRead.ts
+++ b/packages/apps-engine/src/server/accessors/CloudWorkspaceRead.ts
@@ -3,7 +3,10 @@ import type { IWorkspaceToken } from '../../definition/cloud/IWorkspaceToken';
 import type { CloudWorkspaceBridge } from '../bridges/CloudWorkspaceBridge';
 
 export class CloudWorkspaceRead implements ICloudWorkspaceRead {
-    constructor(private readonly cloudBridge: CloudWorkspaceBridge, private readonly appId: string) {}
+    constructor(
+        private readonly cloudBridge: CloudWorkspaceBridge,
+        private readonly appId: string,
+    ) {}
 
     public async getWorkspaceToken(scope: string): Promise<IWorkspaceToken> {
         return this.cloudBridge.doGetWorkspaceToken(scope, this.appId);
diff --git a/packages/apps-engine/src/server/accessors/ContactCreator.ts b/packages/apps-engine/src/server/accessors/ContactCreator.ts
new file mode 100644
index 000000000000..01f3bb39b31f
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/ContactCreator.ts
@@ -0,0 +1,18 @@
+import type { IContactCreator } from '../../definition/accessors/IContactCreator';
+import type { ILivechatContact } from '../../definition/livechat';
+import type { AppBridges } from '../bridges';
+
+export class ContactCreator implements IContactCreator {
+    constructor(
+        private readonly bridges: AppBridges,
+        private readonly appId: string,
+    ) {}
+
+    verifyContact(verifyContactChannelParams: { contactId: string; field: string; value: string; visitorId: string; roomId: string }): Promise<void> {
+        return this.bridges.getContactBridge().doVerifyContact(verifyContactChannelParams, this.appId);
+    }
+
+    addContactEmail(contactId: ILivechatContact['_id'], email: string): Promise<ILivechatContact> {
+        return this.bridges.getContactBridge().doAddContactEmail(contactId, email, this.appId);
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/ContactRead.ts b/packages/apps-engine/src/server/accessors/ContactRead.ts
new file mode 100644
index 000000000000..32faa076c8c8
--- /dev/null
+++ b/packages/apps-engine/src/server/accessors/ContactRead.ts
@@ -0,0 +1,14 @@
+import type { IContactRead } from '../../definition/accessors/IContactRead';
+import type { ILivechatContact } from '../../definition/livechat';
+import type { AppBridges } from '../bridges';
+
+export class ContactRead implements IContactRead {
+    constructor(
+        private readonly bridges: AppBridges,
+        private readonly appId: string,
+    ) {}
+
+    public getById(contactId: ILivechatContact['_id']): Promise<ILivechatContact | undefined> {
+        return this.bridges.getContactBridge().doGetById(contactId, this.appId);
+    }
+}
diff --git a/packages/apps-engine/src/server/accessors/DiscussionBuilder.ts b/packages/apps-engine/src/server/accessors/DiscussionBuilder.ts
index fa616ce3ca19..2be31580020c 100644
--- a/packages/apps-engine/src/server/accessors/DiscussionBuilder.ts
+++ b/packages/apps-engine/src/server/accessors/DiscussionBuilder.ts
@@ -1,9 +1,9 @@
+import { RoomBuilder } from './RoomBuilder';
 import type { IDiscussionBuilder } from '../../definition/accessors';
 import type { IMessage } from '../../definition/messages';
 import { RocketChatAssociationModel } from '../../definition/metadata';
 import { RoomType } from '../../definition/rooms';
 import type { IRoom } from '../../definition/rooms/IRoom';
-import { RoomBuilder } from './RoomBuilder';
 
 export class DiscussionBuilder extends RoomBuilder implements IDiscussionBuilder {
     public kind: RocketChatAssociationModel.DISCUSSION;
diff --git a/packages/apps-engine/src/server/accessors/EmailCreator.ts b/packages/apps-engine/src/server/accessors/EmailCreator.ts
index 6d481db605e1..c7926a08df70 100644
--- a/packages/apps-engine/src/server/accessors/EmailCreator.ts
+++ b/packages/apps-engine/src/server/accessors/EmailCreator.ts
@@ -3,7 +3,10 @@ import type { IEmail } from '../../definition/email';
 import type { AppBridges } from '../bridges';
 
 export class EmailCreator implements IEmailCreator {
-    constructor(private readonly bridges: AppBridges, private readonly appId: string) {}
+    constructor(
+        private readonly bridges: AppBridges,
+        private readonly appId: string,
+    ) {}
 
     public async send(email: IEmail): Promise<void> {
         return this.bridges.getEmailBridge().doSendEmail(email, this.appId);
diff --git a/packages/apps-engine/src/server/accessors/EnvironmentWrite.ts b/packages/apps-engine/src/server/accessors/EnvironmentWrite.ts
index 6b6a833b36a6..05cdf1b8f4b7 100644
--- a/packages/apps-engine/src/server/accessors/EnvironmentWrite.ts
+++ b/packages/apps-engine/src/server/accessors/EnvironmentWrite.ts
@@ -1,7 +1,10 @@
 import type { IEnvironmentWrite, IServerSettingUpdater, ISettingUpdater } from '../../definition/accessors';
 
 export class EnvironmentWrite implements IEnvironmentWrite {
-    constructor(private readonly settings: ISettingUpdater, private readonly serverSettings: IServerSettingUpdater) {}
+    constructor(
+        private readonly settings: ISettingUpdater,
+        private readonly serverSettings: IServerSettingUpdater,
+    ) {}
 
     public getSettings(): ISettingUpdater {
         return this.settings;
diff --git a/packages/apps-engine/src/server/accessors/EnvironmentalVariableRead.ts b/packages/apps-engine/src/server/accessors/EnvironmentalVariableRead.ts
index 2b8b917b7290..40800c942f10 100644
--- a/packages/apps-engine/src/server/accessors/EnvironmentalVariableRead.ts
+++ b/packages/apps-engine/src/server/accessors/EnvironmentalVariableRead.ts
@@ -2,7 +2,10 @@ import type { IEnvironmentalVariableRead } from '../../definition/accessors';
 import type { EnvironmentalVariableBridge } from '../bridges';
 
 export class EnvironmentalVariableRead implements IEnvironmentalVariableRead {
-    constructor(private readonly bridge: EnvironmentalVariableBridge, private readonly appId: string) {}
+    constructor(
+        private readonly bridge: EnvironmentalVariableBridge,
+        private readonly appId: string,
+    ) {}
 
     public getValueByName(envVarName: string): Promise<string> {
         return this.bridge.doGetValueByName(envVarName, this.appId);
diff --git a/packages/apps-engine/src/server/accessors/ExternalComponentsExtend.ts b/packages/apps-engine/src/server/accessors/ExternalComponentsExtend.ts
index 29fba0b9353f..ddb3fb1b922a 100644
--- a/packages/apps-engine/src/server/accessors/ExternalComponentsExtend.ts
+++ b/packages/apps-engine/src/server/accessors/ExternalComponentsExtend.ts
@@ -3,7 +3,10 @@ import type { IExternalComponent } from '../../definition/externalComponent/IExt
 import type { AppExternalComponentManager } from '../managers/AppExternalComponentManager';
 
 export class ExternalComponentsExtend implements IExternalComponentsExtend {
-    constructor(private readonly manager: AppExternalComponentManager, private readonly appId: string) {}
+    constructor(
+        private readonly manager: AppExternalComponentManager,
+        private readonly appId: string,
+    ) {}
 
     public async register(externalComponent: IExternalComponent): Promise<void> {
         return Promise.resolve(this.manager.addExternalComponent(this.appId, externalComponent));
diff --git a/packages/apps-engine/src/server/accessors/LivechatCreator.ts b/packages/apps-engine/src/server/accessors/LivechatCreator.ts
index 8cd527159662..0462230b97b0 100644
--- a/packages/apps-engine/src/server/accessors/LivechatCreator.ts
+++ b/packages/apps-engine/src/server/accessors/LivechatCreator.ts
@@ -6,7 +6,10 @@ import type { IUser } from '../../definition/users';
 import type { AppBridges } from '../bridges';
 
 export class LivechatCreator implements ILivechatCreator {
-    constructor(private readonly bridges: AppBridges, private readonly appId: string) {}
+    constructor(
+        private readonly bridges: AppBridges,
+        private readonly appId: string,
+    ) {}
 
     public createRoom(visitor: IVisitor, agent: IUser, extraParams?: IExtraRoomParams): Promise<ILivechatRoom> {
         return this.bridges.getLivechatBridge().doCreateRoom(visitor, agent, this.appId, extraParams);
diff --git a/packages/apps-engine/src/server/accessors/LivechatMessageBuilder.ts b/packages/apps-engine/src/server/accessors/LivechatMessageBuilder.ts
index a271da344baa..f42e7222c3ba 100644
--- a/packages/apps-engine/src/server/accessors/LivechatMessageBuilder.ts
+++ b/packages/apps-engine/src/server/accessors/LivechatMessageBuilder.ts
@@ -1,3 +1,4 @@
+import { MessageBuilder } from './MessageBuilder';
 import type { ILivechatMessageBuilder, IMessageBuilder } from '../../definition/accessors';
 import type { ILivechatMessage } from '../../definition/livechat/ILivechatMessage';
 import type { IVisitor } from '../../definition/livechat/IVisitor';
@@ -6,7 +7,6 @@ import { RocketChatAssociationModel } from '../../definition/metadata';
 import type { IRoom } from '../../definition/rooms';
 import { RoomType } from '../../definition/rooms';
 import type { IUser } from '../../definition/users';
-import { MessageBuilder } from './MessageBuilder';
 
 export class LivechatMessageBuilder implements ILivechatMessageBuilder {
     public kind: RocketChatAssociationModel.LIVECHAT_MESSAGE;
diff --git a/packages/apps-engine/src/server/accessors/LivechatRead.ts b/packages/apps-engine/src/server/accessors/LivechatRead.ts
index 3d9421ff9e4c..04374b1c271a 100644
--- a/packages/apps-engine/src/server/accessors/LivechatRead.ts
+++ b/packages/apps-engine/src/server/accessors/LivechatRead.ts
@@ -6,7 +6,10 @@ import type { IMessage } from '../../definition/messages';
 import type { LivechatBridge } from '../bridges/LivechatBridge';
 
 export class LivechatRead implements ILivechatRead {
-    constructor(private readonly livechatBridge: LivechatBridge, private readonly appId: string) {}
+    constructor(
+        private readonly livechatBridge: LivechatBridge,
+        private readonly appId: string,
+    ) {}
 
     /**
      * @deprecated please use the `isOnlineAsync` method instead.
diff --git a/packages/apps-engine/src/server/accessors/LivechatUpdater.ts b/packages/apps-engine/src/server/accessors/LivechatUpdater.ts
index 684bdb2903e1..2d6786ba5158 100644
--- a/packages/apps-engine/src/server/accessors/LivechatUpdater.ts
+++ b/packages/apps-engine/src/server/accessors/LivechatUpdater.ts
@@ -4,7 +4,10 @@ import type { IUser } from '../../definition/users';
 import type { AppBridges } from '../bridges';
 
 export class LivechatUpdater implements ILivechatUpdater {
-    constructor(private readonly bridges: AppBridges, private readonly appId: string) {}
+    constructor(
+        private readonly bridges: AppBridges,
+        private readonly appId: string,
+    ) {}
 
     public transferVisitor(visitor: IVisitor, transferData: ILivechatTransferData): Promise<boolean> {
         return this.bridges.getLivechatBridge().doTransferVisitor(visitor, transferData, this.appId);
diff --git a/packages/apps-engine/src/server/accessors/MessageRead.ts b/packages/apps-engine/src/server/accessors/MessageRead.ts
index 90db6a2ba509..03c4a952ce7f 100644
--- a/packages/apps-engine/src/server/accessors/MessageRead.ts
+++ b/packages/apps-engine/src/server/accessors/MessageRead.ts
@@ -5,7 +5,10 @@ import type { IUser } from '../../definition/users';
 import type { MessageBridge } from '../bridges/MessageBridge';
 
 export class MessageRead implements IMessageRead {
-    constructor(private messageBridge: MessageBridge, private appId: string) {}
+    constructor(
+        private messageBridge: MessageBridge,
+        private appId: string,
+    ) {}
 
     public getById(id: string): Promise<IMessage> {
         return this.messageBridge.doGetById(id, this.appId);
diff --git a/packages/apps-engine/src/server/accessors/ModerationModify.ts b/packages/apps-engine/src/server/accessors/ModerationModify.ts
index 0fb97fdedb61..7e29895dbf90 100644
--- a/packages/apps-engine/src/server/accessors/ModerationModify.ts
+++ b/packages/apps-engine/src/server/accessors/ModerationModify.ts
@@ -4,7 +4,10 @@ import type { IUser } from '../../definition/users';
 import type { ModerationBridge } from '../bridges';
 
 export class ModerationModify implements IModerationModify {
-    constructor(private moderationBridge: ModerationBridge, appId: string) {}
+    constructor(
+        private moderationBridge: ModerationBridge,
+        appId: string,
+    ) {}
 
     public report(messageId: string, description: string, userId: string, appId: string): Promise<void> {
         return this.moderationBridge.doReport(messageId, description, userId, appId);
diff --git a/packages/apps-engine/src/server/accessors/Modify.ts b/packages/apps-engine/src/server/accessors/Modify.ts
index 7abd4bc1cd33..025057ede70b 100644
--- a/packages/apps-engine/src/server/accessors/Modify.ts
+++ b/packages/apps-engine/src/server/accessors/Modify.ts
@@ -39,7 +39,10 @@ export class Modify implements IModify {
 
     private moderation: ModerationModify;
 
-    constructor(private readonly bridges: AppBridges, private readonly appId: string) {
+    constructor(
+        private readonly bridges: AppBridges,
+        private readonly appId: string,
+    ) {
         this.creator = new ModifyCreator(this.bridges, this.appId);
         this.deleter = new ModifyDeleter(this.bridges, this.appId);
         this.updater = new ModifyUpdater(this.bridges, this.appId);
diff --git a/packages/apps-engine/src/server/accessors/ModifyCreator.ts b/packages/apps-engine/src/server/accessors/ModifyCreator.ts
index ec829ae98788..f389cb8bbcf6 100644
--- a/packages/apps-engine/src/server/accessors/ModifyCreator.ts
+++ b/packages/apps-engine/src/server/accessors/ModifyCreator.ts
@@ -1,3 +1,13 @@
+import { ContactCreator } from './ContactCreator';
+import { DiscussionBuilder } from './DiscussionBuilder';
+import { EmailCreator } from './EmailCreator';
+import { LivechatCreator } from './LivechatCreator';
+import { LivechatMessageBuilder } from './LivechatMessageBuilder';
+import { MessageBuilder } from './MessageBuilder';
+import { RoomBuilder } from './RoomBuilder';
+import { UploadCreator } from './UploadCreator';
+import { UserBuilder } from './UserBuilder';
+import { VideoConferenceBuilder } from './VideoConferenceBuilder';
 import type {
     IDiscussionBuilder,
     ILivechatCreator,
@@ -9,6 +19,7 @@ import type {
     IUserBuilder,
     IVideoConferenceBuilder,
 } from '../../definition/accessors';
+import type { IContactCreator } from '../../definition/accessors/IContactCreator';
 import type { IEmailCreator } from '../../definition/accessors/IEmailCreator';
 import type { ILivechatMessage } from '../../definition/livechat/ILivechatMessage';
 import type { IMessage } from '../../definition/messages';
@@ -21,15 +32,6 @@ import { UserType } from '../../definition/users/UserType';
 import type { AppVideoConference } from '../../definition/videoConferences';
 import type { AppBridges } from '../bridges';
 import { UIHelper } from '../misc/UIHelper';
-import { DiscussionBuilder } from './DiscussionBuilder';
-import { EmailCreator } from './EmailCreator';
-import { LivechatCreator } from './LivechatCreator';
-import { LivechatMessageBuilder } from './LivechatMessageBuilder';
-import { MessageBuilder } from './MessageBuilder';
-import { RoomBuilder } from './RoomBuilder';
-import { UploadCreator } from './UploadCreator';
-import { UserBuilder } from './UserBuilder';
-import { VideoConferenceBuilder } from './VideoConferenceBuilder';
 
 export class ModifyCreator implements IModifyCreator {
     private livechatCreator: LivechatCreator;
@@ -38,10 +40,16 @@ export class ModifyCreator implements IModifyCreator {
 
     private emailCreator: EmailCreator;
 
-    constructor(private readonly bridges: AppBridges, private readonly appId: string) {
+    private contactCreator: ContactCreator;
+
+    constructor(
+        private readonly bridges: AppBridges,
+        private readonly appId: string,
+    ) {
         this.livechatCreator = new LivechatCreator(bridges, appId);
         this.uploadCreator = new UploadCreator(bridges, appId);
         this.emailCreator = new EmailCreator(bridges, appId);
+        this.contactCreator = new ContactCreator(bridges, appId);
     }
 
     public getLivechatCreator(): ILivechatCreator {
@@ -56,6 +64,10 @@ export class ModifyCreator implements IModifyCreator {
         return this.emailCreator;
     }
 
+    public getContactCreator(): IContactCreator {
+        return this.contactCreator;
+    }
+
     /**
      * @deprecated please prefer the rocket.chat/ui-kit components
      */
diff --git a/packages/apps-engine/src/server/accessors/ModifyDeleter.ts b/packages/apps-engine/src/server/accessors/ModifyDeleter.ts
index 34a17654b2e0..fae6dd206866 100644
--- a/packages/apps-engine/src/server/accessors/ModifyDeleter.ts
+++ b/packages/apps-engine/src/server/accessors/ModifyDeleter.ts
@@ -4,7 +4,10 @@ import type { IUser, UserType } from '../../definition/users';
 import type { AppBridges } from '../bridges';
 
 export class ModifyDeleter implements IModifyDeleter {
-    constructor(private readonly bridges: AppBridges, private readonly appId: string) {}
+    constructor(
+        private readonly bridges: AppBridges,
+        private readonly appId: string,
+    ) {}
 
     public async deleteRoom(roomId: string): Promise<void> {
         return this.bridges.getRoomBridge().doDelete(roomId, this.appId);
diff --git a/packages/apps-engine/src/server/accessors/ModifyExtender.ts b/packages/apps-engine/src/server/accessors/ModifyExtender.ts
index ecf65f2e5571..d5bf4ef51f03 100644
--- a/packages/apps-engine/src/server/accessors/ModifyExtender.ts
+++ b/packages/apps-engine/src/server/accessors/ModifyExtender.ts
@@ -1,13 +1,16 @@
+import { MessageExtender } from './MessageExtender';
+import { RoomExtender } from './RoomExtender';
+import { VideoConferenceExtender } from './VideoConferenceExtend';
 import type { IMessageExtender, IModifyExtender, IRoomExtender, IVideoConferenceExtender } from '../../definition/accessors';
 import { RocketChatAssociationModel } from '../../definition/metadata';
 import type { IUser } from '../../definition/users';
 import type { AppBridges } from '../bridges/AppBridges';
-import { MessageExtender } from './MessageExtender';
-import { RoomExtender } from './RoomExtender';
-import { VideoConferenceExtender } from './VideoConferenceExtend';
 
 export class ModifyExtender implements IModifyExtender {
-    constructor(private readonly bridges: AppBridges, private readonly appId: string) {}
+    constructor(
+        private readonly bridges: AppBridges,
+        private readonly appId: string,
+    ) {}
 
     public async extendMessage(messageId: string, updater: IUser): Promise<IMessageExtender> {
         const msg = await this.bridges.getMessageBridge().doGetById(messageId, this.appId);
diff --git a/packages/apps-engine/src/server/accessors/ModifyUpdater.ts b/packages/apps-engine/src/server/accessors/ModifyUpdater.ts
index 0ae175b01734..2f8cc43c1902 100644
--- a/packages/apps-engine/src/server/accessors/ModifyUpdater.ts
+++ b/packages/apps-engine/src/server/accessors/ModifyUpdater.ts
@@ -1,3 +1,7 @@
+import { LivechatUpdater } from './LivechatUpdater';
+import { MessageBuilder } from './MessageBuilder';
+import { RoomBuilder } from './RoomBuilder';
+import { UserUpdater } from './UserUpdater';
 import type { ILivechatUpdater, IMessageBuilder, IMessageUpdater, IModifyUpdater, IRoomBuilder } from '../../definition/accessors';
 import type { IUserUpdater } from '../../definition/accessors/IUserUpdater';
 import { RocketChatAssociationModel } from '../../definition/metadata';
@@ -5,10 +9,6 @@ import { RoomType } from '../../definition/rooms';
 import type { IUser } from '../../definition/users';
 import type { AppBridges } from '../bridges';
 import { UIHelper } from '../misc/UIHelper';
-import { LivechatUpdater } from './LivechatUpdater';
-import { MessageBuilder } from './MessageBuilder';
-import { RoomBuilder } from './RoomBuilder';
-import { UserUpdater } from './UserUpdater';
 
 export class ModifyUpdater implements IModifyUpdater {
     private livechatUpdater: ILivechatUpdater;
@@ -17,7 +17,10 @@ export class ModifyUpdater implements IModifyUpdater {
 
     private messageUpdater: IMessageUpdater;
 
-    constructor(private readonly bridges: AppBridges, private readonly appId: string) {
+    constructor(
+        private readonly bridges: AppBridges,
+        private readonly appId: string,
+    ) {
         this.livechatUpdater = new LivechatUpdater(this.bridges, this.appId);
         this.userUpdater = new UserUpdater(this.bridges, this.appId);
     }
diff --git a/packages/apps-engine/src/server/accessors/Notifier.ts b/packages/apps-engine/src/server/accessors/Notifier.ts
index 8e81cc2e9f2e..f8aa947404f7 100644
--- a/packages/apps-engine/src/server/accessors/Notifier.ts
+++ b/packages/apps-engine/src/server/accessors/Notifier.ts
@@ -8,7 +8,11 @@ import type { MessageBridge, UserBridge } from '../bridges';
 import { MessageBuilder } from './MessageBuilder';
 
 export class Notifier implements INotifier {
-    constructor(private readonly userBridge: UserBridge, private readonly msgBridge: MessageBridge, private readonly appId: string) {}
+    constructor(
+        private readonly userBridge: UserBridge,
+        private readonly msgBridge: MessageBridge,
+        private readonly appId: string,
+    ) {}
 
     public async notifyUser(user: IUser, message: IMessage): Promise<void> {
         if (!message.sender || !message.sender.id) {
diff --git a/packages/apps-engine/src/server/accessors/OAuthAppsModify.ts b/packages/apps-engine/src/server/accessors/OAuthAppsModify.ts
index 71ad047ef66f..ca289b5cc9f5 100644
--- a/packages/apps-engine/src/server/accessors/OAuthAppsModify.ts
+++ b/packages/apps-engine/src/server/accessors/OAuthAppsModify.ts
@@ -3,7 +3,10 @@ import type { IOAuthAppsModify } from '../../definition/accessors/IOAuthAppsModi
 import type { OAuthAppsBridge } from '../bridges/OAuthAppsBridge';
 
 export class OAuthAppsModify implements IOAuthAppsModify {
-    constructor(private readonly oauthAppsBridge: OAuthAppsBridge, private readonly appId: string) {}
+    constructor(
+        private readonly oauthAppsBridge: OAuthAppsBridge,
+        private readonly appId: string,
+    ) {}
 
     public async createOAuthApp(oAuthApp: IOAuthAppParams): Promise<string> {
         return this.oauthAppsBridge.doCreate(oAuthApp, this.appId);
diff --git a/packages/apps-engine/src/server/accessors/OAuthAppsReader.ts b/packages/apps-engine/src/server/accessors/OAuthAppsReader.ts
index 2075875d2f06..8afc00ff580a 100644
--- a/packages/apps-engine/src/server/accessors/OAuthAppsReader.ts
+++ b/packages/apps-engine/src/server/accessors/OAuthAppsReader.ts
@@ -3,7 +3,10 @@ import type { IOAuthAppsReader } from '../../definition/accessors/IOAuthAppsRead
 import type { OAuthAppsBridge } from '../bridges/OAuthAppsBridge';
 
 export class OAuthAppsReader implements IOAuthAppsReader {
-    constructor(private readonly oauthAppsBridge: OAuthAppsBridge, private readonly appId: string) {}
+    constructor(
+        private readonly oauthAppsBridge: OAuthAppsBridge,
+        private readonly appId: string,
+    ) {}
 
     public async getOAuthAppById(id: string): Promise<IOAuthApp> {
         return this.oauthAppsBridge.doGetByid(id, this.appId);
diff --git a/packages/apps-engine/src/server/accessors/Persistence.ts b/packages/apps-engine/src/server/accessors/Persistence.ts
index 8dc98fa225dd..1e349c70e3fc 100644
--- a/packages/apps-engine/src/server/accessors/Persistence.ts
+++ b/packages/apps-engine/src/server/accessors/Persistence.ts
@@ -3,7 +3,10 @@ import type { RocketChatAssociationRecord } from '../../definition/metadata';
 import type { PersistenceBridge } from '../bridges/PersistenceBridge';
 
 export class Persistence implements IPersistence {
-    constructor(private persistBridge: PersistenceBridge, private appId: string) {}
+    constructor(
+        private persistBridge: PersistenceBridge,
+        private appId: string,
+    ) {}
 
     public create(data: object): Promise<string> {
         return this.persistBridge.doCreate(data, this.appId);
diff --git a/packages/apps-engine/src/server/accessors/PersistenceRead.ts b/packages/apps-engine/src/server/accessors/PersistenceRead.ts
index bd0549d177ad..326a7970b9d5 100644
--- a/packages/apps-engine/src/server/accessors/PersistenceRead.ts
+++ b/packages/apps-engine/src/server/accessors/PersistenceRead.ts
@@ -3,7 +3,10 @@ import type { RocketChatAssociationRecord } from '../../definition/metadata';
 import type { PersistenceBridge } from '../bridges';
 
 export class PersistenceRead implements IPersistenceRead {
-    constructor(private persistBridge: PersistenceBridge, private appId: string) {}
+    constructor(
+        private persistBridge: PersistenceBridge,
+        private appId: string,
+    ) {}
 
     public read(id: string): Promise<object> {
         return this.persistBridge.doReadById(id, this.appId);
diff --git a/packages/apps-engine/src/server/accessors/Reader.ts b/packages/apps-engine/src/server/accessors/Reader.ts
index 735bf4aa8991..266cca924d7e 100644
--- a/packages/apps-engine/src/server/accessors/Reader.ts
+++ b/packages/apps-engine/src/server/accessors/Reader.ts
@@ -11,6 +11,7 @@ import type {
     IUserRead,
     IVideoConferenceRead,
 } from '../../definition/accessors';
+import type { IContactRead } from '../../definition/accessors/IContactRead';
 import type { IOAuthAppsReader } from '../../definition/accessors/IOAuthAppsReader';
 import type { IRoleRead } from '../../definition/accessors/IRoleRead';
 import type { IThreadRead } from '../../definition/accessors/IThreadRead';
@@ -27,6 +28,7 @@ export class Reader implements IRead {
         private upload: IUploadRead,
         private cloud: ICloudWorkspaceRead,
         private videoConf: IVideoConferenceRead,
+        private contactRead: IContactRead,
 
         private oauthApps: IOAuthAppsReader,
         private thread: IThreadRead,
@@ -84,4 +86,8 @@ export class Reader implements IRead {
     public getRoleReader(): IRoleRead {
         return this.role;
     }
+
+    public getContactReader(): IContactRead {
+        return this.contactRead;
+    }
 }
diff --git a/packages/apps-engine/src/server/accessors/RoleRead.ts b/packages/apps-engine/src/server/accessors/RoleRead.ts
index 62272edb75e2..0c36d99cc73c 100644
--- a/packages/apps-engine/src/server/accessors/RoleRead.ts
+++ b/packages/apps-engine/src/server/accessors/RoleRead.ts
@@ -3,7 +3,10 @@ import type { IRole } from '../../definition/roles';
 import type { RoleBridge } from '../bridges';
 
 export class RoleRead implements IRoleRead {
-    constructor(private roleBridge: RoleBridge, private appId: string) {}
+    constructor(
+        private roleBridge: RoleBridge,
+        private appId: string,
+    ) {}
 
     public getOneByIdOrName(idOrName: IRole['id'] | IRole['name']): Promise<IRole | null> {
         return this.roleBridge.doGetOneByIdOrName(idOrName, this.appId);
diff --git a/packages/apps-engine/src/server/accessors/RoomRead.ts b/packages/apps-engine/src/server/accessors/RoomRead.ts
index 5b7d58ef67e1..7577daa9e851 100644
--- a/packages/apps-engine/src/server/accessors/RoomRead.ts
+++ b/packages/apps-engine/src/server/accessors/RoomRead.ts
@@ -6,7 +6,10 @@ import type { RoomBridge } from '../bridges';
 import { type GetMessagesOptions, GetMessagesSortableFields } from '../bridges/RoomBridge';
 
 export class RoomRead implements IRoomRead {
-    constructor(private roomBridge: RoomBridge, private appId: string) {}
+    constructor(
+        private roomBridge: RoomBridge,
+        private appId: string,
+    ) {}
 
     public getById(id: string): Promise<IRoom> {
         return this.roomBridge.doGetById(id, this.appId);
diff --git a/packages/apps-engine/src/server/accessors/SchedulerExtend.ts b/packages/apps-engine/src/server/accessors/SchedulerExtend.ts
index c6ea866b70b6..8d33f9eeaca2 100644
--- a/packages/apps-engine/src/server/accessors/SchedulerExtend.ts
+++ b/packages/apps-engine/src/server/accessors/SchedulerExtend.ts
@@ -3,7 +3,10 @@ import type { IProcessor } from '../../definition/scheduler';
 import type { AppSchedulerManager } from '../managers/AppSchedulerManager';
 
 export class SchedulerExtend implements ISchedulerExtend {
-    constructor(private readonly manager: AppSchedulerManager, private readonly appId: string) {}
+    constructor(
+        private readonly manager: AppSchedulerManager,
+        private readonly appId: string,
+    ) {}
 
     public async registerProcessors(processors: Array<IProcessor> = []): Promise<void | Array<string>> {
         return this.manager.registerProcessors(processors, this.appId);
diff --git a/packages/apps-engine/src/server/accessors/SchedulerModify.ts b/packages/apps-engine/src/server/accessors/SchedulerModify.ts
index bfbb92e7ffae..9ce4b2c587b2 100644
--- a/packages/apps-engine/src/server/accessors/SchedulerModify.ts
+++ b/packages/apps-engine/src/server/accessors/SchedulerModify.ts
@@ -7,7 +7,10 @@ function createProcessorId(jobId: string, appId: string): string {
 }
 
 export class SchedulerModify implements ISchedulerModify {
-    constructor(private readonly bridge: SchedulerBridge, private readonly appId: string) {}
+    constructor(
+        private readonly bridge: SchedulerBridge,
+        private readonly appId: string,
+    ) {}
 
     public async scheduleOnce(job: IOnetimeSchedule): Promise<void | string> {
         return this.bridge.doScheduleOnce({ ...job, id: createProcessorId(job.id, this.appId) }, this.appId);
diff --git a/packages/apps-engine/src/server/accessors/ServerSettingRead.ts b/packages/apps-engine/src/server/accessors/ServerSettingRead.ts
index 5660ac1b1560..3675411af7e3 100644
--- a/packages/apps-engine/src/server/accessors/ServerSettingRead.ts
+++ b/packages/apps-engine/src/server/accessors/ServerSettingRead.ts
@@ -3,7 +3,10 @@ import type { ISetting } from '../../definition/settings';
 import type { ServerSettingBridge } from '../bridges/ServerSettingBridge';
 
 export class ServerSettingRead implements IServerSettingRead {
-    constructor(private readonly settingBridge: ServerSettingBridge, private readonly appId: string) {}
+    constructor(
+        private readonly settingBridge: ServerSettingBridge,
+        private readonly appId: string,
+    ) {}
 
     public getOneById(id: string): Promise<ISetting> {
         return this.settingBridge.doGetOneById(id, this.appId);
diff --git a/packages/apps-engine/src/server/accessors/ServerSettingUpdater.ts b/packages/apps-engine/src/server/accessors/ServerSettingUpdater.ts
index d4022ac643b4..5b8f41d471b3 100644
--- a/packages/apps-engine/src/server/accessors/ServerSettingUpdater.ts
+++ b/packages/apps-engine/src/server/accessors/ServerSettingUpdater.ts
@@ -3,7 +3,10 @@ import type { ISetting } from '../../definition/settings';
 import type { AppBridges } from '../bridges';
 
 export class ServerSettingUpdater implements IServerSettingUpdater {
-    constructor(private readonly bridges: AppBridges, private readonly appId: string) {}
+    constructor(
+        private readonly bridges: AppBridges,
+        private readonly appId: string,
+    ) {}
 
     public async updateOne(setting: ISetting): Promise<void> {
         await this.bridges.getServerSettingBridge().doUpdateOne(setting, this.appId);
diff --git a/packages/apps-engine/src/server/accessors/ServerSettingsModify.ts b/packages/apps-engine/src/server/accessors/ServerSettingsModify.ts
index 3ca999e59f84..e79b946eda0b 100644
--- a/packages/apps-engine/src/server/accessors/ServerSettingsModify.ts
+++ b/packages/apps-engine/src/server/accessors/ServerSettingsModify.ts
@@ -3,7 +3,10 @@ import type { ISetting } from '../../definition/settings';
 import type { ServerSettingBridge } from '../bridges/ServerSettingBridge';
 
 export class ServerSettingsModify implements IServerSettingsModify {
-    constructor(private readonly bridge: ServerSettingBridge, private readonly appId: string) {}
+    constructor(
+        private readonly bridge: ServerSettingBridge,
+        private readonly appId: string,
+    ) {}
 
     public async hideGroup(name: string): Promise<void> {
         await this.bridge.doHideGroup(name, this.appId);
diff --git a/packages/apps-engine/src/server/accessors/SettingUpdater.ts b/packages/apps-engine/src/server/accessors/SettingUpdater.ts
index a4310d9ef6ee..879c1282ee58 100644
--- a/packages/apps-engine/src/server/accessors/SettingUpdater.ts
+++ b/packages/apps-engine/src/server/accessors/SettingUpdater.ts
@@ -4,7 +4,10 @@ import type { ProxiedApp } from '../ProxiedApp';
 import type { AppSettingsManager } from '../managers';
 
 export class SettingUpdater implements ISettingUpdater {
-    constructor(private readonly app: ProxiedApp, private readonly manager: AppSettingsManager) {}
+    constructor(
+        private readonly app: ProxiedApp,
+        private readonly manager: AppSettingsManager,
+    ) {}
 
     public async updateValue(id: ISetting['id'], value: ISetting['value']) {
         if (!this.app.getStorageItem().settings[id]) {
diff --git a/packages/apps-engine/src/server/accessors/SlashCommandsExtend.ts b/packages/apps-engine/src/server/accessors/SlashCommandsExtend.ts
index 4653571443b5..227acb45c74e 100644
--- a/packages/apps-engine/src/server/accessors/SlashCommandsExtend.ts
+++ b/packages/apps-engine/src/server/accessors/SlashCommandsExtend.ts
@@ -3,7 +3,10 @@ import type { ISlashCommand } from '../../definition/slashcommands';
 import type { AppSlashCommandManager } from '../managers/AppSlashCommandManager';
 
 export class SlashCommandsExtend implements ISlashCommandsExtend {
-    constructor(private readonly manager: AppSlashCommandManager, private readonly appId: string) {}
+    constructor(
+        private readonly manager: AppSlashCommandManager,
+        private readonly appId: string,
+    ) {}
 
     public provideSlashCommand(slashCommand: ISlashCommand): Promise<void> {
         return Promise.resolve(this.manager.addCommand(this.appId, slashCommand));
diff --git a/packages/apps-engine/src/server/accessors/SlashCommandsModify.ts b/packages/apps-engine/src/server/accessors/SlashCommandsModify.ts
index 690157db6de7..3c042b4cf344 100644
--- a/packages/apps-engine/src/server/accessors/SlashCommandsModify.ts
+++ b/packages/apps-engine/src/server/accessors/SlashCommandsModify.ts
@@ -3,7 +3,10 @@ import type { ISlashCommand } from '../../definition/slashcommands';
 import type { AppSlashCommandManager } from '../managers';
 
 export class SlashCommandsModify implements ISlashCommandsModify {
-    constructor(private readonly manager: AppSlashCommandManager, private readonly appId: string) {}
+    constructor(
+        private readonly manager: AppSlashCommandManager,
+        private readonly appId: string,
+    ) {}
 
     public modifySlashCommand(slashCommand: ISlashCommand): Promise<void> {
         return Promise.resolve(this.manager.modifyCommand(this.appId, slashCommand));
diff --git a/packages/apps-engine/src/server/accessors/ThreadRead.ts b/packages/apps-engine/src/server/accessors/ThreadRead.ts
index 45cdf9225d01..7a9f9572d024 100644
--- a/packages/apps-engine/src/server/accessors/ThreadRead.ts
+++ b/packages/apps-engine/src/server/accessors/ThreadRead.ts
@@ -3,7 +3,10 @@ import type { IMessage } from '../../definition/messages';
 import type { ThreadBridge } from '../bridges/ThreadBridge';
 
 export class ThreadRead implements IThreadRead {
-    constructor(private threadBridge: ThreadBridge, private appId: string) {}
+    constructor(
+        private threadBridge: ThreadBridge,
+        private appId: string,
+    ) {}
 
     public getThreadById(id: string): Promise<Array<IMessage>> {
         return this.threadBridge.doGetById(id, this.appId);
diff --git a/packages/apps-engine/src/server/accessors/UIController.ts b/packages/apps-engine/src/server/accessors/UIController.ts
index 3fb33f8da318..9a76a6914351 100644
--- a/packages/apps-engine/src/server/accessors/UIController.ts
+++ b/packages/apps-engine/src/server/accessors/UIController.ts
@@ -10,7 +10,10 @@ import { UIHelper } from '../misc/UIHelper';
 export class UIController implements IUIController {
     private readonly uiInteractionBridge: UiInteractionBridge;
 
-    constructor(private readonly appId: string, bridges: AppBridges) {
+    constructor(
+        private readonly appId: string,
+        bridges: AppBridges,
+    ) {
         this.uiInteractionBridge = bridges.getUiInteractionBridge();
     }
 
diff --git a/packages/apps-engine/src/server/accessors/UIExtend.ts b/packages/apps-engine/src/server/accessors/UIExtend.ts
index b19db42e7e98..1a5888cf99dd 100644
--- a/packages/apps-engine/src/server/accessors/UIExtend.ts
+++ b/packages/apps-engine/src/server/accessors/UIExtend.ts
@@ -3,7 +3,10 @@ import type { IUIActionButtonDescriptor } from '../../definition/ui';
 import type { UIActionButtonManager } from '../managers/UIActionButtonManager';
 
 export class UIExtend implements IUIExtend {
-    constructor(private readonly manager: UIActionButtonManager, private readonly appId: string) {}
+    constructor(
+        private readonly manager: UIActionButtonManager,
+        private readonly appId: string,
+    ) {}
 
     public registerButton(button: IUIActionButtonDescriptor): void {
         this.manager.registerActionButton(this.appId, button);
diff --git a/packages/apps-engine/src/server/accessors/UploadCreator.ts b/packages/apps-engine/src/server/accessors/UploadCreator.ts
index 7316c43fcf3b..ee92337724f1 100644
--- a/packages/apps-engine/src/server/accessors/UploadCreator.ts
+++ b/packages/apps-engine/src/server/accessors/UploadCreator.ts
@@ -5,7 +5,10 @@ import type { IUploadDetails } from '../../definition/uploads/IUploadDetails';
 import type { AppBridges } from '../bridges';
 
 export class UploadCreator implements IUploadCreator {
-    constructor(private readonly bridges: AppBridges, private readonly appId: string) {}
+    constructor(
+        private readonly bridges: AppBridges,
+        private readonly appId: string,
+    ) {}
 
     public async uploadBuffer(buffer: Buffer, descriptor: IUploadDescriptor): Promise<IUpload> {
         if (!descriptor.hasOwnProperty('user') && !descriptor.visitorToken) {
diff --git a/packages/apps-engine/src/server/accessors/UploadRead.ts b/packages/apps-engine/src/server/accessors/UploadRead.ts
index e2d32de3f9b7..a51c96416298 100644
--- a/packages/apps-engine/src/server/accessors/UploadRead.ts
+++ b/packages/apps-engine/src/server/accessors/UploadRead.ts
@@ -3,7 +3,10 @@ import type { IUpload } from '../../definition/uploads';
 import type { UploadBridge } from '../bridges/UploadBridge';
 
 export class UploadRead implements IUploadRead {
-    constructor(private readonly uploadBridge: UploadBridge, private readonly appId: string) {}
+    constructor(
+        private readonly uploadBridge: UploadBridge,
+        private readonly appId: string,
+    ) {}
 
     public getById(id: string): Promise<IUpload> {
         return this.uploadBridge.doGetById(id, this.appId);
diff --git a/packages/apps-engine/src/server/accessors/UserRead.ts b/packages/apps-engine/src/server/accessors/UserRead.ts
index 4eeb38cc77e3..a8e49b016062 100644
--- a/packages/apps-engine/src/server/accessors/UserRead.ts
+++ b/packages/apps-engine/src/server/accessors/UserRead.ts
@@ -3,7 +3,10 @@ import type { IUser } from '../../definition/users';
 import type { UserBridge } from '../bridges/UserBridge';
 
 export class UserRead implements IUserRead {
-    constructor(private userBridge: UserBridge, private appId: string) {}
+    constructor(
+        private userBridge: UserBridge,
+        private appId: string,
+    ) {}
 
     public getById(id: string): Promise<IUser> {
         return this.userBridge.doGetById(id, this.appId);
diff --git a/packages/apps-engine/src/server/accessors/UserUpdater.ts b/packages/apps-engine/src/server/accessors/UserUpdater.ts
index ed10617c6a37..239c9e6e4898 100644
--- a/packages/apps-engine/src/server/accessors/UserUpdater.ts
+++ b/packages/apps-engine/src/server/accessors/UserUpdater.ts
@@ -4,7 +4,10 @@ import type { IUser } from '../../definition/users/IUser';
 import type { AppBridges } from '../bridges';
 
 export class UserUpdater implements IUserUpdater {
-    constructor(private readonly bridges: AppBridges, private readonly appId: string) {}
+    constructor(
+        private readonly bridges: AppBridges,
+        private readonly appId: string,
+    ) {}
 
     public async updateStatusText(user: IUser, statusText: IUser['statusText']) {
         return this.bridges.getUserBridge().doUpdate(user, { statusText }, this.appId);
diff --git a/packages/apps-engine/src/server/accessors/VideoConfProviderExtend.ts b/packages/apps-engine/src/server/accessors/VideoConfProviderExtend.ts
index e0e895cb57b0..7427414ed921 100644
--- a/packages/apps-engine/src/server/accessors/VideoConfProviderExtend.ts
+++ b/packages/apps-engine/src/server/accessors/VideoConfProviderExtend.ts
@@ -3,7 +3,10 @@ import type { IVideoConfProvider } from '../../definition/videoConfProviders';
 import type { AppVideoConfProviderManager } from '../managers/AppVideoConfProviderManager';
 
 export class VideoConfProviderExtend implements IVideoConfProvidersExtend {
-    constructor(private readonly manager: AppVideoConfProviderManager, private readonly appId: string) {}
+    constructor(
+        private readonly manager: AppVideoConfProviderManager,
+        private readonly appId: string,
+    ) {}
 
     public provideVideoConfProvider(provider: IVideoConfProvider): Promise<void> {
         return Promise.resolve(this.manager.addProvider(this.appId, provider));
diff --git a/packages/apps-engine/src/server/accessors/VideoConferenceRead.ts b/packages/apps-engine/src/server/accessors/VideoConferenceRead.ts
index 011e2d2ae844..03eefbc5384e 100644
--- a/packages/apps-engine/src/server/accessors/VideoConferenceRead.ts
+++ b/packages/apps-engine/src/server/accessors/VideoConferenceRead.ts
@@ -3,7 +3,10 @@ import type { VideoConference } from '../../definition/videoConferences';
 import type { VideoConferenceBridge } from '../bridges';
 
 export class VideoConferenceRead implements IVideoConferenceRead {
-    constructor(private videoConfBridge: VideoConferenceBridge, private appId: string) {}
+    constructor(
+        private videoConfBridge: VideoConferenceBridge,
+        private appId: string,
+    ) {}
 
     public getById(id: string): Promise<VideoConference> {
         return this.videoConfBridge.doGetById(id, this.appId);
diff --git a/packages/apps-engine/src/server/bridges/ApiBridge.ts b/packages/apps-engine/src/server/bridges/ApiBridge.ts
index 32f5316d3ce4..9b444f7a67da 100644
--- a/packages/apps-engine/src/server/bridges/ApiBridge.ts
+++ b/packages/apps-engine/src/server/bridges/ApiBridge.ts
@@ -1,8 +1,8 @@
+import { BaseBridge } from './BaseBridge';
 import { PermissionDeniedError } from '../errors/PermissionDeniedError';
 import type { AppApi } from '../managers/AppApi';
 import { AppPermissionManager } from '../managers/AppPermissionManager';
 import { AppPermissions } from '../permissions/AppPermissions';
-import { BaseBridge } from './BaseBridge';
 
 export abstract class ApiBridge extends BaseBridge {
     public async doRegisterApi(api: AppApi, appId: string): Promise<void> {
diff --git a/packages/apps-engine/src/server/bridges/AppBridges.ts b/packages/apps-engine/src/server/bridges/AppBridges.ts
index 643bdbea1abb..c6bab319c43a 100644
--- a/packages/apps-engine/src/server/bridges/AppBridges.ts
+++ b/packages/apps-engine/src/server/bridges/AppBridges.ts
@@ -3,6 +3,7 @@ import type { AppActivationBridge } from './AppActivationBridge';
 import type { AppDetailChangesBridge } from './AppDetailChangesBridge';
 import type { CloudWorkspaceBridge } from './CloudWorkspaceBridge';
 import type { CommandBridge } from './CommandBridge';
+import type { ContactBridge } from './ContactBridge';
 import type { EmailBridge } from './EmailBridge';
 import type { EnvironmentalVariableBridge } from './EnvironmentalVariableBridge';
 import type { HttpBridge } from './HttpBridge';
@@ -26,6 +27,7 @@ import type { VideoConferenceBridge } from './VideoConferenceBridge';
 
 export type Bridge =
     | CommandBridge
+    | ContactBridge
     | ApiBridge
     | AppDetailChangesBridge
     | EnvironmentalVariableBridge
@@ -51,6 +53,8 @@ export type Bridge =
 export abstract class AppBridges {
     public abstract getCommandBridge(): CommandBridge;
 
+    public abstract getContactBridge(): ContactBridge;
+
     public abstract getApiBridge(): ApiBridge;
 
     public abstract getAppDetailChangesBridge(): AppDetailChangesBridge;
diff --git a/packages/apps-engine/src/server/bridges/AppDetailChangesBridge.ts b/packages/apps-engine/src/server/bridges/AppDetailChangesBridge.ts
index 357419c9aa95..66b0719739e2 100644
--- a/packages/apps-engine/src/server/bridges/AppDetailChangesBridge.ts
+++ b/packages/apps-engine/src/server/bridges/AppDetailChangesBridge.ts
@@ -1,5 +1,5 @@
-import type { ISetting } from '../../definition/settings';
 import { BaseBridge } from './BaseBridge';
+import type { ISetting } from '../../definition/settings';
 
 /**
  * An abstract class which will contain various methods related to Apps
diff --git a/packages/apps-engine/src/server/bridges/CloudWorkspaceBridge.ts b/packages/apps-engine/src/server/bridges/CloudWorkspaceBridge.ts
index bb1caf3a151c..7bc897f78c2d 100644
--- a/packages/apps-engine/src/server/bridges/CloudWorkspaceBridge.ts
+++ b/packages/apps-engine/src/server/bridges/CloudWorkspaceBridge.ts
@@ -1,8 +1,8 @@
+import { BaseBridge } from './BaseBridge';
 import type { IWorkspaceToken } from '../../definition/cloud/IWorkspaceToken';
 import { PermissionDeniedError } from '../errors/PermissionDeniedError';
 import { AppPermissionManager } from '../managers/AppPermissionManager';
 import { AppPermissions } from '../permissions/AppPermissions';
-import { BaseBridge } from './BaseBridge';
 
 export abstract class CloudWorkspaceBridge extends BaseBridge {
     public doGetWorkspaceToken(scope: string, appId: string): Promise<IWorkspaceToken> {
diff --git a/packages/apps-engine/src/server/bridges/CommandBridge.ts b/packages/apps-engine/src/server/bridges/CommandBridge.ts
index 71b0a971c2e1..20c1c2369bd7 100644
--- a/packages/apps-engine/src/server/bridges/CommandBridge.ts
+++ b/packages/apps-engine/src/server/bridges/CommandBridge.ts
@@ -1,8 +1,8 @@
+import { BaseBridge } from './BaseBridge';
 import type { ISlashCommand } from '../../definition/slashcommands';
 import { PermissionDeniedError } from '../errors/PermissionDeniedError';
 import { AppPermissionManager } from '../managers/AppPermissionManager';
 import { AppPermissions } from '../permissions/AppPermissions';
-import { BaseBridge } from './BaseBridge';
 
 export abstract class CommandBridge extends BaseBridge {
     public async doDoesCommandExist(command: string, appId: string): Promise<boolean> {
diff --git a/packages/apps-engine/src/server/bridges/ContactBridge.ts b/packages/apps-engine/src/server/bridges/ContactBridge.ts
new file mode 100644
index 000000000000..d3644846c569
--- /dev/null
+++ b/packages/apps-engine/src/server/bridges/ContactBridge.ts
@@ -0,0 +1,69 @@
+import type { ILivechatContact } from '../../definition/livechat/ILivechatContact';
+import { PermissionDeniedError } from '../errors/PermissionDeniedError';
+import { AppPermissionManager } from '../managers/AppPermissionManager';
+import { AppPermissions } from '../permissions/AppPermissions';
+import { BaseBridge } from './BaseBridge';
+
+export type VerifyContactChannelParams = {
+    contactId: string;
+    field: string;
+    value: string;
+    visitorId: string;
+    roomId: string;
+};
+
+export abstract class ContactBridge extends BaseBridge {
+    public async doGetById(contactId: ILivechatContact['_id'], appId: string): Promise<ILivechatContact | undefined> {
+        if (this.hasReadPermission(appId)) {
+            return this.getById(contactId, appId);
+        }
+    }
+
+    public async doVerifyContact(verifyContactChannelParams: VerifyContactChannelParams, appId: string): Promise<void> {
+        if (this.hasWritePermission(appId)) {
+            return this.verifyContact(verifyContactChannelParams, appId);
+        }
+    }
+
+    public async doAddContactEmail(contactId: ILivechatContact['_id'], email: string, appId: string): Promise<ILivechatContact> {
+        if (this.hasWritePermission(appId)) {
+            return this.addContactEmail(contactId, email, appId);
+        }
+    }
+
+    protected abstract getById(contactId: ILivechatContact['_id'], appId: string): Promise<ILivechatContact | undefined>;
+
+    protected abstract verifyContact(verifyContactChannelParams: VerifyContactChannelParams, appId: string): Promise<void>;
+
+    protected abstract addContactEmail(contactId: ILivechatContact['_id'], email: string, appId: string): Promise<ILivechatContact>;
+
+    private hasReadPermission(appId: string): boolean {
+        if (AppPermissionManager.hasPermission(appId, AppPermissions.contact.read)) {
+            return true;
+        }
+
+        AppPermissionManager.notifyAboutError(
+            new PermissionDeniedError({
+                appId,
+                missingPermissions: [AppPermissions.contact.read],
+            }),
+        );
+
+        return false;
+    }
+
+    private hasWritePermission(appId: string): boolean {
+        if (AppPermissionManager.hasPermission(appId, AppPermissions.contact.write)) {
+            return true;
+        }
+
+        AppPermissionManager.notifyAboutError(
+            new PermissionDeniedError({
+                appId,
+                missingPermissions: [AppPermissions.contact.write],
+            }),
+        );
+
+        return false;
+    }
+}
diff --git a/packages/apps-engine/src/server/bridges/EmailBridge.ts b/packages/apps-engine/src/server/bridges/EmailBridge.ts
index c8a5b22e9c86..71bf9adc522e 100644
--- a/packages/apps-engine/src/server/bridges/EmailBridge.ts
+++ b/packages/apps-engine/src/server/bridges/EmailBridge.ts
@@ -1,8 +1,8 @@
+import { BaseBridge } from './BaseBridge';
 import type { IEmail } from '../../definition/email';
 import { PermissionDeniedError } from '../errors/PermissionDeniedError';
 import { AppPermissionManager } from '../managers/AppPermissionManager';
 import { AppPermissions } from '../permissions/AppPermissions';
-import { BaseBridge } from './BaseBridge';
 
 export abstract class EmailBridge extends BaseBridge {
     public async doSendEmail(email: IEmail, appId: string): Promise<void> {
diff --git a/packages/apps-engine/src/server/bridges/EnvironmentalVariableBridge.ts b/packages/apps-engine/src/server/bridges/EnvironmentalVariableBridge.ts
index 5377dcef6164..52fc7ca7f220 100644
--- a/packages/apps-engine/src/server/bridges/EnvironmentalVariableBridge.ts
+++ b/packages/apps-engine/src/server/bridges/EnvironmentalVariableBridge.ts
@@ -1,7 +1,7 @@
+import { BaseBridge } from './BaseBridge';
 import { PermissionDeniedError } from '../errors/PermissionDeniedError';
 import { AppPermissionManager } from '../managers/AppPermissionManager';
 import { AppPermissions } from '../permissions/AppPermissions';
-import { BaseBridge } from './BaseBridge';
 
 export abstract class EnvironmentalVariableBridge extends BaseBridge {
     public async doGetValueByName(envVarName: string, appId: string): Promise<string | undefined> {
diff --git a/packages/apps-engine/src/server/bridges/HttpBridge.ts b/packages/apps-engine/src/server/bridges/HttpBridge.ts
index 6d02fb15262d..5d6297bb868d 100644
--- a/packages/apps-engine/src/server/bridges/HttpBridge.ts
+++ b/packages/apps-engine/src/server/bridges/HttpBridge.ts
@@ -1,8 +1,8 @@
+import { BaseBridge } from './BaseBridge';
 import type { IHttpRequest, IHttpResponse, RequestMethod } from '../../definition/accessors';
 import { PermissionDeniedError } from '../errors/PermissionDeniedError';
 import { AppPermissionManager } from '../managers/AppPermissionManager';
 import { AppPermissions } from '../permissions/AppPermissions';
-import { BaseBridge } from './BaseBridge';
 
 export interface IHttpBridgeRequestInfo {
     appId: string;
diff --git a/packages/apps-engine/src/server/bridges/InternalBridge.ts b/packages/apps-engine/src/server/bridges/InternalBridge.ts
index 3d9e3b21f18e..e8851ecd5d8c 100644
--- a/packages/apps-engine/src/server/bridges/InternalBridge.ts
+++ b/packages/apps-engine/src/server/bridges/InternalBridge.ts
@@ -1,5 +1,5 @@
-import type { ISetting } from '../../definition/settings';
 import { BaseBridge } from './BaseBridge';
+import type { ISetting } from '../../definition/settings';
 
 export abstract class InternalBridge extends BaseBridge {
     public doGetUsernamesOfRoomById(roomId: string): Promise<Array<string>> {
diff --git a/packages/apps-engine/src/server/bridges/ListenerBridge.ts b/packages/apps-engine/src/server/bridges/ListenerBridge.ts
index 1357e75ce99f..7907e2afab10 100644
--- a/packages/apps-engine/src/server/bridges/ListenerBridge.ts
+++ b/packages/apps-engine/src/server/bridges/ListenerBridge.ts
@@ -1,7 +1,7 @@
+import { BaseBridge } from './BaseBridge';
 import type { IMessage } from '../../definition/messages';
 import type { AppInterface } from '../../definition/metadata';
 import type { IRoom } from '../../definition/rooms';
-import { BaseBridge } from './BaseBridge';
 
 export abstract class ListenerBridge extends BaseBridge {
     public async doMessageEvent(int: AppInterface, message: IMessage): Promise<void | boolean | IMessage> {
diff --git a/packages/apps-engine/src/server/bridges/LivechatBridge.ts b/packages/apps-engine/src/server/bridges/LivechatBridge.ts
index 9fc830767545..d90db78c91ae 100644
--- a/packages/apps-engine/src/server/bridges/LivechatBridge.ts
+++ b/packages/apps-engine/src/server/bridges/LivechatBridge.ts
@@ -1,3 +1,4 @@
+import { BaseBridge } from './BaseBridge';
 import type { IExtraRoomParams } from '../../definition/accessors/ILivechatCreator';
 import type { IDepartment, ILivechatMessage, ILivechatRoom, ILivechatTransferData, IVisitor } from '../../definition/livechat';
 import type { IMessage } from '../../definition/messages';
@@ -5,7 +6,6 @@ import type { IUser } from '../../definition/users';
 import { PermissionDeniedError } from '../errors/PermissionDeniedError';
 import { AppPermissionManager } from '../managers/AppPermissionManager';
 import { AppPermissions } from '../permissions/AppPermissions';
-import { BaseBridge } from './BaseBridge';
 
 type LivechatReadPermissions = keyof Pick<
     typeof AppPermissions,
diff --git a/packages/apps-engine/src/server/bridges/MessageBridge.ts b/packages/apps-engine/src/server/bridges/MessageBridge.ts
index d37fb13cc165..9d0a18db52f0 100644
--- a/packages/apps-engine/src/server/bridges/MessageBridge.ts
+++ b/packages/apps-engine/src/server/bridges/MessageBridge.ts
@@ -1,3 +1,4 @@
+import { BaseBridge } from './BaseBridge';
 import type { ITypingOptions } from '../../definition/accessors/INotifier';
 import type { IMessage, Reaction } from '../../definition/messages';
 import type { IRoom } from '../../definition/rooms';
@@ -5,7 +6,6 @@ import type { IUser } from '../../definition/users';
 import { PermissionDeniedError } from '../errors/PermissionDeniedError';
 import { AppPermissionManager } from '../managers/AppPermissionManager';
 import { AppPermissions } from '../permissions/AppPermissions';
-import { BaseBridge } from './BaseBridge';
 
 export interface ITypingDescriptor extends ITypingOptions {
     isTyping: boolean;
diff --git a/packages/apps-engine/src/server/bridges/ModerationBridge.ts b/packages/apps-engine/src/server/bridges/ModerationBridge.ts
index ad17e4d6ebef..c214529580ef 100644
--- a/packages/apps-engine/src/server/bridges/ModerationBridge.ts
+++ b/packages/apps-engine/src/server/bridges/ModerationBridge.ts
@@ -1,9 +1,9 @@
+import { BaseBridge } from './BaseBridge';
 import type { IMessage } from '../../definition/messages';
 import type { IUser } from '../../definition/users';
 import { PermissionDeniedError } from '../errors/PermissionDeniedError';
 import { AppPermissionManager } from '../managers/AppPermissionManager';
 import { AppPermissions } from '../permissions/AppPermissions';
-import { BaseBridge } from './BaseBridge';
 
 export abstract class ModerationBridge extends BaseBridge {
     public async doReport(messageId: IMessage['id'], description: string, userId: string, appId: string): Promise<void> {
diff --git a/packages/apps-engine/src/server/bridges/OAuthAppsBridge.ts b/packages/apps-engine/src/server/bridges/OAuthAppsBridge.ts
index dec6366e3aff..2dfe71bdbf3c 100644
--- a/packages/apps-engine/src/server/bridges/OAuthAppsBridge.ts
+++ b/packages/apps-engine/src/server/bridges/OAuthAppsBridge.ts
@@ -1,8 +1,8 @@
+import { BaseBridge } from './BaseBridge';
 import type { IOAuthApp, IOAuthAppParams } from '../../definition/accessors/IOAuthApp';
 import { PermissionDeniedError } from '../errors/PermissionDeniedError';
 import { AppPermissionManager } from '../managers/AppPermissionManager';
 import { AppPermissions } from '../permissions/AppPermissions';
-import { BaseBridge } from './BaseBridge';
 
 export abstract class OAuthAppsBridge extends BaseBridge {
     public async doCreate(oAuthApp: IOAuthAppParams, appId: string) {
diff --git a/packages/apps-engine/src/server/bridges/PersistenceBridge.ts b/packages/apps-engine/src/server/bridges/PersistenceBridge.ts
index 2ab48dd8599b..0ed0e274bffb 100644
--- a/packages/apps-engine/src/server/bridges/PersistenceBridge.ts
+++ b/packages/apps-engine/src/server/bridges/PersistenceBridge.ts
@@ -1,8 +1,8 @@
+import { BaseBridge } from './BaseBridge';
 import type { RocketChatAssociationRecord } from '../../definition/metadata';
 import { PermissionDeniedError } from '../errors/PermissionDeniedError';
 import { AppPermissionManager } from '../managers/AppPermissionManager';
 import { AppPermissions } from '../permissions/AppPermissions';
-import { BaseBridge } from './BaseBridge';
 
 export abstract class PersistenceBridge extends BaseBridge {
     public async doPurge(appId: string): Promise<void> {
diff --git a/packages/apps-engine/src/server/bridges/RoleBridge.ts b/packages/apps-engine/src/server/bridges/RoleBridge.ts
index 2fea98f32818..137dca4a960b 100644
--- a/packages/apps-engine/src/server/bridges/RoleBridge.ts
+++ b/packages/apps-engine/src/server/bridges/RoleBridge.ts
@@ -1,8 +1,8 @@
+import { BaseBridge } from './BaseBridge';
 import type { IRole } from '../../definition/roles';
 import { PermissionDeniedError } from '../errors/PermissionDeniedError';
 import { AppPermissionManager } from '../managers/AppPermissionManager';
 import { AppPermissions } from '../permissions/AppPermissions';
-import { BaseBridge } from './BaseBridge';
 
 export abstract class RoleBridge extends BaseBridge {
     public async doGetOneByIdOrName(idOrName: IRole['id'] | IRole['name'], appId: string): Promise<IRole | null> {
diff --git a/packages/apps-engine/src/server/bridges/RoomBridge.ts b/packages/apps-engine/src/server/bridges/RoomBridge.ts
index deb6f81667d9..155c85ba4689 100644
--- a/packages/apps-engine/src/server/bridges/RoomBridge.ts
+++ b/packages/apps-engine/src/server/bridges/RoomBridge.ts
@@ -1,10 +1,10 @@
+import { BaseBridge } from './BaseBridge';
 import type { IMessage, IMessageRaw } from '../../definition/messages';
 import type { IRoom } from '../../definition/rooms';
 import type { IUser } from '../../definition/users';
 import { PermissionDeniedError } from '../errors/PermissionDeniedError';
 import { AppPermissionManager } from '../managers/AppPermissionManager';
 import { AppPermissions } from '../permissions/AppPermissions';
-import { BaseBridge } from './BaseBridge';
 
 export const GetMessagesSortableFields = ['createdAt'] as const;
 
diff --git a/packages/apps-engine/src/server/bridges/SchedulerBridge.ts b/packages/apps-engine/src/server/bridges/SchedulerBridge.ts
index e275ca599433..d93660ef75c1 100644
--- a/packages/apps-engine/src/server/bridges/SchedulerBridge.ts
+++ b/packages/apps-engine/src/server/bridges/SchedulerBridge.ts
@@ -1,8 +1,8 @@
+import { BaseBridge } from './BaseBridge';
 import type { IOnetimeSchedule, IProcessor, IRecurringSchedule } from '../../definition/scheduler';
 import { PermissionDeniedError } from '../errors/PermissionDeniedError';
 import { AppPermissionManager } from '../managers/AppPermissionManager';
 import { AppPermissions } from '../permissions/AppPermissions';
-import { BaseBridge } from './BaseBridge';
 
 export abstract class SchedulerBridge extends BaseBridge {
     public async doRegisterProcessors(processors: Array<IProcessor> = [], appId: string): Promise<void | Array<string>> {
diff --git a/packages/apps-engine/src/server/bridges/ServerSettingBridge.ts b/packages/apps-engine/src/server/bridges/ServerSettingBridge.ts
index b5590bd7033d..82eed11b3927 100644
--- a/packages/apps-engine/src/server/bridges/ServerSettingBridge.ts
+++ b/packages/apps-engine/src/server/bridges/ServerSettingBridge.ts
@@ -1,8 +1,8 @@
+import { BaseBridge } from './BaseBridge';
 import type { ISetting } from '../../definition/settings';
 import { PermissionDeniedError } from '../errors/PermissionDeniedError';
 import { AppPermissionManager } from '../managers/AppPermissionManager';
 import { AppPermissions } from '../permissions/AppPermissions';
-import { BaseBridge } from './BaseBridge';
 
 export abstract class ServerSettingBridge extends BaseBridge {
     public async doGetAll(appId: string): Promise<Array<ISetting>> {
diff --git a/packages/apps-engine/src/server/bridges/ThreadBridge.ts b/packages/apps-engine/src/server/bridges/ThreadBridge.ts
index ccf1f4b1d330..a9bca0020442 100644
--- a/packages/apps-engine/src/server/bridges/ThreadBridge.ts
+++ b/packages/apps-engine/src/server/bridges/ThreadBridge.ts
@@ -1,9 +1,9 @@
+import { BaseBridge } from './BaseBridge';
 import type { ITypingOptions } from '../../definition/accessors/INotifier';
 import type { IMessage } from '../../definition/messages';
 import { PermissionDeniedError } from '../errors/PermissionDeniedError';
 import { AppPermissionManager } from '../managers/AppPermissionManager';
 import { AppPermissions } from '../permissions/AppPermissions';
-import { BaseBridge } from './BaseBridge';
 
 export interface ITypingDescriptor extends ITypingOptions {
     isTyping: boolean;
diff --git a/packages/apps-engine/src/server/bridges/UiInteractionBridge.ts b/packages/apps-engine/src/server/bridges/UiInteractionBridge.ts
index 2d0b6202fc86..287c876d5b66 100644
--- a/packages/apps-engine/src/server/bridges/UiInteractionBridge.ts
+++ b/packages/apps-engine/src/server/bridges/UiInteractionBridge.ts
@@ -1,9 +1,9 @@
+import { BaseBridge } from './BaseBridge';
 import type { IUIKitInteraction } from '../../definition/uikit';
 import type { IUser } from '../../definition/users';
 import { PermissionDeniedError } from '../errors/PermissionDeniedError';
 import { AppPermissionManager } from '../managers/AppPermissionManager';
 import { AppPermissions } from '../permissions/AppPermissions';
-import { BaseBridge } from './BaseBridge';
 
 export abstract class UiInteractionBridge extends BaseBridge {
     public async doNotifyUser(user: IUser, interaction: IUIKitInteraction, appId: string): Promise<void> {
diff --git a/packages/apps-engine/src/server/bridges/UploadBridge.ts b/packages/apps-engine/src/server/bridges/UploadBridge.ts
index 14ae85ca41dd..eb6ee63c2ee5 100644
--- a/packages/apps-engine/src/server/bridges/UploadBridge.ts
+++ b/packages/apps-engine/src/server/bridges/UploadBridge.ts
@@ -1,9 +1,9 @@
+import { BaseBridge } from './BaseBridge';
 import type { IUpload } from '../../definition/uploads';
 import type { IUploadDetails } from '../../definition/uploads/IUploadDetails';
 import { PermissionDeniedError } from '../errors/PermissionDeniedError';
 import { AppPermissionManager } from '../managers/AppPermissionManager';
 import { AppPermissions } from '../permissions/AppPermissions';
-import { BaseBridge } from './BaseBridge';
 
 export abstract class UploadBridge extends BaseBridge {
     public async doGetById(id: string, appId: string): Promise<IUpload> {
diff --git a/packages/apps-engine/src/server/bridges/UserBridge.ts b/packages/apps-engine/src/server/bridges/UserBridge.ts
index d67f2a091dda..8d3167f40e24 100644
--- a/packages/apps-engine/src/server/bridges/UserBridge.ts
+++ b/packages/apps-engine/src/server/bridges/UserBridge.ts
@@ -1,8 +1,8 @@
+import { BaseBridge } from './BaseBridge';
 import type { IUser, IUserCreationOptions, UserType } from '../../definition/users';
 import { PermissionDeniedError } from '../errors/PermissionDeniedError';
 import { AppPermissionManager } from '../managers/AppPermissionManager';
 import { AppPermissions } from '../permissions/AppPermissions';
-import { BaseBridge } from './BaseBridge';
 
 export abstract class UserBridge extends BaseBridge {
     public async doGetById(id: string, appId: string): Promise<IUser> {
diff --git a/packages/apps-engine/src/server/bridges/VideoConferenceBridge.ts b/packages/apps-engine/src/server/bridges/VideoConferenceBridge.ts
index 1a980e437fbe..0fdaa2a4256a 100644
--- a/packages/apps-engine/src/server/bridges/VideoConferenceBridge.ts
+++ b/packages/apps-engine/src/server/bridges/VideoConferenceBridge.ts
@@ -1,10 +1,10 @@
+import { BaseBridge } from './BaseBridge';
 import type { IVideoConfProvider } from '../../definition/videoConfProviders';
 import type { AppVideoConference } from '../../definition/videoConferences/AppVideoConference';
 import type { VideoConference } from '../../definition/videoConferences/IVideoConference';
 import { PermissionDeniedError } from '../errors/PermissionDeniedError';
 import { AppPermissionManager } from '../managers/AppPermissionManager';
 import { AppPermissions } from '../permissions/AppPermissions';
-import { BaseBridge } from './BaseBridge';
 
 export abstract class VideoConferenceBridge extends BaseBridge {
     public async doGetById(callId: string, appId: string): Promise<VideoConference> {
diff --git a/packages/apps-engine/src/server/bridges/index.ts b/packages/apps-engine/src/server/bridges/index.ts
index f5550e96f8e0..fd0ebdd31be4 100644
--- a/packages/apps-engine/src/server/bridges/index.ts
+++ b/packages/apps-engine/src/server/bridges/index.ts
@@ -4,6 +4,7 @@ import { AppBridges } from './AppBridges';
 import { AppDetailChangesBridge } from './AppDetailChangesBridge';
 import { CloudWorkspaceBridge } from './CloudWorkspaceBridge';
 import { CommandBridge } from './CommandBridge';
+import { ContactBridge } from './ContactBridge';
 import { EmailBridge } from './EmailBridge';
 import { EnvironmentalVariableBridge } from './EnvironmentalVariableBridge';
 import { HttpBridge, IHttpBridgeRequestInfo } from './HttpBridge';
@@ -25,6 +26,7 @@ import { VideoConferenceBridge } from './VideoConferenceBridge';
 
 export {
     CloudWorkspaceBridge,
+    ContactBridge,
     EnvironmentalVariableBridge,
     HttpBridge,
     IHttpBridgeRequestInfo,
diff --git a/packages/apps-engine/src/server/compiler/AppCompiler.ts b/packages/apps-engine/src/server/compiler/AppCompiler.ts
index d1f9ddf8a0c0..33f937771ec0 100644
--- a/packages/apps-engine/src/server/compiler/AppCompiler.ts
+++ b/packages/apps-engine/src/server/compiler/AppCompiler.ts
@@ -21,7 +21,7 @@ export class AppCompiler {
             throw new Error(`Invalid App package for "${storage.info.name}". Could not find the classFile (${storage.info.classFile}) file.`);
         }
 
-        const runtime = await manager.getRuntime().startRuntimeForApp(packageResult);
+        const runtime = await manager.getRuntime().startRuntimeForApp(packageResult, storage);
 
         const app = new ProxiedApp(manager, storage, runtime);
 
diff --git a/packages/apps-engine/src/server/compiler/IParseAppPackageResult.ts b/packages/apps-engine/src/server/compiler/IParseAppPackageResult.ts
index 62444988d7c3..89019e1ccc55 100644
--- a/packages/apps-engine/src/server/compiler/IParseAppPackageResult.ts
+++ b/packages/apps-engine/src/server/compiler/IParseAppPackageResult.ts
@@ -1,5 +1,5 @@
-import type { IAppInfo } from '../../definition/metadata';
 import type { AppImplements } from './AppImplements';
+import type { IAppInfo } from '../../definition/metadata';
 
 export interface IParseAppPackageResult {
     info: IAppInfo;
diff --git a/packages/apps-engine/src/server/logging/AppConsole.ts b/packages/apps-engine/src/server/logging/AppConsole.ts
index becf90ede454..46dd2bd46a8e 100644
--- a/packages/apps-engine/src/server/logging/AppConsole.ts
+++ b/packages/apps-engine/src/server/logging/AppConsole.ts
@@ -1,9 +1,9 @@
 import * as stackTrace from 'stack-trace';
 
+import type { ILoggerStorageEntry } from './ILoggerStorageEntry';
 import type { ILogEntry, ILogger } from '../../definition/accessors';
 import { LogMessageSeverity } from '../../definition/accessors';
 import type { AppMethod } from '../../definition/metadata';
-import type { ILoggerStorageEntry } from './ILoggerStorageEntry';
 
 export class AppConsole implements ILogger {
     public static toStorageEntry(appId: string, logger: AppConsole): ILoggerStorageEntry {
diff --git a/packages/apps-engine/src/server/managers/AppAccessorManager.ts b/packages/apps-engine/src/server/managers/AppAccessorManager.ts
index 7a100d58da34..097ab5ed7926 100644
--- a/packages/apps-engine/src/server/managers/AppAccessorManager.ts
+++ b/packages/apps-engine/src/server/managers/AppAccessorManager.ts
@@ -46,6 +46,7 @@ import {
     VideoConfProviderExtend,
 } from '../accessors';
 import { CloudWorkspaceRead } from '../accessors/CloudWorkspaceRead';
+import { ContactRead } from '../accessors/ContactRead';
 import { ThreadRead } from '../accessors/ThreadRead';
 import { UIExtend } from '../accessors/UIExtend';
 import type { AppBridges } from '../bridges/AppBridges';
@@ -183,12 +184,15 @@ export class AppAccessorManager {
             const cloud = new CloudWorkspaceRead(this.bridges.getCloudWorkspaceBridge(), appId);
             const videoConf = new VideoConferenceRead(this.bridges.getVideoConferenceBridge(), appId);
             const oauthApps = new OAuthAppsReader(this.bridges.getOAuthAppsBridge(), appId);
-
+            const contactReader = new ContactRead(this.bridges, appId);
             const thread = new ThreadRead(this.bridges.getThreadBridge(), appId);
 
             const role = new RoleRead(this.bridges.getRoleBridge(), appId);
 
-            this.readers.set(appId, new Reader(env, msg, persist, room, user, noti, livechat, upload, cloud, videoConf, oauthApps, thread, role));
+            this.readers.set(
+                appId,
+                new Reader(env, msg, persist, room, user, noti, livechat, upload, cloud, videoConf, contactReader, oauthApps, thread, role),
+            );
         }
 
         return this.readers.get(appId);
diff --git a/packages/apps-engine/src/server/managers/AppApi.ts b/packages/apps-engine/src/server/managers/AppApi.ts
index 20e6cde3b994..fc42ab97e507 100644
--- a/packages/apps-engine/src/server/managers/AppApi.ts
+++ b/packages/apps-engine/src/server/managers/AppApi.ts
@@ -17,7 +17,11 @@ export class AppApi {
 
     public readonly implementedMethods: Array<string>;
 
-    constructor(public app: ProxiedApp, public api: IApi, public endpoint: IApiEndpoint) {
+    constructor(
+        public app: ProxiedApp,
+        public api: IApi,
+        public endpoint: IApiEndpoint,
+    ) {
         this.appId = app.getID();
 
         switch (this.api.visibility) {
diff --git a/packages/apps-engine/src/server/managers/AppListenerManager.ts b/packages/apps-engine/src/server/managers/AppListenerManager.ts
index dc145408a795..f51adca31a92 100644
--- a/packages/apps-engine/src/server/managers/AppListenerManager.ts
+++ b/packages/apps-engine/src/server/managers/AppListenerManager.ts
@@ -1,3 +1,4 @@
+import type { AppAccessorManager } from './AppAccessorManager';
 import type { IEmailDescriptor, IPreEmailSentContext } from '../../definition/email';
 import { EssentialAppDisabledException } from '../../definition/exceptions';
 import type { IExternalComponent } from '../../definition/externalComponent';
@@ -29,7 +30,6 @@ import type { AppManager } from '../AppManager';
 import type { ProxiedApp } from '../ProxiedApp';
 import { Utilities } from '../misc/Utilities';
 import { JSONRPC_METHOD_NOT_FOUND } from '../runtime/deno/AppsEngineDenoRuntime';
-import type { AppAccessorManager } from './AppAccessorManager';
 
 interface IListenerExecutor {
     [AppInterface.IPreMessageSentPrevent]: {
diff --git a/packages/apps-engine/src/server/managers/AppRuntimeManager.ts b/packages/apps-engine/src/server/managers/AppRuntimeManager.ts
index 64adf9b0a98d..6c63307a9ba2 100644
--- a/packages/apps-engine/src/server/managers/AppRuntimeManager.ts
+++ b/packages/apps-engine/src/server/managers/AppRuntimeManager.ts
@@ -1,6 +1,7 @@
 import type { AppManager } from '../AppManager';
 import type { IParseAppPackageResult } from '../compiler';
 import { DenoRuntimeSubprocessController } from '../runtime/deno/AppsEngineDenoRuntime';
+import type { IAppStorageItem } from '../storage';
 
 export type AppRuntimeParams = {
     appId: string;
@@ -21,14 +22,18 @@ export class AppRuntimeManager {
 
     constructor(private readonly manager: AppManager) {}
 
-    public async startRuntimeForApp(appPackage: IParseAppPackageResult, options = { force: false }): Promise<DenoRuntimeSubprocessController> {
+    public async startRuntimeForApp(
+        appPackage: IParseAppPackageResult,
+        storageItem: IAppStorageItem,
+        options = { force: false },
+    ): Promise<DenoRuntimeSubprocessController> {
         const { id: appId } = appPackage.info;
 
         if (appId in this.subprocesses && !options.force) {
             throw new Error('App already has an associated runtime');
         }
 
-        this.subprocesses[appId] = new DenoRuntimeSubprocessController(this.manager, appPackage);
+        this.subprocesses[appId] = new DenoRuntimeSubprocessController(this.manager, appPackage, storageItem);
 
         await this.subprocesses[appId].setupApp();
 
diff --git a/packages/apps-engine/src/server/managers/AppSlashCommand.ts b/packages/apps-engine/src/server/managers/AppSlashCommand.ts
index ef60e1d16877..7da46a6c0a2b 100644
--- a/packages/apps-engine/src/server/managers/AppSlashCommand.ts
+++ b/packages/apps-engine/src/server/managers/AppSlashCommand.ts
@@ -22,7 +22,10 @@ export class AppSlashCommand {
      */
     public isDisabled: boolean;
 
-    constructor(public app: ProxiedApp, public slashCommand: ISlashCommand) {
+    constructor(
+        public app: ProxiedApp,
+        public slashCommand: ISlashCommand,
+    ) {
         this.isRegistered = false;
         this.isEnabled = false;
         this.isDisabled = false;
diff --git a/packages/apps-engine/src/server/managers/AppSlashCommandManager.ts b/packages/apps-engine/src/server/managers/AppSlashCommandManager.ts
index 05a93816d35a..75f15d7679f1 100644
--- a/packages/apps-engine/src/server/managers/AppSlashCommandManager.ts
+++ b/packages/apps-engine/src/server/managers/AppSlashCommandManager.ts
@@ -5,9 +5,9 @@ import { SlashCommandContext } from '../../definition/slashcommands';
 import type { AppManager } from '../AppManager';
 import type { CommandBridge } from '../bridges';
 import { CommandAlreadyExistsError, CommandHasAlreadyBeenTouchedError } from '../errors';
-import { Room } from '../rooms/Room';
 import type { AppAccessorManager } from './AppAccessorManager';
 import { AppSlashCommand } from './AppSlashCommand';
+import { Room } from '../rooms/Room';
 
 /**
  * The command manager for the Apps.
diff --git a/packages/apps-engine/src/server/managers/AppVideoConfProvider.ts b/packages/apps-engine/src/server/managers/AppVideoConfProvider.ts
index 7e74677e1c13..064f4548955c 100644
--- a/packages/apps-engine/src/server/managers/AppVideoConfProvider.ts
+++ b/packages/apps-engine/src/server/managers/AppVideoConfProvider.ts
@@ -14,7 +14,10 @@ export class AppVideoConfProvider {
      */
     public isRegistered: boolean;
 
-    constructor(public app: ProxiedApp, public provider: IVideoConfProvider) {
+    constructor(
+        public app: ProxiedApp,
+        public provider: IVideoConfProvider,
+    ) {
         this.isRegistered = false;
     }
 
diff --git a/packages/apps-engine/src/server/managers/AppVideoConfProviderManager.ts b/packages/apps-engine/src/server/managers/AppVideoConfProviderManager.ts
index 861a5bc5f36f..bd30403ff464 100644
--- a/packages/apps-engine/src/server/managers/AppVideoConfProviderManager.ts
+++ b/packages/apps-engine/src/server/managers/AppVideoConfProviderManager.ts
@@ -5,11 +5,11 @@ import type { IVideoConferenceUser } from '../../definition/videoConferences/IVi
 import type { AppManager } from '../AppManager';
 import type { VideoConferenceBridge } from '../bridges';
 import { VideoConfProviderAlreadyExistsError, VideoConfProviderNotRegisteredError } from '../errors';
-import { PermissionDeniedError } from '../errors/PermissionDeniedError';
-import { AppPermissions } from '../permissions/AppPermissions';
 import type { AppAccessorManager } from './AppAccessorManager';
 import { AppPermissionManager } from './AppPermissionManager';
 import { AppVideoConfProvider } from './AppVideoConfProvider';
+import { PermissionDeniedError } from '../errors/PermissionDeniedError';
+import { AppPermissions } from '../permissions/AppPermissions';
 
 export class AppVideoConfProviderManager {
     private readonly accessors: AppAccessorManager;
diff --git a/packages/apps-engine/src/server/managers/UIActionButtonManager.ts b/packages/apps-engine/src/server/managers/UIActionButtonManager.ts
index fac613fbef9f..4d4123330af9 100644
--- a/packages/apps-engine/src/server/managers/UIActionButtonManager.ts
+++ b/packages/apps-engine/src/server/managers/UIActionButtonManager.ts
@@ -1,9 +1,9 @@
 import type { IUIActionButton, IUIActionButtonDescriptor } from '../../definition/ui';
 import type { AppManager } from '../AppManager';
 import type { AppActivationBridge } from '../bridges';
+import { AppPermissionManager } from './AppPermissionManager';
 import { PermissionDeniedError } from '../errors/PermissionDeniedError';
 import { AppPermissions } from '../permissions/AppPermissions';
-import { AppPermissionManager } from './AppPermissionManager';
 
 export class UIActionButtonManager {
     private readonly activationBridge: AppActivationBridge;
diff --git a/packages/apps-engine/src/server/marketplace/IMarketplaceInfo.ts b/packages/apps-engine/src/server/marketplace/IMarketplaceInfo.ts
index 3740f5e06f6b..07b9852b16ef 100644
--- a/packages/apps-engine/src/server/marketplace/IMarketplaceInfo.ts
+++ b/packages/apps-engine/src/server/marketplace/IMarketplaceInfo.ts
@@ -1,8 +1,8 @@
-import type { IAppInfo } from '../../definition/metadata';
 import type { IMarketplacePricingPlan } from './IMarketplacePricingPlan';
 import type { IMarketplaceSimpleBundleInfo } from './IMarketplaceSimpleBundleInfo';
 import type { IMarketplaceSubscriptionInfo } from './IMarketplaceSubscriptionInfo';
 import type { MarketplacePurchaseType } from './MarketplacePurchaseType';
+import type { IAppInfo } from '../../definition/metadata';
 
 export interface IMarketplaceInfo extends IAppInfo {
     categories: Array<string>;
diff --git a/packages/apps-engine/src/server/messages/Message.ts b/packages/apps-engine/src/server/messages/Message.ts
index b4c02025974f..255bf4af2f05 100644
--- a/packages/apps-engine/src/server/messages/Message.ts
+++ b/packages/apps-engine/src/server/messages/Message.ts
@@ -60,7 +60,10 @@ export class Message implements IMessage {
         this._ROOM = new Room(room, this.manager);
     }
 
-    public constructor(message: IMessage, private manager: AppManager) {
+    public constructor(
+        message: IMessage,
+        private manager: AppManager,
+    ) {
         Object.assign(this, message);
     }
 
diff --git a/packages/apps-engine/src/server/oauth2/OAuth2Client.ts b/packages/apps-engine/src/server/oauth2/OAuth2Client.ts
index 046ce696aedc..987fe5de58e8 100644
--- a/packages/apps-engine/src/server/oauth2/OAuth2Client.ts
+++ b/packages/apps-engine/src/server/oauth2/OAuth2Client.ts
@@ -30,7 +30,10 @@ export class OAuth2Client implements IOAuth2Client {
                 </div>`,
     };
 
-    constructor(private readonly app: App, private readonly config: IOAuth2ClientOptions) {}
+    constructor(
+        private readonly app: App,
+        private readonly config: IOAuth2ClientOptions,
+    ) {}
 
     public async setup(configuration: IConfigurationExtend): Promise<void> {
         configuration.api.provideApi({
diff --git a/packages/apps-engine/src/server/permissions/AppPermissions.ts b/packages/apps-engine/src/server/permissions/AppPermissions.ts
index a0cc643c7f2b..fe368668b32b 100644
--- a/packages/apps-engine/src/server/permissions/AppPermissions.ts
+++ b/packages/apps-engine/src/server/permissions/AppPermissions.ts
@@ -52,6 +52,10 @@ export const AppPermissions = {
         read: { name: 'moderation.read' },
         write: { name: 'moderation.write' },
     },
+    contact: {
+        read: { name: 'contact.read' },
+        write: { name: 'contact.write' },
+    },
     threads: {
         read: { name: 'threads.read' },
     },
diff --git a/packages/apps-engine/src/server/runtime/AppsEngineEmptyRuntime.ts b/packages/apps-engine/src/server/runtime/AppsEngineEmptyRuntime.ts
index 72ddc6d7617d..6b400eebcb45 100644
--- a/packages/apps-engine/src/server/runtime/AppsEngineEmptyRuntime.ts
+++ b/packages/apps-engine/src/server/runtime/AppsEngineEmptyRuntime.ts
@@ -1,6 +1,6 @@
-import type { App } from '../../definition/App';
 import type { IAppsEngineRuntimeOptions } from './AppsEngineRuntime';
 import { AppsEngineRuntime } from './AppsEngineRuntime';
+import type { App } from '../../definition/App';
 
 export class AppsEngineEmptyRuntime extends AppsEngineRuntime {
     public static async runCode(code: string, sandbox?: Record<string, any>, options?: IAppsEngineRuntimeOptions): Promise<any> {
diff --git a/packages/apps-engine/src/server/runtime/AppsEngineNodeRuntime.ts b/packages/apps-engine/src/server/runtime/AppsEngineNodeRuntime.ts
index dd69f23159f9..4561ab66ebc5 100644
--- a/packages/apps-engine/src/server/runtime/AppsEngineNodeRuntime.ts
+++ b/packages/apps-engine/src/server/runtime/AppsEngineNodeRuntime.ts
@@ -1,9 +1,9 @@
 import * as timers from 'timers';
 import * as vm from 'vm';
 
-import type { App } from '../../definition/App';
 import type { IAppsEngineRuntimeOptions } from './AppsEngineRuntime';
 import { APPS_ENGINE_RUNTIME_DEFAULT_TIMEOUT, AppsEngineRuntime, getFilenameForApp } from './AppsEngineRuntime';
+import type { App } from '../../definition/App';
 
 export class AppsEngineNodeRuntime extends AppsEngineRuntime {
     public static defaultRuntimeOptions = {
@@ -38,7 +38,10 @@ export class AppsEngineNodeRuntime extends AppsEngineRuntime {
         );
     }
 
-    constructor(private readonly app: App, private readonly customRequire: (mod: string) => any) {
+    constructor(
+        private readonly app: App,
+        private readonly customRequire: (mod: string) => any,
+    ) {
         super(app, customRequire);
     }
 
diff --git a/packages/apps-engine/src/server/runtime/deno/AppsEngineDenoRuntime.ts b/packages/apps-engine/src/server/runtime/deno/AppsEngineDenoRuntime.ts
index 5eb3b7cd0918..458799286c83 100644
--- a/packages/apps-engine/src/server/runtime/deno/AppsEngineDenoRuntime.ts
+++ b/packages/apps-engine/src/server/runtime/deno/AppsEngineDenoRuntime.ts
@@ -5,17 +5,18 @@ import { type Readable, EventEmitter } from 'stream';
 import debugFactory from 'debug';
 import * as jsonrpc from 'jsonrpc-lite';
 
+import { LivenessManager } from './LivenessManager';
+import { ProcessMessenger } from './ProcessMessenger';
+import { bundleLegacyApp } from './bundler';
+import { decoder } from './codec';
 import { AppStatus } from '../../../definition/AppStatus';
 import type { AppManager } from '../../AppManager';
 import type { AppBridges } from '../../bridges';
 import type { IParseAppPackageResult } from '../../compiler';
-import type { ILoggerStorageEntry } from '../../logging';
+import { AppConsole, type ILoggerStorageEntry } from '../../logging';
 import type { AppAccessorManager, AppApiManager } from '../../managers';
-import type { AppLogStorage } from '../../storage';
-import { LivenessManager } from './LivenessManager';
-import { ProcessMessenger } from './ProcessMessenger';
-import { bundleLegacyApp } from './bundler';
-import { decoder } from './codec';
+import type { AppLogStorage, IAppStorageItem } from '../../storage';
+import { AppMethod } from '../../../definition/metadata';
 
 const baseDebug = debugFactory('appsEngine:runtime:deno');
 
@@ -52,6 +53,18 @@ const COMMAND_PONG = '_zPONG';
 
 export const JSONRPC_METHOD_NOT_FOUND = -32601;
 
+export function getRuntimeTimeout() {
+    const defaultTimeout = 30000;
+    const envValue = isFinite(process.env.APPS_ENGINE_RUNTIME_TIMEOUT as any) ? Number(process.env.APPS_ENGINE_RUNTIME_TIMEOUT) : defaultTimeout;
+
+    if (envValue < 0) {
+        console.log('Environment variable APPS_ENGINE_RUNTIME_TIMEOUT has a negative value, ignoring...');
+        return defaultTimeout;
+    }
+
+    return envValue;
+}
+
 export function isValidOrigin(accessor: string): accessor is (typeof ALLOWED_ACCESSOR_METHODS)[number] {
     return ALLOWED_ACCESSOR_METHODS.includes(accessor as any);
 }
@@ -78,7 +91,7 @@ export class DenoRuntimeSubprocessController extends EventEmitter {
     private readonly debug: debug.Debugger;
 
     private readonly options = {
-        timeout: 10000,
+        timeout: getRuntimeTimeout(),
     };
 
     private readonly accessors: AppAccessorManager;
@@ -94,7 +107,11 @@ export class DenoRuntimeSubprocessController extends EventEmitter {
     private readonly livenessManager: LivenessManager;
 
     // We need to keep the appSource around in case the Deno process needs to be restarted
-    constructor(manager: AppManager, private readonly appPackage: IParseAppPackageResult) {
+    constructor(
+        manager: AppManager,
+        private readonly appPackage: IParseAppPackageResult,
+        private readonly storageItem: IAppStorageItem,
+    ) {
         super();
 
         this.debug = baseDebug.extend(appPackage.info.id);
@@ -125,17 +142,8 @@ export class DenoRuntimeSubprocessController extends EventEmitter {
             // process must be able to read in order to include files that use NPM packages
             const parentNodeModulesDir = path.dirname(path.join(appsEngineDir, '..'));
 
-            let hasNetworkingPermission = false;
-
-            // If the app doesn't request any permissions, it gets the default set of permissions, which includes "networking"
-            // If the app requests specific permissions, we need to check whether it requests "networking" or not
-            if (!this.appPackage.info.permissions || this.appPackage.info.permissions.findIndex((p) => p.name === 'networking.default')) {
-                hasNetworkingPermission = true;
-            }
-
             const options = [
                 'run',
-                hasNetworkingPermission ? '--allow-net' : '',
                 `--allow-read=${appsEngineDir},${parentNodeModulesDir}`,
                 `--allow-env=${ALLOWED_ENVIRONMENT_VARIABLES.join(',')}`,
                 denoWrapperPath,
@@ -143,6 +151,12 @@ export class DenoRuntimeSubprocessController extends EventEmitter {
                 this.appPackage.info.id,
             ];
 
+            // If the app doesn't request any permissions, it gets the default set of permissions, which includes "networking"
+            // If the app requests specific permissions, we need to check whether it requests "networking" or not
+            if (!this.appPackage.info.permissions || this.appPackage.info.permissions.findIndex((p) => p.name === 'networking') !== -1) {
+                options.splice(1, 0, '--allow-net');
+            }
+
             const environment = {
                 env: {
                     // We need to pass the PATH, otherwise the shell won't find the deno executable
@@ -165,28 +179,38 @@ export class DenoRuntimeSubprocessController extends EventEmitter {
         }
     }
 
-    public async killProcess(): Promise<void> {
+    /**
+     * Attempts to kill the process currently controlled by this.deno
+     *
+     * @returns boolean - if a process has been killed or not
+     */
+    public async killProcess(): Promise<boolean> {
         if (!this.deno) {
             this.debug('No child process reference');
-            return;
+            return false;
         }
 
+        let { killed } = this.deno;
+
         // This field is not populated if the process is killed by the OS
-        if (this.deno.killed) {
+        if (killed) {
             this.debug('App process was already killed');
-            return;
+            return killed;
         }
 
         // What else should we do?
         if (this.deno.kill('SIGKILL')) {
             // Let's wait until we get confirmation the process exited
             await new Promise<void>((r) => this.deno.on('exit', r));
+            killed = true;
         } else {
             this.debug('Tried killing the process but failed. Was it already dead?');
+            killed = false;
         }
 
         delete this.deno;
         this.messenger.clearReceiver();
+        return killed;
     }
 
     // Debug purposes, could be deleted later
@@ -237,19 +261,40 @@ export class DenoRuntimeSubprocessController extends EventEmitter {
 
     public async restartApp() {
         this.debug('Restarting app subprocess');
+        const logger = new AppConsole('runtime:restart');
+
+        logger.info('Starting restart procedure for app subprocess...', this.livenessManager.getRuntimeData());
 
         this.state = 'restarting';
 
-        await this.killProcess();
+        try {
+            const pid = this.deno?.pid;
 
-        await this.setupApp();
+            const hasKilled = await this.killProcess();
 
-        // setupApp() changes the state to 'ready' - we'll need to workaround that for now
-        this.state = 'restarting';
+            if (hasKilled) {
+                logger.debug('Process successfully terminated', { pid });
+            } else {
+                logger.warn('Could not terminate process. Maybe it was already dead?', { pid });
+            }
 
-        await this.sendRequest({ method: 'app:initialize' });
+            await this.setupApp();
+            logger.info('New subprocess successfully spawned', { pid: this.deno.pid });
 
-        this.state = 'ready';
+            // setupApp() changes the state to 'ready' - we'll need to workaround that for now
+            this.state = 'restarting';
+
+            await this.sendRequest({ method: 'app:initialize' });
+            await this.sendRequest({ method: 'app:setStatus', params: [this.storageItem.status] });
+
+            this.state = 'ready';
+
+            logger.info('Successfully restarted app subprocess');
+        } catch (e) {
+            logger.error("Failed to restart app's subprocess", { error: e });
+        } finally {
+            await this.logStorage.storeEntries(AppConsole.toStorageEntry(this.getAppId(), logger));
+        }
     }
 
     public getAppId(): string {
@@ -323,7 +368,7 @@ export class DenoRuntimeSubprocessController extends EventEmitter {
         this.deno.stderr.on('data', this.parseError.bind(this));
         this.deno.on('error', (err) => {
             this.state = 'invalid';
-            console.error('Failed to startup Deno subprocess', err);
+            console.error(`Failed to startup Deno subprocess for app ${this.getAppId()}`, err);
         });
         this.once('ready', this.onReady.bind(this));
         this.parseStdout(this.deno.stdout);
@@ -500,12 +545,28 @@ export class DenoRuntimeSubprocessController extends EventEmitter {
             case 'log':
                 console.log('SUBPROCESS LOG', message);
                 break;
+            case 'unhandledRejection':
+            case 'uncaughtException':
+                await this.logUnhandledError(`runtime:${method}`, message);
+                break;
             default:
                 console.warn('Unrecognized method from sub process');
                 break;
         }
     }
 
+    private async logUnhandledError(
+        method: `${AppMethod.RUNTIME_UNCAUGHT_EXCEPTION | AppMethod.RUNTIME_UNHANDLED_REJECTION}`,
+        message: jsonrpc.IParsedObjectRequest | jsonrpc.IParsedObjectNotification,
+    ) {
+        this.debug('Unhandled error of type "%s" caught in subprocess', method);
+
+        const logger = new AppConsole(method);
+        logger.error(message.payload);
+
+        await this.logStorage.storeEntries(AppConsole.toStorageEntry(this.getAppId(), logger));
+    }
+
     private async handleResultMessage(message: jsonrpc.IParsedObjectError | jsonrpc.IParsedObjectSuccess): Promise<void> {
         const { id } = message.payload;
 
diff --git a/packages/apps-engine/src/server/runtime/deno/LivenessManager.ts b/packages/apps-engine/src/server/runtime/deno/LivenessManager.ts
index 4fb2433e8e0a..2450b3f2ad50 100644
--- a/packages/apps-engine/src/server/runtime/deno/LivenessManager.ts
+++ b/packages/apps-engine/src/server/runtime/deno/LivenessManager.ts
@@ -10,7 +10,7 @@ const defaultOptions: LivenessManager['options'] = {
     pingRequestTimeout: 10000,
     pingFrequencyInMS: 10000,
     consecutiveTimeoutLimit: 4,
-    maxRestarts: 3,
+    maxRestarts: Infinity,
 };
 
 /**
@@ -65,6 +65,16 @@ export class LivenessManager {
         this.options = Object.assign({}, defaultOptions, options);
     }
 
+    public getRuntimeData() {
+        const { restartCount, pingTimeoutConsecutiveCount, restartLog } = this;
+
+        return {
+            restartCount,
+            pingTimeoutConsecutiveCount,
+            restartLog,
+        };
+    }
+
     public attach(deno: ChildProcess) {
         this.subprocess = deno;
 
@@ -122,7 +132,7 @@ export class LivenessManager {
 
                 if (reason === 'timeout' && this.pingTimeoutConsecutiveCount >= this.options.consecutiveTimeoutLimit) {
                     this.debug('Subprocess failed to respond to pings %d consecutive times. Attempting restart...', this.options.consecutiveTimeoutLimit);
-                    this.restartProcess();
+                    this.restartProcess('Too many pings timed out');
                     return false;
                 }
 
@@ -154,17 +164,21 @@ export class LivenessManager {
             return;
         }
 
+        let reason: string;
+
         // Otherwise we try to restart the subprocess, if possible
         if (signal) {
             this.debug('App has been killed (%s). Attempting restart #%d...', signal, this.restartCount + 1);
+            reason = `App has been killed with signal ${signal}`;
         } else {
             this.debug('App has exited with code %d. Attempting restart #%d...', exitCode, this.restartCount + 1);
+            reason = `App has exited with code ${exitCode}`;
         }
 
-        this.restartProcess();
+        this.restartProcess(reason);
     }
 
-    private restartProcess() {
+    private restartProcess(reason: string) {
         if (this.restartCount >= this.options.maxRestarts) {
             this.debug('Limit of restarts reached (%d). Aborting restart...', this.options.maxRestarts);
             this.controller.stopApp();
@@ -174,6 +188,7 @@ export class LivenessManager {
         this.pingTimeoutConsecutiveCount = 0;
         this.restartCount++;
         this.restartLog.push({
+            reason,
             restartedAt: new Date(),
             source: 'liveness-manager',
             pid: this.subprocess.pid,
diff --git a/packages/apps-engine/tests/server/accessors/Reader.spec.ts b/packages/apps-engine/tests/server/accessors/Reader.spec.ts
index f3aa299880b9..96a73bdee9fd 100644
--- a/packages/apps-engine/tests/server/accessors/Reader.spec.ts
+++ b/packages/apps-engine/tests/server/accessors/Reader.spec.ts
@@ -13,6 +13,7 @@ import type {
     IUserRead,
     IVideoConferenceRead,
 } from '../../../src/definition/accessors';
+import type { IContactRead } from '../../../src/definition/accessors/IContactRead';
 import type { IOAuthAppsReader } from '../../../src/definition/accessors/IOAuthAppsReader';
 import type { IThreadRead } from '../../../src/definition/accessors/IThreadRead';
 import { Reader } from '../../../src/server/accessors';
@@ -44,6 +45,8 @@ export class ReaderAccessorTestFixture {
 
     private role: IRoleRead;
 
+    private contact: IContactRead;
+
     @SetupFixture
     public setupFixture() {
         this.env = {} as IEnvironmentRead;
@@ -59,6 +62,7 @@ export class ReaderAccessorTestFixture {
         this.oauthApps = {} as IOAuthAppsReader;
         this.thread = {} as IThreadRead;
         this.role = {} as IRoleRead;
+        this.contact = {} as IContactRead;
     }
 
     @Test()
@@ -76,6 +80,7 @@ export class ReaderAccessorTestFixture {
                     this.upload,
                     this.cloud,
                     this.videoConf,
+                    this.contact,
                     this.oauthApps,
                     this.thread,
                     this.role,
@@ -93,6 +98,7 @@ export class ReaderAccessorTestFixture {
             this.upload,
             this.cloud,
             this.videoConf,
+            this.contact,
             this.oauthApps,
             this.thread,
             this.role,
diff --git a/packages/apps-engine/tests/server/runtime/DenoRuntimeSubprocessController.spec.ts b/packages/apps-engine/tests/server/runtime/DenoRuntimeSubprocessController.spec.ts
index 0e9c1f7f8786..5c675805e813 100644
--- a/packages/apps-engine/tests/server/runtime/DenoRuntimeSubprocessController.spec.ts
+++ b/packages/apps-engine/tests/server/runtime/DenoRuntimeSubprocessController.spec.ts
@@ -4,14 +4,16 @@ import * as path from 'path';
 import { TestFixture, Setup, Expect, AsyncTest, SpyOn, Any, AsyncSetupFixture, Teardown } from 'alsatian';
 import type { SuccessObject } from 'jsonrpc-lite';
 
+import { AppStatus } from '../../../src/definition/AppStatus';
 import { UserStatusConnection, UserType } from '../../../src/definition/users';
 import type { AppManager } from '../../../src/server/AppManager';
 import type { IParseAppPackageResult } from '../../../src/server/compiler';
 import { AppAccessorManager, AppApiManager } from '../../../src/server/managers';
 import { DenoRuntimeSubprocessController } from '../../../src/server/runtime/deno/AppsEngineDenoRuntime';
+import type { IAppStorageItem } from '../../../src/server/storage';
 import { TestInfastructureSetup } from '../../test-data/utilities';
 
-@TestFixture('DenoRuntimeSubprocessController')
+@TestFixture()
 export class DenuRuntimeSubprocessControllerTestFixture {
     private manager: AppManager;
 
@@ -19,6 +21,8 @@ export class DenuRuntimeSubprocessControllerTestFixture {
 
     private appPackage: IParseAppPackageResult;
 
+    private appStorageItem: IAppStorageItem;
+
     @AsyncSetupFixture
     public async fixture() {
         const infrastructure = new TestInfastructureSetup();
@@ -35,11 +39,16 @@ export class DenuRuntimeSubprocessControllerTestFixture {
         const appPackage = await fs.readFile(path.join(__dirname, '../../test-data/apps/hello-world-test_0.0.1.zip'));
 
         this.appPackage = await this.manager.getParser().unpackageApp(appPackage);
+
+        this.appStorageItem = {
+            id: 'hello-world-test',
+            status: AppStatus.MANUALLY_ENABLED,
+        } as IAppStorageItem;
     }
 
     @Setup
     public setup() {
-        this.controller = new DenoRuntimeSubprocessController(this.manager, this.appPackage);
+        this.controller = new DenoRuntimeSubprocessController(this.manager, this.appPackage, this.appStorageItem);
         this.controller.setupApp();
     }
 
diff --git a/packages/apps-engine/tests/test-data/bridges/appBridges.ts b/packages/apps-engine/tests/test-data/bridges/appBridges.ts
index e8e89f864101..f37dda0743ff 100644
--- a/packages/apps-engine/tests/test-data/bridges/appBridges.ts
+++ b/packages/apps-engine/tests/test-data/bridges/appBridges.ts
@@ -1,6 +1,33 @@
+import { TestOAuthAppsBridge } from './OAuthAppsBridge';
+import { TestsActivationBridge } from './activationBridge';
+import { TestsApiBridge } from './apiBridge';
+import { TestsAppDetailChangesBridge } from './appDetailChanges';
+import { TestAppCloudWorkspaceBridge } from './cloudBridge';
+import { TestsCommandBridge } from './commandBridge';
+import { TestContactBridge } from './contactBridge';
+import { TestsEmailBridge } from './emailBridge';
+import { TestsEnvironmentalVariableBridge } from './environmentalVariableBridge';
+import { TestsHttpBridge } from './httpBridge';
+import { TestsInternalBridge } from './internalBridge';
+import { TestsInternalFederationBridge } from './internalFederationBridge';
+import { TestLivechatBridge } from './livechatBridge';
+import { TestsMessageBridge } from './messageBridge';
+import { TestsModerationBridge } from './moderationBridge';
+import { TestsPersisBridge } from './persisBridge';
+import { TestsRoleBridge } from './roleBridge';
+import { TestsRoomBridge } from './roomBridge';
+import { TestSchedulerBridge } from './schedulerBridge';
+import { TestsServerSettingBridge } from './serverSettingBridge';
+import { TestsThreadBridge } from './threadBridge';
+import { TestsUiIntegrationBridge } from './uiIntegrationBridge';
+import { TestUploadBridge } from './uploadBridge';
+import { TestsUserBridge } from './userBridge';
+import { TestsVideoConferenceBridge } from './videoConferenceBridge';
+import { AppBridges } from '../../../src/server/bridges';
 import type {
     AppActivationBridge,
     AppDetailChangesBridge,
+    ContactBridge,
     EnvironmentalVariableBridge,
     HttpBridge,
     IInternalBridge,
@@ -18,36 +45,11 @@ import type {
     UserBridge,
     VideoConferenceBridge,
 } from '../../../src/server/bridges';
-import { AppBridges } from '../../../src/server/bridges';
 import type { CloudWorkspaceBridge } from '../../../src/server/bridges/CloudWorkspaceBridge';
 import type { EmailBridge } from '../../../src/server/bridges/EmailBridge';
 import type { IInternalFederationBridge } from '../../../src/server/bridges/IInternalFederationBridge';
 import type { OAuthAppsBridge } from '../../../src/server/bridges/OAuthAppsBridge';
 import type { ThreadBridge } from '../../../src/server/bridges/ThreadBridge';
-import { TestOAuthAppsBridge } from './OAuthAppsBridge';
-import { TestsActivationBridge } from './activationBridge';
-import { TestsApiBridge } from './apiBridge';
-import { TestsAppDetailChangesBridge } from './appDetailChanges';
-import { TestAppCloudWorkspaceBridge } from './cloudBridge';
-import { TestsCommandBridge } from './commandBridge';
-import { TestsEmailBridge } from './emailBridge';
-import { TestsEnvironmentalVariableBridge } from './environmentalVariableBridge';
-import { TestsHttpBridge } from './httpBridge';
-import { TestsInternalBridge } from './internalBridge';
-import { TestsInternalFederationBridge } from './internalFederationBridge';
-import { TestLivechatBridge } from './livechatBridge';
-import { TestsMessageBridge } from './messageBridge';
-import { TestsModerationBridge } from './moderationBridge';
-import { TestsPersisBridge } from './persisBridge';
-import { TestsRoleBridge } from './roleBridge';
-import { TestsRoomBridge } from './roomBridge';
-import { TestSchedulerBridge } from './schedulerBridge';
-import { TestsServerSettingBridge } from './serverSettingBridge';
-import { TestsThreadBridge } from './threadBridge';
-import { TestsUiIntegrationBridge } from './uiIntegrationBridge';
-import { TestUploadBridge } from './uploadBridge';
-import { TestsUserBridge } from './userBridge';
-import { TestsVideoConferenceBridge } from './videoConferenceBridge';
 
 export class TestsAppBridges extends AppBridges {
     private readonly appDetails: TestsAppDetailChangesBridge;
@@ -84,6 +86,8 @@ export class TestsAppBridges extends AppBridges {
 
     private readonly emailBridge: EmailBridge;
 
+    private readonly contactBridge: ContactBridge;
+
     private readonly uiIntegrationBridge: TestsUiIntegrationBridge;
 
     private readonly schedulerBridge: TestSchedulerBridge;
@@ -124,6 +128,7 @@ export class TestsAppBridges extends AppBridges {
         this.internalFederationBridge = new TestsInternalFederationBridge();
         this.threadBridge = new TestsThreadBridge();
         this.emailBridge = new TestsEmailBridge();
+        this.contactBridge = new TestContactBridge();
     }
 
     public getCommandBridge(): TestsCommandBridge {
@@ -225,4 +230,8 @@ export class TestsAppBridges extends AppBridges {
     public getInternalFederationBridge(): IInternalFederationBridge {
         return this.internalFederationBridge;
     }
+
+    public getContactBridge(): ContactBridge {
+        return this.contactBridge;
+    }
 }
diff --git a/packages/apps-engine/tests/test-data/bridges/contactBridge.ts b/packages/apps-engine/tests/test-data/bridges/contactBridge.ts
new file mode 100644
index 000000000000..2a734516f55d
--- /dev/null
+++ b/packages/apps-engine/tests/test-data/bridges/contactBridge.ts
@@ -0,0 +1,16 @@
+import type { ILivechatContact } from '../../../src/definition/livechat';
+import { ContactBridge } from '../../../src/server/bridges';
+
+export class TestContactBridge extends ContactBridge {
+    protected addContactEmail(contactId: ILivechatContact['_id'], email: string, appId: string): Promise<ILivechatContact> {
+        throw new Error('Method not implemented.');
+    }
+
+    protected getById(id: ILivechatContact['_id']): Promise<ILivechatContact> {
+        throw new Error('Method not implemented.');
+    }
+
+    protected verifyContact(verifyContactChannelParams: { contactId: string; field: string; value: string; visitorId: string; roomId: string }): Promise<void> {
+        throw new Error('Method not implemented.');
+    }
+}
diff --git a/packages/apps-engine/tests/test-data/utilities.ts b/packages/apps-engine/tests/test-data/utilities.ts
index a565702bebe7..4468c03f90b1 100644
--- a/packages/apps-engine/tests/test-data/utilities.ts
+++ b/packages/apps-engine/tests/test-data/utilities.ts
@@ -1,3 +1,7 @@
+import { TestsAppBridges } from './bridges/appBridges';
+import { TestSourceStorage } from './storage/TestSourceStorage';
+import { TestsAppLogStorage } from './storage/logStorage';
+import { TestsAppStorage } from './storage/storage';
 import { AppStatus } from '../../src/definition/AppStatus';
 import type { IHttp, IModify, IPersistence, IRead } from '../../src/definition/accessors';
 import { HttpStatusCode } from '../../src/definition/accessors';
@@ -32,10 +36,6 @@ import type { AppRuntimeManager } from '../../src/server/managers/AppRuntimeMana
 import type { UIActionButtonManager } from '../../src/server/managers/UIActionButtonManager';
 import type { DenoRuntimeSubprocessController } from '../../src/server/runtime/deno/AppsEngineDenoRuntime';
 import type { AppLogStorage, AppMetadataStorage, AppSourceStorage, IAppStorageItem } from '../../src/server/storage';
-import { TestsAppBridges } from './bridges/appBridges';
-import { TestSourceStorage } from './storage/TestSourceStorage';
-import { TestsAppLogStorage } from './storage/logStorage';
-import { TestsAppStorage } from './storage/storage';
 
 export class TestInfastructureSetup {
     private appStorage: TestsAppStorage;
diff --git a/packages/apps/CHANGELOG.md b/packages/apps/CHANGELOG.md
index 531db6e2d896..f76acaa59c99 100644
--- a/packages/apps/CHANGELOG.md
+++ b/packages/apps/CHANGELOG.md
@@ -1,5 +1,46 @@
 # @rocket.chat/apps
 
+## 0.2.1-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.3
+  - @rocket.chat/model-typings@1.1.0-rc.3
+  </details>
+
+## 0.2.1-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.2
+  - @rocket.chat/model-typings@1.1.0-rc.2
+  </details>
+
+## 0.2.1-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.1
+  - @rocket.chat/model-typings@1.1.0-rc.1
+  </details>
+
+## 0.2.1-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [82767d8fd8a52ac348e8aded1d238e688d36129b, 80e36bfc3938775eb26aa5576f1b9b98896e1cc4, 3569b0a9c48f8b94ebaef2f8b607c52fdb8e570a, b4841cb7206d855d7a1bc7604683a5b4a48b7176, 32d93a0666fa1cbe857d02889e93d9bbf45bd4f0, ce7024af36fcde97b1da5b2731f6edc4a4c236b8, d398866dba725918017e3609807f9d0ab9b89b72, d398866dba725918017e3609807f9d0ab9b89b72]:</summary>
+
+  - @rocket.chat/apps-engine@1.48.0-rc.0
+  - @rocket.chat/model-typings@1.1.0-rc.0
+  - @rocket.chat/core-typings@7.1.0-rc.0
+  </details>
+
 ## 0.2.0
 
 ### Patch Changes
diff --git a/packages/apps/package.json b/packages/apps/package.json
index 40831d302751..ed52e9b4537a 100644
--- a/packages/apps/package.json
+++ b/packages/apps/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/apps",
-	"version": "0.2.0",
+	"version": "0.2.1-rc.3",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/apps/src/AppsEngine.ts b/packages/apps/src/AppsEngine.ts
index b85672d23f5a..3b3f43e6e3be 100644
--- a/packages/apps/src/AppsEngine.ts
+++ b/packages/apps/src/AppsEngine.ts
@@ -6,6 +6,7 @@ export type {
 	IVisitor as IAppsVisitor,
 	IVisitorEmail as IAppsVisitorEmail,
 	IVisitorPhone as IAppsVisitorPhone,
+	ILivechatContact as IAppsLivechatContact,
 } from '@rocket.chat/apps-engine/definition/livechat';
 export type { IMessage as IAppsMessage } from '@rocket.chat/apps-engine/definition/messages';
 export type { IMessageRaw as IAppsMesssageRaw } from '@rocket.chat/apps-engine/definition/messages';
diff --git a/packages/apps/src/converters/IAppContactsConverter.ts b/packages/apps/src/converters/IAppContactsConverter.ts
new file mode 100644
index 000000000000..1a69e9debbbf
--- /dev/null
+++ b/packages/apps/src/converters/IAppContactsConverter.ts
@@ -0,0 +1,14 @@
+import type { ILivechatContact } from '@rocket.chat/core-typings';
+
+import type { IAppsLivechatContact } from '../AppsEngine';
+
+export interface IAppContactsConverter {
+	convertById(contactId: ILivechatContact['_id']): Promise<IAppsLivechatContact | undefined>;
+
+	convertContact(contact: undefined | null): Promise<undefined>;
+	convertContact(contact: ILivechatContact): Promise<IAppsLivechatContact>;
+	convertContact(contact: ILivechatContact | undefined | null): Promise<IAppsLivechatContact | undefined>;
+	convertAppContact(contact: undefined | null): Promise<undefined>;
+	convertAppContact(contact: IAppsLivechatContact): Promise<ILivechatContact>;
+	convertAppContact(contact: IAppsLivechatContact | undefined | null): Promise<ILivechatContact | undefined>;
+}
diff --git a/packages/apps/src/converters/IAppConvertersMap.ts b/packages/apps/src/converters/IAppConvertersMap.ts
index 63c94d44cb75..9813195a0edb 100644
--- a/packages/apps/src/converters/IAppConvertersMap.ts
+++ b/packages/apps/src/converters/IAppConvertersMap.ts
@@ -1,3 +1,4 @@
+import type { IAppContactsConverter } from './IAppContactsConverter';
 import type { IAppDepartmentsConverter } from './IAppDepartmentsConverter';
 import type { IAppMessagesConverter } from './IAppMessagesConverter';
 import type { IAppRolesConverter } from './IAppRolesConverter';
@@ -10,6 +11,7 @@ import type { IAppVideoConferencesConverter } from './IAppVideoConferencesConver
 import type { IAppVisitorsConverter } from './IAppVisitorsConverter';
 
 type AppConverters = {
+	contacts: IAppContactsConverter;
 	departments: IAppDepartmentsConverter;
 	messages: IAppMessagesConverter;
 	rooms: IAppRoomsConverter;
diff --git a/packages/apps/src/converters/index.ts b/packages/apps/src/converters/index.ts
index 61560afb5a4e..049e93864b03 100644
--- a/packages/apps/src/converters/index.ts
+++ b/packages/apps/src/converters/index.ts
@@ -1,3 +1,4 @@
+export * from './IAppContactsConverter';
 export * from './IAppConvertersMap';
 export * from './IAppDepartmentsConverter';
 export * from './IAppMessagesConverter';
diff --git a/packages/base64/package.json b/packages/base64/package.json
index 2e6c2ab9d002..2d9c9b101efb 100644
--- a/packages/base64/package.json
+++ b/packages/base64/package.json
@@ -13,8 +13,8 @@
 		"test": "jest"
 	},
 	"devDependencies": {
-		"@babel/core": "~7.25.8",
-		"@babel/preset-env": "~7.25.8",
+		"@babel/core": "~7.26.0",
+		"@babel/preset-env": "~7.26.0",
 		"@rocket.chat/eslint-config": "workspace:^",
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@typescript-eslint/eslint-plugin": "~5.60.1",
diff --git a/packages/base64/src/base64.ts b/packages/base64/src/base64.ts
index c35c76254a10..8cc2ec80bc64 100644
--- a/packages/base64/src/base64.ts
+++ b/packages/base64/src/base64.ts
@@ -11,23 +11,7 @@ for (let i = 0; i < BASE_64_CHARS.length; i++) {
 	BASE_64_VALS[getChar(i)] = i;
 }
 
-// XXX This is a weird place for this to live, but it's used both by
-// this package and 'ejson', and we can't put it in 'ejson' without
-// introducing a circular dependency. It should probably be in its own
-// package or as a helper in a package that both 'base64' and 'ejson'
-// use.
-const newBinary = (len: number) => {
-	if (typeof Uint8Array === 'undefined' || typeof ArrayBuffer === 'undefined') {
-		const ret = Object.assign(
-			Array.from({ length: len }, () => 0),
-			{
-				$Uint8ArrayPolyfill: true,
-			},
-		);
-		return ret;
-	}
-	return new Uint8Array(new ArrayBuffer(len));
-};
+const newBinary = (len: number) => new Uint8Array(new ArrayBuffer(len));
 
 const encode = (array: ArrayLike<number> | string) => {
 	if (typeof array === 'string') {
diff --git a/packages/cas-validate/package.json b/packages/cas-validate/package.json
index b606e0812951..293392baf20b 100644
--- a/packages/cas-validate/package.json
+++ b/packages/cas-validate/package.json
@@ -19,6 +19,6 @@
 		"/dist"
 	],
 	"dependencies": {
-		"cheerio": "1.0.0-rc.10"
+		"cheerio": "1.0.0"
 	}
 }
diff --git a/packages/core-services/CHANGELOG.md b/packages/core-services/CHANGELOG.md
index 4eb78174ca12..677775b6d1b6 100644
--- a/packages/core-services/CHANGELOG.md
+++ b/packages/core-services/CHANGELOG.md
@@ -1,5 +1,51 @@
 # @rocket.chat/core-services
 
+## 0.7.2-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.3
+  - @rocket.chat/rest-typings@7.1.0-rc.3
+  - @rocket.chat/models@1.0.1-rc.3
+  </details>
+
+## 0.7.2-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.2
+  - @rocket.chat/rest-typings@7.1.0-rc.2
+  - @rocket.chat/models@1.0.1-rc.2
+  </details>
+
+## 0.7.2-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.1
+  - @rocket.chat/rest-typings@7.1.0-rc.1
+  - @rocket.chat/models@1.0.1-rc.1
+  </details>
+
+## 0.7.2-rc.0
+
+### Patch Changes
+
+- ([#33719](https://github.com/RocketChat/Rocket.Chat/pull/33719)) stops calling an object through proxy calling getQueueWorker
+
+- <details><summary>Updated dependencies [80e36bfc3938775eb26aa5576f1b9b98896e1cc4, e7edeac3bdd22da0a04b8e873d5a008e249fb4be, 32d93a0666fa1cbe857d02889e93d9bbf45bd4f0]:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.0
+  - @rocket.chat/rest-typings@7.1.0-rc.0
+  - @rocket.chat/models@1.0.1-rc.0
+  </details>
+
 ## 0.7.1
 
 ### Patch Changes
diff --git a/packages/core-services/package.json b/packages/core-services/package.json
index c669873c2fc0..d5cde551a465 100644
--- a/packages/core-services/package.json
+++ b/packages/core-services/package.json
@@ -1,20 +1,20 @@
 {
 	"name": "@rocket.chat/core-services",
-	"version": "0.7.1",
+	"version": "0.7.2-rc.3",
 	"private": true,
 	"devDependencies": {
-		"@babel/core": "~7.25.8",
-		"@babel/preset-env": "~7.25.8",
-		"@babel/preset-typescript": "~7.25.7",
+		"@babel/core": "~7.26.0",
+		"@babel/preset-env": "~7.26.0",
+		"@babel/preset-typescript": "~7.26.0",
 		"@rocket.chat/apps-engine": "workspace:^",
 		"@rocket.chat/eslint-config": "workspace:^",
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@types/jest": "~29.5.13",
-		"babel-jest": "^29.5.0",
+		"@types/jest": "~29.5.14",
+		"babel-jest": "^29.7.0",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"mongodb": "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch",
-		"prettier": "~2.8.8",
+		"prettier": "~3.3.3",
 		"typescript": "~5.6.3"
 	},
 	"scripts": {
@@ -34,7 +34,7 @@
 	},
 	"dependencies": {
 		"@rocket.chat/core-typings": "workspace:^",
-		"@rocket.chat/icons": "~0.38.0",
+		"@rocket.chat/icons": "~0.39.0",
 		"@rocket.chat/message-parser": "workspace:^",
 		"@rocket.chat/models": "workspace:^",
 		"@rocket.chat/rest-typings": "workspace:^",
diff --git a/packages/core-services/src/LocalBroker.ts b/packages/core-services/src/LocalBroker.ts
index 28aa0bc4fc80..4420ab1a9e2d 100644
--- a/packages/core-services/src/LocalBroker.ts
+++ b/packages/core-services/src/LocalBroker.ts
@@ -36,10 +36,6 @@ export class LocalBroker implements IBroker {
 		);
 	}
 
-	async waitAndCall(method: string, data: any): Promise<any> {
-		return this.call(method, data);
-	}
-
 	async destroyService(instance: ServiceClass): Promise<void> {
 		const namespace = instance.getName();
 
diff --git a/packages/core-services/src/MeteorError.ts b/packages/core-services/src/MeteorError.ts
index f86c55eb2c2a..4eebbbc5af74 100644
--- a/packages/core-services/src/MeteorError.ts
+++ b/packages/core-services/src/MeteorError.ts
@@ -3,7 +3,11 @@ export class MeteorError extends Error {
 
 	public readonly errorType = 'Meteor.Error';
 
-	public constructor(public readonly error: string | number, public readonly reason?: string, public readonly details?: any) {
+	public constructor(
+		public readonly error: string | number,
+		public readonly reason?: string,
+		public readonly details?: any,
+	) {
 		super(`${reason ? `${reason} ` : ''}[${String(error)}]`);
 	}
 
diff --git a/packages/core-services/src/index.ts b/packages/core-services/src/index.ts
index c9cfa82caabb..a0b3f65ded0c 100644
--- a/packages/core-services/src/index.ts
+++ b/packages/core-services/src/index.ts
@@ -1,4 +1,4 @@
-import { proxify, proxifyWithWait } from './lib/proxify';
+import { proxify } from './lib/proxify';
 import type { IAccount, ILoginResult } from './types/IAccount';
 import type { IAnalyticsService } from './types/IAnalyticsService';
 import { IApiService } from './types/IApiService';
@@ -124,7 +124,7 @@ export {
 	IVoipFreeSwitchService,
 	NPSCreatePayload,
 	NPSVotePayload,
-	proxifyWithWait,
+	proxify,
 	ResizeResult,
 	RoomAccessValidator,
 	TelemetryEvents,
@@ -155,42 +155,42 @@ export const dbWatchersDisabled =
 	(process.env.NODE_ENV !== 'production' && !['no', 'false'].includes(disabledEnvVar));
 
 // TODO think in a way to not have to pass the service name to proxify here as well
-export const Authorization = proxifyWithWait<IAuthorization>('authorization');
-export const Apps = proxifyWithWait<IAppsEngineService>('apps-engine');
-export const Presence = proxifyWithWait<IPresence>('presence');
-export const Account = proxifyWithWait<IAccount>('accounts');
-export const License = proxifyWithWait<ILicense>('license');
-export const MeteorService = proxifyWithWait<IMeteor>('meteor');
-export const Banner = proxifyWithWait<IBannerService>('banner');
-export const UiKitCoreApp = proxifyWithWait<IUiKitCoreAppService>('uikit-core-app');
-export const NPS = proxifyWithWait<INPSService>('nps');
-export const Team = proxifyWithWait<ITeamService>('team');
-export const MessageReads = proxifyWithWait<IMessageReadsService>('message-reads');
-export const Room = proxifyWithWait<IRoomService>('room');
-export const Media = proxifyWithWait<IMediaService>('media');
-export const VoipAsterisk = proxifyWithWait<IVoipService>('voip-asterisk');
-export const VoipFreeSwitch = proxifyWithWait<IVoipFreeSwitchService>('voip-freeswitch');
-export const LivechatVoip = proxifyWithWait<IOmnichannelVoipService>('omnichannel-voip');
-export const Analytics = proxifyWithWait<IAnalyticsService>('analytics');
-export const LDAP = proxifyWithWait<ILDAPService>('ldap');
-export const SAUMonitor = proxifyWithWait<ISAUMonitorService>('sau-monitor');
-export const DeviceManagement = proxifyWithWait<IDeviceManagementService>('device-management');
-export const VideoConf = proxifyWithWait<IVideoConfService>('video-conference');
-export const Upload = proxifyWithWait<IUploadService>('upload');
-export const Calendar = proxifyWithWait<ICalendarService>('calendar');
-export const QueueWorker = proxifyWithWait<IQueueWorkerService>('queue-worker');
-export const OmnichannelTranscript = proxifyWithWait<IOmnichannelTranscriptService>('omnichannel-transcript');
-export const Message = proxifyWithWait<IMessageService>('message');
-export const Translation = proxifyWithWait<ITranslationService>('translation');
-export const Settings = proxifyWithWait<ISettingsService>('settings');
-export const OmnichannelIntegration = proxifyWithWait<IOmnichannelIntegrationService>('omnichannel-integration');
-export const Federation = proxifyWithWait<IFederationService>('federation');
-export const FederationEE = proxifyWithWait<IFederationServiceEE>('federation-enterprise');
-export const Omnichannel = proxifyWithWait<IOmnichannelService>('omnichannel');
-export const OmnichannelEEService = proxifyWithWait<IOmnichannelEEService>('omnichannel-ee');
-export const Import = proxifyWithWait<IImportService>('import');
-export const OmnichannelAnalytics = proxifyWithWait<IOmnichannelAnalyticsService>('omnichannel-analytics');
-export const User = proxifyWithWait<IUserService>('user');
+export const Authorization = proxify<IAuthorization>('authorization');
+export const Apps = proxify<IAppsEngineService>('apps-engine');
+export const Presence = proxify<IPresence>('presence');
+export const Account = proxify<IAccount>('accounts');
+export const License = proxify<ILicense>('license');
+export const MeteorService = proxify<IMeteor>('meteor');
+export const Banner = proxify<IBannerService>('banner');
+export const UiKitCoreApp = proxify<IUiKitCoreAppService>('uikit-core-app');
+export const NPS = proxify<INPSService>('nps');
+export const Team = proxify<ITeamService>('team');
+export const MessageReads = proxify<IMessageReadsService>('message-reads');
+export const Room = proxify<IRoomService>('room');
+export const Media = proxify<IMediaService>('media');
+export const VoipAsterisk = proxify<IVoipService>('voip-asterisk');
+export const VoipFreeSwitch = proxify<IVoipFreeSwitchService>('voip-freeswitch');
+export const LivechatVoip = proxify<IOmnichannelVoipService>('omnichannel-voip');
+export const Analytics = proxify<IAnalyticsService>('analytics');
+export const LDAP = proxify<ILDAPService>('ldap');
+export const SAUMonitor = proxify<ISAUMonitorService>('sau-monitor');
+export const DeviceManagement = proxify<IDeviceManagementService>('device-management');
+export const VideoConf = proxify<IVideoConfService>('video-conference');
+export const Upload = proxify<IUploadService>('upload');
+export const Calendar = proxify<ICalendarService>('calendar');
+export const QueueWorker = proxify<IQueueWorkerService>('queue-worker');
+export const OmnichannelTranscript = proxify<IOmnichannelTranscriptService>('omnichannel-transcript');
+export const Message = proxify<IMessageService>('message');
+export const Translation = proxify<ITranslationService>('translation');
+export const Settings = proxify<ISettingsService>('settings');
+export const OmnichannelIntegration = proxify<IOmnichannelIntegrationService>('omnichannel-integration');
+export const Federation = proxify<IFederationService>('federation');
+export const FederationEE = proxify<IFederationServiceEE>('federation-enterprise');
+export const Omnichannel = proxify<IOmnichannelService>('omnichannel');
+export const OmnichannelEEService = proxify<IOmnichannelEEService>('omnichannel-ee');
+export const Import = proxify<IImportService>('import');
+export const OmnichannelAnalytics = proxify<IOmnichannelAnalyticsService>('omnichannel-analytics');
+export const User = proxify<IUserService>('user');
 
 // Calls without wait. Means that the service is optional and the result may be an error
 // of service/method not available
diff --git a/packages/core-services/src/lib/Api.ts b/packages/core-services/src/lib/Api.ts
index d09b821b601e..de028dcafd1d 100644
--- a/packages/core-services/src/lib/Api.ts
+++ b/packages/core-services/src/lib/Api.ts
@@ -41,10 +41,6 @@ export class Api implements IApiService {
 		return this.broker?.call(method, data);
 	}
 
-	async waitAndCall(method: string, data: any): Promise<any> {
-		return this.broker?.waitAndCall(method, data);
-	}
-
 	async broadcast<T extends keyof EventSignatures>(event: T, ...args: Parameters<EventSignatures[T]>): Promise<void> {
 		if (!this.broker) {
 			throw new Error(`No broker set to broadcast: ${event}, ${JSON.stringify(args)}`);
diff --git a/packages/core-services/src/lib/asyncLocalStorage.ts b/packages/core-services/src/lib/asyncLocalStorage.ts
index cec53d979e97..a2e07fabada5 100644
--- a/packages/core-services/src/lib/asyncLocalStorage.ts
+++ b/packages/core-services/src/lib/asyncLocalStorage.ts
@@ -1,4 +1,4 @@
-import type { IServiceContext } from '../types/ServiceClass';
 import { AsyncContextStore } from './ContextStore';
+import type { IServiceContext } from '../types/ServiceClass';
 
 export const asyncLocalStorage = new AsyncContextStore<IServiceContext>();
diff --git a/packages/core-services/src/lib/proxify.ts b/packages/core-services/src/lib/proxify.ts
index 2d712b8fd149..ac7d551ac7cd 100644
--- a/packages/core-services/src/lib/proxify.ts
+++ b/packages/core-services/src/lib/proxify.ts
@@ -1,35 +1,22 @@
 import { api } from '../api';
 
-type Prom<T> = {
-	[K in keyof T as T[K] extends (...params: any) => any ? K : never]: T[K] extends (...params: any) => Promise<any>
+type Promisify<T> = {
+	[K in keyof T as T[K] extends (...params: any[]) => unknown ? K : never]: T[K] extends (...params: any[]) => Promise<any>
 		? T[K]
 		: T[K] extends (...params: infer P) => infer R
-		? (...params: P) => Promise<R>
-		: never;
+			? (...params: P) => Promise<R>
+			: never;
 };
 
-type PromOrError<T> = {
-	[K in keyof T as T[K] extends (...params: any) => any ? K : never]: T[K] extends (...params: any) => Promise<any>
-		? T[K]
-		: T[K] extends (...params: infer P) => infer R
-		? (...params: P) => Promise<R | Error>
-		: never;
-};
-
-function handler<T extends object>(namespace: string, waitService: boolean): ProxyHandler<T> {
+function handler<T extends object>(namespace: string): ProxyHandler<T> {
 	return {
 		get:
 			(_target: T, prop: string): any =>
 			(...params: any): Promise<any> =>
-				api[waitService ? 'waitAndCall' : 'call'](`${namespace}.${prop}`, params),
+				api.call(`${namespace}.${prop}`, params),
 	};
 }
 
-// TODO remove the need to wait for a service, if that is really needed it should have a dependency on startup
-export function proxifyWithWait<T>(namespace: string): Prom<T> {
-	return new Proxy({}, handler(namespace, true)) as unknown as Prom<T>;
-}
-
-export function proxify<T>(namespace: string): PromOrError<T> {
-	return new Proxy({}, handler(namespace, false)) as unknown as PromOrError<T>;
+export function proxify<T>(namespace: string): Promisify<T> {
+	return new Proxy({}, handler(namespace)) as unknown as Promisify<T>;
 }
diff --git a/packages/core-services/src/types/IApiService.ts b/packages/core-services/src/types/IApiService.ts
index 802ae04ab5e2..bff4bc3a2d82 100644
--- a/packages/core-services/src/types/IApiService.ts
+++ b/packages/core-services/src/types/IApiService.ts
@@ -1,6 +1,6 @@
-import type { EventSignatures } from '../events/Events';
 import type { IBroker, IBrokerNode } from './IBroker';
 import type { IServiceClass } from './ServiceClass';
+import type { EventSignatures } from '../events/Events';
 
 export interface IApiService {
 	setBroker(broker: IBroker): void;
@@ -11,8 +11,6 @@ export interface IApiService {
 
 	call(method: string, data?: unknown): Promise<any>;
 
-	waitAndCall(method: string, data: any): Promise<any>;
-
 	broadcast<T extends keyof EventSignatures>(event: T, ...args: Parameters<EventSignatures[T]>): Promise<void>;
 
 	broadcastToServices<T extends keyof EventSignatures>(
diff --git a/packages/core-services/src/types/IBroker.ts b/packages/core-services/src/types/IBroker.ts
index d75b25de3452..d72221a09cab 100644
--- a/packages/core-services/src/types/IBroker.ts
+++ b/packages/core-services/src/types/IBroker.ts
@@ -1,5 +1,5 @@
-import type { EventSignatures } from '../events/Events';
 import type { IServiceClass } from './ServiceClass';
+import type { EventSignatures } from '../events/Events';
 
 export interface IBrokerNode {
 	id: string;
@@ -51,7 +51,6 @@ export interface IBroker {
 	destroyService(service: IServiceClass): Promise<void>;
 	createService(service: IServiceClass, serviceDependencies?: string[]): void;
 	call(method: string, data: any): Promise<any>;
-	waitAndCall(method: string, data: any): Promise<any>;
 	broadcastToServices<T extends keyof EventSignatures>(
 		services: string[],
 		event: T,
diff --git a/packages/core-services/src/types/IOmnichannelService.ts b/packages/core-services/src/types/IOmnichannelService.ts
index 73006641c8cd..ac2a1eb57765 100644
--- a/packages/core-services/src/types/IOmnichannelService.ts
+++ b/packages/core-services/src/types/IOmnichannelService.ts
@@ -1,8 +1,7 @@
-import type { AtLeast, IOmnichannelQueue, IOmnichannelRoom } from '@rocket.chat/core-typings';
+import type { AtLeast, IOmnichannelRoom } from '@rocket.chat/core-typings';
 
 import type { IServiceClass } from './ServiceClass';
 
 export interface IOmnichannelService extends IServiceClass {
-	getQueueWorker(): IOmnichannelQueue;
 	isWithinMACLimit(_room: AtLeast<IOmnichannelRoom, 'v'>): Promise<boolean>;
 }
diff --git a/packages/core-services/src/types/ServiceClass.ts b/packages/core-services/src/types/ServiceClass.ts
index 5e6b202a103d..b6554919045b 100644
--- a/packages/core-services/src/types/ServiceClass.ts
+++ b/packages/core-services/src/types/ServiceClass.ts
@@ -1,9 +1,9 @@
 import { EventEmitter } from 'events';
 
-import type { EventSignatures } from '../events/Events';
-import { asyncLocalStorage } from '../lib/asyncLocalStorage';
 import type { IApiService } from './IApiService';
 import type { IBroker, IBrokerNode } from './IBroker';
+import type { EventSignatures } from '../events/Events';
+import { asyncLocalStorage } from '../lib/asyncLocalStorage';
 
 export interface IServiceContext {
 	id: string; // Context ID
diff --git a/packages/core-typings/CHANGELOG.md b/packages/core-typings/CHANGELOG.md
index bc557fcc3224..6344028c9624 100644
--- a/packages/core-typings/CHANGELOG.md
+++ b/packages/core-typings/CHANGELOG.md
@@ -1,5 +1,28 @@
 # @rocket.chat/core-typings
 
+## 7.1.0-rc.3
+
+## 7.1.0-rc.2
+
+## 7.1.0-rc.1
+
+## 7.1.0-rc.0
+
+### Minor Changes
+
+- ([#32727](https://github.com/RocketChat/Rocket.Chat/pull/32727)) These changes aims to add:
+  - A brand-new omnichannel contact profile
+  - The ability to communicate with known contacts only
+  - Communicate with verified contacts only
+  - Merge verified contacts across different channels
+  - Block contact channels
+  - Resolve conflicting contact information when registered via different channels
+  - An advanced contact center filters
+
+### Patch Changes
+
+- ([#32991](https://github.com/RocketChat/Rocket.Chat/pull/32991)) Fixes an issue where updating custom emojis didn’t work as expected, ensuring that uploaded emojis now update correctly and display without any caching problems.
+
 ## 7.0.0
 
 ### Major Changes
diff --git a/packages/core-typings/package.json b/packages/core-typings/package.json
index e2251ddc3f9b..a023ab119c88 100644
--- a/packages/core-typings/package.json
+++ b/packages/core-typings/package.json
@@ -2,13 +2,13 @@
 	"$schema": "https://json.schemastore.org/package",
 	"name": "@rocket.chat/core-typings",
 	"private": true,
-	"version": "7.0.0",
+	"version": "7.1.0-rc.3",
 	"devDependencies": {
 		"@rocket.chat/apps-engine": "workspace:^",
 		"@rocket.chat/eslint-config": "workspace:^",
 		"eslint": "~8.45.0",
 		"mongodb": "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch",
-		"prettier": "~2.8.8",
+		"prettier": "~3.3.3",
 		"typescript": "~5.6.3"
 	},
 	"scripts": {
@@ -24,7 +24,7 @@
 		"/dist"
 	],
 	"dependencies": {
-		"@rocket.chat/icons": "~0.38.0",
+		"@rocket.chat/icons": "~0.39.0",
 		"@rocket.chat/message-parser": "workspace:^",
 		"@rocket.chat/ui-kit": "workspace:~",
 		"@types/express": "^4.17.21"
diff --git a/packages/core-typings/src/IEmojiCustom.ts b/packages/core-typings/src/IEmojiCustom.ts
index 98bbc9121d47..bc9b02fe818d 100644
--- a/packages/core-typings/src/IEmojiCustom.ts
+++ b/packages/core-typings/src/IEmojiCustom.ts
@@ -4,4 +4,5 @@ export interface IEmojiCustom extends IRocketChatRecord {
 	name: string;
 	aliases: string[];
 	extension: string;
+	etag?: string;
 }
diff --git a/packages/core-typings/src/IInquiry.ts b/packages/core-typings/src/IInquiry.ts
index 5c9aa08e88d5..f825261f9d5f 100644
--- a/packages/core-typings/src/IInquiry.ts
+++ b/packages/core-typings/src/IInquiry.ts
@@ -13,6 +13,7 @@ export interface IInquiry {
 }
 
 export enum LivechatInquiryStatus {
+	VERIFYING = 'verifying',
 	QUEUED = 'queued',
 	TAKEN = 'taken',
 	READY = 'ready',
@@ -37,7 +38,9 @@ export interface ILivechatInquiryRecord extends IRocketChatRecord {
 	ts: Date;
 	message: string;
 	status: LivechatInquiryStatus;
-	v: Pick<ILivechatVisitor, '_id' | 'username' | 'status' | 'name' | 'token' | 'phone' | 'activity'> & { lastMessageTs?: Date };
+	v: Pick<ILivechatVisitor, '_id' | 'username' | 'status' | 'name' | 'token' | 'phone' | 'activity'> & {
+		lastMessageTs?: Date;
+	};
 	t: 'l';
 
 	department?: string;
diff --git a/packages/core-typings/src/ILivechatContact.ts b/packages/core-typings/src/ILivechatContact.ts
index 466eeb23d039..7f9301d81d7b 100644
--- a/packages/core-typings/src/ILivechatContact.ts
+++ b/packages/core-typings/src/ILivechatContact.ts
@@ -1,22 +1,33 @@
 import type { IVisitorEmail, IVisitorPhone } from './ILivechatVisitor';
 import type { IRocketChatRecord } from './IRocketChatRecord';
-import type { IOmnichannelSource } from './IRoom';
+import type { IOmnichannelSource, OmnichannelSourceType } from './IRoom';
+
+export interface ILivechatContactVisitorAssociation {
+	visitorId: string;
+	source: {
+		type: OmnichannelSourceType;
+		id?: IOmnichannelSource['id'];
+	};
+}
 
 export interface ILivechatContactChannel {
 	name: string;
 	verified: boolean;
-	visitorId: string;
+	visitor: ILivechatContactVisitorAssociation;
 	blocked: boolean;
 	field?: string;
 	value?: string;
 	verifiedAt?: Date;
-	details?: IOmnichannelSource;
+	details: IOmnichannelSource;
+	lastChat?: {
+		_id: string;
+		ts: Date;
+	};
 }
 
 export interface ILivechatContactConflictingField {
-	field: string;
-	oldValue: string;
-	newValue: string;
+	field: 'name' | 'manager' | `customFields.${string}`;
+	value: string;
 }
 
 export interface ILivechatContact extends IRocketChatRecord {
@@ -25,13 +36,16 @@ export interface ILivechatContact extends IRocketChatRecord {
 	emails?: IVisitorEmail[];
 	contactManager?: string;
 	unknown?: boolean;
-	hasConflict?: boolean;
 	conflictingFields?: ILivechatContactConflictingField[];
 	customFields?: Record<string, string | unknown>;
-	channels?: ILivechatContactChannel[];
+	channels: ILivechatContactChannel[];
 	createdAt: Date;
 	lastChat?: {
 		_id: string;
 		ts: Date;
 	};
+	importIds?: string[];
+	// When preRegistration is true, the contact was added by an admin and it doesn't have any visitor association yet
+	// This contact may then be linked to new visitors that use the same email address or phone number
+	preRegistration?: boolean;
 }
diff --git a/packages/core-typings/src/ILivechatVisitor.ts b/packages/core-typings/src/ILivechatVisitor.ts
index eefb4ebd720c..21819cc23f24 100644
--- a/packages/core-typings/src/ILivechatVisitor.ts
+++ b/packages/core-typings/src/ILivechatVisitor.ts
@@ -49,7 +49,6 @@ export interface ILivechatVisitor extends IRocketChatRecord {
 	};
 	activity?: string[];
 	disabled?: boolean;
-	contactId?: string;
 }
 
 export interface ILivechatVisitorDTO {
diff --git a/packages/core-typings/src/IRoom.ts b/packages/core-typings/src/IRoom.ts
index cba7fbede924..4203184d4c1c 100644
--- a/packages/core-typings/src/IRoom.ts
+++ b/packages/core-typings/src/IRoom.ts
@@ -1,3 +1,4 @@
+import type { ILivechatDepartment } from './ILivechatDepartment';
 import type { ILivechatPriority } from './ILivechatPriority';
 import type { ILivechatVisitor } from './ILivechatVisitor';
 import type { IMessage, MessageTypesValues } from './IMessage';
@@ -196,7 +197,7 @@ export interface IOmnichannelSourceFromApp extends IOmnichannelSource {
 
 export interface IOmnichannelGenericRoom extends Omit<IRoom, 'default' | 'featured' | 'broadcast'> {
 	t: 'l' | 'v';
-	v: Pick<ILivechatVisitor, '_id' | 'username' | 'status' | 'name' | 'token' | 'activity' | 'contactId'> & {
+	v: Pick<ILivechatVisitor, '_id' | 'username' | 'status' | 'name' | 'token' | 'activity'> & {
 		lastMessageTs?: Date;
 		phone?: string;
 	};
@@ -205,7 +206,7 @@ export interface IOmnichannelGenericRoom extends Omit<IRoom, 'default' | 'featur
 		inbox: string;
 		thread: string[];
 		replyTo: string;
-		subject: string;
+		subject?: string;
 	};
 	source: IOmnichannelSource;
 
@@ -264,6 +265,8 @@ export interface IOmnichannelGenericRoom extends Omit<IRoom, 'default' | 'featur
 	closingMessage?: IMessage;
 
 	departmentAncestors?: string[];
+
+	contactId?: string;
 }
 
 export interface IOmnichannelRoom extends IOmnichannelGenericRoom {
@@ -318,6 +321,8 @@ export interface IOmnichannelRoom extends IOmnichannelGenericRoom {
 	// which is controlled by Livechat_auto_transfer_chat_timeout setting
 	autoTransferredAt?: Date;
 	autoTransferOngoing?: boolean;
+
+	verified?: boolean;
 }
 
 export interface IVoipRoom extends IOmnichannelGenericRoom {
@@ -335,7 +340,10 @@ export interface IVoipRoom extends IOmnichannelGenericRoom {
 	queue: string;
 	// The ID assigned to the call (opaque ID)
 	callUniqueId?: string;
-	v: Pick<ILivechatVisitor, '_id' | 'username' | 'status' | 'name' | 'token' | 'contactId'> & { lastMessageTs?: Date; phone?: string };
+	v: Pick<ILivechatVisitor, '_id' | 'username' | 'status' | 'name' | 'token'> & {
+		lastMessageTs?: Date;
+		phone?: string;
+	};
 	// Outbound means the call was initiated from Rocket.Chat and vise versa
 	direction: 'inbound' | 'outbound';
 }
@@ -354,6 +362,8 @@ export type IOmnichannelRoomClosingInfo = Pick<IOmnichannelGenericRoom, 'closer'
 	chatDuration: number;
 };
 
+export type IOmnichannelRoomWithDepartment = IOmnichannelRoom & { department?: ILivechatDepartment };
+
 export const isOmnichannelRoom = (room: Pick<IRoom, 't'>): room is IOmnichannelRoom & IRoom => room.t === 'l';
 
 export const isVoipRoom = (room: IRoom): room is IVoipRoom & IRoom => room.t === 'v';
@@ -362,6 +372,12 @@ export const isOmnichannelSourceFromApp = (source: IOmnichannelSource): source i
 	return source?.type === OmnichannelSourceType.APP;
 };
 
+export type IOmnichannelRoomInfo = Pick<Partial<IOmnichannelRoom>, 'sms' | 'email'> & Pick<IOmnichannelRoom, 'source'>;
+
+export type IOmnichannelRoomExtraData = Pick<Partial<IOmnichannelRoom>, 'customFields' | 'source'> & { sla?: string };
+
+export type IOmnichannelInquiryExtraData = IOmnichannelRoomExtraData & { priority?: string };
+
 export type RoomAdminFieldsType =
 	| '_id'
 	| 'prid'
diff --git a/packages/core-typings/src/IServerEvent.ts b/packages/core-typings/src/IServerEvent.ts
index c920f2dd5cb5..2f4348260ae8 100644
--- a/packages/core-typings/src/IServerEvent.ts
+++ b/packages/core-typings/src/IServerEvent.ts
@@ -7,8 +7,63 @@ export enum ServerEventType {
 
 export interface IServerEvent {
 	_id: string;
-	t: ServerEventType;
+	t: ServerEventType | keyof IServerEvents;
 	ts: Date;
+
+	// @deprecated
 	ip: string;
+	// @deprecated
 	u?: Partial<Pick<IUser, '_id' | 'username'>>;
+
+	actor?: IAuditServerActor;
+
+	data?: AuditServerEventPayloadItem[];
+}
+
+export interface IAuditServerUserActor {
+	type: 'user';
+	_id: string;
+	username: string;
+	ip: string;
+	useragent: string;
+}
+
+export interface IAuditServerSystemActor {
+	type: 'system';
+	reason?: string;
+}
+
+export interface IAuditServerAppActor {
+	type: 'app';
+	_id: string;
+	reason?: string;
 }
+
+export type IAuditServerActor = IAuditServerUserActor | IAuditServerSystemActor | IAuditServerAppActor;
+
+interface IAuditServerEvent {
+	t: string;
+	ts: Date;
+
+	actor: IAuditServerActor;
+}
+
+type AuditServerEventPayloadItem = {
+	key: string;
+	value: unknown;
+};
+
+export interface IAuditServerEventType<E extends AuditServerEventPayloadItem> extends IAuditServerEvent {
+	data: E[];
+}
+
+export interface IServerEvents {}
+
+type KeyValuePair = { key: string; value: any };
+
+type ArrayToObject<T extends readonly KeyValuePair[]> = {
+	[K in T[number] as K['key']]: K['value'];
+};
+
+export type ExtractDataToParams<T extends IAuditServerEventType<any>> =
+	T extends IAuditServerEventType<any> ? ArrayToObject<T['data']> : never;
diff --git a/packages/core-typings/src/ISetting.ts b/packages/core-typings/src/ISetting.ts
index aa30660d7180..8c84e6596788 100644
--- a/packages/core-typings/src/ISetting.ts
+++ b/packages/core-typings/src/ISetting.ts
@@ -1,15 +1,11 @@
 import type { IRocketChatAssetConstraint } from './IRocketChatAssets';
-
-export type SettingId = string;
-export type GroupId = SettingId;
-export type TabId = SettingId;
-export type SectionName = string;
+import type { IRocketChatRecord } from './IRocketChatRecord';
 
 export enum SettingEditor {
 	COLOR = 'color',
 	EXPRESSION = 'expression',
 }
-type AssetValue = { defaultUrl?: string };
+
 export type SettingValueMultiSelect = (string | number)[];
 export type SettingValueRoomPick = { _id: string; name?: string }[];
 export type SettingValue =
@@ -19,7 +15,7 @@ export type SettingValue =
 	| SettingValueMultiSelect
 	| SettingValueRoomPick
 	| Date
-	| AssetValue
+	| { url?: string; defaultUrl?: string }
 	| undefined
 	| null;
 
@@ -32,9 +28,7 @@ export type ISetting = ISettingBase | ISettingEnterprise | ISettingColor | ISett
 
 type EnableQuery = string | { _id: string; value: any } | { _id: string; value: any }[];
 
-export interface ISettingBase {
-	_id: SettingId;
-	_updatedAt: Date;
+export interface ISettingBase extends IRocketChatRecord {
 	type:
 		| 'boolean'
 		| 'timezone'
@@ -57,9 +51,9 @@ export interface ISettingBase {
 		| 'timespan';
 	public: boolean;
 	env: boolean;
-	group?: GroupId;
-	section?: SectionName;
-	tab?: TabId;
+	group?: string;
+	section?: string;
+	tab?: string;
 	i18nLabel: string;
 	value: SettingValue;
 	packageValue: SettingValue;
@@ -132,7 +126,7 @@ export interface ISettingAction extends ISettingBase {
 }
 export interface ISettingAsset extends ISettingBase {
 	type: 'asset';
-	value: AssetValue;
+	value: { url?: string; defaultUrl?: string };
 	fileConstraints: IRocketChatAssetConstraint;
 	asset: string;
 }
diff --git a/packages/core-typings/src/Serialized.ts b/packages/core-typings/src/Serialized.ts
index 94f79cb64d06..9c5408d88b95 100644
--- a/packages/core-typings/src/Serialized.ts
+++ b/packages/core-typings/src/Serialized.ts
@@ -11,16 +11,17 @@ type CustomSerializable<T> = {
 /**
  * The type of a value that was serialized via `JSON.stringify` and then deserialized via `JSON.parse`.
  */
-export type Serialized<T> = T extends CustomSerializable<infer U>
-	? Serialized<U>
-	: T extends [any, ...any] // is T a tuple?
-	? { [K in keyof T]: T extends UnserializablePrimitive ? null : Serialized<T[K]> }
-	: T extends any[]
-	? Serialized<T[number]>[]
-	: T extends object
-	? { [K in keyof T]: Serialized<T[K]> }
-	: T extends SerializablePrimitive
-	? T
-	: T extends UnserializablePrimitive
-	? undefined
-	: null;
+export type Serialized<T> =
+	T extends CustomSerializable<infer U>
+		? Serialized<U>
+		: T extends [any, ...any] // is T a tuple?
+			? { [K in keyof T]: T extends UnserializablePrimitive ? null : Serialized<T[K]> }
+			: T extends any[]
+				? Serialized<T[number]>[]
+				: T extends object
+					? { [K in keyof T]: Serialized<T[K]> }
+					: T extends SerializablePrimitive
+						? T
+						: T extends UnserializablePrimitive
+							? undefined
+							: null;
diff --git a/packages/core-typings/src/ServerAudit/IAuditServerSettingEvent.ts b/packages/core-typings/src/ServerAudit/IAuditServerSettingEvent.ts
new file mode 100644
index 000000000000..a49c4ae5f9be
--- /dev/null
+++ b/packages/core-typings/src/ServerAudit/IAuditServerSettingEvent.ts
@@ -0,0 +1,26 @@
+import type { IAuditServerEventType } from '../IServerEvent';
+import type { ISetting } from '../ISetting';
+
+interface IServerEventSettingsChanged
+	extends IAuditServerEventType<
+		| {
+				key: 'id';
+				value: ISetting['_id'];
+		  }
+		| {
+				key: 'previous';
+				value: ISetting['value'];
+		  }
+		| {
+				key: 'current';
+				value: ISetting['value'];
+		  }
+	> {
+	t: 'settings.changed';
+}
+
+declare module '../IServerEvent' {
+	interface IServerEvents {
+		'settings.changed': IServerEventSettingsChanged;
+	}
+}
diff --git a/packages/core-typings/src/import/IImport.ts b/packages/core-typings/src/import/IImport.ts
index 11fc3028dbbd..344371826efc 100644
--- a/packages/core-typings/src/import/IImport.ts
+++ b/packages/core-typings/src/import/IImport.ts
@@ -19,5 +19,6 @@ export interface IImport extends IRocketChatRecord {
 		users?: number;
 		messages?: number;
 		channels?: number;
+		contacts?: number;
 	};
 }
diff --git a/packages/core-typings/src/import/IImportContact.ts b/packages/core-typings/src/import/IImportContact.ts
new file mode 100644
index 000000000000..c9fbe6960168
--- /dev/null
+++ b/packages/core-typings/src/import/IImportContact.ts
@@ -0,0 +1,9 @@
+export interface IImportContact {
+	importIds: string[];
+	_id?: string;
+	name?: string;
+	phones?: string[];
+	emails?: string[];
+	contactManager?: string;
+	customFields?: Record<string, string>;
+}
diff --git a/packages/core-typings/src/import/IImportProgress.ts b/packages/core-typings/src/import/IImportProgress.ts
index b9f91a16120d..311f59e1cf49 100644
--- a/packages/core-typings/src/import/IImportProgress.ts
+++ b/packages/core-typings/src/import/IImportProgress.ts
@@ -7,11 +7,13 @@ export type ProgressStep =
 	| 'importer_preparing_users'
 	| 'importer_preparing_channels'
 	| 'importer_preparing_messages'
+	| 'importer_preparing_contacts'
 	| 'importer_user_selection'
 	| 'importer_importing_started'
 	| 'importer_importing_users'
 	| 'importer_importing_channels'
 	| 'importer_importing_messages'
+	| 'importer_importing_contacts'
 	| 'importer_importing_files'
 	| 'importer_finishing'
 	| 'importer_done'
diff --git a/packages/core-typings/src/import/IImportRecord.ts b/packages/core-typings/src/import/IImportRecord.ts
index 9adf58e284ed..5f572e54dee0 100644
--- a/packages/core-typings/src/import/IImportRecord.ts
+++ b/packages/core-typings/src/import/IImportRecord.ts
@@ -1,9 +1,10 @@
 import type { IImportChannel } from './IImportChannel';
+import type { IImportContact } from './IImportContact';
 import type { IImportMessage } from './IImportMessage';
 import type { IImportUser } from './IImportUser';
 
-export type IImportRecordType = 'user' | 'channel' | 'message';
-export type IImportData = IImportUser | IImportChannel | IImportMessage;
+export type IImportRecordType = 'user' | 'channel' | 'message' | 'contact';
+export type IImportData = IImportUser | IImportChannel | IImportMessage | IImportContact;
 
 export interface IImportRecord {
 	data: IImportData;
@@ -34,3 +35,8 @@ export interface IImportMessageRecord extends IImportRecord {
 		useQuickInsert?: boolean;
 	};
 }
+
+export interface IImportContactRecord extends IImportRecord {
+	data: IImportContact;
+	dataType: 'contact';
+}
diff --git a/packages/core-typings/src/import/IImporterSelection.ts b/packages/core-typings/src/import/IImporterSelection.ts
index 1c0279e4041b..4a680aff2444 100644
--- a/packages/core-typings/src/import/IImporterSelection.ts
+++ b/packages/core-typings/src/import/IImporterSelection.ts
@@ -1,9 +1,11 @@
 import type { IImporterSelectionChannel } from './IImporterSelectionChannel';
+import type { IImporterSelectionContact } from './IImporterSelectionContact';
 import type { IImporterSelectionUser } from './IImporterSelectionUser';
 
 export interface IImporterSelection {
 	name: string;
 	users: IImporterSelectionUser[];
 	channels: IImporterSelectionChannel[];
+	contacts?: IImporterSelectionContact[];
 	message_count: number;
 }
diff --git a/packages/core-typings/src/import/IImporterSelectionContact.ts b/packages/core-typings/src/import/IImporterSelectionContact.ts
new file mode 100644
index 000000000000..fcd7789a3db3
--- /dev/null
+++ b/packages/core-typings/src/import/IImporterSelectionContact.ts
@@ -0,0 +1,7 @@
+export interface IImporterSelectionContact {
+	id: string;
+	name: string;
+	emails: string[];
+	phones: string[];
+	do_import: boolean;
+}
diff --git a/packages/core-typings/src/import/IImporterShortSelection.ts b/packages/core-typings/src/import/IImporterShortSelection.ts
index 008f54252f91..e22c2b20cb6f 100644
--- a/packages/core-typings/src/import/IImporterShortSelection.ts
+++ b/packages/core-typings/src/import/IImporterShortSelection.ts
@@ -6,4 +6,5 @@ export interface IImporterShortSelectionItem {
 export interface IImporterShortSelection {
 	users?: IImporterShortSelectionItem;
 	channels?: IImporterShortSelectionItem;
+	contacts?: IImporterShortSelectionItem;
 }
diff --git a/packages/core-typings/src/import/index.ts b/packages/core-typings/src/import/index.ts
index a2d5bf188b1f..7b29b2644766 100644
--- a/packages/core-typings/src/import/index.ts
+++ b/packages/core-typings/src/import/index.ts
@@ -3,11 +3,13 @@ export * from './IImportUser';
 export * from './IImportRecord';
 export * from './IImportMessage';
 export * from './IImportChannel';
+export * from './IImportContact';
 export * from './IImporterInfo';
 export * from './IImportFileData';
 export * from './IImportProgress';
 export * from './IImporterSelection';
 export * from './IImporterSelectionUser';
 export * from './IImporterSelectionChannel';
+export * from './IImporterSelectionContact';
 export * from './IImporterShortSelection';
 export * from './ImportState';
diff --git a/packages/core-typings/src/index.ts b/packages/core-typings/src/index.ts
index 56db4cd73b1f..0f589b22ba22 100644
--- a/packages/core-typings/src/index.ts
+++ b/packages/core-typings/src/index.ts
@@ -1,3 +1,5 @@
+import './ServerAudit/IAuditServerSettingEvent';
+
 export * from './Apps';
 export * from './AppOverview';
 export * from './FeaturedApps';
diff --git a/packages/core-typings/src/utils.ts b/packages/core-typings/src/utils.ts
index e739257c070b..c00d8c3f5a7d 100644
--- a/packages/core-typings/src/utils.ts
+++ b/packages/core-typings/src/utils.ts
@@ -15,10 +15,10 @@ export type KeyOfEach<T> = T extends any ? keyof T : never;
 export type Jsonify<T> = T extends Date
 	? string
 	: T extends object
-	? {
-			[k in keyof T]: Jsonify<T[k]>;
-	  }
-	: T;
+		? {
+				[k in keyof T]: Jsonify<T[k]>;
+			}
+		: T;
 
 // Use AtLeast when you don't care if you receive a partial or full object, as long as the specified attributes are loaded
 // Attributes defined as optional will continue to be optional.
@@ -31,6 +31,14 @@ export type DeepWritable<T> = T extends (...args: any) => any
 	? T
 	: {
 			-readonly [P in keyof T]: DeepWritable<T[P]>;
-	  };
+		};
 
 export type DistributiveOmit<T, K extends keyof any> = T extends any ? Omit<T, K> : never;
+
+export type ValueOfUnion<T, K extends KeyOfEach<T>> = T extends any ? (K extends keyof T ? T[K] : undefined) : undefined;
+
+export type ValueOfOptional<T, K extends KeyOfEach<T>> = T extends undefined ? undefined : T extends object ? ValueOfUnion<T, K> : null;
+
+export type DeepPartial<T> = {
+	[P in keyof T]?: T[P] extends (infer U)[] ? DeepPartial<U>[] : T[P] extends object | undefined ? DeepPartial<T[P]> : T[P];
+};
diff --git a/packages/cron/CHANGELOG.md b/packages/cron/CHANGELOG.md
index 6747de4e0783..e2bad580f395 100644
--- a/packages/cron/CHANGELOG.md
+++ b/packages/cron/CHANGELOG.md
@@ -1,5 +1,45 @@
 # @rocket.chat/cron
 
+## 0.1.10-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.3
+  - @rocket.chat/models@1.0.1-rc.3
+  </details>
+
+## 0.1.10-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.2
+  - @rocket.chat/models@1.0.1-rc.2
+  </details>
+
+## 0.1.10-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.1
+  - @rocket.chat/models@1.0.1-rc.1
+  </details>
+
+## 0.1.10-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [80e36bfc3938775eb26aa5576f1b9b98896e1cc4, 32d93a0666fa1cbe857d02889e93d9bbf45bd4f0]:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.0
+  - @rocket.chat/models@1.0.1-rc.0
+  </details>
+
 ## 0.1.9
 
 ### Patch Changes
diff --git a/packages/cron/package.json b/packages/cron/package.json
index 6f8f0f0dc1d3..9a35103c9e0a 100644
--- a/packages/cron/package.json
+++ b/packages/cron/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/cron",
-	"version": "0.1.9",
+	"version": "0.1.10-rc.3",
 	"private": true,
 	"devDependencies": {
 		"eslint": "~8.45.0",
diff --git a/packages/ddp-client/CHANGELOG.md b/packages/ddp-client/CHANGELOG.md
index 22b07dafd0cf..24c8e539bb6e 100644
--- a/packages/ddp-client/CHANGELOG.md
+++ b/packages/ddp-client/CHANGELOG.md
@@ -1,5 +1,49 @@
 # @rocket.chat/ddp-client
 
+## 0.3.10-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.3
+  - @rocket.chat/rest-typings@7.1.0-rc.3
+  - @rocket.chat/api-client@0.2.10-rc.3
+  </details>
+
+## 0.3.10-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.2
+  - @rocket.chat/rest-typings@7.1.0-rc.2
+  - @rocket.chat/api-client@0.2.10-rc.2
+  </details>
+
+## 0.3.10-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.1
+  - @rocket.chat/rest-typings@7.1.0-rc.1
+  - @rocket.chat/api-client@0.2.10-rc.1
+  </details>
+
+## 0.3.10-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [80e36bfc3938775eb26aa5576f1b9b98896e1cc4, e7edeac3bdd22da0a04b8e873d5a008e249fb4be, 32d93a0666fa1cbe857d02889e93d9bbf45bd4f0]:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.0
+  - @rocket.chat/rest-typings@7.1.0-rc.0
+  - @rocket.chat/api-client@0.2.10-rc.0
+  </details>
+
 ## 0.3.9
 
 ### Patch Changes
diff --git a/packages/ddp-client/__tests__/Account.spec.ts b/packages/ddp-client/__tests__/Account.spec.ts
index 948d041ebf2d..f18d8100c8bd 100644
--- a/packages/ddp-client/__tests__/Account.spec.ts
+++ b/packages/ddp-client/__tests__/Account.spec.ts
@@ -1,7 +1,7 @@
 import WS from 'jest-websocket-mock';
 
-import { DDPSDK } from '../src/DDPSDK';
 import { handleConnection, handleMethod } from './helpers';
+import { DDPSDK } from '../src/DDPSDK';
 
 let server: WS;
 
diff --git a/packages/ddp-client/__tests__/Connection.spec.ts b/packages/ddp-client/__tests__/Connection.spec.ts
index c535a6c58cc5..4aea12944845 100644
--- a/packages/ddp-client/__tests__/Connection.spec.ts
+++ b/packages/ddp-client/__tests__/Connection.spec.ts
@@ -1,8 +1,8 @@
 import WS from 'jest-websocket-mock';
 
+import { handleConnection, handleConnectionAndRejects, handleMethod } from './helpers';
 import { ConnectionImpl } from '../src/Connection';
 import { MinimalDDPClient } from '../src/MinimalDDPClient';
-import { handleConnection, handleConnectionAndRejects, handleMethod } from './helpers';
 
 let server: WS;
 beforeEach(() => {
diff --git a/packages/ddp-client/__tests__/DDPSDK.spec.ts b/packages/ddp-client/__tests__/DDPSDK.spec.ts
index cd5b30113de9..8077b5b5b874 100644
--- a/packages/ddp-client/__tests__/DDPSDK.spec.ts
+++ b/packages/ddp-client/__tests__/DDPSDK.spec.ts
@@ -4,8 +4,8 @@ import util from 'util';
 import WS from 'jest-websocket-mock';
 import { WebSocket } from 'ws';
 
-import { DDPSDK } from '../src/DDPSDK';
 import { fireStreamChange, fireStreamAdded, fireStreamRemove, handleConnection, handleSubscription, handleMethod } from './helpers';
+import { DDPSDK } from '../src/DDPSDK';
 
 (global as any).WebSocket = (global as any).WebSocket || WebSocket;
 
diff --git a/packages/ddp-client/package.json b/packages/ddp-client/package.json
index af01fbab3995..c95f20b4dd35 100644
--- a/packages/ddp-client/package.json
+++ b/packages/ddp-client/package.json
@@ -1,10 +1,10 @@
 {
 	"name": "@rocket.chat/ddp-client",
-	"version": "0.3.9",
+	"version": "0.3.10-rc.3",
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@types/jest": "~29.5.13",
-		"@types/ws": "^8.5.12",
+		"@types/jest": "~29.5.14",
+		"@types/ws": "^8.5.13",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"jest-websocket-mock": "~2.5.0",
diff --git a/packages/ddp-client/src/ClientStream.ts b/packages/ddp-client/src/ClientStream.ts
index 166e59a61f6f..f5d596a03f7d 100644
--- a/packages/ddp-client/src/ClientStream.ts
+++ b/packages/ddp-client/src/ClientStream.ts
@@ -11,7 +11,10 @@ import type { PublicationPayloads } from './types/publicationPayloads';
 export class ClientStreamImpl extends Emitter implements ClientStream {
 	subscriptions = new Map<string, Subscription>();
 
-	constructor(private ddp: DDPClient, readonly dispatcher: DDPDispatcher = new DDPDispatcher()) {
+	constructor(
+		private ddp: DDPClient,
+		readonly dispatcher: DDPDispatcher = new DDPDispatcher(),
+	) {
 		ddp.onConnection(({ msg }) => {
 			if (msg === 'connected') {
 				this.emit('connected');
diff --git a/packages/ddp-client/src/MinimalDDPClient.ts b/packages/ddp-client/src/MinimalDDPClient.ts
index 1f62d4fb8822..b4f9f534d577 100644
--- a/packages/ddp-client/src/MinimalDDPClient.ts
+++ b/packages/ddp-client/src/MinimalDDPClient.ts
@@ -65,7 +65,11 @@ interface MinimalDDPClientEvents {
  * ```
  */
 export class MinimalDDPClient extends Emitter<MinimalDDPClientEvents> implements DDPClient {
-	constructor(send?: (params: string) => void, readonly encode = JSON.stringify, readonly decode = JSON.parse) {
+	constructor(
+		send?: (params: string) => void,
+		readonly encode = JSON.stringify,
+		readonly decode = JSON.parse,
+	) {
 		super();
 		if (send) {
 			this.onDispatchMessage(send);
diff --git a/packages/ddp-client/src/TimeoutControl.ts b/packages/ddp-client/src/TimeoutControl.ts
index f6cbb05c4283..922bc3e8ac90 100644
--- a/packages/ddp-client/src/TimeoutControl.ts
+++ b/packages/ddp-client/src/TimeoutControl.ts
@@ -25,7 +25,10 @@ export class TimeoutControl
 
 	private heartbeatId: ReturnType<typeof setTimeout> | undefined;
 
-	constructor(readonly timeout: number = 60_000, readonly heartbeat: number = timeout / 2) {
+	constructor(
+		readonly timeout: number = 60_000,
+		readonly heartbeat: number = timeout / 2,
+	) {
 		super();
 		/* istanbul ignore next */
 		if (this.heartbeat >= this.timeout) {
diff --git a/packages/ddp-client/src/legacy/RocketchatSDKLegacy.ts b/packages/ddp-client/src/legacy/RocketchatSDKLegacy.ts
index 04ae2e5edeb0..cac646fa2bbf 100644
--- a/packages/ddp-client/src/legacy/RocketchatSDKLegacy.ts
+++ b/packages/ddp-client/src/legacy/RocketchatSDKLegacy.ts
@@ -163,11 +163,11 @@ export class RocketchatSdkLegacyImpl extends DDPSDK implements RocketchatSDKLega
 					? {
 							msg: message,
 							rid,
-					  }
+						}
 					: {
 							...message,
 							rid,
-					  },
+						},
 		});
 	}
 
diff --git a/packages/ddp-client/src/livechat/types/LivechatSDK.ts b/packages/ddp-client/src/livechat/types/LivechatSDK.ts
index e45cd6603e9f..b57a13cffc89 100644
--- a/packages/ddp-client/src/livechat/types/LivechatSDK.ts
+++ b/packages/ddp-client/src/livechat/types/LivechatSDK.ts
@@ -3,15 +3,16 @@ import type { OperationParams, OperationResult } from '@rocket.chat/rest-typings
 
 import type { StreamerCallbackArgs } from '../../types/streams';
 
-export type LivechatRoomEvents<T> = StreamerCallbackArgs<'livechat-room', `${string}`> extends [infer A]
-	? A extends { type: T; data: unknown }
-		? A['data']
-		: A extends { type: T; status: unknown }
-		? A['status']
-		: A extends { type: T; visitor: unknown }
-		? A['visitor']
-		: never
-	: never;
+export type LivechatRoomEvents<T> =
+	StreamerCallbackArgs<'livechat-room', `${string}`> extends [infer A]
+		? A extends { type: T; data: unknown }
+			? A['data']
+			: A extends { type: T; status: unknown }
+				? A['status']
+				: A extends { type: T; visitor: unknown }
+					? A['visitor']
+					: never
+		: never;
 
 export interface LivechatStream {
 	notifyVisitorActivity(rid: string, username: string, activities: string[]): Promise<unknown>;
diff --git a/packages/ddp-client/src/types/streams.ts b/packages/ddp-client/src/types/streams.ts
index 99aa9b77c7c9..eae9d6c7d4fe 100644
--- a/packages/ddp-client/src/types/streams.ts
+++ b/packages/ddp-client/src/types/streams.ts
@@ -64,7 +64,22 @@ export interface StreamerEvents {
 		{ key: `${string}/videoconf`; args: [id: string] },
 		{ key: `${string}/messagesRead`; args: [{ until: Date; tmid?: string }] },
 		{ key: `${string}/messagesImported`; args: [null] },
-		{ key: `${string}/webrtc`; args: unknown[] },
+		{
+			key: `${string}/webrtc`;
+			args: [
+				type: 'status',
+				data: {
+					from?: string;
+					room?: string;
+					to?: string;
+					media: MediaStreamConstraints;
+					remoteConnections: {
+						id: string;
+						media: MediaStreamConstraints;
+					}[];
+				},
+			];
+		},
 		/* @deprecated over videoconf*/
 		// { key: `${string}/${string}`; args: [id: string] },
 	];
@@ -173,7 +188,51 @@ export interface StreamerEvents {
 		{ key: `${string}/userData`; args: [IUserDataEvent] },
 		{ key: `${string}/updateInvites`; args: [unknown] },
 		{ key: `${string}/departmentAgentData`; args: [unknown] },
-		{ key: `${string}/webrtc`; args: unknown[] },
+		{
+			key: `${string}/webrtc`;
+			args:
+				| [
+						type: 'candidate',
+						data: {
+							from?: string;
+							room?: string;
+							to?: string;
+							candidate: RTCIceCandidateInit;
+						},
+				  ]
+				| [
+						type: 'description',
+						data:
+							| {
+									from?: string;
+									room?: string;
+									to?: string;
+									type: 'offer';
+									ts: number;
+									media: MediaStreamConstraints;
+									description: RTCSessionDescriptionInit;
+							  }
+							| {
+									from?: string;
+									room?: string;
+									to?: string;
+									type: 'answer';
+									ts: number;
+									media?: undefined;
+									description: RTCSessionDescriptionInit;
+							  },
+				  ]
+				| [
+						type: 'join',
+						data: {
+							from?: string;
+							room?: string;
+							to?: string;
+							media?: MediaStreamConstraints;
+							monitor?: boolean;
+						},
+				  ];
+		},
 		{
 			key: `${string}/otr`;
 			args: [
@@ -283,7 +342,19 @@ export interface StreamerEvents {
 			key: `${string}/video-conference`;
 			args: [{ action: string; params: { callId: VideoConference['_id']; uid: IUser['_id']; rid: IRoom['_id'] } }];
 		},
-		{ key: `${string}/webrtc`; args: unknown[] },
+		{
+			key: `${string}/webrtc`;
+			args: [
+				type: 'call',
+				data: {
+					from?: string;
+					room?: string;
+					to?: string;
+					media: MediaStreamConstraints;
+					monitor?: boolean;
+				},
+			];
+		},
 		{
 			key: `${string}/otr`;
 			args: [
@@ -491,18 +562,14 @@ export type StreamKeys<S extends StreamNames> = StreamerEvents[S][number]['key']
 
 export type StreamerConfigs<N extends StreamNames> = StreamerEvents[N][number];
 
-export type StreamerConfig<N extends StreamNames, K extends StreamKeys<N>> = StreamerConfigs<N> extends infer U
-	? U extends any
-		? { key: K; args: any } extends U
-			? U
-			: never
-		: never
-	: never;
+export type StreamerConfig<N extends StreamNames, K extends StreamKeys<N>> =
+	StreamerConfigs<N> extends infer U ? (U extends any ? ({ key: K; args: any } extends U ? U : never) : never) : never;
 
-export type StreamerCallbackArgs<N extends StreamNames, K extends StreamKeys<N>> = StreamerConfig<N, K> extends {
-	args: any;
-}
-	? StreamerConfig<N, K>['args']
-	: never;
+export type StreamerCallbackArgs<N extends StreamNames, K extends StreamKeys<N>> =
+	StreamerConfig<N, K> extends {
+		args: any;
+	}
+		? StreamerConfig<N, K>['args']
+		: never;
 
 export type StreamerCallback<N extends StreamNames, K extends StreamKeys<N>> = (...args: StreamerCallbackArgs<N, K>) => void;
diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
index 240289379aac..a7aa7698cabc 100644
--- a/packages/eslint-config/package.json
+++ b/packages/eslint-config/package.json
@@ -3,20 +3,20 @@
 	"version": "0.7.0",
 	"description": "Rocket.Chat's JS/TS ESLint config",
 	"dependencies": {
-		"@babel/core": "^7.25.8",
-		"@babel/eslint-parser": "~7.25.8",
+		"@babel/core": "^7.26.0",
+		"@babel/eslint-parser": "~7.25.9",
 		"@types/eslint": "~8.44.9",
-		"@types/prettier": "^2.6.3",
+		"@types/prettier": "^2.7.3",
 		"@typescript-eslint/eslint-plugin": "~5.60.1",
 		"@typescript-eslint/parser": "~5.60.1",
 		"eslint": "~8.45.0",
-		"eslint-config-prettier": "~8.8.0",
+		"eslint-config-prettier": "~9.1.0",
 		"eslint-plugin-anti-trojan-source": "~1.1.1",
-		"eslint-plugin-import": "~2.26.0",
-		"eslint-plugin-jest": "~27.2.3",
-		"eslint-plugin-jsx-a11y": "^6.8.0",
-		"eslint-plugin-prettier": "~4.2.1",
-		"prettier": "~2.8.8"
+		"eslint-plugin-import": "~2.31.0",
+		"eslint-plugin-jest": "~28.8.3",
+		"eslint-plugin-jsx-a11y": "^6.10.2",
+		"eslint-plugin-prettier": "~5.2.1",
+		"prettier": "~3.3.3"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js .",
diff --git a/packages/freeswitch/CHANGELOG.md b/packages/freeswitch/CHANGELOG.md
index d1c1421253fb..124bb14947e6 100644
--- a/packages/freeswitch/CHANGELOG.md
+++ b/packages/freeswitch/CHANGELOG.md
@@ -1,5 +1,41 @@
 # @rocket.chat/freeswitch
 
+## 1.0.1-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.3
+  </details>
+
+## 1.0.1-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.2
+  </details>
+
+## 1.0.1-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.1
+  </details>
+
+## 1.0.1-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [80e36bfc3938775eb26aa5576f1b9b98896e1cc4, 32d93a0666fa1cbe857d02889e93d9bbf45bd4f0]:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.0
+  </details>
+
 ## 1.0.0
 
 ### Major Changes
diff --git a/packages/freeswitch/package.json b/packages/freeswitch/package.json
index 720502a3320f..564b6501017a 100644
--- a/packages/freeswitch/package.json
+++ b/packages/freeswitch/package.json
@@ -1,13 +1,13 @@
 {
 	"name": "@rocket.chat/freeswitch",
-	"version": "1.0.0",
+	"version": "1.0.1-rc.3",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@types/jest": "~29.5.12",
+		"@types/jest": "~29.5.14",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
-		"typescript": "~5.3.3"
+		"typescript": "~5.6.3"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
diff --git a/packages/freeswitch/tests/parseUserList.test.ts b/packages/freeswitch/tests/parseUserList.test.ts
index e1db317f24fa..0d4aa7bd0347 100644
--- a/packages/freeswitch/tests/parseUserList.test.ts
+++ b/packages/freeswitch/tests/parseUserList.test.ts
@@ -1,5 +1,5 @@
-import { parseUserList } from '../src/utils/parseUserList';
 import { makeFreeSwitchResponse } from './utils/makeFreeSwitchResponse';
+import { parseUserList } from '../src/utils/parseUserList';
 
 test.each(['', undefined, 200 as unknown as any, '\nsomething'])('Invalid FreeSwitch responses', (input) => {
 	expect(() => parseUserList({ _body: input })).toThrow('Invalid response from FreeSwitch server.');
diff --git a/packages/fuselage-ui-kit/.storybook/DocsContainer.tsx b/packages/fuselage-ui-kit/.storybook/DocsContainer.tsx
index e15e7f27354a..fa750d0d0d04 100644
--- a/packages/fuselage-ui-kit/.storybook/DocsContainer.tsx
+++ b/packages/fuselage-ui-kit/.storybook/DocsContainer.tsx
@@ -8,7 +8,7 @@ import { DARK_MODE_EVENT_NAME } from 'storybook-dark-mode';
 const channel = addons.getChannel();
 
 const DocsContainer = (
-  props: ComponentPropsWithoutRef<typeof BaseContainer>
+  props: ComponentPropsWithoutRef<typeof BaseContainer>,
 ) => {
   const [isDark, setDark] = useState(false);
 
diff --git a/packages/fuselage-ui-kit/CHANGELOG.md b/packages/fuselage-ui-kit/CHANGELOG.md
index b13d71f2dbd3..617360c0c5b5 100644
--- a/packages/fuselage-ui-kit/CHANGELOG.md
+++ b/packages/fuselage-ui-kit/CHANGELOG.md
@@ -1,5 +1,58 @@
 # Change Log
 
+## 13.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.3
+  - @rocket.chat/gazzodown@13.0.0-rc.3
+  - @rocket.chat/ui-contexts@13.0.0-rc.3
+  - @rocket.chat/ui-avatar@9.0.0-rc.3
+  - @rocket.chat/ui-video-conf@13.0.0-rc.3
+  </details>
+
+## 13.0.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.2
+  - @rocket.chat/gazzodown@13.0.0-rc.2
+  - @rocket.chat/ui-contexts@13.0.0-rc.2
+  - @rocket.chat/ui-avatar@9.0.0-rc.2
+  - @rocket.chat/ui-video-conf@13.0.0-rc.2
+  </details>
+
+## 13.0.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.1
+  - @rocket.chat/gazzodown@13.0.0-rc.1
+  - @rocket.chat/ui-contexts@13.0.0-rc.1
+  - @rocket.chat/ui-avatar@9.0.0-rc.1
+  - @rocket.chat/ui-video-conf@13.0.0-rc.1
+  </details>
+
+## 13.0.0-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [82767d8fd8a52ac348e8aded1d238e688d36129b, 80e36bfc3938775eb26aa5576f1b9b98896e1cc4, 3569b0a9c48f8b94ebaef2f8b607c52fdb8e570a, b4841cb7206d855d7a1bc7604683a5b4a48b7176, 32d93a0666fa1cbe857d02889e93d9bbf45bd4f0, ce7024af36fcde97b1da5b2731f6edc4a4c236b8, d398866dba725918017e3609807f9d0ab9b89b72, d398866dba725918017e3609807f9d0ab9b89b72]:</summary>
+
+  - @rocket.chat/apps-engine@1.48.0-rc.0
+  - @rocket.chat/core-typings@7.1.0-rc.0
+  - @rocket.chat/gazzodown@13.0.0-rc.0
+  - @rocket.chat/ui-contexts@13.0.0-rc.0
+  - @rocket.chat/ui-avatar@9.0.0-rc.0
+  - @rocket.chat/ui-video-conf@13.0.0-rc.0
+  </details>
+
 ## 12.0.0
 
 ### Minor Changes
diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json
index 74f0e7dc6987..c90c2a245329 100644
--- a/packages/fuselage-ui-kit/package.json
+++ b/packages/fuselage-ui-kit/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/fuselage-ui-kit",
-	"version": "12.0.0",
+	"version": "13.0.0-rc.3",
 	"private": true,
 	"description": "UiKit elements for Rocket.Chat Apps built under Fuselage design system",
 	"homepage": "https://rocketchat.github.io/Rocket.Chat.Fuselage/",
@@ -45,17 +45,17 @@
 		"@rocket.chat/ui-kit": "workspace:~"
 	},
 	"devDependencies": {
-		"@babel/core": "~7.25.8",
-		"@babel/preset-env": "~7.25.8",
-		"@babel/preset-react": "~7.25.7",
-		"@babel/preset-typescript": "~7.25.7",
+		"@babel/core": "~7.26.0",
+		"@babel/preset-env": "~7.26.0",
+		"@babel/preset-react": "~7.25.9",
+		"@babel/preset-typescript": "~7.26.0",
 		"@rocket.chat/apps-engine": "workspace:^",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/eslint-config": "workspace:^",
 		"@rocket.chat/fuselage": "^0.59.4",
 		"@rocket.chat/fuselage-hooks": "^0.33.1",
 		"@rocket.chat/fuselage-polyfills": "~0.31.25",
-		"@rocket.chat/icons": "~0.38.0",
+		"@rocket.chat/icons": "~0.39.0",
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@rocket.chat/mock-providers": "workspace:^",
 		"@rocket.chat/prettier-config": "~0.31.25",
@@ -64,36 +64,36 @@
 		"@rocket.chat/ui-contexts": "workspace:^",
 		"@rocket.chat/ui-kit": "workspace:~",
 		"@rocket.chat/ui-video-conf": "workspace:^",
-		"@storybook/addon-essentials": "^8.3.5",
-		"@storybook/addon-styling-webpack": "^1.0.0",
+		"@storybook/addon-essentials": "^8.4.4",
+		"@storybook/addon-styling-webpack": "^1.0.1",
 		"@storybook/addon-webpack5-compiler-babel": "^3.0.3",
-		"@storybook/blocks": "^8.3.5",
-		"@storybook/react": "^8.3.5",
-		"@storybook/react-webpack5": "^8.3.5",
-		"@storybook/theming": "^8.3.5",
-		"@tanstack/react-query": "^4.16.1",
+		"@storybook/blocks": "^8.4.4",
+		"@storybook/react": "^8.4.4",
+		"@storybook/react-webpack5": "^8.4.4",
+		"@storybook/theming": "^8.4.4",
+		"@tanstack/react-query": "^4.36.1",
 		"@testing-library/react": "~16.0.1",
 		"@testing-library/user-event": "~14.5.2",
 		"@types/react": "~17.0.80",
 		"@types/react-dom": "~17.0.25",
-		"babel-loader": "~8.2.5",
+		"babel-loader": "~9.2.1",
 		"cross-env": "^7.0.3",
 		"eslint": "~8.45.0",
 		"i18next": "^23.10.1",
 		"jest": "~29.7.0",
 		"normalize.css": "^8.0.1",
 		"npm-run-all": "^4.1.5",
-		"prettier": "~2.8.8",
+		"prettier": "~3.3.3",
 		"react": "~17.0.2",
 		"react-dom": "^17.0.2",
 		"react-i18next": "~13.2.2",
 		"rimraf": "^6.0.1",
-		"storybook": "^8.3.5",
+		"storybook": "^8.4.4",
 		"storybook-dark-mode": "^4.0.2",
 		"typescript": "~5.6.3"
 	},
 	"peerDependencies": {
-		"@rocket.chat/apps-engine": "1.47.0",
+		"@rocket.chat/apps-engine": "1.48.0-rc.0",
 		"@rocket.chat/eslint-config": "0.7.0",
 		"@rocket.chat/fuselage": "*",
 		"@rocket.chat/fuselage-hooks": "*",
@@ -101,10 +101,10 @@
 		"@rocket.chat/icons": "*",
 		"@rocket.chat/prettier-config": "*",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-avatar": "8.0.0",
-		"@rocket.chat/ui-contexts": "12.0.0",
+		"@rocket.chat/ui-avatar": "9.0.0-rc.3",
+		"@rocket.chat/ui-contexts": "13.0.0-rc.3",
 		"@rocket.chat/ui-kit": "0.37.0",
-		"@rocket.chat/ui-video-conf": "12.0.0",
+		"@rocket.chat/ui-video-conf": "13.0.0-rc.3",
 		"@tanstack/react-query": "*",
 		"react": "~17.0.2",
 		"react-dom": "*"
diff --git a/packages/fuselage-ui-kit/src/blocks/ActionsBlock.tsx b/packages/fuselage-ui-kit/src/blocks/ActionsBlock.tsx
index db1a39472a22..5254e4751cb7 100644
--- a/packages/fuselage-ui-kit/src/blocks/ActionsBlock.tsx
+++ b/packages/fuselage-ui-kit/src/blocks/ActionsBlock.tsx
@@ -3,9 +3,9 @@ import * as UiKit from '@rocket.chat/ui-kit';
 import type { ReactElement } from 'react';
 import { memo, useCallback, useMemo, useState } from 'react';
 
+import Action from './ActionsBlock.Action';
 import { useSurfaceType } from '../hooks/useSurfaceType';
 import type { BlockProps } from '../utils/BlockProps';
-import Action from './ActionsBlock.Action';
 
 type ActionsBlockProps = BlockProps<UiKit.ActionsBlock>;
 
@@ -17,7 +17,7 @@ const ActionsBlock = ({
   const surfaceType = useSurfaceType();
 
   const [showMoreVisible, setShowMoreVisible] = useState(
-    () => block.elements.length > 5 && surfaceType !== 'banner'
+    () => block.elements.length > 5 && surfaceType !== 'banner',
   );
 
   const handleShowMoreClick = useCallback(() => {
@@ -31,9 +31,9 @@ const ActionsBlock = ({
           ...element,
           appId: element.appId ?? block.appId,
           blockId: element.blockId ?? block.blockId,
-        })
+        }),
       ),
-    [block.appId, block.blockId, block.elements, showMoreVisible]
+    [block.appId, block.blockId, block.elements, showMoreVisible],
   );
 
   return (
@@ -47,7 +47,7 @@ const ActionsBlock = ({
             {surfaceRenderer.renderTextObject(
               { type: 'plain_text', text: 'Show more...' },
               0,
-              UiKit.BlockContext.NONE
+              UiKit.BlockContext.NONE,
             )}
           </Button>
         </Box>
diff --git a/packages/fuselage-ui-kit/src/blocks/CalloutBlock.tsx b/packages/fuselage-ui-kit/src/blocks/CalloutBlock.tsx
index a8b634a1739c..1a57fdbda8ce 100644
--- a/packages/fuselage-ui-kit/src/blocks/CalloutBlock.tsx
+++ b/packages/fuselage-ui-kit/src/blocks/CalloutBlock.tsx
@@ -18,7 +18,7 @@ const CalloutBlock = ({
         (block.accessory &&
           surfaceRenderer.renderSectionAccessoryBlockElement(
             block.accessory,
-            0
+            0,
           )) ||
         undefined
       }
diff --git a/packages/fuselage-ui-kit/src/blocks/ContextBlock.tsx b/packages/fuselage-ui-kit/src/blocks/ContextBlock.tsx
index 200bf8b2fc5a..db40de7e3f6c 100644
--- a/packages/fuselage-ui-kit/src/blocks/ContextBlock.tsx
+++ b/packages/fuselage-ui-kit/src/blocks/ContextBlock.tsx
@@ -3,8 +3,8 @@ import type * as UiKit from '@rocket.chat/ui-kit';
 import type { ReactElement } from 'react';
 import { memo, useMemo } from 'react';
 
-import type { BlockProps } from '../utils/BlockProps';
 import Item from './ContextBlock.Item';
+import type { BlockProps } from '../utils/BlockProps';
 
 type ContextBlockProps = BlockProps<UiKit.ContextBlock>;
 
@@ -20,7 +20,7 @@ const ContextBlock = ({
         appId: block.appId,
         blockId: block.blockId,
       })),
-    [block.appId, block.blockId, block.elements]
+    [block.appId, block.blockId, block.elements],
   );
 
   return (
diff --git a/packages/fuselage-ui-kit/src/blocks/ImageBlock.tsx b/packages/fuselage-ui-kit/src/blocks/ImageBlock.tsx
index 00d0a477f883..10ee2502ff0e 100644
--- a/packages/fuselage-ui-kit/src/blocks/ImageBlock.tsx
+++ b/packages/fuselage-ui-kit/src/blocks/ImageBlock.tsx
@@ -3,9 +3,9 @@ import * as UiKit from '@rocket.chat/ui-kit';
 import type { ReactElement } from 'react';
 import { memo, useEffect, useState } from 'react';
 
+import { Image } from './ImageBlock.styles';
 import { useSurfaceType } from '../hooks/useSurfaceType';
 import type { BlockProps } from '../utils/BlockProps';
-import { Image } from './ImageBlock.styles';
 
 const maxSize = 360;
 
@@ -84,7 +84,7 @@ const ImageBlock = ({
             {surfaceRenderer.renderTextObject(
               block.title,
               0,
-              UiKit.BlockContext.NONE
+              UiKit.BlockContext.NONE,
             )}
           </Box>
         )}
diff --git a/packages/fuselage-ui-kit/src/blocks/InputBlock.tsx b/packages/fuselage-ui-kit/src/blocks/InputBlock.tsx
index 9844372a3060..8a4cee136a07 100644
--- a/packages/fuselage-ui-kit/src/blocks/InputBlock.tsx
+++ b/packages/fuselage-ui-kit/src/blocks/InputBlock.tsx
@@ -26,7 +26,7 @@ const InputBlock = ({
       appId: block.element.appId ?? block.appId,
       blockId: block.element.blockId ?? block.blockId,
     }),
-    [block.element, block.appId, block.blockId]
+    [block.element, block.appId, block.blockId],
   );
 
   const [{ error }] = useUiKitState(inputElement, context);
@@ -38,7 +38,7 @@ const InputBlock = ({
           {surfaceRenderer.renderTextObject(
             block.label,
             0,
-            UiKit.BlockContext.NONE
+            UiKit.BlockContext.NONE,
           )}
         </FieldLabel>
       )}
@@ -51,7 +51,7 @@ const InputBlock = ({
           {surfaceRenderer.renderTextObject(
             block.hint,
             0,
-            UiKit.BlockContext.NONE
+            UiKit.BlockContext.NONE,
           )}
         </FieldHint>
       )}
diff --git a/packages/fuselage-ui-kit/src/blocks/PreviewBlock.tsx b/packages/fuselage-ui-kit/src/blocks/PreviewBlock.tsx
index 063ef7bdd34f..23b4b0cacb3a 100644
--- a/packages/fuselage-ui-kit/src/blocks/PreviewBlock.tsx
+++ b/packages/fuselage-ui-kit/src/blocks/PreviewBlock.tsx
@@ -16,8 +16,8 @@ import {
 import type { ReactElement } from 'react';
 import { memo } from 'react';
 
-import type { BlockProps } from '../utils/BlockProps';
 import ContextBlock from './ContextBlock';
+import type { BlockProps } from '../utils/BlockProps';
 
 type PreviewBlockProps = BlockProps<UiKit.PreviewBlock>;
 
@@ -57,8 +57,8 @@ const PreviewBlock = ({
               surfaceRenderer.renderTextObject(
                 title,
                 0,
-                UiKit.BlockContext.NONE
-              )
+                UiKit.BlockContext.NONE,
+              ),
             )}
           </MessageGenericPreviewTitle>
         ) : null}
@@ -68,8 +68,8 @@ const PreviewBlock = ({
               surfaceRenderer.renderTextObject(
                 description,
                 0,
-                UiKit.BlockContext.NONE
-              )
+                UiKit.BlockContext.NONE,
+              ),
             )}
           </MessageGenericPreviewDescription>
         ) : null}
diff --git a/packages/fuselage-ui-kit/src/blocks/SectionBlock.Fields.tsx b/packages/fuselage-ui-kit/src/blocks/SectionBlock.Fields.tsx
index b1161d55905b..a92ad87ad0ee 100644
--- a/packages/fuselage-ui-kit/src/blocks/SectionBlock.Fields.tsx
+++ b/packages/fuselage-ui-kit/src/blocks/SectionBlock.Fields.tsx
@@ -18,7 +18,7 @@ type FieldsProps = {
 const Fields = ({ fields, surfaceRenderer }: FieldsProps): ReactElement => (
   <Grid>
     {fields.map((field, i) => (
-      <Grid.Item {...breakpoints} key={i}>
+      <Grid.Item key={i} {...breakpoints}>
         {surfaceRenderer.renderTextObject(field, 0, UiKit.BlockContext.NONE)}
       </Grid.Item>
     ))}
diff --git a/packages/fuselage-ui-kit/src/blocks/SectionBlock.tsx b/packages/fuselage-ui-kit/src/blocks/SectionBlock.tsx
index 261a81f6b967..dab4662ea0ec 100644
--- a/packages/fuselage-ui-kit/src/blocks/SectionBlock.tsx
+++ b/packages/fuselage-ui-kit/src/blocks/SectionBlock.tsx
@@ -3,8 +3,8 @@ import type * as UiKit from '@rocket.chat/ui-kit';
 import type { ReactElement } from 'react';
 import { memo, useMemo } from 'react';
 
-import type { BlockProps } from '../utils/BlockProps';
 import Fields from './SectionBlock.Fields';
+import type { BlockProps } from '../utils/BlockProps';
 
 type SectionBlockProps = BlockProps<UiKit.SectionBlock>;
 
@@ -24,7 +24,7 @@ const SectionBlock = ({
             ...block.accessory,
           }
         : undefined,
-    [block.appId, block.blockId, block.accessory]
+    [block.appId, block.blockId, block.accessory],
   );
 
   return (
@@ -43,7 +43,7 @@ const SectionBlock = ({
             {accessoryElement
               ? surfaceRenderer.renderSectionAccessoryBlockElement(
                   accessoryElement,
-                  0
+                  0,
                 )
               : null}
           </Grid.Item>
diff --git a/packages/fuselage-ui-kit/src/blocks/TabNavigationBlock.tsx b/packages/fuselage-ui-kit/src/blocks/TabNavigationBlock.tsx
index cbdf91d948a3..9d5d4f4e1f48 100644
--- a/packages/fuselage-ui-kit/src/blocks/TabNavigationBlock.tsx
+++ b/packages/fuselage-ui-kit/src/blocks/TabNavigationBlock.tsx
@@ -9,7 +9,7 @@ import type { BlockProps } from '../utils/BlockProps';
 type TabNavigationBlockProps = BlockProps<ExperimentalTabNavigationBlock>;
 
 const TabNavigationBlock = (
-  blockProps: TabNavigationBlockProps
+  blockProps: TabNavigationBlockProps,
 ): ReactElement => {
   const {
     block: { tabs },
diff --git a/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/VideoConferenceBlock.tsx b/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/VideoConferenceBlock.tsx
index 7125dbbf1bc4..c56121585318 100644
--- a/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/VideoConferenceBlock.tsx
+++ b/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/VideoConferenceBlock.tsx
@@ -23,9 +23,9 @@ import type { MouseEventHandler, ReactElement } from 'react';
 import { useContext, memo } from 'react';
 
 import { UiKitContext } from '../..';
+import { useVideoConfDataStream } from './hooks/useVideoConfDataStream';
 import { useSurfaceType } from '../../hooks/useSurfaceType';
 import type { BlockProps } from '../../utils/BlockProps';
-import { useVideoConfDataStream } from './hooks/useVideoConfDataStream';
 
 type VideoConferenceBlockProps = BlockProps<UiKit.VideoConferenceBlock>;
 
@@ -61,7 +61,7 @@ const VideoConferenceBlock = ({
         value: block.blockId || '',
         viewId,
       },
-      e
+      e,
     );
   };
 
@@ -74,7 +74,7 @@ const VideoConferenceBlock = ({
         value: rid || '',
         viewId,
       },
-      e
+      e,
     );
   };
 
@@ -87,7 +87,7 @@ const VideoConferenceBlock = ({
         value: rid,
         viewId,
       },
-      e
+      e,
     );
   };
 
diff --git a/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/hooks/useVideoConfData.ts b/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/hooks/useVideoConfData.ts
index 8e2ea11e6b41..cc3081db7af6 100644
--- a/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/hooks/useVideoConfData.ts
+++ b/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/hooks/useVideoConfData.ts
@@ -16,6 +16,6 @@ export const useVideoConfData = ({ callId }: { callId: string }) => {
 
         return 'always';
       },
-    }
+    },
   );
 };
diff --git a/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/hooks/useVideoConfDataStream.ts b/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/hooks/useVideoConfDataStream.ts
index bcab7ee10db9..02ba077bfb50 100644
--- a/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/hooks/useVideoConfDataStream.ts
+++ b/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/hooks/useVideoConfDataStream.ts
@@ -21,7 +21,7 @@ export const useVideoConfDataStream = ({
       `${rid}/videoconf`,
       (id) =>
         id === callId &&
-        queryClient.invalidateQueries(['video-conference', callId])
+        queryClient.invalidateQueries(['video-conference', callId]),
     );
   }, [rid, callId, subscribeNotifyRoom, queryClient]);
 
diff --git a/packages/fuselage-ui-kit/src/contexts/SurfaceContext.ts b/packages/fuselage-ui-kit/src/contexts/SurfaceContext.ts
index 579daaa3ef6d..97af38bbc51e 100644
--- a/packages/fuselage-ui-kit/src/contexts/SurfaceContext.ts
+++ b/packages/fuselage-ui-kit/src/contexts/SurfaceContext.ts
@@ -5,6 +5,7 @@ export type SurfaceContextValue =
   | 'banner'
   | 'message'
   | 'modal'
-  | 'contextualBar';
+  | 'contextualBar'
+  | 'custom';
 
 export const SurfaceContext = createContext<SurfaceContextValue>('message');
diff --git a/packages/fuselage-ui-kit/src/contexts/UiKitContext.ts b/packages/fuselage-ui-kit/src/contexts/UiKitContext.ts
index 96ef1a7376be..c36f82afd53e 100644
--- a/packages/fuselage-ui-kit/src/contexts/UiKitContext.ts
+++ b/packages/fuselage-ui-kit/src/contexts/UiKitContext.ts
@@ -19,11 +19,11 @@ type ActionParams = {
 type UiKitContextValue = {
   action: (
     state: ActionParams,
-    event: Parameters<React.MouseEventHandler<HTMLElement>>[0]
+    event: Parameters<React.MouseEventHandler<HTMLElement>>[0],
   ) => Promise<void> | void;
   updateState?: (
     state: ActionParams,
-    event: Parameters<React.MouseEventHandler<HTMLElement>>[0]
+    event: Parameters<React.MouseEventHandler<HTMLElement>>[0],
   ) => Promise<void> | void;
   appId?: string;
   errors?: { [field: string]: string }[] | { [field: string]: string };
diff --git a/packages/fuselage-ui-kit/src/elements/ChannelsSelectElement/ChannelsSelectElement.spec.tsx b/packages/fuselage-ui-kit/src/elements/ChannelsSelectElement/ChannelsSelectElement.spec.tsx
index a1a1f93dd1cd..a9ba6cd72677 100644
--- a/packages/fuselage-ui-kit/src/elements/ChannelsSelectElement/ChannelsSelectElement.spec.tsx
+++ b/packages/fuselage-ui-kit/src/elements/ChannelsSelectElement/ChannelsSelectElement.spec.tsx
@@ -5,8 +5,8 @@ import { BlockContext } from '@rocket.chat/ui-kit';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { contextualBarParser } from '../../surfaces';
 import ChannelsSelectElement from './ChannelsSelectElement';
+import { contextualBarParser } from '../../surfaces';
 import { useChannelsData } from './hooks/useChannelsData';
 
 const channelsBlock: ChannelsSelectElementType = {
@@ -69,7 +69,7 @@ describe('UiKit ChannelsSelect Element', () => {
       </MockedServerContext>,
       {
         legacyRoot: true,
-      }
+      },
     );
   });
 
diff --git a/packages/fuselage-ui-kit/src/elements/ChannelsSelectElement/ChannelsSelectElement.tsx b/packages/fuselage-ui-kit/src/elements/ChannelsSelectElement/ChannelsSelectElement.tsx
index a26037373aa7..96d055253ac2 100644
--- a/packages/fuselage-ui-kit/src/elements/ChannelsSelectElement/ChannelsSelectElement.tsx
+++ b/packages/fuselage-ui-kit/src/elements/ChannelsSelectElement/ChannelsSelectElement.tsx
@@ -4,9 +4,9 @@ import { RoomAvatar } from '@rocket.chat/ui-avatar';
 import type * as UiKit from '@rocket.chat/ui-kit';
 import { memo, useCallback, useState } from 'react';
 
+import { useChannelsData } from './hooks/useChannelsData';
 import { useUiKitState } from '../../hooks/useUiKitState';
 import type { BlockProps } from '../../utils/BlockProps';
-import { useChannelsData } from './hooks/useChannelsData';
 
 type ChannelsSelectElementProps = BlockProps<UiKit.ChannelsSelectElement>;
 
@@ -25,7 +25,7 @@ const ChannelsSelectElement = ({
     (value: string | string[]) => {
       if (!Array.isArray(value)) action({ target: { value } });
     },
-    [action]
+    [action],
   );
 
   return (
diff --git a/packages/fuselage-ui-kit/src/elements/ChannelsSelectElement/MultiChannelsSelectElement.spec.tsx b/packages/fuselage-ui-kit/src/elements/ChannelsSelectElement/MultiChannelsSelectElement.spec.tsx
index 304a1a442d69..c3c65c3dbe7c 100644
--- a/packages/fuselage-ui-kit/src/elements/ChannelsSelectElement/MultiChannelsSelectElement.spec.tsx
+++ b/packages/fuselage-ui-kit/src/elements/ChannelsSelectElement/MultiChannelsSelectElement.spec.tsx
@@ -4,8 +4,8 @@ import { BlockContext } from '@rocket.chat/ui-kit';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { contextualBarParser } from '../../surfaces';
 import MultiChannelsSelectElement from './MultiChannelsSelectElement';
+import { contextualBarParser } from '../../surfaces';
 import { useChannelsData } from './hooks/useChannelsData';
 
 const channelsBlock: MultiChannelsSelectElementType = {
@@ -66,7 +66,7 @@ describe('UiKit MultiChannelsSelect Element', () => {
           surfaceRenderer={contextualBarParser}
         />
       </MockedServerContext>,
-      { legacyRoot: true }
+      { legacyRoot: true },
     );
   });
 
diff --git a/packages/fuselage-ui-kit/src/elements/ChannelsSelectElement/MultiChannelsSelectElement.tsx b/packages/fuselage-ui-kit/src/elements/ChannelsSelectElement/MultiChannelsSelectElement.tsx
index b050a137860d..526822e14b3c 100644
--- a/packages/fuselage-ui-kit/src/elements/ChannelsSelectElement/MultiChannelsSelectElement.tsx
+++ b/packages/fuselage-ui-kit/src/elements/ChannelsSelectElement/MultiChannelsSelectElement.tsx
@@ -4,9 +4,9 @@ import { RoomAvatar } from '@rocket.chat/ui-avatar';
 import type * as UiKit from '@rocket.chat/ui-kit';
 import { memo, useCallback, useState } from 'react';
 
+import { useChannelsData } from './hooks/useChannelsData';
 import { useUiKitState } from '../../hooks/useUiKitState';
 import type { BlockProps } from '../../utils/BlockProps';
-import { useChannelsData } from './hooks/useChannelsData';
 
 type MultiChannelsSelectProps = BlockProps<UiKit.MultiChannelsSelectElement>;
 
@@ -25,7 +25,7 @@ const MultiChannelsSelectElement = ({
     (value: string | string[]) => {
       if (Array.isArray(value)) action({ target: { value } });
     },
-    [action]
+    [action],
   );
 
   return (
diff --git a/packages/fuselage-ui-kit/src/elements/ChannelsSelectElement/hooks/useChannelsData.ts b/packages/fuselage-ui-kit/src/elements/ChannelsSelectElement/hooks/useChannelsData.ts
index 7d4bac6f7866..66019cfcf6e0 100644
--- a/packages/fuselage-ui-kit/src/elements/ChannelsSelectElement/hooks/useChannelsData.ts
+++ b/packages/fuselage-ui-kit/src/elements/ChannelsSelectElement/hooks/useChannelsData.ts
@@ -6,7 +6,7 @@ type useChannelsDataProps = {
 };
 
 const generateQuery = (
-  term = ''
+  term = '',
 ): {
   selector: string;
 } => ({ selector: JSON.stringify({ name: term }) });
@@ -14,7 +14,7 @@ const generateQuery = (
 export const useChannelsData = ({ filter }: useChannelsDataProps) => {
   const getRooms = useEndpoint(
     'GET',
-    '/v1/rooms.autocomplete.channelAndPrivate'
+    '/v1/rooms.autocomplete.channelAndPrivate',
   );
 
   const { data } = useQuery(
@@ -26,14 +26,14 @@ export const useChannelsData = ({ filter }: useChannelsDataProps) => {
         ({ fname, name, _id, avatarETag, t }) => ({
           value: _id,
           label: { name: name || fname, avatarETag, type: t },
-        })
+        }),
       );
 
       return options || [];
     },
     {
       keepPreviousData: true,
-    }
+    },
   );
 
   return data;
diff --git a/packages/fuselage-ui-kit/src/elements/CheckboxElement.tsx b/packages/fuselage-ui-kit/src/elements/CheckboxElement.tsx
index 94bc2db21126..ea66a3702094 100644
--- a/packages/fuselage-ui-kit/src/elements/CheckboxElement.tsx
+++ b/packages/fuselage-ui-kit/src/elements/CheckboxElement.tsx
@@ -32,7 +32,7 @@ const CheckboxElement = ({
               {surfaceRenderer.renderTextObject(
                 option.text,
                 0,
-                UiKit.BlockContext.NONE
+                UiKit.BlockContext.NONE,
               )}
             </Box>
           </Box>
diff --git a/packages/fuselage-ui-kit/src/elements/ContextElement/ContextElement.tsx b/packages/fuselage-ui-kit/src/elements/ContextElement/ContextElement.tsx
index a1bcc93c583c..fc580bc0bd98 100644
--- a/packages/fuselage-ui-kit/src/elements/ContextElement/ContextElement.tsx
+++ b/packages/fuselage-ui-kit/src/elements/ContextElement/ContextElement.tsx
@@ -1,8 +1,8 @@
 import { Box } from '@rocket.chat/fuselage';
 import type * as UiKit from '@rocket.chat/ui-kit';
 
-import type { BlockProps } from '../../utils/BlockProps';
 import { ContextElementItem } from './ContextElementItem';
+import type { BlockProps } from '../../utils/BlockProps';
 
 type ContextElementProps = BlockProps<UiKit.ContextBlock>;
 
diff --git a/packages/fuselage-ui-kit/src/elements/ContextElement/ContextElementItem.tsx b/packages/fuselage-ui-kit/src/elements/ContextElement/ContextElementItem.tsx
index bfc93603b232..04bf56166b0f 100644
--- a/packages/fuselage-ui-kit/src/elements/ContextElement/ContextElementItem.tsx
+++ b/packages/fuselage-ui-kit/src/elements/ContextElement/ContextElementItem.tsx
@@ -21,7 +21,7 @@ export const ContextElementItem = ({
     element,
     BlockContext.CONTEXT,
     undefined,
-    index
+    index,
   );
 
   if (!renderedElement) {
diff --git a/packages/fuselage-ui-kit/src/elements/ImageElement.tsx b/packages/fuselage-ui-kit/src/elements/ImageElement.tsx
index d790b6bf28cd..89a495c9ebc5 100644
--- a/packages/fuselage-ui-kit/src/elements/ImageElement.tsx
+++ b/packages/fuselage-ui-kit/src/elements/ImageElement.tsx
@@ -1,8 +1,8 @@
 import * as UiKit from '@rocket.chat/ui-kit';
 import type { ReactElement } from 'react';
 
-import type { BlockProps } from '../utils/BlockProps';
 import { Element } from './ImageElement.styles';
+import type { BlockProps } from '../utils/BlockProps';
 
 type ImageElementProps = BlockProps<UiKit.ImageElement>;
 
diff --git a/packages/fuselage-ui-kit/src/elements/LinearScaleElement.tsx b/packages/fuselage-ui-kit/src/elements/LinearScaleElement.tsx
index 8637c57f8612..bca683be8810 100644
--- a/packages/fuselage-ui-kit/src/elements/LinearScaleElement.tsx
+++ b/packages/fuselage-ui-kit/src/elements/LinearScaleElement.tsx
@@ -24,15 +24,15 @@ const LinearScaleElement = ({
 
   const [{ loading, value = initialValue, error }, action] = useUiKitState(
     block,
-    context
+    context,
   );
 
   const points = useMemo(
     () =>
       Array.from({ length: Math.max(maxValue - minValue + 1, 1) }, (_, i) =>
-        String(minValue + i)
+        String(minValue + i),
       ),
-    [maxValue, minValue]
+    [maxValue, minValue],
   );
 
   return (
@@ -47,7 +47,7 @@ const LinearScaleElement = ({
           {surfaceRenderer.renderTextObject(
             preLabel,
             0,
-            UiKit.BlockContext.NONE
+            UiKit.BlockContext.NONE,
           )}
         </Box>
       )}
@@ -72,7 +72,7 @@ const LinearScaleElement = ({
                   text: String(i + minValue),
                 },
                 0,
-                UiKit.BlockContext.NONE
+                UiKit.BlockContext.NONE,
               )}
             </Button>
           ))}
@@ -83,7 +83,7 @@ const LinearScaleElement = ({
           {surfaceRenderer.renderTextObject(
             postLabel,
             0,
-            UiKit.BlockContext.NONE
+            UiKit.BlockContext.NONE,
           )}
         </Box>
       )}
diff --git a/packages/fuselage-ui-kit/src/elements/MultiStaticSelectElement.tsx b/packages/fuselage-ui-kit/src/elements/MultiStaticSelectElement.tsx
index 9bb5746f7ef0..fca56b87613d 100644
--- a/packages/fuselage-ui-kit/src/elements/MultiStaticSelectElement.tsx
+++ b/packages/fuselage-ui-kit/src/elements/MultiStaticSelectElement.tsx
@@ -23,14 +23,14 @@ const MultiStaticSelectElement = ({
         value,
         fromTextObjectToString(text) ?? '',
       ]),
-    [block.options, fromTextObjectToString]
+    [block.options, fromTextObjectToString],
   );
 
   const handleChange = useCallback(
     (value: string[]) => {
       action({ target: { value } });
     },
-    [action]
+    [action],
   );
 
   return (
diff --git a/packages/fuselage-ui-kit/src/elements/OverflowElement.tsx b/packages/fuselage-ui-kit/src/elements/OverflowElement.tsx
index 1af8fe18394c..6b3eafb4aceb 100644
--- a/packages/fuselage-ui-kit/src/elements/OverflowElement.tsx
+++ b/packages/fuselage-ui-kit/src/elements/OverflowElement.tsx
@@ -25,7 +25,7 @@ const OverflowElement = ({
   const fireChange = useCallback(
     ([value]: [UiKit.ActionOf<UiKit.OverflowElement>, string]) =>
       action({ target: { value } }),
-    [action]
+    [action],
   );
 
   const options = useMemo<OptionType[]>(
@@ -38,7 +38,7 @@ const OverflowElement = ({
         undefined,
         url,
       ]),
-    [block.options, fromTextObjectToString]
+    [block.options, fromTextObjectToString],
   );
 
   const [cursor, handleKeyDown, handleKeyUp, reset, [visible, hide, show]] =
@@ -63,7 +63,7 @@ const OverflowElement = ({
       reset();
       hide();
     },
-    [action, hide, reset]
+    [action, hide, reset],
   );
 
   return (
diff --git a/packages/fuselage-ui-kit/src/elements/RadioButtonElement.tsx b/packages/fuselage-ui-kit/src/elements/RadioButtonElement.tsx
index 3076c8583883..618293179642 100644
--- a/packages/fuselage-ui-kit/src/elements/RadioButtonElement.tsx
+++ b/packages/fuselage-ui-kit/src/elements/RadioButtonElement.tsx
@@ -30,7 +30,7 @@ const RadioButtonElement = ({
               {surfaceRenderer.renderTextObject(
                 option.text,
                 0,
-                UiKit.BlockContext.NONE
+                UiKit.BlockContext.NONE,
               )}
             </Box>
           </Box>
diff --git a/packages/fuselage-ui-kit/src/elements/StaticSelectElement.tsx b/packages/fuselage-ui-kit/src/elements/StaticSelectElement.tsx
index 549ef2d8bd6e..12726b5163d1 100644
--- a/packages/fuselage-ui-kit/src/elements/StaticSelectElement.tsx
+++ b/packages/fuselage-ui-kit/src/elements/StaticSelectElement.tsx
@@ -22,14 +22,14 @@ const StaticSelectElement = ({
         option.value,
         fromTextObjectToString(option.text) ?? '',
       ]),
-    [block.options, fromTextObjectToString]
+    [block.options, fromTextObjectToString],
   );
 
   const handleChange = useCallback(
     (value: string) => {
       action({ target: { value } });
     },
-    [action]
+    [action],
   );
 
   return (
diff --git a/packages/fuselage-ui-kit/src/elements/ToggleSwitchElement.tsx b/packages/fuselage-ui-kit/src/elements/ToggleSwitchElement.tsx
index daa58c1a730f..7576ba741662 100644
--- a/packages/fuselage-ui-kit/src/elements/ToggleSwitchElement.tsx
+++ b/packages/fuselage-ui-kit/src/elements/ToggleSwitchElement.tsx
@@ -32,7 +32,7 @@ const ToggleSwitchElement = ({
               {surfaceRenderer.renderTextObject(
                 option.text,
                 0,
-                UiKit.BlockContext.NONE
+                UiKit.BlockContext.NONE,
               )}
             </Box>
           </Box>
diff --git a/packages/fuselage-ui-kit/src/elements/UsersSelectElement/MultiUsersSelectElement.spec.tsx b/packages/fuselage-ui-kit/src/elements/UsersSelectElement/MultiUsersSelectElement.spec.tsx
index eea4f509fed0..3f42c1908fd1 100644
--- a/packages/fuselage-ui-kit/src/elements/UsersSelectElement/MultiUsersSelectElement.spec.tsx
+++ b/packages/fuselage-ui-kit/src/elements/UsersSelectElement/MultiUsersSelectElement.spec.tsx
@@ -4,8 +4,8 @@ import { BlockContext } from '@rocket.chat/ui-kit';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { contextualBarParser } from '../../surfaces';
 import MultiUsersSelectElement from './MultiUsersSelectElement';
+import { contextualBarParser } from '../../surfaces';
 import { useUsersData } from './hooks/useUsersData';
 
 const usersBlock: MultiUsersSelectElementType = {
@@ -54,7 +54,7 @@ describe('UiKit MultiUsersSelect Element', () => {
           surfaceRenderer={contextualBarParser}
         />
       </MockedServerContext>,
-      { legacyRoot: true }
+      { legacyRoot: true },
     );
   });
 
diff --git a/packages/fuselage-ui-kit/src/elements/UsersSelectElement/MultiUsersSelectElement.tsx b/packages/fuselage-ui-kit/src/elements/UsersSelectElement/MultiUsersSelectElement.tsx
index 3fd3351c2bb6..3b5dced9092c 100644
--- a/packages/fuselage-ui-kit/src/elements/UsersSelectElement/MultiUsersSelectElement.tsx
+++ b/packages/fuselage-ui-kit/src/elements/UsersSelectElement/MultiUsersSelectElement.tsx
@@ -13,9 +13,9 @@ import type * as UiKit from '@rocket.chat/ui-kit';
 import type { ReactElement } from 'react';
 import { memo, useCallback, useState } from 'react';
 
+import { useUsersData } from './hooks/useUsersData';
 import { useUiKitState } from '../../hooks/useUiKitState';
 import type { BlockProps } from '../../utils/BlockProps';
-import { useUsersData } from './hooks/useUsersData';
 
 type MultiUsersSelectElementProps = BlockProps<UiKit.MultiUsersSelectElement>;
 
@@ -34,7 +34,7 @@ const MultiUsersSelectElement = ({
     (value: string | string[]) => {
       if (Array.isArray(value)) action({ target: { value } });
     },
-    [action]
+    [action],
   );
 
   return (
diff --git a/packages/fuselage-ui-kit/src/elements/UsersSelectElement/UserSelectElement.spec.tsx b/packages/fuselage-ui-kit/src/elements/UsersSelectElement/UserSelectElement.spec.tsx
index 6e92a85d1656..cd7a2cc07eb9 100644
--- a/packages/fuselage-ui-kit/src/elements/UsersSelectElement/UserSelectElement.spec.tsx
+++ b/packages/fuselage-ui-kit/src/elements/UsersSelectElement/UserSelectElement.spec.tsx
@@ -4,8 +4,8 @@ import { BlockContext } from '@rocket.chat/ui-kit';
 import { render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import { contextualBarParser } from '../../surfaces';
 import UsersSelectElement from './UsersSelectElement';
+import { contextualBarParser } from '../../surfaces';
 import { useUsersData } from './hooks/useUsersData';
 
 const userBlock: UsersSelectElementType = {
@@ -54,7 +54,7 @@ describe('UiKit UserSelect Element', () => {
           surfaceRenderer={contextualBarParser}
         />
       </MockedServerContext>,
-      { legacyRoot: true }
+      { legacyRoot: true },
     );
   });
 
diff --git a/packages/fuselage-ui-kit/src/elements/UsersSelectElement/UsersSelectElement.tsx b/packages/fuselage-ui-kit/src/elements/UsersSelectElement/UsersSelectElement.tsx
index 03306a36905c..1f8f00475583 100644
--- a/packages/fuselage-ui-kit/src/elements/UsersSelectElement/UsersSelectElement.tsx
+++ b/packages/fuselage-ui-kit/src/elements/UsersSelectElement/UsersSelectElement.tsx
@@ -4,9 +4,9 @@ import { UserAvatar } from '@rocket.chat/ui-avatar';
 import type * as UiKit from '@rocket.chat/ui-kit';
 import { useCallback, useState } from 'react';
 
+import { useUsersData } from './hooks/useUsersData';
 import { useUiKitState } from '../../hooks/useUiKitState';
 import type { BlockProps } from '../../utils/BlockProps';
-import { useUsersData } from './hooks/useUsersData';
 
 type UsersSelectElementProps = BlockProps<UiKit.UsersSelectElement>;
 
@@ -27,7 +27,7 @@ const UsersSelectElement = ({ block, context }: UsersSelectElementProps) => {
     (value: string | string[]) => {
       if (!Array.isArray(value)) action({ target: { value } });
     },
-    [action]
+    [action],
   );
 
   return (
diff --git a/packages/fuselage-ui-kit/src/elements/UsersSelectElement/hooks/useUsersData.ts b/packages/fuselage-ui-kit/src/elements/UsersSelectElement/hooks/useUsersData.ts
index 6ab9ef43f03d..8e807dba8f1c 100644
--- a/packages/fuselage-ui-kit/src/elements/UsersSelectElement/hooks/useUsersData.ts
+++ b/packages/fuselage-ui-kit/src/elements/UsersSelectElement/hooks/useUsersData.ts
@@ -20,12 +20,12 @@ export const useUsersData = ({ filter }: useUsersDataProps) => {
         (item): UserAutoCompleteOptionType => ({
           value: item.username,
           label: item.name || item.username,
-        })
+        }),
       );
 
       return options || [];
     },
-    { keepPreviousData: true }
+    { keepPreviousData: true },
   );
 
   return data;
diff --git a/packages/fuselage-ui-kit/src/hooks/useAppTranslation.spec.tsx b/packages/fuselage-ui-kit/src/hooks/useAppTranslation.spec.tsx
index 46314982aed8..50bf1d77b1a8 100644
--- a/packages/fuselage-ui-kit/src/hooks/useAppTranslation.spec.tsx
+++ b/packages/fuselage-ui-kit/src/hooks/useAppTranslation.spec.tsx
@@ -3,8 +3,8 @@ import * as i18next from 'i18next';
 import { Suspense } from 'react';
 import { I18nextProvider, initReactI18next } from 'react-i18next';
 
-import { AppIdProvider } from '../contexts/AppIdContext';
 import { useAppTranslation } from './useAppTranslation';
+import { AppIdProvider } from '../contexts/AppIdContext';
 
 let i18n: i18next.i18n;
 
@@ -107,7 +107,7 @@ describe('with suspense', () => {
     });
 
     await waitFor(() =>
-      expect(result.current).toBe('jumped over the lazy dog')
+      expect(result.current).toBe('jumped over the lazy dog'),
     );
   });
 
diff --git a/packages/fuselage-ui-kit/src/hooks/useStringFromTextObject.ts b/packages/fuselage-ui-kit/src/hooks/useStringFromTextObject.ts
index 72908da48eca..84537fd30385 100644
--- a/packages/fuselage-ui-kit/src/hooks/useStringFromTextObject.ts
+++ b/packages/fuselage-ui-kit/src/hooks/useStringFromTextObject.ts
@@ -16,6 +16,6 @@ export const useStringFromTextObject = () => {
         ? t?.(textObject.i18n.key, { ...textObject.i18n.args })
         : textObject.text;
     },
-    [t]
+    [t],
   );
 };
diff --git a/packages/fuselage-ui-kit/src/hooks/useUiKitState.ts b/packages/fuselage-ui-kit/src/hooks/useUiKitState.ts
index be2813e5d28a..4a3e328b2a1b 100644
--- a/packages/fuselage-ui-kit/src/hooks/useUiKitState.ts
+++ b/packages/fuselage-ui-kit/src/hooks/useUiKitState.ts
@@ -14,7 +14,7 @@ const getElementValueFromState = (
       }
     | undefined
   >,
-  initialValue: string | number | string[] | undefined
+  initialValue: string | number | string[] | undefined,
 ) => {
   return (
     (values &&
@@ -24,7 +24,7 @@ const getElementValueFromState = (
 };
 
 type UiKitState<
-  TElement extends UiKit.ActionableElement = UiKit.ActionableElement
+  TElement extends UiKit.ActionableElement = UiKit.ActionableElement,
 > = {
   loading: boolean;
   setLoading: (loading: boolean) => void;
@@ -34,15 +34,15 @@ type UiKitState<
 
 export const useUiKitState = <TElement extends UiKit.ActionableElement>(
   element: TElement,
-  context: UiKit.BlockContext
+  context: UiKit.BlockContext,
 ): [
   state: UiKitState<TElement>,
   action: (
     pseudoEvent?:
       | Event
       | { target: EventTarget }
-      | { target: { value: UiKit.ActionOf<TElement> } }
-  ) => Promise<void>
+      | { target: { value: UiKit.ActionOf<TElement> } },
+  ) => Promise<void>,
 ] => {
   const { blockId, actionId, appId, dispatchActionConfig } = element;
   const {
@@ -59,7 +59,7 @@ export const useUiKitState = <TElement extends UiKit.ActionableElement>(
   const _value = getElementValueFromState(actionId, values, initialValue);
   const error = Array.isArray(errors)
     ? errors.find((error) =>
-        Object.keys(error).find((key) => key === actionId)
+        Object.keys(error).find((key) => key === actionId),
       )?.[actionId]
     : errors?.[actionId];
 
@@ -91,7 +91,7 @@ export const useUiKitState = <TElement extends UiKit.ActionableElement>(
 
     await updateState?.(
       { blockId, appId, actionId, value: elValue, viewId },
-      e
+      e,
     );
     await action(
       {
@@ -101,7 +101,7 @@ export const useUiKitState = <TElement extends UiKit.ActionableElement>(
         value: elValue,
         viewId,
       },
-      e
+      e,
     );
     setLoading(false);
   });
@@ -126,7 +126,7 @@ export const useUiKitState = <TElement extends UiKit.ActionableElement>(
         viewId,
         dispatchActionConfig,
       },
-      e
+      e,
     );
   });
 
@@ -145,13 +145,13 @@ export const useUiKitState = <TElement extends UiKit.ActionableElement>(
         value,
         viewId,
       },
-      e
+      e,
     );
   });
 
   const result: UiKitState = useMemo(
     () => ({ loading, setLoading, error, value }),
-    [loading, setLoading, error, value]
+    [loading, setLoading, error, value],
   );
 
   if (
@@ -165,7 +165,7 @@ export const useUiKitState = <TElement extends UiKit.ActionableElement>(
   if (
     (context &&
       [UiKit.BlockContext.SECTION, UiKit.BlockContext.ACTION].includes(
-        context
+        context,
       )) ||
     (Array.isArray(element?.dispatchActionConfig) &&
       element.dispatchActionConfig.includes('on_item_selected'))
diff --git a/packages/fuselage-ui-kit/src/stories/Banner.stories.tsx b/packages/fuselage-ui-kit/src/stories/Banner.stories.tsx
index 848135428827..109abf0ef551 100644
--- a/packages/fuselage-ui-kit/src/stories/Banner.stories.tsx
+++ b/packages/fuselage-ui-kit/src/stories/Banner.stories.tsx
@@ -59,23 +59,23 @@ export const SectionWithPlainText = createStory(payloads.sectionWithPlainText);
 export const SectionWithMrkdwn = createStory(payloads.sectionWithMrkdwn);
 
 export const SectionWithTextFields = createStory(
-  payloads.sectionWithTextFields
+  payloads.sectionWithTextFields,
 );
 
 export const SectionWithButtonAccessory = createStory(
-  payloads.sectionWithButtonAccessory
+  payloads.sectionWithButtonAccessory,
 );
 
 export const SectionWithImageAccessory = createStory(
-  payloads.sectionWithImageAccessory
+  payloads.sectionWithImageAccessory,
 );
 
 export const SectionWithOverflowMenuAccessory = createStory(
-  payloads.sectionWithOverflowMenuAccessory
+  payloads.sectionWithOverflowMenuAccessory,
 );
 
 export const SectionWithDatePickerAccessory = createStory(
-  payloads.sectionWithDatePickerAccessory
+  payloads.sectionWithDatePickerAccessory,
 );
 
 export const ImageWithTitle = createStory(payloads.imageWithTitle);
@@ -83,25 +83,25 @@ export const ImageWithTitle = createStory(payloads.imageWithTitle);
 export const ImageWithoutTitle = createStory(payloads.imageWithoutTitle);
 
 export const ActionsWithAllSelects = createStory(
-  payloads.actionsWithAllSelects
+  payloads.actionsWithAllSelects,
 );
 
 export const ActionsWithFilteredConversationsSelect = createStory(
-  payloads.actionsWithFilteredConversationsSelect
+  payloads.actionsWithFilteredConversationsSelect,
 );
 
 export const ActionsWithInitializedSelects = createStory(
-  payloads.actionsWithInitializedSelects
+  payloads.actionsWithInitializedSelects,
 );
 
 export const ActionsWithButton = createStory(payloads.actionsWithButton);
 
 export const ActionsWithButtonAsLink = createStory(
-  payloads.actionsWithButtonAsLink
+  payloads.actionsWithButtonAsLink,
 );
 
 export const ActionsWithDatePicker = createStory(
-  payloads.actionsWithDatePicker
+  payloads.actionsWithDatePicker,
 );
 
 export const ContextWithPlainText = createStory(payloads.contextWithPlainText);
@@ -109,35 +109,35 @@ export const ContextWithPlainText = createStory(payloads.contextWithPlainText);
 export const ContextWithMrkdwn = createStory(payloads.contextWithMrkdwn);
 
 export const ContextWithTextAndImages = createStory(
-  payloads.contextWithTextAndImages
+  payloads.contextWithTextAndImages,
 );
 
 export const InputWithMultilinePlainTextInput = createStory(
   payloads.inputWithMultilinePlainTextInput,
   {
     'input-0': 'Error',
-  }
+  },
 );
 
 export const InputWithPlainTextInput = createStory(
   payloads.inputWithPlainTextInput,
   {
     'input-0': 'Error',
-  }
+  },
 );
 
 export const InputWithMultiUsersSelect = createStory(
   payloads.inputWithMultiUsersSelect,
   {
     'input-0': 'Error',
-  }
+  },
 );
 
 export const InputWithStaticSelect = createStory(
   payloads.inputWithStaticSelect,
   {
     'input-0': 'Error',
-  }
+  },
 );
 
 export const InputWithDatePicker = createStory(payloads.inputWithDatePicker, {
diff --git a/packages/fuselage-ui-kit/src/stories/Message.stories.tsx b/packages/fuselage-ui-kit/src/stories/Message.stories.tsx
index 418904245370..15c099d39ca2 100644
--- a/packages/fuselage-ui-kit/src/stories/Message.stories.tsx
+++ b/packages/fuselage-ui-kit/src/stories/Message.stories.tsx
@@ -85,23 +85,23 @@ export const SectionWithPlainText = createStory(payloads.sectionWithPlainText);
 export const SectionWithMrkdwn = createStory(payloads.sectionWithMrkdwn);
 
 export const SectionWithTextFields = createStory(
-  payloads.sectionWithTextFields
+  payloads.sectionWithTextFields,
 );
 
 export const SectionWithButtonAccessory = createStory(
-  payloads.sectionWithButtonAccessory
+  payloads.sectionWithButtonAccessory,
 );
 
 export const SectionWithImageAccessory = createStory(
-  payloads.sectionWithImageAccessory
+  payloads.sectionWithImageAccessory,
 );
 
 export const SectionWithOverflowMenuAccessory = createStory(
-  payloads.sectionWithOverflowMenuAccessory
+  payloads.sectionWithOverflowMenuAccessory,
 );
 
 export const SectionWithDatePickerAccessory = createStory(
-  payloads.sectionWithDatePickerAccessory
+  payloads.sectionWithDatePickerAccessory,
 );
 
 export const ImageWithTitle = createStory(payloads.imageWithTitle);
@@ -109,25 +109,25 @@ export const ImageWithTitle = createStory(payloads.imageWithTitle);
 export const ImageWithoutTitle = createStory(payloads.imageWithoutTitle);
 
 export const ActionsWithAllSelects = createStory(
-  payloads.actionsWithAllSelects
+  payloads.actionsWithAllSelects,
 );
 
 export const ActionsWithFilteredConversationsSelect = createStory(
-  payloads.actionsWithFilteredConversationsSelect
+  payloads.actionsWithFilteredConversationsSelect,
 );
 
 export const ActionsWithInitializedSelects = createStory(
-  payloads.actionsWithInitializedSelects
+  payloads.actionsWithInitializedSelects,
 );
 
 export const ActionsWithButton = createStory(payloads.actionsWithButton);
 
 export const ActionsWithButtonAsLink = createStory(
-  payloads.actionsWithButtonAsLink
+  payloads.actionsWithButtonAsLink,
 );
 
 export const ActionsWithDatePicker = createStory(
-  payloads.actionsWithDatePicker
+  payloads.actionsWithDatePicker,
 );
 
 export const ContextWithPlainText = createStory(payloads.contextWithPlainText);
@@ -135,12 +135,12 @@ export const ContextWithPlainText = createStory(payloads.contextWithPlainText);
 export const ContextWithMrkdwn = createStory(payloads.contextWithMrkdwn);
 
 export const ContextWithTextAndImages = createStory(
-  payloads.contextWithTextAndImages
+  payloads.contextWithTextAndImages,
 );
 
 export const Conditional = createStory(payloads.conditional);
 
 export const Preview = createStory(payloads.preview);
 export const PreviewWithExternalUrl = createStory(
-  payloads.previewWithExternalUrl
+  payloads.previewWithExternalUrl,
 );
diff --git a/packages/fuselage-ui-kit/src/stories/Modal.stories.tsx b/packages/fuselage-ui-kit/src/stories/Modal.stories.tsx
index 2be71ef91bd8..b4b578c043e0 100644
--- a/packages/fuselage-ui-kit/src/stories/Modal.stories.tsx
+++ b/packages/fuselage-ui-kit/src/stories/Modal.stories.tsx
@@ -100,23 +100,23 @@ export const SectionWithPlainText = createStory(payloads.sectionWithPlainText);
 export const SectionWithMrkdwn = createStory(payloads.sectionWithMrkdwn);
 
 export const SectionWithTextFields = createStory(
-  payloads.sectionWithTextFields
+  payloads.sectionWithTextFields,
 );
 
 export const SectionWithButtonAccessory = createStory(
-  payloads.sectionWithButtonAccessory
+  payloads.sectionWithButtonAccessory,
 );
 
 export const SectionWithImageAccessory = createStory(
-  payloads.sectionWithImageAccessory
+  payloads.sectionWithImageAccessory,
 );
 
 export const SectionWithOverflowMenuAccessory = createStory(
-  payloads.sectionWithOverflowMenuAccessory
+  payloads.sectionWithOverflowMenuAccessory,
 );
 
 export const SectionWithDatePickerAccessory = createStory(
-  payloads.sectionWithDatePickerAccessory
+  payloads.sectionWithDatePickerAccessory,
 );
 
 export const ImageWithTitle = createStory(payloads.imageWithTitle);
@@ -124,25 +124,25 @@ export const ImageWithTitle = createStory(payloads.imageWithTitle);
 export const ImageWithoutTitle = createStory(payloads.imageWithoutTitle);
 
 export const ActionsWithAllSelects = createStory(
-  payloads.actionsWithAllSelects
+  payloads.actionsWithAllSelects,
 );
 
 export const ActionsWithFilteredConversationsSelect = createStory(
-  payloads.actionsWithFilteredConversationsSelect
+  payloads.actionsWithFilteredConversationsSelect,
 );
 
 export const ActionsWithInitializedSelects = createStory(
-  payloads.actionsWithInitializedSelects
+  payloads.actionsWithInitializedSelects,
 );
 
 export const ActionsWithButton = createStory(payloads.actionsWithButton);
 
 export const ActionsWithButtonAsLink = createStory(
-  payloads.actionsWithButtonAsLink
+  payloads.actionsWithButtonAsLink,
 );
 
 export const ActionsWithDatePicker = createStory(
-  payloads.actionsWithDatePicker
+  payloads.actionsWithDatePicker,
 );
 
 export const ContextWithPlainText = createStory(payloads.contextWithPlainText);
@@ -150,35 +150,35 @@ export const ContextWithPlainText = createStory(payloads.contextWithPlainText);
 export const ContextWithMrkdwn = createStory(payloads.contextWithMrkdwn);
 
 export const ContextWithTextAndImages = createStory(
-  payloads.contextWithTextAndImages
+  payloads.contextWithTextAndImages,
 );
 
 export const InputWithMultilinePlainTextInput = createStory(
   payloads.inputWithMultilinePlainTextInput,
   {
     'input-0': 'Error',
-  }
+  },
 );
 
 export const InputWithPlainTextInput = createStory(
   payloads.inputWithPlainTextInput,
   {
     'input-0': 'Error',
-  }
+  },
 );
 
 export const InputWithMultiUsersSelect = createStory(
   payloads.inputWithMultiUsersSelect,
   {
     'input-0': 'Error',
-  }
+  },
 );
 
 export const InputWithStaticSelect = createStory(
   payloads.inputWithStaticSelect,
   {
     'input-0': 'Error',
-  }
+  },
 );
 
 export const InputWithDatePicker = createStory(payloads.inputWithDatePicker, {
diff --git a/packages/fuselage-ui-kit/src/surfaces/ContextualBarSurfaceRenderer.tsx b/packages/fuselage-ui-kit/src/surfaces/ContextualBarSurfaceRenderer.tsx
index 48b678365a7f..a973f5478b73 100644
--- a/packages/fuselage-ui-kit/src/surfaces/ContextualBarSurfaceRenderer.tsx
+++ b/packages/fuselage-ui-kit/src/surfaces/ContextualBarSurfaceRenderer.tsx
@@ -1,12 +1,12 @@
 import * as UiKit from '@rocket.chat/ui-kit';
 import type { ReactElement } from 'react';
 
-import TabNavigationBlock from '../blocks/TabNavigationBlock';
-import { AppIdProvider } from '../contexts/AppIdContext';
 import {
   FuselageSurfaceRenderer,
   renderTextObject,
 } from './FuselageSurfaceRenderer';
+import TabNavigationBlock from '../blocks/TabNavigationBlock';
+import { AppIdProvider } from '../contexts/AppIdContext';
 
 export class ContextualBarSurfaceRenderer extends FuselageSurfaceRenderer {
   public constructor() {
@@ -30,7 +30,7 @@ export class ContextualBarSurfaceRenderer extends FuselageSurfaceRenderer {
   tab_navigation(
     block: UiKit.ExperimentalTabNavigationBlock,
     context: UiKit.BlockContext,
-    index: number
+    index: number,
   ): ReactElement | null {
     if (context === UiKit.BlockContext.BLOCK) {
       return (
diff --git a/packages/fuselage-ui-kit/src/surfaces/FuselageMessageSurfaceRenderer.tsx b/packages/fuselage-ui-kit/src/surfaces/FuselageMessageSurfaceRenderer.tsx
index 610dd1f408c5..b1c8d4da58f6 100644
--- a/packages/fuselage-ui-kit/src/surfaces/FuselageMessageSurfaceRenderer.tsx
+++ b/packages/fuselage-ui-kit/src/surfaces/FuselageMessageSurfaceRenderer.tsx
@@ -1,12 +1,12 @@
 import * as UiKit from '@rocket.chat/ui-kit';
 import type { ReactElement } from 'react';
 
-import VideoConferenceBlock from '../blocks/VideoConferenceBlock/VideoConferenceBlock';
-import { AppIdProvider } from '../contexts/AppIdContext';
 import {
   FuselageSurfaceRenderer,
   renderTextObject,
 } from './FuselageSurfaceRenderer';
+import VideoConferenceBlock from '../blocks/VideoConferenceBlock/VideoConferenceBlock';
+import { AppIdProvider } from '../contexts/AppIdContext';
 
 export class FuselageMessageSurfaceRenderer extends FuselageSurfaceRenderer {
   public constructor() {
@@ -29,7 +29,7 @@ export class FuselageMessageSurfaceRenderer extends FuselageSurfaceRenderer {
   video_conf(
     block: UiKit.VideoConferenceBlock,
     context: UiKit.BlockContext,
-    index: number
+    index: number,
   ): ReactElement | null {
     if (context === UiKit.BlockContext.BLOCK) {
       return (
diff --git a/packages/fuselage-ui-kit/src/surfaces/FuselageSurfaceRenderer.tsx b/packages/fuselage-ui-kit/src/surfaces/FuselageSurfaceRenderer.tsx
index 37f3aa796527..fe3c39b31a9d 100644
--- a/packages/fuselage-ui-kit/src/surfaces/FuselageSurfaceRenderer.tsx
+++ b/packages/fuselage-ui-kit/src/surfaces/FuselageSurfaceRenderer.tsx
@@ -32,7 +32,7 @@ import UsersSelectElement from '../elements/UsersSelectElement/UsersSelectElemen
 type TextObjectRenderers = {
   [TTextObject in UiKit.TextObject as TTextObject['type']]: (
     textObject: TTextObject,
-    index: number
+    index: number,
   ) => ReactElement | null;
 };
 
@@ -48,7 +48,7 @@ const textObjectRenderers: TextObjectRenderers = {
 export const renderTextObject = (
   textObject: UiKit.TextObject,
   context: UiKit.BlockContext,
-  index: number
+  index: number,
 ) => {
   if (context === UiKit.BlockContext.BLOCK) {
     return null;
@@ -65,7 +65,7 @@ export const renderTextObject = (
 
 const isImageBlock = (
   _elementOrBlock: UiKit.ImageBlock | UiKit.ImageElement,
-  context: UiKit.BlockContext
+  context: UiKit.BlockContext,
 ): _elementOrBlock is UiKit.ImageBlock => {
   return context === UiKit.BlockContext.BLOCK;
 };
@@ -85,14 +85,14 @@ export abstract class FuselageSurfaceRenderer extends UiKit.SurfaceRenderer<Reac
         'input',
         'section',
         'preview',
-      ]
+      ],
     );
   }
 
   public plain_text(
     textObject: UiKit.PlainText,
     context: UiKit.BlockContext,
-    index: number
+    index: number,
   ): ReactElement | null {
     if (context === UiKit.BlockContext.BLOCK) {
       return null;
@@ -104,7 +104,7 @@ export abstract class FuselageSurfaceRenderer extends UiKit.SurfaceRenderer<Reac
   public mrkdwn(
     textObject: UiKit.TextObject,
     context: UiKit.BlockContext,
-    index: number
+    index: number,
   ): ReactElement | null {
     if (context === UiKit.BlockContext.BLOCK) {
       return null;
@@ -116,7 +116,7 @@ export abstract class FuselageSurfaceRenderer extends UiKit.SurfaceRenderer<Reac
   public text(
     textObject: UiKit.TextObject,
     context: UiKit.BlockContext,
-    index: number
+    index: number,
   ): ReactElement | null {
     if (textObject.type === 'mrkdwn') {
       return this.mrkdwn(textObject, context, index);
@@ -128,7 +128,7 @@ export abstract class FuselageSurfaceRenderer extends UiKit.SurfaceRenderer<Reac
   actions(
     block: UiKit.ActionsBlock,
     context: UiKit.BlockContext,
-    index: number
+    index: number,
   ): ReactElement | null {
     if (context === UiKit.BlockContext.BLOCK) {
       return (
@@ -149,7 +149,7 @@ export abstract class FuselageSurfaceRenderer extends UiKit.SurfaceRenderer<Reac
   preview(
     block: UiKit.PreviewBlock,
     context: UiKit.BlockContext,
-    index: number
+    index: number,
   ): ReactElement | null {
     if (context !== UiKit.BlockContext.BLOCK) {
       return null;
@@ -168,7 +168,7 @@ export abstract class FuselageSurfaceRenderer extends UiKit.SurfaceRenderer<Reac
   context(
     block: UiKit.ContextBlock,
     context: UiKit.BlockContext,
-    index: number
+    index: number,
   ): ReactElement | null {
     if (context === UiKit.BlockContext.BLOCK) {
       return (
@@ -189,7 +189,7 @@ export abstract class FuselageSurfaceRenderer extends UiKit.SurfaceRenderer<Reac
   divider(
     block: UiKit.DividerBlock,
     context: UiKit.BlockContext,
-    index: number
+    index: number,
   ): ReactElement | null {
     if (context === UiKit.BlockContext.BLOCK) {
       return (
@@ -210,7 +210,7 @@ export abstract class FuselageSurfaceRenderer extends UiKit.SurfaceRenderer<Reac
   image(
     block: UiKit.ImageBlock | UiKit.ImageElement,
     context: UiKit.BlockContext,
-    index: number
+    index: number,
   ): ReactElement | null {
     if (isImageBlock(block, context)) {
       return (
@@ -239,7 +239,7 @@ export abstract class FuselageSurfaceRenderer extends UiKit.SurfaceRenderer<Reac
   input(
     block: UiKit.InputBlock,
     context: UiKit.BlockContext,
-    index: number
+    index: number,
   ): ReactElement | null {
     if (context === UiKit.BlockContext.BLOCK) {
       return (
@@ -263,7 +263,7 @@ export abstract class FuselageSurfaceRenderer extends UiKit.SurfaceRenderer<Reac
   section(
     block: UiKit.SectionBlock,
     context: UiKit.BlockContext,
-    index: number
+    index: number,
   ): ReactElement | null {
     if (context === UiKit.BlockContext.BLOCK) {
       return (
@@ -284,7 +284,7 @@ export abstract class FuselageSurfaceRenderer extends UiKit.SurfaceRenderer<Reac
   button(
     block: UiKit.ButtonElement,
     context: UiKit.BlockContext,
-    index: number
+    index: number,
   ): ReactElement | null {
     if (context === UiKit.BlockContext.BLOCK) {
       return null;
@@ -305,7 +305,7 @@ export abstract class FuselageSurfaceRenderer extends UiKit.SurfaceRenderer<Reac
   datepicker(
     block: UiKit.DatePickerElement,
     context: UiKit.BlockContext,
-    index: number
+    index: number,
   ): ReactElement | null {
     if (context === UiKit.BlockContext.BLOCK) {
       return null;
@@ -326,7 +326,7 @@ export abstract class FuselageSurfaceRenderer extends UiKit.SurfaceRenderer<Reac
   static_select(
     block: UiKit.StaticSelectElement,
     context: UiKit.BlockContext,
-    index: number
+    index: number,
   ): ReactElement | null {
     if (context === UiKit.BlockContext.BLOCK) {
       return null;
@@ -347,7 +347,7 @@ export abstract class FuselageSurfaceRenderer extends UiKit.SurfaceRenderer<Reac
   multi_static_select(
     block: UiKit.MultiStaticSelectElement,
     context: UiKit.BlockContext,
-    index: number
+    index: number,
   ): ReactElement | null {
     if (context === UiKit.BlockContext.BLOCK) {
       return null;
@@ -368,7 +368,7 @@ export abstract class FuselageSurfaceRenderer extends UiKit.SurfaceRenderer<Reac
   overflow(
     block: UiKit.OverflowElement,
     context: UiKit.BlockContext,
-    index: number
+    index: number,
   ): ReactElement | null {
     if (context === UiKit.BlockContext.BLOCK) {
       return null;
@@ -389,7 +389,7 @@ export abstract class FuselageSurfaceRenderer extends UiKit.SurfaceRenderer<Reac
   plain_text_input(
     block: UiKit.PlainTextInputElement,
     context: UiKit.BlockContext,
-    index: number
+    index: number,
   ): ReactElement | null {
     if (context === UiKit.BlockContext.BLOCK) {
       return null;
@@ -410,7 +410,7 @@ export abstract class FuselageSurfaceRenderer extends UiKit.SurfaceRenderer<Reac
   linear_scale(
     block: UiKit.LinearScaleElement,
     context: UiKit.BlockContext,
-    index: number
+    index: number,
   ): ReactElement | null {
     if (context === UiKit.BlockContext.BLOCK) {
       return null;
@@ -431,7 +431,7 @@ export abstract class FuselageSurfaceRenderer extends UiKit.SurfaceRenderer<Reac
   toggle_switch(
     block: UiKit.ToggleSwitchElement,
     context: UiKit.BlockContext,
-    index: number
+    index: number,
   ): ReactElement | null {
     if (context === UiKit.BlockContext.BLOCK) {
       return null;
@@ -452,7 +452,7 @@ export abstract class FuselageSurfaceRenderer extends UiKit.SurfaceRenderer<Reac
   radio_button(
     block: UiKit.RadioButtonElement,
     context: UiKit.BlockContext,
-    index: number
+    index: number,
   ): ReactElement | null {
     if (context === UiKit.BlockContext.BLOCK) {
       return null;
@@ -473,7 +473,7 @@ export abstract class FuselageSurfaceRenderer extends UiKit.SurfaceRenderer<Reac
   checkbox(
     block: UiKit.CheckboxElement,
     context: UiKit.BlockContext,
-    index: number
+    index: number,
   ): ReactElement | null {
     if (context === UiKit.BlockContext.BLOCK) {
       return null;
@@ -494,7 +494,7 @@ export abstract class FuselageSurfaceRenderer extends UiKit.SurfaceRenderer<Reac
   callout(
     block: UiKit.CalloutBlock,
     context: UiKit.BlockContext,
-    index: number
+    index: number,
   ): ReactElement | null {
     if (context === UiKit.BlockContext.BLOCK) {
       return (
@@ -515,7 +515,7 @@ export abstract class FuselageSurfaceRenderer extends UiKit.SurfaceRenderer<Reac
   time_picker(
     block: UiKit.TimePickerElement,
     context: UiKit.BlockContext,
-    index: number
+    index: number,
   ): ReactElement | null {
     if (context === UiKit.BlockContext.BLOCK) {
       return null;
@@ -536,7 +536,7 @@ export abstract class FuselageSurfaceRenderer extends UiKit.SurfaceRenderer<Reac
   users_select(
     block: UiKit.UsersSelectElement,
     context: UiKit.BlockContext,
-    index: number
+    index: number,
   ): ReactElement | null {
     if (context === UiKit.BlockContext.FORM) {
       return (
@@ -555,7 +555,7 @@ export abstract class FuselageSurfaceRenderer extends UiKit.SurfaceRenderer<Reac
   channels_select(
     block: UiKit.ChannelsSelectElement,
     context: UiKit.BlockContext,
-    index: number
+    index: number,
   ): ReactElement | null {
     if (context === UiKit.BlockContext.FORM) {
       return (
@@ -574,7 +574,7 @@ export abstract class FuselageSurfaceRenderer extends UiKit.SurfaceRenderer<Reac
   multi_users_select(
     block: UiKit.MultiUsersSelectElement,
     context: UiKit.BlockContext,
-    index: number
+    index: number,
   ): ReactElement | null {
     if (context === UiKit.BlockContext.FORM) {
       return (
@@ -593,7 +593,7 @@ export abstract class FuselageSurfaceRenderer extends UiKit.SurfaceRenderer<Reac
   multi_channels_select(
     block: UiKit.MultiChannelsSelectElement,
     context: UiKit.BlockContext,
-    index: number
+    index: number,
   ): ReactElement | null {
     if (context === UiKit.BlockContext.FORM) {
       return (
diff --git a/packages/fuselage-ui-kit/src/surfaces/createSurfaceRenderer.tsx b/packages/fuselage-ui-kit/src/surfaces/createSurfaceRenderer.tsx
index 0208198f0268..3b9fcdcd1c3a 100644
--- a/packages/fuselage-ui-kit/src/surfaces/createSurfaceRenderer.tsx
+++ b/packages/fuselage-ui-kit/src/surfaces/createSurfaceRenderer.tsx
@@ -2,15 +2,15 @@ import type * as UiKit from '@rocket.chat/ui-kit';
 import type { ComponentType, ReactElement, ReactNode } from 'react';
 
 export const createSurfaceRenderer = <
-  S extends UiKit.SurfaceRenderer<ReactElement>
+  S extends UiKit.SurfaceRenderer<ReactElement>,
 >(
   // eslint-disable-next-line @typescript-eslint/naming-convention
   SurfaceComponent: ComponentType<{ children: ReactNode }>,
-  surfaceRenderer: S
+  surfaceRenderer: S,
 ) =>
   function Surface(
     blocks: readonly UiKit.LayoutBlock[],
-    conditions: UiKit.Conditions = {}
+    conditions: UiKit.Conditions = {},
   ): ReactElement {
     return (
       <SurfaceComponent>
diff --git a/packages/fuselage-ui-kit/src/surfaces/index.ts b/packages/fuselage-ui-kit/src/surfaces/index.ts
index 8b92a4d646a2..e2ccb2da32c2 100644
--- a/packages/fuselage-ui-kit/src/surfaces/index.ts
+++ b/packages/fuselage-ui-kit/src/surfaces/index.ts
@@ -3,9 +3,14 @@ import { BannerSurfaceRenderer } from './BannerSurfaceRenderer';
 import ContextualBarSurface from './ContextualBarSurface';
 import { ContextualBarSurfaceRenderer } from './ContextualBarSurfaceRenderer';
 import { FuselageMessageSurfaceRenderer } from './FuselageMessageSurfaceRenderer';
+import {
+  FuselageSurfaceRenderer,
+  renderTextObject,
+} from './FuselageSurfaceRenderer';
 import MessageSurface from './MessageSurface';
 import ModalSurface from './ModalSurface';
 import { ModalSurfaceRenderer } from './ModalSurfaceRenderer';
+import { Surface } from './Surface';
 import { createSurfaceRenderer } from './createSurfaceRenderer';
 
 export const bannerParser = new BannerSurfaceRenderer();
@@ -16,10 +21,17 @@ export const contextualBarParser = new ContextualBarSurfaceRenderer();
 export const UiKitBanner = createSurfaceRenderer(BannerSurface, bannerParser);
 export const UiKitMessage = createSurfaceRenderer(
   MessageSurface,
-  messageParser
+  messageParser,
 );
 export const UiKitModal = createSurfaceRenderer(ModalSurface, modalParser);
 export const UiKitContextualBar = createSurfaceRenderer(
   ContextualBarSurface,
-  contextualBarParser
+  contextualBarParser,
 );
+
+export {
+  createSurfaceRenderer,
+  Surface,
+  FuselageSurfaceRenderer,
+  renderTextObject,
+};
diff --git a/packages/fuselage-ui-kit/src/utils/extractInitialStateFromLayout.ts b/packages/fuselage-ui-kit/src/utils/extractInitialStateFromLayout.ts
index 0fc66c7f72ab..b6054aba92df 100644
--- a/packages/fuselage-ui-kit/src/utils/extractInitialStateFromLayout.ts
+++ b/packages/fuselage-ui-kit/src/utils/extractInitialStateFromLayout.ts
@@ -5,13 +5,13 @@ import { hasElement } from './hasElement';
 import { hasElements } from './hasElements';
 
 const isActionableElement = (
-  element: UiKit.BlockElement | UiKit.TextObject
+  element: UiKit.BlockElement | UiKit.TextObject,
 ): element is UiKit.ActionableElement =>
   'actionId' in element && typeof element.actionId === 'string';
 
 const reduceInitialValuesFromLayoutBlock = (
   state: { [actionId: string]: Value },
-  block: UiKit.LayoutBlock
+  block: UiKit.LayoutBlock,
 ) => {
   if (hasElement(block)) {
     if (isActionableElement(block.element)) {
diff --git a/packages/fuselage-ui-kit/src/utils/getInitialValue.ts b/packages/fuselage-ui-kit/src/utils/getInitialValue.ts
index 7e75d4d5231c..fd5fcc00417a 100644
--- a/packages/fuselage-ui-kit/src/utils/getInitialValue.ts
+++ b/packages/fuselage-ui-kit/src/utils/getInitialValue.ts
@@ -3,27 +3,27 @@ import type * as UiKit from '@rocket.chat/ui-kit';
 export type Value = { value: unknown; blockId?: string };
 
 const hasInitialValue = (
-  element: UiKit.ActionableElement
+  element: UiKit.ActionableElement,
 ): element is UiKit.ActionableElement & { initialValue: number | string } =>
   'initialValue' in element;
 
 const hasInitialTime = (
-  element: UiKit.ActionableElement
+  element: UiKit.ActionableElement,
 ): element is UiKit.ActionableElement & { initialTime: string } =>
   'initialTime' in element;
 
 const hasInitialDate = (
-  element: UiKit.ActionableElement
+  element: UiKit.ActionableElement,
 ): element is UiKit.ActionableElement & { initialDate: string } =>
   'initialDate' in element;
 
 const hasInitialOption = (
-  element: UiKit.ActionableElement
+  element: UiKit.ActionableElement,
 ): element is UiKit.ActionableElement & { initialOption: UiKit.Option } =>
   'initialOption' in element;
 
 const hasInitialOptions = (
-  element: UiKit.ActionableElement
+  element: UiKit.ActionableElement,
 ): element is UiKit.ActionableElement & { initialOptions: UiKit.Option[] } =>
   'initialOptions' in element;
 
diff --git a/packages/fuselage-ui-kit/src/utils/hasElement.ts b/packages/fuselage-ui-kit/src/utils/hasElement.ts
index 42484addf444..1d438c2e618a 100644
--- a/packages/fuselage-ui-kit/src/utils/hasElement.ts
+++ b/packages/fuselage-ui-kit/src/utils/hasElement.ts
@@ -6,5 +6,5 @@ type LayoutBlockWithElement = Extract<
 >;
 
 export const hasElement = (
-  block: UiKit.LayoutBlock
+  block: UiKit.LayoutBlock,
 ): block is LayoutBlockWithElement => 'element' in block;
diff --git a/packages/fuselage-ui-kit/src/utils/hasElements.ts b/packages/fuselage-ui-kit/src/utils/hasElements.ts
index 9df00cda1768..089238b82484 100644
--- a/packages/fuselage-ui-kit/src/utils/hasElements.ts
+++ b/packages/fuselage-ui-kit/src/utils/hasElements.ts
@@ -6,6 +6,6 @@ type LayoutBlockWithElements = Extract<
 >;
 
 export const hasElements = (
-  block: UiKit.LayoutBlock
+  block: UiKit.LayoutBlock,
 ): block is LayoutBlockWithElements =>
   'elements' in block && Array.isArray(block.elements);
diff --git a/packages/gazzodown/.storybook/preview.tsx b/packages/gazzodown/.storybook/preview.tsx
index bf546111492f..b8e7113474ab 100644
--- a/packages/gazzodown/.storybook/preview.tsx
+++ b/packages/gazzodown/.storybook/preview.tsx
@@ -14,7 +14,7 @@ export const parameters: Parameters = {
 
 export const decorators: Decorator[] = [
 	(Story) => (
-		<div className='rc-old'>
+		<div>
 			<style>{`
 				body {
 					background-color: white;
diff --git a/packages/gazzodown/CHANGELOG.md b/packages/gazzodown/CHANGELOG.md
index 8683a9beaab5..11e84a0e093e 100644
--- a/packages/gazzodown/CHANGELOG.md
+++ b/packages/gazzodown/CHANGELOG.md
@@ -1,5 +1,49 @@
 # @rocket.chat/gazzodown
 
+## 13.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.3
+  - @rocket.chat/ui-contexts@13.0.0-rc.3
+  - @rocket.chat/ui-client@13.0.0-rc.3
+  </details>
+
+## 13.0.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.2
+  - @rocket.chat/ui-contexts@13.0.0-rc.2
+  - @rocket.chat/ui-client@13.0.0-rc.2
+  </details>
+
+## 13.0.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.1
+  - @rocket.chat/ui-contexts@13.0.0-rc.1
+  - @rocket.chat/ui-client@13.0.0-rc.1
+  </details>
+
+## 13.0.0-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [80e36bfc3938775eb26aa5576f1b9b98896e1cc4, 32d93a0666fa1cbe857d02889e93d9bbf45bd4f0]:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.0
+  - @rocket.chat/ui-contexts@13.0.0-rc.0
+  - @rocket.chat/ui-client@13.0.0-rc.0
+  </details>
+
 ## 12.0.0
 
 ### Minor Changes
diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json
index a3706366b2e5..dc50f83b46d6 100644
--- a/packages/gazzodown/package.json
+++ b/packages/gazzodown/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/gazzodown",
-	"version": "12.0.0",
+	"version": "13.0.0-rc.3",
 	"private": true,
 	"main": "./dist/index.js",
 	"typings": "./dist/index.d.ts",
@@ -21,13 +21,12 @@
 		"typecheck": "tsc --noEmit"
 	},
 	"dependencies": {
-		"date-fns": "^3.3.1",
-		"dompurify": "^3.1.7",
-		"highlight.js": "^11.5.1",
+		"dompurify": "^3.2.0",
+		"highlight.js": "^11.10.0",
 		"react-error-boundary": "^3.1.4"
 	},
 	"devDependencies": {
-		"@babel/core": "~7.25.8",
+		"@babel/core": "~7.26.0",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/css-in-js": "~0.31.25",
 		"@rocket.chat/fuselage": "^0.59.4",
@@ -37,35 +36,35 @@
 		"@rocket.chat/styled": "~0.31.25",
 		"@rocket.chat/ui-client": "workspace:^",
 		"@rocket.chat/ui-contexts": "workspace:^",
-		"@storybook/addon-actions": "^8.3.5",
-		"@storybook/addon-docs": "^8.3.5",
-		"@storybook/addon-essentials": "^8.3.5",
-		"@storybook/addon-interactions": "^8.3.5",
-		"@storybook/addon-links": "^8.3.5",
-		"@storybook/addon-styling-webpack": "^1.0.0",
+		"@storybook/addon-actions": "^8.4.4",
+		"@storybook/addon-docs": "^8.4.4",
+		"@storybook/addon-essentials": "^8.4.4",
+		"@storybook/addon-interactions": "^8.4.4",
+		"@storybook/addon-links": "^8.4.4",
+		"@storybook/addon-styling-webpack": "^1.0.1",
 		"@storybook/addon-webpack5-compiler-babel": "^3.0.3",
-		"@storybook/react": "^8.3.5",
-		"@storybook/react-webpack5": "^8.3.5",
+		"@storybook/react": "^8.4.4",
+		"@storybook/react-webpack5": "^8.4.4",
 		"@testing-library/react": "~16.0.1",
 		"@types/dompurify": "^3.0.5",
-		"@types/jest": "~29.5.13",
+		"@types/jest": "~29.5.14",
 		"@types/katex": "~0.16.7",
 		"@types/react": "~17.0.80",
 		"@types/react-dom": "~17.0.25",
 		"@typescript-eslint/eslint-plugin": "~5.60.1",
 		"@typescript-eslint/parser": "~5.60.1",
-		"babel-loader": "^8.3.0",
+		"babel-loader": "^9.2.1",
 		"eslint": "~8.45.0",
 		"eslint-plugin-anti-trojan-source": "~1.1.1",
-		"eslint-plugin-react": "~7.32.2",
-		"eslint-plugin-react-hooks": "~4.6.2",
-		"eslint-plugin-storybook": "^0.9.0",
+		"eslint-plugin-react": "~7.37.2",
+		"eslint-plugin-react-hooks": "~5.0.0",
+		"eslint-plugin-storybook": "^0.11.0",
 		"identity-obj-proxy": "^3.0.0",
 		"jest": "~29.7.0",
 		"katex": "~0.16.11",
 		"outdent": "^0.8.0",
 		"react-dom": "~17.0.2",
-		"storybook": "^8.3.5",
+		"storybook": "^8.4.4",
 		"typescript": "~5.6.3"
 	},
 	"peerDependencies": {
@@ -75,8 +74,8 @@
 		"@rocket.chat/fuselage-tokens": "*",
 		"@rocket.chat/message-parser": "0.31.31",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-client": "12.0.0",
-		"@rocket.chat/ui-contexts": "12.0.0",
+		"@rocket.chat/ui-client": "13.0.0-rc.3",
+		"@rocket.chat/ui-contexts": "13.0.0-rc.3",
 		"katex": "*",
 		"react": "*"
 	},
diff --git a/packages/gazzodown/src/elements/BoldSpan.tsx b/packages/gazzodown/src/elements/BoldSpan.tsx
index c00cd0c1d95a..81fcc91f66c6 100644
--- a/packages/gazzodown/src/elements/BoldSpan.tsx
+++ b/packages/gazzodown/src/elements/BoldSpan.tsx
@@ -1,14 +1,14 @@
 import type * as MessageParser from '@rocket.chat/message-parser';
 import type { ReactElement } from 'react';
 
-import CodeElement from '../code/CodeElement';
-import EmojiElement from '../emoji/EmojiElement';
-import ChannelMentionElement from '../mentions/ChannelMentionElement';
-import UserMentionElement from '../mentions/UserMentionElement';
 import ItalicSpan from './ItalicSpan';
 import LinkSpan from './LinkSpan';
 import PlainSpan from './PlainSpan';
 import StrikeSpan from './StrikeSpan';
+import CodeElement from '../code/CodeElement';
+import EmojiElement from '../emoji/EmojiElement';
+import ChannelMentionElement from '../mentions/ChannelMentionElement';
+import UserMentionElement from '../mentions/UserMentionElement';
 
 type MessageBlock =
 	| MessageParser.Emoji
diff --git a/packages/gazzodown/src/elements/InlineElements.tsx b/packages/gazzodown/src/elements/InlineElements.tsx
index 39fcd7938cff..aa6f749d023b 100644
--- a/packages/gazzodown/src/elements/InlineElements.tsx
+++ b/packages/gazzodown/src/elements/InlineElements.tsx
@@ -1,12 +1,6 @@
 import type * as MessageParser from '@rocket.chat/message-parser';
 import { lazy, ReactElement } from 'react';
 
-import CodeElement from '../code/CodeElement';
-import ColorElement from '../colors/ColorElement';
-import EmojiElement from '../emoji/EmojiElement';
-import KatexErrorBoundary from '../katex/KatexErrorBoundary';
-import ChannelMentionElement from '../mentions/ChannelMentionElement';
-import UserMentionElement from '../mentions/UserMentionElement';
 import BoldSpan from './BoldSpan';
 import ImageElement from './ImageElement';
 import ItalicSpan from './ItalicSpan';
@@ -14,6 +8,12 @@ import LinkSpan from './LinkSpan';
 import PlainSpan from './PlainSpan';
 import StrikeSpan from './StrikeSpan';
 import Timestamp from './Timestamp';
+import CodeElement from '../code/CodeElement';
+import ColorElement from '../colors/ColorElement';
+import EmojiElement from '../emoji/EmojiElement';
+import KatexErrorBoundary from '../katex/KatexErrorBoundary';
+import ChannelMentionElement from '../mentions/ChannelMentionElement';
+import UserMentionElement from '../mentions/UserMentionElement';
 
 const KatexElement = lazy(() => import('../katex/KatexElement'));
 
diff --git a/packages/gazzodown/src/elements/ItalicSpan.tsx b/packages/gazzodown/src/elements/ItalicSpan.tsx
index 4893d3b7e3b6..946a28bdac3f 100644
--- a/packages/gazzodown/src/elements/ItalicSpan.tsx
+++ b/packages/gazzodown/src/elements/ItalicSpan.tsx
@@ -1,14 +1,14 @@
 import type * as MessageParser from '@rocket.chat/message-parser';
 import type { ReactElement } from 'react';
 
-import CodeElement from '../code/CodeElement';
-import EmojiElement from '../emoji/EmojiElement';
-import ChannelMentionElement from '../mentions/ChannelMentionElement';
-import UserMentionElement from '../mentions/UserMentionElement';
 import BoldSpan from './BoldSpan';
 import LinkSpan from './LinkSpan';
 import PlainSpan from './PlainSpan';
 import StrikeSpan from './StrikeSpan';
+import CodeElement from '../code/CodeElement';
+import EmojiElement from '../emoji/EmojiElement';
+import ChannelMentionElement from '../mentions/ChannelMentionElement';
+import UserMentionElement from '../mentions/UserMentionElement';
 
 type MessageBlock =
 	| MessageParser.Emoji
diff --git a/packages/gazzodown/src/elements/PreviewInlineElements.tsx b/packages/gazzodown/src/elements/PreviewInlineElements.tsx
index 77c0b17bc99c..bdd5b58cfe43 100644
--- a/packages/gazzodown/src/elements/PreviewInlineElements.tsx
+++ b/packages/gazzodown/src/elements/PreviewInlineElements.tsx
@@ -1,6 +1,9 @@
 import type * as MessageParser from '@rocket.chat/message-parser';
 import { Fragment, ReactElement } from 'react';
 
+import BoldSpan from './BoldSpan';
+import ItalicSpan from './ItalicSpan';
+import StrikeSpan from './StrikeSpan';
 import PreviewCodeElement from '../code/PreviewCodeElement';
 import PreviewColorElement from '../colors/PreviewColorElement';
 import PreviewEmojiElement from '../emoji/PreviewEmojiElement';
@@ -8,9 +11,6 @@ import KatexErrorBoundary from '../katex/KatexErrorBoundary';
 import PreviewKatexElement from '../katex/PreviewKatexElement';
 import PreviewChannelMentionElement from '../mentions/PreviewChannelMentionElement';
 import PreviewUserMentionElement from '../mentions/PreviewUserMentionElement';
-import BoldSpan from './BoldSpan';
-import ItalicSpan from './ItalicSpan';
-import StrikeSpan from './StrikeSpan';
 
 type PreviewInlineElementsProps = {
 	children: MessageParser.Inlines[];
diff --git a/packages/gazzodown/src/elements/StrikeSpan.tsx b/packages/gazzodown/src/elements/StrikeSpan.tsx
index 34417f45d787..138a9c359dde 100644
--- a/packages/gazzodown/src/elements/StrikeSpan.tsx
+++ b/packages/gazzodown/src/elements/StrikeSpan.tsx
@@ -1,14 +1,14 @@
 import type * as MessageParser from '@rocket.chat/message-parser';
 import type { ReactElement } from 'react';
 
-import CodeElement from '../code/CodeElement';
-import EmojiElement from '../emoji/EmojiElement';
-import ChannelMentionElement from '../mentions/ChannelMentionElement';
-import UserMentionElement from '../mentions/UserMentionElement';
 import BoldSpan from './BoldSpan';
 import ItalicSpan from './ItalicSpan';
 import LinkSpan from './LinkSpan';
 import PlainSpan from './PlainSpan';
+import CodeElement from '../code/CodeElement';
+import EmojiElement from '../emoji/EmojiElement';
+import ChannelMentionElement from '../mentions/ChannelMentionElement';
+import UserMentionElement from '../mentions/UserMentionElement';
 
 type MessageBlock =
 	| MessageParser.Timestamp
diff --git a/packages/gazzodown/src/elements/Timestamp/index.tsx b/packages/gazzodown/src/elements/Timestamp/index.tsx
index efc691843a1d..3346c684ffe6 100644
--- a/packages/gazzodown/src/elements/Timestamp/index.tsx
+++ b/packages/gazzodown/src/elements/Timestamp/index.tsx
@@ -5,8 +5,8 @@ import { format } from 'date-fns';
 import { useContext, useEffect, useState, type ReactElement } from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
 
-import { MarkupInteractionContext } from '../../MarkupInteractionContext';
 import { timeAgo } from './timeago';
+import { MarkupInteractionContext } from '../../MarkupInteractionContext';
 
 type BoldSpanProps = {
 	children: MessageParser.Timestamp;
diff --git a/packages/gazzodown/src/emoji/Emoji.tsx b/packages/gazzodown/src/emoji/Emoji.tsx
index 33b6a7ed6391..896a7d6d954e 100644
--- a/packages/gazzodown/src/emoji/Emoji.tsx
+++ b/packages/gazzodown/src/emoji/Emoji.tsx
@@ -2,8 +2,8 @@ import type * as MessageParser from '@rocket.chat/message-parser';
 import { ReactElement, useMemo, useContext, memo } from 'react';
 
 import { MarkupInteractionContext } from '../MarkupInteractionContext';
-import PlainSpan from '../elements/PlainSpan';
 import EmojiRenderer from './EmojiRenderer';
+import PlainSpan from '../elements/PlainSpan';
 
 type EmojiProps = MessageParser.Emoji & {
 	big?: boolean;
diff --git a/packages/i18n/CHANGELOG.md b/packages/i18n/CHANGELOG.md
index 901750cd4984..05fa9e6037d0 100644
--- a/packages/i18n/CHANGELOG.md
+++ b/packages/i18n/CHANGELOG.md
@@ -1,5 +1,35 @@
 # @rocket.chat/i18n
 
+## 1.1.0-rc.0
+
+### Minor Changes
+
+- ([#32906](https://github.com/RocketChat/Rocket.Chat/pull/32906)) Improves thread metrics featuring user avatars, better titles and repositioned elements.
+
+- ([#32727](https://github.com/RocketChat/Rocket.Chat/pull/32727)) These changes aims to add:
+  - A brand-new omnichannel contact profile
+  - The ability to communicate with known contacts only
+  - Communicate with verified contacts only
+  - Merge verified contacts across different channels
+  - Block contact channels
+  - Resolve conflicting contact information when registered via different channels
+  - An advanced contact center filters
+- ([#33920](https://github.com/RocketChat/Rocket.Chat/pull/33920)) Improves the customizability of the naming of automatic Persistent video calls discussions, allowing the date of the call to be in different parts of the name, using the `[date]` keyword.
+
+- ([#33997](https://github.com/RocketChat/Rocket.Chat/pull/33997)) Prevent apps' subprocesses from crashing on unhandled rejections or uncaught exceptions
+
+- ([#33814](https://github.com/RocketChat/Rocket.Chat/pull/33814)) Adds a confirmation modal to the cancel subscription action
+
+- ([#33949](https://github.com/RocketChat/Rocket.Chat/pull/33949)) Disables the possiblity to upload exempted apps
+
+### Patch Changes
+
+- ([#33218](https://github.com/RocketChat/Rocket.Chat/pull/33218)) Fixes message character limit not being applied to file upload descriptions
+
+- ([#33902](https://github.com/RocketChat/Rocket.Chat/pull/33902)) Adds "Master volume" and "Call ringer volume" to the user preferences sound section.
+
+- ([#33880](https://github.com/RocketChat/Rocket.Chat/pull/33880)) Updates VoIP field labels from 'Free Extension Numbers' to 'Available Extensions' to better describe the field's purpose and improve clarity.
+
 ## 1.0.0
 
 ### Major Changes
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
index a5fe4a02d02a..d2121eb14f06 100644
--- a/packages/i18n/package.json
+++ b/packages/i18n/package.json
@@ -1,12 +1,11 @@
 {
 	"name": "@rocket.chat/i18n",
-	"version": "1.0.0",
+	"version": "1.1.0-rc.0",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
-		"tsup": "^6.7.0",
 		"typescript": "~5.6.3"
 	},
 	"scripts": {
diff --git a/packages/i18n/src/locales/af.i18n.json b/packages/i18n/src/locales/af.i18n.json
index 484d1ff2cc58..20c862010cb6 100644
--- a/packages/i18n/src/locales/af.i18n.json
+++ b/packages/i18n/src/locales/af.i18n.json
@@ -784,7 +784,6 @@
   "Custom_Emoji_Updated_Successfully": "Gepasmaakte emoji suksesvol opgedateer",
   "Custom_Fields": "Aangepaste velde",
   "Custom_oauth_helper": "Wanneer u u OAuth-verskaffer opstel, moet u 'n terugbel-URL in kennis stel. Gebruik <pre>%s</pre>.",
-  "Custom_oauth_unique_name": "Custom oauth unieke naam",
   "Custom_Script_Logged_In": "Aangepaste skrif vir aangemelde gebruikers",
   "Custom_Script_Logged_Out": "Aangepaste skrif vir aangemeld gebruikers",
   "Custom_Scripts": "Gepasmaakte skrifte",
@@ -1196,7 +1195,6 @@
   "Gaming": "gaming",
   "General": "algemene",
   "github_no_public_email": "Jy het geen e-pos as publieke e-pos in jou GitHub-rekening nie",
-  "Give_a_unique_name_for_the_custom_oauth": "Gee 'n unieke naam vir die persoonlike oauth",
   "strike": "staking",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Gee die aansoek 'n naam. Dit sal deur u gebruikers gesien word.",
   "Global": "Global",
@@ -1776,7 +1774,6 @@
   "Newer_than_may_not_exceed_Older_than": "\"Nuwer as\" mag nie \"Ouer as\" wees nie.",
   "No": "Geen",
   "No_available_agents_to_transfer": "Geen beskikbare agente om oor te dra nie",
-  "No_channels_yet": "Jy is nog nie deel van enige kanaal nie",
   "No_direct_messages_yet": "Geen direkte boodskappe.",
   "No_Encryption": "Geen enkripsie",
   "No_groups_yet": "Jy het nog geen privaat groepe nie.",
@@ -1808,7 +1805,6 @@
   "Notifications_Max_Room_Members_Description": "Maksimum aantal lede in die kamer wanneer kennisgewings vir alle boodskappe afgeskakel word. Gebruikers kan steeds per kamerinstelling verander om alle kennisgewings op individuele basis te ontvang. (0 om uit te skakel)",
   "Notifications_Muted_Description": "As jy kies om alles te demper, sal jy nie die kamerhoogte in die lys sien as daar nuwe boodskappe is nie, behalwe vir verwysings. Muting-kennisgewings sal kennisgewingsinstellings ignoreer.",
   "Notifications_Preferences": "Kennisgewings Voorkeure",
-  "Notifications_Sound_Volume": "Kennisgewings klankvolume",
   "Notify_active_in_this_room": "Stel aktiewe gebruikers in hierdie kamer in kennis",
   "Notify_all_in_this_room": "Stel alles in hierdie kamer in kennis",
   "Num_Agents": "# Agente",
diff --git a/packages/i18n/src/locales/ar.i18n.json b/packages/i18n/src/locales/ar.i18n.json
index ee0e6f179b0e..7af11923ae03 100644
--- a/packages/i18n/src/locales/ar.i18n.json
+++ b/packages/i18n/src/locales/ar.i18n.json
@@ -1272,7 +1272,6 @@
   "Custom_Field_Not_Found": "الحقول المخصصة غير موجودة",
   "Custom_Integration": "تكامل الحقول المخصصة",
   "Custom_oauth_helper": "عند إعداد موفر OAuth لديك، سيتعين عليك الإبلاغ عن عنوان URL الخاص بإعادة الاتصال. استخدم <pre>‎%s</pre> .",
-  "Custom_oauth_unique_name": "الاسم الفريد المخصص لـ oauth",
   "Custom_Script_Logged_In": "البرنامج النصي المخصص للمستخدمين المسجلين الدخول",
   "Custom_Script_Logged_In_Description": "البرنامج النصي المخصص الذي سيتم تشغيله دائمًا ولأي مستخدم قام بتسجيل الدخول. على سبيل المثال (كلما دخلت الدردشة وكنت مسجلاً الدخول)",
   "Custom_Script_Logged_Out": "البرنامج النصي المخصص للمستخدمين المسجلين الخروج",
@@ -2006,7 +2005,6 @@
   "Forward_to_user": "إعادة التوجيه إلى مستخدم",
   "Forwarding": "تتم إعادة التوجيه",
   "Free": "مجانًا",
-  "Free_Extension_Numbers": "أرقام امتداد مجانية",
   "Free_Apps": "تطبيقات مجانية",
   "Frequently_Used": "الأكثر استعمالاً",
   "Friday": "الجمعة",
@@ -2031,7 +2029,6 @@
   "get-server-info": "الحصول على معلومات الخادم",
   "github_no_public_email": "ليس لديك أي بريد إلكتروني عام في حسابك على Github",
   "github_HEAD": "العنوان",
-  "Give_a_unique_name_for_the_custom_oauth": "امنح اسمًا فريدًا مخصصًا لـ oauth",
   "strike": "شطب",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "امنح التطبيق اسمًا. وسيظهر للمستخدمين لديك.",
   "Global": "عام",
@@ -3064,7 +3061,6 @@
   "No_Canned_Responses_Yet": "لا توجد ردود مسجلة حتى الآن",
   "No_Canned_Responses_Yet-description": "استخدم الردود المسجلة لتقديم إجابات سريعة ومتسقة للأسئلة المتداولة.",
   "No_channels_in_team": "لا توجد Channels بالنسبة إلى هذا الفريق",
-  "No_channels_yet": "أنت لست جزءًا من أي قنوات حتى الآن",
   "No_data_found": "لم يتم العثور على بيانات",
   "No_direct_messages_yet": "لا توجد رسائل مباشرة.",
   "No_Discussions_found": "لم يتم العثور على مناقشات",
@@ -3120,7 +3116,6 @@
   "Notifications_Max_Room_Members_Description": "الحد الأقصى لعدد الأعضاء في الغرفة عند تعطيل إشعارات كل الرسائل. لا يزال بإمكان المستخدمين تغيير إعداد كل غرفة لتلقي كل الإشعارات على أساس فردي. (0 للتعطيل)",
   "Notifications_Muted_Description": "إذا اخترت كتم صوت كل شيء، فلن ترى تمييز الغرفة في القائمة عند وجود رسائل جديدة، باستثناء الإشارات. سيتجاوز كتم صوت الإشعارات إعدادات الإشعارات.",
   "Notifications_Preferences": "تفضيلات الإشعارات",
-  "Notifications_Sound_Volume": "حجم صوت الإشعارات",
   "Notify_active_in_this_room": "إخطار المستخدمين النشطين في هذه الغرفة",
   "Notify_all_in_this_room": "إخطار جميع من في هذه الغرفة",
   "NPS_survey_enabled": "تمكين استطلاع صافي نقاط الترويج",
diff --git a/packages/i18n/src/locales/az.i18n.json b/packages/i18n/src/locales/az.i18n.json
index c956a418e5ff..1fa9ee0cea70 100644
--- a/packages/i18n/src/locales/az.i18n.json
+++ b/packages/i18n/src/locales/az.i18n.json
@@ -784,7 +784,6 @@
   "Custom_Emoji_Updated_Successfully": "Xüsusi emoji uğurla güncəllənir",
   "Custom_Fields": "Xüsusi sahələr",
   "Custom_oauth_helper": "OAuth Provayderinizi qurarkən, bir Geri Axtarış URL'sini bildirməlisiniz. <pre>%s</pre>istifadə edin.",
-  "Custom_oauth_unique_name": "Xüsusi oauth unikal adı",
   "Custom_Script_Logged_In": "Daxil olanlar üçün xüsusi skript",
   "Custom_Script_Logged_Out": "Daxil olanlar üçün xüsusi skript",
   "Custom_Scripts": "Xüsusi skriptlər",
@@ -1196,7 +1195,6 @@
   "Gaming": "Oyun",
   "General": "Ümumi",
   "github_no_public_email": "GitHub hesabınızda ictimai e-poçt olaraq heç bir e-poçtunuz yoxdur",
-  "Give_a_unique_name_for_the_custom_oauth": "Xüsusi oauth üçün unikal bir ad verin",
   "strike": "tətil",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Ərizə bir ad verin. Bu, istifadəçilər tərəfindən görünəcək.",
   "Global": "Qlobal",
@@ -1776,7 +1774,6 @@
   "Newer_than_may_not_exceed_Older_than": "\"Daha yeni\", \"Əvvəllər daha çox\"",
   "No": "Yox",
   "No_available_agents_to_transfer": "Transfer üçün heç bir agent yoxdur",
-  "No_channels_yet": "Hələ heç bir kanalın bir hissəsi deyilsiniz",
   "No_direct_messages_yet": "Birbaşa mesajlar yoxdur.",
   "No_Encryption": "Şifrələmə yoxdur",
   "No_groups_yet": "Hələ xüsusi qruplarınız yoxdur.",
@@ -1808,7 +1805,6 @@
   "Notifications_Max_Room_Members_Description": "Bütün mesajlar üçün bildirişlər çıxdıqda otaqda maksimum üzv sayı. İstifadəçilər fərdi şəkildə bütün bildirişləri qəbul etmək üçün hələ otaq qəbulu üçün dəyişə bilərlər. (Aradan qaldırılması üçün 0)",
   "Notifications_Muted_Description": "Hər şeyi ləğv etməyi seçsəniz, qeydləri istisna olmaqla, yeni mesajlar olduqda siyahıdakı qeydləri görməyəcəksiniz. Bildirişlərin silinməsi bildirişlərin parametrlərini qüvvədə saxlayır.",
   "Notifications_Preferences": "Bildirişlərin üstünlükləri",
-  "Notifications_Sound_Volume": "Bildirişlərin səs həcmi",
   "Notify_active_in_this_room": "Bu otaqda aktiv istifadəçiləri xəbərdar et",
   "Notify_all_in_this_room": "Bütün bu otaqda xəbər verin",
   "Num_Agents": "# Agentlər",
diff --git a/packages/i18n/src/locales/be-BY.i18n.json b/packages/i18n/src/locales/be-BY.i18n.json
index abb3ddecb80b..2d777c73cc5f 100644
--- a/packages/i18n/src/locales/be-BY.i18n.json
+++ b/packages/i18n/src/locales/be-BY.i18n.json
@@ -803,7 +803,6 @@
   "Custom_Emoji_Updated_Successfully": "Прыстасаваныя смайлікі паспяхова абноўленыя",
   "Custom_Fields": "прыстасаваныя поля",
   "Custom_oauth_helper": "Падчас усталявання OAuth пастаўшчыка, вы павінны будзеце паведаміць Callback URL. Выкарыстоўвайце <pre>%s</pre>.",
-  "Custom_oauth_unique_name": "Прыстасаваныя OAuth унікальнае імя",
   "Custom_Script_Logged_In": "Карыстацкі скрыпт для зарэгістраваных карыстальнікаў",
   "Custom_Script_Logged_Out": "Карыстацкі скрыпт для логаут карыстальнікаў",
   "Custom_Scripts": "прыстасаваныя скрыпты",
@@ -1212,7 +1211,6 @@
   "Gaming": "азартныя гульні",
   "General": "агульны",
   "github_no_public_email": "У вас няма адрасы электроннай пошты ў якасці публічнай электроннай пошты ў вашым акаўнце GitHub",
-  "Give_a_unique_name_for_the_custom_oauth": "Дайце унікальнае імя для карыстацкага OAuth",
   "strike": "забастоўка",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Дайце дадаткам імя. Гэта будзе бачна вашымі карыстальнікамі.",
   "Global": "глабальнай",
@@ -1792,7 +1790,6 @@
   "Newer_than_may_not_exceed_Older_than": "«Навей чым» не можа перавышаць «Старэй»",
   "No": "Няма",
   "No_available_agents_to_transfer": "Няма даступных агентаў не перадаваць",
-  "No_channels_yet": "Вы не з'яўляюцца часткай якога-небудзь канала яшчэ",
   "No_direct_messages_yet": "Няма прамых паведамленняў.",
   "No_Encryption": "Няма Шыфраванне",
   "No_groups_yet": "У вас няма асабістых груп яшчэ.",
@@ -1824,7 +1821,6 @@
   "Notifications_Max_Room_Members_Description": "Максімальную колькасць удзельнікаў у пакоі, калі паведамленьняў ва ўсіх паведамленняў атрымлівае інвалід. Карыстальнікі па-ранейшаму могуць змяняцца ў залежнасці ад налады нумары, каб атрымаць усе апавяшчэння на індывідуальнай аснове. (0 для адключэння)",
   "Notifications_Muted_Description": "Калі вы хочаце адключыць усе, вы не ўбачыце падсвятленне нумары ў спісе, калі ёсць новыя паведамленні, за выключэннем згадкі. Прыглушэння апавяшчэння будуць перавызначаць налады апавяшчэнняў.",
   "Notifications_Preferences": "апавяшчэння Preferences",
-  "Notifications_Sound_Volume": "Апавяшчэння гучнасці гуку",
   "Notify_active_in_this_room": "Апавяшчаць актыўных карыстальнікаў у гэтым пакоі",
   "Notify_all_in_this_room": "Паведаміце усё ў гэтым пакоі",
   "Num_Agents": "# Агенты",
diff --git a/packages/i18n/src/locales/bg.i18n.json b/packages/i18n/src/locales/bg.i18n.json
index e0c1e62c6f05..30158cc9114c 100644
--- a/packages/i18n/src/locales/bg.i18n.json
+++ b/packages/i18n/src/locales/bg.i18n.json
@@ -784,7 +784,6 @@
   "Custom_Emoji_Updated_Successfully": "Персонализираното емотико се актуализира успешно",
   "Custom_Fields": "Персонализирани полета",
   "Custom_oauth_helper": "Когато настройвате своя доставчик на OAuth, ще трябва да информирате URL адрес за обратно повикване. Използвайте <pre>%s</pre>.",
-  "Custom_oauth_unique_name": "Потребителско уникално име",
   "Custom_Script_Logged_In": "Персонализиран скрипт за регистрирани потребители",
   "Custom_Script_Logged_Out": "Персонализиран скрипт за излезли потребители",
   "Custom_Scripts": "Персонализирани скриптове",
@@ -1196,7 +1195,6 @@
   "Gaming": "игрален",
   "General": "Общ",
   "github_no_public_email": "Нямате имейл като публичен имейл в профила си в GitHub",
-  "Give_a_unique_name_for_the_custom_oauth": "Дайте уникално име за обичайното име",
   "strike": "стачка",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Дайте име на приложението. Това ще се види от вашите потребители.",
   "Global": "в световен мащаб",
@@ -1773,7 +1771,6 @@
   "Newer_than_may_not_exceed_Older_than": "\"По-нова от\" не може да надвишава \"По-стари от\"",
   "No": "Не",
   "No_available_agents_to_transfer": "Няма налични агенти за прехвърляне",
-  "No_channels_yet": "Не си част от никой канал все още",
   "No_direct_messages_yet": "Няма директни съобщения.",
   "No_Encryption": "Без шифроване",
   "No_groups_yet": "Все още нямате частни групи.",
@@ -1805,7 +1802,6 @@
   "Notifications_Max_Room_Members_Description": "Максимален брой членове в стаята, когато известията за всички съобщения са деактивирани. Потребителите все още могат да променят настройките за стая, за да получават всички известия на индивидуална основа. (0 за деактивиране)",
   "Notifications_Muted_Description": "Ако решите да заглушите всичко, няма да виждате избраното място в списъка, когато има нови съобщения, с изключение на споменаванията. Известията за заглушаване ще заменят настройките за известия.",
   "Notifications_Preferences": "Предпочитания за известия",
-  "Notifications_Sound_Volume": "Обем на звука за известия",
   "Notify_active_in_this_room": "Уведомявайте активните потребители в тази стая",
   "Notify_all_in_this_room": "Известявайте всички в тази стая",
   "Num_Agents": "# Агенти",
diff --git a/packages/i18n/src/locales/bs.i18n.json b/packages/i18n/src/locales/bs.i18n.json
index 03c230496a43..0bf165f464c9 100644
--- a/packages/i18n/src/locales/bs.i18n.json
+++ b/packages/i18n/src/locales/bs.i18n.json
@@ -783,7 +783,6 @@
   "Custom_Emoji_Updated_Successfully": "Poseban emotikon je ažuriran.",
   "Custom_Fields": "Prilagođena polja",
   "Custom_oauth_helper": "Prilikom postavljanja OAuth Provider, morate namjestiti URL povratnog poziva. Koristite <pre> %s </pre> ,",
-  "Custom_oauth_unique_name": "Prilagođeno OAuth jedinstveno ime",
   "Custom_Script_Logged_In": "Prilagođena skripta za prijavljene korisnike",
   "Custom_Script_Logged_Out": "Prilagođena skripta za odjavljene korisnike",
   "Custom_Scripts": "Prilagođene skripte",
@@ -1192,7 +1191,6 @@
   "Gaming": "kockanje",
   "General": "Općenito",
   "github_no_public_email": "Nemaš nijedan javni email u svom GitHub računu",
-  "Give_a_unique_name_for_the_custom_oauth": "Daj jedinstveno ime prilagođenom OAuth",
   "strike": "precrtaj",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Dajte ime aplikaciji. To će korisnici vidjeti.",
   "Global": "Globalno",
@@ -1770,7 +1768,6 @@
   "Newer_than": "Noviji od",
   "Newer_than_may_not_exceed_Older_than": "\"Noviji od\" ne smije premašiti \"starije od\"",
   "No_available_agents_to_transfer": "Nema dostupnih agenata za prijenos",
-  "No_channels_yet": "Još nisi dio nijedne sobe.",
   "No_direct_messages_yet": "Još nisi započeo nijedan razgovor.",
   "No_Encryption": "Bez Enkripcije",
   "No_groups_yet": "Još nemaš privatnih grupa.",
@@ -1802,7 +1799,6 @@
   "Notifications_Max_Room_Members_Description": "Maksimalni broj članova u sobi kada se obavijesti o svim porukama onemogućuju. Korisnici se i dalje mogu mijenjati po postavkama sobe kako bi primile sve obavijesti na pojedinačnoj osnovi. (0 za onemogućavanje)",
   "Notifications_Muted_Description": "Ako odlučite isključiti sve, u popisu se neće prikazati oznaka sobe ako postoje nove poruke, osim za spominjanja. Isključivanje obavijesti poništava postavke obavijesti.",
   "Notifications_Preferences": "Postavke obavijesti",
-  "Notifications_Sound_Volume": "Glasnoća zvuka obavijesti",
   "Notify_active_in_this_room": "Obavijesti aktivne korisnike u ovoj sobi",
   "Notify_all_in_this_room": "Obavijesti sve u ovoj sobi",
   "Num_Agents": "# agenata",
diff --git a/packages/i18n/src/locales/ca.i18n.json b/packages/i18n/src/locales/ca.i18n.json
index c0bde7e54311..de5327ab75f5 100644
--- a/packages/i18n/src/locales/ca.i18n.json
+++ b/packages/i18n/src/locales/ca.i18n.json
@@ -1258,7 +1258,6 @@
   "Custom_Field_Not_Found": "Camp personalitzat no trobat",
   "Custom_Integration": "Integració personalitzada",
   "Custom_oauth_helper": "Per configurar el proveïdor OAuth, heu d'establir un URL de retorn (callback). Useu <pre>%s</pre>.",
-  "Custom_oauth_unique_name": "Nom únic de OAuth personalitzat",
   "Custom_Script_Logged_In": "Script personalitzat per a usuaris que han iniciat sessió",
   "Custom_Script_Logged_In_Description": "Script personalitzat que s'executarà SEMPRE i per QUALSEVOL usuari que estigui connectat. (Cada vegada que ingressa a xat i està connectat)",
   "Custom_Script_Logged_Out": "Script personalitzat per als usuaris que han tancat sessió",
@@ -1976,7 +1975,6 @@
   "Forward_to_user": "Remetre a l'usuari",
   "Forwarding": "Reenviament",
   "Free": "Lliure",
-  "Free_Extension_Numbers": "Números d'extensió gratuïts",
   "Free_Apps": "Aplicacions gratuïtes",
   "Frequently_Used": "Usat freqüentment",
   "Friday": "divendres",
@@ -2000,7 +1998,6 @@
   "get-password-policy-mustContainAtLeastOneUppercase": "La contrasenya ha de tenir al menys una lletra majúscula",
   "github_no_public_email": "No tens cap adreça electrònica com a correu-e públic al teu compte de GitHub",
   "github_HEAD": "CAP",
-  "Give_a_unique_name_for_the_custom_oauth": "Estableix un nom únic per al OAuth personalitzat",
   "strike": "strike",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Bateja l'aplicació. El nom escollit serà visible als usuaris.",
   "Global": "Global",
@@ -3027,7 +3024,6 @@
   "No_Canned_Responses_Yet": "Encara no hi ha respostes predefinides",
   "No_Canned_Responses_Yet-description": "Utilitzeu respostes predefinides per proporcionar respostes ràpides i coherents a les preguntes freqüents.",
   "No_channels_in_team": "No hi ha canals en aquest equip",
-  "No_channels_yet": "Encara no formes part de cap canal",
   "No_data_found": "Dades no trobades",
   "No_direct_messages_yet": "Encara no has començat cap conversa.",
   "No_Discussions_found": "No s'ha trobat cap discussió",
@@ -3081,7 +3077,6 @@
   "Notifications_Max_Room_Members_Description": "Nombre màxim de membres a la sala quan es desactiven les notificacions de tots els missatges. Els usuaris encara poden canviar la configuració de cada habitació per rebre totes les notificacions de forma individual. (0 per desactivar)",
   "Notifications_Muted_Description": "Si esculls silenciar-ho tot, no veuràs la sala destacada a la llista quan hi hagi nous missatges, excepte si són mencions. Silenciar les notificacions sobreescriurà les opcions de notificació.",
   "Notifications_Preferences": "Preferències de notificacions",
-  "Notifications_Sound_Volume": "Volum del so de notificacions",
   "Notify_active_in_this_room": "Notifica als usuaris actius d'aquesta sala",
   "Notify_all_in_this_room": "Notifica a tothom d'aquest canal",
   "NPS_survey_enabled": "Habilitar l'enquesta NPS",
diff --git a/packages/i18n/src/locales/cs.i18n.json b/packages/i18n/src/locales/cs.i18n.json
index 3aec98442180..2bce5a03c8ca 100644
--- a/packages/i18n/src/locales/cs.i18n.json
+++ b/packages/i18n/src/locales/cs.i18n.json
@@ -1072,7 +1072,6 @@
   "Custom_Emoji_Updated_Successfully": "Vlastní emotikona upravena",
   "Custom_Fields": "Vlastní pole",
   "Custom_oauth_helper": "Při nastavování OAuth poskytovatele, budete muset nastavit callback URL. Použijte <pre> %s </pre> ,",
-  "Custom_oauth_unique_name": "Název vlastní OAuth",
   "Custom_Script_Logged_In": "Vlastní skripty pro přihlášené uživatele",
   "Custom_Script_Logged_In_Description": "Vlastní skript, který bude spuštěn VŽDY a VŠEM přihlášeným uživatelům (pokaždé, když vstoupíte do chatu a jste přihlášeni)",
   "Custom_Script_Logged_Out": "Vlastní skripty pro odhlášené uživatele",
@@ -1713,7 +1712,6 @@
   "get-password-policy-mustContainAtLeastOneSpecialCharacter": "Heslo musí obsahovat alespoň jeden speciální znak",
   "get-password-policy-mustContainAtLeastOneUppercase": "Heslo musí obsahovat alespoň jedno velké písmeno",
   "github_no_public_email": "Ve svém účtu GitHub nemáte žádný e-mail jako veřejný",
-  "Give_a_unique_name_for_the_custom_oauth": "Zadejte jedinečný název pro vlastní OAuth",
   "strike": "přeškrtnuté",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Pojmenujte jak se bude aplikace jmenovat pro Vaše uživatele.",
   "Global": "Globální",
@@ -2575,7 +2573,6 @@
   "No": "Ne",
   "No_available_agents_to_transfer": "Žádní operátoři k dispozici",
   "No_Canned_Responses": "Žádné zakonzervované odpovědi",
-  "No_channels_yet": "Zatím nejste v žádné místnosti.",
   "No_data_found": "Data nanalezena",
   "No_direct_messages_yet": "Zatím jste nezačali žádné konverzace.",
   "No_Discussions_found": "Diskuze nenalezeny",
@@ -2624,7 +2621,6 @@
   "Notifications_Max_Room_Members_Description": "Pokud počet uživatelů v místnosti překročí zadané číslo, notifikace všech (@all) nebude povolena. Uživatelé si toto nastavení mohou individuálně změnit. (0 možnost zakáže)",
   "Notifications_Muted_Description": "Pokud ztišíte všechno, neuvidíte zvýrazněné místnosti s novými zprávami, krom zmínek. Ztišení notifikací přetěží nastavení notifikací v jednotlivých místnostech.",
   "Notifications_Preferences": "Nastavení upozornění",
-  "Notifications_Sound_Volume": "Hlasitost zvuku notifikace",
   "Notify_active_in_this_room": "Notifikovat aktivní uživatele v místnosti",
   "Notify_all_in_this_room": "Oznámit všem v této místnosti",
   "Num_Agents": "# Operátorů",
diff --git a/packages/i18n/src/locales/cy.i18n.json b/packages/i18n/src/locales/cy.i18n.json
index b07027243130..4684ca63e300 100644
--- a/packages/i18n/src/locales/cy.i18n.json
+++ b/packages/i18n/src/locales/cy.i18n.json
@@ -783,7 +783,6 @@
   "Custom_Emoji_Updated_Successfully": "Diweddarwyd emoji Custom yn llwyddiannus",
   "Custom_Fields": "Maesau Custom",
   "Custom_oauth_helper": "Wrth sefydlu eich Darparwr OAuth, bydd yn rhaid i chi hysbysu URL Callback. Defnyddiwch <pre> %s</pre>.",
-  "Custom_oauth_unique_name": "Enw unigryw oauth arferol",
   "Custom_Script_Logged_In": "Sgript Custom ar gyfer Defnyddwyr Mewnol",
   "Custom_Script_Logged_Out": "Sgript Custom ar gyfer Defnyddwyr Wedi Logio",
   "Custom_Scripts": "Sgriptiau Custom",
@@ -1192,7 +1191,6 @@
   "Gaming": "Hapchwarae",
   "General": "Cyffredinol",
   "github_no_public_email": "Nid oes gennych unrhyw e-bost fel e-bost cyhoeddus yn eich cyfrif GitHub",
-  "Give_a_unique_name_for_the_custom_oauth": "Rhowch enw unigryw ar gyfer yr arferiad",
   "strike": "streic",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Rhowch enw'r cais. Bydd eich defnyddwyr yn gweld hyn.",
   "Global": "Byd-eang",
@@ -1771,7 +1769,6 @@
   "Newer_than_may_not_exceed_Older_than": "\"Efallai na fydd\" Yn fwy na \"yn fwy na\" Hŷn na \"",
   "No": "Na",
   "No_available_agents_to_transfer": "Dim asiantau sydd ar gael i'w trosglwyddo",
-  "No_channels_yet": "Nid ydych chi'n rhan o unrhyw sianel eto",
   "No_direct_messages_yet": "Dim Negeseuon Uniongyrchol.",
   "No_Encryption": "Dim Amgryptio",
   "No_groups_yet": "Nid oes gennych grwpiau preifat eto.",
@@ -1803,7 +1800,6 @@
   "Notifications_Max_Room_Members_Description": "Nifer o aelodau yn yr ystafell pan fydd hysbysiadau ar gyfer pob neges yn cael eu hanabledd. Gall defnyddwyr barhau i newid fesul ystafell i dderbyn pob hysbysiad yn unigol. (0 i analluogi)",
   "Notifications_Muted_Description": "Os byddwch chi'n dewis difetha popeth, ni welwch yr uchafbwynt i'r ystafell yn y rhestr pan fo negeseuon newydd, heblaw am sôn amdanynt. Bydd hysbysiadau Muting yn goresgyn gosodiadau hysbysiadau.",
   "Notifications_Preferences": "Dewisiadau Hysbysiadau",
-  "Notifications_Sound_Volume": "Cyfrol sain hysbysiadau",
   "Notify_active_in_this_room": "Hysbysu defnyddwyr gweithredol yn yr ystafell hon",
   "Notify_all_in_this_room": "Hysbyswch bawb yn yr ystafell hon",
   "Num_Agents": "# Asiantau",
diff --git a/packages/i18n/src/locales/da.i18n.json b/packages/i18n/src/locales/da.i18n.json
index d3b1fa007652..cc9db86ea536 100644
--- a/packages/i18n/src/locales/da.i18n.json
+++ b/packages/i18n/src/locales/da.i18n.json
@@ -42,7 +42,6 @@
   "Access_not_authorized": "Adgang ikke godkendt",
   "Access_Token_URL": "Adgangstoken-URL",
   "Access_Your_Account": "Få adgang til din konto",
-  "access_your_basic_information": "få adgang til dine grundlæggende oplysninger",
   "access-mailer": "Åbn mail-skærmen",
   "access-mailer_description": "Tilladelse til at sende masse-emails til alle brugere.",
   "access-marketplace": "Adgang til markedsplads",
@@ -1148,7 +1147,6 @@
   "Custom_Fields": "Brugerdefinerede felter",
   "Custom_Field_Removed": "Brugerdefineret felt fjernet",
   "Custom_oauth_helper": "Når du konfigurerer din OAuth-leverandør, skal du oplyse en tilbagekalds-url. Brug <pre>%s</pre>.",
-  "Custom_oauth_unique_name": "Brugerdefineret unikt oauth-navn",
   "Custom_Script_Logged_In": "Brugerdefineret script til brugere der er logget ind ",
   "Custom_Script_Logged_In_Description": "Brugerdefineret script der ALTID kører og for ENHVER bruger der er logget ind. (F.eks. hver gang du går ind i chatten og du er logget ind)",
   "Custom_Script_Logged_Out": "Brugerdefineret script for brugere der er logget ud",
@@ -1802,7 +1800,6 @@
   "get-password-policy-minLength-label": "Mindst {{limit}} tegn",
   "get-password-policy-forbidRepeatingCharactersCount-label": "Max. {{limit}} gentagne tegn",
   "github_no_public_email": "Du har ikke nogen e-mail som offentlig e-mail i din GitHub-konto",
-  "Give_a_unique_name_for_the_custom_oauth": "Angiv et unikt navn til den brugerdefinerede oauth",
   "strike": "gennemstreget",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Giv applikationen et navn. Dette ses af dine brugere.",
   "Global": "Global",
@@ -2668,7 +2665,6 @@
   "No": "Nej",
   "No_available_agents_to_transfer": "Ingen tilgængelige agenter til overførsel",
   "No_Canned_Responses": "Ingen opbevarede svar",
-  "No_channels_yet": "Du er endnu ikke en del af en kanal",
   "No_data_found": "Ingen data fundet",
   "No_direct_messages_yet": "Ingen direkte beskeder.",
   "No_Discussions_found": "Der blev ikke fundet nogen diskussioner",
@@ -2717,7 +2713,6 @@
   "Notifications_Max_Room_Members_Description": "Maks antal medlemmer i rummet, når meddelelser for alle meddelelser bliver deaktiveret. Brugere kan stadig ændre pr. Værelseindstilling for at modtage alle meddelelser individuelt. (0 for at deaktivere)",
   "Notifications_Muted_Description": "Hvis du vælger at dempe alt, vil du ikke se rummarkeringen i listen, når der er nye meddelelser, undtagen nævninger. Muting notifikationer vil tilsidesætte meddelelsesindstillinger.",
   "Notifications_Preferences": "Indstillinger for meddelelser",
-  "Notifications_Sound_Volume": "Meddelelser lydstyrke",
   "Notify_active_in_this_room": "Underret aktive brugere i dette rum",
   "Notify_all_in_this_room": "Underret alle i dette rum",
   "Num_Agents": "# Agenter",
diff --git a/packages/i18n/src/locales/de-AT.i18n.json b/packages/i18n/src/locales/de-AT.i18n.json
index e70a6ade27d6..640c9878e85e 100644
--- a/packages/i18n/src/locales/de-AT.i18n.json
+++ b/packages/i18n/src/locales/de-AT.i18n.json
@@ -785,7 +785,6 @@
   "Custom_Emoji_Updated_Successfully": "Benutzerdefiniertes Emoji wurde erfolgreich aktualisiert",
   "Custom_Fields": "Benutzerdefinierte Felder",
   "Custom_oauth_helper": "Bei der Einrichtung muss eine Rückruf-URL angegeben werden. Benutze dafür folgende URL: <pre>%s</pre>",
-  "Custom_oauth_unique_name": "Name des OAuth-Kontos",
   "Custom_Script_Logged_In": "Benutzerdefiniertes Script für angemeldete Benutzer",
   "Custom_Script_Logged_Out": "Benutzerdefiniertes Script für abgemeldete Benutzer",
   "Custom_Scripts": "Benutzerdefinierte Skripts",
@@ -1198,7 +1197,6 @@
   "Gaming": "Gaming",
   "General": "Allgemeines",
   "github_no_public_email": "Sie haben keine öffentliche E-Mail-Adresse in Ihrem GitHub-Account.",
-  "Give_a_unique_name_for_the_custom_oauth": "Geben Sie dem benutzerdefinierten OAuth-Konto einen eindeutigen Namen.",
   "strike": "durchgestrichen",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Geben Sie der Anwendung einen Namen. Die Nutzer können den Namen sehen.",
   "Global": "Global",
@@ -1779,7 +1777,6 @@
   "Newer_than_may_not_exceed_Older_than": "\"Neuer als\" darf \"Älter als\" nicht überschreiten",
   "No": "Nein",
   "No_available_agents_to_transfer": "Keine verfügbaren Berater zum Übertragen",
-  "No_channels_yet": "bisher nirgendwo dabei",
   "No_direct_messages_yet": "Sie haben keine Gespräche gestartet.",
   "No_Encryption": "Keine Verschlüsselung",
   "No_groups_yet": "Sie sind kein Mitglied einer privaten Chatgruppe.",
@@ -1811,7 +1808,6 @@
   "Notifications_Max_Room_Members_Description": "Maximale Anzahl von Mitgliedern im Raum, wenn Benachrichtigungen für alle Nachrichten deaktiviert werden. Benutzer können die Einstellung pro Zimmer ändern, um alle Benachrichtigungen auf individueller Basis zu erhalten. (0 zum Deaktivieren)",
   "Notifications_Muted_Description": "Wenn Sie sich dafür entscheiden, alles stummzuschalten, wird die Raumhighlight in der Liste nicht angezeigt, wenn neue Nachrichten vorhanden sind, mit Ausnahme von Erwähnungen. Stummschaltungsbenachrichtigungen überschreiben Benachrichtigungseinstellungen.",
   "Notifications_Preferences": "Benachrichtigungseinstellungen",
-  "Notifications_Sound_Volume": "Benachrichtigungen Lautstärke",
   "Notify_active_in_this_room": "Aktive Benutzer/innen benachrichtigen",
   "Notify_all_in_this_room": "Alle Benutzer in diesem Raum benachrichtigen",
   "Num_Agents": "# Agents",
diff --git a/packages/i18n/src/locales/de-IN.i18n.json b/packages/i18n/src/locales/de-IN.i18n.json
index 4ed95330c89b..bfacfea754ed 100644
--- a/packages/i18n/src/locales/de-IN.i18n.json
+++ b/packages/i18n/src/locales/de-IN.i18n.json
@@ -890,7 +890,6 @@
   "Custom_Emoji_Updated_Successfully": "Benutzerdefinierter Emoji erfolgreich aktualisiert",
   "Custom_Fields": "Benutzerdefinierte Felder",
   "Custom_oauth_helper": "Bei der Einrichtung Deines OAuth-Providers muss eine Rückruf-URL angegeben werden. Benutze dafür folgende URL: <pre>%s</pre>",
-  "Custom_oauth_unique_name": "Name des OAuth-Kontos",
   "Custom_Script_Logged_In": "Benutzerdefiniertes Skript für angemeldete Benutzer",
   "Custom_Script_Logged_Out": "Benutzerdefiniertes Skript für abgemeldete Benutzer",
   "Custom_Scripts": "Benutzerdefinierte Skripte",
@@ -1378,7 +1377,6 @@
   "Gaming": "Spiele",
   "General": "Allgemeines",
   "github_no_public_email": "Du hast keine öffentliche E-Mail-Adresse in Deinem GitHub-Account.",
-  "Give_a_unique_name_for_the_custom_oauth": "Gib dem benutzerdefinierten OAuth-Konto einen eindeutigen Namen.",
   "strike": "durchgestrichen",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Gib der Anwendung einen Namen. Alle Nutzer können diesen Namen sehen.",
   "Global": "Global",
@@ -2020,7 +2018,6 @@
   "Newer_than": "Neuer als",
   "Newer_than_may_not_exceed_Older_than": "\"Neuer als\" darf \"Älter als\" nicht überschreiten",
   "No_available_agents_to_transfer": "Kein Agent verfügbar, an den übergeben werden kann",
-  "No_channels_yet": "bisher nirgendwo dabei",
   "No_direct_messages_yet": "Du hast bisher kein Gespräch gestartet",
   "No_discussions_yet": "Keine Discussion vorhanden",
   "No_Encryption": "Keine Verschlüsselung",
@@ -2058,7 +2055,6 @@
   "Notifications_Max_Room_Members_Description": "Maximale Anzahl der Raummitglieder, ab der alle Benachrichtigungen deaktiviert werden. Benutzer können weiterhin die Einstellung für den Raum ändern, um auf individueller Basis alle Nachrichten zu erhalten (0 deaktiviert die Einstellung)",
   "Notifications_Muted_Description": "Wenn Du Dich entscheidest, alles stumm zu schalten, wirst Du keine Kennzeichnungen für neue Nachrichten in der Liste sehen. Ausgenommen davon sind Erwähnungen. Das Stummschalten der Benachrichtigungen überschreibt die Benachrichtigungseinstellungen.",
   "Notifications_Preferences": "Benachrichtigungseinstellungen",
-  "Notifications_Sound_Volume": "Lautstärke des Benachrichtigungstons",
   "Notify_active_in_this_room": "Aktive Benutzer/innen benachrichtigen",
   "Notify_all_in_this_room": "Alle Benutzer in diesem Raum benachrichtigen",
   "Num_Agents": "# Agenten",
diff --git a/packages/i18n/src/locales/de.i18n.json b/packages/i18n/src/locales/de.i18n.json
index ad91a1593789..f39ec20f1622 100644
--- a/packages/i18n/src/locales/de.i18n.json
+++ b/packages/i18n/src/locales/de.i18n.json
@@ -1394,7 +1394,6 @@
   "Custom_OAuth_has_been_added": "Benutzerdefiniertes OAuth wurde hinzugefügt",
   "Custom_OAuth_has_been_removed": "Benutzerdefiniertes OAuth wurde entfernt",
   "Custom_oauth_helper": "Bei der Einrichtung Ihres OAuth-Providers muss eine Rückruf-URL angegeben werden. Benutzen Sie dafür folgende URL: <pre>%s</pre>",
-  "Custom_oauth_unique_name": "Name des OAuth-Kontos",
   "Custom_roles": "Benutzerdefinierte Rollen",
   "Custom_roles_upsell_add_custom_roles_workspace": "Fügen Sie benutzerdefinierte Rollen hinzu, die zu Ihrem Arbeitsbereich passen",
   "Custom_roles_upsell_add_custom_roles_workspace_description": "Mit benutzerdefinierten Rollen können Sie Berechtigungen für die Personen in Ihrem Workspace festlegen. Legen Sie alle Rollen fest, die Sie benötigen, um sicherzustellen, dass die Mitarbeiter ein sicheres Arbeitsumfeld haben.",
@@ -2233,7 +2232,6 @@
   "Forward_to_user": "An BenutzerIn weiterleiten",
   "Forwarding": "Weiterleitung",
   "Free": "Frei",
-  "Free_Extension_Numbers": "Freie Erweiterungsnummern",
   "Free_Apps": "Freie Apps",
   "Frequently_Used": "Häufig verwendet",
   "Friday": "Freitag",
@@ -2261,7 +2259,6 @@
   "get-server-info_description": "Berechtigung zum Abrufen von Serverinformationen",
   "github_no_public_email": "Sie haben keine öffentliche E-Mail-Adresse in Ihrem GitHub-Account.",
   "github_HEAD": "HEAD",
-  "Give_a_unique_name_for_the_custom_oauth": "Geben Sie dem benutzerdefinierten OAuth-Konto einen eindeutigen Namen.",
   "strike": "durchgestrichen",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Geben Sie der Anwendung einen Namen. Alle Nutzer können diesen Namen sehen.",
   "Global": "Global",
@@ -3439,7 +3436,6 @@
   "No_Canned_Responses_Yet": "Noch keine vorformulierten Antworten",
   "No_Canned_Responses_Yet-description": "Verwenden Sie vorformulierte Antworten, um häufig gestellte Fragen schnell und konsistent zu beantworten.",
   "No_channels_in_team": "Keine Kanäle in diesem Team",
-  "No_channels_yet": "bisher nirgendwo dabei",
   "No_data_found": "Keine Daten gefunden",
   "No_direct_messages_yet": "Sie haben bisher keine Konversationen gestartet",
   "No_Discussions_found": "Keine Diskussionen gefunden",
@@ -3497,7 +3493,6 @@
   "Notifications_Max_Room_Members_Description": "Maximale Anzahl der Raum-Mitglieder, ab der alle Benachrichtigungen deaktiviert werden. Benutzer können weiterhin die Einstellung für den Room ändern, um auf individueller Basis alle Nachrichten zu erhalten (0 deaktiviert die Einstellung)",
   "Notifications_Muted_Description": "Wenn Sie sich entscheiden, alles stumm zu schalten, werden Sie keine Kennzeichnungen für neue Nachrichten in der Liste sehen. Ausgenommen davon sind Erwähnungen. Das Stummschalten der Benachrichtigungen überschreibt die Benachrichtigungseinstellungen.",
   "Notifications_Preferences": "Benachrichtigungseinstellungen",
-  "Notifications_Sound_Volume": "Lautstärke des Benachrichtigungstons",
   "Notify_active_in_this_room": "Aktive Benutzer/innen benachrichtigen",
   "Notify_all_in_this_room": "Alle Benutzer in diesem Raum benachrichtigen",
   "NPS_survey_enabled": "NPS-Umfrage aktivieren",
diff --git a/packages/i18n/src/locales/el.i18n.json b/packages/i18n/src/locales/el.i18n.json
index ecabeeaf31ae..5fc038165aa8 100644
--- a/packages/i18n/src/locales/el.i18n.json
+++ b/packages/i18n/src/locales/el.i18n.json
@@ -791,7 +791,6 @@
   "Custom_Emoji_Updated_Successfully": "Το προσαρμοσμένο emoji ενημερώθηκε επιτυχώς",
   "Custom_Fields": "Προσαρμοσμένα πεδία",
   "Custom_oauth_helper": "Κατά τη ρύθμιση του Παρόχου OAuth σας, θα πρέπει να ενημερώσετε μια διεύθυνση URL επανάκλησης. Χρησιμοποιήστε <pre>%s</pre> .",
-  "Custom_oauth_unique_name": "Προσαρμοσμένο μοναδικό όνομα oauth",
   "Custom_Script_Logged_In": "Προσαρμοσμένο Σενάριο για τη Σύνδεση Χρηστών",
   "Custom_Script_Logged_Out": "Προσαρμοσμένη Σενάριο για την Αποσύνδεση Χρηστών",
   "Custom_Scripts": "Προσαρμοσμένα Σενάρια",
@@ -1203,7 +1202,6 @@
   "Gaming": "Παιχνίδια",
   "General": "Γενικός",
   "github_no_public_email": "Δεν έχεις κανένα δημόσιο email στον GitHub λογαριασμό σου",
-  "Give_a_unique_name_for_the_custom_oauth": "Δώστε ένα μοναδικό όνομα για την προσαρμοσμένη OAuth",
   "strike": "σβήσιμο",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Δώστε στην εφαρμογή ένα όνομα. Αυτό θα φανεί από τους χρήστες σας.",
   "Global": "Παγκόσμια",
@@ -1784,7 +1782,6 @@
   "Newer_than_may_not_exceed_Older_than": "Το \"νεότερο από\" δεν μπορεί να υπερβαίνει το \"Παλαιότερο από\"",
   "No": "Όχι",
   "No_available_agents_to_transfer": "Δεν υπάρχουν διαθέσιμοι πράκτορες για μεταφορά",
-  "No_channels_yet": "Δεν είστε σε κανένα κανάλι ακόμα.",
   "No_direct_messages_yet": "Δεν έχετε ξεκινήσει συνομιλίες ακόμα.",
   "No_Encryption": "Όχι Κρυπτογράφηση",
   "No_groups_yet": "Δεν έχετε κλειστές ομάδες ακόμα.",
@@ -1816,7 +1813,6 @@
   "Notifications_Max_Room_Members_Description": "Μέγιστος αριθμός μελών στο δωμάτιο, όταν οι ειδοποιήσεις για όλα τα μηνύματα αποκλείονται. Οι χρήστες μπορούν ακόμα να αλλάξουν ανά ρύθμιση δωματίου για να λάβουν όλες τις ειδοποιήσεις σε ατομική βάση. (0 για απενεργοποίηση)",
   "Notifications_Muted_Description": "Εάν επιλέξετε να απενεργοποιήσετε τα πάντα, δεν θα δείτε την ένδειξη του δωματίου στη λίστα όταν υπάρχουν νέα μηνύματα, εκτός από τις αναφορές. Οι ειδοποιήσεις σίγασης θα υπερισχύσουν των ρυθμίσεων ειδοποιήσεων.",
   "Notifications_Preferences": "Ειδοποιήσεις Προτιμήσεις",
-  "Notifications_Sound_Volume": "Ένταση ήχου ειδοποιήσεων",
   "Notify_active_in_this_room": "Ειδοποιήστε τους ενεργούς χρήστες σε αυτό το δωμάτιο",
   "Notify_all_in_this_room": "Ειδοποιείστε τους όλους στο δωμάτιο",
   "Num_Agents": "# Πράκτορες",
diff --git a/packages/i18n/src/locales/en.i18n.json b/packages/i18n/src/locales/en.i18n.json
index 2b02c5b7c36b..81c6e0f3715d 100644
--- a/packages/i18n/src/locales/en.i18n.json
+++ b/packages/i18n/src/locales/en.i18n.json
@@ -6,6 +6,10 @@
   "__count__message_pruned_one": "{{count}} message pruned",
   "__count__message_pruned_other": "{{count}} messages pruned",
   "__count__conversations__period__": "{{count}} conversations, {{period}}",
+  "__count__replies": "{{count}} replies",
+  "__count__replies__date__": "{{count}} replies, {{date}}",
+  "__count__follower_one": "+{{count}} follower",
+  "__count__follower_other": "+{{count}} followers",
   "__count__tags__and__count__conversations__period__": "{{count}} tags and {{conversations}} conversations, {{period}}",
   "__departments__departments_and__count__conversations__period__": "{{departments}} departments and {{count}} conversations, {{period}}",
   "__usersCount__member_joined_one": "+ {{count}} member joined",
@@ -59,7 +63,6 @@
   "Access_not_authorized": "Access not authorized",
   "Access_Token_URL": "Access Token URL",
   "Access_Your_Account": "Access Your Account",
-  "access_your_basic_information": "access your basic information",
   "access-mailer": "Access Mailer Screen",
   "access-mailer_description": "Permission to send mass email to all users.",
   "access-marketplace": "Access marketplace",
@@ -319,6 +322,7 @@
   "Add_agent": "Add agent",
   "Add_custom_oauth": "Add custom OAuth",
   "Add_Domain": "Add Domain",
+  "Add_email": "Add email",
   "Add_emoji": "Add emoji",
   "Add_files_from": "Add files from",
   "Add_manager": "Add manager",
@@ -334,6 +338,7 @@
   "Add_User": "Add User",
   "Add_users": "Add users",
   "Add_members": "Add Members",
+  "Add_phone": "Add phone",
   "add-to-room": "Add to room",
   "add-all-to-room": "Add all users to a room",
   "add-all-to-room_description": "Permission to add all users to a room",
@@ -684,6 +689,8 @@
   "Apps_Settings": "App's Settings",
   "Apps_Manual_Update_Modal_Title": "This app is already installed",
   "Apps_Manual_Update_Modal_Body": "Do you want to update it?",
+  "Apps_Cannot_Be_Updated": "App cannot be updated",
+  "Apps_Private_App_Is_Exempt": "{{appName}} is already installed and exempt from the app limit policy.\nExempted apps cannot be updated.",
   "Apps_User_Already_Exists": "The username \"{{username}}\" is already being used. Rename or remove the user using it to install this App",
   "AutoLinker": "AutoLinker",
   "Apps_WhatIsIt": "Apps: What Are They?",
@@ -778,6 +785,7 @@
   "Available": "Available",
   "Available_agents": "Available agents",
   "Available_departments": "Available Departments",
+  "Available_extensions": "Available extensions",
   "Avatar": "Avatar",
   "Avatars": "Avatars",
   "Avatar_changed_successfully": "Avatar changed successfully",
@@ -845,6 +853,7 @@
   "block-ip-device-management": "Block IP Device Management",
   "block-ip-device-management_description": "Permission to block an IP adress",
   "Block_IP_Address": "Block IP Address",
+  "Blocked": "Blocked",
   "Blocked_IP_Addresses": "Blocked IP addresses",
   "Blockstack": "Blockstack",
   "Blockstack_Description": "Give workspace members the ability to sign in without relying on any third parties or remote servers.",
@@ -924,6 +933,8 @@
   "Call_was_not_answered": "Call was not answered",
   "Call_transfered_to__name__": "Call transfered to {{name}}",
   "Call_terminated": "Call terminated",
+  "Call_ringer_volume": "Call ringer volume",
+  "Call_ringer_volume_hint": "For all incoming call notifications",
   "Caller": "Caller",
   "Caller_Id": "Caller ID",
   "Camera_access_not_allowed": "Camera access was not allowed, please check your browser settings.",
@@ -936,7 +947,10 @@
   "Cancel": "Cancel",
   "Cancel_message_input": "Cancel",
   "Canceled": "Canceled",
+  "Cancel_recording": "Cancel recording",
   "Cancel_subscription": "Cancel subscription",
+  "Cancel__planName__subscription": "Cancel {{planName}} subscription",
+  "Cancel_subscription_message": "<strong>This workspace will downgrage to Community and lose free access to premium capabilities.</strong><br/><br/> While you can keep using Rocket.Chat, your team will lose access to unlimited mobile push notifications, read receipts, marketplace apps <4>and other capabilities</4>.",
   "Canned_Response_Created": "Canned Response created",
   "Canned_Response_Updated": "Canned Response updated",
   "Canned_Response_Delete_Warning": "Deleting a canned response cannot be undone.",
@@ -955,6 +969,7 @@
   "Cannot_open_conversation_with_yourself": "Cannot Direct Message with yourself",
   "Cannot_share_your_location": "Cannot share your location...",
   "Cannot_disable_while_on_call": "Can't change status during calls ",
+  "Cannot_upload_file_character_limit": "Cannot upload file, description is over the {{count}} character limit",
   "Cant_join": "Can't join",
   "CAS": "CAS",
   "CAS_Description": "Central Authentication Service allows members to use one set of credentials to sign in to multiple sites over multiple protocols.",
@@ -1205,6 +1220,7 @@
   "convert-team": "Convert Team",
   "convert-team_description": "Permission to convert team to channel",
   "Conversation": "Conversation",
+  "Conversation_in_progress": "Conversation in progress",
   "Conversation_closed": "Conversation closed: {{comment}}.",
   "Conversation_closed_without_comment": "Conversation closed",
   "Conversation_closing_tags": "Conversation closing tags",
@@ -1520,6 +1536,8 @@
   "Current_Status": "Current Status",
   "Currently_we_dont_support_joining_servers_with_this_many_people": "Currently we don't support joining servers with this many people",
   "Custom": "Custom",
+  "Custom_API": "Custom (API)",
+  "Custom_APP": "Custom (APP)",
   "Custom CSS": "Custom CSS",
   "Custom_agent": "Custom agent",
   "Custom_dates": "Custom Dates",
@@ -1540,7 +1558,8 @@
   "Custom_OAuth_has_been_added": "Custom OAuth has been added",
   "Custom_OAuth_has_been_removed": "Custom OAuth has been removed",
   "Custom_oauth_helper": "When setting up your OAuth Provider, you'll have to inform a Callback URL. Use <pre>%s</pre> .",
-  "Custom_oauth_unique_name": "Custom OAuth unique name",
+  "Custom_OAuth_name": "Custom OAuth name",
+  "Custom_OAuth_name_hint": "Enter a unique name that will help you identify and manage different authentication methods.",
   "Custom_roles": "Custom roles",
   "Custom_roles_upsell_add_custom_roles_workspace": "Add custom roles to suit your workspace",
   "Custom_roles_upsell_add_custom_roles_workspace_description": "Custom roles allow you to set permissions for the people in your workspace. Set all the roles you need to make sure people have a safe environment to work on.",
@@ -1672,6 +1691,7 @@
   "Desktop_Notifications_Not_Enabled": "Desktop Notifications are Not Enabled",
   "Unselected_by_default": "Unselected by default",
   "Unseen_features": "Unseen features",
+  "Unverified": "Unverified",
   "Details": "Details",
   "Device_Changes_Not_Available": "Device changes not available in this browser. For guaranteed availability, please use Rocket.Chat's official desktop app.",
   "Device_Changes_Not_Available_Insecure_Context": "Device changes are only available on secure contexts (e.g. https://)",
@@ -1789,6 +1809,7 @@
   "Done": "Done",
   "Dont_ask_me_again": "Don't ask me again!",
   "Dont_ask_me_again_list": "Don't ask me again list",
+  "Dont_cancel": "Don't cancel",
   "Download": "Download",
   "Download_Destkop_App": "Download Desktop App",
   "Download_Disabled": "Download disabled",
@@ -2131,6 +2152,7 @@
   "error-invalid-custom-field-name": "Invalid custom field name. Use only letters, numbers, hyphens and underscores.",
   "error-invalid-custom-field-value": "Invalid value for {{field}} field",
   "error-custom-field-not-allowed": "Custom field {{key}} is not allowed",
+  "error-invalid-contact": "Invalid contact.",
   "error-invalid-date": "Invalid date provided.",
   "error-invalid-dates": "From date cannot be after To date",
   "error-invalid-description": "Invalid description",
@@ -2240,6 +2262,8 @@
   "error-no-permission-team-channel": "You don't have permission to add this channel to the team",
   "error-no-owner-channel": "Only owners can add this channel to the team",
   "error-unable-to-update-priority": "Unable to update priority",
+  "error-unknown-contact": "Contact is unknown.",
+  "error-unverified-contact": "Contact is not verified.",
   "error-you-are-last-owner": "You are the last owner. Please set new owner before leaving the room.",
   "error-saving-sla": "An error ocurred while saving the SLA",
   "error-duplicated-sla": "An SLA with the same name or due time already exists",
@@ -2517,12 +2541,15 @@
   "Filters_applied": "Filters applied",
   "Financial_Services": "Financial Services",
   "Finish": "Finish",
+  "Finish_recording": "Finish Recording",
   "Finish_Registration": "Finish Registration",
   "First_Channel_After_Login": "First Channel After Login",
   "First_response_time": "First Response Time",
   "Flags": "Flags",
   "Follow_message": "Follow message",
   "Follow_social_profiles": "Follow our social profiles, fork us on github and share your thoughts about the rocket.chat app on our trello board.",
+  "Follower_one": "Follower",
+  "Follower_other": "Followers",
   "Following": "Following",
   "Fonts": "Fonts",
   "Food_and_Drink": "Food & Drink",
@@ -2558,7 +2585,6 @@
   "Forward_to_user": "Forward to user",
   "Forwarding": "Forwarding",
   "Free": "Free",
-  "Free_Extension_Numbers": "Free Extension Numbers",
   "Free_Apps": "Free Apps",
   "Frequently_Used": "Frequently Used",
   "Friday": "Friday",
@@ -2594,7 +2620,6 @@
   "get-server-info_description": "Permission to get server info",
   "github_no_public_email": "You don't have any email as public email in your GitHub account",
   "github_HEAD": "HEAD",
-  "Give_a_unique_name_for_the_custom_oauth": "Give a unique name for the custom OAuth",
   "strike": "strike",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Give the application a name. This will be seen by your users.",
   "Global": "Global",
@@ -3022,9 +3047,12 @@
   "Last_active": "Last active",
   "Last_Call": "Last Call",
   "Last_Chat": "Last Chat",
+  "Last_channel": "Last channel",
+  "Last_contacts": "Last contacts",
   "Last_Heartbeat_Time": "Last Heartbeat Time",
   "Last_login": "Last login",
   "Last_Message": "Last Message",
+  "Last_message__date__": "Last message: {{date}}",
   "Last_Message_At": "Last Message At",
   "Last_seen": "Last seen",
   "Last_Status": "Last Status",
@@ -3337,6 +3365,12 @@
   "Omnichannel_placed_chat_on_hold": "Chat On Hold: {{comment}}",
   "Omnichannel_hide_conversation_after_closing": "Hide conversation after closing",
   "Omnichannel_hide_conversation_after_closing_description": "After closing the conversation you will be redirected to Home.",
+  "Livechat_Block_Unknown_Contacts": "Block unknown contacts",
+  "Livechat_Block_Unknown_Contacts_Description": "Conversations from people who are not on the contact list will not be able to be taken.",
+  "Livechat_Block_Unverified_Contacts": "Block unverified contacts",
+  "Livechat_Block_Unverified_Contacts_Description": "Conversations from people who are not verified will not be able to be taken.",
+  "Livechat_Require_Contact_Verification": "Require verification on contacts.",
+  "Livechat_Require_Contact_Verification_Description": "Requesting verification on all contacts is recommended to follow a zero-trust security strategy. Messages from unverified people will not appear in the queue but will still appear in contact center.",
   "Livechat_Queue": "Omnichannel Queue",
   "Livechat_registration_form": "Registration Form",
   "Livechat_registration_form_message": "Registration Form Message",
@@ -3475,6 +3509,8 @@
   "Make_sure_you_have_a_copy_of_your_codes_1": "Make sure you have a copy of your codes:",
   "Make_sure_you_have_a_copy_of_your_codes_2": "If you lose access to your authenticator app, you can use one of these codes to log in.",
   "Manage": "Manage",
+  "Master_volume": "Master volume",
+  "Master_volume_hint": "Controls the volume for all sounds coming from your workspace",
   "manage-agent-extension-association": "Manage Agent Extension Association",
   "manage-agent-extension-association_description": "Permission to manage agent extension association",
   "manage-apps": "Manage Apps",
@@ -3930,6 +3966,7 @@
   "no-active-video-conf-provider": "**Conference call not enabled**: A workspace admin needs to enable the conference call feature first.",
   "No_available_agents_to_transfer": "No available agents to transfer",
   "No_app_matches": "No app matches",
+  "No_app_label_provided": "No app label provided",
   "No_app_matches_for": "No app matches for",
   "No_apps_installed": "No Apps Installed",
   "No_Canned_Responses": "No Canned Responses",
@@ -3938,7 +3975,8 @@
   "No_channels_in_team": "No Channels on this Team",
   "No_agents_yet": "No agents yet",
   "No_agents_yet_description": "Add agents to engage with your audience and provide optimized customer service.",
-  "No_channels_yet": "You aren't part of any channels yet",
+  "No_channels_yet": "No channels yet",
+  "No_channels_yet_description": "Channels associated to this contact will appear here.",
   "No_chats_yet": "No chats yet",
   "No_chats_yet_description": "All your chats will appear here.",
   "No_calls_yet": "No calls yet",
@@ -3951,6 +3989,8 @@
   "No_departments_yet_description": "Organize agents into departments, set how tickets get forwarded and monitor their performance.",
   "No_managers_yet": "No managers yet",
   "No_managers_yet_description": "Managers have access to all omnichannel controls, being able to monitor and take actions.",
+  "No_history_yet": "No history yet",
+  "No_history_yet_description": "The entire message history with this contact will appear here.",
   "No_content_was_provided": "No content was provided",
   "No_data_found": "No data found",
   "No_data_available_for_the_selected_period": "No data available for the selected period",
@@ -4023,12 +4063,13 @@
   "Notification_Push_Default_For": "Send Push Notifications For",
   "Notification_RequireInteraction": "Require Interaction to Dismiss Desktop Notification",
   "Notification_RequireInteraction_Description": "Works only with Chrome browser versions > 50. Utilizes the parameter *requireInteraction* to show the desktop notification to indefinite until the user interacts with it.",
+  "Notification_volume": "Notification volume",
+  "Notification_volume_hint": "For message notifications, both for when the workspace is open or not",
   "Notifications": "Notifications",
   "Notifications_Max_Room_Members": "Max Room Members Before Disabling All Message Notifications",
   "Notifications_Max_Room_Members_Description": "Max number of members in room when notifications for all messages gets disabled. Users can still change per room setting to receive all notifications on an individual basis. (0 to disable)",
   "Notifications_Muted_Description": "If you choose to mute everything, you won't see the room highlight in the list when there are new messages, except for mentions. Muting notifications will override notifications settings.",
   "Notifications_Preferences": "Notifications Preferences",
-  "Notifications_Sound_Volume": "Notifications sound volume",
   "Notify_active_in_this_room": "Notify active users in this room",
   "Notify_all_in_this_room": "Notify all in this room",
   "Notify_Calendar_Events": "Notify calendar events",
@@ -4055,6 +4096,7 @@
   "OAuth_Description": "Configure authentication methods beyond just username and password.",
   "OAuth_Application": "OAuth Application",
   "OAuth_button_colors_alert": "Changing the color may result in non-compliance with WCAG (Web Content Accessibility Guidelines) requirements. Please ensure that the new colors meet the recommended contrast and readability standards to maintain accessibility for all users.",
+  "OAuth_Full_Access_Warning": "<strong>{{appName}}</strong> will have full, unrestricted access to your account, including the ability to perform any action on your behalf. Only proceed if you trust this application completely.",
   "Objects": "Objects",
   "Off": "Off",
   "Off_the_record_conversation": "Off-the-Record Conversation",
@@ -4082,6 +4124,7 @@
   "Old Colors (minor)": "Old Colors (minor)",
   "Older_than": "Older than",
   "Omnichannel": "Omnichannel",
+  "omnichannel_contacts_importer": "Omnichannel Contacts (*.csv)",
   "Omnichannel_Description": "Set up Omnichannel to communicate with customers from one place, regardless of how they connect with you.",
   "Omnichannel_Directory": "Omnichannel Directory",
   "Omnichannel_appearance": "Omnichannel Appearance",
@@ -4136,6 +4179,7 @@
   "Open_call": "Open call",
   "Open_call_in_new_tab": "Open call in new tab",
   "Open_channel_user_search": "`%s` - Open Channel / User search",
+  "Open_chat": "Open chat",
   "Open_conversations": "Open Conversations",
   "Open_Days": "Open days",
   "Open_days_of_the_week": "Open Days of the Week",
@@ -4454,6 +4498,7 @@
   "Read_Receipts": "Read receipts",
   "Readability": "Readability",
   "This_room_is_read_only": "This room is read only",
+  "This_page_will_be_deprecated_soon": "This page will be deprecated soon",
   "Only_people_with_permission_can_send_messages_here": "Only people with permission can send messages here",
   "Read_only_changed_successfully": "Read only changed successfully",
   "Read_only_channel": "Read Only Channel",
@@ -4525,9 +4570,11 @@
   "Remove_custom_oauth": "Remove custom OAuth",
   "Remove_from_room": "Remove from room",
   "Remove_from_team": "Remove from team",
+  "Remove_email": "Remove email",
   "Remove_extension": "Remove extension",
   "Remove_last_character": "Remove last character",
   "Remove_last_admin": "Removing last admin",
+  "Remove_phone": "Remove phone",
   "Remove_someone_from_room": "Remove someone from the room",
   "remove-closed-livechat-room": "Remove Closed Omnichannel Room",
   "remove-closed-livechat-room_description": "Permission to remove closed omnichannel room",
@@ -5879,6 +5926,7 @@
   "VideoConf_Enable_Persistent_Chat_description": "When persistent chat is enabled, Rocket.Chat will create a discussion every time a conference call is initiated. The provider app is responsible for sending the chat messages to this discussion.",
   "VideoConf_Enable_Persistent_Chat_Alert": "Persistent Chat will not work if discussions are disabled on the workspace. It will also not work if the provider app being used do not explicitly support this feature.",
   "VideoConf_Persistent_Chat_Discussion_Name": "Persistent Chat Discussion Name",
+  "VideoConf_Persistent_Chat_Discussion_Name_Description": "Use [date] tag to set where to include the date. Date will be added to the start if tag is not included.",
   "VideoConf_Mobile_Ringing": "Enable mobile ringing",
   "VideoConf_Mobile_Ringing_Description": "When enabled, direct calls to mobile users will ring their device as a phone call.",
   "VideoConf_Mobile_Ringing_Alert": "This feature is currently in an experimental stage and may not yet be fully supported by the mobile app. When enabled it will send additional Push Notifications to users.",
@@ -5936,6 +5984,8 @@
   "update-livechat-contact": "Update Omnichannel contacts",
   "view-livechat-contact": "View Omnichannel contacts",
   "view-livechat-contact-history": "View Omnichannel contacts history",
+  "block-livechat-contact": "Block Omnichannel contact channel",
+  "unblock-livechat-contact": "Unblock Omnichannel contact channel",
   "view-l-room_description": "Permission to view Omnichannel rooms",
   "view-livechat-analytics": "View Omnichannel Analytics",
   "onboarding.page.awaitingConfirmation.subtitle": "We have sent you an email to {{emailAddress}} with a confirmation link. Please verify that the security code below matches the one in the email.",
@@ -5989,6 +6039,7 @@
   "view-room-administration_description": "Permission to view public, private and direct message statistics. Does not include the ability to view conversations or archives",
   "view-statistics": "View Statistics",
   "view-statistics_description": "Permission to view system statistics such as number of users logged in, number of rooms, operating system information",
+  "View_thread": "View thread",
   "view-user-administration": "View User Administration",
   "view-user-administration_description": "Permission to partial, read-only list view of other user accounts currently logged into the system. No user account information is accessible with this permission",
   "view-user-voip-extension": "View User VoIP Extension",
@@ -6422,6 +6473,7 @@
   "Omnichannel_transcript_pdf": "Export chat transcript as PDF.",
   "Accounts_Default_User_Preferences_omnichannelTranscriptPDF_Description": "Always export the transcript as PDF at the end of conversations.",
   "Contact_email": "Contact email",
+  "Contact_identification": "Contact identification",
   "Customer": "Customer",
   "Time": "Time",
   "Omnichannel_Agent": "Omnichannel Agent",
@@ -6539,6 +6591,7 @@
   "trial": "trial",
   "Subscription": "Subscription",
   "Manage_subscription": "Manage subscription",
+  "Manage_conversations_in_the_contact_center": "Manage conversations in the <1>contact center</1>.",
   "ActiveSessionsPeak": "Active sessions peak",
   "ActiveSessionsPeak_InfoText": "Highest amount of active connections in the past 30 days",
   "ActiveSessions": "Active sessions",
@@ -6651,9 +6704,31 @@
   "Incoming_Calls": "Incoming calls",
   "Advanced_settings": "Advanced settings",
   "Security_and_permissions": "Security and permissions",
+  "Security_and_privacy": "Security and privacy",
   "Sidepanel_navigation": "Secondary navigation for teams",
   "Sidepanel_navigation_description": "Display channels and/or discussions associated with teams by default. This allows team owners to customize communication methods to best meet their team’s needs. This is currently in feature preview and will be a premium capability once fully released.",
   "Show_channels_description": "Show team channels in second sidebar",
   "Show_discussions_description": "Show team discussions in second sidebar",
-  "Recent": "Recent"
+  "Block_channel": "Block channel",
+  "Block_channel_description": "Are you sure you want to block this channel? Messages from this conversation will no longer reach this workspace.",
+  "Contact_unblocked": "Contact unblocked",
+  "Contact_blocked": "Contact blocked",
+  "Contact_has_been_updated": "Contact has been updated",
+  "Contact_has_been_created": "Contact has been created",
+  "Advanced_contact_profile": "Advanced contact profile",
+  "Advanced_contact_profile_description": "Manage multiple emails and phone numbers for a single contact, enabling a comprehensive multi-channel history that keeps you well-informed and improves communication efficiency.",
+  "Add_contact": "Add contact",
+  "Add_to_contact_list_manually": "Add to contact list manually",
+  "Add_to_contact_and_enable_verification_description": "Add to contact list manually and <1>enable verification</1> using multi-factor authentication.",
+  "Ask_enable_advanced_contact_profile": "Ask your workspace admin to enable advanced contact profile",
+  "close-blocked-room-comment": "This channel has been blocked",
+  "Contact_unknown": "Contact unknown",
+  "Review_contact": "Review contact",
+  "See_conflicts": "See conflicts",
+  "Conflicts_found": "Conflicts found",
+  "Contact_history_is_preserved": "Contact history is preserved",
+  "different_values_found": "{{number}} different values found",
+  "Recent": "Recent",
+  "On_All_Contacts": "On All Contacts",
+  "Once": "Once"
 }
diff --git a/packages/i18n/src/locales/eo.i18n.json b/packages/i18n/src/locales/eo.i18n.json
index 6340ba504495..43707e5b8c6b 100644
--- a/packages/i18n/src/locales/eo.i18n.json
+++ b/packages/i18n/src/locales/eo.i18n.json
@@ -784,7 +784,6 @@
   "Custom_Emoji_Updated_Successfully": "Propra emoji ĝisdatigita sukcese",
   "Custom_Fields": "Propraj Kampoj",
   "Custom_oauth_helper": "Kiam vi agordas vian OAuth Provider, vi devos informi Callback-URL. Uzu <pre>%s</pre>.",
-  "Custom_oauth_unique_name": "Propra oauth unika nomo",
   "Custom_Script_Logged_In": "Propra Skripto por Ensalutitaj Uzantoj",
   "Custom_Script_Logged_Out": "Propra Skripto por ensalutintaj uzantoj",
   "Custom_Scripts": "Propra Skriptoj",
@@ -1196,7 +1195,6 @@
   "Gaming": "Ludado",
   "General": "Ĝenerala",
   "github_no_public_email": "Vi ne havas retpoŝton kiel publika retpoŝto en via konto de GitHub",
-  "Give_a_unique_name_for_the_custom_oauth": "Donu unikan nomon por la kutimo",
   "strike": "striko",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Donu la aplikaĵon nomon. Ĉi tio estos vidita de viaj uzantoj.",
   "Global": "Suma",
@@ -1776,7 +1774,6 @@
   "Newer_than_may_not_exceed_Older_than": "\"Pli nova ol\" eble ne superas \"Pli malnova ol\"",
   "No": "Ne",
   "No_available_agents_to_transfer": "Ne disponeblaj agentoj por translokiĝi",
-  "No_channels_yet": "Vi ankoraŭ ne estas parto de iu ajn kanalo",
   "No_direct_messages_yet": "Ne Rekta Mesaĝoj.",
   "No_Encryption": "Neniu ĉifrado",
   "No_groups_yet": "Vi ankoraŭ ne havas privatajn grupojn.",
@@ -1808,7 +1805,6 @@
   "Notifications_Max_Room_Members_Description": "Max nombro da membroj en ĉambro kiam sciigoj por ĉiuj mesaĝoj malŝaltas. Uzantoj ankoraŭ povas ŝanĝi laŭ ĉambro por ricevi ĉiujn sciigojn individue. (0 malŝalti)",
   "Notifications_Muted_Description": "Se vi elektas munti ĉion, vi ne vidos la ĉambron reliefigi en la listo kiam estas novaj mesaĝoj, krom mencioj. Mutaj sciigoj forĵetos sciigajn agordojn.",
   "Notifications_Preferences": "Agordoj de sciigoj",
-  "Notifications_Sound_Volume": "Sciigoj sono volumo",
   "Notify_active_in_this_room": "Avizu aktivajn uzantojn en ĉi tiu ĉambro",
   "Notify_all_in_this_room": "Avizu ĉion en ĉi tiu ĉambro",
   "Num_Agents": "# Agentoj",
diff --git a/packages/i18n/src/locales/es.i18n.json b/packages/i18n/src/locales/es.i18n.json
index fe2c2fa81493..fc1362aa7eeb 100644
--- a/packages/i18n/src/locales/es.i18n.json
+++ b/packages/i18n/src/locales/es.i18n.json
@@ -1276,7 +1276,6 @@
   "Custom_Field_Not_Found": "Campo personalizado no encontrado",
   "Custom_Integration": "Integración personalizada",
   "Custom_oauth_helper": "Al configurar el proveedor de OAuth, tendrás que indicar una URL de devolución. Usa <pre>%s</pre>.",
-  "Custom_oauth_unique_name": "Nombre único de OAuth personalizado",
   "Custom_Script_Logged_In": "Script personalizado para los usuarios que han iniciado sesión",
   "Custom_Script_Logged_In_Description": "Script personalizado que se ejecutará SIEMPRE y para CUALQUIER usuario que haya iniciado sesión (por ejemplo, cada vez que accedas al chat y hayas iniciado sesión)",
   "Custom_Script_Logged_Out": "Script personalizado para los usuarios que han cerrado sesión",
@@ -1999,7 +1998,6 @@
   "Forward_to_user": "Reenviar a usuario",
   "Forwarding": "Reenvío",
   "Free": "Gratuito",
-  "Free_Extension_Numbers": "Números de extensión gratuitos",
   "Free_Apps": "Aplicaciones gratuitas",
   "Frequently_Used": "Usado frecuentemente",
   "Friday": "Viernes",
@@ -2023,7 +2021,6 @@
   "get-password-policy-mustContainAtLeastOneUppercase": "La contraseña debe contener al menos una letra en mayúscula",
   "github_no_public_email": "No tienes ningún correo electrónico como correo público en tu cuenta de GitHub",
   "github_HEAD": "HEAD",
-  "Give_a_unique_name_for_the_custom_oauth": "Indicar un nombre único para el OAuth personalizado",
   "strike": "tachado",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Indica un nombre para la aplicación, que podrán ver los usuarios",
   "Global": "Global",
@@ -3056,7 +3053,6 @@
   "No_Canned_Responses_Yet": "Aún no hay respuestas predefinidas",
   "No_Canned_Responses_Yet-description": "Usar respuestas predefinidas para proporcionar respuestas rápidas y coherentes a las preguntas frecuentes.",
   "No_channels_in_team": "No hay Channels en este equipo",
-  "No_channels_yet": "Aún no formas parte de ningún canal",
   "No_data_found": "No se han encontrado datos",
   "No_direct_messages_yet": "No hay mensajes directos.",
   "No_Discussions_found": "No se han encontrado discusiones",
@@ -3112,7 +3108,6 @@
   "Notifications_Max_Room_Members_Description": "Número máximo de miembros que debe haber en la sala para que se deshabiliten las notificaciones de todos los mensajes. Los usuarios pueden cambiar la configuración de cada sala para recibir todas las notificaciones de forma individual. Usa un valor 0 para deshabilitar esta opción.",
   "Notifications_Muted_Description": "Si eliges silenciarlo todo, no verás la sala resaltada en la lista cuando haya mensajes nuevos, a excepción de las menciones. La configuración de las notificaciones se anulará si las silencias.",
   "Notifications_Preferences": "Preferencias de notificaciones",
-  "Notifications_Sound_Volume": "Volumen del sonido de notificaciones",
   "Notify_active_in_this_room": "Notificar usuarios activos en esta sala",
   "Notify_all_in_this_room": "Notificar a todos en esta sala",
   "NPS_survey_enabled": "Habilitar encuesta NPS",
diff --git a/packages/i18n/src/locales/eu.i18n.json b/packages/i18n/src/locales/eu.i18n.json
index fd6e8a17f0d3..2fd2962cfc3f 100644
--- a/packages/i18n/src/locales/eu.i18n.json
+++ b/packages/i18n/src/locales/eu.i18n.json
@@ -93,7 +93,6 @@
   "Integrations_Outgoing_Type_FileUploaded": "Fitxategia kargatu da",
   "New_messages": "Mezu berriak",
   "No": "Ez",
-  "No_channels_yet": "Oraindik ez zara inongo kanalen partaide",
   "No_discussions_yet": "Ez dago eztabaidarik",
   "Options": "Aukerak",
   "Outlook_Calendar_Enabled": "Gaituta",
diff --git a/packages/i18n/src/locales/fa.i18n.json b/packages/i18n/src/locales/fa.i18n.json
index f8b7b62f536b..b66441d5e9a5 100644
--- a/packages/i18n/src/locales/fa.i18n.json
+++ b/packages/i18n/src/locales/fa.i18n.json
@@ -974,7 +974,6 @@
   "Custom_Emoji_Updated_Successfully": "شکلک های سفارشی به صورت موفقیت آمیز به روز شد",
   "Custom_Fields": "فیلدهای سفارشی",
   "Custom_oauth_helper": ".در حال تنظیم OAuth Provider شما، شما باید یک آدرس Callback بدهید. با <pre>%s</pre> ",
-  "Custom_oauth_unique_name": "نام یکتای oauth سفارشی",
   "Custom_Script_Logged_In": "اسکریپت سفارشی برای کاربران وارد شده",
   "Custom_Script_Logged_In_Description": "اسکریپت هایی سفارشی همیشه و برای هر کاربری که وارد شده اجرا می شود. (هروقت وارد سیستم و چت شوید)",
   "Custom_Script_Logged_Out": "اسکریپت سفارشی برای کاربران خارج شده",
@@ -1454,7 +1453,6 @@
   "Gaming": "بازی",
   "General": "عمومی",
   "github_no_public_email": "شما هیچ ایمیلی به عنوان ایمیل عمومی در اکانت گیت هابتان ندارید",
-  "Give_a_unique_name_for_the_custom_oauth": "یک نام یکتا به oauth سفارشی بدهید",
   "strike": "ضربه",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "یک نام به برنامه بدهید. کاربران آن را مشاهده خواهند کرد.",
   "Global": "سراسری",
@@ -2071,7 +2069,6 @@
   "No": "خیر",
   "No_available_agents_to_transfer": "هیچ عامل موجود برای انتقال وجود ندارد",
   "No_Canned_Responses": "بدون پاسخ آماده",
-  "No_channels_yet": "شما در حال عضو هیچ کانالی نیستید.",
   "No_data_found": "داده ای یافت نشد",
   "No_direct_messages_yet": "بدون تماس مستقیم",
   "No_Encryption": "بدون رمزگذاری",
@@ -2104,7 +2101,6 @@
   "Notifications_Max_Room_Members_Description": "حداکثر تعداد اعضا در اتاق زمانی که اعلان برای همه پیامها غیرفعال می شود. کاربران هنوز هم می توانند در هر اتاق تنظیمات را تغییر دهند تا همه اعلان ها را به صورت فردی دریافت کنند. (0 برای غیر فعال کردن)",
   "Notifications_Muted_Description": "اگر انتخاب کنید همه چیز را خاموش کنید، زمانی که پیامهای جدیدی وجود دارد، به جز موارد ذکر شده، شماره اتاق را در لیست مشاهده نخواهید کرد. اعلانهای خاموش کردن تنظیمات اعلانها را لغو میکنند.",
   "Notifications_Preferences": "تنظیمات اطلاع رسانی",
-  "Notifications_Sound_Volume": "میزان صدای اعلان ها",
   "Notify_active_in_this_room": "اطلاع کاربران فعال در این اتاق",
   "Notify_all_in_this_room": "به اطلاع همه در این اتاق",
   "Num_Agents": "# نمایندگی",
diff --git a/packages/i18n/src/locales/fi.i18n.json b/packages/i18n/src/locales/fi.i18n.json
index 7f27c89e7969..497484914396 100644
--- a/packages/i18n/src/locales/fi.i18n.json
+++ b/packages/i18n/src/locales/fi.i18n.json
@@ -40,7 +40,6 @@
   "Access_not_authorized": "Pääsyä ei valtuutettu",
   "Access_Token_URL": "Käyttöoikeustietueen URL-osoite",
   "Access_Your_Account": "Avaa käyttäjätilisi",
-  "access_your_basic_information": "pääset perustietoihisi",
   "access-mailer": "Avaa postittajanäyttö",
   "access-mailer_description": "Oikeus lähettää joukkosähköpostia kaikille käyttäjille.",
   "access-permissions": "Avaa käyttöoikeusnäyttö",
@@ -1409,7 +1408,6 @@
   "Custom_OAuth_has_been_added": "Mukautettu OAuth on lisätty",
   "Custom_OAuth_has_been_removed": "Mukautettu OAuth on poistettu",
   "Custom_oauth_helper": "Kun määrität OAuth-palveluntarjoajaa, ilmoita myös vastakutsun URL-osoite. Käytä: <pre>%s</pre> .",
-  "Custom_oauth_unique_name": "Mukautetun yksilöivä OAuth-nimi",
   "Custom_roles": "Mukautetut roolit",
   "Custom_roles_upsell_add_custom_roles_workspace": "Lisää työtilaan sopivia mukautettuja rooleja",
   "Custom_roles_upsell_add_custom_roles_workspace_description": "Mukautettujen roolien avulla voit asettaa oikeuksia työtilasi ihmisille. Määritä kaikki tarvittavat roolit, jotta kaikkien työympäristö on turvallinen.",
@@ -2265,7 +2263,6 @@
   "Forward_to_user": "Välitä käyttäjälle",
   "Forwarding": "Välitys",
   "Free": "Vapaa",
-  "Free_Extension_Numbers": "Maksuttomat alanumerot",
   "Free_Apps": "Maksuttomat sovellukset",
   "Frequently_Used": "Usein käytetyt",
   "Friday": "Perjantai",
@@ -2293,7 +2290,6 @@
   "get-server-info_description": "Oikeus hakea palvelintiedot",
   "github_no_public_email": "GitHub-tililläsi ei ole julkisia sähköpostiosoitteita",
   "github_HEAD": "HEAD",
-  "Give_a_unique_name_for_the_custom_oauth": "Anna yksilöllinen nimi mukautettua OAuth:a varten",
   "strike": "päälleviivaa",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Anna sovellukselle nimi. Käyttäjät näkevät tämän.",
   "Global": "Yleinen",
@@ -3473,7 +3469,6 @@
   "No_Canned_Responses_Yet": "Ei esivalmistettuja vastauksia vielä",
   "No_Canned_Responses_Yet-description": "Käytä esivalmistettuja vastauksia, jotta voit antaa nopeita ja johdonmukaisia vastauksia usein kysyttyihin kysymyksiin.",
   "No_channels_in_team": "Ei kanavia Channel tässä tiimissä",
-  "No_channels_yet": "Et ole vielä millään kanavalla",
   "No_data_found": "Tietoja ei löytynyt",
   "No_direct_messages_yet": "Ei suoria viestejä.",
   "No_Discussions_found": "Keskusteluja ei löytynyt",
@@ -3537,7 +3532,6 @@
   "Notifications_Max_Room_Members_Description": "Huoneen jäsenten enimmäismäärä, kun kaikkien viestien ilmoitukset poistetaan käytöstä. Muuttamalla huonekohtaista asetusta käyttäjät voivat edelleen saada kaikki ilmoitukset erikseen. (poista käytöstä: 0)",
   "Notifications_Muted_Description": "Jos mykistät kaiken, et näe huonetta korostettuna luettelossa, uusien viestien yhteydessä, paitsi mainintojen kohdalla. Ilmoitusten mykistäminen ohittaa ilmoitusasetukset.",
   "Notifications_Preferences": "Ilmoitusasetukset",
-  "Notifications_Sound_Volume": "Ilmoitusten äänenvoimakkuus",
   "Notify_active_in_this_room": "Ilmoita tämän huoneen aktiivisille käyttäjille",
   "Notify_all_in_this_room": "Ilmoita kaikille tässä huoneessa",
   "Now_Its_Visible_For_Everyone": "Näkyy nyt kaikille",
diff --git a/packages/i18n/src/locales/fr.i18n.json b/packages/i18n/src/locales/fr.i18n.json
index e10120333982..e4208c564aaf 100644
--- a/packages/i18n/src/locales/fr.i18n.json
+++ b/packages/i18n/src/locales/fr.i18n.json
@@ -1270,7 +1270,6 @@
   "Custom_Field_Not_Found": "Champ personnalisé introuvable",
   "Custom_Integration": "Intégration personnalisée",
   "Custom_oauth_helper": "Lorsque vous configurez votre fournisseur OAuth, vous devez indiquer une URL de rappel. Utilisez <pre>%s</pre>",
-  "Custom_oauth_unique_name": "Nom unique OAuth personnalisé",
   "Custom_Script_Logged_In": "Script personnalisé pour les utilisateurs connectés",
   "Custom_Script_Logged_In_Description": "Script personnalisé qui s'exécute TOUJOURS et pour TOUT utilisateur connecté (lorsque vous entrez dans le chat et que vous êtes connecté)",
   "Custom_Script_Logged_Out": "Script personnalisé pour les utilisateurs déconnectés",
@@ -1991,7 +1990,6 @@
   "Forward_to_user": "Transmettre à l'utilisateur",
   "Forwarding": "Transmission",
   "Free": "Gratuit",
-  "Free_Extension_Numbers": "Numéros d'extension gratuits",
   "Free_Apps": "Applications gratuites",
   "Frequently_Used": "Fréquemment utilisé",
   "Friday": "Vendredi",
@@ -2016,7 +2014,6 @@
   "get-server-info": "Obtenir des informations sur le serveur",
   "github_no_public_email": "Vous n'avez pas d'adresse e-mail publique associée à votre compte GitHub",
   "github_HEAD": "EN-TÊTE",
-  "Give_a_unique_name_for_the_custom_oauth": "Indiquez un nom unique pour OAuth personnalisé",
   "strike": "barrer",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Donnez un nom à l'application. Il sera visible par les utilisateurs.",
   "Global": "Global",
@@ -3050,7 +3047,6 @@
   "No_Canned_Responses_Yet": "Aucune réponse standardisée pour le moment",
   "No_Canned_Responses_Yet-description": "Utilisez des réponses standardisées pour fournir des réponses rapides et cohérentes aux questions fréquemment posées.",
   "No_channels_in_team": "Aucun canal dans cette équipe",
-  "No_channels_yet": "Vous ne faites pas encore partie d'un canal.",
   "No_data_found": "Aucune donnée trouvée",
   "No_direct_messages_yet": "Pas de messages directs.",
   "No_Discussions_found": "Aucune discussion trouvée",
@@ -3107,7 +3103,6 @@
   "Notifications_Max_Room_Members_Description": "Nombre maximal de membres dans le salon pour désactiver les notifications pour tous les messages. Les utilisateurs peuvent toujours modifier les paramètres du salon pour recevoir toutes les notifications individuellement. (0 pour désactiver)",
   "Notifications_Muted_Description": "Si vous choisissez de tout mettre en sourdine, vous ne voyez pas le salon en surbrillance dans la liste lorsque de nouveaux messages arrivent, à l'exception des mentions. La mise en sourdine des notifications remplace les paramètres de notification.",
   "Notifications_Preferences": "Préférences pour les notifications",
-  "Notifications_Sound_Volume": "Volume sonore des notifications",
   "Notify_active_in_this_room": "Avertir les utilisateurs actifs de ce salon",
   "Notify_all_in_this_room": "Avertir tous les utilisateurs de ce salon",
   "NPS_survey_enabled": "Activer l'enquête NPS",
diff --git a/packages/i18n/src/locales/he.i18n.json b/packages/i18n/src/locales/he.i18n.json
index 7cdc81b3ec1c..8323b972d75d 100644
--- a/packages/i18n/src/locales/he.i18n.json
+++ b/packages/i18n/src/locales/he.i18n.json
@@ -363,7 +363,6 @@
   "Custom CSS": "CSS מותאם אישית",
   "Custom_Fields": "שדות מותאמים אישית",
   "Custom_oauth_helper": "כאשר אתה מגדיר ספק OAuth, תצטרך לספק כתובת Callback. השתמש ב-<pre>%s</pre>.",
-  "Custom_oauth_unique_name": "שם ייחודי ב-OAuth מותאם אישית",
   "Custom_Script_Logged_In": "סקריפט המותאם אישית עבור משתמשים מחוברים",
   "Custom_Script_Logged_Out": "סקריפט המותאם אישית למשתמשים מתנתקים",
   "Customize": "התאם אישית",
@@ -617,7 +616,6 @@
   "From_email_warning": "<b>אזהרה:</b>: השדה <b>From</b> תלוי בהגדרות שרת המייל שלך.",
   "General": "כללי",
   "github_no_public_email": "אין לך אף כתובת דוא״ל פומבית בחשבון ה־GitHub שלך",
-  "Give_a_unique_name_for_the_custom_oauth": "תן שם ייחודי ב-OAuth מותאם אישית",
   "strike": "מחוק",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "תן שם ליישום. שם זה יופיע למשתמשיך",
   "Global": "גלובלי",
@@ -961,7 +959,6 @@
   "Nickname_Placeholder": "הכנס את הכינוי שלך...",
   "No": "לא",
   "No_available_agents_to_transfer": "אין סוכנים פנויים בכדי להעביר",
-  "No_channels_yet": "אינך חבר באף ערוץ עד כה.",
   "No_data_found": "לא נמצאו תוצאות",
   "No_direct_messages_yet": "לא התחלת אף שיחה עד כה.",
   "No_Encryption": "ללא הצפנה",
diff --git a/packages/i18n/src/locales/hi-IN.i18n.json b/packages/i18n/src/locales/hi-IN.i18n.json
index 116d429b85e6..46d5a2325fc2 100644
--- a/packages/i18n/src/locales/hi-IN.i18n.json
+++ b/packages/i18n/src/locales/hi-IN.i18n.json
@@ -49,7 +49,6 @@
   "Access_not_authorized": "प्रवेश अधिकृत नहीं है",
   "Access_Token_URL": "एक्सेस टोकन URL",
   "Access_Your_Account": "अपने खाते पर पहुंच",
-  "access_your_basic_information": "अपनी बुनियादी सूचना का आंकलन करें",
   "access-mailer": "मेलर स्क्रीन एक्सेस करें",
   "access-mailer_description": "सभी उपयोगकर्ताओं को बड़े पैमाने पर ईमेल भेजने की अनुमति।",
   "access-marketplace": "बाज़ार तक पहुंचें",
@@ -1460,7 +1459,6 @@
   "Custom_OAuth_has_been_added": "कस्टम OAuth जोड़ा गया है",
   "Custom_OAuth_has_been_removed": "कस्टम OAuth हटा दिया गया है",
   "Custom_oauth_helper": "अपना OAuth प्रदाता स्थापित करते समय, आपको एक कॉलबैक URL सूचित करना होगा। उपयोग<pre> %एस</pre> .",
-  "Custom_oauth_unique_name": "कस्टम OAuth अद्वितीय नाम",
   "Custom_roles": "कस्टम भूमिकाएँ",
   "Custom_roles_upsell_add_custom_roles_workspace": "अपने कार्यक्षेत्र के अनुरूप कस्टम भूमिकाएँ जोड़ें",
   "Custom_roles_upsell_add_custom_roles_workspace_description": "कस्टम भूमिकाएँ आपको अपने कार्यक्षेत्र में लोगों के लिए अनुमतियाँ सेट करने की अनुमति देती हैं। यह सुनिश्चित करने के लिए कि लोगों को काम करने के लिए सुरक्षित वातावरण मिले, सभी भूमिकाएँ निर्धारित करें।",
@@ -2354,7 +2352,6 @@
   "Forward_to_user": "उपयोगकर्ता को अग्रेषित करें",
   "Forwarding": "अग्रेषित करना",
   "Free": "मुक्त",
-  "Free_Extension_Numbers": "निःशुल्क एक्सटेंशन नंबर",
   "Free_Apps": "मुक्त एप्लिकेशन्स",
   "Frequently_Used": "बहुधा प्रयुक्त",
   "Friday": "शुक्रवार",
@@ -2390,7 +2387,6 @@
   "get-server-info_description": "सर्वर जानकारी प्राप्त करने की अनुमति",
   "github_no_public_email": "आपके GitHub खाते में सार्वजनिक ईमेल के रूप में कोई ईमेल नहीं है",
   "github_HEAD": "सिर",
-  "Give_a_unique_name_for_the_custom_oauth": "कस्टम OAuth के लिए एक अद्वितीय नाम दें",
   "strike": "हड़ताल",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "एप्लिकेशन को एक नाम दें. यह आपके उपयोगकर्ताओं को दिखाई देगा.",
   "Global": "वैश्विक",
@@ -3646,7 +3642,6 @@
   "No_channels_in_team": "इस टीम में कोई चैनल नहीं",
   "No_agents_yet": "अभी तक कोई एजेंट नहीं",
   "No_agents_yet_description": "अपने दर्शकों से जुड़ने और अनुकूलित ग्राहक सेवा प्रदान करने के लिए एजेंट जोड़ें।",
-  "No_channels_yet": "आप अभी तक किसी भी चैनल का हिस्सा नहीं हैं",
   "No_chats_yet": "अभी तक कोई चैट नहीं",
   "No_chats_yet_description": "आपकी सभी चैट यहां दिखाई देंगी.",
   "No_calls_yet": "अभी तक कोई कॉल नहीं",
@@ -3733,7 +3728,6 @@
   "Notifications_Max_Room_Members_Description": "जब सभी संदेशों के लिए सूचनाएं अक्षम हो जाती हैं तो कमरे में सदस्यों की अधिकतम संख्या। उपयोगकर्ता व्यक्तिगत आधार पर सभी सूचनाएं प्राप्त करने के लिए अभी भी प्रति कमरा सेटिंग बदल सकते हैं। (0 अक्षम करने के लिए)",
   "Notifications_Muted_Description": "यदि आप सब कुछ म्यूट करना चुनते हैं, तो उल्लेखों को छोड़कर, नए संदेश आने पर आपको सूची में रूम हाइलाइट नहीं दिखाई देगा। सूचनाओं को म्यूट करने से सूचना सेटिंग ओवरराइड हो जाएंगी.",
   "Notifications_Preferences": "अधिसूचना प्राथमिकताएँ",
-  "Notifications_Sound_Volume": "सूचनाएं ध्वनि की मात्रा",
   "Notify_active_in_this_room": "इस कक्ष में सक्रिय उपयोगकर्ताओं को सूचित करें",
   "Notify_all_in_this_room": "इस कमरे में सभी को सूचित करें",
   "Notify_Calendar_Events": "कैलेंडर घटनाओं को सूचित करें",
diff --git a/packages/i18n/src/locales/hr.i18n.json b/packages/i18n/src/locales/hr.i18n.json
index 0ab9b6e1dad0..b0c457211515 100644
--- a/packages/i18n/src/locales/hr.i18n.json
+++ b/packages/i18n/src/locales/hr.i18n.json
@@ -875,7 +875,6 @@
   "Custom_Emoji_Updated_Successfully": "Poseban emotikon je ažuriran.",
   "Custom_Fields": "Prilagođena polja",
   "Custom_oauth_helper": "Prilikom postavljanja OAuth Provider, morate namjestiti URL povratnog poziva. Koristite <pre> %s </pre> ,",
-  "Custom_oauth_unique_name": "Prilagođeno OAuth jedinstveno ime",
   "Custom_Script_Logged_In": "Prilagođena skripta za prijavljene korisnike",
   "Custom_Script_Logged_Out": "Prilagođena skripta za odjavljene korisnike",
   "Custom_Scripts": "Prilagođene skripte",
@@ -1325,7 +1324,6 @@
   "Gaming": "kockanje",
   "General": "Općenito",
   "github_no_public_email": "Nemaš nijedan javni email u svom GitHub računu",
-  "Give_a_unique_name_for_the_custom_oauth": "Daj jedinstveno ime prilagođenom OAuth",
   "strike": "precrtaj",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Dajte ime aplikaciji. To će korisnici vidjeti.",
   "Global": "Globalno",
@@ -1907,7 +1905,6 @@
   "Newer_than_may_not_exceed_Older_than": "\"Noviji od\" ne smije premašiti \"starije od\"",
   "No": "Ne",
   "No_available_agents_to_transfer": "Nema dostupnih agenata za prijenos",
-  "No_channels_yet": "Još nisi dio nijedne sobe.",
   "No_direct_messages_yet": "Još nisi započeo nijedan razgovor.",
   "No_Encryption": "Bez Enkripcije",
   "No_groups_yet": "Još nemaš privatnih grupa.",
@@ -1939,7 +1936,6 @@
   "Notifications_Max_Room_Members_Description": "Maksimalni broj članova u sobi kada se obavijesti o svim porukama onemogućuju. Korisnici se i dalje mogu mijenjati po postavkama sobe kako bi primile sve obavijesti na pojedinačnoj osnovi. (0 za onemogućavanje)",
   "Notifications_Muted_Description": "Ako odlučite isključiti sve, u popisu se neće prikazati oznaka sobe ako postoje nove poruke, osim za spominjanja. Isključivanje obavijesti poništava postavke obavijesti.",
   "Notifications_Preferences": "Postavke obavijesti",
-  "Notifications_Sound_Volume": "Glasnoća zvuka obavijesti",
   "Notify_active_in_this_room": "Obavijesti aktivne korisnike u ovoj sobi",
   "Notify_all_in_this_room": "Obavijesti sve u ovoj sobi",
   "Num_Agents": "# agenata",
diff --git a/packages/i18n/src/locales/hu.i18n.json b/packages/i18n/src/locales/hu.i18n.json
index da26cc26203c..e5b68aeddbee 100644
--- a/packages/i18n/src/locales/hu.i18n.json
+++ b/packages/i18n/src/locales/hu.i18n.json
@@ -1371,7 +1371,6 @@
   "Custom_OAuth_has_been_added": "Az egyéni OAuth hozzá lett adva",
   "Custom_OAuth_has_been_removed": "Az egyéni OAuth el lett távolítva",
   "Custom_oauth_helper": "Ha beállítja az OAuth-szolgáltatóját, akkor tájékoztatnia kell egy visszahívási URL-t. Használja ezt: <pre>%s</pre>.",
-  "Custom_oauth_unique_name": "Egyéni OAuth egyedi neve",
   "Custom_Script_Logged_In": "Egyéni parancsfájl a bejelentkezett felhasználókhoz",
   "Custom_Script_Logged_In_Description": "Egyéni parancsfájl, amely MINDIG lefut az ÖSSZES bejelentkezett felhasználónál (például amikor belép egy csevegésbe és be van jelentkezve)",
   "Custom_Script_Logged_Out": "Egyéni parancsfájl a kijelentkezett felhasználókhoz",
@@ -2187,7 +2186,6 @@
   "Forward_to_user": "Továbbítás felhasználónak",
   "Forwarding": "Továbbítás",
   "Free": "Ingyenes",
-  "Free_Extension_Numbers": "Ingyenes kiterjesztések száma",
   "Free_Apps": "Ingyenes alkalmazások",
   "Frequently_Used": "Gyakran használt",
   "Friday": "Péntek",
@@ -2215,7 +2213,6 @@
   "get-server-info_description": "Jogosultság a kiszolgálóinformációk lekéréséhez",
   "github_no_public_email": "Nincs egyetlen e-mail-címe sem nyilvános e-mail-címként a GitHub-fiókjában",
   "github_HEAD": "FEJ",
-  "Give_a_unique_name_for_the_custom_oauth": "Adjon egyedi nevet az egyéni OAuth-nak",
   "strike": "áthúzott",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Adjon nevet az alkalmazásnak. Ezt fogják látni a felhasználói.",
   "Global": "Globális",
@@ -3347,7 +3344,6 @@
   "No_Canned_Responses_Yet": "Még nincsenek sablonválaszok",
   "No_Canned_Responses_Yet-description": "Használjon sablonválaszokat, hogy gyors és következetes válaszokat adjon a gyakran feltett kérdésekre.",
   "No_channels_in_team": "Nincsenek csatornák ennél a csapatnál",
-  "No_channels_yet": "Ön még nem tagja egyetlen csatornának sem",
   "No_data_found": "Nem található adat",
   "No_direct_messages_yet": "Nincsenek közvetlen üzenetek.",
   "No_Discussions_found": "Nem találhatók megbeszélések",
@@ -3407,7 +3403,6 @@
   "Notifications_Max_Room_Members_Description": "A szobában lévő tagok legnagyobb száma, amikor az összes üzenet értesítései letiltásra kerülnek. A felhasználók továbbra is megváltoztathatják a szobánkénti beállítást, hogy az összes értesítést egyénileg kapják meg (0 a letiltáshoz).",
   "Notifications_Muted_Description": "Ha úgy dönt, hogy mindent elnémít, akkor nem fogja látni a szoba kiemelését a listában, amikor új üzenetek érkeznek, kivéve az említéseket. Az értesítések némítása felülírja az értesítések beállításait.",
   "Notifications_Preferences": "Értesítések beállításai",
-  "Notifications_Sound_Volume": "Értesítések hangereje",
   "Notify_active_in_this_room": "Aktív felhasználók értesítése ebben a szobában",
   "Notify_all_in_this_room": "Mindenki értesítése ebben a szobában",
   "NPS_survey_enabled": "Ügyfél-elégedettségi felmérés engedélyezése",
diff --git a/packages/i18n/src/locales/id.i18n.json b/packages/i18n/src/locales/id.i18n.json
index 5e29925ead23..ffe250cfba91 100644
--- a/packages/i18n/src/locales/id.i18n.json
+++ b/packages/i18n/src/locales/id.i18n.json
@@ -785,7 +785,6 @@
   "Custom_Emoji_Updated_Successfully": "Custom emoji berhasil diperbarui",
   "Custom_Fields": "Fields kustom",
   "Custom_oauth_helper": "Anda harus menyediakan URL Callback ketika melakukan setup untuk OAuth Provider. Gunakan <pre>%s</pre> .",
-  "Custom_oauth_unique_name": "Nama unik dari oauth kustom",
   "Custom_Script_Logged_In": "Kustom Script untuk login pengguna",
   "Custom_Script_Logged_Out": "Kustom Script untuk log out pengguna",
   "Custom_Scripts": "Skrip Kustom",
@@ -1196,7 +1195,6 @@
   "Gaming": "Game",
   "General": "Umum",
   "github_no_public_email": "Anda tidak memiliki email publik di akun GitHub anda.",
-  "Give_a_unique_name_for_the_custom_oauth": "Berikan nama unik untuk kustom oauth",
   "strike": "coret",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Memberikan aplikasi nama. Ini akan terlihat oleh pengguna Anda.",
   "Global": "Global",
@@ -1784,7 +1782,6 @@
   "Newer_than_may_not_exceed_Older_than": "\"Lebih baru dari\" tidak boleh melebihi \"Lebih lama dari\"",
   "No": "Tidak",
   "No_available_agents_to_transfer": "Tidak ada agen yang tersedia untuk transfer",
-  "No_channels_yet": "Anda belum bergabung ke dalam channel manapun.",
   "No_direct_messages_yet": "Anda belum memulai percakapan.",
   "No_Encryption": "Tidak ada Encryption",
   "No_groups_yet": "Anda belum memiliki grup privat.",
@@ -1816,7 +1813,6 @@
   "Notifications_Max_Room_Members_Description": "Jumlah anggota maksimal di ruangan saat pemberitahuan untuk semua pesan dinonaktifkan. Pengguna tetap dapat mengubah setelan per kamar untuk menerima semua notifikasi secara individual. (0 untuk menonaktifkan)",
   "Notifications_Muted_Description": "Jika Anda memilih untuk membisukan semuanya, Anda tidak akan melihat sorotan ruangan dalam daftar saat ada pesan baru, kecuali untuk menyebutkannya. Nonaktifkan pemberitahuan akan menggantikan setelan notifikasi.",
   "Notifications_Preferences": "Preferensi Pemberitahuan",
-  "Notifications_Sound_Volume": "Notifikasi volume suara",
   "Notify_active_in_this_room": "Beritahu pengguna aktif di ruangan ini",
   "Notify_all_in_this_room": "Berikan pemberitahuan ke semua yang ada di room",
   "Num_Agents": "# Agen",
diff --git a/packages/i18n/src/locales/it.i18n.json b/packages/i18n/src/locales/it.i18n.json
index d97e288cd5b8..e83bc48163e3 100644
--- a/packages/i18n/src/locales/it.i18n.json
+++ b/packages/i18n/src/locales/it.i18n.json
@@ -55,7 +55,6 @@
   "Access_not_authorized": "Accesso non autorizzato",
   "Access_Token_URL": "URL del Token di Accesso",
   "Access_Your_Account": "Accedi al tuo account",
-  "access_your_basic_information": "accedere alle tue informazioni di base",
   "access-mailer": "Accedi alla schermata del client di posta",
   "access-mailer_description": "Autorizzazione a inviare email di massa a tutti gli utenti.",
   "access-marketplace": "Accedi al marketplace",
@@ -1013,7 +1012,6 @@
   "Custom_Emoji_Updated_Successfully": "Emoji personalizzata aggiornata con successo",
   "Custom_Fields": "Campi personalizzati",
   "Custom_oauth_helper": "Quando si imposta l'OAuth Provider, è necessario impostare un URL Callback. Usa <pre>%s</pre> .",
-  "Custom_oauth_unique_name": "Nome univoco dell'OAuth personalizzato",
   "Custom_roles": "Ruoli personalizzati",
   "Custom_Script_Logged_In": "Script personalizzato per gli utenti collegati",
   "Custom_Script_Logged_Out": "Script personalizzato per gli utenti scollegati",
@@ -1570,7 +1568,6 @@
   "get-password-policy-mustContainAtLeastOneSpecialCharacter-label": "Almeno un simbolo",
   "github_no_public_email": "Non hai un email publica sul tuo account GitHub",
   "github_HEAD": "HEAD",
-  "Give_a_unique_name_for_the_custom_oauth": "Dai un nome univoco per l'OAuth personalizzato",
   "strike": "barrato",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Dai un nome all'applicazione. Sarà visibile agli utenti.",
   "Global": "Globale",
@@ -2266,7 +2263,6 @@
   "Newer_than_may_not_exceed_Older_than": "\"Più recente di\" non può superare \"Più vecchio di\"",
   "No": "No",
   "No_available_agents_to_transfer": "Nessun operatore disponibile da trasferire",
-  "No_channels_yet": "Non fai ancora parte di nessun canale.",
   "No_direct_messages_yet": "Non hai ancora iniziato nessuna conversazione.",
   "No_discussions_yet": "Nessuna discussione",
   "No_Encryption": "Senza crittografia",
@@ -2302,7 +2298,6 @@
   "Notifications_Max_Room_Members_Description": "Numero massimo di membri nella stanza quando le notifiche per tutti i messaggi vengono disabilitate. Gli utenti possono comunque modificare l'impostazione di ogni stanza per ricevere tutte le notifiche su base individuale. (0 per disabilitare)",
   "Notifications_Muted_Description": "Se decidi di disattivare l'audio, non vedrai l'evidenziazione della stanza nell'elenco quando ci sono nuovi messaggi, ad eccezione delle menzioni. Le notifiche di muting annulleranno le impostazioni delle notifiche.",
   "Notifications_Preferences": "Notifiche Preferenze",
-  "Notifications_Sound_Volume": "Notifiche del volume sonoro",
   "Notify_active_in_this_room": "Notifica utenti attivi in questa stanza",
   "Notify_all_in_this_room": "Notifica tutti in questo canale",
   "Num_Agents": "# Operatori",
@@ -3398,4 +3393,4 @@
   "UpgradeToGetMore_custom-roles_Title": "Ruoli personalizzati",
   "Video_call_manager": "Gestore di videochiamate",
   "Sync_license_update_Callout_Title": "Stiamo aggiornando la vostra licenza"
-}
\ No newline at end of file
+}
diff --git a/packages/i18n/src/locales/ja.i18n.json b/packages/i18n/src/locales/ja.i18n.json
index 5f90bf07d5bd..f25cd0eff21f 100644
--- a/packages/i18n/src/locales/ja.i18n.json
+++ b/packages/i18n/src/locales/ja.i18n.json
@@ -1251,7 +1251,6 @@
   "Custom_Field_Not_Found": "カスタムフィールドが見つかりません",
   "Custom_Integration": "カスタム統合",
   "Custom_oauth_helper": "OAuthプロバイダーを設定する場合は、コールバックURLを通知する必要があります。<pre>%s</pre>を使用してください。",
-  "Custom_oauth_unique_name": "カスタムOAuthの一意の名前",
   "Custom_Script_Logged_In": "ログイン済みユーザー用のカスタムスクリプト",
   "Custom_Script_Logged_In_Description": "常に実行され、ログインしているすべてのユーザーに対して実行されるカスタムスクリプト（チャットに参加およびログインしているときは常時）",
   "Custom_Script_Logged_Out": "ログアウト済みユーザー用のカスタムスクリプト",
@@ -1969,7 +1968,6 @@
   "Forward_to_user": "ユーザーに転送",
   "Forwarding": "転送",
   "Free": "無料",
-  "Free_Extension_Numbers": "無料の内線番号",
   "Free_Apps": "無料のアプリ",
   "Frequently_Used": "よく使うもの",
   "Friday": "金曜日",
@@ -1993,7 +1991,6 @@
   "get-password-policy-mustContainAtLeastOneUppercase": "パスワードには少なくとも1つの大文字を含める必要があります",
   "github_no_public_email": "GitHubアカウントがパブリックメールとしてのメールアドレスを持っていません",
   "github_HEAD": "ヘッド",
-  "Give_a_unique_name_for_the_custom_oauth": "カスタムOAuthの一意の名前を入力してください",
   "strike": "取り消し線",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "アプリケーション名を入力してください。この名前はユーザーに表示されます。",
   "Global": "グローバル",
@@ -3020,7 +3017,6 @@
   "No_Canned_Responses_Yet": "返信定型文がまだありません",
   "No_Canned_Responses_Yet-description": "返信定型文を使用して、よくある質問にすばやく確実に回答します。",
   "No_channels_in_team": "このチームにはChannelsがありません",
-  "No_channels_yet": "まだチャネルに参加していません",
   "No_data_found": "データが見つかりませんでした",
   "No_direct_messages_yet": "ダイレクトメッセージがありません。",
   "No_Discussions_found": "ディスカッションが見つかりませんでした",
@@ -3076,7 +3072,6 @@
   "Notifications_Max_Room_Members_Description": "すべてのメッセージの通知が無効にされた場合のルームのメンバーの最大数。ユーザーは個々の基準ですべての通知を受け取るために、ルームごとの設定を変更できます。（0は無効）",
   "Notifications_Muted_Description": "すべてミュートすることを選択した場合、新しいメッセージがあるときは、ルームのハイライトがリストに表示されません（メンションを除く）。通知のミュートは通知設定より優先されます。",
   "Notifications_Preferences": "通知基本設定",
-  "Notifications_Sound_Volume": "通知音量",
   "Notify_active_in_this_room": "このルームのアクティブユーザーに通知",
   "Notify_all_in_this_room": "このルームの全員に通知",
   "NPS_survey_enabled": "NPSアンケートを有効にする",
diff --git a/packages/i18n/src/locales/ka-GE.i18n.json b/packages/i18n/src/locales/ka-GE.i18n.json
index 0437c60992eb..2d966c7aa3c4 100644
--- a/packages/i18n/src/locales/ka-GE.i18n.json
+++ b/packages/i18n/src/locales/ka-GE.i18n.json
@@ -1010,7 +1010,6 @@
   "Custom_Emoji_Updated_Successfully": "მორგებული სმაილი განახლდა",
   "Custom_Fields": "მორგებული ველები",
   "Custom_oauth_helper": "OAuth– ის პროვაიდერის შექმნისას, თქვენ უნდა აცნობოთ უკუკავშირის მისამართს. გამოიყენეთ <pre>%s</pre>.",
-  "Custom_oauth_unique_name": "უნიკალური oauth სახელი",
   "Custom_Script_Logged_In": "პირადი სკრიპტი ავტორიზებული მომხმარებლებისთვის",
   "Custom_Script_Logged_In_Description": "პერსონალური სკრიპტი, რომელიც გაეშვება ყოველთვის და ყველა მომხმარებლისთვის რომელიც შესულია სისტემაში ",
   "Custom_Script_Logged_Out": "პირადი სკრიპტი სისტემიდან გასული მომხმარებლებისტვის",
@@ -1618,7 +1617,6 @@
   "Generate_New_Link": "შექმენით ახალი ბმული",
   "Generating_key": "გასაღების გენერაცია",
   "github_no_public_email": "თქვენ არ გაქვთ მითითებული საჯარო ელ.ფოსტა GitHub-თვის",
-  "Give_a_unique_name_for_the_custom_oauth": "მიეცით უნიკალური სახელი ინდივიდუალურ oauth-ს ( ღია ავტორიზაცია)",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "დაარქვით აპლიკაციას სახელი.ეს ხილული იქნება თქვენთვის",
   "Global": "გლობალური",
   "Global Policy": "გლობალური წესები",
@@ -2427,7 +2425,6 @@
   "Newer_than_may_not_exceed_Older_than": "\"უფრო ახალი ვიდრე\" შეიძლება არ აჭარბებდეს \"უფრო ძველი ვიდრე\" -ს",
   "No_available_agents_to_transfer": "არ არის ხელმისაწვდომი აგენტები გადასაცემად",
   "No_Canned_Responses": "შენახული პასუხები არ არის",
-  "No_channels_yet": "თქვენ ჯერ არ ხართ არც ერთი არხის წევრი",
   "No_data_found": "მონაცემი ვერ მოიძებნა",
   "No_direct_messages_yet": "პირდაპირი შეტყობინებები არ არის.",
   "No_discussions_yet": "ჯერჯერობით განხილვები არ არის",
@@ -2471,7 +2468,6 @@
   "Notifications_Max_Room_Members_Description": "ოთახის წევრთა მაქსიმალური რაოდენობა, როდესაც ყველა მესიჯისთვის შეტყობინებები გამორთულია. მომხმარებლებს მაინც შეუძლიათ შეცვალონ თითოეულის პარამეტრი, მიიღონ ყველა შეტყობინებები ინდივიდუალურად. (0 გამორთვა)",
   "Notifications_Muted_Description": "თუ ყველაფრის უხმო რეჟიმში გადაყვანას გადაწყვეტთ, სიაში ვერ ნახავთ ოთახის მონიშვნას, როდესაც ახალი შეტყობინებებია, გარდა ხსენებებისა. შეტყობინებების ხმის გათიშვა გადაფარავს შეტყობინებების პარამეტრებს.",
   "Notifications_Preferences": "უპირატესი შეტყობინებები",
-  "Notifications_Sound_Volume": "შეტყობინებების ხმის სიძლიერე",
   "Notify_active_in_this_room": "აცნობეთ ამ ოთახში აქტიურ მომხმარებლებს",
   "Notify_all_in_this_room": "აცნობეთ ყველა ამ ოთახში",
   "Num_Agents": "# აგენტები",
diff --git a/packages/i18n/src/locales/km.i18n.json b/packages/i18n/src/locales/km.i18n.json
index e2f35e19e770..d867a8ba6f79 100644
--- a/packages/i18n/src/locales/km.i18n.json
+++ b/packages/i18n/src/locales/km.i18n.json
@@ -954,7 +954,6 @@
   "Custom_Emoji_Updated_Successfully": "សញ្ញាអារម្មណ៍ផ្ទាល់ខ្លួនបានអាប់ដេតដោយជោគជ័យ",
   "Custom_Fields": "វាលផ្ទាល់ខ្លួន",
   "Custom_oauth_helper": "ពេលអ្នកកំពុងកំណត់ OAuth Provider នោះអ្នកនឹងទទួល URL បញ្ជាក់មួយត្រឡប់មកវិញ, ដែលប្រើ <pre>%s</pre>",
-  "Custom_oauth_unique_name": "កំណត់ oauth ឲ្យមានឈ្មោះតែមួយគត់",
   "Custom_Script_Logged_In": "ស្គ្រីបផ្ទាល់ខ្លួនសម្រាប់ចូលរបស់អ្នកប្រើ",
   "Custom_Script_Logged_In_Description": "ស្គ្រីបផ្ទាល់ខ្លួនដែលនឹងដំណើរការគ្រប់ពេលនិងចំពោះអ្នកប្រើប្រាស់ណាដែលបានចូល។ ឧ។ (រាល់ពេលដែលអ្នកចូលជជែកហើយអ្នកបានចូល)",
   "Custom_Script_Logged_Out": "ស្គ្រីបផ្ទាល់ខ្លួនសម្រាប់អ្នកប្រើចេញ",
@@ -1442,7 +1441,6 @@
   "Gaming": "ហ្គេម",
   "General": "ទូទៅ",
   "github_no_public_email": "អ្នក​មិន​មាន​អ៊ីមែល​សាធារណៈ​ក្នុង​ GitHub នៅ​ឡើយ​ទេ",
-  "Give_a_unique_name_for_the_custom_oauth": "ផ្តល់​ឱ្យ​ឈ្មោះ​តែ​មួយ​គត់​សម្រាប់ oauth ផ្ទាល់​ខ្លួន",
   "strike": "strike",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "ផ្តល់ឱ្យកម្មវិធីនេះមានឈ្មោះមួយ។ នេះនឹងត្រូវបានគេមើលឃើញដោយអ្នកប្រើរបស់អ្នក។",
   "Global": "សកល",
@@ -2082,7 +2080,6 @@
   "Newer_than_may_not_exceed_Older_than": "\"ថ្មីជាង\" មិនអាចលើសពី \"ចាស់ជាង\"",
   "No": "ទេ",
   "No_available_agents_to_transfer": "គ្មានភ្នាក់ងារដែលអាចផ្ទេរបានទេ",
-  "No_channels_yet": "អ្នក​មិន​មែន​ជា​សមាជិក​នៃ​ប៉ុស្តិ៍​ណា​មួយ​ឡើយ",
   "No_direct_messages_yet": "អ្នក​មិន​ធ្លាប់​បាន​ធ្វើ​ការ​ពិភាក្សា​នៅ​ឡើយ",
   "No_Encryption": "គ្មានការអ៊ិនគ្រីប",
   "No_groups_yet": "អ្នក​មិន​ទាន់​មាន​ក្រុម​ឯកជន​នៅឡើយ",
@@ -2114,7 +2111,6 @@
   "Notifications_Max_Room_Members_Description": "ចំនួនអតិបរមានៃសមាជិកនៅក្នុងបន្ទប់នៅពេលដែលការជូនដំណឹងសម្រាប់សារទាំងអស់ត្រូវបានបិទ។ អ្នកប្រើនៅតែអាចផ្លាស់ប្តូរក្នុងការកំណត់បន្ទប់ដើម្បីទទួលបានការជូនដំណឹងទាំងអស់នៅលើមូលដ្ឋានបុគ្គល។ (0 ដើម្បីបិទ)",
   "Notifications_Muted_Description": "ប្រសិនបើអ្នកជ្រើសរើសបិទសម្លេងអ្វីៗគ្រប់យ៉ាងអ្នកនឹងមិនឃើញការរំលេចបន្ទប់ក្នុងបញ្ជីនៅពេលមានសារថ្មីលើកលែងតែការលើកឡើង។ ការជូនដំណឹងការជូនដំណឹងនឹងបដិសេធការកំណត់ការជូនដំណឹង។",
   "Notifications_Preferences": "ចំណង់ចំណូលចិត្តជូនដំណឹង",
-  "Notifications_Sound_Volume": "ការជូនដំណឹងសំឡេងសំឡេង",
   "Notify_active_in_this_room": "ជូនដំណឹងដល់អ្នកប្រើសកម្មនៅក្នុងបន្ទប់នេះ",
   "Notify_all_in_this_room": "ជូន​ដំណឹង​ទាំង​អស់​នៅ​ក្នុង​បន្ទប់​នេះ",
   "Num_Agents": "ភ្នាក់ងារ #",
diff --git a/packages/i18n/src/locales/ko.i18n.json b/packages/i18n/src/locales/ko.i18n.json
index 6a523855aa02..44f57d2b30a5 100644
--- a/packages/i18n/src/locales/ko.i18n.json
+++ b/packages/i18n/src/locales/ko.i18n.json
@@ -1111,7 +1111,6 @@
   "Custom_Fields": "사용자 정의 필드",
   "Custom_Field_Removed": "사용자정의 필드 제거",
   "Custom_oauth_helper": "OAuth Provider를 설정할때, 콜백 URL을 알려줘야합니다. <pre>%s</pre>를 사용.",
-  "Custom_oauth_unique_name": "사용자 정의 OAuth 고유 이름",
   "Custom_Script_Logged_In": "로그인한 사용자를 위한 사용자 정의 스크립트 ",
   "Custom_Script_Logged_In_Description": "항상 사용자와 로그인 한 모든 사용자에게 실행되는 사용자 정의 스크립트. 예 (채팅을 입력하고 로그인 할 때마다)",
   "Custom_Script_Logged_Out": "로그아웃 사용자를 위한 사용자 정의 스크립트 ",
@@ -1767,7 +1766,6 @@
   "get-password-policy-mustContainAtLeastOneSpecialCharacter": "비밀번호는 한 개 이상의 특수 문자를 포함해야합니다",
   "get-password-policy-mustContainAtLeastOneUppercase": "비밀번호는 한 개 이상의 대문자를 포함해야합니다",
   "github_no_public_email": "Github 계정에 공개된 이메일이 없습니다.",
-  "Give_a_unique_name_for_the_custom_oauth": "사용자 정의 OAuth에 대한 고유 이름 지정",
   "strike": "취소선",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "응용프로그램명을 지정합니다. 등록된 사용자가 볼 수 있습니다.",
   "Global": "글로벌",
@@ -2627,7 +2625,6 @@
   "No": "아니오",
   "No_available_agents_to_transfer": "전송에 사용할 수 있는 에이전트가 없습니다.",
   "No_Canned_Responses": "예상 답변이 없습니다.",
-  "No_channels_yet": "아직 채널에 속해 있지 않습니다",
   "No_data_found": "데이터를 찾을 수 없습니다.",
   "No_direct_messages_yet": "개인 대화방이 없습니다.",
   "No_Discussions_found": "토론을 찾을 수 없습니다.",
@@ -2676,7 +2673,6 @@
   "Notifications_Max_Room_Members_Description": "모든 메시지에 대한 알림이 중지된 경우 대화방의 최대 구성원 수입니다. 사용자는 개별적으로 모든 알림을 수신하도록 대화방 설정을 변경할 수 있습니다. (0은 비활성화)",
   "Notifications_Muted_Description": "모든 알림을 해제한 경우 멘션을 제외하고 새 메시지가 있는 대화방을 강조하여 볼 수 없습니다. 알림해제는 알림 설정보다 우선 적용됩니다.",
   "Notifications_Preferences": "알림 환경 설정",
-  "Notifications_Sound_Volume": "알림 음량",
   "Notify_active_in_this_room": "이 대화방에있는 활성 사용자에게 알립니다.",
   "Notify_all_in_this_room": "이 대화방의 모든 이에게 알림",
   "Num_Agents": "# 에이전트",
diff --git a/packages/i18n/src/locales/ku.i18n.json b/packages/i18n/src/locales/ku.i18n.json
index 3a135c886c9c..7409ecd08d0c 100644
--- a/packages/i18n/src/locales/ku.i18n.json
+++ b/packages/i18n/src/locales/ku.i18n.json
@@ -784,7 +784,6 @@
   "Custom_Emoji_Updated_Successfully": "Emoji bi serkeftî veguhastin",
   "Custom_Fields": "Fields Custom",
   "Custom_oauth_helper": "Dema ku avakirina Provider OAuth te, tu ê bi xwe agahdar bike a URL Callback. Bikaranîn <pre>%s</pre>.",
-  "Custom_oauth_unique_name": "Navê yekane OAuth Custom",
   "Custom_Script_Logged_In": "Custom Script ji bo Bikarhênerên qeydkirî",
   "Custom_Script_Logged_Out": "Custom Script ji bo bikarhênerên (logged out)",
   "Custom_Scripts": "Vebijêrkên Custom",
@@ -1192,7 +1191,6 @@
   "Gaming": "Gaming",
   "General": "Giştî",
   "github_no_public_email": "لە هەژماری گیتهەبەکەت هیچ ئیمەیڵێکی کراوەی گشتیت نیە",
-  "Give_a_unique_name_for_the_custom_oauth": "Give a bi navê yekta ji bo OAuth custom li",
   "strike": "karberdan",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Bide ku sepan a name. Ev jî dê ji aliyê bikarhênerên xwe dît.",
   "Global": "Cîhane",
@@ -1771,7 +1769,6 @@
   "Newer_than_may_not_exceed_Older_than": "\"Ji nûtir\" dikare bêtir \"Pir ji\"",
   "No": "Na",
   "No_available_agents_to_transfer": "Agahdariyên ku ji bo veguhastinê tune",
-  "No_channels_yet": "تۆ هێشتا لە هیچ کەناڵێک نیت.",
   "No_direct_messages_yet": "تۆ هێشتا هیچ گفتوگۆیەکت دەست پێنەکردوە.",
   "No_Encryption": "No şîfrekirinê",
   "No_groups_yet": "هێشتا گروپی تایبەتت نیە.",
@@ -1803,7 +1800,6 @@
   "Notifications_Max_Room_Members_Description": "Hejmareke hejmarek endamên hejmarê heger agahdariyên hemî mesajan neçalak kirin. Bikaranîna bikarhêner dikarin li ser sazûmanek odeyê biguherînin ku hemî agahdariyên li ser bingeha kesan bigirin. (0 heta qedexekirin)",
   "Notifications_Muted_Description": "Heke hûn ji bo her tiştê bêdeng bijartin, hûn ê li ser lîsteyê nîqaş li ser lîsteyê niqaş nabînin, lê ji bo ramanên nû. Agahdariyên Muting dê di raporên agahdariyê de agahdar bike.",
   "Notifications_Preferences": "Pêşniyarên pêşniyaran",
-  "Notifications_Sound_Volume": "Dengbêjî dengê dengê",
   "Notify_active_in_this_room": "Di vê odeyê de bikarhênerên çalak çalak bike",
   "Notify_all_in_this_room": "Notify hemû di vê odeyê",
   "Num_Agents": "# Agents",
diff --git a/packages/i18n/src/locales/lo.i18n.json b/packages/i18n/src/locales/lo.i18n.json
index ad1721739c25..6f424d51917d 100644
--- a/packages/i18n/src/locales/lo.i18n.json
+++ b/packages/i18n/src/locales/lo.i18n.json
@@ -802,7 +802,6 @@
   "Custom_Emoji_Updated_Successfully": "Emoji ທີ່ຖືກຕ້ອງຖືກປັບປຸງຢ່າງປະສົບຜົນສໍາເລັດ",
   "Custom_Fields": "ຊຸດກໍານົດຄ່າ",
   "Custom_oauth_helper": "ໃນເວລາທີ່ການສ້າງຕັ້ງໃຫ້ບໍລິການ OAuth ຂອງທ່ານ, ທ່ານຈະຕ້ອງໄດ້ແຈ້ງ URL ໂທໄດ້. ການນໍາໃຊ້ <pre> %s </pre> .",
-  "Custom_oauth_unique_name": "ຊື່ເປັນເອກະລັກ OAuth Custom",
   "Custom_Script_Logged_In": "Script Custom ສໍາລັບການເຂົ້າສູ່ລະບົບຜູ້ໃຊ້",
   "Custom_Script_Logged_Out": "Script ລູກຄ້າສໍາລັບຜູ້ໃຊ້ອອກຈາກລະບົບ",
   "Custom_Scripts": "Custom Scripts",
@@ -1230,7 +1229,6 @@
   "Gaming": "Gaming",
   "General": "ໂດຍທົ່ວໄປ",
   "github_no_public_email": "ທ່ານບໍ່ມີອີເມລອີເມລສາທາລະນະຢູ່ໃນບັນຊີ GitHub ຂອງທ່ານ",
-  "Give_a_unique_name_for_the_custom_oauth": "ໃຫ້ຊື່ເປັນເອກະລັກສໍາລັບການ OAuth ທີ່ກໍາຫນົດເອງ",
   "strike": "ປະທ້ວງ",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "ໃຫ້ຄໍາຮ້ອງສະຫມັກຂອງຊື່. ນີ້ຈະໄດ້ຮັບການເຫັນໂດຍຜູ້ໃຊ້ຂອງທ່ານ.",
   "Global": "Global",
@@ -1814,7 +1812,6 @@
   "Newer_than_may_not_exceed_Older_than": "\"ໃຫມ່ກວ່າ\" ອາດຈະບໍ່ເກີນ \"ເກົ່າກວ່າ\"",
   "No": "No",
   "No_available_agents_to_transfer": "ບໍ່ມີຕົວແທນທີ່ມີການໂອນ",
-  "No_channels_yet": "ທ່ານບໍ່ແມ່ນສ່ວນຫນຶ່ງຂອງຊ່ອງທາງໃດ ໆ .",
   "No_direct_messages_yet": "ທ່ານບໍ່ໄດ້ເລີ່ມຕົ້ນການສົນທະນາໃດ ໆ .",
   "No_Encryption": "ບໍ່ມີການເຂົ້າລະຫັດ",
   "No_groups_yet": "ທ່ານມີບໍ່ມີກຸ່ມເອກະຊົນບໍ່ມີ.",
@@ -1846,7 +1843,6 @@
   "Notifications_Max_Room_Members_Description": "ຈໍານວນສະມາຊິກສູງສຸດໃນຫ້ອງເມື່ອແຈ້ງເຕືອນສໍາລັບຂໍ້ຄວາມທັງຫມົດຖືກປິດປະຕິບັດ. ຜູ້ໃຊ້ຍັງສາມາດປ່ຽນແປງຕໍ່ການຕັ້ງຄ່າຫ້ອງເພື່ອຮັບການແຈ້ງເຕືອນທັງຫມົດໃນແຕ່ລະພື້ນຖານ. (0 ເພື່ອປິດການໃຊ້ງານ)",
   "Notifications_Muted_Description": "ຖ້າທ່ານເລືອກທີ່ຈະປິດທຸກສິ່ງທຸກຢ່າງ, ທ່ານຈະບໍ່ເຫັນລາຍລະອຽດຂອງຫ້ອງໃນບັນຊີໃນເວລາທີ່ມີຂໍ້ຄວາມໃຫມ່, ຍົກເວັ້ນສໍາລັບຄໍາແນະນໍາ. ການແຈ້ງເຕືອນຊົ່ວຄາວຈະ override ການຕັ້ງຄ່າການແຈ້ງເຕືອນ.",
   "Notifications_Preferences": "Notifications Preferences",
-  "Notifications_Sound_Volume": "ແຈ້ງການລະດັບສຽງ",
   "Notify_active_in_this_room": "ແຈ້ງໃຫ້ຜູ້ໃຊ້ທີ່ໃຊ້ວຽກຢູ່ໃນຫ້ອງນີ້",
   "Notify_all_in_this_room": "ແຈ້ງໃຫ້ທຸກຢູ່ໃນຫ້ອງນີ້",
   "Num_Agents": "ຕົວແທນ #",
diff --git a/packages/i18n/src/locales/lt.i18n.json b/packages/i18n/src/locales/lt.i18n.json
index 16a99624534e..9afd8e50612a 100644
--- a/packages/i18n/src/locales/lt.i18n.json
+++ b/packages/i18n/src/locales/lt.i18n.json
@@ -839,7 +839,6 @@
   "Custom_Emoji_Updated_Successfully": "Tinkintos piktogramos sėkmingai atnaujintos",
   "Custom_Fields": "Pasirinktiniai laukai",
   "Custom_oauth_helper": "Nustatydami OAuth teikėją turėsite pranešti atgalinio ryšio URL. Naudokite <pre>%s</pre>.",
-  "Custom_oauth_unique_name": "Tikslus unikalus vardas",
   "Custom_Script_Logged_In": "Tinkintas scenarijus prisijungusiems vartotojams",
   "Custom_Script_Logged_Out": "Pasirinktinis scenarijus išjungtiems vartotojams",
   "Custom_Scripts": "Tinkinti scenarijai",
@@ -1251,7 +1250,6 @@
   "Gaming": "Žaidimas",
   "General": "Generalinis direktorius",
   "github_no_public_email": "GitHub paskyroje neturite el. Pašto kaip viešas el. Pašto adresas",
-  "Give_a_unique_name_for_the_custom_oauth": "Pateikite unikalų pavadinimą pagal užsakymą",
   "strike": "streikuoti",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Pateikite paraiškai vardą. Tai matys jūsų vartotojai.",
   "Global": "Pasaulinis",
@@ -1831,7 +1829,6 @@
   "Newer_than_may_not_exceed_Older_than": "\"Naujesni nei\" negali viršyti \"Senesni nei\"",
   "No": "Nėra",
   "No_available_agents_to_transfer": "Negalima perkelti jokių agentų",
-  "No_channels_yet": "Dar nėra kanalo dalis",
   "No_direct_messages_yet": "Nėra tiesioginių žinučių.",
   "No_Encryption": "Nėra šifravimo",
   "No_groups_yet": "Jūs dar neturite privačių grupių.",
@@ -1863,7 +1860,6 @@
   "Notifications_Max_Room_Members_Description": "Maksimalus narių skaičius kambaryje, kai pranešimai apie visus pranešimus išjungiami. Vartotojai vis dar gali pakeisti kambario nustatymą, kad gautų visus pranešimus atskirai. (Išjungti 0)",
   "Notifications_Muted_Description": "Jei pasirinksite nutildyti viską, sąraše esančio kambario nematysite, kai yra naujų pranešimų, išskyrus pastabas. Pranešimai apie neaktyvumą peradresuoja pranešimų nustatymus.",
   "Notifications_Preferences": "Pranešimų nuostatos",
-  "Notifications_Sound_Volume": "Pranešimų garsas",
   "Notify_active_in_this_room": "Pranešti aktyviems naudotojams šiame kambaryje",
   "Notify_all_in_this_room": "Pranešti viską šiame kambaryje",
   "Num_Agents": "# Agentai",
diff --git a/packages/i18n/src/locales/lv.i18n.json b/packages/i18n/src/locales/lv.i18n.json
index f316ee4f18ff..a02e61a2547b 100644
--- a/packages/i18n/src/locales/lv.i18n.json
+++ b/packages/i18n/src/locales/lv.i18n.json
@@ -792,7 +792,6 @@
   "Custom_Emoji_Updated_Successfully": "Pielāgotais emoji ir veiksmīgi atjaunināts",
   "Custom_Fields": "Pielāgotie lauki",
   "Custom_oauth_helper": " Uzstādot OAuth nodrošinātāju, jums būs jāinformē Callback URL. Izmantojiet <pre>%s</pre>.",
-  "Custom_oauth_unique_name": "Pielāgots oauth unikāls nosaukums",
   "Custom_Script_Logged_In": "Pielāgots skripts lietotājiem kuri ir pierakstījušies",
   "Custom_Script_Logged_Out": "Pielāgots skripts lietotājiem kuri ir izrakstījušies",
   "Custom_Scripts": "Pielāgotie skripti",
@@ -1208,7 +1207,6 @@
   "Gaming": "Spēles",
   "General": "Sākums",
   "github_no_public_email": "Jums nav neviena e-pasta kā publiska e-pasta jūsu GitHub kontā",
-  "Give_a_unique_name_for_the_custom_oauth": "Piešķiriet unikālu nosaukumu pielāgotajam oauth",
   "strike": "streiks",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Piešķiriet lietotnei nosaukumu. To redzēs jūsu lietotāji.",
   "Global": "Globāls",
@@ -1789,7 +1787,6 @@
   "Newer_than_may_not_exceed_Older_than": "\"Jaunāki par\" nedrīkst pārsniegt \"Vecāki par\"",
   "No": "Nr.",
   "No_available_agents_to_transfer": "Nav pieejamu aģentu kam nosūtīt",
-  "No_channels_yet": "Jūs vēl neesat nevienā kanāla",
   "No_direct_messages_yet": "Nav ziņojumu.",
   "No_Encryption": "Nav šifrēšanas",
   "No_groups_yet": "Jums vēl nav privātu grupu.",
@@ -1821,7 +1818,6 @@
   "Notifications_Max_Room_Members_Description": "Maksimālais dalībnieku skaits istabā, kad paziņojumi par visiem ziņojumiem tiek atspējoti. Lietotāji joprojām var mainīt istabas iestatījumus, lai saņemtu visus paziņojumus individuāli. (0 lai atspējotu)",
   "Notifications_Muted_Description": "Ja izvēlaties izslēgt visu, istaba jūsu sarakstā netiks izcēlta kad būs jauni ziņojumi neredzēsiet, izņemot kad ir pieminējumi. Paziņojumu izslēgšana pārlabo paziņojumu iestatījumus.",
   "Notifications_Preferences": "Paziņojumu preferences",
-  "Notifications_Sound_Volume": "Paziņojumu skaļums",
   "Notify_active_in_this_room": "Paziņojot istabā esošajiem aktīvajiem lietotājiem",
   "Notify_all_in_this_room": "Paziņot visiem šajā istabā",
   "Num_Agents": "# Aģenti",
diff --git a/packages/i18n/src/locales/mn.i18n.json b/packages/i18n/src/locales/mn.i18n.json
index aad1cb2b8829..ead45a7ed408 100644
--- a/packages/i18n/src/locales/mn.i18n.json
+++ b/packages/i18n/src/locales/mn.i18n.json
@@ -783,7 +783,6 @@
   "Custom_Emoji_Updated_Successfully": "Гаалийн emoji амжилттай шинэчлэгдсэн",
   "Custom_Fields": "Гаалийн талбарууд",
   "Custom_oauth_helper": "OAuth-ийн үйлчилгээ үзүүлэгчийг тохируулахдаа Callback URL руу орно. <pre>%s</pre>ашиглана уу.",
-  "Custom_oauth_unique_name": "Custom oauth нэртэй",
   "Custom_Script_Logged_In": "Хэрэглэгчид рүү нэвтрэх тусгай тэмдэг",
   "Custom_Script_Logged_Out": "Хэрэглэгчид рүү илгээсэн тусгай скрипт",
   "Custom_Scripts": "Custom Scripts",
@@ -1192,7 +1191,6 @@
   "Gaming": "Тоглоом",
   "General": "Ерөнхий зүйл",
   "github_no_public_email": "Та өөрийн GitHub дансанд нийтийн имэйлээр ямар ч имэйл хүлээж авахгүй",
-  "Give_a_unique_name_for_the_custom_oauth": "Өөртөө зориулж өвөрмөц нэр өг",
   "strike": "ажил хаялт",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Өргөдлийг нэрийг өгнө үү. Энэ нь таны хэрэглэгчдэд харагдах болно.",
   "Global": "Глобал",
@@ -1771,7 +1769,6 @@
   "Newer_than_may_not_exceed_Older_than": "\"Дахин илүү\" нь \"Хуучин\"",
   "No": "Үгүй",
   "No_available_agents_to_transfer": "Шилжүүлэх агент байхгүй байна",
-  "No_channels_yet": "Та одоо ямар ч сувгийн нэг хэсэг биш",
   "No_direct_messages_yet": "Шууд зурвас байхгүй.",
   "No_Encryption": "Шифрлэлгүй байна",
   "No_groups_yet": "Танд ямар ч хувийн групп байхгүй байна.",
@@ -1803,7 +1800,6 @@
   "Notifications_Max_Room_Members_Description": "Бүх мессежийн мэдэгдлийн үед өрөөнд гишүүдийн хамгийн их тоо идэвхгүй болно. Хэрэглэгчид нь бүх мэдэгдлийг нэг нэгээр нь хүлээн авахын тулд өрөөнд тохируулан өөрчилж болно. (0-ыг идэвхгүй болгох)",
   "Notifications_Muted_Description": "Хэрэв та бүх зүйлийг дуугүй болгохыг сонговол өөр газраас гадна шинэ бичлэг байгаа тохиолдолд жагсаалтын тодруулгыг харахгүй. Мэдэгдэлийг зогсоох нь мэдэгдлийн тохиргоог дарна.",
   "Notifications_Preferences": "Мэдэгдэлийн сонголтууд",
-  "Notifications_Sound_Volume": "Мэдэгдэл дуут дууны хэмжээ",
   "Notify_active_in_this_room": "Энэ өрөөн доторх идэвхтэй хэрэглэгчдэд мэдэгдэнэ үү",
   "Notify_all_in_this_room": "Энэ өрөөнд байгаа бүх хүмүүст мэдэгдээрэй",
   "Num_Agents": "# Агентууд",
diff --git a/packages/i18n/src/locales/ms-MY.i18n.json b/packages/i18n/src/locales/ms-MY.i18n.json
index b62ff81cae20..7970c7121244 100644
--- a/packages/i18n/src/locales/ms-MY.i18n.json
+++ b/packages/i18n/src/locales/ms-MY.i18n.json
@@ -785,7 +785,6 @@
   "Custom_Emoji_Updated_Successfully": "Emoji tersuai berjaya dikemas kini",
   "Custom_Fields": "Fields Custom",
   "Custom_oauth_helper": "Apabila menyediakan Pembekal OAuth anda, anda akan mempunyai untuk memberitahu URL Callback. Penggunaan <pre> %s </pre> .",
-  "Custom_oauth_unique_name": "nama unik Custom OAuth",
   "Custom_Script_Logged_In": "Custom Script untuk log masuk pengguna",
   "Custom_Script_Logged_Out": "Custom Script untuk pengguna log keluar",
   "Custom_Scripts": "Skrip Tersuai",
@@ -1194,7 +1193,6 @@
   "Gaming": "Permainan",
   "General": "Umum",
   "github_no_public_email": "Anda tidak mempunyai sebarang e-mel umum pada akaun GitHub anda",
-  "Give_a_unique_name_for_the_custom_oauth": "Beri nama unik untuk OAuth adat",
   "strike": "mogok",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Beri permohonan itu nama. Ini akan dapat dilihat oleh pengguna-pengguna anda.",
   "Global": "global",
@@ -1783,7 +1781,6 @@
   "Newer_than_may_not_exceed_Older_than": "\"Lebih baru daripada\" mungkin tidak melebihi \"Lebih tua daripada\"",
   "No": "Tidak",
   "No_available_agents_to_transfer": "Tiada ejen yang tersedia untuk dipindahkan",
-  "No_channels_yet": "Anda bukan daripada mana-mana saluran lagi.",
   "No_direct_messages_yet": "Anda tidak memulakan sebarang perbualan lagi.",
   "No_Encryption": "Tiada penyulitan",
   "No_groups_yet": "Anda tidak mempunyai kumpulan persendirian lagi.",
@@ -1815,7 +1812,6 @@
   "Notifications_Max_Room_Members_Description": "Bilangan ahli dalam bilik apabila pemberitahuan untuk semua mesej menjadi kurang upaya. Pengguna masih boleh menukar tetapan bilik untuk menerima semua pemberitahuan secara individu. (0 untuk melumpuhkan)",
   "Notifications_Muted_Description": "Sekiranya anda memilih untuk meredamkan segala-galanya, anda tidak akan melihat kemuncak bilik dalam senarai apabila ada mesej baru, kecuali untuk menyebutnya. Mengalihkan pemberitahuan akan mengatasi tetapan pemberitahuan.",
   "Notifications_Preferences": "Pilihan Pemberitahuan",
-  "Notifications_Sound_Volume": "Kelantangan bunyi pemberitahuan",
   "Notify_active_in_this_room": "Beritahu pengguna aktif di dalam bilik ini",
   "Notify_all_in_this_room": "Memberitahu semua di dalam bilik ini",
   "Num_Agents": "# Agents",
diff --git a/packages/i18n/src/locales/nl.i18n.json b/packages/i18n/src/locales/nl.i18n.json
index 6e1944940d92..0dba59dc7418 100644
--- a/packages/i18n/src/locales/nl.i18n.json
+++ b/packages/i18n/src/locales/nl.i18n.json
@@ -1262,7 +1262,6 @@
   "Custom_Field_Not_Found": "Aangepast veld niet gevonden",
   "Custom_Integration": "Aangepaste integratie",
   "Custom_oauth_helper": "Bij het instellen van uw OAuth Provider, moet u een Callback URL geven. Gebruik <pre>%s</pre> .",
-  "Custom_oauth_unique_name": "Aangepaste unieke OAuth naam",
   "Custom_Script_Logged_In": "Aangepast script voor aangemelde gebruikers",
   "Custom_Script_Logged_In_Description": "Aangepast script dat ALTIJD en voor ELKE gebruiker die is ingelogd wordt uitgevoerd. (Bijv. telkens wanneer u de chat binnengaat en u bent ingelogd)",
   "Custom_Script_Logged_Out": "Aangepast script voor afgemelde gebruikers",
@@ -1983,7 +1982,6 @@
   "Forward_to_user": "Doorsturen naar gebruiker",
   "Forwarding": "Doorsturen",
   "Free": "Gratis",
-  "Free_Extension_Numbers": "Gratis extensienummers",
   "Free_Apps": "Gratis apps",
   "Frequently_Used": "Vaak gebruikt",
   "Friday": "Vrijdag",
@@ -2008,7 +2006,6 @@
   "get-server-info": "Serverinformatie ophalen",
   "github_no_public_email": "Je hebt geen e-mail als openbare e-mailadres in je GitHub-account",
   "github_HEAD": "HEAD",
-  "Give_a_unique_name_for_the_custom_oauth": "Geef een unieke naam voor de aangepaste OAuth",
   "strike": "doorstreept",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Geef de applicatie een naam. Dit zal worden gezien door de gebruikers.",
   "Global": "Globaal",
@@ -3041,7 +3038,6 @@
   "No_Canned_Responses_Yet": "Nog geen standaardantwoorden",
   "No_Canned_Responses_Yet-description": "Gebruik standaardantwoorden om snel en consistente antwoorden te geven op veelgestelde vragen.",
   "No_channels_in_team": "Geen kanalen in dit team",
-  "No_channels_yet": "U maakt nog geen deel uit van een kanaal.",
   "No_data_found": "Geen data gevonden",
   "No_direct_messages_yet": "Geen directe berichten.",
   "No_Discussions_found": "Geen discussies gevonden",
@@ -3097,7 +3093,6 @@
   "Notifications_Max_Room_Members_Description": "Max aantal leden in de ruimte wanneer meldingen voor alle berichten worden uitgeschakeld. Gebruikers kunnen nog steeds de instelling per kamer wijzigen om alle meldingen op individuele basis te ontvangen. (0 om uit te schakelen)",
   "Notifications_Muted_Description": "Als u ervoor kiest om alles te dempen, wordt de kamer niet gemarkeerd in de lijst als er nieuwe berichten zijn, behalve bij vermeldingen. Als u meldingen dempt, worden de instellingen voor meldingen overschreven.",
   "Notifications_Preferences": "Meldingsvoorkeuren",
-  "Notifications_Sound_Volume": "Meldingen geluidsvolume",
   "Notify_active_in_this_room": "Breng actieve gebruikers in deze kamer op de hoogte",
   "Notify_all_in_this_room": "Breng iedereen in deze kamer op de hoogte",
   "NPS_survey_enabled": "Schakel de NPS-enquête in",
diff --git a/packages/i18n/src/locales/nn.i18n.json b/packages/i18n/src/locales/nn.i18n.json
index c6c7502aefe1..27df7821fae0 100644
--- a/packages/i18n/src/locales/nn.i18n.json
+++ b/packages/i18n/src/locales/nn.i18n.json
@@ -55,7 +55,6 @@
   "Access_not_authorized": "Tilgang ikke autorisert",
   "Access_Token_URL": "Tilgangstoken URL",
   "Access_Your_Account": "Få tilgang til kontoen din",
-  "access_your_basic_information": "tilgang til din basis informasjon",
   "access-mailer": "Tilgang til Mailer-skjermen",
   "access-mailer_description": "Tillatelse til å sende masse e-post til alle brukere.",
   "access-marketplace": "Få tilgang til markedsplassen",
@@ -1346,7 +1345,6 @@
   "Custom_OAuth_has_been_added": "Egendefinert OAuth er lagt til",
   "Custom_OAuth_has_been_removed": "Tilpasset OAuth er fjernet",
   "Custom_oauth_helper": "Når du konfigurerer OAuth-leverandøren din, må du informere en tilbakekallingsadresse. Bruk <pre>%s</pre>.",
-  "Custom_oauth_unique_name": "Egendefinert oauth unikt navn",
   "Custom_roles": "Egendefinerte roller",
   "Custom_roles_upsell_add_custom_roles_workspace_description": "Egendefinerte roller lar deg angi tillatelser for personene i arbeidsområdet ditt. Angi alle rollene du trenger for å sikre at folk har et trygt miljø å jobbe i.",
   "Custom_Script_Logged_In": "Tilpasset script for logget inn brukere",
@@ -2093,7 +2091,6 @@
   "get-server-info_description": "Tillatelse til å hente serverinformasjon",
   "github_no_public_email": "Du har ingen e-post som offentlig e-post i din GitHub-konto",
   "github_HEAD": "HEAD",
-  "Give_a_unique_name_for_the_custom_oauth": "Gi et unikt navn til den egendefinerte oauth",
   "strike": "streik",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Gi søknaden et navn. Dette vil bli sett av brukerne.",
   "Global": "Global",
@@ -2992,7 +2989,6 @@
   "Nickname_Placeholder": "Skriv inn kallenavnet ditt...",
   "No": "Nei",
   "No_available_agents_to_transfer": "Ingen tilgjengelige agenter for å overføre",
-  "No_channels_yet": "Du er ikke en del av en kanal ennå",
   "No_chats_yet": "Ingen chatter ennå",
   "No_chats_yet_description": "Alle chattene dine vises her.",
   "No_calls_yet": "Ingen anrop enda",
@@ -3047,7 +3043,6 @@
   "Notifications_Max_Room_Members_Description": "Maks antall medlemmer i rommet når meldinger for alle meldinger blir deaktivert. Brukere kan fortsatt endre seg per rominnstilling for å motta alle varsler på individuell basis. (0 for å deaktivere)",
   "Notifications_Muted_Description": "Hvis du velger å dempe alt, vil du ikke se romlyset i listen når det er nye meldinger, med unntak av nevner. Muting notifikasjoner vil overstyre meldingsinnstillinger.",
   "Notifications_Preferences": "Meldingsinnstillinger",
-  "Notifications_Sound_Volume": "Meldinger lydvolum",
   "Notify_active_in_this_room": "Gi beskjed til aktive brukere i dette rommet",
   "Notify_all_in_this_room": "Gi beskjed om alt i dette rommet",
   "Now_Its_Visible_For_Everyone": "Nå er det synlig for alle",
diff --git a/packages/i18n/src/locales/no.i18n.json b/packages/i18n/src/locales/no.i18n.json
index d6140952fa62..a053a75912d3 100644
--- a/packages/i18n/src/locales/no.i18n.json
+++ b/packages/i18n/src/locales/no.i18n.json
@@ -55,7 +55,6 @@
   "Access_not_authorized": "Tilgang ikke autorisert",
   "Access_Token_URL": "Tilgangstoken URL",
   "Access_Your_Account": "Få tilgang til kontoen din",
-  "access_your_basic_information": "tilgang til din basis informasjon",
   "access-mailer": "Tilgang til Mailer-skjermen",
   "access-mailer_description": "Tillatelse til å sende masse e-post til alle brukere.",
   "access-marketplace": "Få tilgang til markedsplassen",
@@ -1346,7 +1345,6 @@
   "Custom_OAuth_has_been_added": "Egendefinert OAuth er lagt til",
   "Custom_OAuth_has_been_removed": "Tilpasset OAuth er fjernet",
   "Custom_oauth_helper": "Når du konfigurerer OAuth-leverandøren din, må du informere en tilbakekallingsadresse. Bruk <pre>%s</pre>.",
-  "Custom_oauth_unique_name": "Egendefinert oauth unikt navn",
   "Custom_roles": "Egendefinerte roller",
   "Custom_roles_upsell_add_custom_roles_workspace_description": "Egendefinerte roller lar deg angi tillatelser for personene i arbeidsområdet ditt. Angi alle rollene du trenger for å sikre at folk har et trygt miljø å jobbe i.",
   "Custom_Script_Logged_In": "Tilpasset script for logget inn brukere",
@@ -2093,7 +2091,6 @@
   "get-server-info_description": "Tillatelse til å hente serverinformasjon",
   "github_no_public_email": "Du har ingen e-post som offentlig e-post i din GitHub-konto",
   "github_HEAD": "HEAD",
-  "Give_a_unique_name_for_the_custom_oauth": "Gi et unikt navn til den egendefinerte oauth",
   "strike": "streik",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Gi søknaden et navn. Dette vil bli sett av brukerne.",
   "Global": "Global",
@@ -2992,7 +2989,6 @@
   "Nickname_Placeholder": "Skriv inn kallenavnet ditt...",
   "No": "Nei",
   "No_available_agents_to_transfer": "Ingen tilgjengelige agenter for å overføre",
-  "No_channels_yet": "Du er ikke en del av en kanal ennå",
   "No_chats_yet": "Ingen chatter ennå",
   "No_chats_yet_description": "Alle chattene dine vises her.",
   "No_calls_yet": "Ingen anrop enda",
@@ -3047,7 +3043,6 @@
   "Notifications_Max_Room_Members_Description": "Maks antall medlemmer i rommet når meldinger for alle meldinger blir deaktivert. Brukere kan fortsatt endre seg per rominnstilling for å motta alle varsler på individuell basis. (0 for å deaktivere)",
   "Notifications_Muted_Description": "Hvis du velger å dempe alt, vil du ikke se romlyset i listen når det er nye meldinger, med unntak av nevner. Muting notifikasjoner vil overstyre meldingsinnstillinger.",
   "Notifications_Preferences": "Meldingsinnstillinger",
-  "Notifications_Sound_Volume": "Meldinger lydvolum",
   "Notify_active_in_this_room": "Gi beskjed til aktive brukere i dette rommet",
   "Notify_all_in_this_room": "Gi beskjed om alt i dette rommet",
   "Now_Its_Visible_For_Everyone": "Nå er det synlig for alle",
diff --git a/packages/i18n/src/locales/pl.i18n.json b/packages/i18n/src/locales/pl.i18n.json
index 271394975e2d..3a58a1a4c4eb 100644
--- a/packages/i18n/src/locales/pl.i18n.json
+++ b/packages/i18n/src/locales/pl.i18n.json
@@ -63,7 +63,6 @@
   "Access_not_authorized": "Dostęp zabroniony",
   "Access_Token_URL": "URL dostępu przez token",
   "Access_Your_Account": "Dostęp do konta",
-  "access_your_basic_information": "dostęp do podstawowych informacji",
   "access-mailer": "Uzyskaj dostęp do ekranu Mailer",
   "access-mailer_description": "Uprawnienie do wysyłania masowych wiadomości e-mail do wszystkich użytkowników.",
   "access-marketplace": "Dostęp do marketplace",
@@ -1409,7 +1408,6 @@
   "Custom_OAuth_has_been_added": "Dodano niestandardowy OAuth",
   "Custom_OAuth_has_been_removed": "Niestandardowy OAuth został usunięty",
   "Custom_oauth_helper": "Podczas konfigurowania dostawcy OAuth należy podać adres URL wywołania zwrotnego. Użyj adresu <pre>%s</pre>.",
-  "Custom_oauth_unique_name": "Niestandardowa unikatowa nazwa oauth",
   "Custom_roles": "Role niestandardowe",
   "Custom_Script_Logged_In": "Skrypt niestandardowy dla zalogowanych użytkowników",
   "Custom_Script_Logged_In_Description": "Skrypt niestandardowy, który będzie uruchamiany ZAWSZE w przypadku KAŻDEGO zalogowanego użytkownika, np. (gdy użytkownik wejdzie na czat i jest zalogowany)",
@@ -2212,7 +2210,6 @@
   "Forward_to_user": "Przekaż do użytkownika",
   "Forwarding": "Przekierowanie",
   "Free": "Darmowy",
-  "Free_Extension_Numbers": "Bezpłatne numery wewnętrzne",
   "Free_Apps": "Bezpłatne aplikacje",
   "Frequently_Used": "Często używany",
   "Friday": "Piątek",
@@ -2240,7 +2237,6 @@
   "get-server-info_description": "Pozwolenie na uzyskanie informacji o serwerze",
   "github_no_public_email": "Nie posiadasz publicznego konta e-mail przypisanego do swojego profilu GitHub.",
   "github_HEAD": "HEAD",
-  "Give_a_unique_name_for_the_custom_oauth": "Podaj unikalną nazwę dla własnego OAuth",
   "strike": "przekreślenie",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Nadaj aplikacji nazwę. Będzie ona widoczna dla użytkowników.",
   "Global": "Światowy",
@@ -3352,7 +3348,6 @@
   "No_Canned_Responses_Yet": "Nie ma jeszcze predefiniowanych odpowiedzi",
   "No_Canned_Responses_Yet-description": "Użyj predefiniowanych odpowiedzi, aby zapewnić szybkie i spójne odpowiedzi na często zadawane pytania.",
   "No_channels_in_team": "Brak kanałów w tym zespole",
-  "No_channels_yet": "Nie jesteś członkiem żadnego kanału.",
   "No_data_found": "Nie znaleziono żadnych danych",
   "No_direct_messages_yet": "Nie rozpocząłeś jeszcze żadnej rozmowy.",
   "No_Discussions_found": "Nie znaleziono żadnych dyskusji",
@@ -3410,7 +3405,6 @@
   "Notifications_Max_Room_Members_Description": "Maksymalna liczba członków w pokoju, gdy powiadomienia o wszystkich wiadomościach zostaną wyłączone. Użytkownicy mogą nadal zmieniać ustawienia w zależności od pokoju, aby otrzymywać wszystkie powiadomienia indywidualnie. (0, aby wyłączyć)",
   "Notifications_Muted_Description": "Jeśli zdecydujesz się wyciszyć wszystko, nie zobaczysz podświetlenia pokoju na liście, gdy pojawią się nowe wiadomości, z wyjątkiem wzmianek. Powiadomienia o ignorowaniu zastąpią ustawienia powiadomień.",
   "Notifications_Preferences": "Preferencje powiadomień",
-  "Notifications_Sound_Volume": "Głośność powiadomienia ",
   "Notify_active_in_this_room": "Powiadom aktywnych użytkowników w tym pokoju",
   "Notify_all_in_this_room": "Powiadom wszystkich w pokoju",
   "NPS_survey_enabled": "Włącz badanie NPS",
diff --git a/packages/i18n/src/locales/pt-BR.i18n.json b/packages/i18n/src/locales/pt-BR.i18n.json
index d74478c2fd72..700115f75f30 100644
--- a/packages/i18n/src/locales/pt-BR.i18n.json
+++ b/packages/i18n/src/locales/pt-BR.i18n.json
@@ -655,6 +655,7 @@
   "Available": "Disponível",
   "Available_agents": "Agentes disponíveis",
   "Available_departments": "Departamentos disponíveis",
+  "Available_extensions": "Extensões disponíveis",
   "Avatar": "Avatar",
   "Avatar_changed_successfully": "Avatar alterado com sucesso",
   "Avatar_URL": "URL do avatar",
@@ -767,11 +768,16 @@
   "call-management_description": "Permissão para iniciar reunião",
   "Call_transfered_to__name__": "Chamada transferida para {{name}}",
   "Call_terminated": "Chamada encerrada",
+  "Call_ringer_volume": "Volume do toque de chamada",
+  "Call_ringer_volume_hint": "Para todas as notificações de chamadas recebidas",
   "Caller": "Autor da chamada",
   "Caller_Id": "ID do autor da chamada",
   "Cancel": "Cancelar",
   "Cancel_message_input": "Cancelar",
   "Canceled": "Cancelado",
+  "Cancel_subscription": "Cancelar assinatura",
+	"Cancel__planName__subscription": "Cancelar assinatura do plano {{planName}}",
+	"Cancel_subscription_message": "<strong>Este workspace será migrado para a versão Community, perdendo acesso gratuito a recursos premium.</strong><br/><br/> Ainda será possível usar o Rocket.Chat, mas sua equipe perderá acesso a integrações e notificações push ilimitadas, confirmação de leitura de mensagens <4>e outras funcionalidades</4>.",
   "Canned_Response_Created": "Resposta modelo criada",
   "Canned_Response_Updated": "Resposta modelo atualizada",
   "Canned_Response_Delete_Warning": "A exclusão de uma resposta modelo não pode ser desfeita.",
@@ -1316,7 +1322,6 @@
   "Custom_Field_Not_Found": "Campo personalizado não encontrado",
   "Custom_Integration": "Integração personalizada",
   "Custom_oauth_helper": "Ao configurar o seu provedor de OAuth, você terá que informar uma URL de Callback. Use <pre>%s</pre>.",
-  "Custom_oauth_unique_name": "Nome único para OAuth customizado",
   "Custom_Script_Logged_In": "Script personalizado para usuários conectados",
   "Custom_Script_Logged_In_Description": "Script personalizado que executará SEMPRE e para QUALQUER usuário que estiver conectado. Por exemplo (toda vez que você entrar no chat e estiver conectado)",
   "Custom_Script_Logged_Out": "Script personalizado para usuários não conectados",
@@ -1505,6 +1510,7 @@
   "Domains_allowed_to_embed_the_livechat_widget": "Lista de domínios separados por vírgulas permitidos a incorporar o widget do Livechat. Deixe em branco para permitir todos os domínios.",
   "Dont_ask_me_again": "Não perguntar de novo!",
   "Dont_ask_me_again_list": "Lista Não perguntar de novo",
+  "Dont_cancel": "Não cancelar",
   "Download": "Baixar",
   "Download_Destkop_App": "Baixar aplicativo para desktop",
   "Download_Info": "Baixar informações",
@@ -2065,7 +2071,6 @@
   "Forward_to_user": "Encaminhar ao usuário",
   "Forwarding": "Encaminhando",
   "Free": "Grátis",
-  "Free_Extension_Numbers": "Números de extensão livres",
   "Free_Apps": "Aplicativos gratuitos",
   "Frequently_Used": "Usados frequentemente",
   "Friday": "Sexta-feira",
@@ -2092,7 +2097,6 @@
   "get-server-info": "Obter informações do servidor",
   "github_no_public_email": "Você não possui um e-mail público em sua conta do GitHub",
   "github_HEAD": "HEAD",
-  "Give_a_unique_name_for_the_custom_oauth": "Dê um nome exclusivo para o oauth customizado",
   "strike": "tachado",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Dê um nome ao aplicativo. Isso será visto por seus usuários.",
   "Global": "Global",
@@ -2856,6 +2860,8 @@
   "Manager_added": "Gerente adicionado",
   "Manager_removed": "Gerente removido",
   "Managers": "Gerentes",
+  "Master_volume": "Volume principal",
+  "Master_volume_hint": "Controla o volume de todos os sons do seu workspace",
   "Management_Server": "Interface de gerenciamento Asterisk (AMI)",
   "Managing_assets": "Gerenciando recursos",
   "Managing_integrations": "Gerenciando integrações",
@@ -3153,7 +3159,6 @@
   "No_Canned_Responses_Yet": "Nenhuma resposta modelo ainda",
   "No_Canned_Responses_Yet-description": "Use respostas modelo para dar respostas rápidas e consistentes para perguntas frequentes.",
   "No_channels_in_team": "Nenhum canal nesta equipe",
-  "No_channels_yet": "Você não faz parte de nenhum canal ainda",
   "No_data_found": "Nenhum dado encontrado",
   "No_data_available_for_the_selected_period": "Não há dados disponíveis para o período selecionado",
   "No_direct_messages_yet": "Nenhuma mensagem direta.",
@@ -3211,7 +3216,8 @@
   "Notifications_Max_Room_Members_Description": "Número máximo de membros na sala quando as notificações para todas as mensagens são desabilitadas. Os usuários ainda podem alterar a configuração por sala para receber todas as notificações de forma individual. (0 para desativar)",
   "Notifications_Muted_Description": "Se você optar por silenciar tudo, você não verá a sala em destaque na lista quando houver novas mensagens, apenas quando houverem menções. Silenciar notificações vai substituir as configurações de notificações.",
   "Notifications_Preferences": "Preferências de notificações",
-  "Notifications_Sound_Volume": "Volume do som de notificações",
+  "Notification_volume": "Volume das notificações",
+  "Notification_volume_hint": "Para notificações de mensagens, independentemente de o workspace estar aberto ou não",
   "Notify_active_in_this_room": "Notificar usuários ativos nesta sala",
   "Notify_all_in_this_room": "Notificar todos nesta sala",
   "NPS_survey_enabled": "Habilita pesquisa NPS",
@@ -3584,9 +3590,11 @@
   "Remove_custom_oauth": "Remover oauth customizado",
   "Remove_from_room": "Remover da sala",
   "Remove_from_team": "Remover da equipe",
+  "Remove_email": "Remover endereço de e-mail",
   "Remove_extension": "Remover extensão",
   "Remove_last_character": "Remover último caracter",
   "Remove_last_admin": "Removendo último admin",
+  "Remove_phone": "Remover número de telefone",
   "Remove_someone_from_room": "Remover alguém da sala",
   "remove-closed-livechat-room": "Remover sala de omnichannel fechada",
   "remove-closed-livechat-rooms": "Remover todas as salas de omnichannel fechadas",
@@ -4706,6 +4714,8 @@
   "update-livechat-contact": "Atualizar contatos do omnichannel",
   "view-livechat-contact": "Ver contatos do omnichannel",
   "view-livechat-contact-history": "Ver histórico do contato do omnichannel",
+  "block-livechat-contact": "Bloquear canal do contato do omnichannel",
+  "unblock-livechat-contact": "Desbloquear canal do contato do omnichannel",
   "view-l-room_description": "Permissão para ver salas de omnichannel",
   "view-livechat-analytics": "Ver a análise do omnichannel",
   "onboarding.page.awaitingConfirmation.subtitle": "Enviamos um e-mail para {{emailAddress}} com um link de confirmação. Verifique se o código de segurança abaixo coincide com o do e-mail.",
@@ -5057,5 +5067,46 @@
   "cloud.RegisterWorkspace_Setup_Terms_Privacy": "Eu concordo com os <1>Termos e condições</1> e a <3>Política de privacidade</3>",
   "Enterprise": "Enterprise",
   "UpgradeToGetMore_engagement-dashboard_Title": "Analytics",
-  "UpgradeToGetMore_auditing_Title": "Auditoria de mensagem"
+  "UpgradeToGetMore_auditing_Title": "Auditoria de mensagem",
+  "close-blocked-room-comment": "Esse canal foi bloqueado",
+  "Add_email": "Adicionar endereço de e-mail",
+  "Add_phone": "Adicionar número de telefone",
+  "Blocked": "Bloqueado",
+  "Unverified": "Não verificado",
+  "error-unverified-contact": "Contacto não está verificado",
+  "Last_contacts": "Últimos contatos",
+  "Last_channel": "Último canal",
+  "Livechat_Block_Unknown_Contacts": "Bloquear contatos desconhecidos",
+  "Livechat_Block_Unknown_Contacts_Description": "Conversas de contatos não verificados não serão encaminhadas para filas de atendimento até que p contato seja verificado.",
+  "Livechat_Require_Contact_Verification": "Exigir verificação de contatos",
+  "Livechat_Require_Contact_Verification_Description": "Garantir a verificação de todas as conversas de um contato é recomendada, seguindo princípios da estratégia Zero-Trust. Conversas de contatos não verificados não estão aptas para atendimento mas serão visualizadas no Contact Center do Omnichannel.",
+  "No_channels_yet": "Nenhum canal até o momento.",
+  "No_history_yet": "Nenhum histórico até o momento.",
+  "No_history_yet_description": "Todo o histórico deste contato será visualizado aqui.",
+  "omnichannel_contacts_importer": "Contatos Omnichannel (*.csv)",
+  "This_page_will_be_deprecated_soon": "Está página será descontinuada em breve.",
+  "Contact_identification": "Identificação de contato",
+  "Manage_conversations_in_the_contact_center": "Gerencie conversas no <1>Contact Center</1>",
+  "Security_and_privacy": "Segurança e Privacidade",
+  "Block_channel": "Bloquear canal",
+  "Block_channel_description": "Você tem certeza que este canal deve ser bloqueado? Novas mensagens deste contato, neste canal, serão ignoradas por este Workspace.",
+  "Contact_unblocked": "Contato desbloqueado",
+  "Contact_blocked": "Contato bloqueado",
+  "Contact_has_been_updated": "Contato foi atualizado",
+  "Contact_has_been_created": "Contato foi criado",
+  "Advanced_contact_profile": "Perfil de contato avançado",
+  "Advanced_contact_profile_description": "Gerencie múltiplos endereços de e-mail e números de telefone de um único contato. habilitando histórico multicanal abrangente que mantém você bem informado e melhora a eficiência da comunicação.",
+  "Add_contact": "Adicionar contato",
+  "Add_to_contact_list_manually": "Adicione o contato na lista manualmente",
+  "Add_to_contact_and_enable_verification_description": "Adicione o contato na lista manualmente e <1>habilite a verificação</1> usando autenticação de múltiplos fatores.",
+  "Ask_enable_advanced_contact_profile": "Peça para o administrador do workspace habilitar perfil de contato avançado.",
+  "Contact_unknown": "Contato desconhecido",
+  "Review_contact": "Revisar contato",
+  "See_conflicts": "Ver conflitos",
+  "Conflicts_found": "Conflitos encontrados",
+  "Contact_history_is_preserved": "O histórico de conversas do contato é preservado.",
+  "different_values_found": "Valores diferentes encontrados",
+  "Recent": "Reciente",
+  "On_All_Contacts": "Em todos os contatos",
+  "Once": "Um vez"
 }
diff --git a/packages/i18n/src/locales/pt.i18n.json b/packages/i18n/src/locales/pt.i18n.json
index b5ade7fed5e7..342f1ca8291c 100644
--- a/packages/i18n/src/locales/pt.i18n.json
+++ b/packages/i18n/src/locales/pt.i18n.json
@@ -931,7 +931,6 @@
   "Custom_Emoji_Updated_Successfully": "Emoji personalizado atualizado com sucesso",
   "Custom_Fields": "Campos Personalizados",
   "Custom_oauth_helper": "Ao configurar o seu Provedor de OAuth, terá que informar uma URL de retorno de chamada. Use <pre>%s</pre>.",
-  "Custom_oauth_unique_name": "Nome exclusivo para oauth personalizado",
   "Custom_Script_Logged_In": "Script Personalizado para utiilzadores ligados",
   "Custom_Script_Logged_Out": "Script Personalizado para utiilzadores não ligados",
   "Custom_Scripts": "Scripts Personalizados",
@@ -1429,7 +1428,6 @@
   "Gaming": "Jogos",
   "General": "Geral",
   "github_no_public_email": "Não possui um e-mail público na sua conta GitHub",
-  "Give_a_unique_name_for_the_custom_oauth": "Dê um nome exclusivo para o oauth customizado",
   "strike": "tachado",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Dê um nome à aplicação. Isso será visto por seus utilizadores.",
   "Global": "Global",
@@ -2073,7 +2071,6 @@
   "Newer_than_may_not_exceed_Older_than": "\"Mais recente que\" não pode exceder \"Mais antigo que\"",
   "No": "Não",
   "No_available_agents_to_transfer": "Nenhum agente disponível para transferir",
-  "No_channels_yet": "Ainda não faz parte de nenhum canal.",
   "No_direct_messages_yet": "Ainda não iniciou nenhuma conversa.",
   "No_discussions_yet": "Ainda sem conversas",
   "No_Encryption": "Sem Criptografia",
@@ -2108,7 +2105,6 @@
   "Notifications_Max_Room_Members_Description": "Número máximo de membros na sala quando as notificações para todas as mensagens são desabilitadas. Os utilizadores ainda podem alterar a configuração por sala para receber todas as notificações de forma individual. (0 para desactivar)",
   "Notifications_Muted_Description": "Se optar por silenciar tudo, não verá a sala destacada na lista quando houver novas mensagens, exceto para menções. Silenciar as notificações irão substituir as configurações de notificações.",
   "Notifications_Preferences": "Preferências de Notificações",
-  "Notifications_Sound_Volume": "Som do som das notificações",
   "Notify_active_in_this_room": "Notificar utilizadores activos nesta sala",
   "Notify_all_in_this_room": "Notificar todos nesta sala",
   "Num_Agents": "# Agentes",
diff --git a/packages/i18n/src/locales/ro.i18n.json b/packages/i18n/src/locales/ro.i18n.json
index 41bb29ed8828..418d92307063 100644
--- a/packages/i18n/src/locales/ro.i18n.json
+++ b/packages/i18n/src/locales/ro.i18n.json
@@ -785,7 +785,6 @@
   "Custom_Emoji_Updated_Successfully": "Emoji personalizat sa actualizat cu succes",
   "Custom_Fields": "câmpuri customizate",
   "Custom_oauth_helper": "La configurarea furnizorul de OAuth, va trebui să apelați un URL de apel invers. Utilizați <pre>%s</pre>.",
-  "Custom_oauth_unique_name": "Nume unic OAuth personalizat",
   "Custom_Script_Logged_In": "Script-ul personalizat pentru utilizatorii autentificați",
   "Custom_Script_Logged_Out": "Script-ul personalizat pentru utilizatorii delogat",
   "Custom_Scripts": "Scripturi personalizate",
@@ -1195,7 +1194,6 @@
   "Gaming": "Gaming",
   "General": "General",
   "github_no_public_email": "Nu aveți nici un e-mail setat ca e-mail public în contul dumneavoastră GitHub",
-  "Give_a_unique_name_for_the_custom_oauth": "Alegeți un nume unic pentru OAuth personalizat",
   "strike": "tăiat",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Da aplicației un nume. Acest lucru va fi văzut de utilizatori.",
   "Global": "Global",
@@ -1775,7 +1773,6 @@
   "Newer_than_may_not_exceed_Older_than": "\"Mai nou decât\" nu poate depăși \"Mai vechi decât\"",
   "No": "Nu",
   "No_available_agents_to_transfer": "Nu există agenți disponibili pentru transfer",
-  "No_channels_yet": "Încă nu faceți parte din niciun canal.",
   "No_direct_messages_yet": "Încă nu ați inițiat nicio conversație.",
   "No_Encryption": "Nicio encriptare",
   "No_groups_yet": "Încă nu aveți niciun grup privat.",
@@ -1807,7 +1804,6 @@
   "Notifications_Max_Room_Members_Description": "Numărul maxim de membri în cameră, când notificările pentru toate mesajele sunt dezactivate. Utilizatorii pot schimba în continuare setările camerei pentru a primi toate notificările în mod individual. (0 pentru a dezactiva)",
   "Notifications_Muted_Description": "Dacă alegeți să dezactivați totul, nu veți vedea evidențiarea camerei în listă atunci când există mesaje noi, cu excepția mențiunilor. Setările pentru notificări vor suprascrie notificările.",
   "Notifications_Preferences": "Notificări Preferințe",
-  "Notifications_Sound_Volume": "Notificări volum sonor",
   "Notify_active_in_this_room": "Notificați utilizatorii activi din această cameră",
   "Notify_all_in_this_room": "Notifică toți utilizatorii din această cameră",
   "Num_Agents": "# Agenți",
diff --git a/packages/i18n/src/locales/ru.i18n.json b/packages/i18n/src/locales/ru.i18n.json
index 24dfdfe266c6..dd8b95fdb143 100644
--- a/packages/i18n/src/locales/ru.i18n.json
+++ b/packages/i18n/src/locales/ru.i18n.json
@@ -41,7 +41,6 @@
   "Access_not_authorized": "Неавторизованный доступ",
   "Access_Token_URL": "Access Token URL",
   "Access_Your_Account": "Доступ к вашей учетной записи",
-  "access_your_basic_information": "доступ к вашей основной информации",
   "access-mailer": "Доступ к странице мейлера",
   "access-mailer_description": "Разрешение рассылку email сообщений всем пользователям",
   "access-permissions": "Доступ к странице разрешений",
@@ -1376,7 +1375,6 @@
   "Custom_Field_Not_Found": "Пользовательское поле не найдено",
   "Custom_Integration": "Пользовательская интеграция",
   "Custom_oauth_helper": "Настраивая вашего поставщика OAuth, вам необходимо сообщить обратный URL-адрес. Используйте <pre>%s</pre> .",
-  "Custom_oauth_unique_name": "Имя OAuth сервиса",
   "Custom_Script_Logged_In": "Пользовательский скрипт для авторизованных пользователей",
   "Custom_Script_Logged_In_Description": "Пользовательский скрипт который будет запускаться ВСЕГДА и для КАЖДОГО авторизованного пользователя (например: когда Вы посещаете чат и вы авторизованны)",
   "Custom_Script_Logged_Out": "Пользовательский скрипт для неавторизованных пользователей",
@@ -2135,7 +2133,6 @@
   "Forward_to_user": "Отправить пользователю",
   "Forwarding": "Перенаправление",
   "Free": "Свободно",
-  "Free_Extension_Numbers": "Номера бесплатных расширений",
   "Free_Apps": "Бесплатные приложения",
   "Frequently_Used": "Часто используемые",
   "Friday": "Пятницу",
@@ -2160,7 +2157,6 @@
   "get-server-info": "Получить информацию о сервере",
   "github_no_public_email": "В вашей учетной записи GitHub отсутствует публично доступный адрес электронной почты",
   "github_HEAD": "HEAD",
-  "Give_a_unique_name_for_the_custom_oauth": "Выберите имя OAuth сервиса",
   "strike": "зачеркнутый",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Задайте приложению имя. Оно будет видно всем пользователям.",
   "Global": "Общие",
@@ -3204,7 +3200,6 @@
   "No_Canned_Responses_Yet": "Пока нет заготовленных ответов",
   "No_Canned_Responses_Yet-description": "Используйте заготовленные ответы для предоставления быстрых и последовательных ответов на часто задаваемые вопросы.",
   "No_channels_in_team": "У этой Команды нет чатов",
-  "No_channels_yet": "Вы пока не участвуете ни в одном канале.",
   "No_data_found": "Данные не найдены",
   "No_direct_messages_yet": "Нет личных переписок.",
   "No_Discussions_found": "Обсуждения не найдены",
@@ -3263,7 +3258,6 @@
   "Notifications_Max_Room_Members_Description": "Максимальное количество участников в комнате, превышение которого отключает все уведомления. Участники в индивидуальном порядке по-прежнему могут изменять настройки комнаты, чтобы получать все уведомления. 0 для отключения.",
   "Notifications_Muted_Description": "Если вы выберете заглушить всех, комната не будет подсвечиваться в списке при появлении новых сообщений за исключением упоминания о вас. Заглушение уведомлений переопределяет настройки уведомлений.",
   "Notifications_Preferences": "Настройки уведомлений",
-  "Notifications_Sound_Volume": "Громкость уведомления",
   "Notify_active_in_this_room": "Уведомить всех активных пользователей в этом чате",
   "Notify_all_in_this_room": "Уведомить всех в этом чате",
   "NPS_survey_enabled": "Включить опрос NPS",
diff --git a/packages/i18n/src/locales/se.i18n.json b/packages/i18n/src/locales/se.i18n.json
index c8bf5f9f123b..cec29a4655e7 100644
--- a/packages/i18n/src/locales/se.i18n.json
+++ b/packages/i18n/src/locales/se.i18n.json
@@ -61,7 +61,6 @@
   "Access_not_authorized": "Access not authorized",
   "Access_Token_URL": "Access Token URL",
   "Access_Your_Account": "Access Your Account",
-  "access_your_basic_information": "access your basic information",
   "access-mailer": "Access Mailer Screen",
   "access-mailer_description": "Permission to send mass email to all users.",
   "access-marketplace": "Access marketplace",
@@ -1520,7 +1519,6 @@
   "Custom_OAuth_has_been_added": "Custom OAuth has been added",
   "Custom_OAuth_has_been_removed": "Custom OAuth has been removed",
   "Custom_oauth_helper": "When setting up your OAuth Provider, you'll have to inform a Callback URL. Use <pre>%s</pre> .",
-  "Custom_oauth_unique_name": "Custom OAuth unique name",
   "Custom_roles": "Custom roles",
   "Custom_roles_upsell_add_custom_roles_workspace": "Add custom roles to suit your workspace",
   "Custom_roles_upsell_add_custom_roles_workspace_description": "Custom roles allow you to set permissions for the people in your workspace. Set all the roles you need to make sure people have a safe environment to work on.",
@@ -2512,7 +2510,6 @@
   "Forward_to_user": "Forward to user",
   "Forwarding": "Forwarding",
   "Free": "Free",
-  "Free_Extension_Numbers": "Free Extension Numbers",
   "Free_Apps": "Free Apps",
   "Frequently_Used": "Frequently Used",
   "Friday": "Friday",
@@ -2548,7 +2545,6 @@
   "get-server-info_description": "Permission to get server info",
   "github_no_public_email": "You don't have any email as public email in your GitHub account",
   "github_HEAD": "HEAD",
-  "Give_a_unique_name_for_the_custom_oauth": "Give a unique name for the custom OAuth",
   "strike": "strike",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Give the application a name. This will be seen by your users.",
   "Global": "Global",
@@ -3885,7 +3881,6 @@
   "No_channels_in_team": "No Channels on this Team",
   "No_agents_yet": "No agents yet",
   "No_agents_yet_description": "Add agents to engage with your audience and provide optimized customer service.",
-  "No_channels_yet": "You aren't part of any channels yet",
   "No_chats_yet": "No chats yet",
   "No_chats_yet_description": "All your chats will appear here.",
   "No_calls_yet": "No calls yet",
@@ -3975,7 +3970,6 @@
   "Notifications_Max_Room_Members_Description": "Max number of members in room when notifications for all messages gets disabled. Users can still change per room setting to receive all notifications on an individual basis. (0 to disable)",
   "Notifications_Muted_Description": "If you choose to mute everything, you won't see the room highlight in the list when there are new messages, except for mentions. Muting notifications will override notifications settings.",
   "Notifications_Preferences": "Notifications Preferences",
-  "Notifications_Sound_Volume": "Notifications sound volume",
   "Notify_active_in_this_room": "Notify active users in this room",
   "Notify_all_in_this_room": "Notify all in this room",
   "Notify_Calendar_Events": "Notify calendar events",
diff --git a/packages/i18n/src/locales/sk-SK.i18n.json b/packages/i18n/src/locales/sk-SK.i18n.json
index fe53212bc8e0..83d2e8f0991e 100644
--- a/packages/i18n/src/locales/sk-SK.i18n.json
+++ b/packages/i18n/src/locales/sk-SK.i18n.json
@@ -790,7 +790,6 @@
   "Custom_Emoji_Updated_Successfully": "Vlastné Emoji bolo úspešne aktualizované",
   "Custom_Fields": "Vlastné polia",
   "Custom_oauth_helper": "Pri nastavovaní poskytovateľa OAuth budete musieť informovať URL spätného volania. Použite <pre>%s</pre>.",
-  "Custom_oauth_unique_name": "Vlastný jedinečný názov OAuth",
   "Custom_Script_Logged_In": "Vlastný skript pre prihlásených používateľov",
   "Custom_Script_Logged_Out": "Vlastný skript pre odhlásených používateľov",
   "Custom_Scripts": "Vlastné skripty",
@@ -1206,7 +1205,6 @@
   "Gaming": "Gaming",
   "General": "všeobecný",
   "github_no_public_email": "V účte GitHub nemáte žiadny e-mail ako verejnú e-mailovú správu",
-  "Give_a_unique_name_for_the_custom_oauth": "Zadajte jedinečný názov pre vlastnú oauth",
   "strike": "štrajk",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Zadajte aplikáciu názov. To uvidia vaši používatelia.",
   "Global": "globálnej",
@@ -1785,7 +1783,6 @@
   "Newer_than_may_not_exceed_Older_than": "\"Novšie ako\" nesmie prekročiť hodnotu \"Staršie ako\"",
   "No": "Žiadny",
   "No_available_agents_to_transfer": "Na prenos nie sú k dispozícii žiadne agenty",
-  "No_channels_yet": "Ešte nie ste súčasťou žiadneho kanálu",
   "No_direct_messages_yet": "Žiadne priame správy.",
   "No_Encryption": "Žiadne šifrovanie",
   "No_groups_yet": "Nemáte ešte žiadne súkromné ​​skupiny.",
@@ -1817,7 +1814,6 @@
   "Notifications_Max_Room_Members_Description": "Maximálny počet členov v miestnosti, kedy sú upozornenia na všetky správy zakázané. Užívatelia sa môžu stále meniť za každé nastavenie miestnosti, aby dostali všetky upozornenia na individuálnom základe. (0 pre vypnutie)",
   "Notifications_Muted_Description": "Ak sa rozhodnete stlmiť všetko, nezobrazí sa zvýraznenie miestnosti v zozname, ak existujú nové správy, s výnimkou zmien. Zrušenie upozornení zruší nastavenia upozornení.",
   "Notifications_Preferences": "Predvoľby upozornení",
-  "Notifications_Sound_Volume": "Hlasitosť zvuku upozornení",
   "Notify_active_in_this_room": "Upozornenie aktívnych používateľov v tejto miestnosti",
   "Notify_all_in_this_room": "Oznámte všetkým v tejto izbe",
   "Num_Agents": "# Agenti",
diff --git a/packages/i18n/src/locales/sl-SI.i18n.json b/packages/i18n/src/locales/sl-SI.i18n.json
index 46710fdd45fa..96ebd4c74c5d 100644
--- a/packages/i18n/src/locales/sl-SI.i18n.json
+++ b/packages/i18n/src/locales/sl-SI.i18n.json
@@ -781,7 +781,6 @@
   "Custom_Emoji_Updated_Successfully": "Čustveni simboli po meri so bili uspešno posodobljeni",
   "Custom_Fields": "Polja po meri",
   "Custom_oauth_helper": "Pri nastavljanju ponudnika OAuth boste morali obvestiti URL povratnega klica. Uporabite <pre>%s</pre>.",
-  "Custom_oauth_unique_name": "Unikatno ime oauth po meri",
   "Custom_Script_Logged_In": "Skript po meri za prijavljene uporabnike",
   "Custom_Script_Logged_Out": "Skript po meri za odjavljene uporabnike",
   "Custom_Scripts": "Skripti po meri",
@@ -1187,7 +1186,6 @@
   "Gaming": "Igre",
   "General": "Splošno",
   "github_no_public_email": "V svojem računu GitHub nimate nobenega e-poštnega naslova kot javnega.",
-  "Give_a_unique_name_for_the_custom_oauth": "Navedite enolično ime za OAuth po meri",
   "strike": "Prečrtano",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Poimenujte aplikacijo. To bodo videli vaši uporabniki.",
   "Global": "Globalno",
@@ -1765,7 +1763,6 @@
   "Newer_than_may_not_exceed_Older_than": "»Novejše od« ne sme preseči »Starejše od«,",
   "No": "Ne",
   "No_available_agents_to_transfer": "Agenti za prenos niso na voljo ",
-  "No_channels_yet": "Niste še vključeni v noben kanal",
   "No_direct_messages_yet": "Nič neposrednih sporočil",
   "No_Encryption": "Ni šifriranja",
   "No_groups_yet": "Zasebnih skupin še niste ustvarili.",
@@ -1797,7 +1794,6 @@
   "Notifications_Max_Room_Members_Description": "Največje število uporabnikov v sobi, ko se obvestila za vsa sporočila onemogočijo. Uporabnik lahko še vedno spremeni nastavitve posamezne sobe, da prejme vsa obvestila posamezno. (0 za onemogoči)",
   "Notifications_Muted_Description": "Če utišate vse, na seznamu ob novih sporočilih ne boste videli zanimivosti sobe, zgolj omembe. Če utišate obvestila, bodo nastavitve obvestil začasno neupoštevane. ",
   "Notifications_Preferences": "Nastavitve obvestil",
-  "Notifications_Sound_Volume": "Glasnost zvoka obvestil",
   "Notify_active_in_this_room": "Obvesti aktivne uporabnike v tej sobi",
   "Notify_all_in_this_room": "Obvesti vse v tej sobi",
   "Num_Agents": "# agenti",
diff --git a/packages/i18n/src/locales/sq.i18n.json b/packages/i18n/src/locales/sq.i18n.json
index 342ea7e9ea31..13eee087d88a 100644
--- a/packages/i18n/src/locales/sq.i18n.json
+++ b/packages/i18n/src/locales/sq.i18n.json
@@ -785,7 +785,6 @@
   "Custom_Emoji_Updated_Successfully": "Personalizimi i emoji u përditësua me sukses",
   "Custom_Fields": "Fushat Custom",
   "Custom_oauth_helper": "Kur ngritjen Provider tuaj OAuth, ju do të keni për të informuar një URL callback. përdorim <pre> %s </pre> .",
-  "Custom_oauth_unique_name": "Emri Custom OAuth unike",
   "Custom_Script_Logged_In": "Custom Script për përdoruesit e regjistruar në",
   "Custom_Script_Logged_Out": "Custom Script për përdoruesit e regjistruar jashtë",
   "Custom_Scripts": "Scripts Custom",
@@ -1196,7 +1195,6 @@
   "Gaming": "kumar",
   "General": "i përgjithshëm",
   "github_no_public_email": "Ju nuk keni ndonjë email si email publik në llogarinë tuaj GitHub",
-  "Give_a_unique_name_for_the_custom_oauth": "Jepni një emër të veçantë për OAuth porosi",
   "strike": "grevë",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Jepni aplikacionin një emër. Kjo do të shihet nga përdoruesit e juaj.",
   "Global": "global",
@@ -1775,7 +1773,6 @@
   "Newer_than_may_not_exceed_Older_than": "\"Më i ri se\" nuk mund të kalojë \"Më i vjetër se\"",
   "No": "jo",
   "No_available_agents_to_transfer": "Nuk ka agjentë në dispozicion për të transferuar",
-  "No_channels_yet": "Ju nuk jeni ende pjesë e ndonjë kanali.",
   "No_direct_messages_yet": "Ju nuk keni filluar ende asnjë bisedë.",
   "No_Encryption": "No Encryption",
   "No_groups_yet": "Nuk keni ende asnjë grup privat.",
@@ -1807,7 +1804,6 @@
   "Notifications_Max_Room_Members_Description": "Numri maksimal i anëtarëve në dhomë kur njoftimet për të gjitha mesazhet çaktivizohen. Përdoruesit mund të ndryshojnë ende për vendosjen e dhomës për të marrë të gjitha njoftimet në baza individuale. (0 për të çaktivizuar)",
   "Notifications_Muted_Description": "Nëse vendosni të mute gjithçka, nuk do të shihni dhomën e nxjerr në pah në listë kur ka mesazhe të reja, me përjashtim të përmendjeve. Njoftimet e modifikimit do të anashkalojnë cilësimet e njoftimeve.",
   "Notifications_Preferences": "Preferencat e njoftimeve",
-  "Notifications_Sound_Volume": "Vëllimi i tingullit të njoftimeve",
   "Notify_active_in_this_room": "Lajmëroni përdoruesit aktivë në këtë dhomë",
   "Notify_all_in_this_room": "Njoftojë të gjithë në këtë dhomë",
   "Num_Agents": "# Agents",
diff --git a/packages/i18n/src/locales/sr.i18n.json b/packages/i18n/src/locales/sr.i18n.json
index a483c6be75f5..79ee67501920 100644
--- a/packages/i18n/src/locales/sr.i18n.json
+++ b/packages/i18n/src/locales/sr.i18n.json
@@ -1598,7 +1598,6 @@
   "Newer_than_may_not_exceed_Older_than": "\"Новије од\" можда не прелази \"Старије од\"",
   "No": "Ne",
   "No_available_agents_to_transfer": "Нема расположивих агената за пренос",
-  "No_channels_yet": "Још увек нисте члан ниједног канала",
   "No_direct_messages_yet": "Нема директних порука.",
   "No_Discussions_found": "Нису пронађене дискусије",
   "No_Encryption": "Без шифровања",
@@ -1629,7 +1628,6 @@
   "Notifications_Max_Room_Members_Description": "Максималан број чланова у соби када се обавештења за све поруке онемогућавају. Корисници могу и даље мењати по подешавању собе како би примили сва обавјештења на индивидуалној основи. (0 за онемогућавање)",
   "Notifications_Muted_Description": "Ако одлучите да све искључите, нећете видети собу означити на листи када постоје нове поруке, осим за помињања. Мутинг обавештења ће преклапати подешавања обавештења.",
   "Notifications_Preferences": "Подешавања обавештења",
-  "Notifications_Sound_Volume": "Обим звука обавјештења",
   "Notify_active_in_this_room": "Обавестите активне кориснике у овој соби",
   "Notify_all_in_this_room": "Обавештава све у овој соби",
   "Num_Agents": "# Агенти",
diff --git a/packages/i18n/src/locales/sv.i18n.json b/packages/i18n/src/locales/sv.i18n.json
index 5875146d3f62..5bcb4e9af48f 100644
--- a/packages/i18n/src/locales/sv.i18n.json
+++ b/packages/i18n/src/locales/sv.i18n.json
@@ -41,7 +41,6 @@
   "Access_not_authorized": "Tillträde är ej tillåtet",
   "Access_Token_URL": "Tillgång till Token URL",
   "Access_Your_Account": "Öppna kontot",
-  "access_your_basic_information": "få tillgång till din grundläggande information",
   "access-mailer": "Öppna Mailer-skärmen",
   "access-mailer_description": "Behörighet att skicka massmejl till alla användare.",
   "access-permissions": "Öppna behörighetsskärmen",
@@ -1408,7 +1407,6 @@
   "Custom_OAuth_has_been_added": "Anpassad OAuth har lagts till",
   "Custom_OAuth_has_been_removed": "Anpassad OAuth har tagits bort",
   "Custom_oauth_helper": "När du ställer in din OAuth-provider, måste du ange en callback-webbadress. Använd <pre> %s </pre> .",
-  "Custom_oauth_unique_name": "Anpassat unikt OAuth-namn",
   "Custom_roles": "Anpassade roller",
   "Custom_roles_upsell_add_custom_roles_workspace": "Lägg till anpassade roller för att passa din arbetsyta",
   "Custom_roles_upsell_add_custom_roles_workspace_description": "Med anpassade roller kan du ange behörigheter för personerna i din arbetsyta. Ställ in alla roller du behöver för att se till att personerna har en säker arbetsmiljö att arbeta i.",
@@ -2267,7 +2265,6 @@
   "Forward_to_user": "Vidarebefodra till användare",
   "Forwarding": "Vidarebefordran",
   "Free": "Kostnadsfritt",
-  "Free_Extension_Numbers": "Kostnadsfria anknytningsnummer",
   "Free_Apps": "Kostnadsfria appar",
   "Frequently_Used": "Ofta använd",
   "Friday": "Fredag",
@@ -2295,7 +2292,6 @@
   "get-server-info_description": "Behörighet att hämta serverinformation",
   "github_no_public_email": "Du har inte någon publik epostadress i ditt GitHub-konto",
   "github_HEAD": "HEAD",
-  "Give_a_unique_name_for_the_custom_oauth": "Ge ett unikt namn för den anpassade OAuth",
   "strike": "genomstruken",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Ge applikationen ett namn. Detta kommer att ses av dina användare.",
   "Global": "Global",
@@ -3479,7 +3475,6 @@
   "No_Canned_Responses_Yet": "Inga standardsvar ännu",
   "No_Canned_Responses_Yet-description": "Med standardsvar kan du ge snabba och konsekventa svar på vanliga frågor.",
   "No_channels_in_team": "Inga kanaler i teamet",
-  "No_channels_yet": "Du är inte med i någon kanal ännu.",
   "No_chats_yet": "Inga chattar hittades",
   "No_chats_yet_description": "Alla chattar kommer dyka upp här",
   "No_calls_yet": "Inga samtal hittades",
@@ -3547,7 +3542,6 @@
   "Notifications_Max_Room_Members_Description": "Max antal medlemmar i rummet när notiser för alla meddelanden blir inaktiverade. Användare kan ändå ändra per rumsinställning för att få alla notiser individuellt. (0 för att inaktivera)",
   "Notifications_Muted_Description": "Om du väljer att stänga av allt kommer du inte att se rummets höjdpunkt i listan när det finns nya meddelanden, med undantag för omnämnanden. Att stänga av notifieringar kommer att åsidosätta meddelandeinställningar.",
   "Notifications_Preferences": "Notisinställningar",
-  "Notifications_Sound_Volume": "Ljudvolym för meddelanden",
   "Notify_active_in_this_room": "Meddela aktiva användare i det här rummet",
   "Notify_all_in_this_room": "Meddela alla i det här rummet",
   "Now_Its_Visible_For_Everyone": "Nu är den synlig för alla",
diff --git a/packages/i18n/src/locales/ta-IN.i18n.json b/packages/i18n/src/locales/ta-IN.i18n.json
index 83f1d0726a67..3cae91078be8 100644
--- a/packages/i18n/src/locales/ta-IN.i18n.json
+++ b/packages/i18n/src/locales/ta-IN.i18n.json
@@ -785,7 +785,6 @@
   "Custom_Emoji_Updated_Successfully": "தனிப்பயன் ஈமோஜி வெற்றிகரமாக புதுப்பிக்கப்பட்டது",
   "Custom_Fields": "விருப்ப புலங்கள்",
   "Custom_oauth_helper": "உங்கள் அறிந்திருந்தால் வழங்குநர் அமைக்க போது, நீங்கள் ஒரு கோரிக்கை URL ஐ தெரிவிக்க வேண்டும். பயன்பாட்டு <pre> % கள் </pre> .",
-  "Custom_oauth_unique_name": "விருப்ப OAuth தனிப்பட்ட பெயர்",
   "Custom_Script_Logged_In": "வழக்கமான ஸ்கிரிப்ட் பயனர்கள் வெளியேற்ற",
   "Custom_Script_Logged_Out": "வழக்கமான ஸ்கிரிப்ட் வெளியேற்றப்படுவீர்கள் பயனர்கள்",
   "Custom_Scripts": "விருப்ப உரைகள்",
@@ -1196,7 +1195,6 @@
   "Gaming": "கேமிங்",
   "General": "பொது",
   "github_no_public_email": "நீங்கள் உங்கள் மகிழ்ச்சியா கணக்கில் பொது மின்னஞ்சல் என எந்த மின்னஞ்சல் இல்லை",
-  "Give_a_unique_name_for_the_custom_oauth": "விருப்ப OAuth ஒரு தனிப்பட்ட பெயரை கொடுங்கள்",
   "strike": "வேலைநிறுத்தம்",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "விண்ணப்ப ஒரு பெயர் கொடுக்க. இது உங்கள் பயனர் பார்க்க வேண்டும்.",
   "Global": "குளோபல்",
@@ -1776,7 +1774,6 @@
   "Newer_than_may_not_exceed_Older_than": "\"விடக் குறைந்தது\" \"பழையது\"",
   "No": "இல்லை",
   "No_available_agents_to_transfer": "மாற்றுவதற்கு கிடைக்கக்கூடிய முகவர்கள் இல்லை",
-  "No_channels_yet": "நீங்கள் இதுவரை எந்த பொது குழுவிலும் இல்லை.",
   "No_direct_messages_yet": "நீங்கள் இதுவரை எந்த உரையாடலும் ஆரம்பிக்கவே இல்லை.",
   "No_Encryption": "மறைகுறியாக்கப்படவில்லை",
   "No_groups_yet": "நீங்கள் இதுவரை எந்த தனியார் குழுவிலும் இல்லை.",
@@ -1808,7 +1805,6 @@
   "Notifications_Max_Room_Members_Description": "அனைத்து செய்திகளுக்கான அறிவிப்புகளும் முடக்கப்பட்டால் அறையில் உறுப்பினர்களின் அதிகபட்ச எண்ணிக்கை. ஒரு தனிப்பட்ட அடிப்படையில் அனைத்து அறிவிப்புகளையும் பெறுவதற்கு ஒரு அறை அமைப்பை பயனர்கள் மாற்ற முடியும். (முடக்க 0)",
   "Notifications_Muted_Description": "எல்லாவற்றையும் முடக்க நீங்கள் தேர்வு செய்தால், புதிய செய்திகளைக் குறிப்பிடுகையில் தவிர, பட்டியலிலுள்ள அறையில் சிறப்பம்சமாக நீங்கள் காண்பீர்கள். அறிவிப்புகளை முடக்குதல் அறிவிப்பு அமைப்புகளை மேல்தோன்றும்.",
   "Notifications_Preferences": "அறிவிப்பு விருப்பங்கள்",
-  "Notifications_Sound_Volume": "அறிவிப்புகள் ஒலி தொகுதி",
   "Notify_active_in_this_room": "இந்த அறையில் செயலில் உள்ள பயனர்களைத் தெரிவிக்கவும்",
   "Notify_all_in_this_room": "இந்த அறையில் தெரிவி",
   "Num_Agents": "# முகவர்கள்",
diff --git a/packages/i18n/src/locales/th-TH.i18n.json b/packages/i18n/src/locales/th-TH.i18n.json
index 0f5c7de06fe0..db864b2a0ebd 100644
--- a/packages/i18n/src/locales/th-TH.i18n.json
+++ b/packages/i18n/src/locales/th-TH.i18n.json
@@ -783,7 +783,6 @@
   "Custom_Emoji_Updated_Successfully": "กำหนดค่า emoji แบบกำหนดเองสำเร็จแล้ว",
   "Custom_Fields": "ฟิลด์ที่กำหนดเอง",
   "Custom_oauth_helper": "เมื่อตั้งค่าผู้ให้บริการ OAuth คุณจะต้องแจ้ง URL โทรกลับ ใช้ <pre>%s</pre>",
-  "Custom_oauth_unique_name": "กำหนดชื่อที่ไม่ซ้ำกัน",
   "Custom_Script_Logged_In": "สคริปต์ที่กำหนดเองสำหรับผู้ใช้ที่ล็อกอิน",
   "Custom_Script_Logged_Out": "สคริปต์ที่กำหนดเองสำหรับผู้ใช้ที่บันทึกไว้",
   "Custom_Scripts": "สคริปต์ที่กำหนดเอง",
@@ -1192,7 +1191,6 @@
   "Gaming": "การเล่นเกม",
   "General": "ทั่วไป",
   "github_no_public_email": "คุณไม่มีอีเมลเป็นอีเมลสาธารณะในบัญชี GitHub ของคุณ",
-  "Give_a_unique_name_for_the_custom_oauth": "ให้ชื่อที่ไม่ซ้ำกันสำหรับ oauth ที่กำหนดเอง",
   "strike": "การนัดหยุดงาน",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "ให้ชื่อแอ็พพลิเคชัน ผู้ใช้ของคุณจะเห็นข้อมูลนี้",
   "Global": "ทั่วโลก",
@@ -1769,7 +1767,6 @@
   "Newer_than_may_not_exceed_Older_than": "\"ใหม่กว่า\" ต้องไม่เกิน \"เก่ากว่า\"",
   "No": "ไม่",
   "No_available_agents_to_transfer": "ไม่มีตัวแทนที่จะโอน",
-  "No_channels_yet": "คุณยังไม่ได้เป็นส่วนหนึ่งของช่องใด ๆ",
   "No_direct_messages_yet": "ไม่มีข้อความตรง",
   "No_Encryption": "ไม่มีการเข้ารหัส",
   "No_groups_yet": "คุณยังไม่มีกลุ่มส่วนตัว",
@@ -1801,7 +1798,6 @@
   "Notifications_Max_Room_Members_Description": "จำนวนสมาชิกในห้องเมื่อการแจ้งเตือนสำหรับข้อความทั้งหมดถูกปิดใช้งาน ผู้ใช้ยังคงสามารถเปลี่ยนการตั้งค่าห้องต่อเพื่อรับการแจ้งเตือนทั้งหมดตามแต่ละบุคคล (0 เพื่อปิดการใช้งาน)",
   "Notifications_Muted_Description": "หากคุณเลือกที่จะปิดเสียงทุกอย่างคุณจะไม่เห็นไฮไลต์ในห้องในรายการเมื่อมีข้อความใหม่ยกเว้นการพูดถึง การแจ้งเตือนการแจ้งเตือนจะแทนที่การตั้งค่าการแจ้งเตือน",
   "Notifications_Preferences": "การแจ้งเตือน",
-  "Notifications_Sound_Volume": "แจ้งระดับเสียง",
   "Notify_active_in_this_room": "แจ้งผู้ใช้ที่ใช้งานอยู่ในห้องนี้",
   "Notify_all_in_this_room": "แจ้งให้ทราบในห้องนี้ทั้งหมด",
   "Num_Agents": "# Agents",
diff --git a/packages/i18n/src/locales/tr.i18n.json b/packages/i18n/src/locales/tr.i18n.json
index dd27825eca25..61c0b8f4d0c1 100644
--- a/packages/i18n/src/locales/tr.i18n.json
+++ b/packages/i18n/src/locales/tr.i18n.json
@@ -925,7 +925,6 @@
   "Custom_Emoji_Updated_Successfully": "Özel emoji başarıyla güncellendi",
   "Custom_Fields": "Özel Alanlar",
   "Custom_oauth_helper": "OAuth sağlayıcısı kurarken, bir geri bildirim URL bildirmek gerekir.  <pre> %s </pre> kullan.",
-  "Custom_oauth_unique_name": "Özel oauth benzersiz ad",
   "Custom_Script_Logged_In": "Özel Senaryo kullanıcılar giriş için",
   "Custom_Script_Logged_Out": "Özel Senaryo çıkış yapmış kullanıcılar için",
   "Custom_Scripts": "Özel Komut Dosyaları",
@@ -1451,7 +1450,6 @@
   "General": "Genel",
   "Generate_New_Link": "Yeni Bağlantı Oluştur",
   "github_no_public_email": "Sen GitHub hesabınızda kamu e-posta olarak herhangi bir e-posta yok",
-  "Give_a_unique_name_for_the_custom_oauth": "Özel OAuth için benzersiz bir ad verin",
   "strike": "üstü çizili",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Uygulamayı bir ad verin. Bu kullanıcılar tarafından görülecektir.",
   "Global": "Genel",
@@ -2125,7 +2123,6 @@
   "Newer_than_may_not_exceed_Older_than": "\"Daha yeni\", \"Daha eski\"den yeni olamaz",
   "No": "Hayır",
   "No_available_agents_to_transfer": "Aktarılacak ajanlar yok",
-  "No_channels_yet": "Henüz hiç bir kanala bağlı değilsiniz.",
   "No_direct_messages_yet": "Doğrudan İleti Yok.",
   "No_discussions_yet": "Henüz tartışma yok",
   "No_Encryption": "Şifreleme yok",
@@ -2162,7 +2159,6 @@
   "Notifications_Max_Room_Members_Description": "Tüm mesajlar için bildirimler devre dışı bırakıldığında odanın azami üye sayısı. Kullanıcılar, tüm bildirimleri tek tek almak üzere oda başına ayarlarını değiştirebilir. (Devre dışı bırakmak için 0)",
   "Notifications_Muted_Description": "Her şeyi sessize almayı seçerseniz, bahsetmeler dışında yeni ileti olduğunda listedeki oda vurgulamasını görmezsiniz. Bildirimleri sessize almak, bildirim ayarlarını ezecektir.",
   "Notifications_Preferences": "Bildirim Tercihleri",
-  "Notifications_Sound_Volume": "Bildirimlerin ses seviyesi",
   "Notify_active_in_this_room": "Bu odadaki etkin kullanıcıları bilgilendir",
   "Notify_all_in_this_room": "Bu odadaki tüm bildirimleri göster",
   "Num_Agents": "# Temsilciler",
diff --git a/packages/i18n/src/locales/ug.i18n.json b/packages/i18n/src/locales/ug.i18n.json
index c177d0dfa065..801559fca23e 100644
--- a/packages/i18n/src/locales/ug.i18n.json
+++ b/packages/i18n/src/locales/ug.i18n.json
@@ -271,7 +271,6 @@
   "Custom CSS": "CSSئۆزى بېكىتكەن",
   "Custom_Fields": "ئۆزلۈكىدىن بېكىتىلگەن خەت بۆلىكى",
   "Custom_oauth_helper": "نى ئىشلىتىڭ.<pre>%s</pre>نى قايتۇرۇپ يۆتكەشكە موھتاج بولىسىز ،بۇ URL نىڭ تەمىنلىگۈچىسىنى بەلگىلىگەندىن كېيىن ، سىز يەنە OAuth",
-  "Custom_oauth_unique_name": "نىڭ بىردىنبىر ئىسمىنى ئۆزلۈكىدىن بېكىتىشOAuth  ",
   "Custom_Script_Logged_In": "كىرىپ بولغان ئابونت ئۈچۈن ئۆزلۈكىدىن تەييارلىغان ئىسكرىپت",
   "Custom_Script_Logged_Out": "چىقىپ كەتكەن ئابونت ئۈچۈن ئۆزلۈكىدىن تەييارلىغان ئىسكرىپت",
   "Dashboard": "كونترول تاختىسى",
@@ -468,7 +467,6 @@
   "From_email_warning": "خەت بۆلىكى ئىلخەت مۇلازىمىتېرنىڭ تەڭشىكىدىن كەلگەن.<b>دىن</b> :<b>ئاگاھلاندۇرۇش</b>",
   "General": "ھەممىباب",
   "github_no_public_email": "تىكى ھېسابات نومۇرىڭىزدا ،سىز ھېچقانداق ئىلخەتنى ئاممىۋى ئىلخەت ئادرېسى قىلىپ بېكەتمىدىڭىز. GitHub سىزنىڭ",
-  "Give_a_unique_name_for_the_custom_oauth": "بىردىنبىر ئىسىم بېكىتىڭ OAuth ئۆزى بېكىتىش",
   "strike": "سىزىق سىزماق",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "ئەپكە بىر ئىسىم قويۇڭ . بۇ ئىسىمنى سىزنىڭ ئەزايىڭىز كۆرەلەيدۇ.",
   "Global": "ئومۇمىي ئەھۋال",
@@ -743,7 +741,6 @@
   "New_password": "يېڭى پارول",
   "New_role": "يېڭى رول",
   "New_Room_Notification": "يېڭى ئۆي ئۇقتۇرۇشى",
-  "No_channels_yet": "سىز تېخى بۇ قانالغا كىرمىدىڭىز",
   "No_direct_messages_yet": "سىز ھېچقانداق پاراڭنى باشلىمىدىڭىز",
   "No_Encryption": "مەخپىيلەشتۈرۈش ئىشلىتىلمىدى",
   "No_groups_yet": "سىزنىڭ تېخى شەخسىي گۇرۇپپىڭىزيوق",
diff --git a/packages/i18n/src/locales/uk.i18n.json b/packages/i18n/src/locales/uk.i18n.json
index 1a17fed4cc75..601d1299f02c 100644
--- a/packages/i18n/src/locales/uk.i18n.json
+++ b/packages/i18n/src/locales/uk.i18n.json
@@ -1005,7 +1005,6 @@
   "Custom_Emoji_Updated_Successfully": "Користувацькі смайли успішно оновлено",
   "Custom_Fields": "Користувацькі поля",
   "Custom_oauth_helper": "При налаштуванні OAuth постачальника, ви повинні будете повідомити який буде зворотній URL для використання <pre>%s</pre>.",
-  "Custom_oauth_unique_name": "Власне унікальне ім'я oauth",
   "Custom_Script_Logged_In": "Користувацький скрипт для авторизованих користувачів",
   "Custom_Script_Logged_In_Description": "Користувацький скрипт, який ЗАВЖДИ буде спрацьовувати для БУДЬ-ЯКОГО користувача, який увійшов у систему, (наприклад, щоразу, коли ви входите в чат і ви входите в систему)",
   "Custom_Script_Logged_Out": "Спеціальний сценарій для користувачів, які вийшли з системи",
@@ -1589,7 +1588,6 @@
   "General": "Загальні",
   "Generate_New_Link": "Створити нове посилання",
   "github_no_public_email": "У Вашому обліковому записі GitHub, відсутній публічний e-mail",
-  "Give_a_unique_name_for_the_custom_oauth": "Дайте унікальне ім'я для призначеного користувача OAuth",
   "strike": "страйк",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Дайте додатком ім'я. Це буде видно ваших користувачів.",
   "Global": "Глобальні",
@@ -2290,7 +2288,6 @@
   "Newer_than_may_not_exceed_Older_than": "\"Новіші ніж\" не можуть перевищувати \"Старіше, ніж\"",
   "No": "Ні",
   "No_available_agents_to_transfer": "Немає доступних агентів для передачі",
-  "No_channels_yet": "Ви не під'єднані до жодного каналу.",
   "No_direct_messages_yet": "Ви ще не почали ніяких розмов поки.",
   "No_discussions_yet": "Обговорень поки що немає",
   "No_Encryption": "немає шифрування",
@@ -2326,7 +2323,6 @@
   "Notifications_Max_Room_Members_Description": "Максимальна кількість учасників в кімнаті, коли сповіщення для всіх повідомлень вимикаються. Користувачі все ще можуть змінювати параметри кімнати, щоб отримувати всі сповіщення на індивідуальній основі. (Відключити 0)",
   "Notifications_Muted_Description": "Якщо ви вирішите вимкнути все, ви не побачите номер висвітлення в списку, коли з'являються нові повідомлення, за винятком згадок. Вимкнення сповіщень перевищить налаштування сповіщень.",
   "Notifications_Preferences": "Налаштування сповіщень",
-  "Notifications_Sound_Volume": "Повідомлення звуку гучності",
   "Notify_active_in_this_room": "Повідомте активних користувачів у цій кімнаті",
   "Notify_all_in_this_room": "Повідомте все в цій кімнаті",
   "Num_Agents": "# Агенти",
diff --git a/packages/i18n/src/locales/vi-VN.i18n.json b/packages/i18n/src/locales/vi-VN.i18n.json
index 05df188f9c23..f9c8848aa328 100644
--- a/packages/i18n/src/locales/vi-VN.i18n.json
+++ b/packages/i18n/src/locales/vi-VN.i18n.json
@@ -880,7 +880,6 @@
   "Custom_Emoji_Updated_Successfully": "Đã cập nhật thành công emoji tùy chỉnh",
   "Custom_Fields": "Trường tùy chỉnh",
   "Custom_oauth_helper": "Khi thiết lập nhà cung cấp OAuth của bạn, bạn sẽ phải thông báo cho một URL gọi lại. Sử dụng <pre>%s</pre>.",
-  "Custom_oauth_unique_name": "Tuỳ chỉnh tên duy nhất",
   "Custom_Script_Logged_In": "Tập lệnh Tuỳ chỉnh cho Người dùng đăng nhập",
   "Custom_Script_Logged_Out": "Tập lệnh Tuỳ chỉnh cho Người dùng đăng nhập",
   "Custom_Scripts": "Script Tuỳ chỉnh",
@@ -1290,7 +1289,6 @@
   "Gaming": "Chơi game",
   "General": "Chung",
   "github_no_public_email": "Bạn không có bất kỳ email nào dưới dạng email công khai trong tài khoản GitHub của mình",
-  "Give_a_unique_name_for_the_custom_oauth": "Cho một tên duy nhất cho tùy chỉnh oauth",
   "strike": "đình công",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "Cung cấp cho ứng dụng một cái tên. Người dùng của bạn sẽ nhìn thấy điều này.",
   "Global": "Toàn cầu",
@@ -1876,7 +1874,6 @@
   "Newer_than_may_not_exceed_Older_than": "\"Mới hơn\" không được vượt quá \"Cũ hơn\"",
   "No": "Không",
   "No_available_agents_to_transfer": "Không có agent nào có thể chuyển",
-  "No_channels_yet": "Bạn chưa thuộc bất kỳ kênh nào",
   "No_direct_messages_yet": "Không có tin nhắn trực tiếp.",
   "No_Encryption": "Không có Mã hóa",
   "No_groups_yet": "Bạn chưa có Nhóm riêng tư.",
@@ -1908,7 +1905,6 @@
   "Notifications_Max_Room_Members_Description": "Số thành viên tối đa trong phòng khi thông báo cho tất cả các tin nhắn bị tắt. Người dùng vẫn có thể thay đổi cài đặt mỗi phòng để nhận tất cả các thông báo trên cơ sở cá nhân. (0 để vô hiệu hóa)",
   "Notifications_Muted_Description": "Nếu bạn chọn tắt tiếng mọi thứ, bạn sẽ không thấy nổi bật trong phòng trong danh sách khi có tin nhắn mới, ngoại trừ các đề cập. Thông báo tắt tiếng sẽ ghi đè cài đặt thông báo.",
   "Notifications_Preferences": "Thông báo Preferences",
-  "Notifications_Sound_Volume": "Âm lượng thông báo",
   "Notify_active_in_this_room": "Thông báo cho người dùng đang hoạt động trong phòng này",
   "Notify_all_in_this_room": "Thông báo cho tất cả trong phòng này",
   "Num_Agents": "# Agent",
diff --git a/packages/i18n/src/locales/zh-HK.i18n.json b/packages/i18n/src/locales/zh-HK.i18n.json
index 42fd9fb00919..af7e8495f868 100644
--- a/packages/i18n/src/locales/zh-HK.i18n.json
+++ b/packages/i18n/src/locales/zh-HK.i18n.json
@@ -806,7 +806,6 @@
   "Custom_Emoji_Updated_Successfully": "自定义表情符号已成功更新",
   "Custom_Fields": "自定义字段",
   "Custom_oauth_helper": "设置OAuth提供程序时，您必须通知回调URL。使用<pre>％s</pre>。",
-  "Custom_oauth_unique_name": "自定义oauth唯一的名称",
   "Custom_Script_Logged_In": "用于登录用户的自定义脚本",
   "Custom_Script_Logged_Out": "用于注销用户的自定义脚本",
   "Custom_Scripts": "自定义脚本",
@@ -1216,7 +1215,6 @@
   "Gaming": "赌博",
   "General": "通用",
   "github_no_public_email": "在您的GitHub上帐户中，您没有设置任何电子邮件作为公共电子邮件地址。",
-  "Give_a_unique_name_for_the_custom_oauth": "为自定义oauth提供一个唯一的名称",
   "strike": "划线",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "为应用程序命名。这将被您的用户看到。",
   "Global": "全球",
@@ -1800,7 +1798,6 @@
   "Newer_than_may_not_exceed_Older_than": "“比”更新“不得超过”年龄大于“",
   "No": "否",
   "No_available_agents_to_transfer": "没有可用的代理进行传输",
-  "No_channels_yet": "您尚未加入这个频道。",
   "No_direct_messages_yet": "您还没有开始任何聊天。",
   "No_Encryption": "没有加密",
   "No_groups_yet": "你还没有私有组。",
@@ -1832,7 +1829,6 @@
   "Notifications_Max_Room_Members_Description": "当所有消息的通知被禁用时，房间内的最大成员数量。用户仍然可以更改每个房间的设置，以单独接收所有通知。 （0禁用）",
   "Notifications_Muted_Description": "如果您选择将所有内容静音，除了提及之外，当有新消息时，您不会在列表中看到突出显示的房间。屏蔽通知将覆盖通知设置。",
   "Notifications_Preferences": "通知首选项",
-  "Notifications_Sound_Volume": "通知音量",
   "Notify_active_in_this_room": "通知此房间的活动用户",
   "Notify_all_in_this_room": "提醒房间中的所有人",
   "Num_Agents": "＃代理商",
diff --git a/packages/i18n/src/locales/zh-TW.i18n.json b/packages/i18n/src/locales/zh-TW.i18n.json
index 883cc09de12c..37864a815f40 100644
--- a/packages/i18n/src/locales/zh-TW.i18n.json
+++ b/packages/i18n/src/locales/zh-TW.i18n.json
@@ -1249,7 +1249,6 @@
   "Custom_Field_Not_Found": "找不到自訂欄位",
   "Custom_Integration": "自訂整合",
   "Custom_oauth_helper": "設定 OAuth 提供者時，請提供一個 Callback URL。使用 <pre> %s </pre> 。",
-  "Custom_oauth_unique_name": "自訂 OAuth 名稱",
   "Custom_Script_Logged_In": "針對登錄使用者自訂腳本",
   "Custom_Script_Logged_In_Description": "自訂腳本讓所有登入的使用者在登入時都會執行。例如. (無論何時登入頁面)",
   "Custom_Script_Logged_Out": "自訂腳本用於登出用戶",
@@ -1948,7 +1947,6 @@
   "Forward_to_user": "轉發給使用者",
   "Forwarding": "轉寄",
   "Free": "免費",
-  "Free_Extension_Numbers": "免費分機號碼",
   "Free_Apps": "免費應用程式",
   "Frequently_Used": "常用",
   "Friday": "星期五",
@@ -1971,7 +1969,6 @@
   "get-password-policy-mustContainAtLeastOneSpecialCharacter": "密碼應至少包含一個特殊字符",
   "get-password-policy-mustContainAtLeastOneUppercase": "密碼應至少包含一個大寫字母",
   "github_no_public_email": "您沒有設置任何電子郵件作為公共電子郵件地址，在你的Github帳戶上",
-  "Give_a_unique_name_for_the_custom_oauth": "為自訂 OAuth 設定一個獨一無二的名稱",
   "strike": "刪除線",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "給應用程式的名稱。這將被使用者看到。",
   "Global": "全域",
@@ -2967,7 +2964,6 @@
   "No_Canned_Responses_Yet": "沒有罐頭回覆",
   "No_Canned_Responses_Yet-description": "使用罐頭回覆來提供快速且對常見的問題有一致回答。",
   "No_channels_in_team": "此團隊中沒有 Channel",
-  "No_channels_yet": "您尚未加入任何頻道。",
   "No_data_found": "沒有找到資料",
   "No_direct_messages_yet": "您還没有開始任何聊天。",
   "No_Discussions_found": "找不到論壇",
@@ -3021,7 +3017,6 @@
   "Notifications_Max_Room_Members_Description": "當所有訊息通知被停用時，房間內的最大成員數量。使用者仍然可以更改每個房間的設定，以單獨接收所有通知。 （0是停用）",
   "Notifications_Muted_Description": "如果您選擇將所有內容靜音，除了提及之外，當有新消息時，您不會在列表中看到突出顯示的房間。關閉通知將覆蓋通知設定。",
   "Notifications_Preferences": "通知選項",
-  "Notifications_Sound_Volume": "通知音量",
   "Notify_active_in_this_room": "通知此房間的活動用戶",
   "Notify_all_in_this_room": "提醒這個房間中的所有人",
   "Default_Timezone_For_Reporting": "回報的預設時區",
diff --git a/packages/i18n/src/locales/zh.i18n.json b/packages/i18n/src/locales/zh.i18n.json
index e15ca26a86d1..530ab418cdeb 100644
--- a/packages/i18n/src/locales/zh.i18n.json
+++ b/packages/i18n/src/locales/zh.i18n.json
@@ -1131,7 +1131,6 @@
   "Custom_Fields": "自定义字段",
   "Custom_Field_Removed": "已移除自定义字段",
   "Custom_oauth_helper": "设置完 OAuth 提供者之后，你还需要设置回调 URL。请使用 <pre>%s</pre>。",
-  "Custom_oauth_unique_name": "自定义 OAuth 唯一名称 ",
   "Custom_Script_Logged_In": "为已登录用户准备的自定义脚本",
   "Custom_Script_Logged_In_Description": "任何登录的用户都将运行的自定义脚本(例如当登录的用户进入聊天时)。",
   "Custom_Script_Logged_Out": "为已登出用户准备的自定义脚本",
@@ -1799,7 +1798,6 @@
   "get-password-policy-mustContainAtLeastOneSpecialCharacter": "密码应包含至少一个特殊字符",
   "get-password-policy-mustContainAtLeastOneUppercase": "密码应包含至少一个大写字符",
   "github_no_public_email": "在您的 GitHub 帐户中没有设置任何电子邮件作为公共电子邮件地址。",
-  "Give_a_unique_name_for_the_custom_oauth": "请给自定义 OAuth 设置一个唯一的名称",
   "strike": "划线",
   "Give_the_application_a_name_This_will_be_seen_by_your_users": "给该应用设置一个名称。该名称将被您的用户看到。",
   "Global": "全局",
@@ -2678,7 +2676,6 @@
   "No": "否",
   "No_available_agents_to_transfer": "没有可用的客服来进行转移",
   "No_Canned_Responses": "无自动回复",
-  "No_channels_yet": "您尚未加入这个频道。",
   "No_data_found": "未找到数据",
   "No_direct_messages_yet": "无私聊消息。",
   "No_Discussions_found": "未找到讨论",
@@ -2728,7 +2725,6 @@
   "Notifications_Max_Room_Members_Description": "所有消息通知被禁用前的聊天室内的最大成员数量。用户仍然可以更改每个房间的设置，以单独接收所有通知。 （0禁用）",
   "Notifications_Muted_Description": "如果您选择将所有内容静音，除了提及之外，当有新消息时，您不会在列表中看到突出显示的聊天室。屏蔽通知将覆盖通知设置。",
   "Notifications_Preferences": "通知首选项",
-  "Notifications_Sound_Volume": "通知音量",
   "Notify_active_in_this_room": "通知此房间的活跃用户",
   "Notify_all_in_this_room": "提醒聊天室中的所有人",
   "NPS_survey_enabled": "启用 NPS 问卷调查",
diff --git a/packages/instance-status/CHANGELOG.md b/packages/instance-status/CHANGELOG.md
index cf0030dc14a4..602f5c9e2153 100644
--- a/packages/instance-status/CHANGELOG.md
+++ b/packages/instance-status/CHANGELOG.md
@@ -1,5 +1,41 @@
 # @rocket.chat/instance-status
 
+## 0.1.10-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/models@1.0.1-rc.3
+  </details>
+
+## 0.1.10-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/models@1.0.1-rc.2
+  </details>
+
+## 0.1.10-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/models@1.0.1-rc.1
+  </details>
+
+## 0.1.10-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/models@1.0.1-rc.0
+  </details>
+
 ## 0.1.9
 
 ### Patch Changes
diff --git a/packages/instance-status/package.json b/packages/instance-status/package.json
index 89d95993f219..f099b52f8166 100644
--- a/packages/instance-status/package.json
+++ b/packages/instance-status/package.json
@@ -1,12 +1,12 @@
 {
 	"name": "@rocket.chat/instance-status",
-	"version": "0.1.9",
+	"version": "0.1.10-rc.3",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:^",
 		"eslint": "~8.45.0",
 		"mongodb": "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch",
-		"prettier": "~2.8.8",
+		"prettier": "~3.3.3",
 		"typescript": "~5.6.3"
 	},
 	"scripts": {
diff --git a/packages/jest-presets/package.json b/packages/jest-presets/package.json
index f0809089d248..d8ceb388c99b 100644
--- a/packages/jest-presets/package.json
+++ b/packages/jest-presets/package.json
@@ -13,21 +13,21 @@
 		"/server"
 	],
 	"dependencies": {
-		"@swc/core": "~1.7.26",
-		"@swc/jest": "~0.2.36",
-		"@testing-library/jest-dom": "~6.4.8",
+		"@swc/core": "~1.9.2",
+		"@swc/jest": "~0.2.37",
+		"@testing-library/jest-dom": "~6.6.3",
 		"@types/jest-axe": "~3.5.9",
 		"identity-obj-proxy": "~3.0.0",
 		"jest-axe": "~9.0.0",
 		"jest-environment-jsdom": "~29.7.0",
 		"jest-environment-node": "~29.7.0",
-		"uuid": "~9.0.1"
+		"uuid": "~11.0.3"
 	},
 	"devDependencies": {
 		"@rocket.chat/eslint-config": "workspace:~",
 		"@types/identity-obj-proxy": "^3.0.2",
-		"@types/jest": "~29.5.13",
-		"@types/uuid": "^9.0.8",
+		"@types/jest": "~29.5.14",
+		"@types/uuid": "^10.0.0",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"typescript": "~5.6.3"
diff --git a/packages/jwt/package.json b/packages/jwt/package.json
index ccc38eb48a98..c8636fb6e404 100644
--- a/packages/jwt/package.json
+++ b/packages/jwt/package.json
@@ -4,7 +4,7 @@
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@types/jest": "~29.5.13",
+		"@types/jest": "~29.5.14",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"typescript": "~5.6.3"
diff --git a/packages/livechat/.storybook/helpers.tsx b/packages/livechat/.storybook/helpers.tsx
index f6f4fb4527ad..b6b4caf98dc3 100644
--- a/packages/livechat/.storybook/helpers.tsx
+++ b/packages/livechat/.storybook/helpers.tsx
@@ -34,7 +34,7 @@ export const avatarResolver = (username: string) =>
 		'guilherme.gazzo': gazzoAvatar,
 		'martin.schoeler': martinAvatar,
 		'tasso.evangelista': tassoAvatar,
-	}[username]);
+	})[username];
 
 export const attachmentResolver = (url: string) => url;
 
diff --git a/packages/livechat/.stylelintrc.json b/packages/livechat/.stylelintrc.json
index 3d25a336e06e..7831b4cf0d70 100644
--- a/packages/livechat/.stylelintrc.json
+++ b/packages/livechat/.stylelintrc.json
@@ -16,18 +16,7 @@
         ]
       }
     ],
-    "at-rule-name-case": "lower",
-    "at-rule-name-space-after": "always",
-    "at-rule-semicolon-newline-after": "always",
-    "block-closing-brace-empty-line-before": "never",
-    "block-closing-brace-newline-after": "always",
-    "block-closing-brace-newline-before": "always",
-    "block-closing-brace-space-before": "never-single-line",
     "block-no-empty": true,
-    "block-opening-brace-newline-after": "always",
-    "block-opening-brace-space-after": "never-single-line",
-    "block-opening-brace-space-before": "always",
-    "color-hex-case": "lower",
     "color-hex-length": "long",
     "color-no-invalid-hex": true,
     "comment-empty-line-before": [
@@ -44,8 +33,6 @@
     "comment-no-empty": true,
     "comment-whitespace-inside": "always",
     "custom-property-empty-line-before": "never",
-    "declaration-bang-space-after": "never",
-    "declaration-bang-space-before": "always",
     "declaration-block-no-duplicate-properties": [
       true,
       {
@@ -56,46 +43,15 @@
     ],
     "declaration-block-no-redundant-longhand-properties": true,
     "declaration-block-no-shorthand-property-overrides": true,
-    "declaration-block-semicolon-newline-after": "always",
-    "declaration-block-semicolon-space-after": "always-single-line",
-    "declaration-block-semicolon-space-before": "never",
     "declaration-block-single-line-max-declarations": 1,
-    "declaration-block-trailing-semicolon": "always",
-    "declaration-colon-newline-after": "always-multi-line",
-    "declaration-colon-space-after": "always-single-line",
-    "declaration-colon-space-before": "never",
     "font-family-no-duplicate-names": true,
-    "function-comma-newline-after": "always-multi-line",
-    "function-comma-space-after": "always-single-line",
-    "function-comma-space-before": "never",
     "function-linear-gradient-no-nonstandard-direction": true,
-    "function-max-empty-lines": 0,
     "function-name-case": "lower",
-    "function-parentheses-newline-inside": "always-multi-line",
-    "function-parentheses-space-inside": "never-single-line",
-    "function-whitespace-after": "always",
-    "indentation": "tab",
     "keyframe-declaration-no-important": true,
     "length-zero-no-unit": true,
-    "max-empty-lines": 1,
-    "media-feature-colon-space-after": "always",
-    "media-feature-colon-space-before": "never",
-    "media-feature-name-case": "lower",
     "media-feature-name-no-unknown": true,
-    "media-feature-parentheses-space-inside": "never",
-    "media-feature-range-operator-space-after": "always",
-    "media-feature-range-operator-space-before": "always",
-    "media-query-list-comma-newline-after": "always-multi-line",
-    "media-query-list-comma-space-after": "always-single-line",
-    "media-query-list-comma-space-before": "never",
     "no-duplicate-selectors": true,
     "no-empty-source": true,
-    "no-eol-whitespace": true,
-    "no-extra-semicolons": true,
-    "no-missing-end-of-source-newline": true,
-    "number-leading-zero": "always",
-    "number-no-trailing-zeros": true,
-    "property-case": "lower",
     "property-no-unknown": true,
     "rule-empty-line-before": [
       "always",
@@ -108,16 +64,6 @@
         ]
       }
     ],
-    "selector-attribute-brackets-space-inside": "never",
-    "selector-attribute-operator-space-after": "never",
-    "selector-attribute-operator-space-before": "never",
-    "selector-combinator-space-after": "always",
-    "selector-combinator-space-before": "always",
-    "selector-descendant-combinator-no-non-space": true,
-    "selector-list-comma-newline-after": "always",
-    "selector-list-comma-space-before": "never",
-    "selector-max-empty-lines": 0,
-    "selector-pseudo-class-case": "lower",
     "selector-pseudo-class-no-unknown": [
       true,
       {
@@ -126,20 +72,13 @@
         ]
       }
     ],
-    "selector-pseudo-class-parentheses-space-inside": "never",
-    "selector-pseudo-element-case": "lower",
     "selector-pseudo-element-colon-notation": "double",
     "selector-pseudo-element-no-unknown": true,
     "selector-type-case": "lower",
     "selector-type-no-unknown": true,
     "shorthand-property-no-redundant-values": true,
     "string-no-newline": true,
-    "unit-case": "lower",
     "unit-no-unknown": true,
-    "value-list-comma-newline-after": "always-multi-line",
-    "value-list-comma-space-after": "always-single-line",
-    "value-list-comma-space-before": "never",
-    "value-list-max-empty-lines": 0,
     "order/properties-order": [
       [
         {
diff --git a/packages/livechat/CHANGELOG.md b/packages/livechat/CHANGELOG.md
index c3f5baf9566e..b2d139ae0341 100644
--- a/packages/livechat/CHANGELOG.md
+++ b/packages/livechat/CHANGELOG.md
@@ -1,5 +1,49 @@
 # @rocket.chat/livechat Change Log
 
+## 1.21.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/gazzodown@13.0.0-rc.3
+  </details>
+
+## 1.21.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/gazzodown@13.0.0-rc.2
+  </details>
+
+## 1.21.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/gazzodown@13.0.0-rc.1
+  </details>
+
+## 1.21.0-rc.0
+
+### Minor Changes
+
+- ([#33997](https://github.com/RocketChat/Rocket.Chat/pull/33997)) Prevent apps' subprocesses from crashing on unhandled rejections or uncaught exceptions
+
+### Patch Changes
+
+- ([#33911](https://github.com/RocketChat/Rocket.Chat/pull/33911)) Fixes the 'Finish Chat' option in Livechat appearing before the conversation is started, which caused the action to fail.
+
+- ([#33944](https://github.com/RocketChat/Rocket.Chat/pull/33944)) Fixes livechat popout mode not working correctly in cross domain situations
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/gazzodown@13.0.0-rc.0
+  </details>
+
 ## 1.20.1
 
 ### Patch Changes
diff --git a/packages/livechat/package.json b/packages/livechat/package.json
index e373ee84e9bb..98c9fd14bb01 100644
--- a/packages/livechat/package.json
+++ b/packages/livechat/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/livechat",
-	"version": "1.20.1",
+	"version": "1.21.0-rc.3",
 	"files": [
 		"/build"
 	],
@@ -17,7 +17,6 @@
 		"build": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack-cli --mode production",
 		"dev": "yarn build",
 		"start": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack-dev-server --mode development",
-		"lint": "run-s eslint stylelint",
 		"eslint": "eslint --ext .js,.jsx,.ts,.tsx .",
 		"stylelint": "stylelint 'src/**/*.scss'",
 		"storybook": "storybook dev -p 9001 -c .storybook",
@@ -25,9 +24,9 @@
 		"typecheck": "tsc -p tsconfig.typecheck.json"
 	},
 	"devDependencies": {
-		"@babel/eslint-parser": "~7.25.8",
-		"@babel/preset-env": "~7.25.8",
-		"@babel/preset-typescript": "~7.25.7",
+		"@babel/eslint-parser": "~7.25.9",
+		"@babel/preset-env": "~7.26.0",
+		"@babel/preset-typescript": "~7.26.0",
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/ddp-client": "workspace:^",
 		"@rocket.chat/eslint-config": "workspace:^",
@@ -35,63 +34,58 @@
 		"@rocket.chat/fuselage-tokens": "^0.33.2",
 		"@rocket.chat/logo": "^0.31.30",
 		"@rocket.chat/ui-contexts": "workspace:^",
-		"@storybook/addon-essentials": "^8.3.5",
-		"@storybook/addon-styling-webpack": "~1.0.0",
+		"@storybook/addon-essentials": "^8.4.4",
+		"@storybook/addon-styling-webpack": "~1.0.1",
 		"@storybook/addon-webpack5-compiler-babel": "^3.0.3",
-		"@storybook/preact": "^8.3.5",
-		"@storybook/preact-webpack5": "^8.3.5",
-		"@storybook/theming": "^8.3.5",
-		"@types/crypto-js": "~4.1.3",
-		"@types/markdown-it": "^14.0.1",
+		"@storybook/preact": "^8.4.4",
+		"@storybook/preact-webpack5": "^8.4.4",
+		"@storybook/theming": "^8.4.4",
+		"@types/crypto-js": "~4.2.2",
+		"@types/markdown-it": "^14.1.2",
 		"@types/mini-css-extract-plugin": "~1.4.3",
-		"@types/webpack-bundle-analyzer": "^4.6.2",
 		"@types/webpack-env": "~1.18.5",
 		"@types/whatwg-fetch": "~0.0.33",
 		"@typescript-eslint/eslint-plugin": "~5.60.1",
 		"@typescript-eslint/parser": "~5.60.1",
 		"autoprefixer": "^9.8.8",
-		"babel-loader": "^8.3.0",
+		"babel-loader": "^9.2.1",
 		"cross-env": "^7.0.3",
 		"css-loader": "^4.3.0",
 		"cssnano": "^4.1.11",
 		"desvg-loader": "^0.1.0",
 		"eslint": "~8.45.0",
-		"eslint-plugin-import": "~2.26.0",
-		"eslint-plugin-react": "~7.32.2",
-		"eslint-plugin-react-hooks": "~4.6.2",
+		"eslint-plugin-import": "~2.31.0",
+		"eslint-plugin-react": "~7.37.2",
+		"eslint-plugin-react-hooks": "~5.0.0",
 		"file-loader": "^6.2.0",
-		"gh-release": "^3.5.0",
-		"html-webpack-plugin": "^5.5.3",
-		"husky": "^4.3.8",
+		"html-webpack-plugin": "^5.6.3",
 		"if-env": "^1.0.4",
 		"image-webpack-loader": "~8.1.0",
 		"lorem-ipsum": "^2.0.8",
 		"mini-css-extract-plugin": "~1.6.2",
 		"npm-run-all": "^4.1.5",
-		"postcss-css-variables": "^0.17.0",
-		"postcss-dir-pseudo-class": "^5.0.0",
-		"postcss-flexbugs-fixes": "^4.2.1",
+		"postcss-css-variables": "^0.19.0",
+		"postcss-dir-pseudo-class": "^9.0.1",
+		"postcss-flexbugs-fixes": "^5.0.2",
 		"postcss-ie11-supports": "^0.1.3",
 		"postcss-loader": "^8.1.1",
-		"postcss-logical": "^4.0.2",
+		"postcss-logical": "^8.0.0",
 		"postcss-scss": "^4.0.9",
-		"postcss-selector-not": "^4.0.1",
+		"postcss-selector-not": "^8.0.1",
 		"react-dom": "~17.0.2",
 		"resolve-url-loader": "~5.0.0",
 		"rimraf": "^6.0.1",
-		"sass": "~1.79.5",
-		"sass-loader": "~16.0.2",
-		"serve": "^11.3.2",
-		"storybook": "^8.3.5",
-		"style-loader": "^1.2.1",
-		"stylelint": "^14.9.1",
-		"stylelint-order": "^5.0.0",
+		"sass": "~1.80.7",
+		"sass-loader": "~16.0.3",
+		"storybook": "^8.4.4",
+		"style-loader": "^1.3.0",
+		"stylelint": "^16.10.0",
+		"stylelint-order": "^6.0.4",
 		"svg-loader": "^0.0.2",
 		"terser-webpack-plugin": "~4.2.3",
 		"typescript": "~5.6.3",
 		"url-loader": "^4.1.1",
 		"webpack": "~5.95.0",
-		"webpack-bundle-analyzer": "^4.9.1",
 		"webpack-cli": "~5.1.4",
 		"webpack-dev-server": "~5.1.0"
 	},
@@ -100,22 +94,21 @@
 		"@rocket.chat/logo": "*"
 	},
 	"dependencies": {
+		"@rocket.chat/emitter": "~0.31.25",
 		"@rocket.chat/gazzodown": "workspace:^",
 		"@rocket.chat/message-parser": "workspace:^",
 		"@rocket.chat/random": "workspace:~",
-		"@rocket.chat/sdk": "^1.0.0-alpha.42",
 		"@rocket.chat/ui-kit": "workspace:~",
 		"css-vars-ponyfill": "^2.4.9",
-		"date-fns": "^2.15.0",
+		"date-fns": "^2.30.0",
 		"emoji-mart": "^3.0.1",
 		"history": "~5.3.0",
 		"i18next": "~23.4.9",
 		"markdown-it": "^14.1.0",
-		"mem": "^6.1.1",
-		"mitt": "^2.1.0",
+		"mem": "^8.1.1",
 		"path-to-regexp": "^6.3.0",
-		"preact": "~10.24.2",
-		"preact-router": "^3.2.1",
+		"preact": "~10.24.3",
+		"preact-router": "^4.1.2",
 		"query-string": "^7.1.3",
 		"react-hook-form": "~7.45.4",
 		"react-i18next": "~13.2.2",
diff --git a/packages/livechat/src/components/Alert/styles.scss b/packages/livechat/src/components/Alert/styles.scss
index 8aa979ccad24..b554fc80febb 100644
--- a/packages/livechat/src/components/Alert/styles.scss
+++ b/packages/livechat/src/components/Alert/styles.scss
@@ -1,13 +1,13 @@
-@import '../../styles/colors';
-@import '../../styles/helpers';
-@import '../../styles/variables';
+@use '../../styles/colors';
+@use '../../styles/helpers';
+@use '../../styles/variables';
 
-$alert-color: $color-text-lighter;
-$alert-font-family: $font-family;
-$alert-background-color: $bg-color-darker;
-$alert-success-background-color: $color-green;
-$alert-warning-background-color: $color-yellow;
-$alert-error-background-color: $color-red;
+$alert-color: colors.$color-text-lighter;
+$alert-font-family: variables.$font-family;
+$alert-background-color: colors.$bg-color-darker;
+$alert-success-background-color: colors.$color-green;
+$alert-warning-background-color: colors.$color-yellow;
+$alert-error-background-color: colors.$color-red;
 
 .alert {
 	display: flex;
@@ -48,7 +48,7 @@ $alert-error-background-color: $color-red;
 		outline: none;
 		background: none;
 
-		@include pressable-button(1px);
+		@include helpers.pressable-button(1px);
 	}
 
 	&--success {
diff --git a/packages/livechat/src/components/Avatar/styles.scss b/packages/livechat/src/components/Avatar/styles.scss
index 8a429935a81a..0df8fbe3ef99 100644
--- a/packages/livechat/src/components/Avatar/styles.scss
+++ b/packages/livechat/src/components/Avatar/styles.scss
@@ -1,5 +1,5 @@
-@import '../../styles/colors';
-@import '../../styles/variables';
+@use '../../styles/colors';
+@use '../../styles/variables';
 
 $avatar-size-small: 20px;
 $avatar-status-indicator-size-small: 10px;
@@ -16,7 +16,7 @@ $avatar-status-indicator-size-large: 14px;
 	width: $avatar-size-medium;
 	height: $avatar-size-medium;
 
-	border-radius: $default-border-radius;
+	border-radius: variables.$default-border-radius;
 	background-color: #000000;
 	background-image: url(./profile.png);
 	background-repeat: no-repeat;
@@ -28,7 +28,7 @@ $avatar-status-indicator-size-large: 14px;
 		height: 100%;
 
 		color: transparent;
-		border-radius: $default-border-radius;
+		border-radius: variables.$default-border-radius;
 		object-fit: cover;
 	}
 
@@ -44,7 +44,7 @@ $avatar-status-indicator-size-large: 14px;
 
 		border: 2px solid var(--color, transparent);
 		border-radius: 50%;
-		background-color: $bg-color-grey;
+		background-color: colors.$bg-color-grey;
 
 		&--small {
 			right: -2px;
@@ -64,15 +64,15 @@ $avatar-status-indicator-size-large: 14px;
 
 		&--status {
 			&-online {
-				background-color: $color-green;
+				background-color: colors.$color-green;
 			}
 
 			&-away {
-				background-color: $color-yellow;
+				background-color: colors.$color-yellow;
 			}
 
 			&-busy {
-				background-color: $color-red;
+				background-color: colors.$color-red;
 			}
 		}
 	}
diff --git a/packages/livechat/src/components/Button/styles.scss b/packages/livechat/src/components/Button/styles.scss
index 4fe09d94484a..e1760bd46300 100644
--- a/packages/livechat/src/components/Button/styles.scss
+++ b/packages/livechat/src/components/Button/styles.scss
@@ -1,37 +1,36 @@
 @use 'sass:math';
+@use '../../styles/colors';
+@use '../../styles/helpers';
+@use '../../styles/variables';
 
-@import '../../styles/colors';
-@import '../../styles/helpers';
-@import '../../styles/variables';
-
-$button-border-width: $default-border;
-$button-border-radius: $default-border-radius;
-$button-padding: (0.75 * $default-gap - $default-border) (1.5 * $default-gap - $default-border);
-$button-small-padding: (0.25 * $default-gap - math.div($default-border, 2)) (1.5 * $default-gap - $default-border);
+$button-border-width: variables.$default-border;
+$button-border-radius: variables.$default-border-radius;
+$button-padding: (0.75 * variables.$default-gap - variables.$default-border) (1.5 * variables.$default-gap - variables.$default-border);
+$button-small-padding: (0.25 * variables.$default-gap - math.div(variables.$default-border, 2)) (1.5 * variables.$default-gap - variables.$default-border);
 
 $button-active-displacement: 2px;
 
-$button-color: $color-text-lighter;
-$button-background-color: $color-blue;
-$button-danger-background-color: $color-dark-red;
-$button-secondary-background-color: $color-text-grey;
+$button-color: colors.$color-text-lighter;
+$button-background-color: colors.$color-blue;
+$button-danger-background-color: colors.$color-dark-red;
+$button-secondary-background-color: colors.$color-text-grey;
 
-$button-font-family: $font-family;
+$button-font-family: variables.$font-family;
 $button-font-size: 0.875rem;
 $button-font-weight: 500;
 $button-line-height: 1.25rem;
 
-$button-disabled-opacity: $disabled-opacity;
+$button-disabled-opacity: variables.$disabled-opacity;
 
-$button-loading-border-width: (2 * $default-border);
-$button-loading-gap: math.div($default-gap, 2);
+$button-loading-border-width: (2 * variables.$default-border);
+$button-loading-gap: math.div(variables.$default-gap, 2);
 $button-loading-size: $button-line-height;
 $button-loading-color: #ffffff;
 
 $button-badge-size: 1.5rem;
-$button-badge-background-color: $color-red;
-$button-badge-color: $color-text-lighter;
-$button-badge-font-family: $font-family;
+$button-badge-background-color: colors.$color-red;
+$button-badge-color: colors.$color-text-lighter;
+$button-badge-font-family: variables.$font-family;
 $button-badge-font-size: 0.8125rem;
 $button-badge-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2);
 
@@ -65,10 +64,10 @@ $button-icon-padding: 10px;
 	cursor: pointer;
 	user-select: none;
 	transition:
-		color $default-time-animation,
-		background-color $default-time-animation,
-		border-color $default-time-animation,
-		transform math.div($default-time-animation, 2);
+		color variables.$default-time-animation,
+		background-color variables.$default-time-animation,
+		border-color variables.$default-time-animation,
+		transform math.div(variables.$default-time-animation, 2);
 	white-space: nowrap;
 	text-decoration: none;
 
@@ -83,7 +82,7 @@ $button-icon-padding: 10px;
 	justify-content: center;
 
 	@include state(var(--color, $button-background-color), transparent);
-	@include pressable-button($button-active-displacement, $button-border-width);
+	@include helpers.pressable-button($button-active-displacement, $button-border-width);
 
 	&:focus {
 		box-shadow: 0 0 5px rgba(#000000, 0.5);
diff --git a/packages/livechat/src/components/ButtonGroup/styles.scss b/packages/livechat/src/components/ButtonGroup/styles.scss
index 55376240df52..d3274f8aaf93 100644
--- a/packages/livechat/src/components/ButtonGroup/styles.scss
+++ b/packages/livechat/src/components/ButtonGroup/styles.scss
@@ -1,8 +1,7 @@
 @use 'sass:math';
+@use '../../styles/variables';
 
-@import '../../styles/variables';
-
-$button-group-margin: math.div($default-gap, 4);
+$button-group-margin: math.div(variables.$default-gap, 4);
 
 .button-group {
 	display: flex;
diff --git a/packages/livechat/src/components/Calls/styles.scss b/packages/livechat/src/components/Calls/styles.scss
index 333655e58633..c8f6841f9081 100644
--- a/packages/livechat/src/components/Calls/styles.scss
+++ b/packages/livechat/src/components/Calls/styles.scss
@@ -1,5 +1,5 @@
-@import '../../styles/colors';
-@import '../../styles/variables';
+@use '../../styles/colors';
+@use '../../styles/variables';
 
 .call-notification {
 	position: relative;
diff --git a/packages/livechat/src/components/Composer/ComposerAction/styles.scss b/packages/livechat/src/components/Composer/ComposerAction/styles.scss
index a95ec44c1d2c..13ef549ab1d6 100644
--- a/packages/livechat/src/components/Composer/ComposerAction/styles.scss
+++ b/packages/livechat/src/components/Composer/ComposerAction/styles.scss
@@ -1,4 +1,4 @@
-@import '../../../styles/helpers';
+@use '../../../styles/helpers';
 
 $composer-action-margin: 0 6px;
 
@@ -22,5 +22,5 @@ $composer-action-margin: 0 6px;
 		outline: none;
 	}
 
-	@include pressable-button(1px);
+	@include helpers.pressable-button(1px);
 }
diff --git a/packages/livechat/src/components/Composer/styles.scss b/packages/livechat/src/components/Composer/styles.scss
index 0ee3eb61981c..15a75e9c7115 100644
--- a/packages/livechat/src/components/Composer/styles.scss
+++ b/packages/livechat/src/components/Composer/styles.scss
@@ -1,22 +1,22 @@
-@import '../../styles/colors';
-@import '../../styles/helpers';
-@import '../../styles/variables';
+@use '../../styles/colors';
+@use '../../styles/helpers';
+@use '../../styles/variables';
 
 $composer-padding: 12px 6px;
-$composer-border-width: $default-border;
-$composer-border-color: $color-text-light;
-$composer-border-radius: $default-border-radius;
-$composer-background-color: $bg-color-white;
-$composer-focused-border-color: $color-text-grey;
+$composer-border-width: variables.$default-border;
+$composer-border-color: colors.$color-text-light;
+$composer-border-radius: variables.$default-border-radius;
+$composer-background-color: colors.$bg-color-white;
+$composer-focused-border-color: colors.$color-text-grey;
 
 $composer-input-min-height: 20px;
 $composer-input-max-height: 150px;
 $composer-input-padding: 2px 6px;
-$composer-input-color: $bg-color-dark;
+$composer-input-color: colors.$bg-color-dark;
 $composer-input-font-size: 0.875rem;
 $composer-input-font-weight: 500;
 $composer-input-line-height: 1.25rem;
-$composer-input-placeholder-color: $color-text-light;
+$composer-input-placeholder-color: colors.$color-text-light;
 
 .composer {
 	display: flex;
@@ -24,7 +24,7 @@ $composer-input-placeholder-color: $color-text-light;
 	width: 100%;
 	padding: $composer-padding;
 
-	transition: all $default-time-animation;
+	transition: all variables.$default-time-animation;
 
 	border: $composer-border-width solid $composer-border-color;
 	border-radius: $composer-border-radius;
diff --git a/packages/livechat/src/components/FilesDropTarget/styles.scss b/packages/livechat/src/components/FilesDropTarget/styles.scss
index b36f6d72411f..453b9996106a 100644
--- a/packages/livechat/src/components/FilesDropTarget/styles.scss
+++ b/packages/livechat/src/components/FilesDropTarget/styles.scss
@@ -1,9 +1,9 @@
-@import '../../styles/colors';
-@import '../../styles/variables';
+@use '../../styles/colors';
+@use '../../styles/variables';
 
-$drop-overlay-animation-time: $default-time-animation;
-$drop-overlay-background-color: rgba($bg-color-white, 0.9);
-$drop-overlay-gap: $default-padding;
+$drop-overlay-animation-time: variables.$default-time-animation;
+$drop-overlay-background-color: rgba(colors.$bg-color-white, 0.9);
+$drop-overlay-gap: variables.$default-padding;
 $drop-overlay-border-width: 4px;
 $drop-overlay-border-style: dashed;
 $drop-overlay-text-font-size: 1.375rem;
@@ -21,25 +21,18 @@ $drop-overlay-text-font-size: 1.375rem;
 		&::before {
 			position: absolute;
 			z-index: 10;
-			top: 0;
-			right: 0;
-			bottom: 0;
-			left: 0;
 
 			content: "";
 			animation: fadein $drop-overlay-animation-time;
 			pointer-events: none;
 
 			background-color: $drop-overlay-background-color;
+			inset: 0;
 		}
 
 		&::after {
 			position: absolute;
 			z-index: 10;
-			top: $drop-overlay-gap;
-			right: $drop-overlay-gap;
-			bottom: $drop-overlay-gap;
-			left: $drop-overlay-gap;
 
 			display: flex;
 
@@ -51,12 +44,13 @@ $drop-overlay-text-font-size: 1.375rem;
 			text-align: center;
 			pointer-events: none;
 
-			color: var(--color, $color-blue);
-			border: $drop-overlay-border-width var(--color, $color-blue) $drop-overlay-border-style;
+			color: var(--color, colors.$color-blue);
+			border: $drop-overlay-border-width var(--color, colors.$color-blue) $drop-overlay-border-style;
 
 			font-size: $drop-overlay-text-font-size;
 			font-weight: 500;
 			align-items: center;
+			inset: $drop-overlay-gap $drop-overlay-gap $drop-overlay-gap $drop-overlay-gap;
 			justify-content: center;
 		}
 	}
diff --git a/packages/livechat/src/components/Footer/styles.scss b/packages/livechat/src/components/Footer/styles.scss
index 4fce9533acea..6743cca9aaf0 100644
--- a/packages/livechat/src/components/Footer/styles.scss
+++ b/packages/livechat/src/components/Footer/styles.scss
@@ -1,6 +1,6 @@
-@import '../../styles/colors';
-@import '../../styles/helpers';
-@import '../../styles/variables';
+@use '../../styles/colors';
+@use '../../styles/helpers';
+@use '../../styles/variables';
 
 .footer {
 	z-index: 2;
@@ -12,9 +12,9 @@
 	width: 100%;
 	padding: 4px 8px;
 
-	color: $color-text-grey;
+	color: colors.$color-text-grey;
 
-	background-color: $bg-color-white;
+	background-color: colors.$bg-color-white;
 
 	font-size: 0.625rem;
 	align-items: stretch;
@@ -31,11 +31,11 @@
 
 		cursor: pointer;
 		user-select: none;
-		transition: trasform $default-time-animation;
+		transition: trasform variables.$default-time-animation;
 		text-align: left;
 		letter-spacing: 0.2px;
 
-		color: $color-text-grey;
+		color: colors.$color-text-grey;
 		border: none;
 		background: none;
 
@@ -48,7 +48,7 @@
 			color: black;
 		}
 
-		@include pressable-button(2px);
+		@include helpers.pressable-button(2px);
 	}
 
 	&__remainder {
@@ -60,7 +60,7 @@
 		&--highlight {
 			transition: color 0.2s;
 
-			color: $color-red;
+			color: colors.$color-red;
 		}
 	}
 }
@@ -86,7 +86,7 @@
 		align-items: center;
 
 		svg {
-			fill: #{$color-text-grey};
+			fill: #{colors.$color-text-grey};
 
 			&:hover {
 				fill: #db2323;
diff --git a/packages/livechat/src/components/Form/CustomFields/index.tsx b/packages/livechat/src/components/Form/CustomFields/index.tsx
index 3bca3375a972..b0f3022ebd01 100644
--- a/packages/livechat/src/components/Form/CustomFields/index.tsx
+++ b/packages/livechat/src/components/Form/CustomFields/index.tsx
@@ -39,7 +39,7 @@ export const CustomFields = ({ customFields, loading, control, errors }: RenderC
 								message: t('invalid', { field: label }),
 							},
 						}),
-				  };
+					};
 
 		return (
 			<FormField label={label} required={required} key={_id} error={errors?.[_id]?.message?.toString()}>
diff --git a/packages/livechat/src/components/Form/DateInput/styles.scss b/packages/livechat/src/components/Form/DateInput/styles.scss
index f660055b10c2..1eeb574dde57 100644
--- a/packages/livechat/src/components/Form/DateInput/styles.scss
+++ b/packages/livechat/src/components/Form/DateInput/styles.scss
@@ -1,5 +1,5 @@
-@import '../mixins';
+@use '../mixins';
 
 .date-input {
-	@include form__input-box;
+	@include mixins.form__input-box;
 }
diff --git a/packages/livechat/src/components/Form/FormField/styles.scss b/packages/livechat/src/components/Form/FormField/styles.scss
index 335a5946de7e..96e7a459be99 100644
--- a/packages/livechat/src/components/Form/FormField/styles.scss
+++ b/packages/livechat/src/components/Form/FormField/styles.scss
@@ -1,19 +1,19 @@
-@import '../../../styles/colors';
-@import '../../../styles/variables';
+@use '../../../styles/colors';
+@use '../../../styles/variables';
 
-$form-field-label-color: $color-text-dark;
-$form-field-label-error-color: $color-red;
+$form-field-label-color: colors.$color-text-dark;
+$form-field-label-error-color: colors.$color-red;
 $form-field-label-font-size: 0.75rem;
 $form-field-label-font-weight: 600;
 $form-field-label-line-height: 1rem;
 
-$form-field-description-color: $color-text-grey;
+$form-field-description-color: colors.$color-text-grey;
 $form-field-description-font-size: 0.75rem;
 $form-field-description-font-weight: 500;
 $form-field-description-line-height: 1rem;
 
-$form-field-error-color: $color-red;
-$form-field-error-border-color: $color-red;
+$form-field-error-color: colors.$color-red;
+$form-field-error-border-color: colors.$color-red;
 
 .form-field {
 	display: flex;
@@ -37,7 +37,7 @@ $form-field-error-border-color: $color-red;
 	&__label {
 		flex: 0 0 auto;
 
-		transition: color $default-time-animation;
+		transition: color variables.$default-time-animation;
 		text-align: left;
 		white-space: nowrap;
 		letter-spacing: 0;
@@ -60,7 +60,7 @@ $form-field-error-border-color: $color-red;
 
 		min-height: $form-field-description-line-height;
 
-		transition: color $default-time-animation;
+		transition: color variables.$default-time-animation;
 
 		color: $form-field-description-color;
 
diff --git a/packages/livechat/src/components/Form/MultilineTextInput/styles.scss b/packages/livechat/src/components/Form/MultilineTextInput/styles.scss
index 66c4783e5dda..13b8be3be5c8 100644
--- a/packages/livechat/src/components/Form/MultilineTextInput/styles.scss
+++ b/packages/livechat/src/components/Form/MultilineTextInput/styles.scss
@@ -1,7 +1,7 @@
-@import '../mixins';
+@use '../mixins';
 
 .textarea-input {
 	resize: none;
 
-	@include form__input-box;
+	@include mixins.form__input-box;
 }
diff --git a/packages/livechat/src/components/Form/PasswordInput/styles.scss b/packages/livechat/src/components/Form/PasswordInput/styles.scss
index 32d1dfa1bc6c..45d599a19ca7 100644
--- a/packages/livechat/src/components/Form/PasswordInput/styles.scss
+++ b/packages/livechat/src/components/Form/PasswordInput/styles.scss
@@ -1,5 +1,5 @@
-@import '../mixins';
+@use '../mixins';
 
 .password-input {
-	@include form__input-box;
+	@include mixins.form__input-box;
 }
diff --git a/packages/livechat/src/components/Form/SelectInput/styles.scss b/packages/livechat/src/components/Form/SelectInput/styles.scss
index 78f2fd6f08b2..c3d4e8b14a48 100644
--- a/packages/livechat/src/components/Form/SelectInput/styles.scss
+++ b/packages/livechat/src/components/Form/SelectInput/styles.scss
@@ -1,8 +1,9 @@
-@import '../mixins';
+@use '../mixins';
+@use "../../../styles/colors";
 
-$form-input-select-arrow-size: $form-input-padding;
-$form-input-select-arrow-padding: $form-input-padding;
-$form-input-select-arrow-color: $color-text-light;
+$form-input-select-arrow-size: mixins.$form-input-padding;
+$form-input-select-arrow-padding: mixins.$form-input-padding;
+$form-input-select-arrow-color: colors.$color-text-light;
 
 .select-input {
 	position: relative;
@@ -15,7 +16,7 @@ $form-input-select-arrow-color: $color-text-light;
 
 		padding-right: (3 * $form-input-select-arrow-padding + $form-input-select-arrow-size);
 
-		color: $form-input-color;
+		color: mixins.$form-input-color;
 
 		-webkit-appearance: none;
 		-moz-appearance: none;
@@ -26,18 +27,18 @@ $form-input-select-arrow-color: $color-text-light;
 		}
 
 		&--placeholder {
-			color: $form-input-placeholder-color;
+			color: mixins.$form-input-placeholder-color;
 		}
 
 		&--small {
 			padding-right: (3 * $form-input-select-arrow-padding + $form-input-select-arrow-size);
 		}
 
-		@include form__input-box;
+		@include mixins.form__input-box;
 	}
 
 	&__option {
-		color: $form-input-color;
+		color: mixins.$form-input-color;
 	}
 
 	&__arrow {
diff --git a/packages/livechat/src/components/Form/TextInput/styles.scss b/packages/livechat/src/components/Form/TextInput/styles.scss
index a157985dbd8f..afc05689bf92 100644
--- a/packages/livechat/src/components/Form/TextInput/styles.scss
+++ b/packages/livechat/src/components/Form/TextInput/styles.scss
@@ -1,5 +1,5 @@
-@import '../mixins';
+@use '../mixins';
 
 .text-input {
-	@include form__input-box;
+	@include mixins.form__input-box;
 }
diff --git a/packages/livechat/src/components/Form/mixins.scss b/packages/livechat/src/components/Form/mixins.scss
index 1d153a883a25..dd522667aa22 100644
--- a/packages/livechat/src/components/Form/mixins.scss
+++ b/packages/livechat/src/components/Form/mixins.scss
@@ -1,50 +1,50 @@
 @use 'sass:math';
+@use '../../styles/variables';
+@use '../../styles/colors';
 
-@import '../../styles/variables';
-@import '../../styles/colors';
-
-$form-input-border-width: $default-border;
-$form-input-border-radius: $default-border-radius;
-$form-input-padding: (0.75 * $default-gap - $default-border);
-$form-input-small-padding: (0.25 * $default-gap - math.div($default-border, 2)) (0.75 * $default-gap - $default-border);
-$form-input-color: $color-text-dark;
-$form-input-placeholder-color: $color-text-light;
-$form-input-background-color: $bg-color-white;
-$form-input-border-color: $bg-color-grey;
-$form-input-focus-border-color: $color-text-dark;
-$form-input-hover-border-color: $color-text-light;
-$form-input-disabled-background-color: $bg-color-grey;
-$form-input-disabled-color: $color-text-light;
-$form-input-error-color: $color-red;
-$form-input-error-border-color: $color-red;
-$form-input-font-family: $font-family;
+$form-input-border-width: variables.$default-border;
+$form-input-border-radius: variables.$default-border-radius;
+$form-input-padding: (0.75 * variables.$default-gap - variables.$default-border);
+$form-input-small-padding: (0.25 * variables.$default-gap - math.div(variables.$default-border, 2)) (0.75 * variables.$default-gap - variables.$default-border);
+$form-input-color: colors.$color-text-dark;
+$form-input-placeholder-color: colors.$color-text-light;
+$form-input-background-color: colors.$bg-color-white;
+$form-input-border-color: colors.$bg-color-grey;
+$form-input-focus-border-color: colors.$color-text-dark;
+$form-input-hover-border-color: colors.$color-text-light;
+$form-input-disabled-background-color: colors.$bg-color-grey;
+$form-input-disabled-color: colors.$color-text-light;
+$form-input-error-color: colors.$color-red;
+$form-input-error-border-color: colors.$color-red;
+$form-input-font-family: variables.$font-family;
 $form-input-font-size: 0.875rem;
 $form-input-font-weight: 500;
 $form-input-line-height: 1.25rem;
-$form-input-disabled-opacity: $disabled-opacity;
+$form-input-disabled-opacity: variables.$disabled-opacity;
 
 @mixin form__input-box {
-	flex: 1 1 auto;
-
-	padding: $form-input-padding;
+	& {
+		flex: 1 1 auto;
 
-	transition:
-		border-color $default-time-animation,
-		color $default-time-animation,
-		background-color $default-time-animation,
-		trasform $default-time-animation;
+		padding: $form-input-padding;
 
-	color: $form-input-color;
+		transition:
+		border-color variables.$default-time-animation,
+		color variables.$default-time-animation,
+		background-color variables.$default-time-animation,
+		trasform variables.$default-time-animation;
 
-	border: $form-input-border-width solid $form-input-border-color;
-	border-radius: $form-input-border-radius;
-	outline: none;
-	background-color: $form-input-background-color;
+		color: $form-input-color;
+		border: $form-input-border-width solid $form-input-border-color;
+		border-radius: $form-input-border-radius;
+		outline: none;
+		background-color: $form-input-background-color;
 
-	font-family: $form-input-font-family;
-	font-size: $form-input-font-size;
-	font-weight: $form-input-font-weight;
-	line-height: $form-input-line-height;
+		font-family: $form-input-font-family;
+		font-size: $form-input-font-size;
+		font-weight: $form-input-font-weight;
+		line-height: $form-input-line-height;
+	}
 
 	&:focus {
 		border-color: $form-input-focus-border-color;
diff --git a/packages/livechat/src/components/Header/styles.scss b/packages/livechat/src/components/Header/styles.scss
index ab90e6946e9f..ffc7272c2276 100644
--- a/packages/livechat/src/components/Header/styles.scss
+++ b/packages/livechat/src/components/Header/styles.scss
@@ -1,12 +1,11 @@
 @use 'sass:math';
+@use '../../styles/colors';
+@use '../../styles/helpers';
+@use '../../styles/variables';
 
-@import '../../styles/colors';
-@import '../../styles/helpers';
-@import '../../styles/variables';
-
-$header-background-color: $color-dark-blue;
-$header-color: $color-text-lighter;
-$header-padding: $default-padding;
+$header-background-color: colors.$color-dark-blue;
+$header-color: colors.$color-text-lighter;
+$header-padding: variables.$default-padding;
 $header-height: 56px;
 $header-height-large: 77px;
 
@@ -24,7 +23,7 @@ $header-action-active-displacement: 2px;
 
 	color: var(--font-color, $header-color);
 	background-color: var(--color, $header-background-color);
-	box-shadow: 0 0 16px $bg-color-grey;
+	box-shadow: 0 0 16px colors.$bg-color-grey;
 
 	font-size: 16px;
 	align-items: center;
@@ -102,7 +101,7 @@ $header-action-active-displacement: 2px;
 			background: none;
 			justify-content: center;
 
-			@include pressable-button($header-action-active-displacement, 0);
+			@include helpers.pressable-button($header-action-active-displacement, 0);
 		}
 	}
 
diff --git a/packages/livechat/src/components/Menu/styles.scss b/packages/livechat/src/components/Menu/styles.scss
index e15f28729a0e..07b3a1021ea7 100644
--- a/packages/livechat/src/components/Menu/styles.scss
+++ b/packages/livechat/src/components/Menu/styles.scss
@@ -1,7 +1,7 @@
 @use 'sass:math';
-
-@import '../../styles/colors';
-@import '../../styles/variables';
+@use "sass:color";
+@use '../../styles/colors';
+@use '../../styles/variables';
 
 .menu {
 	display: flex;
@@ -11,15 +11,15 @@
 
 	user-select: none;
 	transition:
-		opacity $default-time-animation,
-		visibility $default-time-animation,
-		transform math.div($default-time-animation, 2);
+		opacity variables.$default-time-animation,
+		visibility variables.$default-time-animation,
+		transform math.div(variables.$default-time-animation, 2);
 
 	border-radius: 4px;
-	background: $bg-color-white;
+	background: colors.$bg-color-white;
 	box-shadow:
-		0 0 2px 0 rgba($bg-color-dark, 0.08),
-		0 0 12px 0 rgba($bg-color-dark, 0.12);
+		0 0 2px 0 rgba(colors.$bg-color-dark, 0.08),
+		0 0 12px 0 rgba(colors.$bg-color-dark, 0.12);
 	align-items: stretch;
 
 	&:empty {
@@ -36,7 +36,7 @@
 
 			letter-spacing: 0;
 
-			color: $color-text-dark;
+			color: colors.$color-text-dark;
 
 			font-size: 12px;
 			font-weight: 600;
@@ -50,7 +50,7 @@
 
 			content: "";
 
-			border: 1px solid $bg-color-grey;
+			border: 1px solid colors.$bg-color-grey;
 		}
 	}
 
@@ -77,22 +77,22 @@
 			color: $color;
 
 			&:hover {
-				background-color: mix($color, $bg-color-white, 5%);
+				background-color: color.mix($color, colors.$bg-color-white, 5%);
 			}
 
 			&:active {
-				background-color: mix($color, $bg-color-white, 10%);
+				background-color: color.mix($color, colors.$bg-color-white, 10%);
 			}
 		}
 
-		@include itemcolor($color-text-dark);
+		@include itemcolor(colors.$color-text-dark);
 
 		&--primary {
-			@include itemcolor($color-blue);
+			@include itemcolor(colors.$color-blue);
 		}
 
 		&--danger {
-			@include itemcolor($color-red);
+			@include itemcolor(colors.$color-red);
 		}
 
 		&--disabled {
@@ -150,5 +150,5 @@
 }
 
 .popover-menu__overlay {
-	background-color: $overlay-bg-color;
+	background-color: colors.$overlay-bg-color;
 }
diff --git a/packages/livechat/src/components/Messages/FileAttachment/styles.scss b/packages/livechat/src/components/Messages/FileAttachment/styles.scss
index b421250f9f20..30aa82d16c03 100644
--- a/packages/livechat/src/components/Messages/FileAttachment/styles.scss
+++ b/packages/livechat/src/components/Messages/FileAttachment/styles.scss
@@ -1,13 +1,13 @@
-@import '../../../styles/colors';
+@use '../../../styles/colors';
 
 $file-attachment-min-width: 180px;
 $file-attachment-height: 2rem;
-$file-attachment-color: $color-text-dark;
+$file-attachment-color: colors.$color-text-dark;
 $file-attachment-font-size: 0.75rem;
 $file-attachment-line-height: 1rem;
 $file-attachment-title-margin: 0 8px;
-$file-attachment-download-color: $color-text-light;
-$file-attachment-download-highlight-color: $color-blue;
+$file-attachment-download-color: colors.$color-text-light;
+$file-attachment-download-highlight-color: colors.$color-blue;
 
 .file-attachment {
 	& &__inner {
diff --git a/packages/livechat/src/components/Messages/MessageBubble/styles.scss b/packages/livechat/src/components/Messages/MessageBubble/styles.scss
index e155aa194c24..1ddc002b4e66 100644
--- a/packages/livechat/src/components/Messages/MessageBubble/styles.scss
+++ b/packages/livechat/src/components/Messages/MessageBubble/styles.scss
@@ -1,21 +1,21 @@
-@import '../../../styles/colors';
-@import '../../../styles/variables';
+@use '../../../styles/colors';
+@use '../../../styles/variables';
 
 $message-bubble-padding: 12px;
-$message-bubble-background-color: $bg-color-light;
-$message-bubble-color: $color-text-dark;
-$message-bubble-border-radius: $default-border-radius;
-$message-bubble-link-color: $color-blue;
-$message-bubble-me-background-color: $color-blue;
-$message-bubble-me-color: $color-text-lighter;
-$message-bubble-me-link-color: $color-text-lighter;
+$message-bubble-background-color: colors.$bg-color-light;
+$message-bubble-color: colors.$color-text-dark;
+$message-bubble-border-radius: variables.$default-border-radius;
+$message-bubble-link-color: colors.$color-blue;
+$message-bubble-me-background-color: colors.$color-blue;
+$message-bubble-me-color: colors.$color-text-lighter;
+$message-bubble-me-link-color: colors.$color-text-lighter;
 $message-bubble-nude-padding: 0;
 $message-bubble-quoted-padding: 12px 12px 12px 0;
 $message-bubble-quoted-indicator-width: 3px;
 $message-bubble-quoted-indicator-margin: (-2 * $message-bubble-quoted-indicator-width) (2 * $message-bubble-quoted-indicator-width)
 	(-2 * $message-bubble-quoted-indicator-width) $message-bubble-quoted-indicator-width;
-$message-bubble-quoted-indicator-border-radius: $default-border-radius;
-$message-bubble-quoted-indicator-color: $color-green;
+$message-bubble-quoted-indicator-border-radius: variables.$default-border-radius;
+$message-bubble-quoted-indicator-color: colors.$color-green;
 
 .message-bubble {
 	display: flex;
diff --git a/packages/livechat/src/components/Messages/MessageContainer/styles.scss b/packages/livechat/src/components/Messages/MessageContainer/styles.scss
index 532b9f5fb770..7384f6a2782d 100644
--- a/packages/livechat/src/components/Messages/MessageContainer/styles.scss
+++ b/packages/livechat/src/components/Messages/MessageContainer/styles.scss
@@ -1,9 +1,8 @@
 @use 'sass:math';
+@use '../../../styles/variables';
 
-@import '../../../styles/variables';
-
-$message-container-margin: 0 0 $default-padding 0;
-$message-container-compact-margin: 0 0 math.div($default-padding, 4) 0;
+$message-container-margin: 0 0 variables.$default-padding 0;
+$message-container-compact-margin: 0 0 math.div(variables.$default-padding, 4) 0;
 
 .message-container {
 	display: flex;
diff --git a/packages/livechat/src/components/Messages/MessageContent/styles.scss b/packages/livechat/src/components/Messages/MessageContent/styles.scss
index 54644d982551..72a6bce00c96 100644
--- a/packages/livechat/src/components/Messages/MessageContent/styles.scss
+++ b/packages/livechat/src/components/Messages/MessageContent/styles.scss
@@ -1,9 +1,8 @@
 @use 'sass:math';
+@use '../../../styles/variables';
 
-@import '../../../styles/variables';
-
-$message-content-gap: math.div($default-gap, 2);
-$message-content-margin: math.div(-$message-content-gap, 2) math.div($default-gap, 2);
+$message-content-gap: math.div(variables.$default-gap, 2);
+$message-content-margin: math.div(-$message-content-gap, 2) math.div(variables.$default-gap, 2);
 
 .message-content {
 	display: flex;
diff --git a/packages/livechat/src/components/Messages/MessageList/styles.scss b/packages/livechat/src/components/Messages/MessageList/styles.scss
index 005257e85f35..68d0e6e3f5fc 100644
--- a/packages/livechat/src/components/Messages/MessageList/styles.scss
+++ b/packages/livechat/src/components/Messages/MessageList/styles.scss
@@ -1,5 +1,5 @@
-@import '../../../styles/colors';
-@import '../../../styles/variables';
+@use '../../../styles/colors';
+@use '../../../styles/variables';
 
 .message-list {
 	display: flex;
@@ -23,7 +23,7 @@
 
 	&:hover::-webkit-scrollbar {
 		&-thumb {
-			background-color: $color-text-light;
+			background-color: colors.$color-text-light;
 		}
 	}
 
diff --git a/packages/livechat/src/components/Messages/MessageSeparator/styles.scss b/packages/livechat/src/components/Messages/MessageSeparator/styles.scss
index cd90c287e92a..dab7d8ff5dd5 100644
--- a/packages/livechat/src/components/Messages/MessageSeparator/styles.scss
+++ b/packages/livechat/src/components/Messages/MessageSeparator/styles.scss
@@ -1,18 +1,18 @@
-@import '../../../styles/colors';
-@import '../../../styles/variables';
+@use '../../../styles/colors';
+@use '../../../styles/variables';
 
 $separator-text-font-size: 0.625rem;
 $separator-text-letter-spacing: 0.2px;
 $separator-line-width: 2px;
-$separator-date-text-color: $color-text-grey;
-$separator-date-line-color: $bg-color-grey;
-$separator-unread-text-color: $color-red;
-$separator-unread-line-color: $color-red;
+$separator-date-text-color: colors.$color-text-grey;
+$separator-date-line-color: colors.$bg-color-grey;
+$separator-unread-text-color: colors.$color-red;
+$separator-unread-line-color: colors.$color-red;
 
 .separator {
 	display: flex;
 
-	margin: $default-gap 0;
+	margin: variables.$default-gap 0;
 	align-items: center;
 	flex-flow: row nowrap;
 
diff --git a/packages/livechat/src/components/Messages/MessageText/markdown.ts b/packages/livechat/src/components/Messages/MessageText/markdown.ts
index 05c91ae5fdf9..df65ff195568 100644
--- a/packages/livechat/src/components/Messages/MessageText/markdown.ts
+++ b/packages/livechat/src/components/Messages/MessageText/markdown.ts
@@ -74,7 +74,6 @@ md.use((md) => {
 			state.delimiters.push({
 				marker,
 				length: 0,
-				jump: i,
 				token: state.tokens.length - 1,
 				end: -1,
 				open: scanned.can_open,
diff --git a/packages/livechat/src/components/Messages/MessageText/styles.scss b/packages/livechat/src/components/Messages/MessageText/styles.scss
index a60123d1b5fa..1efeaa5301ad 100644
--- a/packages/livechat/src/components/Messages/MessageText/styles.scss
+++ b/packages/livechat/src/components/Messages/MessageText/styles.scss
@@ -1,5 +1,5 @@
-@import '../../../styles/colors';
-@import '../../../styles/variables';
+@use '../../../styles/colors';
+@use '../../../styles/variables';
 
 $message-text-font-size: 0.875rem;
 
@@ -32,7 +32,7 @@ $message-text-font-size: 0.875rem;
 	&--system {
 		width: 200px;
 
-		color: $color-text-grey-system;
+		color: colors.$color-text-grey-system;
 
 		font-size: 0.75rem;
 
diff --git a/packages/livechat/src/components/Messages/MessageTime/styles.scss b/packages/livechat/src/components/Messages/MessageTime/styles.scss
index 482fd8b5152a..6d45176d2730 100644
--- a/packages/livechat/src/components/Messages/MessageTime/styles.scss
+++ b/packages/livechat/src/components/Messages/MessageTime/styles.scss
@@ -1,12 +1,11 @@
 @use 'sass:math';
+@use '../../../styles/colors';
+@use '../../../styles/variables';
 
-@import '../../../styles/colors';
-@import '../../../styles/variables';
-
-$message-time-margin: 0 math.div($default-gap, 2);
+$message-time-margin: 0 math.div(variables.$default-gap, 2);
 $message-time-font-size: 0.625rem;
 $message-time-line-height: 1rem;
-$message-time-color: $color-text-grey;
+$message-time-color: colors.$color-text-grey;
 
 .message-time {
 	position: absolute;
diff --git a/packages/livechat/src/components/Messages/TypingDots/styles.scss b/packages/livechat/src/components/Messages/TypingDots/styles.scss
index 11462707ebd7..ea846c0ac544 100644
--- a/packages/livechat/src/components/Messages/TypingDots/styles.scss
+++ b/packages/livechat/src/components/Messages/TypingDots/styles.scss
@@ -1,13 +1,13 @@
-@import '../../../styles/colors';
-@import '../../../styles/helpers';
-@import '../../../styles/variables';
+@use '../../../styles/colors';
+@use '../../../styles/helpers';
+@use '../../../styles/variables';
 
 $typing-dots-dot-size: 8px;
 $typing-dots-dot-margin: 0 2px;
-$typing-dots-dot-color: $color-text-grey;
-$typing-dots-dot-highlight-color: $bg-color-grey;
-$typing-dots-dot-animation-time: 3 * $default-time-animation;
-$typing-dots-dot-animation-delay-gap: $default-time-animation;
+$typing-dots-dot-color: colors.$color-text-grey;
+$typing-dots-dot-highlight-color: colors.$bg-color-grey;
+$typing-dots-dot-animation-time: 3 * variables.$default-time-animation;
+$typing-dots-dot-animation-delay-gap: variables.$default-time-animation;
 
 .typing-dots {
 	text-align: center;
@@ -35,7 +35,7 @@ $typing-dots-dot-animation-delay-gap: $default-time-animation;
 	}
 }
 
-@include keyframes('typing-dots__indicator') {
+@include helpers.keyframes('typing-dots__indicator') {
 	0% {
 		background-color: $typing-dots-dot-color;
 	}
diff --git a/packages/livechat/src/components/Modal/styles.scss b/packages/livechat/src/components/Modal/styles.scss
index 359a953bf124..d289735bba1b 100644
--- a/packages/livechat/src/components/Modal/styles.scss
+++ b/packages/livechat/src/components/Modal/styles.scss
@@ -1,10 +1,10 @@
-@import '../../styles/colors';
-@import '../../styles/variables';
+@use '../../styles/colors';
+@use '../../styles/variables';
 
-$modal-padding: $default-padding;
-$modal-border-radius: 2 * $default-border-radius;
+$modal-padding: variables.$default-padding;
+$modal-border-radius: 2 * variables.$default-border-radius;
 $modal-shadow: 0 7px 16px 0 rgba(0, 0, 0, 0.1);
-$modal-background-color: $bg-color-white;
+$modal-background-color: colors.$bg-color-white;
 
 :global(.is-blurred) {
 	filter: blur(2px);
@@ -19,7 +19,7 @@ $modal-background-color: $bg-color-white;
 	width: 100%;
 	height: 100%;
 
-	background-color: $overlay-bg-color;
+	background-color: colors.$overlay-bg-color;
 }
 
 .modal {
@@ -43,7 +43,7 @@ $modal-background-color: $bg-color-white;
 
 	&--animated {
 		animation-name: fadeInUp;
-		animation-duration: $default-time-animation;
+		animation-duration: variables.$default-time-animation;
 	}
 }
 
@@ -52,7 +52,7 @@ $modal-background-color: $bg-color-white;
 
 	text-align: center;
 
-	color: $color-text-dark;
+	color: colors.$color-text-dark;
 
 	font-size: 1rem;
 	font-weight: 500;
diff --git a/packages/livechat/src/components/Popover/styles.scss b/packages/livechat/src/components/Popover/styles.scss
index c274bfa9a3ae..981d64b538ba 100644
--- a/packages/livechat/src/components/Popover/styles.scss
+++ b/packages/livechat/src/components/Popover/styles.scss
@@ -1,12 +1,9 @@
 .popover__overlay {
 	position: absolute;
 	z-index: 10;
-	top: 0;
-	right: 0;
-	bottom: 0;
-	left: 0;
 
 	visibility: hidden;
+	inset: 0;
 
 	&--visible {
 		visibility: visible;
diff --git a/packages/livechat/src/components/Screen/Header.tsx b/packages/livechat/src/components/Screen/Header.tsx
index 671a5b343b21..a2080382dc91 100644
--- a/packages/livechat/src/components/Screen/Header.tsx
+++ b/packages/livechat/src/components/Screen/Header.tsx
@@ -12,6 +12,7 @@ import Alert from '../Alert';
 import { Avatar } from '../Avatar';
 import Header from '../Header';
 import Tooltip from '../Tooltip';
+import type { ScreenContextValue } from './ScreenProvider';
 
 type screenHeaderProps = {
 	alerts: { id: string; children: ComponentChildren; [key: string]: unknown }[];
@@ -24,7 +25,7 @@ type screenHeaderProps = {
 	onEnableNotifications: () => unknown;
 	onDisableNotifications: () => unknown;
 	onMinimize: () => unknown;
-	onRestore: () => unknown;
+	onRestore: ScreenContextValue['onRestore'];
 	onOpenWindow: () => unknown;
 	queueInfo: {
 		spot: number;
diff --git a/packages/livechat/src/components/Screen/ScreenProvider.tsx b/packages/livechat/src/components/Screen/ScreenProvider.tsx
index 1d1295b126b3..aa1dd61c59be 100644
--- a/packages/livechat/src/components/Screen/ScreenProvider.tsx
+++ b/packages/livechat/src/components/Screen/ScreenProvider.tsx
@@ -4,7 +4,9 @@ import { useCallback, useContext, useEffect, useState } from 'preact/hooks';
 import { parse } from 'query-string';
 
 import { isActiveSession } from '../../helpers/isActiveSession';
+import { loadConfig } from '../../lib/main';
 import { parentCall } from '../../lib/parentCall';
+import { loadMessages } from '../../lib/room';
 import Triggers from '../../lib/triggers';
 import { StoreContext } from '../../store';
 
@@ -24,7 +26,7 @@ export type ScreenContextValue = {
 	onEnableNotifications: () => unknown;
 	onDisableNotifications: () => unknown;
 	onMinimize: () => unknown;
-	onRestore: () => unknown;
+	onRestore: () => Promise<void>;
 	onOpenWindow: () => unknown;
 	onDismissAlert: () => unknown;
 	dismissNotification: () => void;
@@ -55,7 +57,7 @@ export const ScreenContext = createContext<ScreenContextValue>({
 	onEnableNotifications: () => undefined,
 	onDisableNotifications: () => undefined,
 	onMinimize: () => undefined,
-	onRestore: () => undefined,
+	onRestore: async () => undefined,
 	onOpenWindow: () => undefined,
 } as ScreenContextValue);
 
@@ -109,26 +111,23 @@ export const ScreenProvider: FunctionalComponent = ({ children }) => {
 		dispatch({ minimized: true });
 	};
 
-	const handleRestore = () => {
+	const handleRestore = async () => {
 		parentCall('restoreWindow');
-		const dispatchRestore = () => dispatch({ minimized: false, undocked: false });
-
-		const dispatchEvent = () => {
-			dispatchRestore();
-			store.off('storageSynced', dispatchEvent);
-		};
 
 		if (undocked) {
-			store.on('storageSynced', dispatchEvent);
-		} else {
-			dispatchRestore();
+			// Cross-tab communication will not work here due cross origin (usually the widget parent and the RC server will have different urls)
+			// So we manually update the widget to get the messages and actions done while undocked
+			await loadConfig();
+			await loadMessages();
 		}
 
+		dispatch({ minimized: false, undocked: false });
+
 		Triggers.callbacks?.emit('chat-opened-by-visitor');
 	};
 
 	const handleOpenWindow = () => {
-		parentCall('openPopout');
+		parentCall('openPopout', store.token);
 		dispatch({ undocked: true, minimized: false });
 	};
 
@@ -144,7 +143,7 @@ export const ScreenProvider: FunctionalComponent = ({ children }) => {
 		setPopedOut(poppedOut);
 
 		if (poppedOut) {
-			dispatch({ minimized: false });
+			dispatch({ minimized: false, undocked: true });
 		}
 	}, [dispatch]);
 
@@ -167,7 +166,7 @@ export const ScreenProvider: FunctionalComponent = ({ children }) => {
 		notificationsEnabled: sound?.enabled,
 		minimized: !poppedOut && (minimized || undocked),
 		expanded: !minimized && expanded,
-		windowed: !minimized && poppedOut,
+		windowed: poppedOut,
 		livechatLogo,
 		hideWatermark,
 		sound,
diff --git a/packages/livechat/src/components/Screen/styles.scss b/packages/livechat/src/components/Screen/styles.scss
index dd12ba7ec705..4a78d7fdce9a 100644
--- a/packages/livechat/src/components/Screen/styles.scss
+++ b/packages/livechat/src/components/Screen/styles.scss
@@ -1,6 +1,5 @@
 @use 'sass:math';
-
-@import '../../styles/colors';
+@use '../../styles/colors';
 
 $screen-padding: 16px;
 $screen-box-shadow: 0 (math.div($screen-padding, 2) - 1) $screen-padding 0 rgba(0, 0, 0, 0.1);
@@ -93,7 +92,7 @@ $max-lines: 12;
 	width: 100%;
 
 	border-radius: 4px;
-	background-color: $bg-color-white;
+	background-color: colors.$bg-color-white;
 	align-items: stretch;
 
 	&--fitTextSize {
diff --git a/packages/livechat/src/components/Tooltip/styles.scss b/packages/livechat/src/components/Tooltip/styles.scss
index 6d6dde02b2b2..95369564e3ad 100644
--- a/packages/livechat/src/components/Tooltip/styles.scss
+++ b/packages/livechat/src/components/Tooltip/styles.scss
@@ -1,5 +1,5 @@
-@import '../../styles/colors';
-@import '../../styles/variables';
+@use '../../styles/colors';
+@use '../../styles/variables';
 
 .tooltip {
 	$tail-size: 0.3125rem;
@@ -14,7 +14,7 @@
 	padding: 0.5rem 0.75rem;
 
 	user-select: none;
-	transition: opacity $default-time-animation;
+	transition: opacity variables.$default-time-animation;
 	text-align: center;
 	white-space: nowrap;
 	letter-spacing: 0;
@@ -22,13 +22,13 @@
 
 	opacity: 1;
 
-	color: $color-text-lighter;
-	border-radius: $default-border-radius;
+	color: colors.$color-text-lighter;
+	border-radius: variables.$default-border-radius;
 
-	background-color: $bg-color-darker;
+	background-color: colors.$bg-color-darker;
 	box-shadow:
-		0 0 0.125rem 0 rgba($bg-color-dark, 0.08),
-		0 0 0.75rem 0 rgba($bg-color-dark, 0.12);
+		0 0 0.125rem 0 rgba(colors.$bg-color-dark, 0.08),
+		0 0 0.75rem 0 rgba(colors.$bg-color-dark, 0.12);
 
 	font-size: 0.75rem;
 	font-weight: 600;
@@ -47,7 +47,7 @@
 
 				content: "";
 
-				border: $tail-size solid $bg-color-darker;
+				border: $tail-size solid colors.$bg-color-darker;
 				@content;
 			}
 		}
@@ -88,7 +88,7 @@
 		&-top-left {
 			@include tail {
 				top: 100%;
-				right: $default-border-radius;
+				right: variables.$default-border-radius;
 
 				border-right-color: transparent;
 				border-bottom-color: transparent;
@@ -99,7 +99,7 @@
 		&-top-right {
 			@include tail {
 				top: 100%;
-				left: $default-border-radius;
+				left: variables.$default-border-radius;
 
 				border-right-color: transparent;
 				border-bottom-color: transparent;
@@ -120,7 +120,7 @@
 
 		&-bottom-left {
 			@include tail {
-				right: $default-border-radius;
+				right: variables.$default-border-radius;
 				bottom: 100%;
 
 				border-top-color: transparent;
@@ -132,7 +132,7 @@
 		&-bottom-right {
 			@include tail {
 				bottom: 100%;
-				left: $default-border-radius;
+				left: variables.$default-border-radius;
 
 				border-top-color: transparent;
 				border-right-color: transparent;
diff --git a/packages/livechat/src/components/uiKit/message/ButtonElement/styles.scss b/packages/livechat/src/components/uiKit/message/ButtonElement/styles.scss
index 6a71409ea6f8..0d66eb9cc957 100644
--- a/packages/livechat/src/components/uiKit/message/ButtonElement/styles.scss
+++ b/packages/livechat/src/components/uiKit/message/ButtonElement/styles.scss
@@ -1,8 +1,7 @@
 @use 'sass:math';
-
-@import '../../../../styles/colors';
-@import '../../../../styles/helpers';
-@import '../../../../styles/variables';
+@use '../../../../styles/colors';
+@use '../../../../styles/helpers';
+@use '../../../../styles/variables';
 
 .uikit-button {
 	position: relative;
@@ -16,30 +15,30 @@
 	cursor: pointer;
 	user-select: none;
 	transition:
-		color $default-time-animation,
-		background-color $default-time-animation,
-		border-color $default-time-animation,
-		transform math.div($default-time-animation, 2);
+		color variables.$default-time-animation,
+		background-color variables.$default-time-animation,
+		border-color variables.$default-time-animation,
+		transform math.div(variables.$default-time-animation, 2);
 	white-space: nowrap;
 	text-decoration: none;
 
-	color: $color-text-grey;
+	color: colors.$color-text-grey;
 
-	border: $default-border solid;
+	border: variables.$default-border solid;
 
-	border-color: $bg-color-grey;
-	border-radius: (2 * $default-border-radius);
+	border-color: colors.$bg-color-grey;
+	border-radius: (2 * variables.$default-border-radius);
 	outline: none;
-	background-color: $bg-color-white;
+	background-color: colors.$bg-color-white;
 
-	font-family: $font-family;
+	font-family: variables.$font-family;
 	font-size: 0.875rem;
 	font-weight: normal;
 	line-height: 1.25rem;
 	align-items: center;
 	justify-content: center;
 
-	@include pressable-button(2px, $default-border);
+	@include helpers.pressable-button(2px, variables.$default-border);
 
 	&:focus {
 		box-shadow: 0 0 5px rgba(#000000, 0.5);
@@ -60,11 +59,11 @@
 		content: "";
 
 		transition:
-			opacity math.div($default-time-animation, 2),
-			border-width math.div($default-time-animation, 2),
-			width math.div($default-time-animation, 2),
-			height math.div($default-time-animation, 2),
-			visibility math.div($default-time-animation, 2);
+			opacity math.div(variables.$default-time-animation, 2),
+			border-width math.div(variables.$default-time-animation, 2),
+			width math.div(variables.$default-time-animation, 2),
+			height math.div(variables.$default-time-animation, 2),
+			visibility math.div(variables.$default-time-animation, 2);
 		animation: button-loading-rotation 1s linear infinite;
 
 		opacity: 0;
@@ -81,14 +80,14 @@
 	}
 
 	&:hover:not(:disabled) {
-		color: $color-text-dark;
-		background-color: $bg-color-grey;
+		color: colors.$color-text-dark;
+		background-color: colors.$bg-color-grey;
 	}
 
 	&:disabled {
 		cursor: default;
 
-		opacity: $disabled-opacity;
+		opacity: variables.$disabled-opacity;
 
 		&::before {
 			cursor: default;
@@ -96,22 +95,22 @@
 	}
 
 	&--style-primary {
-		color: var(--color, $color-blue);
+		color: var(--color, colors.$color-blue);
 
 		&:hover:not(:disabled) {
-			color: $color-text-lighter;
-			border-color: var(--color, $color-blue);
-			background-color: var(--color, $color-blue);
+			color: colors.$color-text-lighter;
+			border-color: var(--color, colors.$color-blue);
+			background-color: var(--color, colors.$color-blue);
 		}
 	}
 
 	&--style-danger {
-		color: $color-dark-red;
+		color: colors.$color-dark-red;
 
 		&:hover:not(:disabled) {
-			color: $color-text-lighter;
-			border-color: $color-dark-red;
-			background-color: $color-dark-red;
+			color: colors.$color-text-lighter;
+			border-color: colors.$color-dark-red;
+			background-color: colors.$color-dark-red;
 		}
 	}
 }
diff --git a/packages/livechat/src/components/uiKit/message/ContextBlock/styles.scss b/packages/livechat/src/components/uiKit/message/ContextBlock/styles.scss
index 764de98d596c..46573ce3eca3 100644
--- a/packages/livechat/src/components/uiKit/message/ContextBlock/styles.scss
+++ b/packages/livechat/src/components/uiKit/message/ContextBlock/styles.scss
@@ -1,5 +1,5 @@
-@import '../../../../styles/colors';
-@import '../../../../styles/variables';
+@use '../../../../styles/colors';
+@use '../../../../styles/variables';
 
 .uikit-context-block {
 	display: flex;
@@ -8,9 +8,9 @@
 
 	letter-spacing: 0.2px;
 
-	color: $color-text-grey;
+	color: colors.$color-text-grey;
 
-	font-family: $font-family;
+	font-family: variables.$font-family;
 	font-size: 0.75rem;
 	font-weight: normal;
 	line-height: 1.25rem;
diff --git a/packages/livechat/src/components/uiKit/message/DividerBlock/styles.scss b/packages/livechat/src/components/uiKit/message/DividerBlock/styles.scss
index 7904114eba83..52d86c7aa8bb 100644
--- a/packages/livechat/src/components/uiKit/message/DividerBlock/styles.scss
+++ b/packages/livechat/src/components/uiKit/message/DividerBlock/styles.scss
@@ -1,4 +1,4 @@
-@import '../../../../styles/colors';
+@use '../../../../styles/colors';
 
 .uikit-divider-block {
 	height: 2px;
@@ -6,5 +6,5 @@
 
 	border: 0;
 	border-radius: 2px;
-	background-color: $bg-color-grey;
+	background-color: colors.$bg-color-grey;
 }
diff --git a/packages/livechat/src/components/uiKit/message/ImageBlock/styles.scss b/packages/livechat/src/components/uiKit/message/ImageBlock/styles.scss
index 7151034745d6..57d15fccbf48 100644
--- a/packages/livechat/src/components/uiKit/message/ImageBlock/styles.scss
+++ b/packages/livechat/src/components/uiKit/message/ImageBlock/styles.scss
@@ -1,5 +1,5 @@
-@import '../../../../styles/colors';
-@import '../../../../styles/variables';
+@use '../../../../styles/colors';
+@use '../../../../styles/variables';
 
 .uikit-image-block {
 	margin: 0 8px 8px;
@@ -7,7 +7,7 @@
 	&__title {
 		letter-spacing: 0.2px;
 
-		color: $color-text-grey;
+		color: colors.$color-text-grey;
 
 		font-size: 0.75rem;
 		font-weight: normal;
@@ -18,7 +18,7 @@
 		overflow: hidden;
 
 		&--loading {
-			opacity: $disabled-opacity;
+			opacity: variables.$disabled-opacity;
 		}
 	}
 
@@ -44,7 +44,7 @@
 		white-space: nowrap;
 		text-indent: 100%;
 
-		border-radius: $default-border-radius;
+		border-radius: variables.$default-border-radius;
 		background-repeat: no-repeat;
 		background-position: 50%;
 		background-size: contain;
diff --git a/packages/livechat/src/components/uiKit/message/ImageElement/styles.scss b/packages/livechat/src/components/uiKit/message/ImageElement/styles.scss
index 35ec15b2d906..e7cfd8f5cf00 100644
--- a/packages/livechat/src/components/uiKit/message/ImageElement/styles.scss
+++ b/packages/livechat/src/components/uiKit/message/ImageElement/styles.scss
@@ -1,4 +1,4 @@
-@import '../../../../styles/variables';
+@use '../../../../styles/variables';
 
 .uikit-image {
 	overflow: hidden;
@@ -11,13 +11,13 @@
 		width: 5.5rem;
 		height: 5.5rem;
 
-		border-radius: $default-border-radius;
+		border-radius: variables.$default-border-radius;
 	}
 
 	&--context {
 		width: 1.25rem;
 		height: 1.25rem;
 
-		border-radius: $default-border-radius;
+		border-radius: variables.$default-border-radius;
 	}
 }
diff --git a/packages/livechat/src/components/uiKit/message/Mrkdwn/styles.scss b/packages/livechat/src/components/uiKit/message/Mrkdwn/styles.scss
index db5d915b5580..6d2fc8d237f6 100644
--- a/packages/livechat/src/components/uiKit/message/Mrkdwn/styles.scss
+++ b/packages/livechat/src/components/uiKit/message/Mrkdwn/styles.scss
@@ -1,4 +1,4 @@
-@import '../../../../styles/colors';
+@use '../../../../styles/colors';
 
 .uikit-mrkdwn {
 	word-wrap: break-word;
@@ -7,7 +7,7 @@
 	a {
 		text-decoration: none;
 
-		color: var(--color, $color-blue);
+		color: var(--color, colors.$color-blue);
 
 		&:hover,
 		&:focus {
diff --git a/packages/livechat/src/components/uiKit/message/OverflowElement/styles.scss b/packages/livechat/src/components/uiKit/message/OverflowElement/styles.scss
index eaef0c3d3fb8..11241cac0160 100644
--- a/packages/livechat/src/components/uiKit/message/OverflowElement/styles.scss
+++ b/packages/livechat/src/components/uiKit/message/OverflowElement/styles.scss
@@ -1,9 +1,9 @@
-@import '../../../../styles/colors';
+@use '../../../../styles/colors';
 
 .uikit-overflow {
 	&__trigger {
 		padding: 0;
 
-		border-color: $bg-color-grey;
+		border-color: colors.$bg-color-grey;
 	}
 }
diff --git a/packages/livechat/src/components/uiKit/message/SectionBlock/styles.scss b/packages/livechat/src/components/uiKit/message/SectionBlock/styles.scss
index 14cb7db5df93..0fa21632d33d 100644
--- a/packages/livechat/src/components/uiKit/message/SectionBlock/styles.scss
+++ b/packages/livechat/src/components/uiKit/message/SectionBlock/styles.scss
@@ -1,14 +1,14 @@
-@import '../../../../styles/colors';
-@import '../../../../styles/variables';
+@use '../../../../styles/colors';
+@use '../../../../styles/variables';
 
 .uikit-section-block {
 	display: flex;
 
 	margin: 0 2px 8px;
 
-	color: $color-text-dark;
+	color: colors.$color-text-dark;
 
-	font-family: $font-family;
+	font-family: variables.$font-family;
 	font-size: 0.875rem;
 	font-weight: normal;
 	line-height: 1.25rem;
diff --git a/packages/livechat/src/helpers/canRenderMessage.ts b/packages/livechat/src/helpers/canRenderMessage.ts
index 726ec689631c..fa873cd2f3b5 100644
--- a/packages/livechat/src/helpers/canRenderMessage.ts
+++ b/packages/livechat/src/helpers/canRenderMessage.ts
@@ -27,8 +27,8 @@ const msgTypesNotRendered = [
 
 export const getHiddenSystemMessages = () => {
 	const { config, iframe } = store.state;
-	const configHiddenSystemMessages = config.settings.hiddenSystemMessages || [];
-	const localHiddenSystemMessages = iframe.hiddenSystemMessages || [];
+	const configHiddenSystemMessages = config?.settings.hiddenSystemMessages || [];
+	const localHiddenSystemMessages = iframe?.hiddenSystemMessages || [];
 
 	return [...configHiddenSystemMessages, ...localHiddenSystemMessages] as string[];
 };
diff --git a/packages/livechat/src/helpers/formatAgent.ts b/packages/livechat/src/helpers/formatAgent.ts
index 249733b12c64..4d3572e1e806 100644
--- a/packages/livechat/src/helpers/formatAgent.ts
+++ b/packages/livechat/src/helpers/formatAgent.ts
@@ -26,7 +26,7 @@ export const formatAgent = (agent: AgentType) => {
 			? {
 					description: agent.username,
 					src: getAvatarUrl(agent.username),
-			  }
+				}
 			: undefined,
 	};
 };
diff --git a/packages/livechat/src/hooks/useDeleteMessageSubscription.ts b/packages/livechat/src/hooks/useDeleteMessageSubscription.ts
index 0c637af986ce..b027cb251296 100644
--- a/packages/livechat/src/hooks/useDeleteMessageSubscription.ts
+++ b/packages/livechat/src/hooks/useDeleteMessageSubscription.ts
@@ -6,7 +6,7 @@ import store from '../store';
 // TODO: optimize this function
 const deleteMessage = (messageId: string) => {
 	store.setState({
-		messages: store.state.messages.filter((message) => message._id !== messageId),
+		messages: store.state.messages?.filter((message) => message._id !== messageId),
 	});
 };
 
diff --git a/packages/livechat/src/lib/connection.ts b/packages/livechat/src/lib/connection.ts
index 3ea5e6b29087..a52bec91fd2a 100644
--- a/packages/livechat/src/lib/connection.ts
+++ b/packages/livechat/src/lib/connection.ts
@@ -53,12 +53,14 @@ const Connection = {
 
 	async clearAlerts() {
 		const { alerts } = store.state;
-		await store.setState({ alerts: alerts.filter((alert) => ![livechatDisconnectedAlertId, livechatConnectedAlertId].includes(alert.id)) });
+		await store.setState({
+			alerts: alerts?.filter((alert) => ![livechatDisconnectedAlertId, livechatConnectedAlertId].includes(alert.id)),
+		});
 	},
 
 	async displayAlert(alert = {}) {
 		const { alerts } = store.state;
-		await store.setState({ alerts: (alerts.push(alert), alerts) });
+		await store.setState({ alerts: (alerts?.push(alert), alerts) });
 	},
 
 	async handleConnected() {
diff --git a/packages/livechat/src/lib/triggers.js b/packages/livechat/src/lib/triggers.js
index 2cdd104415d7..58b93c317b0e 100644
--- a/packages/livechat/src/lib/triggers.js
+++ b/packages/livechat/src/lib/triggers.js
@@ -1,4 +1,4 @@
-import mitt from 'mitt';
+import { Emitter } from '@rocket.chat/emitter';
 
 import { Livechat } from '../api';
 import store from '../store';
@@ -24,14 +24,14 @@ class Triggers {
 
 	/** @property {boolean} _enabled */
 
-	/** @property {import('mitt').Emitter} callbacks */
+	/** @property {import('@rocket.chat/emitter').Emitter} callbacks */
 
 	constructor() {
 		if (!Triggers.instance) {
 			this._started = false;
 			this._triggers = [];
 			this._enabled = true;
-			this.callbacks = mitt();
+			this.callbacks = new Emitter();
 			Triggers.instance = this;
 		}
 
diff --git a/packages/livechat/src/providers/ConnectionStatusProvider.tsx b/packages/livechat/src/providers/ConnectionStatusProvider.tsx
index 42378055d808..b72bae1de3e6 100644
--- a/packages/livechat/src/providers/ConnectionStatusProvider.tsx
+++ b/packages/livechat/src/providers/ConnectionStatusProvider.tsx
@@ -32,7 +32,7 @@ const ConnectionStatusProvider = ({ children }: { children: ComponentChildren })
 				status,
 				connected: status === 'connected',
 				reconnect: () => sdk.connection.reconnect(),
-			} as const),
+			}) as const,
 		[status, sdk],
 	);
 
diff --git a/packages/livechat/src/routes/Chat/component.js b/packages/livechat/src/routes/Chat/component.js
index d499696348c3..bb0d081fefc8 100644
--- a/packages/livechat/src/routes/Chat/component.js
+++ b/packages/livechat/src/routes/Chat/component.js
@@ -2,6 +2,7 @@ import { Component, createRef } from 'preact';
 import { Suspense, lazy } from 'preact/compat';
 import { withTranslation } from 'react-i18next';
 
+import styles from './styles.scss';
 import { Button } from '../../components/Button';
 import { CallIframe } from '../../components/Calls/CallIFrame';
 import { default as CallNotification } from '../../components/Calls/CallNotification';
@@ -19,7 +20,6 @@ import PlusIcon from '../../icons/plus.svg';
 import RemoveIcon from '../../icons/remove.svg';
 import SendIcon from '../../icons/send.svg';
 import EmojiIcon from '../../icons/smile.svg';
-import styles from './styles.scss';
 
 import 'emoji-mart/css/emoji-mart.css';
 
diff --git a/packages/livechat/src/routes/Chat/connector.tsx b/packages/livechat/src/routes/Chat/connector.tsx
index 3c72f9ae88cf..a66102ffdaba 100644
--- a/packages/livechat/src/routes/Chat/connector.tsx
+++ b/packages/livechat/src/routes/Chat/connector.tsx
@@ -84,7 +84,7 @@ export const ChatConnector: FunctionalComponent<{ path: string; default: boolean
 							spot: queueInfo.spot,
 							estimatedWaitTimeSeconds: queueInfo.estimatedWaitTimeSeconds,
 							message: queueInfo.message,
-					  }
+						}
 					: undefined
 			}
 			registrationFormEnabled={registrationForm}
diff --git a/packages/livechat/src/routes/Chat/container.js b/packages/livechat/src/routes/Chat/container.js
index 43ff281c6472..e38a53a7db6a 100644
--- a/packages/livechat/src/routes/Chat/container.js
+++ b/packages/livechat/src/routes/Chat/container.js
@@ -243,9 +243,11 @@ class ChatContainer extends Component {
 
 		await dispatch({ loading: true });
 		try {
-			if (rid) {
-				await Livechat.closeChat({ rid });
+			if (!rid) {
+				throw new Error('error-room-not-found');
 			}
+
+			await Livechat.closeChat({ rid });
 		} catch (error) {
 			console.error(error);
 			const alert = { id: createToken(), children: i18n.t('error_closing_chat'), error: true, timeout: 0 };
@@ -289,7 +291,7 @@ class ChatContainer extends Component {
 
 	canFinishChat = () => {
 		const { room, connecting, visitorsCanCloseChat } = this.props;
-		return visitorsCanCloseChat && (room !== undefined || connecting);
+		return visitorsCanCloseChat && (room?._id !== undefined || connecting);
 	};
 
 	canRemoveUserData = () => {
diff --git a/packages/livechat/src/routes/Chat/styles.scss b/packages/livechat/src/routes/Chat/styles.scss
index ef7d29958f59..9829b8dfad53 100644
--- a/packages/livechat/src/routes/Chat/styles.scss
+++ b/packages/livechat/src/routes/Chat/styles.scss
@@ -1,5 +1,5 @@
-@import '../../styles/colors';
-@import '../../styles/variables';
+@use '../../styles/colors';
+@use '../../styles/variables';
 
 .chat {
 	&__messages {
@@ -40,13 +40,13 @@
 			width: 20px;
 			height: 20px;
 
-			margin: $default-padding auto;
+			margin: variables.$default-padding auto;
 
 			content: "";
 			animation: loader-rotate 1s linear infinite;
 
-			border: 4px solid $color-dark-blue;
-			border-color: $color-dark-blue transparent transparent transparent;
+			border: 4px solid colors.$color-dark-blue;
+			border-color: colors.$color-dark-blue transparent transparent transparent;
 			border-radius: 50%;
 		}
 	}
diff --git a/packages/livechat/src/routes/ChatFinished/styles.scss b/packages/livechat/src/routes/ChatFinished/styles.scss
index 1bac82502376..6fb91bea7cbf 100644
--- a/packages/livechat/src/routes/ChatFinished/styles.scss
+++ b/packages/livechat/src/routes/ChatFinished/styles.scss
@@ -1,4 +1,4 @@
-@import '../../styles/colors';
+@use '../../styles/colors';
 
 .chat-finished {
 	&__greeting {
@@ -16,7 +16,7 @@
 
 		letter-spacing: 0;
 
-		color: $color-text-grey;
+		color: colors.$color-text-grey;
 
 		font-size: 1rem;
 		font-weight: 500;
diff --git a/packages/livechat/src/routes/GDPRAgreement/styles.scss b/packages/livechat/src/routes/GDPRAgreement/styles.scss
index a732f6091d22..5151ef796845 100644
--- a/packages/livechat/src/routes/GDPRAgreement/styles.scss
+++ b/packages/livechat/src/routes/GDPRAgreement/styles.scss
@@ -1,4 +1,4 @@
-@import '../../styles/colors';
+@use '../../styles/colors';
 
 .gdpr {
 	&__consent-text {
@@ -6,7 +6,7 @@
 
 		letter-spacing: 0;
 
-		color: $color-text-grey;
+		color: colors.$color-text-grey;
 
 		font-size: 1rem;
 		font-weight: normal;
@@ -18,7 +18,7 @@
 
 		letter-spacing: 0;
 
-		color: $color-text-grey;
+		color: colors.$color-text-grey;
 
 		font-size: 0.75rem;
 		font-weight: normal;
diff --git a/packages/livechat/src/routes/LeaveMessage/index.tsx b/packages/livechat/src/routes/LeaveMessage/index.tsx
index 91b3e8f57d9c..b530e9563dae 100644
--- a/packages/livechat/src/routes/LeaveMessage/index.tsx
+++ b/packages/livechat/src/routes/LeaveMessage/index.tsx
@@ -5,6 +5,7 @@ import type { FieldValues, SubmitHandler } from 'react-hook-form';
 import { Controller, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 
+import styles from './styles.scss';
 import { Livechat } from '../../api';
 import { Button } from '../../components/Button';
 import { Form, FormField, SelectInput, TextInput } from '../../components/Form';
@@ -20,7 +21,6 @@ import { validateEmail } from '../../lib/email';
 import { parentCall } from '../../lib/parentCall';
 import { createToken } from '../../lib/random';
 import { StoreContext } from '../../store';
-import styles from './styles.scss';
 
 const LeaveMessage: FunctionalComponent<{ path: string }> = () => {
 	const {
diff --git a/packages/livechat/src/routes/SwitchDepartment/styles.scss b/packages/livechat/src/routes/SwitchDepartment/styles.scss
index 941c4048c3f3..2cb57b646e5b 100644
--- a/packages/livechat/src/routes/SwitchDepartment/styles.scss
+++ b/packages/livechat/src/routes/SwitchDepartment/styles.scss
@@ -1,4 +1,4 @@
-@import '../../styles/colors';
+@use '../../styles/colors';
 
 .switch-department {
 	&__message {
@@ -6,7 +6,7 @@
 
 		letter-spacing: 0;
 
-		color: $color-text-dark;
+		color: colors.$color-text-dark;
 
 		font-size: 1rem;
 		font-weight: 500;
diff --git a/packages/livechat/src/routes/TriggerMessage/container.tsx b/packages/livechat/src/routes/TriggerMessage/container.tsx
index 62a3a1927a0e..98510e512f2d 100644
--- a/packages/livechat/src/routes/TriggerMessage/container.tsx
+++ b/packages/livechat/src/routes/TriggerMessage/container.tsx
@@ -13,10 +13,10 @@ export const TriggerMessageContainer: FunctionalComponent<{ path: string }> = ({
 	const { messages, agent, unread } = useContext(StoreContext);
 	const { theme, onRestore } = useContext(ScreenContext);
 
-	const handleStart = () => {
+	const handleStart = async () => {
 		parentCall('setFullScreenDocumentMobile');
 		parentCall('openWidget');
-		onRestore();
+		await onRestore();
 		route('/');
 	};
 
diff --git a/packages/livechat/src/routes/TriggerMessage/styles.scss b/packages/livechat/src/routes/TriggerMessage/styles.scss
index 3f6ad5916953..b0bc2d9caa58 100644
--- a/packages/livechat/src/routes/TriggerMessage/styles.scss
+++ b/packages/livechat/src/routes/TriggerMessage/styles.scss
@@ -1,4 +1,4 @@
-@import '../../styles/colors';
+@use '../../styles/colors';
 
 .trigger-message {
 	&__message {
@@ -34,7 +34,7 @@
 		cursor: pointer;
 		text-decoration: none;
 
-		color: var(--color, $color-blue);
+		color: var(--color, colors.$color-blue);
 		border: 0;
 		background: none;
 
diff --git a/packages/livechat/src/store/Store.ts b/packages/livechat/src/store/Store.ts
index d1929a1977e2..989ffed269a9 100644
--- a/packages/livechat/src/store/Store.ts
+++ b/packages/livechat/src/store/Store.ts
@@ -1,5 +1,6 @@
-import type { Emitter, EventHandlerMap, EventType, Handler, WildcardHandler } from 'mitt';
-import mitt from 'mitt';
+import { Emitter } from '@rocket.chat/emitter';
+
+import type { StoreState } from '.';
 
 function getLocalStorage() {
 	try {
@@ -18,46 +19,26 @@ function getLocalStorage() {
 }
 const localStorage = getLocalStorage();
 
-export default class Store<T extends Record<string, unknown>> implements Emitter {
-	private _state: T;
-
-	private localStorageKey: string;
-
-	private dontPersist: string[];
-
-	all: EventHandlerMap;
+type StoreStateType = StoreState;
 
-	on: {
-		<T = any>(type: EventType, handler: Handler<T>): void;
-		(type: '*', handler: WildcardHandler): void;
-	};
+export default class Store extends Emitter {
+	private _state: StoreStateType;
 
-	off: {
-		<T = any>(type: EventType, handler: Handler<T>): void;
-		(type: '*', handler: WildcardHandler): void;
-	};
+	private localStorageKey: string;
 
-	emit: {
-		<T = any>(type: EventType, event?: T): void;
-		(type: '*', event?: any): void;
-	};
+	private dontPersist: Array<keyof StoreStateType>;
 
 	constructor(
-		initialState: T,
+		initialState: StoreStateType,
 		{
 			localStorageKey = 'store',
 			dontPersist = [],
 		}: {
 			localStorageKey?: string;
-			dontPersist?: string[];
+			dontPersist?: Array<keyof StoreStateType>;
 		} = {},
 	) {
-		const emitter = mitt();
-		this.all = emitter.all;
-		this.on = emitter.on;
-		this.off = emitter.off;
-		this.emit = emitter.emit;
-
+		super();
 		this.localStorageKey = localStorageKey;
 		this.dontPersist = dontPersist;
 
@@ -103,14 +84,14 @@ export default class Store<T extends Record<string, unknown>> implements Emitter
 		localStorage.setItem(this.localStorageKey, JSON.stringify(persistable));
 	}
 
-	setState(partialState: Partial<T>) {
+	setState(partialState: Partial<StoreStateType>) {
 		const prevState = this._state;
 		this._state = { ...prevState, ...partialState };
 		this.persist();
 		this.emit('change', [this._state, prevState, partialState]);
 	}
 
-	unsetSinglePropInStateByName(propName: string) {
+	unsetSinglePropInStateByName(propName: keyof StoreStateType) {
 		const prevState = this._state;
 		delete prevState[propName];
 		this._state = { ...prevState };
@@ -118,13 +99,15 @@ export default class Store<T extends Record<string, unknown>> implements Emitter
 		this.emit('change', [this._state, prevState]);
 	}
 
-	setStoredState(storedState: T) {
+	setStoredState(storedState: StoreStateType) {
 		const prevState = this._state;
 
 		const nonPeristable: Record<string, unknown> = {};
+
 		for (const ignoredKey of this.dontPersist) {
 			nonPeristable[ignoredKey] = prevState[ignoredKey];
 		}
+
 		this._state = { ...storedState, ...nonPeristable };
 		this.emit('change', [this._state, prevState]);
 	}
diff --git a/packages/livechat/src/store/index.tsx b/packages/livechat/src/store/index.tsx
index e7d4b8caae17..8f5294e42cba 100644
--- a/packages/livechat/src/store/index.tsx
+++ b/packages/livechat/src/store/index.tsx
@@ -177,7 +177,7 @@ const dontPersist = [
 	'incomingCallAlert',
 	'ongoingCall',
 	'parentUrl',
-];
+] as Array<keyof StoreState>;
 
 export const store = new Store(initialState(), { dontPersist });
 
diff --git a/packages/livechat/src/styles/grid.scss b/packages/livechat/src/styles/grid.scss
index 0364d348d0a2..8e77b56ad13e 100644
--- a/packages/livechat/src/styles/grid.scss
+++ b/packages/livechat/src/styles/grid.scss
@@ -1,7 +1,6 @@
 //----- Grid System
 @use 'sass:math';
-
-@import "helpers";
+@use "helpers";
 
 //----- Extends
 %clearfix::after {
@@ -43,8 +42,8 @@ $cols: 12;
 	}
 }
 
-@each $breakpoint, $value in ($breakpoints) {
-	@include md($breakpoint) {
+@each $breakpoint, $value in (helpers.$breakpoints) {
+	@include helpers.md($breakpoint) {
 		@for $i from 1 through $cols {
 			.col-#{$breakpoint}-#{$i},
 			%col-#{$breakpoint}-#{$i} {
diff --git a/packages/livechat/src/styles/helpers.scss b/packages/livechat/src/styles/helpers.scss
index 0817c8f236c3..7a3ea70ae7f9 100644
--- a/packages/livechat/src/styles/helpers.scss
+++ b/packages/livechat/src/styles/helpers.scss
@@ -1,3 +1,5 @@
+@use "sass:map";
+@use "sass:meta";
 $breakpoints: (
 	'small':  ( min-width:  767px ),
 	'medium': ( min-width:  992px ),
@@ -6,9 +8,9 @@ $breakpoints: (
 
 @mixin md($breakpoint) {
 	// If the key exists in the map
-	@if map-has-key($breakpoints, $breakpoint) {
+	@if map.has-key($breakpoints, $breakpoint) {
 		// Prints a media query based on the value
-		@media (#{inspect(map-get($breakpoints, $breakpoint))}) {
+		@media (#{meta.inspect(map.get($breakpoints, $breakpoint))}) {
 			@content;
 		}
 	}
@@ -16,7 +18,7 @@ $breakpoints: (
 	// If the key doesn't exist in the map
 	@else {
 		@warn "Unfortunately, there are no value to `#{$breakpoint}` breakpoints. "
-			+ "Available breakpoints are: #{map-keys($breakpoints)}.";
+			+ "Available breakpoints are: #{map.keys($breakpoints)}.";
 	}
 }
 
@@ -58,12 +60,9 @@ $breakpoints: (
 
 	&::before {
 		position: absolute;
-		top: (-$border-width);
-		right: (-$border-width);
-		bottom: (-$border-width);
-		left: (-$border-width);
 
 		content: "";
 		cursor: pointer;
+		inset: (-$border-width);
 	}
 }
diff --git a/packages/livechat/src/styles/index.scss b/packages/livechat/src/styles/index.scss
index ff895cf9777e..7f62658a7181 100644
--- a/packages/livechat/src/styles/index.scss
+++ b/packages/livechat/src/styles/index.scss
@@ -1,6 +1,6 @@
-@import 'colors';
-@import 'grid';
-@import 'variables';
+@use 'colors';
+@use 'grid';
+@use 'variables';
 
 html,
 body {
@@ -11,7 +11,7 @@ body {
 
 	color: #444444;
 
-	font-family: $font-family;
+	font-family: variables.$font-family;
 	font-weight: 400;
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
@@ -27,12 +27,12 @@ body {
 
 	&-thumb {
 		border-radius: 5px;
-		background: $color-text-grey;
+		background: colors.$color-text-grey;
 	}
 
 	&-track {
 		border-radius: 5px;
-		background: $color-text-light;
+		background: colors.$color-text-light;
 	}
 }
 
diff --git a/packages/livechat/src/widget.ts b/packages/livechat/src/widget.ts
index 9a7af87de95d..234d61f87096 100644
--- a/packages/livechat/src/widget.ts
+++ b/packages/livechat/src/widget.ts
@@ -1,6 +1,6 @@
 import type { UserStatus } from '@rocket.chat/core-typings';
 import type { LivechatRoomEvents } from '@rocket.chat/ddp-client';
-import mitt from 'mitt';
+import { Emitter } from '@rocket.chat/emitter';
 
 import { isDefined } from './helpers/isDefined';
 import type { HooksWidgetAPI } from './lib/hooks';
@@ -11,7 +11,7 @@ type InternalWidgetAPI = {
 	ready: () => void;
 	minimizeWindow: () => void;
 	restoreWindow: () => void;
-	openPopout: () => void;
+	openPopout: (token?: string) => void;
 	openWidget: () => void;
 	resizeWidget: (height: number) => void;
 	removeWidget: () => void;
@@ -79,7 +79,7 @@ export const VALID_CALLBACKS = [
 
 const VALID_SYSTEM_MESSAGES = ['uj', 'ul', 'livechat-close', 'livechat-started', 'livechat_transfer_history'];
 
-const callbacks = mitt();
+const callbacks = new Emitter();
 
 function registerCallback(eventName: string, fn: () => unknown) {
 	if (VALID_CALLBACKS.indexOf(eventName) === -1) {
@@ -98,7 +98,9 @@ function emitCallback(eventName: string, data?: unknown) {
 }
 
 function clearAllCallbacks() {
-	callbacks.all.clear();
+	callbacks.events().forEach((callback) => {
+		callbacks.off(callback, () => undefined);
+	});
 }
 
 // hooks
@@ -482,7 +484,7 @@ const api: InternalWidgetAPI = {
 		openWidget();
 	},
 
-	openPopout() {
+	openPopout(token = '') {
 		closeWidget();
 		if (!config.url) {
 			throw new Error('Config.url is not set!');
@@ -492,6 +494,14 @@ const api: InternalWidgetAPI = {
 			'livechat-popout',
 			`width=${WIDGET_OPEN_WIDTH}, height=${widgetHeight}, toolbars=no`,
 		);
+
+		const data = {
+			src: 'rocketchat',
+			fn: 'setGuestToken',
+			args: [token],
+		};
+
+		api.popup?.postMessage(data, '*');
 		api.popup?.focus();
 	},
 
diff --git a/packages/log-format/package.json b/packages/log-format/package.json
index 6ba2282c02c3..3de7db486a2c 100644
--- a/packages/log-format/package.json
+++ b/packages/log-format/package.json
@@ -3,7 +3,7 @@
 	"version": "0.0.2",
 	"private": true,
 	"devDependencies": {
-		"@types/chalk": "^2.2.0",
+		"@types/chalk": "^2.2.4",
 		"@types/ejson": "^2.2.2",
 		"eslint": "~8.45.0",
 		"typescript": "~5.6.3"
@@ -23,7 +23,7 @@
 		"extends": "../../package.json"
 	},
 	"dependencies": {
-		"chalk": "^4.0.0",
+		"chalk": "^4.1.2",
 		"ejson": "^2.2.3"
 	}
 }
diff --git a/packages/logger/package.json b/packages/logger/package.json
index 8f0d1a9a7738..d372f0da7ebe 100644
--- a/packages/logger/package.json
+++ b/packages/logger/package.json
@@ -19,6 +19,6 @@
 	],
 	"dependencies": {
 		"@rocket.chat/emitter": "~0.31.25",
-		"pino": "^8.15.0"
+		"pino": "^8.21.0"
 	}
 }
diff --git a/packages/logger/src/getPino.ts b/packages/logger/src/getPino.ts
index 9361e168d11e..89f7ba729c19 100644
--- a/packages/logger/src/getPino.ts
+++ b/packages/logger/src/getPino.ts
@@ -36,7 +36,7 @@ const mainPino = pino({
 						colorize: true,
 					},
 				},
-		  }
+			}
 		: {}),
 });
 
diff --git a/packages/message-parser/package.json b/packages/message-parser/package.json
index c171baa00fa9..d5e0cd5a2c06 100644
--- a/packages/message-parser/package.json
+++ b/packages/message-parser/package.json
@@ -48,32 +48,32 @@
     "docs": "typedoc"
   },
   "devDependencies": {
-    "@babel/core": "~7.25.8",
-    "@babel/eslint-parser": "~7.25.8",
-    "@babel/preset-env": "~7.25.8",
+    "@babel/core": "~7.26.0",
+    "@babel/eslint-parser": "~7.25.9",
+    "@babel/preset-env": "~7.26.0",
     "@rocket.chat/eslint-config": "workspace:^",
     "@rocket.chat/jest-presets": "workspace:~",
     "@rocket.chat/peggy-loader": "workspace:~",
     "@rocket.chat/prettier-config": "~0.31.25",
-    "@types/jest": "~29.5.13",
-    "@types/node": "~20.16.12",
+    "@types/jest": "~29.5.14",
+    "@types/node": "~20.16.15",
     "@typescript-eslint/parser": "~5.58.0",
-    "babel-loader": "~9.1.3",
+    "babel-loader": "~9.2.1",
     "eslint": "~8.45.0",
     "jest": "~29.7.0",
     "npm-run-all": "^4.1.5",
-    "peggy": "3.0.2",
-    "prettier": "~2.8.8",
+    "peggy": "4.1.1",
+    "prettier": "~3.3.3",
     "prettier-plugin-pegjs": "~0.5.4",
     "rimraf": "^6.0.1",
-    "ts-loader": "~9.4.4",
+    "ts-loader": "~9.5.1",
     "typedoc": "~0.24.8",
     "typescript": "~5.6.3",
     "webpack": "~5.95.0",
     "webpack-cli": "~5.1.4"
   },
   "dependencies": {
-    "tldts": "~5.7.112"
+    "tldts": "~6.1.61"
   },
   "volta": {
     "extends": "../../package.json"
diff --git a/packages/message-parser/src/guards.ts b/packages/message-parser/src/guards.ts
index f9d812f49458..c8d35071b9c3 100644
--- a/packages/message-parser/src/guards.ts
+++ b/packages/message-parser/src/guards.ts
@@ -2,7 +2,7 @@ import type { ASTNode } from './definitions';
 
 export const isNodeOfType = <N extends ASTNode>(
   value: unknown,
-  type: N['type']
+  type: N['type'],
 ): value is N =>
   typeof value === 'object' &&
   value !== null &&
diff --git a/packages/message-parser/src/utils.ts b/packages/message-parser/src/utils.ts
index 6c5d605c5c7a..5a52fad9b887 100644
--- a/packages/message-parser/src/utils.ts
+++ b/packages/message-parser/src/utils.ts
@@ -22,7 +22,7 @@ import type {
 const generate =
   <Type extends keyof Types>(type: Type) =>
   (value: Types[Type]['value']): Types[Type] =>
-    ({ type, value } as any);
+    ({ type, value }) as any;
 
 export const paragraph = generate('PARAGRAPH');
 
@@ -35,7 +35,7 @@ export const color = (r: number, g: number, b: number, a = 255): Color => ({
 
 export const heading = (
   value: Heading['value'],
-  level: Heading['level'] = 1
+  level: Heading['level'] = 1,
 ): Heading => ({
   type: 'HEADING',
   level,
@@ -44,7 +44,7 @@ export const heading = (
 
 export const code = (
   value: Code['value'],
-  language?: Code['language']
+  language?: Code['language'],
 ): Code => ({
   type: 'CODE',
   language: language || 'none',
@@ -168,7 +168,7 @@ export const emoticon = (emoticon: string, shortCode: string): Emoji => ({
 const joinEmoji = (
   current: Inlines,
   previous: Inlines | undefined,
-  next: Inlines | undefined
+  next: Inlines | undefined,
 ): Inlines => {
   if (current.type !== 'EMOJI' || !current.value || (!previous && !next)) {
     return current;
@@ -196,21 +196,24 @@ const joinEmoji = (
 };
 
 export const reducePlainTexts = (
-  values: Paragraph['value']
+  values: Paragraph['value'],
 ): Paragraph['value'] =>
-  values.flat().reduce((result, item, index, values) => {
-    const next = values[index + 1];
-    const current = joinEmoji(item, values[index - 1], next);
-    const previous: Inlines = result[result.length - 1];
-
-    if (previous) {
-      if (current.type === 'PLAIN_TEXT' && current.type === previous.type) {
-        previous.value += current.value;
-        return result;
+  values.flat().reduce(
+    (result, item, index, values) => {
+      const next = values[index + 1];
+      const current = joinEmoji(item, values[index - 1], next);
+      const previous: Inlines = result[result.length - 1];
+
+      if (previous) {
+        if (current.type === 'PLAIN_TEXT' && current.type === previous.type) {
+          previous.value += current.value;
+          return result;
+        }
       }
-    }
-    return [...result, current];
-  }, [] as Paragraph['value']);
+      return [...result, current];
+    },
+    [] as Paragraph['value'],
+  );
 export const lineBreak = (): LineBreak => ({
   type: 'LINE_BREAK',
   value: undefined,
@@ -236,7 +239,7 @@ export const phoneChecker = (text: string, number: string) => {
 
 export const timestamp = (
   value: string,
-  type?: 't' | 'T' | 'd' | 'D' | 'f' | 'F' | 'R'
+  type?: 't' | 'T' | 'd' | 'D' | 'f' | 'F' | 'R',
 ): Timestamp => {
   return {
     type: 'TIMESTAMP',
@@ -249,7 +252,7 @@ export const timestamp = (
 };
 
 export const extractFirstResult = (
-  value: Types[keyof Types]['value']
+  value: Types[keyof Types]['value'],
 ): Types[keyof Types]['value'] => {
   if (typeof value !== 'object' || !Array.isArray(value)) {
     return value;
diff --git a/packages/message-parser/tests/abuse.test.ts b/packages/message-parser/tests/abuse.test.ts
index c280ee75b4a0..8630deb9179f 100644
--- a/packages/message-parser/tests/abuse.test.ts
+++ b/packages/message-parser/tests/abuse.test.ts
@@ -7,57 +7,57 @@ test.each([
     [
       paragraph([
         plain(
-          'This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&'
+          'This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&',
         ),
         bold([
           plain('()'),
           italic([
             plain(
-              `+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok`
+              `+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok`,
             ),
             strike([
               plain(
-                `, from now on we repeat some. , REPEATx2 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()_+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok`
+                `, from now on we repeat some. , REPEATx2 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()_+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok`,
               ),
             ]),
             plain(
-              ', from now on we repeat some. REPEAT x3 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()'
+              ', from now on we repeat some. REPEAT x3 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()',
             ),
           ]),
           plain(
-            `+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok`
+            `+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok`,
           ),
           strike([
             plain(
-              ', from now on we repeat some. REPEAT x4 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()'
+              ', from now on we repeat some. REPEAT x4 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()',
             ),
             italic([
               plain(
-                `+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok~, from now on we repeat some. REPEATx 5 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()`
+                `+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok~, from now on we repeat some. REPEATx 5 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()`,
               ),
             ]),
             plain(
-              `+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok`
+              `+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok`,
             ),
           ]),
           plain(
-            `, from now on we repeat some. , REPEAT x6 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&`
+            `, from now on we repeat some. , REPEAT x6 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&`,
           ),
         ]),
         plain(
-          `()_+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok`
+          `()_+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok`,
         ),
         strike([
           plain(
-            `, from now on we repeat some. this can go long for some time, repeat x7 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()`
+            `, from now on we repeat some. this can go long for some time, repeat x7 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()`,
           ),
           italic([
             plain(
-              `+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok~, from now on we repeat some. ,repeat x8 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()`
+              `+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok~, from now on we repeat some. ,repeat x8 This a message designed to stress test the message parser, trying to force several rules to stack at the same time !!@#$%^&*()`,
             ),
           ]),
           plain(
-            `+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok`
+            `+, overloading the symbols {}:"|<>?, some more text ,./;'\\[], numbers too 1234567890-= let it call s o s ok`,
           ),
         ]),
         plain(', from now on we repeat some.'),
diff --git a/packages/message-parser/tests/katex.test.ts b/packages/message-parser/tests/katex.test.ts
index 2ffb3ec2f06b..581e848f2257 100644
--- a/packages/message-parser/tests/katex.test.ts
+++ b/packages/message-parser/tests/katex.test.ts
@@ -28,6 +28,6 @@ test.each([
   ],
 ])('parses %p', (input, output) => {
   expect(parse(input, { katex: { parenthesisSyntax: true } })).toMatchObject(
-    output
+    output,
   );
 });
diff --git a/packages/message-parser/tests/link.test.ts b/packages/message-parser/tests/link.test.ts
index fcf371474bf2..c5f880b84e0d 100644
--- a/packages/message-parser/tests/link.test.ts
+++ b/packages/message-parser/tests/link.test.ts
@@ -95,7 +95,7 @@ test.each([
     [
       paragraph([
         link(
-          'https://desk.rocket.chat/support/rocketchat/ShowHomePage.do#Cases/dv/413244000073043351'
+          'https://desk.rocket.chat/support/rocketchat/ShowHomePage.do#Cases/dv/413244000073043351',
         ),
       ]),
     ],
@@ -106,7 +106,7 @@ test.each([
       paragraph([
         link(
           'https://desk.rocket.chat/support/rocketchat/ShowHomePage.do#Cases/dv/413244000073043351',
-          [plain('Test')]
+          [plain('Test')],
         ),
       ]),
     ],
@@ -117,7 +117,7 @@ test.each([
       paragraph([
         link(
           'https://desk.rocket.chat/support/rocketchat/ShowHomePage.do#Cases/dv/413244000073043351',
-          [plain('title')]
+          [plain('title')],
         ),
       ]),
     ],
@@ -128,7 +128,7 @@ test.each([
       paragraph([
         link(
           'https://desk.rocket.chat/support/rocketchat/ShowHomePage.do#Cases/dv/413244000073043351',
-          [bold([plain('title')])]
+          [bold([plain('title')])],
         ),
       ]),
     ],
@@ -139,7 +139,7 @@ test.each([
       paragraph([
         link(
           'https://desk.rocket.chat/support/rocketchat/ShowHomePage.do#Cases/dv/413244000073043351',
-          [strike([plain('title')])]
+          [strike([plain('title')])],
         ),
       ]),
     ],
@@ -150,7 +150,7 @@ test.each([
       paragraph([
         link(
           'https://desk.rocket.chat/support/rocketchat/ShowHomePage.do#Cases/dv/413244000073043351',
-          [italic([plain('title')])]
+          [italic([plain('title')])],
         ),
       ]),
     ],
@@ -161,7 +161,7 @@ test.each([
       paragraph([
         link(
           'https://desk.rocket.chat/support/rocketchat/ShowHomePage.do#Cases/dv/413244000073043351',
-          [italic([bold([strike([plain('title')])])])]
+          [italic([bold([strike([plain('title')])])])],
         ),
       ]),
     ],
@@ -172,7 +172,7 @@ test.each([
       paragraph([
         link(
           'https://desk.rocket.chat/support/rocketchat/ShowHomePage.do#Cases/dv/413244000073043351?query=test12-34',
-          [plain('title')]
+          [plain('title')],
         ),
       ]),
     ],
@@ -183,7 +183,7 @@ test.each([
       paragraph([
         link(
           'https://desk.rocket.chat/support/rocketchat/ShowHomePage.do?query=test12-34#Cases/dv/413244000073043351',
-          [plain('title')]
+          [plain('title')],
         ),
       ]),
     ],
@@ -194,7 +194,7 @@ test.each([
       paragraph([
         link(
           'https://desk.rocket.chat/support/rocketchat/ShowHomePage.do#Cases/dv/413244000073043351?query=test12-34&query2=abc123',
-          [plain('title')]
+          [plain('title')],
         ),
       ]),
     ],
@@ -205,7 +205,7 @@ test.each([
       paragraph([
         link(
           'https://desk.rocket.chat/support/rocketchat/ShowHomePage.do#Cases?query=test12-34&query2=abcd!e/dv/413244000073043351',
-          [plain('title')]
+          [plain('title')],
         ),
       ]),
     ],
@@ -216,7 +216,7 @@ test.each([
       paragraph([
         link(
           'https://desk.rocket.chat/support/rocketchat/ShowHomePage.do#Cases/dv/413244000073043351?query=test12-34&query2=abcd!~-._%2B+',
-          [plain('title')]
+          [plain('title')],
         ),
       ]),
     ],
@@ -267,7 +267,7 @@ test.each([
       paragraph([
         link(
           'https://github.com/RocketChat/Rocket.Chat/pull/26751/files#diff-c87b108ecf1ede549f8ede68eca840fbb330180b927df0b8a0b4df5d06cbd89b',
-          [plain('Github link with hash')]
+          [plain('Github link with hash')],
         ),
       ]),
     ],
@@ -278,7 +278,7 @@ test.each([
       paragraph([
         link(
           'https://github.com/RocketChat/Rocket.Chat/pull/26751/files#diff',
-          [plain('Github link with hash')]
+          [plain('Github link with hash')],
         ),
       ]),
     ],
@@ -309,7 +309,7 @@ test.each([
       paragraph([
         link(
           'https://www.google.com/url?rct=j&sa=t&url=https://ga.de/freizeit/region-erleben/bonn-und-region-tipps-fuers-wochenende-flohmarkt-rheinaue-weltkindertag-stadtfest_aid-53876987&ct=ga&cd=CAIyHDQ0NzEyYWE3MDA1MGNhNTQ6Y29tOmRlOkRFOlI&usg=AOvVaw3ySYrO9lM0iNSnk43gPVwZ',
-          [plain('Google complex Link')]
+          [plain('Google complex Link')],
         ),
       ]),
     ],
@@ -414,7 +414,7 @@ Text after line break`,
       paragraph([
         link(
           'notes://Server/C3257116002CAD60/0/CCAF6BE2824A1F49432588D2001FA73E',
-          [plain('notes link')]
+          [plain('notes link')],
         ),
       ]),
     ],
@@ -433,7 +433,7 @@ Text after line break`,
       paragraph([
         link(
           'https://desk.rocket.chat/support/rocketchat/ShowHomePage.do#Cases/dv/413244000073043351',
-          [plain('Test with '), bold([plain('bold')]), plain(' element')]
+          [plain('Test with '), bold([plain('bold')]), plain(' element')],
         ),
       ]),
     ],
@@ -444,7 +444,7 @@ Text after line break`,
       paragraph([
         link(
           'https://desk.rocket.chat/support/rocketchat/ShowHomePage.do#Cases/dv/413244000073043351',
-          [plain('Test with '), bold([plain('bold')]), plain(' element')]
+          [plain('Test with '), bold([plain('bold')]), plain(' element')],
         ),
       ]),
     ],
@@ -455,7 +455,7 @@ Text after line break`,
       paragraph([
         link(
           'https://desk.rocket.chat/support/rocketchat/ShowHomePage.do#Cases/dv/413244000073043351',
-          [plain('Test with '), italic([plain('italic')]), plain(' element')]
+          [plain('Test with '), italic([plain('italic')]), plain(' element')],
         ),
       ]),
     ],
@@ -466,7 +466,7 @@ Text after line break`,
       paragraph([
         link(
           'https://desk.rocket.chat/support/rocketchat/ShowHomePage.do#Cases/dv/413244000073043351',
-          [plain('Test with '), strike([plain('strike')]), plain(' element')]
+          [plain('Test with '), strike([plain('strike')]), plain(' element')],
         ),
       ]),
     ],
@@ -481,7 +481,7 @@ Text after line break`,
             plain('Test with '),
             italic([bold([strike([plain('title')])])]),
             plain(' element'),
-          ]
+          ],
         ),
       ]),
     ],
@@ -505,7 +505,7 @@ Text after line break`,
         plain('the '),
         link(
           'https://developer.rocket.chat/reference/api/rest-api/endpoints/core-endpoints/chat-endpoints/postmessage',
-          [plain('audio_url and video_url for post message attachments')]
+          [plain('audio_url and video_url for post message attachments')],
         ),
       ]),
     ],
@@ -555,7 +555,7 @@ Text after line break`,
       paragraph([
         link(
           'https://github.com/RocketChat/Rocket.Chat/releases/tag/6.0.0-rc.3',
-          [plain('here')]
+          [plain('here')],
         ),
       ]),
     ],
diff --git a/packages/message-parser/tests/tasks.test.ts b/packages/message-parser/tests/tasks.test.ts
index ef6752bbfc0a..e822ded86ac3 100644
--- a/packages/message-parser/tests/tasks.test.ts
+++ b/packages/message-parser/tests/tasks.test.ts
@@ -31,15 +31,15 @@ test.each([
             plain(', '),
             bold([plain('formatting')]),
           ],
-          true
+          true,
         ),
         task(
           [
             plain(
-              'list syntax required (any unordered or ordered list supported)'
+              'list syntax required (any unordered or ordered list supported)',
             ),
           ],
-          true
+          true,
         ),
       ]),
     ],
diff --git a/packages/message-parser/tests/url.test.ts b/packages/message-parser/tests/url.test.ts
index 0c7c03d110d2..fb178f22dd52 100644
--- a/packages/message-parser/tests/url.test.ts
+++ b/packages/message-parser/tests/url.test.ts
@@ -7,7 +7,7 @@ test.each([
     [
       paragraph([
         autoLink(
-          'https://pt.wikipedia.org/wiki/Condi%C3%A7%C3%A3o_de_corrida#:~:text=Uma%20condi%C3%A7%C3%A3o%20de%20corrida%20%C3%A9,sequ%C3%AAncia%20ou%20sincronia%20doutros%20eventos'
+          'https://pt.wikipedia.org/wiki/Condi%C3%A7%C3%A3o_de_corrida#:~:text=Uma%20condi%C3%A7%C3%A3o%20de%20corrida%20%C3%A9,sequ%C3%AAncia%20ou%20sincronia%20doutros%20eventos',
         ),
       ]),
     ],
@@ -90,7 +90,7 @@ test.each([
     [
       paragraph([
         autoLink(
-          'https://developer.rocket.chat/reference/api/rest-api#production-security-concerns'
+          'https://developer.rocket.chat/reference/api/rest-api#production-security-concerns',
         ),
         plain(' look at this'),
       ]),
@@ -111,7 +111,7 @@ test.each([
     [
       paragraph([
         autoLink(
-          'https://developer.rocket.chat/reference/api/rest-api#fragment?query=query'
+          'https://developer.rocket.chat/reference/api/rest-api#fragment?query=query',
         ),
         plain(' look at this'),
       ]),
@@ -261,7 +261,7 @@ test.each([
     [
       paragraph([
         autoLink(
-          'https://github.com/RocketChat/Rocket.Chat/releases/tag/6.0.0-rc.3'
+          'https://github.com/RocketChat/Rocket.Chat/releases/tag/6.0.0-rc.3',
         ),
       ]),
     ],
@@ -279,7 +279,7 @@ test.each([
     [
       paragraph([
         link(
-          'https://rocketchat.atlassian.net/browse/OC-718?filter=10078&jql=%22Defect%20from%5BVersion%20Picker%20(multiple%20versions)%5D%22%20%3D%206.0.0%20AND%20%22Defect%20from%5BVersion%20Picker%20(multiple%20versions)%5D%22%20%3D%206.0.0%20AND%20created%20%3E%3D%20-48h%20ORDER%20BY%20cf%5B10070%5D%20ASC%2C%20status%20ASC%2C%20created%20DESC'
+          'https://rocketchat.atlassian.net/browse/OC-718?filter=10078&jql=%22Defect%20from%5BVersion%20Picker%20(multiple%20versions)%5D%22%20%3D%206.0.0%20AND%20%22Defect%20from%5BVersion%20Picker%20(multiple%20versions)%5D%22%20%3D%206.0.0%20AND%20created%20%3E%3D%20-48h%20ORDER%20BY%20cf%5B10070%5D%20ASC%2C%20status%20ASC%2C%20created%20DESC',
         ),
       ]),
     ],
@@ -301,7 +301,7 @@ describe('autoLink with custom hosts settings comming from Rocket.Chat', () => {
     ],
   ])('parses %p', (input, output) => {
     expect(
-      parse(input, { customDomains: ['local', 'intranet'] })
+      parse(input, { customDomains: ['local', 'intranet'] }),
     ).toMatchObject(output);
   });
 });
@@ -320,29 +320,29 @@ describe('autoLink WITHOUT custom hosts settings comming from Rocket.Chat', () =
 describe('autoLink helper function', () => {
   it('should preserve the original protocol if the protocol is http or https', () => {
     expect(autoLink('https://rocket.chat/test')).toMatchObject(
-      link('https://rocket.chat/test')
+      link('https://rocket.chat/test'),
     );
 
     expect(autoLink('http://rocket.chat/test')).toMatchObject(
-      link('http://rocket.chat/test')
+      link('http://rocket.chat/test'),
     );
   });
 
   it('should preserve the original protocol even if for custom protocols', () => {
     expect(autoLink('custom://rocket.chat/test')).toMatchObject(
-      link('custom://rocket.chat/test')
+      link('custom://rocket.chat/test'),
     );
   });
 
   it('should return // as the protocol if // is the protocol specified', () => {
     expect(autoLink('//rocket.chat/test')).toMatchObject(
-      link('//rocket.chat/test')
+      link('//rocket.chat/test'),
     );
   });
 
   it("should return an url concatenated '//' if the url has no protocol", () => {
     expect(autoLink('rocket.chat/test')).toMatchObject(
-      link('//rocket.chat/test', [plain('rocket.chat/test')])
+      link('//rocket.chat/test', [plain('rocket.chat/test')]),
     );
   });
 
@@ -350,13 +350,13 @@ describe('autoLink helper function', () => {
     expect(autoLink('spark-public.s3.amazonaws.com')).toMatchObject(
       link('//spark-public.s3.amazonaws.com', [
         plain('spark-public.s3.amazonaws.com'),
-      ])
+      ]),
     );
   });
 
   it("should return an plain text url due to invalid TLD that's validate with the external library TLDTS", () => {
     expect(autoLink('rocket.chattt/url_path')).toMatchObject(
-      plain('rocket.chattt/url_path')
+      plain('rocket.chattt/url_path'),
     );
   });
 });
diff --git a/packages/mock-providers/CHANGELOG.md b/packages/mock-providers/CHANGELOG.md
index 13d383164eb6..aefa17c20991 100644
--- a/packages/mock-providers/CHANGELOG.md
+++ b/packages/mock-providers/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @rocket.chat/mock-providers
 
+## 0.1.5-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [66ecc64fc1d4464ad2818ad04e23a09cdf221194, 6c83bf0657004ee9cf43d5c832f51826a6591165, 32d93a0666fa1cbe857d02889e93d9bbf45bd4f0, d1e6a73796269824fb1aa7afcc7b8aa242e34e90, 661cc01237629ce83699d6c25df25d12985e88bf, ce7024af36fcde97b1da5b2731f6edc4a4c236b8, 616655585cb1c5c60d7cee97e25b17af3dfda794, e5fe727f6a2f0e60cdf7ba225e1f6caa6db2045c, 322bafd4bd1fe91ed34610501b269e4d8951944c]:</summary>
+
+  - @rocket.chat/i18n@1.1.0-rc.0
+  </details>
+
 ## 0.1.4
 
 ### Patch Changes
diff --git a/packages/mock-providers/package.json b/packages/mock-providers/package.json
index bcb8af979184..074b8e83a660 100644
--- a/packages/mock-providers/package.json
+++ b/packages/mock-providers/package.json
@@ -1,11 +1,11 @@
 {
 	"name": "@rocket.chat/mock-providers",
-	"version": "0.1.4",
+	"version": "0.1.5-rc.0",
 	"private": true,
 	"dependencies": {
 		"@rocket.chat/emitter": "~0.31.25",
 		"@rocket.chat/i18n": "workspace:~",
-		"@storybook/react": "^8.3.5",
+		"@storybook/react": "^8.4.4",
 		"i18next": "~23.4.9",
 		"react-i18next": "~13.2.2",
 		"use-sync-external-store": "~1.2.2"
@@ -13,7 +13,7 @@
 	"devDependencies": {
 		"@rocket.chat/ddp-client": "workspace:~",
 		"@rocket.chat/ui-contexts": "workspace:*",
-		"@tanstack/react-query": "^4.16.1",
+		"@tanstack/react-query": "^4.36.1",
 		"@types/use-sync-external-store": "^0.0.6",
 		"eslint": "~8.45.0",
 		"react": "~17.0.2",
diff --git a/packages/mock-providers/src/MockedAppRootBuilder.tsx b/packages/mock-providers/src/MockedAppRootBuilder.tsx
index 69ca9cde99e1..9993cbee2c0d 100644
--- a/packages/mock-providers/src/MockedAppRootBuilder.tsx
+++ b/packages/mock-providers/src/MockedAppRootBuilder.tsx
@@ -3,7 +3,7 @@ import type { ServerMethodName, ServerMethodParameters, ServerMethodReturn } fro
 import { Emitter } from '@rocket.chat/emitter';
 import languages from '@rocket.chat/i18n/dist/languages';
 import type { Method, OperationParams, OperationResult, PathPattern, UrlParams } from '@rocket.chat/rest-typings';
-import type { Device, ModalContextValue, TranslationKey } from '@rocket.chat/ui-contexts';
+import type { Device, ModalContextValue, SubscriptionWithRoom, TranslationKey } from '@rocket.chat/ui-contexts';
 import {
 	AuthorizationContext,
 	ConnectionStatusContext,
@@ -92,11 +92,13 @@ export class MockedAppRootBuilder {
 		queryPreference: () => [() => () => undefined, () => undefined],
 		queryRoom: () => [() => () => undefined, () => undefined],
 		querySubscription: () => [() => () => undefined, () => undefined],
-		querySubscriptions: () => [() => () => undefined, () => []],
+		querySubscriptions: () => [() => () => undefined, () => this.subscriptions], // apply query and option
 		user: null,
 		userId: null,
 	};
 
+	private subscriptions: SubscriptionWithRoom[] = [];
+
 	private modal: ModalContextValue = {
 		currentModal: { component: null },
 		modal: {
@@ -271,6 +273,12 @@ export class MockedAppRootBuilder {
 		return this;
 	}
 
+	withSubscriptions(subscriptions: SubscriptionWithRoom[]): this {
+		this.subscriptions = subscriptions;
+
+		return this;
+	}
+
 	withRole(role: string): this {
 		if (!this.user.user) {
 			throw new Error('user is not defined');
@@ -418,7 +426,7 @@ export class MockedAppRootBuilder {
 								name: new Intl.DisplayNames([key], { type: 'language' }).of(key) ?? key,
 								ogName: new Intl.DisplayNames([key], { type: 'language' }).of(key) ?? key,
 								key,
-						  }))
+							}))
 						: []),
 				],
 				loadLanguage: async (language) => {
diff --git a/packages/mock-providers/src/MockedRouterContext.tsx b/packages/mock-providers/src/MockedRouterContext.tsx
new file mode 100644
index 000000000000..b1fb2e96cbb8
--- /dev/null
+++ b/packages/mock-providers/src/MockedRouterContext.tsx
@@ -0,0 +1,33 @@
+import { RouterContext } from '@rocket.chat/ui-contexts';
+import type { ContextType } from 'react';
+import React from 'react';
+
+export const MockedRouterContext = ({
+	children,
+	router,
+}: {
+	children: React.ReactNode;
+	router?: Partial<ContextType<typeof RouterContext>>;
+}) => {
+	return (
+		<RouterContext.Provider
+			value={{
+				subscribeToRouteChange: () => () => undefined,
+				getLocationPathname: () => '/',
+				getLocationSearch: () => '',
+				getRouteParameters: () => ({}),
+				getSearchParameters: () => ({}),
+				getRouteName: () => undefined,
+				buildRoutePath: () => '/',
+				navigate: () => undefined,
+				defineRoutes: () => () => undefined,
+				getRoutes: () => [],
+				subscribeToRoutesChange: () => () => undefined,
+				getRoomRoute: () => ({ path: '/' }),
+				...router,
+			}}
+		>
+			{children}
+		</RouterContext.Provider>
+	);
+};
diff --git a/packages/mock-providers/src/index.ts b/packages/mock-providers/src/index.ts
index 38a92c053e4b..941d613a1412 100644
--- a/packages/mock-providers/src/index.ts
+++ b/packages/mock-providers/src/index.ts
@@ -2,6 +2,7 @@ import { MockedAppRootBuilder } from './MockedAppRootBuilder';
 
 export const mockAppRoot = () => new MockedAppRootBuilder();
 
+export * from './MockedRouterContext';
 export * from './MockedAuthorizationContext';
 export * from './MockedModalContext';
 export * from './MockedServerContext';
diff --git a/packages/model-typings/CHANGELOG.md b/packages/model-typings/CHANGELOG.md
index 0029f6cd2b36..f2b4bb71bba7 100644
--- a/packages/model-typings/CHANGELOG.md
+++ b/packages/model-typings/CHANGELOG.md
@@ -1,5 +1,54 @@
 # @rocket.chat/model-typings
 
+## 1.1.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.3
+  </details>
+
+## 1.1.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.2
+  </details>
+
+## 1.1.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.1
+  </details>
+
+## 1.1.0-rc.0
+
+### Minor Changes
+
+- ([#32727](https://github.com/RocketChat/Rocket.Chat/pull/32727)) These changes aims to add:
+  - A brand-new omnichannel contact profile
+  - The ability to communicate with known contacts only
+  - Communicate with verified contacts only
+  - Merge verified contacts across different channels
+  - Block contact channels
+  - Resolve conflicting contact information when registered via different channels
+  - An advanced contact center filters
+
+### Patch Changes
+
+- ([#32991](https://github.com/RocketChat/Rocket.Chat/pull/32991)) Fixes an issue where updating custom emojis didn’t work as expected, ensuring that uploaded emojis now update correctly and display without any caching problems.
+
+- <details><summary>Updated dependencies [80e36bfc3938775eb26aa5576f1b9b98896e1cc4, 32d93a0666fa1cbe857d02889e93d9bbf45bd4f0]:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.0
+  </details>
+
 ## 1.0.0
 
 ### Major Changes
diff --git a/packages/model-typings/package.json b/packages/model-typings/package.json
index 58abd9651651..77cb7b3080d5 100644
--- a/packages/model-typings/package.json
+++ b/packages/model-typings/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/model-typings",
-	"version": "1.0.0",
+	"version": "1.1.0-rc.3",
 	"private": true,
 	"devDependencies": {
 		"@types/node-rsa": "^1.1.4",
diff --git a/packages/model-typings/src/models/IAvatarsModel.ts b/packages/model-typings/src/models/IAvatarsModel.ts
index 5c8e6c7f0f06..4f9ea5bb3706 100644
--- a/packages/model-typings/src/models/IAvatarsModel.ts
+++ b/packages/model-typings/src/models/IAvatarsModel.ts
@@ -1,5 +1,8 @@
-import type { IAvatar } from '@rocket.chat/core-typings';
+import type { IAvatar, IUser } from '@rocket.chat/core-typings';
+import type { FindOptions } from 'mongodb';
 
 import type { IBaseUploadsModel } from './IBaseUploadsModel';
 
-export type IAvatarsModel = IBaseUploadsModel<IAvatar>;
+export interface IAvatarsModel extends IBaseUploadsModel<IAvatar> {
+	findOneByUserId(userId: IUser['_id'], options?: FindOptions<IAvatarsModel>): Promise<IAvatar | null>;
+}
diff --git a/packages/model-typings/src/models/IBaseModel.ts b/packages/model-typings/src/models/IBaseModel.ts
index 626f91385a04..ad5aba3f8a15 100644
--- a/packages/model-typings/src/models/IBaseModel.ts
+++ b/packages/model-typings/src/models/IBaseModel.ts
@@ -29,8 +29,8 @@ export type DefaultFields<Base> = Record<keyof Base, 1> | Record<keyof Base, 0>
 export type ResultFields<Base, Defaults> = Defaults extends void
 	? Base
 	: Defaults[keyof Defaults] extends 1
-	? Pick<Defaults, keyof Defaults>
-	: Omit<Defaults, keyof Defaults>;
+		? Pick<Defaults, keyof Defaults>
+		: Omit<Defaults, keyof Defaults>;
 
 export type InsertionModel<T> = EnhancedOmit<OptionalId<T>, '_updatedAt'> & {
 	_updatedAt?: Date;
diff --git a/packages/model-typings/src/models/IEmojiCustomModel.ts b/packages/model-typings/src/models/IEmojiCustomModel.ts
index 30f0323c1ec7..5bae4d9eb9ba 100644
--- a/packages/model-typings/src/models/IEmojiCustomModel.ts
+++ b/packages/model-typings/src/models/IEmojiCustomModel.ts
@@ -9,6 +9,7 @@ export interface IEmojiCustomModel extends IBaseModel<IEmojiCustom> {
 	setName(_id: string, name: string): Promise<UpdateResult>;
 	setAliases(_id: string, aliases: string[]): Promise<UpdateResult>;
 	setExtension(_id: string, extension: string): Promise<UpdateResult>;
+	setETagByName(name: string, etag: string): Promise<UpdateResult>;
 	create(data: InsertionModel<IEmojiCustom>): Promise<InsertOneResult<WithId<IEmojiCustom>>>;
 	countByNameOrAlias(name: string): Promise<number>;
 }
diff --git a/packages/model-typings/src/models/IExportOperationsModel.ts b/packages/model-typings/src/models/IExportOperationsModel.ts
index c834f1bc46ef..c6ef5212b23d 100644
--- a/packages/model-typings/src/models/IExportOperationsModel.ts
+++ b/packages/model-typings/src/models/IExportOperationsModel.ts
@@ -9,4 +9,5 @@ export interface IExportOperationsModel extends IBaseModel<IExportOperation> {
 	findLastOperationByUser(userId: string, fullExport: boolean): Promise<IExportOperation | null>;
 	findAllPendingBeforeMyRequest(requestDay: Date): FindCursor<IExportOperation>;
 	updateOperation(data: IExportOperation): Promise<UpdateResult>;
+	countAllPendingBeforeMyRequest(requestDay: Date): Promise<number>;
 }
diff --git a/packages/model-typings/src/models/IImportDataModel.ts b/packages/model-typings/src/models/IImportDataModel.ts
index 95eaa8a4ce0d..fa4c9b66af4a 100644
--- a/packages/model-typings/src/models/IImportDataModel.ts
+++ b/packages/model-typings/src/models/IImportDataModel.ts
@@ -1,4 +1,10 @@
-import type { IImportRecord, IImportUserRecord, IImportMessageRecord, IImportChannelRecord } from '@rocket.chat/core-typings';
+import type {
+	IImportRecord,
+	IImportUserRecord,
+	IImportMessageRecord,
+	IImportContactRecord,
+	IImportChannelRecord,
+} from '@rocket.chat/core-typings';
 import type { FindCursor } from 'mongodb';
 
 import type { IBaseModel } from './IBaseModel';
@@ -9,6 +15,7 @@ export interface IImportDataModel extends IBaseModel<IImportRecord> {
 	getAllChannels(): FindCursor<IImportChannelRecord>;
 	getAllUsersForSelection(): Promise<Array<IImportUserRecord>>;
 	getAllChannelsForSelection(): Promise<Array<IImportChannelRecord>>;
+	getAllContactsForSelection(): Promise<IImportContactRecord[]>;
 	checkIfDirectMessagesExists(): Promise<boolean>;
 	countMessages(): Promise<number>;
 	findChannelImportIdByNameOrImportId(channelIdentifier: string): Promise<string | undefined>;
diff --git a/packages/model-typings/src/models/ILivechatContactsModel.ts b/packages/model-typings/src/models/ILivechatContactsModel.ts
index b57cc0cde49f..5cf68b15449c 100644
--- a/packages/model-typings/src/models/ILivechatContactsModel.ts
+++ b/packages/model-typings/src/models/ILivechatContactsModel.ts
@@ -1,11 +1,47 @@
-import type { ILivechatContact, ILivechatContactChannel } from '@rocket.chat/core-typings';
-import type { FindCursor, FindOptions, UpdateResult } from 'mongodb';
+import type {
+	AtLeast,
+	ILivechatContact,
+	ILivechatContactChannel,
+	ILivechatContactVisitorAssociation,
+	ILivechatVisitor,
+} from '@rocket.chat/core-typings';
+import type { Document, FindCursor, FindOneAndUpdateOptions, FindOptions, UpdateFilter, UpdateOptions, UpdateResult } from 'mongodb';
 
-import type { FindPaginated, IBaseModel } from './IBaseModel';
+import type { FindPaginated, IBaseModel, InsertionModel } from './IBaseModel';
 
 export interface ILivechatContactsModel extends IBaseModel<ILivechatContact> {
-	updateContact(contactId: string, data: Partial<ILivechatContact>): Promise<ILivechatContact>;
+	insertContact(
+		data: InsertionModel<Omit<ILivechatContact, 'createdAt'>> & { createdAt?: ILivechatContact['createdAt'] },
+	): Promise<ILivechatContact['_id']>;
+	updateContact(contactId: string, data: Partial<ILivechatContact>, options?: FindOneAndUpdateOptions): Promise<ILivechatContact>;
+	updateById(contactId: string, update: UpdateFilter<ILivechatContact>, options?: UpdateOptions): Promise<Document | UpdateResult>;
 	addChannel(contactId: string, channel: ILivechatContactChannel): Promise<void>;
-	findPaginatedContacts(searchText?: string, options?: FindOptions): FindPaginated<FindCursor<ILivechatContact>>;
-	updateLastChatById(contactId: string, lastChat: ILivechatContact['lastChat']): Promise<UpdateResult>;
+	findPaginatedContacts(
+		search: { searchText?: string; unknown?: boolean },
+		options?: FindOptions<ILivechatContact>,
+	): FindPaginated<FindCursor<ILivechatContact>>;
+	updateLastChatById(
+		contactId: string,
+		visitor: ILivechatContactVisitorAssociation,
+		lastChat: ILivechatContact['lastChat'],
+	): Promise<UpdateResult>;
+	findContactMatchingVisitor(visitor: AtLeast<ILivechatVisitor, 'visitorEmails' | 'phone'>): Promise<ILivechatContact | null>;
+	findOneByVisitor<T extends Document = ILivechatContact>(
+		visitor: ILivechatContactVisitorAssociation,
+		options?: FindOptions<ILivechatContact>,
+	): Promise<T | null>;
+	isChannelBlocked(visitor: ILivechatContactVisitorAssociation): Promise<boolean>;
+	updateContactChannel(
+		visitor: ILivechatContactVisitorAssociation,
+		data: Partial<ILivechatContactChannel>,
+		contactData?: Partial<Omit<ILivechatContact, 'channels'>>,
+		options?: UpdateOptions,
+	): Promise<UpdateResult>;
+	findSimilarVerifiedContacts(
+		channel: Pick<ILivechatContactChannel, 'field' | 'value'>,
+		originalContactId: string,
+		options?: FindOptions<ILivechatContact>,
+	): Promise<ILivechatContact[]>;
+	findAllByVisitorId(visitorId: string): FindCursor<ILivechatContact>;
+	addEmail(contactId: string, email: string): Promise<ILivechatContact | null>;
 }
diff --git a/packages/model-typings/src/models/ILivechatDepartmentAgentsModel.ts b/packages/model-typings/src/models/ILivechatDepartmentAgentsModel.ts
index f0f151fa70d4..827b266421b3 100644
--- a/packages/model-typings/src/models/ILivechatDepartmentAgentsModel.ts
+++ b/packages/model-typings/src/models/ILivechatDepartmentAgentsModel.ts
@@ -64,7 +64,9 @@ export interface ILivechatDepartmentAgentsModel extends IBaseModel<ILivechatDepa
 		departmentId: string,
 		isLivechatEnabledWhenAgentIdle?: boolean,
 	): Promise<FindCursor<ILivechatDepartmentAgents> | undefined>;
+	countOnlineForDepartment(departmentId: string, isLivechatEnabledWhenAgentIdle?: boolean): Promise<number>;
 	getBotsForDepartment(departmentId: string): Promise<undefined | FindCursor<ILivechatDepartmentAgents>>;
+	countBotsForDepartment(departmentId: string): Promise<number>;
 	getNextBotForDepartment(
 		departmentId: ILivechatDepartmentAgents['departmentId'],
 		ignoreAgentId?: ILivechatDepartmentAgents['agentId'],
diff --git a/packages/model-typings/src/models/ILivechatInquiryModel.ts b/packages/model-typings/src/models/ILivechatInquiryModel.ts
index 3535b65c3518..e44ff37b6ed4 100644
--- a/packages/model-typings/src/models/ILivechatInquiryModel.ts
+++ b/packages/model-typings/src/models/ILivechatInquiryModel.ts
@@ -14,6 +14,10 @@ export interface ILivechatInquiryModel extends IBaseModel<ILivechatInquiryRecord
 		rid: string,
 		options?: FindOptions<T extends ILivechatInquiryRecord ? ILivechatInquiryRecord : T>,
 	): Promise<T | null>;
+	findOneReadyByRoomId<T extends Document = ILivechatInquiryRecord>(
+		rid: string,
+		options?: FindOptions<T extends ILivechatInquiryRecord ? ILivechatInquiryRecord : T>,
+	): Promise<T | null>;
 	getDistinctQueuedDepartments(options: DistinctOptions): Promise<(string | undefined)[]>;
 	setDepartmentByInquiryId(inquiryId: string, department: string): Promise<ILivechatInquiryRecord | null>;
 	setLastMessageByRoomId(rid: ILivechatInquiryRecord['rid'], message: IMessage): Promise<ILivechatInquiryRecord | null>;
@@ -43,4 +47,7 @@ export interface ILivechatInquiryModel extends IBaseModel<ILivechatInquiryRecord
 	removeByVisitorToken(token: string): Promise<void>;
 	markInquiryActiveForPeriod(rid: ILivechatInquiryRecord['rid'], period: string): Promise<ILivechatInquiryRecord | null>;
 	findIdsByVisitorToken(token: ILivechatInquiryRecord['v']['token']): FindCursor<ILivechatInquiryRecord>;
+	setStatusById(inquiryId: string, status: LivechatInquiryStatus): Promise<ILivechatInquiryRecord>;
+	updateNameByVisitorIds(visitorIds: string[], name: string): Promise<UpdateResult | Document>;
+	findByVisitorIds(visitorIds: string[], options?: FindOptions<ILivechatInquiryRecord>): FindCursor<ILivechatInquiryRecord>;
 }
diff --git a/packages/model-typings/src/models/ILivechatRoomsModel.ts b/packages/model-typings/src/models/ILivechatRoomsModel.ts
index 7118a390056e..7ba6f9e74a3b 100644
--- a/packages/model-typings/src/models/ILivechatRoomsModel.ts
+++ b/packages/model-typings/src/models/ILivechatRoomsModel.ts
@@ -5,6 +5,9 @@ import type {
 	ISetting,
 	ILivechatVisitor,
 	MACStats,
+	ILivechatContactVisitorAssociation,
+	AtLeast,
+	ILivechatContact,
 } from '@rocket.chat/core-typings';
 import type { FindCursor, UpdateResult, AggregationCursor, Document, FindOptions, DeleteResult, Filter, UpdateOptions } from 'mongodb';
 
@@ -178,6 +181,10 @@ export interface ILivechatRoomsModel extends IBaseModel<IOmnichannelRoom> {
 		options?: FindOptions<IOmnichannelRoom>,
 		extraQuery?: Filter<IOmnichannelRoom>,
 	): FindCursor<IOmnichannelRoom>;
+	findOneOpenByContactChannelVisitor(
+		association: ILivechatContactVisitorAssociation,
+		options?: FindOptions<IOmnichannelRoom>,
+	): Promise<IOmnichannelRoom | null>;
 	findOneOpenByVisitorToken(visitorToken: string, options?: FindOptions<IOmnichannelRoom>): Promise<IOmnichannelRoom | null>;
 	findOneOpenByVisitorTokenAndDepartmentIdAndSource(
 		visitorToken: string,
@@ -260,10 +267,24 @@ export interface ILivechatRoomsModel extends IBaseModel<IOmnichannelRoom> {
 	getVisitorActiveForPeriodUpdateQuery(period: string, updater?: Updater<IOmnichannelRoom>): Updater<IOmnichannelRoom>;
 	getMACStatisticsForPeriod(period: string): Promise<MACStats[]>;
 	getMACStatisticsBetweenDates(start: Date, end: Date): Promise<MACStats[]>;
-	findPaginatedRoomsByVisitorsIdsAndSource(params: {
-		visitorsIds: string[];
+	findNewestByContactVisitorAssociation<T extends Document = IOmnichannelRoom>(
+		association: ILivechatContactVisitorAssociation,
+		options?: Omit<FindOptions<IOmnichannelRoom>, 'sort' | 'limit'>,
+	): Promise<T | null>;
+	setContactByVisitorAssociation(
+		association: ILivechatContactVisitorAssociation,
+		contact: Pick<AtLeast<ILivechatContact, '_id'>, '_id' | 'name'>,
+	): Promise<UpdateResult | Document>;
+	findClosedRoomsByContactPaginated(params: { contactId: string; options?: FindOptions }): FindPaginated<FindCursor<IOmnichannelRoom>>;
+	findClosedRoomsByContactAndSourcePaginated(params: {
+		contactId: string;
 		source?: string;
 		options?: FindOptions;
 	}): FindPaginated<FindCursor<IOmnichannelRoom>>;
 	countLivechatRoomsWithDepartment(): Promise<number>;
+	updateContactDataByContactId(
+		oldContactId: ILivechatContact['_id'],
+		contact: Partial<Pick<ILivechatContact, '_id' | 'name'>>,
+	): Promise<UpdateResult | Document>;
+	findOpenByContactId(contactId: ILivechatContact['_id'], options?: FindOptions<IOmnichannelRoom>): FindCursor<IOmnichannelRoom>;
 }
diff --git a/packages/model-typings/src/models/ILivechatVisitorsModel.ts b/packages/model-typings/src/models/ILivechatVisitorsModel.ts
index 3e17fc2a5962..998d9106cdf7 100644
--- a/packages/model-typings/src/models/ILivechatVisitorsModel.ts
+++ b/packages/model-typings/src/models/ILivechatVisitorsModel.ts
@@ -16,7 +16,6 @@ import type { FindPaginated, IBaseModel } from './IBaseModel';
 export interface ILivechatVisitorsModel extends IBaseModel<ILivechatVisitor> {
 	findById(_id: string, options?: FindOptions<ILivechatVisitor>): FindCursor<ILivechatVisitor>;
 	getVisitorByToken(token: string, options?: FindOptions<ILivechatVisitor>): Promise<ILivechatVisitor | null>;
-	getVisitorsBetweenDate({ start, end, department }: { start: Date; end: Date; department?: string }): FindCursor<ILivechatVisitor>;
 	findByNameRegexWithExceptionsAndConditions<P extends Document = ILivechatVisitor>(
 		searchTerm: string,
 		exceptions: string[],
@@ -77,4 +76,5 @@ export interface ILivechatVisitorsModel extends IBaseModel<ILivechatVisitor> {
 		data: { name?: string; username?: string; email?: string; phone?: string; livechatData: { [k: string]: any } },
 	): Promise<UpdateResult | Document | boolean>;
 	setLastChatById(_id: string, lastChat: Required<ILivechatVisitor['lastChat']>): Promise<UpdateResult>;
+	countVisitorsBetweenDate({ start, end, department }: { start: Date; end: Date; department?: string }): Promise<number>;
 }
diff --git a/packages/model-typings/src/models/IMessagesModel.ts b/packages/model-typings/src/models/IMessagesModel.ts
index 986a50c8cd29..e50e71f179bc 100644
--- a/packages/model-typings/src/models/IMessagesModel.ts
+++ b/packages/model-typings/src/models/IMessagesModel.ts
@@ -206,7 +206,7 @@ export interface IMessagesModel extends IBaseModel<IMessage> {
 	getLastTimestamp(options?: FindOptions<IMessage>): Promise<Date | undefined>;
 	findOneBySlackBotIdAndSlackTs(slackBotId: string, slackTs: Date): Promise<IMessage | null>;
 	findByRoomIdAndMessageIds(rid: string, messageIds: string[], options?: FindOptions<IMessage>): FindCursor<IMessage>;
-	findForUpdates(roomId: string, timestamp: Date, options?: FindOptions<IMessage>): FindCursor<IMessage>;
+	findForUpdates(roomId: IMessage['rid'], timestamp: { $lt: Date } | { $gt: Date }, options?: FindOptions<IMessage>): FindCursor<IMessage>;
 	updateUsernameOfEditByUserId(userId: string, username: string): Promise<UpdateResult | Document>;
 	updateAllUsernamesByUserId(userId: string, username: string): Promise<UpdateResult | Document>;
 
@@ -291,4 +291,6 @@ export interface IMessagesModel extends IBaseModel<IMessage> {
 
 	findThreadsByRoomId(rid: string, skip: number, limit: number): FindCursor<IMessage>;
 	decreaseReplyCountById(_id: string, inc?: number): Promise<UpdateResult>;
+	countPinned(options?: CountDocumentsOptions): Promise<number>;
+	countStarred(options?: CountDocumentsOptions): Promise<number>;
 }
diff --git a/packages/model-typings/src/models/INpsVoteModel.ts b/packages/model-typings/src/models/INpsVoteModel.ts
index a40bbef1b786..0b764299fb76 100644
--- a/packages/model-typings/src/models/INpsVoteModel.ts
+++ b/packages/model-typings/src/models/INpsVoteModel.ts
@@ -10,4 +10,6 @@ export interface INpsVoteModel extends IBaseModel<INpsVote> {
 	save(vote: Omit<INpsVote, '_id' | '_updatedAt'>): Promise<UpdateResult>;
 	updateVotesToSent(voteIds: string[]): Promise<UpdateResult | Document>;
 	updateOldSendingToNewByNpsId(npsId: string): Promise<UpdateResult | Document>;
+	countByNpsId(npsId: string): Promise<number>;
+	countByNpsIdAndStatus(npsId: string, status: INpsVoteStatus): Promise<number>;
 }
diff --git a/packages/model-typings/src/models/IRolesModel.ts b/packages/model-typings/src/models/IRolesModel.ts
index a6e8354a0bc0..84d49ef6baee 100644
--- a/packages/model-typings/src/models/IRolesModel.ts
+++ b/packages/model-typings/src/models/IRolesModel.ts
@@ -1,5 +1,5 @@
 import type { IRole, IUser, IRoom } from '@rocket.chat/core-typings';
-import type { FindCursor, FindOptions } from 'mongodb';
+import type { FindCursor, FindOptions, CountDocumentsOptions } from 'mongodb';
 
 import type { IBaseModel } from './IBaseModel';
 
@@ -61,4 +61,7 @@ export interface IRolesModel extends IBaseModel<IRole> {
 	): Promise<IRole>;
 
 	canAddUserToRole(uid: IUser['_id'], roleId: IRole['_id'], scope?: IRoom['_id']): Promise<boolean>;
+	countUsersInRole(roleId: IRole['_id'], scope?: IRoom['_id']): Promise<number>;
+	countByScope(scope: IRole['scope'], options?: CountDocumentsOptions): Promise<number>;
+	countCustomRoles(options?: CountDocumentsOptions): Promise<number>;
 }
diff --git a/packages/model-typings/src/models/IRoomsModel.ts b/packages/model-typings/src/models/IRoomsModel.ts
index 74d2fbe301e9..83932626ed6e 100644
--- a/packages/model-typings/src/models/IRoomsModel.ts
+++ b/packages/model-typings/src/models/IRoomsModel.ts
@@ -8,6 +8,7 @@ import type {
 	UpdateOptions,
 	UpdateResult,
 	ModifyResult,
+	CountDocumentsOptions,
 } from 'mongodb';
 
 import type { Updater } from '../updater';
@@ -49,6 +50,8 @@ export interface IRoomsModel extends IBaseModel<IRoom> {
 
 	findByTeamId(teamId: ITeam['_id'], options?: FindOptions<IRoom>): FindCursor<IRoom>;
 
+	countByTeamId(teamId: ITeam['_id']): Promise<number>;
+
 	findPaginatedByTeamIdContainingNameAndDefault(
 		teamId: ITeam['_id'],
 		name: IRoom['name'],
@@ -139,6 +142,8 @@ export interface IRoomsModel extends IBaseModel<IRoom> {
 
 	findRoomsInsideTeams(autoJoin?: boolean): FindCursor<IRoom>;
 
+	countRoomsInsideTeams(autoJoin?: boolean): Promise<number>;
+
 	findOneDirectRoomContainingAllUserIDs(uid: IDirectMessageRoom['uids'], options?: FindOptions<IRoom>): Promise<IRoom | null>;
 
 	countByType(t: IRoom['t']): Promise<number>;
@@ -304,4 +309,8 @@ export interface IRoomsModel extends IBaseModel<IRoom> {
 		e2eKeyId: string,
 		e2eQueue?: IRoom['usersWaitingForE2EKeys'],
 	): Promise<ModifyResult<IRoom>>;
+	countGroupDMsByUids(uids: NonNullable<IRoom['uids']>): Promise<number>;
+	countByCreatedOTR(options?: CountDocumentsOptions): Promise<number>;
+	countByBroadcast(options?: CountDocumentsOptions): Promise<number>;
+	countByE2E(options?: CountDocumentsOptions): Promise<number>;
 }
diff --git a/packages/model-typings/src/models/IServerEventsModel.ts b/packages/model-typings/src/models/IServerEventsModel.ts
index b4c91d12dedc..666893d2cabd 100644
--- a/packages/model-typings/src/models/IServerEventsModel.ts
+++ b/packages/model-typings/src/models/IServerEventsModel.ts
@@ -1,4 +1,4 @@
-import type { IServerEvent } from '@rocket.chat/core-typings';
+import type { ExtractDataToParams, IAuditServerActor, IServerEvent, IServerEvents } from '@rocket.chat/core-typings';
 
 import type { IBaseModel } from './IBaseModel';
 
@@ -11,4 +11,9 @@ export interface IServerEventsModel extends IBaseModel<IServerEvent> {
 	countFailedAttemptsByIpSince(ip: string, since: Date): Promise<number>;
 	countFailedAttemptsByIp(ip: string): Promise<number>;
 	countFailedAttemptsByUsername(username: string): Promise<number>;
+	createAuditServerEvent<K extends keyof IServerEvents, E extends IServerEvents[K]>(
+		key: K,
+		data: ExtractDataToParams<E>,
+		actor: IAuditServerActor,
+	): Promise<void>;
 }
diff --git a/packages/model-typings/src/models/ISubscriptionsModel.ts b/packages/model-typings/src/models/ISubscriptionsModel.ts
index 27c5f80e20e7..ec01eccdbf81 100644
--- a/packages/model-typings/src/models/ISubscriptionsModel.ts
+++ b/packages/model-typings/src/models/ISubscriptionsModel.ts
@@ -76,6 +76,8 @@ export interface ISubscriptionsModel extends IBaseModel<ISubscription> {
 
 	findByUserIdAndTypes(userId: string, types: ISubscription['t'][], options?: FindOptions<ISubscription>): FindCursor<ISubscription>;
 
+	findOpenByVisitorIds(visitorIds: string[], options?: FindOptions<ISubscription>): FindCursor<ISubscription>;
+
 	findByRoomIdAndNotAlertOrOpenExcludingUserIds(
 		filter: {
 			roomId: ISubscription['rid'];
@@ -114,6 +116,8 @@ export interface ISubscriptionsModel extends IBaseModel<ISubscription> {
 
 	updateNameAndFnameByRoomId(roomId: string, name: string, fname: string): Promise<UpdateResult | Document>;
 
+	updateNameAndFnameByVisitorIds(visitorIds: string[], name: string): Promise<UpdateResult | Document>;
+
 	setGroupE2EKey(_id: string, key: string): Promise<UpdateResult>;
 
 	setGroupE2EKeyAndOldRoomKeys(_id: string, key: string, oldRoomKeys: ISubscription['oldRoomKeys']): Promise<UpdateResult>;
@@ -321,4 +325,5 @@ export interface ISubscriptionsModel extends IBaseModel<ISubscription> {
 	countByRoomIdAndNotUserId(rid: string, uid: string): Promise<number>;
 	countByRoomIdWhenUsernameExists(rid: string): Promise<number>;
 	setE2EKeyByUserIdAndRoomId(userId: string, rid: string, key: string): Promise<ModifyResult<ISubscription>>;
+	countUsersInRoles(roles: IRole['_id'][], rid: IRoom['_id'] | undefined): Promise<number>;
 }
diff --git a/packages/model-typings/src/models/ITeamMemberModel.ts b/packages/model-typings/src/models/ITeamMemberModel.ts
index 46093c05458f..0a4264c9579a 100644
--- a/packages/model-typings/src/models/ITeamMemberModel.ts
+++ b/packages/model-typings/src/models/ITeamMemberModel.ts
@@ -38,6 +38,7 @@ export interface ITeamMemberModel extends IBaseModel<ITeamMember> {
 		options?: undefined | FindOptions<ITeamMember> | FindOptions<P extends ITeamMember ? ITeamMember : P>,
 	): FindCursor<P> | FindCursor<ITeamMember>;
 
+	countByTeamId(teamId: string): Promise<number>;
 	findByTeamIds(teamIds: Array<string>): FindCursor<ITeamMember>;
 
 	findByTeamIds(teamIds: Array<string>, options: FindOptions<ITeamMember>): FindCursor<ITeamMember>;
@@ -61,6 +62,8 @@ export interface ITeamMemberModel extends IBaseModel<ITeamMember> {
 		options?: undefined | FindOptions<ITeamMember> | FindOptions<P extends ITeamMember ? ITeamMember : P>,
 	): FindCursor<P> | FindCursor<ITeamMember>;
 
+	countByTeamIdAndRole(teamId: string, role: IRole['_id']): Promise<number>;
+
 	findByUserIdAndTeamIds(userId: string, teamIds: Array<string>, options?: FindOptions<ITeamMember>): FindCursor<ITeamMember>;
 
 	findPaginatedMembersInfoByTeamId(
diff --git a/packages/model-typings/src/models/IUsersModel.ts b/packages/model-typings/src/models/IUsersModel.ts
index 83c499a1356e..a2863aba8fe5 100644
--- a/packages/model-typings/src/models/IUsersModel.ts
+++ b/packages/model-typings/src/models/IUsersModel.ts
@@ -224,6 +224,7 @@ export interface IUsersModel extends IBaseModel<IUser> {
 
 	countFederatedExternalUsers(): Promise<number>;
 	findOnlineUserFromList(userList: string[], isLivechatEnabledWhenAgentIdle?: boolean): FindCursor<IUser>;
+	countOnlineUserFromList(userList: string[], isLivechatEnabledWhenAgentIdle?: boolean): Promise<number>;
 	getUnavailableAgents(
 		departmentId?: string,
 		extraQuery?: Document,
@@ -244,6 +245,7 @@ export interface IUsersModel extends IBaseModel<IUser> {
 	): Promise<IUser | null>;
 
 	findBotAgents(usernameList?: string[]): FindCursor<IUser>;
+	countBotAgents(usernameList?: string[]): Promise<number>;
 	removeAllRoomsByUserId(userId: string): Promise<UpdateResult>;
 	removeRoomByUserId(userId: string, rid: string): Promise<UpdateResult>;
 	addRoomByUserId(userId: string, rid: string): Promise<UpdateResult>;
@@ -406,4 +408,6 @@ export interface IUsersModel extends IBaseModel<IUser> {
 	setFreeSwitchExtension(userId: string, extension: string | undefined): Promise<UpdateResult>;
 	findAssignedFreeSwitchExtensions(): FindCursor<string>;
 	findUsersWithAssignedFreeSwitchExtensions<T = IUser>(options?: FindOptions<IUser>): FindCursor<T>;
+	countUsersInRoles(roles: IRole['_id'][]): Promise<number>;
+	countAllUsersWithPendingAvatar(): Promise<number>;
 }
diff --git a/packages/models/CHANGELOG.md b/packages/models/CHANGELOG.md
index 729f1479298c..0625e11c457a 100644
--- a/packages/models/CHANGELOG.md
+++ b/packages/models/CHANGELOG.md
@@ -1,5 +1,41 @@
 # @rocket.chat/models
 
+## 1.0.1-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/model-typings@1.1.0-rc.3
+  </details>
+
+## 1.0.1-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/model-typings@1.1.0-rc.2
+  </details>
+
+## 1.0.1-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/model-typings@1.1.0-rc.1
+  </details>
+
+## 1.0.1-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [80e36bfc3938775eb26aa5576f1b9b98896e1cc4, 32d93a0666fa1cbe857d02889e93d9bbf45bd4f0]:</summary>
+
+  - @rocket.chat/model-typings@1.1.0-rc.0
+  </details>
+
 ## 1.0.0
 
 ### Major Changes
diff --git a/packages/models/package.json b/packages/models/package.json
index 729e3cb632ba..ac5e90755c8b 100644
--- a/packages/models/package.json
+++ b/packages/models/package.json
@@ -1,10 +1,10 @@
 {
 	"name": "@rocket.chat/models",
-	"version": "1.0.0",
+	"version": "1.0.1-rc.3",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@types/jest": "~29.5.13",
+		"@types/jest": "~29.5.14",
 		"eslint": "~8.45.0",
 		"jest": "^29.7.0",
 		"typescript": "~5.6.3"
diff --git a/packages/password-policies/package.json b/packages/password-policies/package.json
index ecde88b09a5e..aef8b5cffba3 100644
--- a/packages/password-policies/package.json
+++ b/packages/password-policies/package.json
@@ -4,7 +4,7 @@
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@types/jest": "~29.5.13",
+		"@types/jest": "~29.5.14",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"typescript": "~5.6.3"
diff --git a/packages/patch-injection/package.json b/packages/patch-injection/package.json
index 895f9d5d3c38..8899f4720e2f 100644
--- a/packages/patch-injection/package.json
+++ b/packages/patch-injection/package.json
@@ -4,7 +4,7 @@
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@types/jest": "~29.5.13",
+		"@types/jest": "~29.5.14",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"typescript": "~5.6.3"
diff --git a/packages/patch-injection/src/definition.ts b/packages/patch-injection/src/definition.ts
index 6a3b56c0c308..85f35752e141 100644
--- a/packages/patch-injection/src/definition.ts
+++ b/packages/patch-injection/src/definition.ts
@@ -6,4 +6,8 @@ export type PatchData<T extends BaseFunction> = {
 };
 export type PatchedFunction<T extends BaseFunction> = T & {
 	patch: (patch: PatchFunction<T>, condition?: () => boolean) => () => void;
+	originalSignature: T;
+	patchSignature: PatchFunction<T>;
 };
+export type OriginalSignature<P extends PatchedFunction<BaseFunction>> = P['originalSignature'];
+export type PatchFor<P extends PatchedFunction<BaseFunction>> = PatchFunction<OriginalSignature<P>>;
diff --git a/packages/patch-injection/src/makeFunction.ts b/packages/patch-injection/src/makeFunction.ts
index a32ff8bc5b20..6bf8e5200a1b 100644
--- a/packages/patch-injection/src/makeFunction.ts
+++ b/packages/patch-injection/src/makeFunction.ts
@@ -29,5 +29,12 @@ export const makeFunction = <T extends BaseFunction>(fn: T): PatchedFunction<T>
 
 	result.patch = (patch: PatchFunction<T>, condition?: () => boolean) => addPatch(result, patch, condition);
 
+	result.originalSignature = (() => {
+		throw new Error('OriginalSignature of patched functions is not meant to be executed directly.');
+	}) as unknown as T;
+	result.patchSignature = (() => {
+		throw new Error('PatchSignature of patched functions is not meant to be executed directly.');
+	}) as unknown as PatchFunction<T>;
+
 	return result;
 };
diff --git a/packages/peggy-loader/package.json b/packages/peggy-loader/package.json
index 4a26ad60237a..13323d1ffa3f 100644
--- a/packages/peggy-loader/package.json
+++ b/packages/peggy-loader/package.json
@@ -44,11 +44,11 @@
   "devDependencies": {
     "@rocket.chat/eslint-config": "workspace:~",
     "@rocket.chat/prettier-config": "~0.31.25",
-    "@types/node": "~20.16.12",
+    "@types/node": "~20.16.15",
     "eslint": "~8.45.0",
     "npm-run-all": "^4.1.5",
-    "peggy": "3.0.2",
-    "prettier": "~2.8.8",
+    "peggy": "4.1.1",
+    "prettier": "~3.3.3",
     "rimraf": "^6.0.1",
     "typescript": "~5.6.3",
     "webpack": "~5.95.0"
diff --git a/packages/peggy-loader/src/index.ts b/packages/peggy-loader/src/index.ts
index 4d805d2be14d..5dcf3054243d 100644
--- a/packages/peggy-loader/src/index.ts
+++ b/packages/peggy-loader/src/index.ts
@@ -9,21 +9,20 @@ import type {
 import peggy from 'peggy';
 import type { LoaderContext } from 'webpack';
 
-type Options =
-  | BuildOptionsBase &
-      (
-        | Omit<
-            OutputFormatAmdCommonjsEs<'source'>,
-            keyof SourceOptionsBase<'source'>
-          >
-        | Omit<OutputFormatUmd<'source'>, keyof SourceOptionsBase<'source'>>
-        | Omit<OutputFormatGlobals<'source'>, keyof SourceOptionsBase<'source'>>
-        | Omit<OutputFormatBare<'source'>, keyof SourceOptionsBase<'source'>>
-      );
+type Options = BuildOptionsBase &
+  (
+    | Omit<
+        OutputFormatAmdCommonjsEs<'source'>,
+        keyof SourceOptionsBase<'source'>
+      >
+    | Omit<OutputFormatUmd<'source'>, keyof SourceOptionsBase<'source'>>
+    | Omit<OutputFormatGlobals<'source'>, keyof SourceOptionsBase<'source'>>
+    | Omit<OutputFormatBare<'source'>, keyof SourceOptionsBase<'source'>>
+  );
 
 function peggyLoader(
   this: LoaderContext<Options>,
-  grammarContent: string
+  grammarContent: string,
 ): string {
   const options: Options = {
     format: 'commonjs',
diff --git a/packages/random/package.json b/packages/random/package.json
index ce97498e087a..192bdbee701d 100644
--- a/packages/random/package.json
+++ b/packages/random/package.json
@@ -15,8 +15,8 @@
 		"test": "jest"
 	},
 	"devDependencies": {
-		"@babel/core": "~7.25.8",
-		"@babel/preset-env": "~7.25.8",
+		"@babel/core": "~7.26.0",
+		"@babel/preset-env": "~7.26.0",
 		"@rocket.chat/eslint-config": "workspace:^",
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@typescript-eslint/eslint-plugin": "~5.60.1",
diff --git a/packages/release-action/package.json b/packages/release-action/package.json
index a1d4db2f3842..0c0fe9e27eb6 100644
--- a/packages/release-action/package.json
+++ b/packages/release-action/package.json
@@ -10,14 +10,14 @@
 	"main": "dist/index.js",
 	"packageManager": "yarn@3.5.1",
 	"devDependencies": {
-		"@types/node": "~20.16.12",
+		"@types/node": "~20.16.15",
 		"typescript": "~5.6.3"
 	},
 	"dependencies": {
-		"@actions/core": "^1.10.1",
+		"@actions/core": "^1.11.1",
 		"@actions/exec": "^1.1.1",
-		"@actions/github": "^5.1.1",
-		"@octokit/plugin-throttling": "^6.0.0",
+		"@actions/github": "^6.0.0",
+		"@octokit/plugin-throttling": "^6.1.0",
 		"@rocket.chat/eslint-config": "workspace:^",
 		"eslint": "~8.45.0",
 		"mdast-util-to-string": "2.0.0",
diff --git a/packages/release-changelog/package.json b/packages/release-changelog/package.json
index 8f887584fc28..de28d8e2b470 100644
--- a/packages/release-changelog/package.json
+++ b/packages/release-changelog/package.json
@@ -10,7 +10,7 @@
 	"devDependencies": {
 		"@changesets/types": "^6.0.0",
 		"@rocket.chat/eslint-config": "workspace:^",
-		"@types/node": "~20.16.12",
+		"@types/node": "~20.16.15",
 		"eslint": "~8.45.0",
 		"typescript": "~5.6.3"
 	},
diff --git a/packages/rest-typings/CHANGELOG.md b/packages/rest-typings/CHANGELOG.md
index 3a9c33c4381c..f644ea8143df 100644
--- a/packages/rest-typings/CHANGELOG.md
+++ b/packages/rest-typings/CHANGELOG.md
@@ -1,5 +1,54 @@
 # @rocket.chat/rest-typings
 
+## 7.1.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.3
+  </details>
+
+## 7.1.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.2
+  </details>
+
+## 7.1.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.1
+  </details>
+
+## 7.1.0-rc.0
+
+### Minor Changes
+
+- ([#33810](https://github.com/RocketChat/Rocket.Chat/pull/33810)) Adds cursor pagination on chat.syncMessages endpoint
+
+- ([#32727](https://github.com/RocketChat/Rocket.Chat/pull/32727)) These changes aims to add:
+  - A brand-new omnichannel contact profile
+  - The ability to communicate with known contacts only
+  - Communicate with verified contacts only
+  - Merge verified contacts across different channels
+  - Block contact channels
+  - Resolve conflicting contact information when registered via different channels
+  - An advanced contact center filters
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [80e36bfc3938775eb26aa5576f1b9b98896e1cc4, 32d93a0666fa1cbe857d02889e93d9bbf45bd4f0]:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.0
+  </details>
+
 ## 7.0.0
 
 ### Major Changes
diff --git a/packages/rest-typings/package.json b/packages/rest-typings/package.json
index b659cb872cde..6cf2fbfa1592 100644
--- a/packages/rest-typings/package.json
+++ b/packages/rest-typings/package.json
@@ -1,10 +1,10 @@
 {
 	"name": "@rocket.chat/rest-typings",
-	"version": "7.0.0",
+	"version": "7.1.0-rc.3",
 	"devDependencies": {
 		"@rocket.chat/apps-engine": "workspace:^",
 		"@rocket.chat/eslint-config": "workspace:~",
-		"@types/jest": "~29.5.13",
+		"@types/jest": "~29.5.14",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"mongodb": "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch",
@@ -27,8 +27,8 @@
 		"@rocket.chat/core-typings": "workspace:^",
 		"@rocket.chat/message-parser": "workspace:^",
 		"@rocket.chat/ui-kit": "workspace:~",
-		"ajv": "^8.11.0",
-		"ajv-formats": "^2.1.1"
+		"ajv": "^8.17.1",
+		"ajv-formats": "^3.0.1"
 	},
 	"volta": {
 		"extends": "../../package.json"
diff --git a/packages/rest-typings/src/helpers/ReplacePlaceholders.ts b/packages/rest-typings/src/helpers/ReplacePlaceholders.ts
index 66c4892f12c2..08dd43b83067 100644
--- a/packages/rest-typings/src/helpers/ReplacePlaceholders.ts
+++ b/packages/rest-typings/src/helpers/ReplacePlaceholders.ts
@@ -1,7 +1,7 @@
 export type ReplacePlaceholders<TPath extends string> = string extends TPath
 	? TPath
 	: TPath extends `${infer Start}:${string}/${infer Rest}`
-	? `${Start}${string}/${ReplacePlaceholders<Rest>}`
-	: TPath extends `${infer Start}:${string}`
-	? `${Start}${string}`
-	: TPath;
+		? `${Start}${string}/${ReplacePlaceholders<Rest>}`
+		: TPath extends `${infer Start}:${string}`
+			? `${Start}${string}`
+			: TPath;
diff --git a/packages/rest-typings/src/index.ts b/packages/rest-typings/src/index.ts
index 930271fe846e..fd1fc3ac2068 100644
--- a/packages/rest-typings/src/index.ts
+++ b/packages/rest-typings/src/index.ts
@@ -115,7 +115,7 @@ type OperationsByPathPatternAndMethod<
 			path: ReplacePlaceholders<TPathPattern extends string ? TPathPattern : never>;
 			params: GetParams<TEndpoints[TPathPattern][TMethod]>;
 			result: GetResult<TEndpoints[TPathPattern][TMethod]>;
-	  }
+		}
 	: never;
 
 type OperationsByPathPattern<TEndpoints extends Endpoints, TPathPattern extends keyof TEndpoints> = TPathPattern extends any
@@ -142,8 +142,8 @@ type MethodToPathWithoutParamsMap = {
 	[TOperation in Operations as Parameters<TOperation['fn']> extends { length: 0 }
 		? TOperation['method']
 		: undefined extends Parameters<TOperation['fn']>[0]
-		? TOperation['method']
-		: never]: TOperation['path'];
+			? TOperation['method']
+			: never]: TOperation['path'];
 };
 
 export type PathFor<TMethod extends Method> = MethodToPathMap[TMethod];
@@ -206,10 +206,10 @@ export type OperationResult<TMethod extends Method, TPathPattern extends PathPat
 export type UrlParams<T extends string> = string extends T
 	? Record<string, string>
 	: T extends `${string}:${infer Param}/${infer Rest}`
-	? { [k in Param | keyof UrlParams<Rest>]: string }
-	: T extends `${string}:${infer Param}`
-	? { [k in Param]: string }
-	: undefined | Record<string, never>;
+		? { [k in Param | keyof UrlParams<Rest>]: string }
+		: T extends `${string}:${infer Param}`
+			? { [k in Param]: string }
+			: undefined | Record<string, never>;
 
 export type MethodOf<TPathPattern extends PathPattern> = TPathPattern extends any ? keyof Endpoints[TPathPattern] : never;
 
diff --git a/packages/rest-typings/src/v1/Ajv.ts b/packages/rest-typings/src/v1/Ajv.ts
index 7eb62ac2cc1d..3b2dc32942d7 100644
--- a/packages/rest-typings/src/v1/Ajv.ts
+++ b/packages/rest-typings/src/v1/Ajv.ts
@@ -3,6 +3,7 @@ import addFormats from 'ajv-formats';
 
 const ajv = new Ajv({
 	coerceTypes: true,
+	allowUnionTypes: true,
 });
 
 addFormats(ajv);
@@ -13,4 +14,10 @@ ajv.addFormat(
 	/^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/,
 );
 
+ajv.addKeyword({
+	keyword: 'isNotEmpty',
+	type: 'string',
+	validate: (_schema: unknown, data: unknown): boolean => typeof data === 'string' && !!data.trim(),
+});
+
 export { ajv };
diff --git a/packages/rest-typings/src/v1/channels/channels.ts b/packages/rest-typings/src/v1/channels/channels.ts
index c3138db17436..51611dfa783b 100644
--- a/packages/rest-typings/src/v1/channels/channels.ts
+++ b/packages/rest-typings/src/v1/channels/channels.ts
@@ -1,7 +1,5 @@
 import type { IUploadWithUser, IMessage, IRoom, ITeam, IGetRoomRoles, IUser, IIntegration } from '@rocket.chat/core-typings';
 
-import type { PaginatedRequest } from '../../helpers/PaginatedRequest';
-import type { PaginatedResult } from '../../helpers/PaginatedResult';
 import type { ChannelsAddAllProps } from './ChannelsAddAllProps';
 import type { ChannelsArchiveProps } from './ChannelsArchiveProps';
 import type { ChannelsConvertToTeamProps } from './ChannelsConvertToTeamProps';
@@ -32,6 +30,8 @@ import type { ChannelsSetReadOnlyProps } from './ChannelsSetReadOnlyProps';
 import type { ChannelsSetTopicProps } from './ChannelsSetTopicProps';
 import type { ChannelsSetTypeProps } from './ChannelsSetTypeProps';
 import type { ChannelsUnarchiveProps } from './ChannelsUnarchiveProps';
+import type { PaginatedRequest } from '../../helpers/PaginatedRequest';
+import type { PaginatedResult } from '../../helpers/PaginatedResult';
 
 export * from './ChannelsFilesListProps';
 export * from './ChannelsListProps';
diff --git a/packages/rest-typings/src/v1/chat.ts b/packages/rest-typings/src/v1/chat.ts
index 84e51b3c379c..d2fb3915b405 100644
--- a/packages/rest-typings/src/v1/chat.ts
+++ b/packages/rest-typings/src/v1/chat.ts
@@ -1,4 +1,12 @@
-import type { IMessage, IRoom, MessageAttachment, ReadReceipt, OtrSystemMessages, MessageUrl } from '@rocket.chat/core-typings';
+import type {
+	IMessage,
+	IRoom,
+	MessageAttachment,
+	ReadReceipt,
+	OtrSystemMessages,
+	MessageUrl,
+	IThreadMainMessage,
+} from '@rocket.chat/core-typings';
 import Ajv from 'ajv';
 
 import type { PaginatedRequest } from '../helpers/PaginatedRequest';
@@ -605,7 +613,11 @@ export const isChatGetMentionedMessagesProps = ajv.compile<GetMentionedMessages>
 
 type ChatSyncMessages = {
 	roomId: IRoom['_id'];
-	lastUpdate: string;
+	lastUpdate?: string;
+	count?: number;
+	next?: string;
+	previous?: string;
+	type?: 'UPDATED' | 'DELETED';
 };
 
 const ChatSyncMessagesSchema = {
@@ -616,9 +628,27 @@ const ChatSyncMessagesSchema = {
 		},
 		lastUpdate: {
 			type: 'string',
+			nullable: true,
+		},
+		count: {
+			type: 'number',
+			nullable: true,
+		},
+		next: {
+			type: 'string',
+			nullable: true,
+		},
+		previous: {
+			type: 'string',
+			nullable: true,
+		},
+		type: {
+			type: 'string',
+			enum: ['UPDATED', 'DELETED'],
+			nullable: true,
 		},
 	},
-	required: ['roomId', 'lastUpdate'],
+	required: ['roomId'],
 	additionalProperties: false,
 };
 
@@ -899,7 +929,7 @@ export type ChatEndpoints = {
 	};
 	'/v1/chat.getThreadsList': {
 		GET: (params: ChatGetThreadsList) => {
-			threads: IMessage[];
+			threads: IThreadMainMessage[];
 			total: number;
 		};
 	};
@@ -966,6 +996,10 @@ export type ChatEndpoints = {
 			result: {
 				updated: IMessage[];
 				deleted: IMessage[];
+				cursor: {
+					next: string | null;
+					previous: string | null;
+				};
 			};
 		};
 	};
diff --git a/packages/rest-typings/src/v1/dm/im.ts b/packages/rest-typings/src/v1/dm/im.ts
index 60d08abc56b2..4f1414fd6b0c 100644
--- a/packages/rest-typings/src/v1/dm/im.ts
+++ b/packages/rest-typings/src/v1/dm/im.ts
@@ -1,7 +1,5 @@
 import type { IMessage, IRoom, IUser, IUploadWithUser } from '@rocket.chat/core-typings';
 
-import type { PaginatedRequest } from '../../helpers/PaginatedRequest';
-import type { PaginatedResult } from '../../helpers/PaginatedResult';
 import type { DmCloseProps } from './DmCloseProps';
 import type { DmCreateProps } from './DmCreateProps';
 import type { DmDeleteProps } from './DmDeleteProps';
@@ -10,6 +8,8 @@ import type { DmHistoryProps } from './DmHistoryProps';
 import type { DmLeaveProps } from './DmLeaveProps';
 import type { DmMemberProps } from './DmMembersProps';
 import type { DmMessagesProps } from './DmMessagesProps';
+import type { PaginatedRequest } from '../../helpers/PaginatedRequest';
+import type { PaginatedResult } from '../../helpers/PaginatedResult';
 
 export type ImEndpoints = {
 	'/v1/im.create': {
diff --git a/packages/rest-typings/src/v1/groups/GroupsFilesProps.ts b/packages/rest-typings/src/v1/groups/GroupsFilesProps.ts
index 5cf796119c72..fc5ba3b73e62 100644
--- a/packages/rest-typings/src/v1/groups/GroupsFilesProps.ts
+++ b/packages/rest-typings/src/v1/groups/GroupsFilesProps.ts
@@ -1,8 +1,8 @@
 import Ajv from 'ajv';
 
-import type { PaginatedRequest } from '../../helpers/PaginatedRequest';
 import type { GroupsBaseProps } from './BaseProps';
 import { withGroupBaseProperties } from './BaseProps';
+import type { PaginatedRequest } from '../../helpers/PaginatedRequest';
 
 const ajv = new Ajv({
 	coerceTypes: true,
diff --git a/packages/rest-typings/src/v1/groups/GroupsHistoryProps.ts b/packages/rest-typings/src/v1/groups/GroupsHistoryProps.ts
index 7293ab3a8819..f92b75b97af7 100644
--- a/packages/rest-typings/src/v1/groups/GroupsHistoryProps.ts
+++ b/packages/rest-typings/src/v1/groups/GroupsHistoryProps.ts
@@ -1,8 +1,8 @@
 import Ajv from 'ajv';
 
-import type { PaginatedRequest } from '../../helpers/PaginatedRequest';
 import type { GroupsBaseProps } from './BaseProps';
 import { withGroupBaseProperties } from './BaseProps';
+import type { PaginatedRequest } from '../../helpers/PaginatedRequest';
 
 const ajv = new Ajv({
 	coerceTypes: true,
diff --git a/packages/rest-typings/src/v1/groups/GroupsMembersProps.ts b/packages/rest-typings/src/v1/groups/GroupsMembersProps.ts
index b3484bf82f87..e26a88a3d459 100644
--- a/packages/rest-typings/src/v1/groups/GroupsMembersProps.ts
+++ b/packages/rest-typings/src/v1/groups/GroupsMembersProps.ts
@@ -1,8 +1,8 @@
 import Ajv from 'ajv';
 
-import type { PaginatedRequest } from '../../helpers/PaginatedRequest';
 import type { GroupsBaseProps } from './BaseProps';
 import { withGroupBaseProperties } from './BaseProps';
+import type { PaginatedRequest } from '../../helpers/PaginatedRequest';
 
 const ajv = new Ajv({
 	coerceTypes: true,
diff --git a/packages/rest-typings/src/v1/groups/GroupsMessagesProps.ts b/packages/rest-typings/src/v1/groups/GroupsMessagesProps.ts
index 834aeea88e4a..d02644be633c 100644
--- a/packages/rest-typings/src/v1/groups/GroupsMessagesProps.ts
+++ b/packages/rest-typings/src/v1/groups/GroupsMessagesProps.ts
@@ -1,8 +1,8 @@
 import type { IRoom } from '@rocket.chat/core-typings';
 import Ajv from 'ajv';
 
-import type { PaginatedRequest } from '../../helpers/PaginatedRequest';
 import { withGroupBaseProperties } from './BaseProps';
+import type { PaginatedRequest } from '../../helpers/PaginatedRequest';
 
 const ajv = new Ajv({
 	coerceTypes: true,
diff --git a/packages/rest-typings/src/v1/groups/groups.ts b/packages/rest-typings/src/v1/groups/groups.ts
index 687418e7d4e9..973f5d98a357 100644
--- a/packages/rest-typings/src/v1/groups/groups.ts
+++ b/packages/rest-typings/src/v1/groups/groups.ts
@@ -1,6 +1,5 @@
 import type { IMessage, IRoom, ITeam, IGetRoomRoles, IUser, IUploadWithUser, IIntegration, ISubscription } from '@rocket.chat/core-typings';
 
-import type { PaginatedResult } from '../../helpers/PaginatedResult';
 import type { GroupsAddAllProps } from './GroupsAddAllProps';
 import type { GroupsAddLeaderProps } from './GroupsAddLeaderProps';
 import type { GroupsAddModeratorProps } from './GroupsAddModeratorProps';
@@ -38,6 +37,7 @@ import type { GroupsSetReadOnlyProps } from './GroupsSetReadOnlyProps';
 import type { GroupsSetTopicProps } from './GroupsSetTopicProps';
 import type { GroupsSetTypeProps } from './GroupsSetTypeProps';
 import type { GroupsUnarchiveProps } from './GroupsUnarchiveProps';
+import type { PaginatedResult } from '../../helpers/PaginatedResult';
 
 export type GroupsEndpoints = {
 	'/v1/groups.files': {
diff --git a/packages/rest-typings/src/v1/import/StartImportParamsPOST.ts b/packages/rest-typings/src/v1/import/StartImportParamsPOST.ts
index fd2a456a615d..943bf8aaa21a 100644
--- a/packages/rest-typings/src/v1/import/StartImportParamsPOST.ts
+++ b/packages/rest-typings/src/v1/import/StartImportParamsPOST.ts
@@ -29,6 +29,7 @@ const StartImportParamsPostSchema = {
 			properties: {
 				users: RecordListSchema,
 				channels: RecordListSchema,
+				contacts: RecordListSchema,
 			},
 			required: [],
 		},
diff --git a/packages/rest-typings/src/v1/integrations/integrations.ts b/packages/rest-typings/src/v1/integrations/integrations.ts
index 4557937b5b77..c2833f20bdbe 100644
--- a/packages/rest-typings/src/v1/integrations/integrations.ts
+++ b/packages/rest-typings/src/v1/integrations/integrations.ts
@@ -1,12 +1,12 @@
 import type { IIntegration, IIntegrationHistory } from '@rocket.chat/core-typings';
 
-import type { PaginatedResult } from '../../helpers/PaginatedResult';
 import type { IntegrationsCreateProps } from './IntegrationsCreateProps';
 import type { IntegrationsGetProps } from './IntegrationsGetProps';
 import type { IntegrationsHistoryProps } from './IntegrationsHistoryProps';
 import type { IntegrationsListProps } from './IntegrationsListProps';
 import type { IntegrationsRemoveProps } from './IntegrationsRemoveProps';
 import type { IntegrationsUpdateProps } from './IntegrationsUpdateProps';
+import type { PaginatedResult } from '../../helpers/PaginatedResult';
 
 export type IntegrationsEndpoints = {
 	'/v1/integrations.create': {
diff --git a/packages/rest-typings/src/v1/moderation/moderation.ts b/packages/rest-typings/src/v1/moderation/moderation.ts
index 7ce7f4276a3c..41562d37dd58 100644
--- a/packages/rest-typings/src/v1/moderation/moderation.ts
+++ b/packages/rest-typings/src/v1/moderation/moderation.ts
@@ -1,6 +1,5 @@
 import type { IModerationAudit, IModerationReport, IUser, MessageReport, UserReport } from '@rocket.chat/core-typings';
 
-import type { PaginatedResult } from '../../helpers/PaginatedResult';
 import type { ArchiveReportPropsPOST } from './ArchiveReportProps';
 import type { GetUserReportsParamsGET } from './GetUserReportsParams';
 import type { ModerationDeleteMsgHistoryParamsPOST } from './ModerationDeleteMsgHistoryParams';
@@ -8,6 +7,7 @@ import type { ModerationReportUserPOST } from './ModerationReportUserPOST';
 import type { ReportHistoryPropsGET } from './ReportHistoryProps';
 import type { ReportInfoParams } from './ReportInfoParams';
 import type { ReportsByMsgIdParamsGET } from './ReportsByMsgIdParams';
+import type { PaginatedResult } from '../../helpers/PaginatedResult';
 
 export type ModerationEndpoints = {
 	// API endpoint to fetch the reported messages
diff --git a/packages/rest-typings/src/v1/omnichannel.ts b/packages/rest-typings/src/v1/omnichannel.ts
index f9b2afea8181..2cd33e6cf8fb 100644
--- a/packages/rest-typings/src/v1/omnichannel.ts
+++ b/packages/rest-typings/src/v1/omnichannel.ts
@@ -9,6 +9,7 @@ import type {
 	ILivechatVisitorDTO,
 	IMessage,
 	IOmnichannelRoom,
+	IOmnichannelRoomWithDepartment,
 	IRoom,
 	ISetting,
 	ILivechatAgentActivity,
@@ -28,22 +29,20 @@ import type {
 	SMSProviderResponse,
 	ILivechatTriggerActionResponse,
 	ILivechatContact,
+	ILivechatContactVisitorAssociation,
+	ILivechatContactChannel,
+	IUser,
 } from '@rocket.chat/core-typings';
 import { ILivechatAgentStatus } from '@rocket.chat/core-typings';
-import Ajv from 'ajv';
 import type { WithId } from 'mongodb';
 
+import { ajv } from './Ajv';
 import type { Deprecated } from '../helpers/Deprecated';
 import type { PaginatedRequest } from '../helpers/PaginatedRequest';
 import type { PaginatedResult } from '../helpers/PaginatedResult';
 
 type booleanString = 'true' | 'false';
 
-const ajv = new Ajv({
-	coerceTypes: true,
-	allowUnionTypes: true,
-});
-
 type LivechatVisitorsInfo = {
 	visitorId: string;
 };
@@ -988,6 +987,24 @@ export type LivechatRoomsProps = {
 	onhold?: boolean;
 };
 
+export type ContactSearchChatsResult = Pick<
+	IOmnichannelRoom,
+	| 'fname'
+	| 'ts'
+	| 'v'
+	| 'msgs'
+	| 'servedBy'
+	| 'closedAt'
+	| 'closedBy'
+	| 'closer'
+	| 'tags'
+	| '_id'
+	| 'closingMessage'
+	| 'source'
+	| 'lastMessage'
+	| 'verified'
+>;
+
 export type VisitorSearchChatsResult = Pick<
 	IOmnichannelRoom,
 	'fname' | 'ts' | 'msgs' | 'servedBy' | 'closedAt' | 'closedBy' | 'closer' | 'tags' | '_id' | 'closingMessage'
@@ -1272,6 +1289,7 @@ type POSTUpdateOmnichannelContactsProps = {
 	phones?: string[];
 	customFields?: Record<string, unknown>;
 	contactManager?: string;
+	wipeConflicts?: boolean;
 };
 
 const POSTUpdateOmnichannelContactsSchema = {
@@ -1307,6 +1325,10 @@ const POSTUpdateOmnichannelContactsSchema = {
 			type: 'string',
 			nullable: true,
 		},
+		wipeConflicts: {
+			type: 'boolean',
+			nullable: true,
+		},
 	},
 	required: ['contactId'],
 	additionalProperties: false,
@@ -1314,13 +1336,38 @@ const POSTUpdateOmnichannelContactsSchema = {
 
 export const isPOSTUpdateOmnichannelContactsProps = ajv.compile<POSTUpdateOmnichannelContactsProps>(POSTUpdateOmnichannelContactsSchema);
 
-type GETOmnichannelContactsProps = { contactId: string };
+type GETOmnichannelContactsProps = { contactId?: string; visitor?: ILivechatContactVisitorAssociation };
+
+export const ContactVisitorAssociationSchema = {
+	type: 'object',
+	properties: {
+		visitorId: {
+			type: 'string',
+		},
+		source: {
+			type: 'object',
+			properties: {
+				type: {
+					type: 'string',
+				},
+				id: {
+					type: 'string',
+				},
+			},
+			required: ['type'],
+		},
+	},
+	nullable: false,
+	required: ['visitorId', 'source'],
+};
 
 const GETOmnichannelContactsSchema = {
 	type: 'object',
 	properties: {
 		contactId: {
 			type: 'string',
+			nullable: false,
+			isNotEmpty: true,
 		},
 	},
 	required: ['contactId'],
@@ -1331,6 +1378,7 @@ export const isGETOmnichannelContactsProps = ajv.compile<GETOmnichannelContactsP
 
 type GETOmnichannelContactsSearchProps = PaginatedRequest<{
 	searchText: string;
+	unknown?: boolean;
 }>;
 
 const GETOmnichannelContactsSearchSchema = {
@@ -1348,6 +1396,9 @@ const GETOmnichannelContactsSearchSchema = {
 		searchText: {
 			type: 'string',
 		},
+		unknown: {
+			type: 'boolean',
+		},
 	},
 	required: [],
 	additionalProperties: false,
@@ -1385,6 +1436,23 @@ const GETOmnichannelContactHistorySchema = {
 
 export const isGETOmnichannelContactHistoryProps = ajv.compile<GETOmnichannelContactHistoryProps>(GETOmnichannelContactHistorySchema);
 
+type GETOmnichannelContactsChannelsProps = {
+	contactId: string;
+};
+
+const GETOmnichannelContactsChannelsSchema = {
+	type: 'object',
+	properties: {
+		contactId: {
+			type: 'string',
+		},
+	},
+	required: ['contactId'],
+	additionalProperties: false,
+};
+
+export const isGETOmnichannelContactsChannelsProps = ajv.compile<GETOmnichannelContactsChannelsProps>(GETOmnichannelContactsChannelsSchema);
+
 type GETOmnichannelContactProps = { contactId: string };
 
 const GETOmnichannelContactSchema = {
@@ -3492,6 +3560,10 @@ const LivechatTriggerWebhookCallParamsSchema = {
 
 export const isLivechatTriggerWebhookCallParams = ajv.compile<LivechatTriggerWebhookCallParams>(LivechatTriggerWebhookCallParamsSchema);
 
+export type ILivechatContactWithManagerData = Omit<ILivechatContact, 'contactManager'> & {
+	contactManager?: Pick<IUser, '_id' | 'name' | 'username'>;
+};
+
 export type OmnichannelEndpoints = {
 	'/v1/livechat/appearance': {
 		GET: () => {
@@ -3781,10 +3853,13 @@ export type OmnichannelEndpoints = {
 		GET: (params: GETOmnichannelContactsProps) => { contact: ILivechatContact | null };
 	};
 	'/v1/omnichannel/contacts.search': {
-		GET: (params: GETOmnichannelContactsSearchProps) => PaginatedResult<{ contacts: ILivechatContact[] }>;
+		GET: (params: GETOmnichannelContactsSearchProps) => PaginatedResult<{ contacts: ILivechatContactWithManagerData[] }>;
 	};
 	'/v1/omnichannel/contacts.history': {
-		GET: (params: GETOmnichannelContactHistoryProps) => PaginatedResult<{ history: VisitorSearchChatsResult[] }>;
+		GET: (params: GETOmnichannelContactHistoryProps) => PaginatedResult<{ history: ContactSearchChatsResult[] }>;
+	};
+	'/v1/omnichannel/contacts.channels': {
+		GET: (params: GETOmnichannelContactsChannelsProps) => { channels: ILivechatContactChannel[] | null };
 	};
 	'/v1/omnichannel/contact.search': {
 		GET: (params: GETOmnichannelContactSearchProps) => { contact: ILivechatVisitor | null };
@@ -3886,7 +3961,7 @@ export type OmnichannelEndpoints = {
 		DELETE: () => void;
 	};
 	'/v1/livechat/rooms': {
-		GET: (params: GETLivechatRoomsParams) => PaginatedResult<{ rooms: IOmnichannelRoom[] }>;
+		GET: (params: GETLivechatRoomsParams) => PaginatedResult<{ rooms: IOmnichannelRoomWithDepartment[] }>;
 	};
 	'/v1/livechat/room/:rid/priority': {
 		POST: (params: POSTLivechatRoomPriorityParams) => void;
diff --git a/packages/rest-typings/src/v1/rooms.ts b/packages/rest-typings/src/v1/rooms.ts
index 16debe87e44c..0f420b486a3b 100644
--- a/packages/rest-typings/src/v1/rooms.ts
+++ b/packages/rest-typings/src/v1/rooms.ts
@@ -1,8 +1,8 @@
 import type { IMessage, IRoom, IUser, RoomAdminFieldsType, IUpload, IE2EEMessage, ITeam } from '@rocket.chat/core-typings';
 
+import { ajv } from './Ajv';
 import type { PaginatedRequest } from '../helpers/PaginatedRequest';
 import type { PaginatedResult } from '../helpers/PaginatedResult';
-import { ajv } from './Ajv';
 
 type RoomsAutoCompleteChannelAndPrivateProps = { selector: string };
 
diff --git a/packages/rest-typings/src/v1/settings.ts b/packages/rest-typings/src/v1/settings.ts
index c512a554762d..7aec62fdfceb 100644
--- a/packages/rest-typings/src/v1/settings.ts
+++ b/packages/rest-typings/src/v1/settings.ts
@@ -1,8 +1,8 @@
 import type { ISetting, ISettingColor, LoginServiceConfiguration } from '@rocket.chat/core-typings';
 
+import { ajv } from './Ajv';
 import type { PaginatedRequest } from '../helpers/PaginatedRequest';
 import type { PaginatedResult } from '../helpers/PaginatedResult';
-import { ajv } from './Ajv';
 
 type SettingsUpdateProps = SettingsUpdatePropDefault | SettingsUpdatePropsActions | SettingsUpdatePropsColor;
 
diff --git a/packages/rest-typings/src/v1/teams/index.ts b/packages/rest-typings/src/v1/teams/index.ts
index a4ae6c7bca0f..31c4e588fb73 100644
--- a/packages/rest-typings/src/v1/teams/index.ts
+++ b/packages/rest-typings/src/v1/teams/index.ts
@@ -1,7 +1,5 @@
 import type { IRole, IRoom, ITeam, IUser } from '@rocket.chat/core-typings';
 
-import type { PaginatedRequest } from '../../helpers/PaginatedRequest';
-import type { PaginatedResult } from '../../helpers/PaginatedResult';
 import type { TeamsAddMembersProps } from './TeamsAddMembersProps';
 import type { TeamsConvertToChannelProps } from './TeamsConvertToChannelProps';
 import type { TeamsDeleteProps } from './TeamsDeleteProps';
@@ -11,6 +9,8 @@ import type { TeamsRemoveMemberProps } from './TeamsRemoveMemberProps';
 import type { TeamsRemoveRoomProps } from './TeamsRemoveRoomProps';
 import type { TeamsUpdateMemberProps } from './TeamsUpdateMemberProps';
 import type { TeamsUpdateProps } from './TeamsUpdateProps';
+import type { PaginatedRequest } from '../../helpers/PaginatedRequest';
+import type { PaginatedResult } from '../../helpers/PaginatedResult';
 
 export * from './TeamsAddMembersProps';
 export * from './TeamsConvertToChannelProps';
diff --git a/packages/rest-typings/src/v1/users/UsersSetPreferenceParamsPOST.ts b/packages/rest-typings/src/v1/users/UsersSetPreferenceParamsPOST.ts
index 7ef41d363dea..01163d9aa4f7 100644
--- a/packages/rest-typings/src/v1/users/UsersSetPreferenceParamsPOST.ts
+++ b/packages/rest-typings/src/v1/users/UsersSetPreferenceParamsPOST.ts
@@ -19,7 +19,9 @@ export type UsersSetPreferencesParamsPOST = {
 		autoImageLoad?: boolean;
 		emailNotificationMode?: string;
 		unreadAlert?: boolean;
+		masterVolume?: number;
 		notificationsSoundVolume?: number;
+		voipRingerVolume?: number;
 		desktopNotifications?: string;
 		pushNotifications?: string;
 		enableAutoAway?: boolean;
@@ -110,10 +112,18 @@ const UsersSetPreferencesParamsPostSchema = {
 					type: 'boolean',
 					nullable: true,
 				},
+				masterVolume: {
+					type: 'number',
+					nullable: true,
+				},
 				notificationsSoundVolume: {
 					type: 'number',
 					nullable: true,
 				},
+				voipRingerVolume: {
+					type: 'number',
+					nullable: true,
+				},
 				desktopNotifications: {
 					type: 'string',
 					nullable: true,
diff --git a/packages/rest-typings/src/v1/videoConference/index.ts b/packages/rest-typings/src/v1/videoConference/index.ts
index 374352c4566e..02dcc67cc713 100644
--- a/packages/rest-typings/src/v1/videoConference/index.ts
+++ b/packages/rest-typings/src/v1/videoConference/index.ts
@@ -1,11 +1,11 @@
 import type { VideoConferenceInstructions, VideoConference, VideoConferenceCapabilities } from '@rocket.chat/core-typings';
 
-import type { PaginatedResult } from '../../helpers/PaginatedResult';
 import type { VideoConfCancelProps } from './VideoConfCancelProps';
 import type { VideoConfInfoProps } from './VideoConfInfoProps';
 import type { VideoConfJoinProps } from './VideoConfJoinProps';
 import type { VideoConfListProps } from './VideoConfListProps';
 import type { VideoConfStartProps } from './VideoConfStartProps';
+import type { PaginatedResult } from '../../helpers/PaginatedResult';
 
 export * from './VideoConfInfoProps';
 export * from './VideoConfListProps';
diff --git a/packages/server-fetch/package.json b/packages/server-fetch/package.json
index 46ef65d3a7ba..c7107dd50e48 100644
--- a/packages/server-fetch/package.json
+++ b/packages/server-fetch/package.json
@@ -23,8 +23,8 @@
 	},
 	"dependencies": {
 		"@types/proxy-from-env": "^1.0.4",
-		"http-proxy-agent": "^5.0.0",
-		"https-proxy-agent": "^5.0.1",
+		"http-proxy-agent": "^7.0.2",
+		"https-proxy-agent": "^7.0.5",
 		"node-fetch": "2.7.0",
 		"proxy-from-env": "^1.1.0"
 	}
diff --git a/packages/server-fetch/src/index.ts b/packages/server-fetch/src/index.ts
index a04343c1bd51..acbd7176b7a3 100644
--- a/packages/server-fetch/src/index.ts
+++ b/packages/server-fetch/src/index.ts
@@ -2,23 +2,24 @@ import http from 'http';
 import https from 'https';
 
 import { AbortController } from 'abort-controller';
-import type { HttpProxyAgent } from 'http-proxy-agent';
-import { default as createHttpProxyAgent } from 'http-proxy-agent';
-import type { HttpsProxyAgent } from 'https-proxy-agent';
-import { default as createHttpsProxyAgent } from 'https-proxy-agent';
+import { HttpProxyAgent } from 'http-proxy-agent';
+import { HttpsProxyAgent } from 'https-proxy-agent';
 import fetch from 'node-fetch';
 import { getProxyForUrl } from 'proxy-from-env';
 
 import { parseRequestOptions } from './parsers';
 import type { ExtendedFetchOptions } from './types';
 
-function getFetchAgent(url: string, allowSelfSignedCerts?: boolean): http.Agent | https.Agent | null | HttpsProxyAgent | HttpProxyAgent {
+function getFetchAgent<U extends string>(
+	url: U,
+	allowSelfSignedCerts?: boolean,
+): http.Agent | https.Agent | null | HttpsProxyAgent<U> | HttpProxyAgent<U> {
 	const isHttps = /^https/.test(url);
 
 	const proxy = getProxyForUrl(url);
 	if (proxy) {
-		const agentFn = isHttps ? createHttpsProxyAgent : createHttpProxyAgent;
-		return agentFn(proxy);
+		const AgentFn = isHttps ? HttpsProxyAgent : HttpProxyAgent;
+		return new AgentFn(proxy);
 	}
 
 	if (!allowSelfSignedCerts) {
diff --git a/packages/sha256/package.json b/packages/sha256/package.json
index f10be0d72404..6248ea4bf316 100644
--- a/packages/sha256/package.json
+++ b/packages/sha256/package.json
@@ -14,8 +14,8 @@
 		"test": "jest"
 	},
 	"devDependencies": {
-		"@babel/core": "~7.25.8",
-		"@babel/preset-env": "~7.25.8",
+		"@babel/core": "~7.26.0",
+		"@babel/preset-env": "~7.26.0",
 		"@rocket.chat/eslint-config": "workspace:^",
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@typescript-eslint/eslint-plugin": "~5.60.1",
diff --git a/packages/tools/package.json b/packages/tools/package.json
index 23555ff93b57..a5a655d83aee 100644
--- a/packages/tools/package.json
+++ b/packages/tools/package.json
@@ -4,7 +4,7 @@
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@types/jest": "~29.5.13",
+		"@types/jest": "~29.5.14",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"typescript": "~5.6.3"
diff --git a/packages/tracing/package.json b/packages/tracing/package.json
index ef19ad071b9f..d94efaf56702 100644
--- a/packages/tracing/package.json
+++ b/packages/tracing/package.json
@@ -3,11 +3,11 @@
 	"version": "0.0.1",
 	"private": true,
 	"devDependencies": {
-		"@types/jest": "~29.5.7",
+		"@types/jest": "~29.5.14",
 		"eslint": "~8.45.0",
-		"jest": "~29.6.4",
-		"ts-jest": "~29.1.1",
-		"typescript": "~5.3.3"
+		"jest": "~29.7.0",
+		"ts-jest": "~29.2.5",
+		"typescript": "~5.6.3"
 	},
 	"scripts": {
 		"lint": "eslint --ext .js,.jsx,.ts,.tsx .",
@@ -26,7 +26,7 @@
 	},
 	"dependencies": {
 		"@opentelemetry/api": "^1.9.0",
-		"@opentelemetry/exporter-trace-otlp-grpc": "^0.53.0",
-		"@opentelemetry/sdk-node": "^0.53.0"
+		"@opentelemetry/exporter-trace-otlp-grpc": "^0.54.2",
+		"@opentelemetry/sdk-node": "^0.54.2"
 	}
 }
diff --git a/packages/ui-avatar/CHANGELOG.md b/packages/ui-avatar/CHANGELOG.md
index d92e6a69e747..bf9718796ce8 100644
--- a/packages/ui-avatar/CHANGELOG.md
+++ b/packages/ui-avatar/CHANGELOG.md
@@ -1,5 +1,41 @@
 # @rocket.chat/ui-avatar
 
+## 9.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@13.0.0-rc.3
+  </details>
+
+## 9.0.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@13.0.0-rc.2
+  </details>
+
+## 9.0.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@13.0.0-rc.1
+  </details>
+
+## 9.0.0-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@13.0.0-rc.0
+  </details>
+
 ## 8.0.0
 
 ### Minor Changes
diff --git a/packages/ui-avatar/package.json b/packages/ui-avatar/package.json
index 8c55be8254d7..cb97ac0c5e88 100644
--- a/packages/ui-avatar/package.json
+++ b/packages/ui-avatar/package.json
@@ -1,18 +1,18 @@
 {
 	"name": "@rocket.chat/ui-avatar",
-	"version": "8.0.0",
+	"version": "9.0.0-rc.3",
 	"private": true,
 	"devDependencies": {
-		"@babel/core": "~7.25.8",
+		"@babel/core": "~7.26.0",
 		"@rocket.chat/fuselage": "^0.59.4",
 		"@rocket.chat/ui-contexts": "workspace:^",
 		"@types/react": "~17.0.80",
 		"@types/react-dom": "~17.0.25",
 		"eslint": "~8.45.0",
-		"eslint-plugin-react": "~7.32.2",
-		"eslint-plugin-react-hooks": "~4.6.2",
-		"eslint-plugin-storybook": "~0.6.15",
-		"eslint-plugin-testing-library": "~5.11.1",
+		"eslint-plugin-react": "~7.37.2",
+		"eslint-plugin-react-hooks": "~5.0.0",
+		"eslint-plugin-storybook": "~0.11.0",
+		"eslint-plugin-testing-library": "~6.4.0",
 		"react": "^17.0.2",
 		"typescript": "~5.6.3"
 	},
@@ -30,7 +30,7 @@
 	],
 	"peerDependencies": {
 		"@rocket.chat/fuselage": "*",
-		"@rocket.chat/ui-contexts": "12.0.0",
+		"@rocket.chat/ui-contexts": "13.0.0-rc.3",
 		"react": "~17.0.2"
 	},
 	"volta": {
diff --git a/packages/ui-avatar/src/components/UserAvatar.tsx b/packages/ui-avatar/src/components/UserAvatar.tsx
index c190f341ef24..b4f5ae85a658 100644
--- a/packages/ui-avatar/src/components/UserAvatar.tsx
+++ b/packages/ui-avatar/src/components/UserAvatar.tsx
@@ -1,22 +1,38 @@
 import { useUserAvatarPath } from '@rocket.chat/ui-contexts';
-import type { FC } from 'react';
 import { memo } from 'react';
 
 import type { BaseAvatarProps } from './BaseAvatar';
 import BaseAvatar from './BaseAvatar';
 
-type UserAvatarProps = Omit<BaseAvatarProps, 'url' | 'title'> & {
+type UsernameProp = {
 	username: string;
+	userId?: never;
+};
+
+type UserIdProp = {
+	userId: string;
+	username?: never;
+};
+type UserAvatarProps = Omit<BaseAvatarProps, 'url' | 'title'> & {
 	etag?: string;
 	url?: string;
 	title?: string;
-};
+} & (UsernameProp | UserIdProp);
 
-const UserAvatar: FC<UserAvatarProps> = ({ username, etag, ...rest }) => {
+const UserAvatar = ({ username, userId, etag, ...rest }: UserAvatarProps) => {
 	const getUserAvatarPath = useUserAvatarPath();
-	const { url = getUserAvatarPath(username, etag), ...props } = rest;
 
-	return <BaseAvatar url={url} data-username={username} title={username} {...props} />;
+	if (userId) {
+		const { url = getUserAvatarPath({ userId, etag }), ...props } = rest;
+		return <BaseAvatar url={url} {...props} />;
+	}
+	if (username) {
+		const { url = getUserAvatarPath({ username, etag }), ...props } = rest;
+		return <BaseAvatar url={url} data-username={username} title={username} {...props} />;
+	}
+
+	// TODO: We should throw an Error after fixing the issue in Composer passing the username undefined
+	return null;
 };
 
 export default memo(UserAvatar);
diff --git a/packages/ui-client/.storybook/preview.tsx b/packages/ui-client/.storybook/preview.tsx
index 7d8187eaf0b0..75d4937b1bed 100644
--- a/packages/ui-client/.storybook/preview.tsx
+++ b/packages/ui-client/.storybook/preview.tsx
@@ -15,7 +15,7 @@ export const parameters: Parameters = {
 
 export const decorators: Decorator[] = [
 	(Story) => (
-		<div className='rc-old'>
+		<div>
 			<style>{`
 				body {
 					background-color: white;
diff --git a/packages/ui-client/CHANGELOG.md b/packages/ui-client/CHANGELOG.md
index b929f975e417..acf2f42f549f 100644
--- a/packages/ui-client/CHANGELOG.md
+++ b/packages/ui-client/CHANGELOG.md
@@ -1,5 +1,45 @@
 # @rocket.chat/ui-client
 
+## 13.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@13.0.0-rc.3
+  - @rocket.chat/ui-avatar@9.0.0-rc.3
+  </details>
+
+## 13.0.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@13.0.0-rc.2
+  - @rocket.chat/ui-avatar@9.0.0-rc.2
+  </details>
+
+## 13.0.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@13.0.0-rc.1
+  - @rocket.chat/ui-avatar@9.0.0-rc.1
+  </details>
+
+## 13.0.0-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@13.0.0-rc.0
+  - @rocket.chat/ui-avatar@9.0.0-rc.0
+  </details>
+
 ## 12.0.0
 
 ### Minor Changes
diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json
index a1f5aace8392..9f4e15b91db7 100644
--- a/packages/ui-client/package.json
+++ b/packages/ui-client/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-client",
-	"version": "12.0.0",
+	"version": "13.0.0-rc.3",
 	"private": true,
 	"main": "./dist/index.js",
 	"typings": "./dist/index.d.ts",
@@ -18,40 +18,40 @@
 		"typecheck": "tsc --noEmit"
 	},
 	"devDependencies": {
-		"@babel/core": "~7.25.8",
-		"@react-aria/toolbar": "^3.0.0-beta.1",
+		"@babel/core": "~7.26.0",
+		"@react-aria/toolbar": "^3.0.0-nightly.5042",
 		"@rocket.chat/css-in-js": "~0.31.25",
 		"@rocket.chat/fuselage": "^0.59.4",
 		"@rocket.chat/fuselage-hooks": "^0.33.1",
-		"@rocket.chat/icons": "~0.38.0",
+		"@rocket.chat/icons": "~0.39.0",
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@rocket.chat/mock-providers": "workspace:^",
 		"@rocket.chat/ui-avatar": "workspace:~",
 		"@rocket.chat/ui-contexts": "workspace:~",
-		"@storybook/addon-actions": "^8.3.5",
-		"@storybook/addon-docs": "^8.3.5",
-		"@storybook/addon-essentials": "^8.3.5",
-		"@storybook/addon-interactions": "^8.3.5",
-		"@storybook/addon-links": "^8.3.5",
-		"@storybook/addon-styling-webpack": "^1.0.0",
+		"@storybook/addon-actions": "^8.4.4",
+		"@storybook/addon-docs": "^8.4.4",
+		"@storybook/addon-essentials": "^8.4.4",
+		"@storybook/addon-interactions": "^8.4.4",
+		"@storybook/addon-links": "^8.4.4",
+		"@storybook/addon-styling-webpack": "^1.0.1",
 		"@storybook/addon-webpack5-compiler-babel": "^3.0.3",
-		"@storybook/react": "^8.3.5",
-		"@storybook/react-webpack5": "^8.3.5",
+		"@storybook/react": "^8.4.4",
+		"@storybook/react-webpack5": "^8.4.4",
 		"@testing-library/react": "~16.0.1",
-		"@types/jest": "~29.5.13",
+		"@types/jest": "~29.5.14",
 		"@types/react": "~17.0.80",
 		"@types/react-dom": "~17.0.25",
 		"eslint": "~8.45.0",
 		"eslint-plugin-anti-trojan-source": "~1.1.1",
-		"eslint-plugin-react": "~7.32.2",
-		"eslint-plugin-react-hooks": "~4.6.2",
-		"eslint-plugin-storybook": "~0.6.15",
-		"eslint-plugin-testing-library": "~5.11.1",
+		"eslint-plugin-react": "~7.37.2",
+		"eslint-plugin-react-hooks": "~5.0.0",
+		"eslint-plugin-storybook": "~0.11.0",
+		"eslint-plugin-testing-library": "~6.4.0",
 		"jest": "~29.7.0",
 		"react": "^17.0.2",
 		"react-dom": "^17.0.2",
 		"react-hook-form": "~7.45.4",
-		"storybook": "^8.3.5",
+		"storybook": "^8.4.4",
 		"typescript": "~5.6.3"
 	},
 	"peerDependencies": {
@@ -60,8 +60,8 @@
 		"@rocket.chat/fuselage": "*",
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
-		"@rocket.chat/ui-avatar": "8.0.0",
-		"@rocket.chat/ui-contexts": "12.0.0",
+		"@rocket.chat/ui-avatar": "9.0.0-rc.3",
+		"@rocket.chat/ui-contexts": "13.0.0-rc.3",
 		"react": "*",
 		"react-i18next": "*"
 	},
diff --git a/packages/ui-client/src/components/EmojiPicker/EmojiPickerContainer.tsx b/packages/ui-client/src/components/EmojiPicker/EmojiPickerContainer.tsx
index 48acd0f829b3..f3ff2736d91a 100644
--- a/packages/ui-client/src/components/EmojiPicker/EmojiPickerContainer.tsx
+++ b/packages/ui-client/src/components/EmojiPicker/EmojiPickerContainer.tsx
@@ -2,23 +2,22 @@ import { Box } from '@rocket.chat/fuselage';
 import type { AllHTMLAttributes } from 'react';
 import { forwardRef } from 'react';
 
-const EmojiPickerContainer = forwardRef<HTMLElement, Omit<AllHTMLAttributes<HTMLDivElement>, 'is' | 'style'>>(function EmojiPickerContainer(
-	props,
-	ref,
-) {
-	return (
-		<Box
-			{...props}
-			color='default'
-			ref={ref}
-			height='x480'
-			bg='light'
-			borderRadius={4}
-			display='flex'
-			flexDirection='column'
-			mb='neg-x12'
-		/>
-	);
-});
+const EmojiPickerContainer = forwardRef<HTMLElement, Omit<AllHTMLAttributes<HTMLDivElement>, 'is' | 'style'>>(
+	function EmojiPickerContainer(props, ref) {
+		return (
+			<Box
+				{...props}
+				color='default'
+				ref={ref}
+				height='x480'
+				bg='light'
+				borderRadius={4}
+				display='flex'
+				flexDirection='column'
+				mb='neg-x12'
+			/>
+		);
+	},
+);
 
 export default EmojiPickerContainer;
diff --git a/packages/ui-client/src/components/PasswordVerifier/PasswordVerifiers.spec.tsx b/packages/ui-client/src/components/PasswordVerifier/PasswordVerifiers.spec.tsx
index 108a13713707..09b57014d3f3 100644
--- a/packages/ui-client/src/components/PasswordVerifier/PasswordVerifiers.spec.tsx
+++ b/packages/ui-client/src/components/PasswordVerifier/PasswordVerifiers.spec.tsx
@@ -1,5 +1,5 @@
 import { mockAppRoot } from '@rocket.chat/mock-providers';
-import { render, waitFor } from '@testing-library/react';
+import { render, screen, waitFor } from '@testing-library/react';
 
 import { PasswordVerifier } from './PasswordVerifier';
 
@@ -9,45 +9,45 @@ afterEach(() => {
 });
 
 it('should render no policy if its disabled ', () => {
-	const { queryByRole } = render(<PasswordVerifier password='' />, {
+	render(<PasswordVerifier password='' />, {
 		legacyRoot: true,
-		wrapper: mockAppRoot().withSetting('Accounts_Password_Policy_Enabled', 'true').build(),
+		wrapper: mockAppRoot().withSetting('Accounts_Password_Policy_Enabled', false).build(),
 	});
 
-	expect(queryByRole('list')).toBeNull();
+	expect(screen.queryByRole('list')).not.toBeInTheDocument();
 });
 
 it('should render no policy if its enabled but empty', async () => {
-	const { queryByRole, queryByTestId } = render(<PasswordVerifier password='asasdfafdgsdffdf' />, {
+	render(<PasswordVerifier password='asasdfafdgsdffdf' />, {
 		legacyRoot: true,
 		wrapper: mockAppRoot().build(),
 	});
 
 	await waitFor(() => {
-		expect(queryByTestId('password-verifier-skeleton')).toBeNull();
+		expect(screen.queryByTestId('password-verifier-skeleton')).not.toBeInTheDocument();
 	});
-	expect(queryByRole('list')).toBeNull();
+	expect(screen.queryByRole('list')).not.toBeInTheDocument();
 });
 
 it('should render policy list if its enabled and not empty', async () => {
-	const { queryByRole, queryByTestId } = render(<PasswordVerifier password='asasdfafdgsdffdf' />, {
+	render(<PasswordVerifier password='asasdfafdgsdffdf' />, {
 		legacyRoot: true,
 		wrapper: mockAppRoot()
-			.withSetting('Accounts_Password_Policy_Enabled', 'true')
-			.withSetting('Accounts_Password_Policy_MinLength', '6')
+			.withSetting('Accounts_Password_Policy_Enabled', true)
+			.withSetting('Accounts_Password_Policy_MinLength', 6)
 			.build(),
 	});
 
 	await waitFor(() => {
-		expect(queryByTestId('password-verifier-skeleton')).toBeNull();
+		expect(screen.queryByTestId('password-verifier-skeleton')).not.toBeInTheDocument();
 	});
 
-	expect(queryByRole('list')).toBeVisible();
-	expect(queryByRole('listitem')).toBeVisible();
+	expect(screen.queryByRole('list')).toBeVisible();
+	expect(screen.queryByRole('listitem', { name: 'get-password-policy-minLength-label' })).toBeVisible();
 });
 
 it('should render all the policies when all policies are enabled', async () => {
-	const { queryByTestId, queryAllByRole } = render(<PasswordVerifier password='asasdfafdgsdffdf' />, {
+	render(<PasswordVerifier password='asasdfafdgsdffdf' />, {
 		legacyRoot: true,
 		wrapper: mockAppRoot()
 			.withSetting('Accounts_Password_Policy_Enabled', 'true')
@@ -63,14 +63,14 @@ it('should render all the policies when all policies are enabled', async () => {
 	});
 
 	await waitFor(() => {
-		expect(queryByTestId('password-verifier-skeleton')).toBeNull();
+		expect(screen.queryByTestId('password-verifier-skeleton')).toBeNull();
 	});
 
-	expect(queryAllByRole('listitem').length).toEqual(7);
+	expect(screen.queryAllByRole('listitem').length).toEqual(7);
 });
 
 it("should render policy as invalid if password doesn't match the requirements", async () => {
-	const { queryByTestId, getByRole } = render(<PasswordVerifier password='asd' />, {
+	render(<PasswordVerifier password='asd' />, {
 		legacyRoot: true,
 		wrapper: mockAppRoot()
 			.withSetting('Accounts_Password_Policy_Enabled', 'true')
@@ -79,14 +79,14 @@ it("should render policy as invalid if password doesn't match the requirements",
 	});
 
 	await waitFor(() => {
-		expect(queryByTestId('password-verifier-skeleton')).toBeNull();
+		expect(screen.queryByTestId('password-verifier-skeleton')).toBeNull();
 	});
 
-	expect(getByRole('listitem', { name: 'get-password-policy-minLength-label' })).toHaveAttribute('aria-invalid', 'true');
+	expect(screen.getByRole('listitem', { name: 'get-password-policy-minLength-label' })).toHaveAttribute('aria-invalid', 'true');
 });
 
 it('should render policy as valid if password matches the requirements', async () => {
-	const { queryByTestId, getByRole } = render(<PasswordVerifier password='asd' />, {
+	render(<PasswordVerifier password='asd' />, {
 		legacyRoot: true,
 		wrapper: mockAppRoot()
 			.withSetting('Accounts_Password_Policy_Enabled', 'true')
@@ -95,7 +95,7 @@ it('should render policy as valid if password matches the requirements', async (
 	});
 
 	await waitFor(() => {
-		expect(queryByTestId('password-verifier-skeleton')).toBeNull();
+		expect(screen.queryByTestId('password-verifier-skeleton')).toBeNull();
 	});
-	expect(getByRole('listitem', { name: 'get-password-policy-minLength-label' })).toHaveAttribute('aria-invalid', 'false');
+	expect(screen.getByRole('listitem', { name: 'get-password-policy-minLength-label' })).toHaveAttribute('aria-invalid', 'false');
 });
diff --git a/packages/ui-client/src/hooks/useDefaultSettingFeaturePreviewList.ts b/packages/ui-client/src/hooks/useDefaultSettingFeaturePreviewList.ts
index 373862379cc1..14965b921d49 100644
--- a/packages/ui-client/src/hooks/useDefaultSettingFeaturePreviewList.ts
+++ b/packages/ui-client/src/hooks/useDefaultSettingFeaturePreviewList.ts
@@ -4,7 +4,7 @@ import { useMemo } from 'react';
 import { parseSetting, useFeaturePreviewList } from './useFeaturePreviewList';
 
 export const useDefaultSettingFeaturePreviewList = () => {
-	const featurePreviewSettingJSON = useSetting<string>('Accounts_Default_User_Preferences_featuresPreview');
+	const featurePreviewSettingJSON = useSetting('Accounts_Default_User_Preferences_featuresPreview', '[]');
 
 	const settingFeaturePreview = useMemo(() => parseSetting(featurePreviewSettingJSON), [featurePreviewSettingJSON]);
 
diff --git a/packages/ui-client/src/hooks/usePreferenceFeaturePreviewList.ts b/packages/ui-client/src/hooks/usePreferenceFeaturePreviewList.ts
index d7c4c13417d2..f0d7b8e83144 100644
--- a/packages/ui-client/src/hooks/usePreferenceFeaturePreviewList.ts
+++ b/packages/ui-client/src/hooks/usePreferenceFeaturePreviewList.ts
@@ -4,7 +4,7 @@ import { useMemo } from 'react';
 import { FeaturePreviewProps, parseSetting, useFeaturePreviewList } from './useFeaturePreviewList';
 
 export const usePreferenceFeaturePreviewList = () => {
-	const featurePreviewEnabled = useSetting<boolean>('Accounts_AllowFeaturePreview');
+	const featurePreviewEnabled = useSetting('Accounts_AllowFeaturePreview', false);
 	const userFeaturesPreviewPreference = useUserPreference<FeaturePreviewProps[]>('featuresPreview');
 	const userFeaturesPreview = useMemo(() => parseSetting(userFeaturesPreviewPreference), [userFeaturesPreviewPreference]);
 	const { unseenFeatures, features } = useFeaturePreviewList(userFeaturesPreview ?? []);
diff --git a/packages/ui-composer/.storybook/preview.tsx b/packages/ui-composer/.storybook/preview.tsx
index d0057fc8504f..d03915c06657 100644
--- a/packages/ui-composer/.storybook/preview.tsx
+++ b/packages/ui-composer/.storybook/preview.tsx
@@ -14,7 +14,7 @@ export const parameters: Parameters = {
 
 export const decorators: Decorator[] = [
 	(Story): ReactElement => (
-		<div className='rc-old'>
+		<div>
 			<style>{`
 				body {
 					background-color: white;
diff --git a/packages/ui-composer/package.json b/packages/ui-composer/package.json
index 67a66da4c100..06eef881e224 100644
--- a/packages/ui-composer/package.json
+++ b/packages/ui-composer/package.json
@@ -18,27 +18,27 @@
 		"typecheck": "tsc --noEmit"
 	},
 	"devDependencies": {
-		"@babel/core": "~7.25.8",
-		"@react-aria/toolbar": "^3.0.0-beta.1",
+		"@babel/core": "~7.26.0",
+		"@react-aria/toolbar": "^3.0.0-nightly.5042",
 		"@rocket.chat/eslint-config": "workspace:^",
 		"@rocket.chat/fuselage": "^0.59.4",
-		"@rocket.chat/icons": "~0.38.0",
-		"@storybook/addon-actions": "^8.3.5",
-		"@storybook/addon-docs": "^8.3.5",
-		"@storybook/addon-essentials": "^8.3.5",
-		"@storybook/addon-styling-webpack": "^1.0.0",
+		"@rocket.chat/icons": "~0.39.0",
+		"@storybook/addon-actions": "^8.4.4",
+		"@storybook/addon-docs": "^8.4.4",
+		"@storybook/addon-essentials": "^8.4.4",
+		"@storybook/addon-styling-webpack": "^1.0.1",
 		"@storybook/addon-webpack5-compiler-babel": "^3.0.3",
-		"@storybook/react": "^8.3.5",
-		"@storybook/react-webpack5": "^8.3.5",
+		"@storybook/react": "^8.4.4",
+		"@storybook/react-webpack5": "^8.4.4",
 		"@types/react": "~17.0.80",
 		"@types/react-dom": "~17.0.25",
 		"eslint": "~8.45.0",
-		"eslint-plugin-react": "~7.32.2",
-		"eslint-plugin-react-hooks": "~4.6.2",
-		"eslint-plugin-storybook": "^0.9.0",
+		"eslint-plugin-react": "~7.37.2",
+		"eslint-plugin-react-hooks": "~5.0.0",
+		"eslint-plugin-storybook": "^0.11.0",
 		"react": "~17.0.2",
 		"react-dom": "~17.0.2",
-		"storybook": "^8.3.5",
+		"storybook": "^8.4.4",
 		"typescript": "~5.6.3"
 	},
 	"peerDependencies": {
diff --git a/packages/ui-composer/src/MessageFooterCallout/MessageFooterCallout.stories.tsx b/packages/ui-composer/src/MessageFooterCallout/MessageFooterCallout.stories.tsx
index 82e5e410ea36..4e55cea3761e 100644
--- a/packages/ui-composer/src/MessageFooterCallout/MessageFooterCallout.stories.tsx
+++ b/packages/ui-composer/src/MessageFooterCallout/MessageFooterCallout.stories.tsx
@@ -1,10 +1,11 @@
 import type { Meta, StoryFn } from '@storybook/react';
 
 import { MessageFooterCallout, MessageFooterCalloutAction } from '.';
-import MessageComposer from '../MessageComposer/MessageComposer';
-import MessageComposerIcon from '../MessageComposer/MessageComposerIcon';
 import MessageFooterCalloutContent from './MessageFooterCalloutContent';
 import MessageFooterCalloutDivider from './MessageFooterCalloutDivider';
+import MessageComposer from '../MessageComposer/MessageComposer';
+import MessageComposerIcon from '../MessageComposer/MessageComposerIcon';
+
 import '@rocket.chat/icons/dist/rocketchat.css';
 
 export default {
diff --git a/packages/ui-composer/src/MessageFooterCallout/MessageFooterCalloutAction.tsx b/packages/ui-composer/src/MessageFooterCallout/MessageFooterCalloutAction.tsx
index dde5e42b8130..61bf9422cf70 100644
--- a/packages/ui-composer/src/MessageFooterCallout/MessageFooterCalloutAction.tsx
+++ b/packages/ui-composer/src/MessageFooterCallout/MessageFooterCalloutAction.tsx
@@ -2,11 +2,10 @@ import { Button } from '@rocket.chat/fuselage';
 import type { ComponentProps, ReactElement } from 'react';
 import { forwardRef } from 'react';
 
-const MessageFooterCalloutAction = forwardRef<HTMLButtonElement, ComponentProps<typeof Button>>(function MessageFooterCalloutAction(
-	props,
-	ref,
-): ReactElement {
-	return <Button mi={4} ref={ref} primary small flexShrink={0} {...props} />;
-});
+const MessageFooterCalloutAction = forwardRef<HTMLButtonElement, ComponentProps<typeof Button>>(
+	function MessageFooterCalloutAction(props, ref): ReactElement {
+		return <Button mi={4} ref={ref} primary small flexShrink={0} {...props} />;
+	},
+);
 
 export default MessageFooterCalloutAction;
diff --git a/packages/ui-contexts/CHANGELOG.md b/packages/ui-contexts/CHANGELOG.md
index 451524f71de6..5fa8ebc9d448 100644
--- a/packages/ui-contexts/CHANGELOG.md
+++ b/packages/ui-contexts/CHANGELOG.md
@@ -1,5 +1,50 @@
 # @rocket.chat/ui-contexts
 
+## 13.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.3
+  - @rocket.chat/rest-typings@7.1.0-rc.3
+  - @rocket.chat/ddp-client@0.3.10-rc.3
+  </details>
+
+## 13.0.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.2
+  - @rocket.chat/rest-typings@7.1.0-rc.2
+  - @rocket.chat/ddp-client@0.3.10-rc.2
+  </details>
+
+## 13.0.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.1
+  - @rocket.chat/rest-typings@7.1.0-rc.1
+  - @rocket.chat/ddp-client@0.3.10-rc.1
+  </details>
+
+## 13.0.0-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies [80e36bfc3938775eb26aa5576f1b9b98896e1cc4, 66ecc64fc1d4464ad2818ad04e23a09cdf221194, 6c83bf0657004ee9cf43d5c832f51826a6591165, e7edeac3bdd22da0a04b8e873d5a008e249fb4be, 32d93a0666fa1cbe857d02889e93d9bbf45bd4f0, d1e6a73796269824fb1aa7afcc7b8aa242e34e90, 661cc01237629ce83699d6c25df25d12985e88bf, ce7024af36fcde97b1da5b2731f6edc4a4c236b8, 616655585cb1c5c60d7cee97e25b17af3dfda794, e5fe727f6a2f0e60cdf7ba225e1f6caa6db2045c, 322bafd4bd1fe91ed34610501b269e4d8951944c]:</summary>
+
+  - @rocket.chat/core-typings@7.1.0-rc.0
+  - @rocket.chat/i18n@1.1.0-rc.0
+  - @rocket.chat/rest-typings@7.1.0-rc.0
+  - @rocket.chat/ddp-client@0.3.10-rc.0
+  </details>
+
 ## 12.0.0
 
 ### Patch Changes
diff --git a/packages/ui-contexts/package.json b/packages/ui-contexts/package.json
index 0d1365f0bc3b..bcc7272f2238 100644
--- a/packages/ui-contexts/package.json
+++ b/packages/ui-contexts/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-contexts",
-	"version": "12.0.0",
+	"version": "13.0.0-rc.3",
 	"private": true,
 	"devDependencies": {
 		"@rocket.chat/core-typings": "workspace:^",
@@ -13,7 +13,7 @@
 		"@types/react-dom": "~17.0.25",
 		"@types/use-sync-external-store": "^0.0.6",
 		"eslint": "~8.45.0",
-		"eslint-plugin-react-hooks": "^4.6.2",
+		"eslint-plugin-react-hooks": "^5.0.0",
 		"mongodb": "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch",
 		"react": "~17.0.2",
 		"typescript": "~5.6.3",
diff --git a/packages/ui-contexts/src/AvatarUrlContext.ts b/packages/ui-contexts/src/AvatarUrlContext.ts
index 8404d67a0c41..1f13e2764720 100644
--- a/packages/ui-contexts/src/AvatarUrlContext.ts
+++ b/packages/ui-contexts/src/AvatarUrlContext.ts
@@ -3,7 +3,11 @@ import { createContext } from 'react';
 const dummy = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVQYV2Oora39DwAFaQJ3y3rKeAAAAABJRU5ErkJggg==';
 
 export type AvatarUrlContextValue = {
-	getUserPathAvatar: (uid: string, etag?: string) => string;
+	getUserPathAvatar: {
+		(username: string, etag?: string): string;
+		(params: { userId: string; etag?: string }): string;
+		(params: { username: string; etag?: string }): string;
+	};
 	getRoomPathAvatar: (...args: any) => string;
 };
 
diff --git a/packages/ui-contexts/src/SettingsContext.ts b/packages/ui-contexts/src/SettingsContext.ts
index 4a2011d2a879..f0a005344d46 100644
--- a/packages/ui-contexts/src/SettingsContext.ts
+++ b/packages/ui-contexts/src/SettingsContext.ts
@@ -1,18 +1,18 @@
-import type { SettingId, ISetting, GroupId, SectionName, TabId } from '@rocket.chat/core-typings';
+import type { ISetting } from '@rocket.chat/core-typings';
 import { createContext } from 'react';
 
 export type SettingsContextQuery = {
-	readonly _id?: SettingId[] | RegExp;
-	readonly group?: GroupId;
-	readonly section?: SectionName;
-	readonly tab?: TabId;
+	readonly _id?: ISetting['_id'][] | RegExp;
+	readonly group?: ISetting['_id'];
+	readonly section?: string;
+	readonly tab?: ISetting['_id'];
 };
 
 export type SettingsContextValue = {
 	readonly hasPrivateAccess: boolean;
 	readonly isLoading: boolean;
 	readonly querySetting: (
-		_id: SettingId,
+		_id: ISetting['_id'],
 	) => [subscribe: (onStoreChange: () => void) => () => void, getSnapshot: () => ISetting | undefined];
 	readonly querySettings: (
 		query: SettingsContextQuery,
diff --git a/packages/ui-contexts/src/hooks/useAssetPath.ts b/packages/ui-contexts/src/hooks/useAssetPath.ts
index a504dd5453e7..56b55cf360c3 100644
--- a/packages/ui-contexts/src/hooks/useAssetPath.ts
+++ b/packages/ui-contexts/src/hooks/useAssetPath.ts
@@ -1,10 +1,10 @@
-import type { IRocketChatAssets } from '@rocket.chat/core-typings';
+import type { IRocketChatAssets, ISettingAsset } from '@rocket.chat/core-typings';
 
 import { useAbsoluteUrl } from './useAbsoluteUrl';
 import { useSetting } from './useSetting';
 
 export const useAssetPath = (assetId: keyof IRocketChatAssets): string | undefined => {
-	const asset = useSetting<{ url?: string; defaultUrl?: string }>(`Assets_${assetId}`);
+	const asset = useSetting<ISettingAsset>(`Assets_${assetId}`);
 	const absoluteUrl = useAbsoluteUrl();
 
 	return (asset?.url ?? asset?.defaultUrl) && absoluteUrl(asset?.url ?? asset?.defaultUrl ?? '');
diff --git a/packages/ui-contexts/src/hooks/useCurrentRoutePath.ts b/packages/ui-contexts/src/hooks/useCurrentRoutePath.ts
index dd7ba683bea1..d63deb9dac4d 100644
--- a/packages/ui-contexts/src/hooks/useCurrentRoutePath.ts
+++ b/packages/ui-contexts/src/hooks/useCurrentRoutePath.ts
@@ -13,7 +13,7 @@ export const useCurrentRoutePath = () => {
 					name,
 					params: router.getRouteParameters(),
 					search: router.getSearchParameters(),
-			  })
+				})
 			: undefined;
 	}, [router]);
 
diff --git a/packages/ui-contexts/src/hooks/useEndpoint.ts b/packages/ui-contexts/src/hooks/useEndpoint.ts
index 3d29917c63e2..a1426f5c9648 100644
--- a/packages/ui-contexts/src/hooks/useEndpoint.ts
+++ b/packages/ui-contexts/src/hooks/useEndpoint.ts
@@ -4,12 +4,10 @@ import { useCallback, useContext, useRef } from 'react';
 
 import { ServerContext } from '../ServerContext';
 
-export type EndpointFunction<TMethod extends Method, TPathPattern extends PathPattern> = undefined extends OperationParams<
-	TMethod,
-	TPathPattern
->
-	? (params?: OperationParams<TMethod, TPathPattern>) => Promise<Serialized<OperationResult<TMethod, TPathPattern>>>
-	: (params: OperationParams<TMethod, TPathPattern>) => Promise<Serialized<OperationResult<TMethod, TPathPattern>>>;
+export type EndpointFunction<TMethod extends Method, TPathPattern extends PathPattern> =
+	undefined extends OperationParams<TMethod, TPathPattern>
+		? (params?: OperationParams<TMethod, TPathPattern>) => Promise<Serialized<OperationResult<TMethod, TPathPattern>>>
+		: (params: OperationParams<TMethod, TPathPattern>) => Promise<Serialized<OperationResult<TMethod, TPathPattern>>>;
 
 export function useEndpoint<TMethod extends Method, TPathPattern extends PathPattern>(
 	method: TMethod,
diff --git a/packages/ui-contexts/src/hooks/useSetting.ts b/packages/ui-contexts/src/hooks/useSetting.ts
index a6493a40d9fd..d85c609af1b1 100644
--- a/packages/ui-contexts/src/hooks/useSetting.ts
+++ b/packages/ui-contexts/src/hooks/useSetting.ts
@@ -1,10 +1,13 @@
-import type { ISetting, SettingValue } from '@rocket.chat/core-typings';
+import type { ISetting } from '@rocket.chat/core-typings';
 
 import { useSettingStructure } from './useSettingStructure';
 
-export function useSetting<TValue extends SettingValue>(settingId: ISetting['_id']): TValue | undefined;
-export function useSetting<TValue extends SettingValue>(settingId: ISetting['_id'], fallbackValue: TValue): TValue;
-export function useSetting<TValue extends SettingValue>(settingId: ISetting['_id'], fallbackValue?: TValue): TValue | undefined {
+export function useSetting<TSetting extends ISetting>(settingId: TSetting['_id']): TSetting['value'] | undefined;
+export function useSetting(settingId: ISetting['_id'], fallbackValue: string): string;
+export function useSetting(settingId: ISetting['_id'], fallbackValue: boolean): boolean;
+export function useSetting(settingId: ISetting['_id'], fallbackValue: number): number;
+export function useSetting<TValue>(settingId: ISetting['_id'], fallbackValue: TValue): TValue;
+export function useSetting<TValue>(settingId: ISetting['_id'], fallbackValue?: TValue): TValue | undefined {
 	const setting = useSettingStructure(settingId);
 	return (setting?.value as TValue | undefined) ?? fallbackValue;
 }
diff --git a/packages/ui-contexts/src/hooks/useSettingSetValue.ts b/packages/ui-contexts/src/hooks/useSettingSetValue.ts
index a710c15c40d8..ac0a24643688 100644
--- a/packages/ui-contexts/src/hooks/useSettingSetValue.ts
+++ b/packages/ui-contexts/src/hooks/useSettingSetValue.ts
@@ -1,9 +1,9 @@
-import type { ISetting, SettingId } from '@rocket.chat/core-typings';
+import type { ISetting } from '@rocket.chat/core-typings';
 import { useCallback } from 'react';
 
 import { useSettingsDispatch } from './useSettingsDispatch';
 
-export const useSettingSetValue = <T extends ISetting['value']>(_id: SettingId): ((value: T) => Promise<void>) => {
+export const useSettingSetValue = <T extends ISetting['value']>(_id: ISetting['_id']): ((value: T) => Promise<void>) => {
 	const dispatch = useSettingsDispatch();
 	return useCallback((value: T) => dispatch([{ _id, value }]), [dispatch, _id]);
 };
diff --git a/packages/ui-contexts/src/hooks/useSettingStructure.ts b/packages/ui-contexts/src/hooks/useSettingStructure.ts
index 19eeb30815f5..9f448d6ee636 100644
--- a/packages/ui-contexts/src/hooks/useSettingStructure.ts
+++ b/packages/ui-contexts/src/hooks/useSettingStructure.ts
@@ -1,10 +1,10 @@
-import type { SettingId, ISetting } from '@rocket.chat/core-typings';
+import type { ISetting } from '@rocket.chat/core-typings';
 import { useContext, useMemo } from 'react';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
 
 import { SettingsContext } from '../SettingsContext';
 
-export const useSettingStructure = (_id: SettingId): ISetting | undefined => {
+export const useSettingStructure = (_id: ISetting['_id']): ISetting | undefined => {
 	const { querySetting } = useContext(SettingsContext);
 	const [subscribe, getSnapshot] = useMemo(() => querySetting(_id), [querySetting, _id]);
 	return useSyncExternalStore(subscribe, getSnapshot);
diff --git a/packages/ui-contexts/src/hooks/useUserAvatarPath.ts b/packages/ui-contexts/src/hooks/useUserAvatarPath.ts
index 91a25e585384..5411bf089ee3 100644
--- a/packages/ui-contexts/src/hooks/useUserAvatarPath.ts
+++ b/packages/ui-contexts/src/hooks/useUserAvatarPath.ts
@@ -1,5 +1,5 @@
 import { useContext } from 'react';
 
-import { AvatarUrlContext } from '../AvatarUrlContext';
+import { AvatarUrlContext, type AvatarUrlContextValue } from '../AvatarUrlContext';
 
-export const useUserAvatarPath = (): ((uid: string, etag?: string) => string) => useContext(AvatarUrlContext).getUserPathAvatar;
+export const useUserAvatarPath = (): AvatarUrlContextValue['getUserPathAvatar'] => useContext(AvatarUrlContext).getUserPathAvatar;
diff --git a/packages/ui-contexts/src/hooks/useVerifyPassword.ts b/packages/ui-contexts/src/hooks/useVerifyPassword.ts
index f1244b2552c6..e010c1f67886 100644
--- a/packages/ui-contexts/src/hooks/useVerifyPassword.ts
+++ b/packages/ui-contexts/src/hooks/useVerifyPassword.ts
@@ -6,15 +6,15 @@ import { useSetting } from './useSetting';
 type PasswordVerifications = { isValid: boolean; limit?: number; name: string }[];
 
 export const useVerifyPassword = (password: string): PasswordVerifications => {
-	const enabled = Boolean(useSetting('Accounts_Password_Policy_Enabled'));
-	const minLength = Number(useSetting('Accounts_Password_Policy_MinLength'));
-	const maxLength = Number(useSetting('Accounts_Password_Policy_MaxLength'));
-	const forbidRepeatingCharacters = Boolean(useSetting('Accounts_Password_Policy_ForbidRepeatingCharacters'));
-	const forbidRepeatingCharactersCount = Number(useSetting('Accounts_Password_Policy_ForbidRepeatingCharactersCount'));
-	const mustContainAtLeastOneLowercase = Boolean(useSetting('Accounts_Password_Policy_AtLeastOneLowercase'));
-	const mustContainAtLeastOneUppercase = Boolean(useSetting('Accounts_Password_Policy_AtLeastOneUppercase'));
-	const mustContainAtLeastOneNumber = Boolean(useSetting('Accounts_Password_Policy_AtLeastOneNumber'));
-	const mustContainAtLeastOneSpecialCharacter = Boolean(useSetting('Accounts_Password_Policy_AtLeastOneSpecialCharacter'));
+	const enabled = useSetting('Accounts_Password_Policy_Enabled', false);
+	const minLength = useSetting('Accounts_Password_Policy_MinLength', 7);
+	const maxLength = useSetting('Accounts_Password_Policy_MaxLength', -1);
+	const forbidRepeatingCharacters = useSetting('Accounts_Password_Policy_ForbidRepeatingCharacters', true);
+	const forbidRepeatingCharactersCount = useSetting('Accounts_Password_Policy_ForbidRepeatingCharactersCount', 3);
+	const mustContainAtLeastOneLowercase = useSetting('Accounts_Password_Policy_AtLeastOneLowercase', true);
+	const mustContainAtLeastOneUppercase = useSetting('Accounts_Password_Policy_AtLeastOneUppercase', true);
+	const mustContainAtLeastOneNumber = useSetting('Accounts_Password_Policy_AtLeastOneNumber', true);
+	const mustContainAtLeastOneSpecialCharacter = useSetting('Accounts_Password_Policy_AtLeastOneSpecialCharacter', true);
 
 	const validator = useMemo(
 		() =>
diff --git a/packages/ui-kit/package.json b/packages/ui-kit/package.json
index 734da3a4faa5..54746cb678f2 100644
--- a/packages/ui-kit/package.json
+++ b/packages/ui-kit/package.json
@@ -35,28 +35,28 @@
 		"test": "jest"
 	},
 	"devDependencies": {
-		"@babel/core": "~7.25.8",
-		"@babel/eslint-parser": "~7.25.8",
-		"@babel/plugin-transform-runtime": "~7.25.7",
-		"@babel/preset-env": "~7.25.8",
+		"@babel/core": "~7.26.0",
+		"@babel/eslint-parser": "~7.25.9",
+		"@babel/plugin-transform-runtime": "~7.25.9",
+		"@babel/preset-env": "~7.26.0",
 		"@rocket.chat/eslint-config": "workspace:~",
-		"@rocket.chat/icons": "~0.38.0",
+		"@rocket.chat/icons": "~0.39.0",
 		"@rocket.chat/jest-presets": "workspace:~",
-		"@types/jest": "~29.5.13",
-		"babel-loader": "~9.1.3",
+		"@types/jest": "~29.5.14",
+		"babel-loader": "~9.2.1",
 		"eslint": "~8.45.0",
 		"jest": "~29.7.0",
 		"npm-run-all": "~4.1.5",
-		"prettier": "~2.8.8",
+		"prettier": "~3.3.3",
 		"rimraf": "~6.0.1",
-		"ts-jest": "~29.1.5",
-		"ts-loader": "~9.4.4",
+		"ts-jest": "~29.2.5",
+		"ts-loader": "~9.5.1",
 		"ts-node": "~10.9.2",
 		"ts-patch": "~3.2.1",
 		"typescript": "~5.6.3"
 	},
 	"dependencies": {
-		"typia": "~6.9.0"
+		"typia": "~6.11.4"
 	},
 	"peerDependencies": {
 		"@rocket.chat/icons": "*"
diff --git a/packages/ui-kit/src/rendering/ActionOf.ts b/packages/ui-kit/src/rendering/ActionOf.ts
index 1a96ebe2cdde..3fda93709837 100644
--- a/packages/ui-kit/src/rendering/ActionOf.ts
+++ b/packages/ui-kit/src/rendering/ActionOf.ts
@@ -21,35 +21,35 @@ import type { UsersSelectElement } from '../blocks/elements/UsersSelectElement';
 export type ActionOf<TElement extends ActionableElement> = TElement extends ButtonElement
 	? ButtonElement['value']
 	: TElement extends ChannelsSelectElement
-	? Option['value']
-	: TElement extends ConversationsSelectElement
-	? unknown
-	: TElement extends DatePickerElement
-	? DatePickerElement['initialDate']
-	: TElement extends LinearScaleElement
-	? LinearScaleElement['initialValue']
-	: TElement extends MultiChannelsSelectElement
-	? Option['value'][]
-	: TElement extends MultiConversationsSelectElement
-	? unknown
-	: TElement extends MultiStaticSelectElement
-	? MultiStaticSelectElement['initialValue']
-	: TElement extends MultiUsersSelectElement
-	? Option['value'][]
-	: TElement extends OverflowElement
-	? OverflowElement['options'][number]['value']
-	: TElement extends PlainTextInputElement
-	? PlainTextInputElement['initialValue']
-	: TElement extends StaticSelectElement
-	? StaticSelectElement['initialValue']
-	: TElement extends UsersSelectElement
-	? Option['value']
-	: TElement extends ToggleSwitchElement
-	? Option['value'][]
-	: TElement extends RadioButtonElement
-	? Option['value'] | undefined
-	: TElement extends CheckboxElement
-	? Option['value'][] | undefined
-	: TElement extends TimePickerElement
-	? TimePickerElement['initialTime']
-	: never;
+		? Option['value']
+		: TElement extends ConversationsSelectElement
+			? unknown
+			: TElement extends DatePickerElement
+				? DatePickerElement['initialDate']
+				: TElement extends LinearScaleElement
+					? LinearScaleElement['initialValue']
+					: TElement extends MultiChannelsSelectElement
+						? Option['value'][]
+						: TElement extends MultiConversationsSelectElement
+							? unknown
+							: TElement extends MultiStaticSelectElement
+								? MultiStaticSelectElement['initialValue']
+								: TElement extends MultiUsersSelectElement
+									? Option['value'][]
+									: TElement extends OverflowElement
+										? OverflowElement['options'][number]['value']
+										: TElement extends PlainTextInputElement
+											? PlainTextInputElement['initialValue']
+											: TElement extends StaticSelectElement
+												? StaticSelectElement['initialValue']
+												: TElement extends UsersSelectElement
+													? Option['value']
+													: TElement extends ToggleSwitchElement
+														? Option['value'][]
+														: TElement extends RadioButtonElement
+															? Option['value'] | undefined
+															: TElement extends CheckboxElement
+																? Option['value'][] | undefined
+																: TElement extends TimePickerElement
+																	? TimePickerElement['initialTime']
+																	: never;
diff --git a/packages/ui-kit/src/rendering/BlockRenderers.ts b/packages/ui-kit/src/rendering/BlockRenderers.ts
index 4a8bf3a29058..9a379bfceb06 100644
--- a/packages/ui-kit/src/rendering/BlockRenderers.ts
+++ b/packages/ui-kit/src/rendering/BlockRenderers.ts
@@ -1,3 +1,6 @@
+import type { BlockElementRenderer } from './BlockElementRenderer';
+import type { LayoutBlockRenderer } from './LayoutBlockRenderer';
+import type { TextObjectRenderer } from './TextObjectRenderer';
 import type { BlockElement } from '../blocks/BlockElement';
 import type { RenderableLayoutBlock } from '../blocks/RenderableLayoutBlock';
 import type { TextObject } from '../blocks/TextObject';
@@ -7,9 +10,6 @@ import type { MultiStaticSelectElement } from '../blocks/elements/MultiStaticSel
 import type { PlainTextInputElement } from '../blocks/elements/PlainTextInputElement';
 import type { StaticSelectElement } from '../blocks/elements/StaticSelectElement';
 import type { PlainText } from '../blocks/text/PlainText';
-import type { BlockElementRenderer } from './BlockElementRenderer';
-import type { LayoutBlockRenderer } from './LayoutBlockRenderer';
-import type { TextObjectRenderer } from './TextObjectRenderer';
 
 export type BlockRenderers<T> = {
 	[B in RenderableLayoutBlock as B['type']]?: LayoutBlockRenderer<T, B>;
diff --git a/packages/ui-kit/src/rendering/LayoutBlockRenderer.ts b/packages/ui-kit/src/rendering/LayoutBlockRenderer.ts
index 030912415d32..96a889e9d8a9 100644
--- a/packages/ui-kit/src/rendering/LayoutBlockRenderer.ts
+++ b/packages/ui-kit/src/rendering/LayoutBlockRenderer.ts
@@ -1,5 +1,5 @@
-import type { RenderableLayoutBlock } from '../blocks/RenderableLayoutBlock';
 import type { BlockContext } from './BlockContext';
+import type { RenderableLayoutBlock } from '../blocks/RenderableLayoutBlock';
 
 export type LayoutBlockRenderer<T, B extends RenderableLayoutBlock = RenderableLayoutBlock> = (
 	layoutBlock: B,
diff --git a/packages/ui-kit/src/rendering/TextObjectRenderer.ts b/packages/ui-kit/src/rendering/TextObjectRenderer.ts
index 2e61cb2f8259..1307ada005b4 100644
--- a/packages/ui-kit/src/rendering/TextObjectRenderer.ts
+++ b/packages/ui-kit/src/rendering/TextObjectRenderer.ts
@@ -1,5 +1,5 @@
-import type { TextObject } from '../blocks/TextObject';
 import type { BlockContext } from './BlockContext';
+import type { TextObject } from '../blocks/TextObject';
 
 export type TextObjectRenderer<OutputElement, Block extends TextObject = TextObject> = (
 	textObject: Block,
diff --git a/packages/ui-kit/src/rendering/createSurfaceRenderer.ts b/packages/ui-kit/src/rendering/createSurfaceRenderer.ts
index dcd91e73d852..bdab9866004b 100644
--- a/packages/ui-kit/src/rendering/createSurfaceRenderer.ts
+++ b/packages/ui-kit/src/rendering/createSurfaceRenderer.ts
@@ -1,7 +1,7 @@
-import type { Block } from '../blocks/Block';
-import type { RenderableLayoutBlock } from '../blocks/RenderableLayoutBlock';
 import type { Conditions } from './Conditions';
 import type { SurfaceRenderer } from './SurfaceRenderer';
+import type { Block } from '../blocks/Block';
+import type { RenderableLayoutBlock } from '../blocks/RenderableLayoutBlock';
 
 export const createSurfaceRenderer =
 	<TAllowedLayoutBlock extends RenderableLayoutBlock>() =>
diff --git a/packages/ui-kit/src/rendering/renderBlockElement.ts b/packages/ui-kit/src/rendering/renderBlockElement.ts
index 8e6794ae9bd9..a18ae6656ccc 100644
--- a/packages/ui-kit/src/rendering/renderBlockElement.ts
+++ b/packages/ui-kit/src/rendering/renderBlockElement.ts
@@ -1,7 +1,7 @@
-import type { BlockElement } from '../blocks/BlockElement';
 import type { BlockContext } from './BlockContext';
 import type { BlockElementRenderer } from './BlockElementRenderer';
 import type { BlockRenderers } from './BlockRenderers';
+import type { BlockElement } from '../blocks/BlockElement';
 
 const getBlockElementRenderer = <T>(renderers: BlockRenderers<T>, type: BlockElement['type']): BlockElementRenderer<T> | undefined => {
 	const renderer = renderers[type] as BlockElementRenderer<T> | undefined;
diff --git a/packages/ui-kit/src/rendering/renderLayoutBlock.ts b/packages/ui-kit/src/rendering/renderLayoutBlock.ts
index 3e4a8b65ee87..235fd9ccd71a 100644
--- a/packages/ui-kit/src/rendering/renderLayoutBlock.ts
+++ b/packages/ui-kit/src/rendering/renderLayoutBlock.ts
@@ -1,8 +1,8 @@
-import type { LayoutBlock } from '../blocks/LayoutBlock';
-import type { ConditionalBlock } from '../blocks/layout/ConditionalBlock';
 import { BlockContext } from './BlockContext';
 import type { BlockRenderers } from './BlockRenderers';
 import type { LayoutBlockRenderer } from './LayoutBlockRenderer';
+import type { LayoutBlock } from '../blocks/LayoutBlock';
+import type { ConditionalBlock } from '../blocks/layout/ConditionalBlock';
 
 const getLayoutBlockRenderer = <T>(
 	renderers: BlockRenderers<T>,
diff --git a/packages/ui-kit/src/rendering/renderTextObject.ts b/packages/ui-kit/src/rendering/renderTextObject.ts
index cd99a192f9e0..90dc92bb484c 100644
--- a/packages/ui-kit/src/rendering/renderTextObject.ts
+++ b/packages/ui-kit/src/rendering/renderTextObject.ts
@@ -1,7 +1,7 @@
-import type { TextObject } from '../blocks/TextObject';
 import type { BlockContext } from './BlockContext';
 import type { BlockRenderers } from './BlockRenderers';
 import type { TextObjectRenderer } from './TextObjectRenderer';
+import type { TextObject } from '../blocks/TextObject';
 
 const getTextObjectRenderer = <T>(renderers: BlockRenderers<T>, type: TextObject['type']): TextObjectRenderer<T> | undefined => {
 	const renderer = renderers[type] as TextObjectRenderer<T> | undefined;
diff --git a/packages/ui-kit/src/rendering/resolveConditionalBlocks.ts b/packages/ui-kit/src/rendering/resolveConditionalBlocks.ts
index 0b6000868757..c4c0e9e27803 100644
--- a/packages/ui-kit/src/rendering/resolveConditionalBlocks.ts
+++ b/packages/ui-kit/src/rendering/resolveConditionalBlocks.ts
@@ -1,7 +1,7 @@
+import type { Conditions } from './Conditions';
 import type { Block } from '../blocks/Block';
 import { LayoutBlockType } from '../blocks/LayoutBlockType';
 import type { ConditionalBlock } from '../blocks/layout/ConditionalBlock';
-import type { Conditions } from './Conditions';
 
 const conditionsMatch = (conditions: Conditions | undefined = undefined, filters: ConditionalBlock['when'] = {}): boolean => {
 	if (!conditions) {
diff --git a/packages/ui-kit/src/surfaces/attachment/UiKitParserAttachment.spec.ts b/packages/ui-kit/src/surfaces/attachment/UiKitParserAttachment.spec.ts
index dd4937d89193..b413dd9ad902 100644
--- a/packages/ui-kit/src/surfaces/attachment/UiKitParserAttachment.spec.ts
+++ b/packages/ui-kit/src/surfaces/attachment/UiKitParserAttachment.spec.ts
@@ -1,6 +1,6 @@
-import { BlockContext } from '../../rendering/BlockContext';
 import { UiKitParserAttachment } from './UiKitParserAttachment';
 import { uiKitAttachment } from './uiKitAttachment';
+import { BlockContext } from '../../rendering/BlockContext';
 
 class TestParser extends UiKitParserAttachment<unknown> {
 	plain_text = (element: any, context: any, index: any): any => ({
diff --git a/packages/ui-kit/src/surfaces/attachment/uiKitAttachment.ts b/packages/ui-kit/src/surfaces/attachment/uiKitAttachment.ts
index 8bb68b0b54cc..fcc3481ae1ee 100644
--- a/packages/ui-kit/src/surfaces/attachment/uiKitAttachment.ts
+++ b/packages/ui-kit/src/surfaces/attachment/uiKitAttachment.ts
@@ -1,4 +1,4 @@
-import { createSurfaceRenderer } from '../../rendering/createSurfaceRenderer';
 import type { AttachmentSurfaceLayout } from './UiKitParserAttachment';
+import { createSurfaceRenderer } from '../../rendering/createSurfaceRenderer';
 
 export const uiKitAttachment = createSurfaceRenderer<AttachmentSurfaceLayout[number]>();
diff --git a/packages/ui-kit/src/surfaces/banner/UiKitParserBanner.spec.ts b/packages/ui-kit/src/surfaces/banner/UiKitParserBanner.spec.ts
index f9439c06ae29..1c12c359c7e3 100644
--- a/packages/ui-kit/src/surfaces/banner/UiKitParserBanner.spec.ts
+++ b/packages/ui-kit/src/surfaces/banner/UiKitParserBanner.spec.ts
@@ -1,7 +1,7 @@
-import type { PlainText } from '../../blocks/text/PlainText';
-import { BlockContext } from '../../rendering/BlockContext';
 import { UiKitParserBanner } from './UiKitParserBanner';
 import { uiKitBanner } from './uiKitBanner';
+import type { PlainText } from '../../blocks/text/PlainText';
+import { BlockContext } from '../../rendering/BlockContext';
 
 class TestParser extends UiKitParserBanner<unknown> {
 	plain_text = (element: any, context: any, index: any): any => ({
diff --git a/packages/ui-kit/src/surfaces/banner/uiKitBanner.ts b/packages/ui-kit/src/surfaces/banner/uiKitBanner.ts
index 10ec0d59b27c..24cf431a9b75 100644
--- a/packages/ui-kit/src/surfaces/banner/uiKitBanner.ts
+++ b/packages/ui-kit/src/surfaces/banner/uiKitBanner.ts
@@ -1,4 +1,4 @@
-import { createSurfaceRenderer } from '../../rendering/createSurfaceRenderer';
 import type { BannerSurfaceLayout } from './UiKitParserBanner';
+import { createSurfaceRenderer } from '../../rendering/createSurfaceRenderer';
 
 export const uiKitBanner = createSurfaceRenderer<BannerSurfaceLayout[number]>();
diff --git a/packages/ui-kit/src/surfaces/contextualBar/UiKitParserContextualBar.spec.ts b/packages/ui-kit/src/surfaces/contextualBar/UiKitParserContextualBar.spec.ts
index e6284de0d11b..89de1bb8ad67 100644
--- a/packages/ui-kit/src/surfaces/contextualBar/UiKitParserContextualBar.spec.ts
+++ b/packages/ui-kit/src/surfaces/contextualBar/UiKitParserContextualBar.spec.ts
@@ -1,8 +1,8 @@
+import { UiKitParserContextualBar } from './UiKitParserContextualBar';
+import { uiKitContextualBar } from './uiKitContextualBar';
 import type { OverflowElement } from '../../blocks/elements/OverflowElement';
 import type { PlainText } from '../../blocks/text/PlainText';
 import { BlockContext } from '../../rendering/BlockContext';
-import { UiKitParserContextualBar } from './UiKitParserContextualBar';
-import { uiKitContextualBar } from './uiKitContextualBar';
 
 class TestParser extends UiKitParserContextualBar<unknown> {
 	plain_text = (element: any, context: any, index: any): any => ({
diff --git a/packages/ui-kit/src/surfaces/contextualBar/uiKitContextualBar.ts b/packages/ui-kit/src/surfaces/contextualBar/uiKitContextualBar.ts
index b5de38b80162..d3bc1efc2092 100644
--- a/packages/ui-kit/src/surfaces/contextualBar/uiKitContextualBar.ts
+++ b/packages/ui-kit/src/surfaces/contextualBar/uiKitContextualBar.ts
@@ -1,4 +1,4 @@
-import { createSurfaceRenderer } from '../../rendering/createSurfaceRenderer';
 import type { ContextualBarSurfaceLayout } from './UiKitParserContextualBar';
+import { createSurfaceRenderer } from '../../rendering/createSurfaceRenderer';
 
 export const uiKitContextualBar = createSurfaceRenderer<ContextualBarSurfaceLayout[number]>();
diff --git a/packages/ui-kit/src/surfaces/message/UiKitParserMessage.spec.ts b/packages/ui-kit/src/surfaces/message/UiKitParserMessage.spec.ts
index d68a02b02068..38e57b34f9c5 100644
--- a/packages/ui-kit/src/surfaces/message/UiKitParserMessage.spec.ts
+++ b/packages/ui-kit/src/surfaces/message/UiKitParserMessage.spec.ts
@@ -1,6 +1,6 @@
-import { BlockContext } from '../../rendering/BlockContext';
 import { UiKitParserMessage } from './UiKitParserMessage';
 import { uiKitMessage } from './uiKitMessage';
+import { BlockContext } from '../../rendering/BlockContext';
 
 class TestParser extends UiKitParserMessage<unknown> {
 	plain_text = (element: any, context: any, index: any): any => ({
diff --git a/packages/ui-kit/src/surfaces/message/uiKitMessage.ts b/packages/ui-kit/src/surfaces/message/uiKitMessage.ts
index 4a59b7e83e53..d6eca2005e34 100644
--- a/packages/ui-kit/src/surfaces/message/uiKitMessage.ts
+++ b/packages/ui-kit/src/surfaces/message/uiKitMessage.ts
@@ -1,4 +1,4 @@
-import { createSurfaceRenderer } from '../../rendering/createSurfaceRenderer';
 import type { MessageSurfaceLayout } from './UiKitParserMessage';
+import { createSurfaceRenderer } from '../../rendering/createSurfaceRenderer';
 
 export const uiKitMessage = createSurfaceRenderer<MessageSurfaceLayout[number]>();
diff --git a/packages/ui-kit/src/surfaces/modal/UiKitParserModal.spec.ts b/packages/ui-kit/src/surfaces/modal/UiKitParserModal.spec.ts
index 33691a21bfd5..22e552e1d683 100644
--- a/packages/ui-kit/src/surfaces/modal/UiKitParserModal.spec.ts
+++ b/packages/ui-kit/src/surfaces/modal/UiKitParserModal.spec.ts
@@ -1,8 +1,8 @@
+import { UiKitParserModal } from './UiKitParserModal';
+import { uiKitModal } from './uiKitModal';
 import type { OverflowElement } from '../../blocks/elements/OverflowElement';
 import type { PlainText } from '../../blocks/text/PlainText';
 import { BlockContext } from '../../rendering/BlockContext';
-import { UiKitParserModal } from './UiKitParserModal';
-import { uiKitModal } from './uiKitModal';
 
 class TestParser extends UiKitParserModal<unknown> {
 	plain_text = (element: any, context: any, index: any): any => ({
diff --git a/packages/ui-kit/src/surfaces/modal/uiKitModal.ts b/packages/ui-kit/src/surfaces/modal/uiKitModal.ts
index a100994a5d50..f5b7f9dc749c 100644
--- a/packages/ui-kit/src/surfaces/modal/uiKitModal.ts
+++ b/packages/ui-kit/src/surfaces/modal/uiKitModal.ts
@@ -1,4 +1,4 @@
-import { createSurfaceRenderer } from '../../rendering/createSurfaceRenderer';
 import type { ModalSurfaceLayout } from './UiKitParserModal';
+import { createSurfaceRenderer } from '../../rendering/createSurfaceRenderer';
 
 export const uiKitModal = createSurfaceRenderer<ModalSurfaceLayout[number]>();
diff --git a/packages/ui-video-conf/.storybook/preview.tsx b/packages/ui-video-conf/.storybook/preview.tsx
index 20914d6a3d22..ffd2620b4681 100644
--- a/packages/ui-video-conf/.storybook/preview.tsx
+++ b/packages/ui-video-conf/.storybook/preview.tsx
@@ -16,7 +16,7 @@ export const parameters = {
 
 export const decorators: Decorator[] = [
 	(Story): ReactElement => (
-		<div className='rc-old'>
+		<div>
 			<style>{`
 				body {
 					background-color: white;
diff --git a/packages/ui-video-conf/CHANGELOG.md b/packages/ui-video-conf/CHANGELOG.md
index b9da493f40c5..bc2a4ce4f775 100644
--- a/packages/ui-video-conf/CHANGELOG.md
+++ b/packages/ui-video-conf/CHANGELOG.md
@@ -1,5 +1,45 @@
 # @rocket.chat/ui-video-conf
 
+## 13.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@13.0.0-rc.3
+  - @rocket.chat/ui-avatar@9.0.0-rc.3
+  </details>
+
+## 13.0.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@13.0.0-rc.2
+  - @rocket.chat/ui-avatar@9.0.0-rc.2
+  </details>
+
+## 13.0.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@13.0.0-rc.1
+  - @rocket.chat/ui-avatar@9.0.0-rc.1
+  </details>
+
+## 13.0.0-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@13.0.0-rc.0
+  - @rocket.chat/ui-avatar@9.0.0-rc.0
+  </details>
+
 ## 12.0.0
 
 ### Minor Changes
diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json
index bdeb77443404..5326be681132 100644
--- a/packages/ui-video-conf/package.json
+++ b/packages/ui-video-conf/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-video-conf",
-	"version": "12.0.0",
+	"version": "13.0.0-rc.3",
 	"private": true,
 	"main": "./dist/index.js",
 	"typings": "./dist/index.d.ts",
@@ -21,35 +21,35 @@
 		"@rocket.chat/emitter": "~0.31.25"
 	},
 	"devDependencies": {
-		"@babel/core": "~7.25.8",
+		"@babel/core": "~7.26.0",
 		"@rocket.chat/css-in-js": "~0.31.25",
 		"@rocket.chat/eslint-config": "workspace:^",
 		"@rocket.chat/fuselage": "^0.59.4",
 		"@rocket.chat/fuselage-hooks": "^0.33.1",
-		"@rocket.chat/icons": "~0.38.0",
+		"@rocket.chat/icons": "~0.39.0",
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@rocket.chat/styled": "~0.31.25",
 		"@rocket.chat/ui-avatar": "workspace:^",
 		"@rocket.chat/ui-contexts": "workspace:^",
-		"@storybook/addon-a11y": "^8.3.5",
-		"@storybook/addon-actions": "^8.3.5",
-		"@storybook/addon-docs": "^8.3.5",
-		"@storybook/addon-essentials": "^8.3.5",
-		"@storybook/addon-styling-webpack": "^1.0.0",
+		"@storybook/addon-a11y": "^8.4.4",
+		"@storybook/addon-actions": "^8.4.4",
+		"@storybook/addon-docs": "^8.4.4",
+		"@storybook/addon-essentials": "^8.4.4",
+		"@storybook/addon-styling-webpack": "^1.0.1",
 		"@storybook/addon-webpack5-compiler-babel": "^3.0.3",
-		"@storybook/react": "^8.3.5",
-		"@storybook/react-webpack5": "^8.3.5",
-		"@types/jest": "~29.5.13",
+		"@storybook/react": "^8.4.4",
+		"@storybook/react-webpack5": "^8.4.4",
+		"@types/jest": "~29.5.14",
 		"@types/jest-axe": "~3.5.9",
 		"@types/react": "~17.0.80",
 		"eslint": "~8.45.0",
-		"eslint-plugin-react": "~7.32.2",
-		"eslint-plugin-react-hooks": "~4.6.2",
-		"eslint-plugin-storybook": "~0.6.15",
+		"eslint-plugin-react": "~7.37.2",
+		"eslint-plugin-react-hooks": "~5.0.0",
+		"eslint-plugin-storybook": "~0.11.0",
 		"jest": "~29.7.0",
 		"jest-axe": "~9.0.0",
 		"react": "~17.0.2",
-		"storybook": "^8.3.5",
+		"storybook": "^8.4.4",
 		"typescript": "~5.6.3"
 	},
 	"peerDependencies": {
@@ -58,8 +58,8 @@
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-avatar": "8.0.0",
-		"@rocket.chat/ui-contexts": "12.0.0",
+		"@rocket.chat/ui-avatar": "9.0.0-rc.3",
+		"@rocket.chat/ui-contexts": "13.0.0-rc.3",
 		"react": "~17.0.2",
 		"react-dom": "^17.0.2"
 	},
diff --git a/packages/ui-voip/.storybook/preview.tsx b/packages/ui-voip/.storybook/preview.tsx
index 8da5cffa9ce2..b3288aea1925 100644
--- a/packages/ui-voip/.storybook/preview.tsx
+++ b/packages/ui-voip/.storybook/preview.tsx
@@ -15,7 +15,7 @@ export const parameters: Parameters = {
 
 export const decorators: Decorator[] = [
 	(Story) => (
-		<div className='rc-old'>
+		<div>
 			<style>{`
 				body {
 					background-color: white;
diff --git a/packages/ui-voip/CHANGELOG.md b/packages/ui-voip/CHANGELOG.md
index e02a7f96df47..2ad4ce6c8c54 100644
--- a/packages/ui-voip/CHANGELOG.md
+++ b/packages/ui-voip/CHANGELOG.md
@@ -1,5 +1,49 @@
 # @rocket.chat/ui-voip
 
+## 3.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@13.0.0-rc.3
+  - @rocket.chat/ui-avatar@9.0.0-rc.3
+  - @rocket.chat/ui-client@13.0.0-rc.3
+  </details>
+
+## 3.0.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@13.0.0-rc.2
+  - @rocket.chat/ui-avatar@9.0.0-rc.2
+  - @rocket.chat/ui-client@13.0.0-rc.2
+  </details>
+
+## 3.0.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@13.0.0-rc.1
+  - @rocket.chat/ui-avatar@9.0.0-rc.1
+  - @rocket.chat/ui-client@13.0.0-rc.1
+  </details>
+
+## 3.0.0-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@13.0.0-rc.0
+  - @rocket.chat/ui-avatar@9.0.0-rc.0
+  - @rocket.chat/ui-client@13.0.0-rc.0
+  </details>
+
 ## 2.0.0
 
 ### Minor Changes
diff --git a/packages/ui-voip/package.json b/packages/ui-voip/package.json
index c9013f30478e..347b8a33b792 100644
--- a/packages/ui-voip/package.json
+++ b/packages/ui-voip/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/ui-voip",
-	"version": "2.0.0",
+	"version": "3.0.0-rc.3",
 	"private": true,
 	"main": "./dist/index.js",
 	"typings": "./dist/index.d.ts",
@@ -19,44 +19,46 @@
 	},
 	"dependencies": {
 		"@rocket.chat/emitter": "~0.31.25",
-		"@tanstack/react-query": "^4.16.1",
+		"@tanstack/react-query": "^4.36.1",
 		"react-i18next": "~13.2.2",
-		"sip.js": "^0.20.1"
+		"sip.js": "^0.21.2"
 	},
 	"devDependencies": {
-		"@babel/core": "~7.25.8",
+		"@babel/core": "~7.26.0",
 		"@faker-js/faker": "~8.0.2",
+		"@react-spectrum/test-utils": "~1.0.0-alpha.2",
 		"@rocket.chat/css-in-js": "~0.31.25",
 		"@rocket.chat/eslint-config": "workspace:^",
 		"@rocket.chat/fuselage": "^0.59.4",
 		"@rocket.chat/fuselage-hooks": "^0.33.1",
-		"@rocket.chat/icons": "~0.38.0",
+		"@rocket.chat/icons": "~0.39.0",
 		"@rocket.chat/jest-presets": "workspace:~",
 		"@rocket.chat/mock-providers": "workspace:~",
 		"@rocket.chat/styled": "~0.31.25",
 		"@rocket.chat/ui-avatar": "workspace:^",
 		"@rocket.chat/ui-client": "workspace:^",
 		"@rocket.chat/ui-contexts": "workspace:^",
-		"@storybook/addon-a11y": "^8.3.5",
-		"@storybook/addon-actions": "^8.3.5",
-		"@storybook/addon-docs": "^8.3.5",
-		"@storybook/addon-essentials": "^8.3.5",
+		"@storybook/addon-a11y": "^8.4.4",
+		"@storybook/addon-actions": "^8.4.4",
+		"@storybook/addon-docs": "^8.4.4",
+		"@storybook/addon-essentials": "^8.4.4",
 		"@storybook/addon-webpack5-compiler-babel": "^3.0.3",
-		"@storybook/react": "^8.3.5",
-		"@storybook/react-webpack5": "^8.3.5",
+		"@storybook/react": "^8.4.4",
+		"@storybook/react-webpack5": "^8.4.4",
 		"@testing-library/react": "~16.0.1",
 		"@testing-library/user-event": "~14.5.2",
-		"@types/jest": "~29.5.12",
+		"@types/jest": "~29.5.14",
 		"@types/jest-axe": "~3.5.9",
 		"@types/react": "~17.0.80",
+		"@types/react-dom": "~17.0.25",
 		"eslint": "~8.45.0",
-		"eslint-plugin-react": "~7.32.2",
-		"eslint-plugin-react-hooks": "~4.6.2",
-		"eslint-plugin-storybook": "^0.9.0",
+		"eslint-plugin-react": "~7.37.2",
+		"eslint-plugin-react-hooks": "~5.0.0",
+		"eslint-plugin-storybook": "^0.11.0",
 		"jest": "~29.7.0",
 		"jest-axe": "~9.0.0",
 		"react": "~17.0.2",
-		"storybook": "^8.3.5",
+		"storybook": "^8.4.4",
 		"typescript": "~5.6.3"
 	},
 	"peerDependencies": {
@@ -65,9 +67,9 @@
 		"@rocket.chat/fuselage-hooks": "*",
 		"@rocket.chat/icons": "*",
 		"@rocket.chat/styled": "*",
-		"@rocket.chat/ui-avatar": "8.0.0",
-		"@rocket.chat/ui-client": "12.0.0",
-		"@rocket.chat/ui-contexts": "12.0.0",
+		"@rocket.chat/ui-avatar": "9.0.0-rc.3",
+		"@rocket.chat/ui-client": "13.0.0-rc.3",
+		"@rocket.chat/ui-contexts": "13.0.0-rc.3",
 		"react": "~17.0.2",
 		"react-aria": "~3.23.1",
 		"react-dom": "^17.0.2"
diff --git a/packages/ui-voip/src/components/VoipContactId/VoipContactId.spec.tsx b/packages/ui-voip/src/components/VoipContactId/VoipContactId.spec.tsx
index 595c6897eeec..43d55c2c125f 100644
--- a/packages/ui-voip/src/components/VoipContactId/VoipContactId.spec.tsx
+++ b/packages/ui-voip/src/components/VoipContactId/VoipContactId.spec.tsx
@@ -2,6 +2,7 @@ import { faker } from '@faker-js/faker';
 import { mockAppRoot } from '@rocket.chat/mock-providers';
 import { composeStories } from '@storybook/react';
 import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 import { axe } from 'jest-axe';
 
 import VoipContactId from './VoipContactId';
@@ -9,57 +10,55 @@ import * as stories from './VoipContactId.stories';
 
 const testCases = Object.values(composeStories(stories)).map((story) => [story.storyName || 'Story', story]);
 
-describe('VoipContactId', () => {
-	beforeAll(() => {
-		Object.assign(navigator, {
-			clipboard: {
-				writeText: jest.fn(),
-			},
-		});
+beforeAll(() => {
+	Object.assign(navigator, {
+		clipboard: {
+			writeText: jest.fn(),
+		},
 	});
+});
 
-	test.each(testCases)(`renders %s without crashing`, async (_storyname, Story) => {
-		const tree = render(<Story />, { wrapper: mockAppRoot().build(), legacyRoot: true });
-		expect(tree.baseElement).toMatchSnapshot();
-	});
+test.each(testCases)(`renders %s without crashing`, async (_storyname, Story) => {
+	const tree = render(<Story />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+	expect(tree.baseElement).toMatchSnapshot();
+});
 
-	test.each(testCases)('%s should have no a11y violations', async (_storyname, Story) => {
-		const { container } = render(<Story />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+test.each(testCases)('%s should have no a11y violations', async (_storyname, Story) => {
+	const { container } = render(<Story />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+
+	const results = await axe(container);
+	expect(results).toHaveNoViolations();
+});
 
-		const results = await axe(container);
-		expect(results).toHaveNoViolations();
+it('should display avatar and name when username is available', () => {
+	render(<VoipContactId name='John Doe' username='john.doe' />, {
+		wrapper: mockAppRoot().build(),
+		legacyRoot: true,
 	});
 
-	it('should display avatar and name when username is available', () => {
-		render(<VoipContactId name='John Doe' username='john.doe' />, {
-			wrapper: mockAppRoot().build(),
-			legacyRoot: true,
-		});
+	expect(screen.getByRole('img', { hidden: true })).toHaveAttribute('title', 'john.doe');
+	expect(screen.getByText('John Doe')).toBeInTheDocument();
+});
 
-		expect(screen.getByRole('img', { hidden: true })).toHaveAttribute('title', 'john.doe');
-		expect(screen.getByText('John Doe')).toBeInTheDocument();
+it('should display transferedBy information when available', () => {
+	render(<VoipContactId name='John Doe' username='john.doe' transferedBy='Jane Doe' />, {
+		wrapper: mockAppRoot().build(),
+		legacyRoot: true,
 	});
 
-	it('should display transferedBy information when available', () => {
-		render(<VoipContactId name='John Doe' username='john.doe' transferedBy='Jane Doe' />, {
-			wrapper: mockAppRoot().build(),
-			legacyRoot: true,
-		});
+	expect(screen.getByText('From: Jane Doe')).toBeInTheDocument();
+});
 
-		expect(screen.getByText('From: Jane Doe')).toBeInTheDocument();
+it('should display copy button when username isnt available', async () => {
+	const phone = faker.phone.number();
+	render(<VoipContactId name={phone} />, {
+		wrapper: mockAppRoot().build(),
+		legacyRoot: true,
 	});
 
-	it('should display copy button when username isnt available', async () => {
-		const phone = faker.phone.number();
-		render(<VoipContactId name={phone} />, {
-			wrapper: mockAppRoot().build(),
-			legacyRoot: true,
-		});
+	const copyButton = screen.getByRole('button', { name: 'Copy_phone_number' });
+	expect(copyButton).toBeInTheDocument();
 
-		const copyButton = screen.getByRole('button', { name: 'Copy_phone_number' });
-		expect(copyButton).toBeInTheDocument();
-
-		copyButton.click();
-		await waitFor(() => expect(navigator.clipboard.writeText).toHaveBeenCalledWith(phone));
-	});
+	await userEvent.click(copyButton);
+	await waitFor(() => expect(navigator.clipboard.writeText).toHaveBeenCalledWith(phone));
 });
diff --git a/packages/ui-voip/src/components/VoipContactId/__snapshots__/VoipContactId.spec.tsx.snap b/packages/ui-voip/src/components/VoipContactId/__snapshots__/VoipContactId.spec.tsx.snap
index e8d94cbfdde4..46980fbdccaf 100644
--- a/packages/ui-voip/src/components/VoipContactId/__snapshots__/VoipContactId.spec.tsx.snap
+++ b/packages/ui-voip/src/components/VoipContactId/__snapshots__/VoipContactId.spec.tsx.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`VoipContactId renders Loading without crashing 1`] = `
+exports[`renders Loading without crashing 1`] = `
 <body>
   <div>
     <div
@@ -21,7 +21,7 @@ exports[`VoipContactId renders Loading without crashing 1`] = `
 </body>
 `;
 
-exports[`VoipContactId renders WithPhoneNumber without crashing 1`] = `
+exports[`renders WithPhoneNumber without crashing 1`] = `
 <body>
   <div>
     <div
@@ -59,7 +59,7 @@ exports[`VoipContactId renders WithPhoneNumber without crashing 1`] = `
 </body>
 `;
 
-exports[`VoipContactId renders WithTransfer without crashing 1`] = `
+exports[`renders WithTransfer without crashing 1`] = `
 <body>
   <div>
     <div
@@ -106,7 +106,7 @@ exports[`VoipContactId renders WithTransfer without crashing 1`] = `
 </body>
 `;
 
-exports[`VoipContactId renders WithUsername without crashing 1`] = `
+exports[`renders WithUsername without crashing 1`] = `
 <body>
   <div>
     <div
diff --git a/packages/ui-voip/src/components/VoipDialPad/VoipDialPad.spec.tsx b/packages/ui-voip/src/components/VoipDialPad/VoipDialPad.spec.tsx
index 602c9813d948..6028a414a581 100644
--- a/packages/ui-voip/src/components/VoipDialPad/VoipDialPad.spec.tsx
+++ b/packages/ui-voip/src/components/VoipDialPad/VoipDialPad.spec.tsx
@@ -1,75 +1,79 @@
+/* eslint-disable no-await-in-loop */
+import { installPointerEvent, triggerLongPress } from '@react-spectrum/test-utils';
 import { mockAppRoot } from '@rocket.chat/mock-providers';
-import { fireEvent, render, screen } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 
 import DialPad from './VoipDialPad';
 
-describe('VoipDialPad', () => {
-	beforeEach(() => {
-		jest.useFakeTimers();
-	});
+const user = userEvent.setup({ advanceTimers: jest.advanceTimersByTime });
 
-	afterEach(() => {
-		jest.clearAllTimers();
-	});
+installPointerEvent();
 
-	it('should not be editable by default', () => {
-		render(<DialPad value='' onChange={jest.fn()} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+beforeEach(() => {
+	jest.useFakeTimers();
+});
 
-		expect(screen.getByLabelText('Phone_number')).toHaveAttribute('readOnly');
-	});
+afterEach(() => {
+	jest.clearAllTimers();
+});
 
-	it('should enable input when editable', () => {
-		render(<DialPad editable value='' onChange={jest.fn()} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+it('should not be editable by default', async () => {
+	render(<DialPad value='' onChange={jest.fn()} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
-		expect(screen.getByLabelText('Phone_number')).not.toHaveAttribute('readOnly');
-	});
+	expect(screen.getByLabelText('Phone_number')).toHaveAttribute('readOnly');
+});
 
-	it('should disable backspace button when input is empty', () => {
-		render(<DialPad editable value='' onChange={jest.fn()} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+it('should enable input when editable', async () => {
+	render(<DialPad editable value='' onChange={jest.fn()} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
-		expect(screen.getByTestId('dial-paid-input-backspace')).toBeDisabled();
-	});
+	expect(screen.getByLabelText('Phone_number')).not.toHaveAttribute('readOnly');
+});
 
-	it('should enable backspace button when input has value', () => {
-		render(<DialPad editable value='123' onChange={jest.fn()} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+it('should disable backspace button when input is empty', async () => {
+	render(<DialPad editable value='' onChange={jest.fn()} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
-		expect(screen.getByTestId('dial-paid-input-backspace')).toBeEnabled();
-	});
+	expect(screen.getByTestId('dial-paid-input-backspace')).toBeDisabled();
+});
 
-	it('should remove last character when backspace is clicked', () => {
-		const fn = jest.fn();
-		render(<DialPad editable value='123' onChange={fn} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+it('should enable backspace button when input has value', async () => {
+	render(<DialPad editable value='123' onChange={jest.fn()} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
-		expect(screen.getByLabelText('Phone_number')).toHaveValue('123');
+	expect(screen.getByTestId('dial-paid-input-backspace')).toBeEnabled();
+});
 
-		screen.getByTestId('dial-paid-input-backspace').click();
+it('should remove last character when backspace is clicked', async () => {
+	const fn = jest.fn();
+	render(<DialPad editable value='123' onChange={fn} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
-		expect(fn).toHaveBeenCalledWith('12');
-	});
+	expect(screen.getByLabelText('Phone_number')).toHaveValue('123');
 
-	it('should call onChange when number is clicked', () => {
-		const fn = jest.fn();
-		render(<DialPad editable value='123' onChange={fn} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+	await user.click(screen.getByTestId('dial-paid-input-backspace'));
+
+	expect(fn).toHaveBeenCalledWith('12');
+});
+
+it('should call onChange when number is clicked', async () => {
+	const fn = jest.fn();
+	render(<DialPad editable value='123' onChange={fn} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+
+	for (const digit of ['1', '2', '3', '4', '5', '6', '7', '8', '9', '0']) {
+		await user.click(screen.getByTestId(`dial-pad-button-${digit}`));
+		expect(fn).toHaveBeenCalledWith(`123${digit}`, digit);
+	}
+});
 
-		['1', '2', '3', '4', '5', '6', '7', '8', '9', '0'].forEach((digit) => {
-			screen.getByTestId(`dial-pad-button-${digit}`).click();
-			expect(fn).toHaveBeenCalledWith(`123${digit}`, digit);
-		});
-	});
+it('should call onChange with + when 0 pressed and held', async () => {
+	const fn = jest.fn();
+	render(<DialPad editable longPress value='123' onChange={fn} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
-	xit('should call onChange with + when 0 pressed and held', () => {
-		const fn = jest.fn();
-		render(<DialPad editable longPress value='123' onChange={fn} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+	const button = screen.getByTestId('dial-pad-button-0');
 
-		const button = screen.getByTestId('dial-pad-button-0');
+	await user.click(button);
 
-		button.click();
-		expect(fn).toHaveBeenCalledWith('1230', '0');
+	expect(fn).toHaveBeenCalledWith('1230', '0');
 
-		fireEvent.pointerDown(button);
-		jest.runOnlyPendingTimers();
-		fireEvent.pointerUp(button);
+	await triggerLongPress({ element: button, advanceTimer: (time = 800) => jest.advanceTimersByTime(time) });
 
-		expect(fn).toHaveBeenCalledWith('123+', '+');
-	});
+	expect(fn).toHaveBeenCalledWith('123+', '+');
 });
diff --git a/packages/ui-voip/src/components/VoipPopup/VoipPopup.spec.tsx b/packages/ui-voip/src/components/VoipPopup/VoipPopup.spec.tsx
index 6ebf1e6fb038..eac2e495c6d9 100644
--- a/packages/ui-voip/src/components/VoipPopup/VoipPopup.spec.tsx
+++ b/packages/ui-voip/src/components/VoipPopup/VoipPopup.spec.tsx
@@ -18,11 +18,10 @@ jest.mock('../../hooks/useVoipDialer', () => ({
 }));
 
 const mockedUseVoipSession = jest.mocked(useVoipSession);
-const appRoot = mockAppRoot();
 
 it('should properly render incoming popup', async () => {
 	mockedUseVoipSession.mockImplementationOnce(() => createMockVoipSession({ type: 'INCOMING' }));
-	render(<VoipPopup />, { wrapper: appRoot.build(), legacyRoot: true });
+	render(<VoipPopup />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
 	expect(screen.getByTestId('vc-popup-incoming')).toBeInTheDocument();
 });
@@ -30,7 +29,7 @@ it('should properly render incoming popup', async () => {
 it('should properly render ongoing popup', async () => {
 	mockedUseVoipSession.mockImplementationOnce(() => createMockVoipSession({ type: 'ONGOING' }));
 
-	render(<VoipPopup />, { wrapper: appRoot.build(), legacyRoot: true });
+	render(<VoipPopup />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
 	expect(screen.getByTestId('vc-popup-ongoing')).toBeInTheDocument();
 });
@@ -38,7 +37,7 @@ it('should properly render ongoing popup', async () => {
 it('should properly render outgoing popup', async () => {
 	mockedUseVoipSession.mockImplementationOnce(() => createMockVoipSession({ type: 'OUTGOING' }));
 
-	render(<VoipPopup />, { wrapper: appRoot.build(), legacyRoot: true });
+	render(<VoipPopup />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
 	expect(screen.getByTestId('vc-popup-outgoing')).toBeInTheDocument();
 });
@@ -46,13 +45,13 @@ it('should properly render outgoing popup', async () => {
 it('should properly render error popup', async () => {
 	mockedUseVoipSession.mockImplementationOnce(() => createMockVoipSession({ type: 'ERROR' }));
 
-	render(<VoipPopup />, { wrapper: appRoot.build(), legacyRoot: true });
+	render(<VoipPopup />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
 	expect(screen.getByTestId('vc-popup-error')).toBeInTheDocument();
 });
 
 it('should properly render dialer popup', async () => {
-	render(<VoipPopup />, { wrapper: appRoot.build(), legacyRoot: true });
+	render(<VoipPopup />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
 	expect(screen.getByTestId('vc-popup-dialer')).toBeInTheDocument();
 });
@@ -60,7 +59,7 @@ it('should properly render dialer popup', async () => {
 it('should prioritize session over dialer', async () => {
 	mockedUseVoipSession.mockImplementationOnce(() => createMockVoipSession({ type: 'INCOMING' }));
 
-	render(<VoipPopup />, { wrapper: appRoot.build(), legacyRoot: true });
+	render(<VoipPopup />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
 	expect(screen.queryByTestId('vc-popup-dialer')).not.toBeInTheDocument();
 	expect(screen.getByTestId('vc-popup-incoming')).toBeInTheDocument();
@@ -69,12 +68,12 @@ it('should prioritize session over dialer', async () => {
 const testCases = Object.values(composeStories(stories)).map((story) => [story.storyName || 'Story', story]);
 
 test.each(testCases)(`renders %s without crashing`, async (_storyname, Story) => {
-	const tree = render(<Story />, { wrapper: appRoot.build(), legacyRoot: true });
+	const tree = render(<Story />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 	expect(replaceReactAriaIds(tree.baseElement)).toMatchSnapshot();
 });
 
 test.each(testCases)('%s should have no a11y violations', async (_storyname, Story) => {
-	const { container } = render(<Story />, { wrapper: appRoot.build(), legacyRoot: true });
+	const { container } = render(<Story />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
 	const results = await axe(container);
 	expect(results).toHaveNoViolations();
diff --git a/packages/ui-voip/src/components/VoipPopup/components/VoipPopupHeader.spec.tsx b/packages/ui-voip/src/components/VoipPopup/components/VoipPopupHeader.spec.tsx
index 07e455260522..2b9bae29b5c0 100644
--- a/packages/ui-voip/src/components/VoipPopup/components/VoipPopupHeader.spec.tsx
+++ b/packages/ui-voip/src/components/VoipPopup/components/VoipPopupHeader.spec.tsx
@@ -1,44 +1,43 @@
 import { mockAppRoot } from '@rocket.chat/mock-providers';
 import { render, screen } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 
 import VoipPopupHeader from './VoipPopupHeader';
 
-const appRoot = mockAppRoot();
-
 it('should render title', () => {
-	render(<VoipPopupHeader>voice call header title</VoipPopupHeader>, { wrapper: appRoot.build(), legacyRoot: true });
+	render(<VoipPopupHeader>voice call header title</VoipPopupHeader>, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
 	expect(screen.getByText('voice call header title')).toBeInTheDocument();
 });
 
 it('should not render close button when onClose is not provided', () => {
-	render(<VoipPopupHeader />, { wrapper: appRoot.build(), legacyRoot: true });
+	render(<VoipPopupHeader />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
 	expect(screen.queryByRole('button', { name: 'Close' })).not.toBeInTheDocument();
 });
 
 it('should render close button when onClose is provided', () => {
-	render(<VoipPopupHeader onClose={jest.fn()} />, { wrapper: appRoot.build(), legacyRoot: true });
+	render(<VoipPopupHeader onClose={jest.fn()} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
 	expect(screen.getByRole('button', { name: 'Close' })).toBeInTheDocument();
 });
 
-it('should call onClose when close button is clicked', () => {
+it('should call onClose when close button is clicked', async () => {
 	const closeFn = jest.fn();
-	render(<VoipPopupHeader onClose={closeFn} />, { wrapper: appRoot.build(), legacyRoot: true });
+	render(<VoipPopupHeader onClose={closeFn} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
-	screen.getByRole('button', { name: 'Close' }).click();
+	await userEvent.click(screen.getByRole('button', { name: 'Close' }));
 	expect(closeFn).toHaveBeenCalled();
 });
 
 it('should render settings button by default', () => {
-	render(<VoipPopupHeader />, { wrapper: appRoot.build(), legacyRoot: true });
+	render(<VoipPopupHeader />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
 	expect(screen.getByRole('button', { name: /Device_settings/ })).toBeInTheDocument();
 });
 
 it('should not render settings button when hideSettings is true', () => {
-	render(<VoipPopupHeader hideSettings>text</VoipPopupHeader>, { wrapper: appRoot.build(), legacyRoot: true });
+	render(<VoipPopupHeader hideSettings>text</VoipPopupHeader>, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
 	expect(screen.queryByRole('button', { name: /Device_settings/ })).not.toBeInTheDocument();
 });
diff --git a/packages/ui-voip/src/components/VoipPopup/views/VoipDialerView.spec.tsx b/packages/ui-voip/src/components/VoipPopup/views/VoipDialerView.spec.tsx
index 3add6e463982..f2ef82edf36c 100644
--- a/packages/ui-voip/src/components/VoipPopup/views/VoipDialerView.spec.tsx
+++ b/packages/ui-voip/src/components/VoipPopup/views/VoipDialerView.spec.tsx
@@ -7,14 +7,12 @@ import VoipDialerView from './VoipDialerView';
 const makeCall = jest.fn();
 const closeDialer = jest.fn();
 
-const appRoot = mockAppRoot();
-
 jest.mock('../../../hooks/useVoipAPI', () => ({
 	useVoipAPI: jest.fn(() => ({ makeCall, closeDialer })),
 }));
 
 it('should look good', async () => {
-	render(<VoipDialerView />, { wrapper: appRoot.build(), legacyRoot: true });
+	render(<VoipDialerView />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
 	expect(screen.getByText('New_Call')).toBeInTheDocument();
 	expect(screen.getByRole('button', { name: /Device_settings/ })).toBeInTheDocument();
@@ -22,7 +20,7 @@ it('should look good', async () => {
 });
 
 it('should only enable call button if input has value (keyboard)', async () => {
-	render(<VoipDialerView />, { wrapper: appRoot.build(), legacyRoot: true });
+	render(<VoipDialerView />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
 	expect(screen.getByRole('button', { name: /Call/i })).toBeDisabled();
 	await userEvent.type(screen.getByLabelText('Phone_number'), '123');
@@ -30,21 +28,22 @@ it('should only enable call button if input has value (keyboard)', async () => {
 });
 
 it('should only enable call button if input has value (mouse)', async () => {
-	render(<VoipDialerView />, { wrapper: appRoot.build(), legacyRoot: true });
+	render(<VoipDialerView />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
 	expect(screen.getByRole('button', { name: /Call/i })).toBeDisabled();
-	screen.getByTestId(`dial-pad-button-1`).click();
-	screen.getByTestId(`dial-pad-button-2`).click();
-	screen.getByTestId(`dial-pad-button-3`).click();
+
+	await userEvent.click(screen.getByTestId(`dial-pad-button-1`));
+	await userEvent.click(screen.getByTestId(`dial-pad-button-2`));
+	await userEvent.click(screen.getByTestId(`dial-pad-button-3`));
 	expect(screen.getByRole('button', { name: /Call/i })).toBeEnabled();
 });
 
 it('should call methods makeCall and closeDialer when call button is clicked', async () => {
-	render(<VoipDialerView />, { wrapper: appRoot.build(), legacyRoot: true });
+	render(<VoipDialerView />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
 	await userEvent.type(screen.getByLabelText('Phone_number'), '123');
-	screen.getByTestId(`dial-pad-button-1`).click();
-	screen.getByRole('button', { name: /Call/i }).click();
+	await userEvent.click(screen.getByTestId(`dial-pad-button-1`));
+	await userEvent.click(screen.getByRole('button', { name: /Call/i }));
 	expect(makeCall).toHaveBeenCalledWith('1231');
 	expect(closeDialer).toHaveBeenCalled();
 });
diff --git a/packages/ui-voip/src/components/VoipPopup/views/VoipErrorView.spec.tsx b/packages/ui-voip/src/components/VoipPopup/views/VoipErrorView.spec.tsx
index 426b284f5102..eba09a99f895 100644
--- a/packages/ui-voip/src/components/VoipPopup/views/VoipErrorView.spec.tsx
+++ b/packages/ui-voip/src/components/VoipPopup/views/VoipErrorView.spec.tsx
@@ -1,5 +1,6 @@
 import { mockAppRoot } from '@rocket.chat/mock-providers';
 import { render, screen, within } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 
 import { createMockFreeSwitchExtensionDetails, createMockVoipErrorSession } from '../../../tests/mocks';
 import VoipErrorView from './VoipErrorView';
@@ -26,11 +27,11 @@ it('should only enable error actions', () => {
 	expect(screen.getByRole('button', { name: 'End_call' })).toBeEnabled();
 });
 
-it('should properly interact with the voice call session', () => {
+it('should properly interact with the voice call session', async () => {
 	const errorSession = createMockVoipErrorSession({ error: { status: -1, reason: '' } });
 	render(<VoipErrorView session={errorSession} />, { wrapper: appRoot.build(), legacyRoot: true });
 
-	screen.getByRole('button', { name: 'End_call' }).click();
+	await userEvent.click(screen.getByRole('button', { name: 'End_call' }));
 	expect(errorSession.end).toHaveBeenCalled();
 });
 
@@ -39,7 +40,7 @@ it('should properly render unknown error calls', async () => {
 	render(<VoipErrorView session={session} />, { wrapper: appRoot.build(), legacyRoot: true });
 
 	expect(screen.getByText('Unable_to_complete_call')).toBeInTheDocument();
-	screen.getByRole('button', { name: 'End_call' }).click();
+	await userEvent.click(screen.getByRole('button', { name: 'End_call' }));
 	expect(session.end).toHaveBeenCalled();
 });
 
@@ -49,7 +50,7 @@ it('should properly render error for unavailable calls', async () => {
 
 	expect(screen.getByText('Temporarily_unavailable')).toBeInTheDocument();
 	expect(screen.getByRole('button', { name: 'End_call' })).toBeEnabled();
-	screen.getByRole('button', { name: 'End_call' }).click();
+	await userEvent.click(screen.getByRole('button', { name: 'End_call' }));
 	expect(session.end).toHaveBeenCalled();
 });
 
@@ -59,7 +60,7 @@ it('should properly render error for busy calls', async () => {
 
 	expect(screen.getByText('Caller_is_busy')).toBeInTheDocument();
 	expect(screen.getByRole('button', { name: 'End_call' })).toBeEnabled();
-	screen.getByRole('button', { name: 'End_call' }).click();
+	await userEvent.click(screen.getByRole('button', { name: 'End_call' }));
 	expect(session.end).toHaveBeenCalled();
 });
 
@@ -69,6 +70,6 @@ it('should properly render error for terminated calls', async () => {
 
 	expect(screen.getByText('Call_terminated')).toBeInTheDocument();
 	expect(screen.getByRole('button', { name: 'End_call' })).toBeEnabled();
-	screen.getByRole('button', { name: 'End_call' }).click();
+	await userEvent.click(screen.getByRole('button', { name: 'End_call' }));
 	expect(session.end).toHaveBeenCalled();
 });
diff --git a/packages/ui-voip/src/components/VoipPopup/views/VoipIncomingView.spec.tsx b/packages/ui-voip/src/components/VoipPopup/views/VoipIncomingView.spec.tsx
index 67e1bdc131f0..88f2f79da5aa 100644
--- a/packages/ui-voip/src/components/VoipPopup/views/VoipIncomingView.spec.tsx
+++ b/packages/ui-voip/src/components/VoipPopup/views/VoipIncomingView.spec.tsx
@@ -1,5 +1,6 @@
 import { mockAppRoot } from '@rocket.chat/mock-providers';
 import { render, screen, within } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 
 import { createMockFreeSwitchExtensionDetails, createMockVoipIncomingSession } from '../../../tests/mocks';
 import VoipIncomingView from './VoipIncomingView';
@@ -27,11 +28,11 @@ it('should only enable incoming actions', () => {
 	expect(screen.getByRole('button', { name: 'Accept' })).toBeEnabled();
 });
 
-it('should properly interact with the voice call session', () => {
+it('should properly interact with the voice call session', async () => {
 	render(<VoipIncomingView session={incomingSession} />, { wrapper: appRoot.build(), legacyRoot: true });
 
-	screen.getByRole('button', { name: 'Decline' }).click();
-	screen.getByRole('button', { name: 'Accept' }).click();
+	await userEvent.click(screen.getByRole('button', { name: 'Decline' }));
+	await userEvent.click(screen.getByRole('button', { name: 'Accept' }));
 
 	expect(incomingSession.end).toHaveBeenCalled();
 	expect(incomingSession.accept).toHaveBeenCalled();
diff --git a/packages/ui-voip/src/components/VoipPopup/views/VoipOngoingView.spec.tsx b/packages/ui-voip/src/components/VoipPopup/views/VoipOngoingView.spec.tsx
index 397e369d6bbb..d1d99f5fa0c7 100644
--- a/packages/ui-voip/src/components/VoipPopup/views/VoipOngoingView.spec.tsx
+++ b/packages/ui-voip/src/components/VoipPopup/views/VoipOngoingView.spec.tsx
@@ -1,5 +1,6 @@
 import { mockAppRoot } from '@rocket.chat/mock-providers';
 import { render, screen, within } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 
 import { createMockFreeSwitchExtensionDetails, createMockVoipOngoingSession } from '../../../tests/mocks';
 import VoipOngoingView from './VoipOngoingView';
@@ -8,65 +9,65 @@ const wrapper = mockAppRoot().withEndpoint('GET', '/v1/voip-freeswitch.extension
 
 const ongoingSession = createMockVoipOngoingSession();
 
-describe('VoipOngoingView', () => {
-	beforeEach(() => {
-		jest.useFakeTimers();
-	});
+const user = userEvent.setup({ advanceTimers: jest.advanceTimersByTime });
 
-	afterEach(() => {
-		jest.clearAllTimers();
-	});
+beforeEach(() => {
+	jest.useFakeTimers();
+});
+
+afterEach(() => {
+	jest.clearAllTimers();
+});
 
-	it('should properly render ongoing view', async () => {
-		render(<VoipOngoingView session={ongoingSession} />, { wrapper: wrapper.build(), legacyRoot: true });
+it('should properly render ongoing view', async () => {
+	render(<VoipOngoingView session={ongoingSession} />, { wrapper: wrapper.build(), legacyRoot: true });
 
-		expect(screen.getByText('00:00')).toBeInTheDocument();
-		expect(screen.getByRole('button', { name: /Device_settings/ })).toBeInTheDocument();
-		expect(await screen.findByText('Administrator')).toBeInTheDocument();
-		expect(screen.queryByText('On_Hold')).not.toBeInTheDocument();
-		expect(screen.queryByText('Muted')).not.toBeInTheDocument();
-	});
+	expect(screen.getByText('00:00')).toBeInTheDocument();
+	expect(screen.getByRole('button', { name: /Device_settings/ })).toBeInTheDocument();
+	expect(await screen.findByText('Administrator')).toBeInTheDocument();
+	expect(screen.queryByText('On_Hold')).not.toBeInTheDocument();
+	expect(screen.queryByText('Muted')).not.toBeInTheDocument();
+});
 
-	it('should display on hold and muted', () => {
-		ongoingSession.isMuted = true;
-		ongoingSession.isHeld = true;
+it('should display on hold and muted', () => {
+	ongoingSession.isMuted = true;
+	ongoingSession.isHeld = true;
 
-		render(<VoipOngoingView session={ongoingSession} />, { wrapper: wrapper.build(), legacyRoot: true });
+	render(<VoipOngoingView session={ongoingSession} />, { wrapper: wrapper.build(), legacyRoot: true });
 
-		expect(screen.getByText('On_Hold')).toBeInTheDocument();
-		expect(screen.getByText('Muted')).toBeInTheDocument();
+	expect(screen.getByText('On_Hold')).toBeInTheDocument();
+	expect(screen.getByText('Muted')).toBeInTheDocument();
 
-		ongoingSession.isMuted = false;
-		ongoingSession.isHeld = false;
-	});
+	ongoingSession.isMuted = false;
+	ongoingSession.isHeld = false;
+});
 
-	it('should only enable ongoing call actions', () => {
-		render(<VoipOngoingView session={ongoingSession} />, { wrapper: wrapper.build(), legacyRoot: true });
+it('should only enable ongoing call actions', () => {
+	render(<VoipOngoingView session={ongoingSession} />, { wrapper: wrapper.build(), legacyRoot: true });
 
-		expect(within(screen.getByTestId('vc-popup-footer')).queryAllByRole('button')).toHaveLength(5);
-		expect(screen.getByRole('button', { name: 'Turn_off_microphone' })).toBeEnabled();
-		expect(screen.getByRole('button', { name: 'Hold' })).toBeEnabled();
-		expect(screen.getByRole('button', { name: 'Open_Dialpad' })).toBeEnabled();
-		expect(screen.getByRole('button', { name: 'Transfer_call' })).toBeEnabled();
-		expect(screen.getByRole('button', { name: 'End_call' })).toBeEnabled();
-	});
+	expect(within(screen.getByTestId('vc-popup-footer')).queryAllByRole('button')).toHaveLength(5);
+	expect(screen.getByRole('button', { name: 'Turn_off_microphone' })).toBeEnabled();
+	expect(screen.getByRole('button', { name: 'Hold' })).toBeEnabled();
+	expect(screen.getByRole('button', { name: 'Open_Dialpad' })).toBeEnabled();
+	expect(screen.getByRole('button', { name: 'Transfer_call' })).toBeEnabled();
+	expect(screen.getByRole('button', { name: 'End_call' })).toBeEnabled();
+});
 
-	it('should properly interact with the voice call session', () => {
-		render(<VoipOngoingView session={ongoingSession} />, { wrapper: wrapper.build(), legacyRoot: true });
+it('should properly interact with the voice call session', async () => {
+	render(<VoipOngoingView session={ongoingSession} />, { wrapper: wrapper.build(), legacyRoot: true });
 
-		screen.getByRole('button', { name: 'Turn_off_microphone' }).click();
-		expect(ongoingSession.mute).toHaveBeenCalled();
+	await user.click(screen.getByRole('button', { name: 'Turn_off_microphone' }));
+	expect(ongoingSession.mute).toHaveBeenCalled();
 
-		screen.getByRole('button', { name: 'Hold' }).click();
-		expect(ongoingSession.hold).toHaveBeenCalled();
+	await user.click(screen.getByRole('button', { name: 'Hold' }));
+	expect(ongoingSession.hold).toHaveBeenCalled();
 
-		screen.getByRole('button', { name: 'Open_Dialpad' }).click();
-		screen.getByTestId('dial-pad-button-1').click();
-		expect(screen.getByRole('textbox', { name: 'Phone_number' })).toHaveValue('1');
-		expect(ongoingSession.dtmf).toHaveBeenCalledWith('1');
+	await user.click(screen.getByRole('button', { name: 'Open_Dialpad' }));
+	await user.click(screen.getByTestId('dial-pad-button-1'));
+	expect(screen.getByRole('textbox', { name: 'Phone_number' })).toHaveValue('1');
+	expect(ongoingSession.dtmf).toHaveBeenCalledWith('1');
 
-		expect(screen.getByRole('button', { name: 'End_call' })).toBeEnabled();
-		screen.getByRole('button', { name: 'End_call' }).click();
-		expect(ongoingSession.end).toHaveBeenCalled();
-	});
+	expect(screen.getByRole('button', { name: 'End_call' })).toBeEnabled();
+	await user.click(screen.getByRole('button', { name: 'End_call' }));
+	expect(ongoingSession.end).toHaveBeenCalled();
 });
diff --git a/packages/ui-voip/src/components/VoipPopup/views/VoipOutgoingView.spec.tsx b/packages/ui-voip/src/components/VoipPopup/views/VoipOutgoingView.spec.tsx
index 2f5f3b5840f4..e733bb324c22 100644
--- a/packages/ui-voip/src/components/VoipPopup/views/VoipOutgoingView.spec.tsx
+++ b/packages/ui-voip/src/components/VoipPopup/views/VoipOutgoingView.spec.tsx
@@ -1,5 +1,6 @@
 import { mockAppRoot } from '@rocket.chat/mock-providers';
 import { render, screen, within } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 
 import { createMockFreeSwitchExtensionDetails, createMockVoipOutgoingSession } from '../../../tests/mocks';
 import VoipOutgoingView from './VoipOutgoingView';
@@ -27,9 +28,9 @@ it('should only enable outgoing actions', () => {
 	expect(screen.getByRole('button', { name: 'End_call' })).toBeEnabled();
 });
 
-it('should properly interact with the voice call session', () => {
+it('should properly interact with the voice call session', async () => {
 	render(<VoipOutgoingView session={outgoingSession} />, { wrapper: wrapper.build(), legacyRoot: true });
 
-	screen.getByRole('button', { name: 'End_call' }).click();
+	await userEvent.click(screen.getByRole('button', { name: 'End_call' }));
 	expect(outgoingSession.end).toHaveBeenCalled();
 });
diff --git a/packages/ui-voip/src/components/VoipTimer/VoipTimer.spec.tsx b/packages/ui-voip/src/components/VoipTimer/VoipTimer.spec.tsx
index 7121a0f1176e..f57338b5bb32 100644
--- a/packages/ui-voip/src/components/VoipTimer/VoipTimer.spec.tsx
+++ b/packages/ui-voip/src/components/VoipTimer/VoipTimer.spec.tsx
@@ -3,38 +3,34 @@ import { act, render, screen } from '@testing-library/react';
 
 import VoipTimer from './VoipTimer';
 
-const appRoot = mockAppRoot();
-
-describe('VoipTimer', () => {
-	beforeEach(() => {
-		jest.useFakeTimers();
-	});
+beforeEach(() => {
+	jest.useFakeTimers();
+});
 
-	afterEach(() => {
-		jest.clearAllTimers();
-	});
+afterEach(() => {
+	jest.clearAllTimers();
+});
 
-	it('should display the initial time correctly', () => {
-		render(<VoipTimer />, { wrapper: appRoot.build(), legacyRoot: true });
+it('should display the initial time correctly', () => {
+	render(<VoipTimer />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
-		expect(screen.getByText('00:00')).toBeInTheDocument();
-	});
-
-	it('should update the time after a few seconds', () => {
-		render(<VoipTimer />, { wrapper: appRoot.build(), legacyRoot: true });
+	expect(screen.getByText('00:00')).toBeInTheDocument();
+});
 
-		act(() => {
-			jest.advanceTimersByTime(5000);
-		});
+it('should update the time after a few seconds', () => {
+	render(<VoipTimer />, { wrapper: mockAppRoot().build(), legacyRoot: true });
 
-		expect(screen.getByText('00:05')).toBeInTheDocument();
+	act(() => {
+		jest.advanceTimersByTime(5000);
 	});
 
-	it('should start with a minute on the timer', () => {
-		const startTime = new Date();
-		startTime.setMinutes(startTime.getMinutes() - 1);
-		render(<VoipTimer startAt={startTime} />, { wrapper: appRoot.build(), legacyRoot: true });
+	expect(screen.getByText('00:05')).toBeInTheDocument();
+});
 
-		expect(screen.getByText('01:00')).toBeInTheDocument();
-	});
+it('should start with a minute on the timer', () => {
+	const startTime = new Date();
+	startTime.setMinutes(startTime.getMinutes() - 1);
+	render(<VoipTimer startAt={startTime} />, { wrapper: mockAppRoot().build(), legacyRoot: true });
+
+	expect(screen.getByText('01:00')).toBeInTheDocument();
 });
diff --git a/packages/ui-voip/src/components/VoipTransferModal/VoipTransferModal.spec.tsx b/packages/ui-voip/src/components/VoipTransferModal/VoipTransferModal.spec.tsx
index ddec476bcf77..f51ca43da639 100644
--- a/packages/ui-voip/src/components/VoipTransferModal/VoipTransferModal.spec.tsx
+++ b/packages/ui-voip/src/components/VoipTransferModal/VoipTransferModal.spec.tsx
@@ -2,7 +2,7 @@ import { mockAppRoot } from '@rocket.chat/mock-providers';
 import { act, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
-import VoipTransferModal from '.';
+import VoipTransferModal from './VoipTransferModal';
 
 it('should be able to select transfer target', async () => {
 	const confirmFn = jest.fn();
@@ -57,19 +57,19 @@ it('should be able to select transfer target', async () => {
 
 	expect(hangUpAnTransferButton).toBeDisabled();
 
-	screen.getByLabelText('Transfer_to').focus();
 	await act(async () => {
+		await userEvent.type(screen.getByRole('textbox', { name: 'Transfer_to' }), 'Jane Doe');
 		const userOption = await screen.findByRole('option', { name: 'Jane Doe' });
 		await userEvent.click(userOption);
 	});
 
 	expect(hangUpAnTransferButton).toBeEnabled();
-	hangUpAnTransferButton.click();
+	await userEvent.click(hangUpAnTransferButton);
 
 	expect(confirmFn).toHaveBeenCalledWith({ extension: '1011', name: 'Jane Doe' });
 });
 
-it('should call onCancel when Cancel is clicked', () => {
+it('should call onCancel when Cancel is clicked', async () => {
 	const confirmFn = jest.fn();
 	const cancelFn = jest.fn();
 	render(<VoipTransferModal extension='1000' onConfirm={confirmFn} onCancel={cancelFn} />, {
@@ -77,12 +77,12 @@ it('should call onCancel when Cancel is clicked', () => {
 		legacyRoot: true,
 	});
 
-	screen.getByText('Cancel').click();
+	await userEvent.click(screen.getByRole('button', { name: 'Cancel' }));
 
 	expect(cancelFn).toHaveBeenCalled();
 });
 
-it('should call onCancel when X is clicked', () => {
+it('should call onCancel when X is clicked', async () => {
 	const confirmFn = jest.fn();
 	const cancelFn = jest.fn();
 	render(<VoipTransferModal extension='1000' onConfirm={confirmFn} onCancel={cancelFn} />, {
@@ -90,7 +90,7 @@ it('should call onCancel when X is clicked', () => {
 		legacyRoot: true,
 	});
 
-	screen.getByLabelText('Close').click();
+	await userEvent.click(screen.getByRole('button', { name: 'Close' }));
 
 	expect(cancelFn).toHaveBeenCalled();
 });
diff --git a/packages/ui-voip/src/hooks/useVoipClient.tsx b/packages/ui-voip/src/hooks/useVoipClient.tsx
index 26c3c50427ba..f42877de3e9b 100644
--- a/packages/ui-voip/src/hooks/useVoipClient.tsx
+++ b/packages/ui-voip/src/hooks/useVoipClient.tsx
@@ -17,7 +17,7 @@ type VoipClientResult = {
 
 export const useVoipClient = ({ enabled = true, autoRegister = true }: VoipClientParams = {}): VoipClientResult => {
 	const { _id: userId } = useUser() || {};
-	const isVoipEnabled = useSetting<boolean>('VoIP_TeamCollab_Enabled');
+	const isVoipEnabled = useSetting('VoIP_TeamCollab_Enabled', false);
 	const voipClientRef = useRef<VoipClient | null>(null);
 
 	const getRegistrationInfo = useEndpoint('GET', '/v1/voip-freeswitch.extension.getRegistrationInfoByUserId');
diff --git a/packages/ui-voip/src/hooks/useVoipEffect.tsx b/packages/ui-voip/src/hooks/useVoipEffect.tsx
index e412959ff923..b7c67672fc92 100644
--- a/packages/ui-voip/src/hooks/useVoipEffect.tsx
+++ b/packages/ui-voip/src/hooks/useVoipEffect.tsx
@@ -1,4 +1,4 @@
-import { useContext, useMemo, useRef } from 'react';
+import { useCallback, useContext, useRef } from 'react';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
 
 import { VoipContext } from '../contexts/VoipContext';
@@ -6,25 +6,23 @@ import type VoIPClient from '../lib/VoipClient';
 
 export const useVoipEffect = <T,>(transform: (voipClient: VoIPClient) => T, initialValue: T) => {
 	const { voipClient } = useContext(VoipContext);
-	const initValue = useRef<T>(initialValue);
+	const stateRef = useRef<T>(initialValue);
 	const transformFn = useRef(transform);
 
-	const [subscribe, getSnapshot] = useMemo(() => {
-		let state: T = initValue.current;
+	const getSnapshot = useCallback(() => stateRef.current, []);
 
-		const getSnapshot = (): T => state;
-		const subscribe = (cb: () => void) => {
+	const subscribe = useCallback(
+		(cb: () => void) => {
 			if (!voipClient) return () => undefined;
 
-			state = transformFn.current(voipClient);
+			stateRef.current = transformFn.current(voipClient);
 			return voipClient.on('stateChanged', (): void => {
-				state = transformFn.current(voipClient);
+				stateRef.current = transformFn.current(voipClient);
 				cb();
 			});
-		};
-
-		return [subscribe, getSnapshot];
-	}, [voipClient]);
+		},
+		[voipClient],
+	);
 
 	return useSyncExternalStore(subscribe, getSnapshot);
 };
diff --git a/packages/ui-voip/src/hooks/useVoipSounds.ts b/packages/ui-voip/src/hooks/useVoipSounds.ts
index 5ba847cae8d2..f08ff00e3da5 100644
--- a/packages/ui-voip/src/hooks/useVoipSounds.ts
+++ b/packages/ui-voip/src/hooks/useVoipSounds.ts
@@ -5,7 +5,9 @@ type VoipSound = 'telephone' | 'outbound-call-ringing' | 'call-ended';
 
 export const useVoipSounds = () => {
 	const { play, pause } = useCustomSound();
-	const audioVolume = useUserPreference<number>('notificationsSoundVolume', 100) || 100;
+	const masterVolume = useUserPreference<number>('masterVolume', 100) || 100;
+	const voipRingerVolume = useUserPreference<number>('voipRingerVolume', 100) || 100;
+	const audioVolume = Math.floor((voipRingerVolume * masterVolume) / 100);
 
 	return useMemo(
 		() => ({
diff --git a/packages/ui-voip/src/providers/VoipProvider.tsx b/packages/ui-voip/src/providers/VoipProvider.tsx
index d723c4b5ceb6..6fcd3f0341d4 100644
--- a/packages/ui-voip/src/providers/VoipProvider.tsx
+++ b/packages/ui-voip/src/providers/VoipProvider.tsx
@@ -21,7 +21,7 @@ import { useVoipSounds } from '../hooks/useVoipSounds';
 
 const VoipProvider = ({ children }: { children: ReactNode }) => {
 	// Settings
-	const isVoipSettingEnabled = useSetting<boolean>('VoIP_TeamCollab_Enabled') || false;
+	const isVoipSettingEnabled = useSetting('VoIP_TeamCollab_Enabled', false);
 	const canViewVoipRegistrationInfo = usePermission('view-user-voip-extension');
 	const isVoipEnabled = isVoipSettingEnabled && canViewVoipRegistrationInfo;
 
diff --git a/packages/web-ui-registration/CHANGELOG.md b/packages/web-ui-registration/CHANGELOG.md
index d2f939681e00..ae188c817a85 100644
--- a/packages/web-ui-registration/CHANGELOG.md
+++ b/packages/web-ui-registration/CHANGELOG.md
@@ -1,5 +1,41 @@
 # @rocket.chat/web-ui-registration
 
+## 13.0.0-rc.3
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@13.0.0-rc.3
+  </details>
+
+## 13.0.0-rc.2
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@13.0.0-rc.2
+  </details>
+
+## 13.0.0-rc.1
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@13.0.0-rc.1
+  </details>
+
+## 13.0.0-rc.0
+
+### Patch Changes
+
+- <details><summary>Updated dependencies []:</summary>
+
+  - @rocket.chat/ui-contexts@13.0.0-rc.0
+  </details>
+
 ## 12.0.0
 
 ### Patch Changes
diff --git a/packages/web-ui-registration/package.json b/packages/web-ui-registration/package.json
index a1eda93896dd..cdd86f0c08dc 100644
--- a/packages/web-ui-registration/package.json
+++ b/packages/web-ui-registration/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@rocket.chat/web-ui-registration",
-	"version": "12.0.0",
+	"version": "13.0.0-rc.3",
 	"private": true,
 	"homepage": "https://rocket.chat",
 	"main": "./dist/index.js",
@@ -17,39 +17,39 @@
 		"typecheck": "tsc --noEmit"
 	},
 	"devDependencies": {
-		"@babel/core": "~7.25.8",
-		"@babel/preset-env": "~7.25.8",
-		"@babel/preset-react": "~7.25.7",
-		"@babel/preset-typescript": "~7.25.7",
+		"@babel/core": "~7.26.0",
+		"@babel/preset-env": "~7.26.0",
+		"@babel/preset-react": "~7.25.9",
+		"@babel/preset-typescript": "~7.26.0",
 		"@rocket.chat/i18n": "workspace:~",
 		"@rocket.chat/layout": "~0.31.27",
 		"@rocket.chat/mock-providers": "workspace:~",
 		"@rocket.chat/tools": "workspace:~",
 		"@rocket.chat/ui-client": "workspace:^",
 		"@rocket.chat/ui-contexts": "workspace:^",
-		"@storybook/addon-actions": "^8.3.5",
-		"@storybook/addon-docs": "^8.3.5",
-		"@storybook/addon-essentials": "^8.3.5",
+		"@storybook/addon-actions": "^8.4.4",
+		"@storybook/addon-docs": "^8.4.4",
+		"@storybook/addon-essentials": "^8.4.4",
 		"@storybook/addon-webpack5-compiler-babel": "^3.0.3",
-		"@storybook/react": "^8.3.5",
-		"@storybook/react-webpack5": "^8.3.5",
-		"@storybook/theming": "^8.3.5",
-		"@tanstack/react-query": "^4.16.1",
+		"@storybook/react": "^8.4.4",
+		"@storybook/react-webpack5": "^8.4.4",
+		"@storybook/theming": "^8.4.4",
+		"@tanstack/react-query": "^4.36.1",
 		"@testing-library/react": "~16.0.1",
 		"@types/react": "~17.0.80",
-		"babel-loader": "~8.3.0",
+		"babel-loader": "~9.2.1",
 		"eslint": "~8.45.0",
 		"react": "~17.0.2",
 		"react-hook-form": "~7.45.4",
 		"react-i18next": "~13.2.2",
-		"storybook": "^8.3.5",
+		"storybook": "^8.4.4",
 		"storybook-dark-mode": "^4.0.2",
 		"typescript": "~5.6.3"
 	},
 	"peerDependencies": {
 		"@rocket.chat/layout": "*",
 		"@rocket.chat/tools": "0.2.2",
-		"@rocket.chat/ui-contexts": "12.0.0",
+		"@rocket.chat/ui-contexts": "13.0.0-rc.3",
 		"@tanstack/react-query": "*",
 		"react": "*",
 		"react-hook-form": "*",
diff --git a/packages/web-ui-registration/src/CMSPage.tsx b/packages/web-ui-registration/src/CMSPage.tsx
index b7a281ba5471..1ab64126b5b9 100644
--- a/packages/web-ui-registration/src/CMSPage.tsx
+++ b/packages/web-ui-registration/src/CMSPage.tsx
@@ -11,7 +11,7 @@ type CMSPageProps = {
 
 const CMSPage = ({ page }: CMSPageProps): ReactElement => {
 	const t = useTranslation();
-	const pageContent = useSetting(page) as string;
+	const pageContent = useSetting(page, '');
 
 	const customLogo = useAssetWithDarkModePath('logo');
 	const customBackground = useAssetWithDarkModePath('background');
diff --git a/packages/web-ui-registration/src/LoginForm.tsx b/packages/web-ui-registration/src/LoginForm.tsx
index 6e28a443be63..62e757db33c8 100644
--- a/packages/web-ui-registration/src/LoginForm.tsx
+++ b/packages/web-ui-registration/src/LoginForm.tsx
@@ -75,12 +75,12 @@ export const LoginForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRoute
 	const { t } = useTranslation();
 	const formLabelId = useUniqueId();
 	const [errorOnSubmit, setErrorOnSubmit] = useState<LoginErrorState>(undefined);
-	const isResetPasswordAllowed = useSetting('Accounts_PasswordReset');
+	const isResetPasswordAllowed = useSetting('Accounts_PasswordReset', true);
 	const login = useLoginWithPassword();
-	const showFormLogin = useSetting('Accounts_ShowFormLogin');
+	const showFormLogin = useSetting('Accounts_ShowFormLogin', true);
 
-	const usernameOrEmailPlaceholder = String(useSetting('Accounts_EmailOrUsernamePlaceholder'));
-	const passwordPlaceholder = String(useSetting('Accounts_PasswordPlaceholder'));
+	const usernameOrEmailPlaceholder = useSetting('Accounts_EmailOrUsernamePlaceholder', '');
+	const passwordPlaceholder = useSetting('Accounts_PasswordPlaceholder', '');
 
 	useDocumentTitle(t('registration.component.login'), false);
 
diff --git a/packages/web-ui-registration/src/LoginServicesButton.tsx b/packages/web-ui-registration/src/LoginServicesButton.tsx
index ba16d360d9c1..7eb22ad5dbfc 100644
--- a/packages/web-ui-registration/src/LoginServicesButton.tsx
+++ b/packages/web-ui-registration/src/LoginServicesButton.tsx
@@ -1,9 +1,10 @@
 import { Button } from '@rocket.chat/fuselage';
 import type { Keys as IconName } from '@rocket.chat/icons';
 import type { LoginService } from '@rocket.chat/ui-contexts';
-import { useLoginWithService, useTranslation } from '@rocket.chat/ui-contexts';
+import { useLoginWithService } from '@rocket.chat/ui-contexts';
 import type { ReactElement, SetStateAction, Dispatch } from 'react';
 import { useCallback } from 'react';
+import { useTranslation } from 'react-i18next';
 
 import type { LoginErrorState, LoginErrors } from './LoginForm';
 
@@ -23,7 +24,7 @@ const LoginServicesButton = <T extends LoginService>({
 	disabled?: boolean;
 	setError?: Dispatch<SetStateAction<LoginErrorState>>;
 }): ReactElement => {
-	const t = useTranslation();
+	const { t } = useTranslation();
 	const handler = useLoginWithService({ service, buttonLabelText, ...props });
 
 	const handleOnClick = useCallback(() => {
diff --git a/packages/web-ui-registration/src/RegisterForm.tsx b/packages/web-ui-registration/src/RegisterForm.tsx
index ce7cb700d5c6..75ef78db204a 100644
--- a/packages/web-ui-registration/src/RegisterForm.tsx
+++ b/packages/web-ui-registration/src/RegisterForm.tsx
@@ -37,13 +37,13 @@ type LoginRegisterPayload = {
 export const RegisterForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRouter }): ReactElement => {
 	const { t } = useTranslation();
 
-	const requireNameForRegister = Boolean(useSetting('Accounts_RequireNameForSignUp'));
-	const requiresPasswordConfirmation = useSetting('Accounts_RequirePasswordConfirmation');
-	const manuallyApproveNewUsersRequired = useSetting('Accounts_ManuallyApproveNewUsers');
+	const requireNameForRegister = useSetting('Accounts_RequireNameForSignUp', true);
+	const requiresPasswordConfirmation = useSetting('Accounts_RequirePasswordConfirmation', true);
+	const manuallyApproveNewUsersRequired = useSetting('Accounts_ManuallyApproveNewUsers', false);
 
-	const usernameOrEmailPlaceholder = String(useSetting('Accounts_EmailOrUsernamePlaceholder'));
-	const passwordPlaceholder = String(useSetting('Accounts_PasswordPlaceholder'));
-	const passwordConfirmationPlaceholder = String(useSetting('Accounts_ConfirmPasswordPlaceholder'));
+	const usernameOrEmailPlaceholder = useSetting('Accounts_EmailOrUsernamePlaceholder', '');
+	const passwordPlaceholder = useSetting('Accounts_PasswordPlaceholder', '');
+	const passwordConfirmationPlaceholder = useSetting('Accounts_ConfirmPasswordPlaceholder', '');
 
 	const formLabelId = useUniqueId();
 	const passwordVerifierId = useUniqueId();
diff --git a/packages/web-ui-registration/src/RegisterFormDisabled.tsx b/packages/web-ui-registration/src/RegisterFormDisabled.tsx
index 4fecdb3f411e..207783c16679 100644
--- a/packages/web-ui-registration/src/RegisterFormDisabled.tsx
+++ b/packages/web-ui-registration/src/RegisterFormDisabled.tsx
@@ -7,7 +7,7 @@ import { Trans, useTranslation } from 'react-i18next';
 import type { DispatchLoginRouter } from './hooks/useLoginRouter';
 
 export const RegisterFormDisabled = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRouter }): ReactElement => {
-	const linkReplacementText = String(useSetting('Accounts_RegistrationForm_LinkReplacementText'));
+	const linkReplacementText = useSetting('Accounts_RegistrationForm_LinkReplacementText', '');
 
 	const { t } = useTranslation();
 
diff --git a/packages/web-ui-registration/src/RegisterSecretPageRouter.tsx b/packages/web-ui-registration/src/RegisterSecretPageRouter.tsx
index 08cf481061f9..10fea62243e6 100644
--- a/packages/web-ui-registration/src/RegisterSecretPageRouter.tsx
+++ b/packages/web-ui-registration/src/RegisterSecretPageRouter.tsx
@@ -19,7 +19,7 @@ export const RegisterSecretPageRouter = ({
 	origin: 'register' | 'secret-register' | 'invite-register';
 }): ReactElement => {
 	const { t } = useTranslation();
-	const registrationMode = useSetting<string>('Accounts_RegistrationForm');
+	const registrationMode = useSetting<'Public' | 'Disabled' | 'Secret URL'>('Accounts_RegistrationForm', 'Public');
 
 	const isPublicRegistration = registrationMode === 'Public';
 	const isRegistrationAllowedForSecret = registrationMode === 'Secret URL';
diff --git a/packages/web-ui-registration/src/RegisterTemplate.tsx b/packages/web-ui-registration/src/RegisterTemplate.tsx
index 9b50c176cef2..9c392d04fbcf 100644
--- a/packages/web-ui-registration/src/RegisterTemplate.tsx
+++ b/packages/web-ui-registration/src/RegisterTemplate.tsx
@@ -5,7 +5,7 @@ import HorizontalTemplate from './template/HorizontalTemplate';
 import VerticalTemplate from './template/VerticalTemplate';
 
 const RegisterTemplate = ({ children, ...props }: AllHTMLAttributes<HTMLElement>) => {
-	const template = useSetting<'vertical-template' | 'horizontal-template'>('Layout_Login_Template');
+	const template = useSetting<'vertical-template' | 'horizontal-template'>('Layout_Login_Template', 'horizontal-template');
 
 	return (
 		<main>
diff --git a/packages/web-ui-registration/src/ResetPassword/ResetPasswordPage.tsx b/packages/web-ui-registration/src/ResetPassword/ResetPasswordPage.tsx
index daf66606f98f..35c463187460 100644
--- a/packages/web-ui-registration/src/ResetPassword/ResetPasswordPage.tsx
+++ b/packages/web-ui-registration/src/ResetPassword/ResetPasswordPage.tsx
@@ -29,9 +29,9 @@ const ResetPasswordPage = (): ReactElement => {
 	const passwordVerifierId = useUniqueId();
 	const formLabelId = useUniqueId();
 
-	const requiresPasswordConfirmation = useSetting('Accounts_RequirePasswordConfirmation');
-	const passwordPlaceholder = String(useSetting('Accounts_PasswordPlaceholder'));
-	const passwordConfirmationPlaceholder = String(useSetting('Accounts_ConfirmPasswordPlaceholder'));
+	const requiresPasswordConfirmation = useSetting('Accounts_RequirePasswordConfirmation', true);
+	const passwordPlaceholder = useSetting('Accounts_PasswordPlaceholder', '');
+	const passwordConfirmationPlaceholder = useSetting('Accounts_ConfirmPasswordPlaceholder', '');
 
 	const router = useRouter();
 
diff --git a/packages/web-ui-registration/src/components/LoginPoweredBy.tsx b/packages/web-ui-registration/src/components/LoginPoweredBy.tsx
index dd21d8c17a11..19d4ca0a7be5 100644
--- a/packages/web-ui-registration/src/components/LoginPoweredBy.tsx
+++ b/packages/web-ui-registration/src/components/LoginPoweredBy.tsx
@@ -5,7 +5,7 @@ import type { ReactElement } from 'react';
 import { Trans } from 'react-i18next';
 
 export const LoginPoweredBy = (): ReactElement | null => {
-	const hidePoweredBy = useSetting<boolean>('Layout_Login_Hide_Powered_By');
+	const hidePoweredBy = useSetting('Layout_Login_Hide_Powered_By', false);
 	if (hidePoweredBy) {
 		return null;
 	}
diff --git a/packages/web-ui-registration/src/components/LoginSwitchLanguageFooter.tsx b/packages/web-ui-registration/src/components/LoginSwitchLanguageFooter.tsx
index 46ce5112b9d4..a65f04190d91 100644
--- a/packages/web-ui-registration/src/components/LoginSwitchLanguageFooter.tsx
+++ b/packages/web-ui-registration/src/components/LoginSwitchLanguageFooter.tsx
@@ -13,7 +13,7 @@ const useSuggestedLanguages = ({
 }) => {
 	const availableLanguages = useLanguages();
 	const currentLanguage = useLanguage();
-	const serverLanguage = normalizeLanguage(useSetting<string>('Language') || 'en');
+	const serverLanguage = normalizeLanguage(useSetting('Language', 'en'));
 
 	const suggestions = useMemo(() => {
 		const potentialLanguages = new Set([serverLanguage, browserLanguage, 'en'].map(normalizeLanguage));
diff --git a/packages/web-ui-registration/src/components/LoginTerms.tsx b/packages/web-ui-registration/src/components/LoginTerms.tsx
index b022bc69ec9a..67dc916fec2d 100644
--- a/packages/web-ui-registration/src/components/LoginTerms.tsx
+++ b/packages/web-ui-registration/src/components/LoginTerms.tsx
@@ -6,7 +6,7 @@ import { useTranslation } from 'react-i18next';
 
 export const LoginTerms = (): ReactElement => {
 	const { t } = useTranslation();
-	const loginTerms = useSetting('Layout_Login_Terms') as string;
+	const loginTerms = useSetting('Layout_Login_Terms', '');
 
 	return (
 		<HorizontalWizardLayoutCaption>
diff --git a/packages/web-ui-registration/src/components/RegisterTitle.tsx b/packages/web-ui-registration/src/components/RegisterTitle.tsx
index 2a8dea17206c..9ee3eb2c20ec 100644
--- a/packages/web-ui-registration/src/components/RegisterTitle.tsx
+++ b/packages/web-ui-registration/src/components/RegisterTitle.tsx
@@ -3,8 +3,8 @@ import type { ReactElement } from 'react';
 import { Trans } from 'react-i18next';
 
 export const RegisterTitle = (): ReactElement | null => {
-	const siteName = useSetting<string>('Site_Name');
-	const hideTitle = useSetting<boolean>('Layout_Login_Hide_Title');
+	const siteName = useSetting('Site_Name', 'Rocket.Chat');
+	const hideTitle = useSetting('Layout_Login_Hide_Title', false);
 
 	if (hideTitle) {
 		return null;
diff --git a/packages/web-ui-registration/src/hooks/useAssetPath.ts b/packages/web-ui-registration/src/hooks/useAssetPath.ts
deleted file mode 100644
index 193803764d76..000000000000
--- a/packages/web-ui-registration/src/hooks/useAssetPath.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { useAbsoluteUrl, useSetting } from '@rocket.chat/ui-contexts';
-
-type Asset = { url?: string; defaultUrl?: string };
-
-export const useAssetPath = (assetId: string): string | undefined => {
-	const asset = useSetting(assetId) as Asset | undefined;
-	const absoluteUrl = useAbsoluteUrl();
-
-	const url = (asset?.url ?? asset?.defaultUrl) && absoluteUrl(asset?.url ?? asset?.defaultUrl ?? '');
-
-	return url;
-};
diff --git a/packages/web-ui-registration/src/template/HorizontalTemplate.tsx b/packages/web-ui-registration/src/template/HorizontalTemplate.tsx
index 6fd11618746f..007f92854f38 100644
--- a/packages/web-ui-registration/src/template/HorizontalTemplate.tsx
+++ b/packages/web-ui-registration/src/template/HorizontalTemplate.tsx
@@ -15,7 +15,7 @@ import LoginTerms from '../components/LoginTerms';
 import { RegisterTitle } from '../components/RegisterTitle';
 
 const HorizontalTemplate = ({ children }: { children: ReactNode }): ReactElement => {
-	const hideLogo = useSetting<boolean>('Layout_Login_Hide_Logo');
+	const hideLogo = useSetting('Layout_Login_Hide_Logo', false);
 	const customLogo = useAssetWithDarkModePath('logo');
 	const customBackground = useAssetWithDarkModePath('background');
 
diff --git a/packages/web-ui-registration/src/template/VerticalTemplate.tsx b/packages/web-ui-registration/src/template/VerticalTemplate.tsx
index 981d1e6e7064..037f9d30351d 100644
--- a/packages/web-ui-registration/src/template/VerticalTemplate.tsx
+++ b/packages/web-ui-registration/src/template/VerticalTemplate.tsx
@@ -9,7 +9,7 @@ import LoginTerms from '../components/LoginTerms';
 import { RegisterTitle } from '../components/RegisterTitle';
 
 const VerticalTemplate = ({ children }: { children: ReactNode }): ReactElement => {
-	const hideLogo = useSetting<boolean>('Layout_Login_Hide_Logo');
+	const hideLogo = useSetting('Layout_Login_Hide_Logo', false);
 	const customLogo = useAssetWithDarkModePath('logo');
 	const customBackground = useAssetWithDarkModePath('background');
 
diff --git a/yarn.lock b/yarn.lock
index f8bb307d4db5..354d4728a1ad 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12,13 +12,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@actions/core@npm:^1.10.1":
-  version: 1.10.1
-  resolution: "@actions/core@npm:1.10.1"
+"@actions/core@npm:^1.11.1":
+  version: 1.11.1
+  resolution: "@actions/core@npm:1.11.1"
   dependencies:
+    "@actions/exec": "npm:^1.1.1"
     "@actions/http-client": "npm:^2.0.1"
-    uuid: "npm:^8.3.2"
-  checksum: 10/d32af783ecb07f25a0f190112ee8e749a4c4cb88327d6df756ea1dcee146ab413c0e651a9c949294f8202ced1436c049d7b469485431a5cc4491d66926ec8323
+  checksum: 10/94f260e33607cc16567ce4c88014f069cd7da92baaa443b72cff80fdf4f1dcd18192e135df0d51ec29e8b82cfe214218715d482f2a7804efa5095737d1245f38
   languageName: node
   linkType: hard
 
@@ -31,15 +31,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@actions/github@npm:^5.1.1":
-  version: 5.1.1
-  resolution: "@actions/github@npm:5.1.1"
+"@actions/github@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "@actions/github@npm:6.0.0"
   dependencies:
-    "@actions/http-client": "npm:^2.0.1"
-    "@octokit/core": "npm:^3.6.0"
-    "@octokit/plugin-paginate-rest": "npm:^2.17.0"
-    "@octokit/plugin-rest-endpoint-methods": "npm:^5.13.0"
-  checksum: 10/2210bd7f8e1e8b407b7df74a259523dc4c63f4ad3a6bfcc0d7867b6e9c3499bd3e25d7de7a9a1bbd0de3be441a8832d5c0b5c0cff3036cd477378c0ec5502434
+    "@actions/http-client": "npm:^2.2.0"
+    "@octokit/core": "npm:^5.0.1"
+    "@octokit/plugin-paginate-rest": "npm:^9.0.0"
+    "@octokit/plugin-rest-endpoint-methods": "npm:^10.0.0"
+  checksum: 10/81831a78377175d8825fc0b94247ff366c0e87ad1dfa48df9b30b8659506f216dcf1e2d3124fcd318839b92c24ba20165e238b3cc11a34db89c69c40825e9ccf
   languageName: node
   linkType: hard
 
@@ -52,6 +52,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@actions/http-client@npm:^2.2.0":
+  version: 2.2.3
+  resolution: "@actions/http-client@npm:2.2.3"
+  dependencies:
+    tunnel: "npm:^0.0.6"
+    undici: "npm:^5.25.4"
+  checksum: 10/0c0a540c79e50f795d214f696710bb9c50bdf5bb1458be288140f2aae3686adec73fdb464c43da5ef94f985ac7736273efef21cb5ba5a3b09e85b403d852c04b
+  languageName: node
+  linkType: hard
+
 "@actions/io@npm:^1.0.1":
   version: 1.1.3
   resolution: "@actions/io@npm:1.1.3"
@@ -955,14 +965,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@axe-core/playwright@npm:^4.7.3":
-  version: 4.7.3
-  resolution: "@axe-core/playwright@npm:4.7.3"
+"@axe-core/playwright@npm:^4.10.1":
+  version: 4.10.1
+  resolution: "@axe-core/playwright@npm:4.10.1"
   dependencies:
-    axe-core: "npm:^4.7.0"
+    axe-core: "npm:~4.10.2"
   peerDependencies:
     playwright-core: ">= 1.0.0"
-  checksum: 10/d48d0c2993147f537d42683721d0062e5d929d0e8968794156e937dbe002b5b7a5418a806e4af551e0a4b5e1a884c814bee09a108881b97dcbfd1eadc6801fd2
+  checksum: 10/842dde90a43157938235db8699816fc910f8f2bd737f1daa6ef96e4e407153394ae42dfde71add501161c87f25539b861f2f1aeee2e7a6e5f905cde4e6a10952
   languageName: node
   linkType: hard
 
@@ -996,6 +1006,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/code-frame@npm:^7.25.9, @babel/code-frame@npm:^7.26.0":
+  version: 7.26.0
+  resolution: "@babel/code-frame@npm:7.26.0"
+  dependencies:
+    "@babel/helper-validator-identifier": "npm:^7.25.9"
+    js-tokens: "npm:^4.0.0"
+    picocolors: "npm:^1.0.0"
+  checksum: 10/41deb0a9ac72d81e46aeab7e587a75e46c7af6a717e10b150a150b332e843807eacb7c856832c84bee2c5015fe31de23e04c18e052c83a1254027c71c0840791
+  languageName: node
+  linkType: hard
+
 "@babel/compat-data@npm:^7.22.6":
   version: 7.23.5
   resolution: "@babel/compat-data@npm:7.23.5"
@@ -1003,14 +1024,44 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/compat-data@npm:^7.25.7, @babel/compat-data@npm:^7.25.8":
+"@babel/compat-data@npm:^7.25.7":
   version: 7.25.8
   resolution: "@babel/compat-data@npm:7.25.8"
   checksum: 10/269fcb0d89e02e36c8a11e0c1b960a6b4204e88f59f20c374d28f8e318f4cd5ded42dfedc4b54162065e6a10f71c0de651f5ed3f9b45d3a4b52240196df85726
   languageName: node
   linkType: hard
 
-"@babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.21.4, @babel/core@npm:^7.7.5":
+"@babel/compat-data@npm:^7.25.9, @babel/compat-data@npm:^7.26.0":
+  version: 7.26.0
+  resolution: "@babel/compat-data@npm:7.26.0"
+  checksum: 10/e847d58222eb567da4bcc2c8e4e44b508d1a34626922858fe12edeb73b5f3c486e7e77a351725b4347525d623dc5046b8a6355df76f368560ca6cbac10fef2c5
+  languageName: node
+  linkType: hard
+
+"@babel/core@npm:>=7.2.2, @babel/core@npm:^7.25.2, @babel/core@npm:^7.26.0, @babel/core@npm:~7.26.0":
+  version: 7.26.0
+  resolution: "@babel/core@npm:7.26.0"
+  dependencies:
+    "@ampproject/remapping": "npm:^2.2.0"
+    "@babel/code-frame": "npm:^7.26.0"
+    "@babel/generator": "npm:^7.26.0"
+    "@babel/helper-compilation-targets": "npm:^7.25.9"
+    "@babel/helper-module-transforms": "npm:^7.26.0"
+    "@babel/helpers": "npm:^7.26.0"
+    "@babel/parser": "npm:^7.26.0"
+    "@babel/template": "npm:^7.25.9"
+    "@babel/traverse": "npm:^7.25.9"
+    "@babel/types": "npm:^7.26.0"
+    convert-source-map: "npm:^2.0.0"
+    debug: "npm:^4.1.0"
+    gensync: "npm:^1.0.0-beta.2"
+    json5: "npm:^2.2.3"
+    semver: "npm:^6.3.1"
+  checksum: 10/65767bfdb1f02e80d3af4f138066670ef8fdd12293de85ef151758a901c191c797e86d2e99b11c4cdfca33c72385ecaf38bbd7fa692791ec44c77763496b9b93
+  languageName: node
+  linkType: hard
+
+"@babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.7.5":
   version: 7.22.20
   resolution: "@babel/core@npm:7.22.20"
   dependencies:
@@ -1033,7 +1084,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/core@npm:^7.18.9, @babel/core@npm:^7.23.7, @babel/core@npm:^7.25.8, @babel/core@npm:~7.25.8":
+"@babel/core@npm:^7.18.9, @babel/core@npm:^7.23.7":
   version: 7.25.8
   resolution: "@babel/core@npm:7.25.8"
   dependencies:
@@ -1056,9 +1107,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/eslint-parser@npm:~7.25.8":
-  version: 7.25.8
-  resolution: "@babel/eslint-parser@npm:7.25.8"
+"@babel/eslint-parser@npm:~7.25.9":
+  version: 7.25.9
+  resolution: "@babel/eslint-parser@npm:7.25.9"
   dependencies:
     "@nicolo-ribaudo/eslint-scope-5-internals": "npm:5.1.1-v1"
     eslint-visitor-keys: "npm:^2.1.0"
@@ -1066,7 +1117,20 @@ __metadata:
   peerDependencies:
     "@babel/core": ^7.11.0
     eslint: ^7.5.0 || ^8.0.0 || ^9.0.0
-  checksum: 10/4e9e5881f57a4680ccdec1ee28586dda35480a4b16ca8953b94ea31152aa8a2a2c9311849001424b54d243467dab13b961ec8a0af0ac2c4cc3bba5887946f3ea
+  checksum: 10/ebb68d80b1fa2b964ad1147cc610e0c69b224e620419a885ba5abc996740523bee636a0d447fc29a0d495dbce5fa0246737b25e9e679cca6c5797fdac5176378
+  languageName: node
+  linkType: hard
+
+"@babel/generator@npm:^7.16.5":
+  version: 7.26.2
+  resolution: "@babel/generator@npm:7.26.2"
+  dependencies:
+    "@babel/parser": "npm:^7.26.2"
+    "@babel/types": "npm:^7.26.0"
+    "@jridgewell/gen-mapping": "npm:^0.3.5"
+    "@jridgewell/trace-mapping": "npm:^0.3.25"
+    jsesc: "npm:^3.0.2"
+  checksum: 10/71ace82b5b07a554846a003624bfab93275ccf73cdb9f1a37a4c1094bf9dc94bb677c67e8b8c939dbd6c5f0eda2e8f268aa2b0d9c3b9511072565660e717e045
   languageName: node
   linkType: hard
 
@@ -1106,6 +1170,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/generator@npm:^7.25.9, @babel/generator@npm:^7.26.0":
+  version: 7.26.0
+  resolution: "@babel/generator@npm:7.26.0"
+  dependencies:
+    "@babel/parser": "npm:^7.26.0"
+    "@babel/types": "npm:^7.26.0"
+    "@jridgewell/gen-mapping": "npm:^0.3.5"
+    "@jridgewell/trace-mapping": "npm:^0.3.25"
+    jsesc: "npm:^3.0.2"
+  checksum: 10/3528b0b5da7003617771ddfc564bcb4037dde59e8142e3808ae8eb5d45c5dfda74df5eb9e6162ab2c2bc66329c609a44d9fd0ce6d4bc14b89b3deb92c3343c56
+  languageName: node
+  linkType: hard
+
 "@babel/helper-annotate-as-pure@npm:^7.22.5":
   version: 7.22.5
   resolution: "@babel/helper-annotate-as-pure@npm:7.22.5"
@@ -1115,22 +1192,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-annotate-as-pure@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/helper-annotate-as-pure@npm:7.25.7"
+"@babel/helper-annotate-as-pure@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/helper-annotate-as-pure@npm:7.25.9"
   dependencies:
-    "@babel/types": "npm:^7.25.7"
-  checksum: 10/38044806cab33032391c46861cd0a36adb960525b00bc03f2f3d4380c983bf17971cdabc431e58b93a328ef24bd0271f1dc3a8c1c1ea6cab49d04702961451d8
+    "@babel/types": "npm:^7.25.9"
+  checksum: 10/41edda10df1ae106a9b4fe617bf7c6df77db992992afd46192534f5cff29f9e49a303231733782dd65c5f9409714a529f215325569f14282046e9d3b7a1ffb6c
   languageName: node
   linkType: hard
 
-"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.25.7"
+"@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.25.9"
   dependencies:
-    "@babel/traverse": "npm:^7.25.7"
-    "@babel/types": "npm:^7.25.7"
-  checksum: 10/e493c4b7ea1dcb1e406cf30265164b632e133ea9a039a5ddc8eadd5370ad498eddcd99871fdf500b9ac05d0b43f2a0987580ceb1f7adb3b7272e49b56589849a
+    "@babel/traverse": "npm:^7.25.9"
+    "@babel/types": "npm:^7.25.9"
+  checksum: 10/e1bb465b3b0155702d82cfef09e3813e87a6d777cdd2c513796861eac14953340491eafea1d4109278bf4ceb48b54074c45758f042c0544d00c498090bee5a6f
   languageName: node
   linkType: hard
 
@@ -1147,20 +1224,33 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-create-class-features-plugin@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/helper-create-class-features-plugin@npm:7.25.7"
+"@babel/helper-compilation-targets@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/helper-compilation-targets@npm:7.25.9"
   dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.25.7"
-    "@babel/helper-member-expression-to-functions": "npm:^7.25.7"
-    "@babel/helper-optimise-call-expression": "npm:^7.25.7"
-    "@babel/helper-replace-supers": "npm:^7.25.7"
-    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.25.7"
-    "@babel/traverse": "npm:^7.25.7"
+    "@babel/compat-data": "npm:^7.25.9"
+    "@babel/helper-validator-option": "npm:^7.25.9"
+    browserslist: "npm:^4.24.0"
+    lru-cache: "npm:^5.1.1"
+    semver: "npm:^6.3.1"
+  checksum: 10/8053fbfc21e8297ab55c8e7f9f119e4809fa7e505268691e1bedc2cf5e7a5a7de8c60ad13da2515378621b7601c42e101d2d679904da395fa3806a1edef6b92e
+  languageName: node
+  linkType: hard
+
+"@babel/helper-create-class-features-plugin@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/helper-create-class-features-plugin@npm:7.25.9"
+  dependencies:
+    "@babel/helper-annotate-as-pure": "npm:^7.25.9"
+    "@babel/helper-member-expression-to-functions": "npm:^7.25.9"
+    "@babel/helper-optimise-call-expression": "npm:^7.25.9"
+    "@babel/helper-replace-supers": "npm:^7.25.9"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.25.9"
+    "@babel/traverse": "npm:^7.25.9"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10/76e3bb727d7541d38acaa9b6ecff88f70e62370396dd22511837b90a556c6815a7efd6fd25b499bf1c8b02cdb18c575781a6aba0c442c38a2129a403b5bf9b1e
+  checksum: 10/d1d47a7b5fd317c6cb1446b0e4f4892c19ddaa69ea0229f04ba8bea5f273fc8168441e7114ad36ff919f2d310f97310cec51adc79002e22039a7e1640ccaf248
   languageName: node
   linkType: hard
 
@@ -1177,16 +1267,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-create-regexp-features-plugin@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/helper-create-regexp-features-plugin@npm:7.25.7"
+"@babel/helper-create-regexp-features-plugin@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/helper-create-regexp-features-plugin@npm:7.25.9"
   dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.25.7"
+    "@babel/helper-annotate-as-pure": "npm:^7.25.9"
     regexpu-core: "npm:^6.1.1"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10/fa083f83ae9ba3326e32762c9839fea171de34d66bffc65569a6a67222ec55cf4ef35b6b26f332d24485c0622a69a2e0b9eb2a7ca279595b174cfeeec68849ac
+  checksum: 10/bc2b6a365ddf490c416661833dbf4430ae0c66132acccb5ce257e82026dd9db54da788bfbdcb7e0032aa0cba965cb1be169b1e1fb2c8c029b81625da4963f6b9
   languageName: node
   linkType: hard
 
@@ -1231,13 +1321,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-member-expression-to-functions@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/helper-member-expression-to-functions@npm:7.25.7"
+"@babel/helper-member-expression-to-functions@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/helper-member-expression-to-functions@npm:7.25.9"
   dependencies:
-    "@babel/traverse": "npm:^7.25.7"
-    "@babel/types": "npm:^7.25.7"
-  checksum: 10/f953a0ddbcfbaae835033b54fdbf42cc3aea08c554875fccfc02ed4b1e5fe3ee06abf1b7a8419314357841fabc9efdbcbb8afdf07c4f216a73164a45a147562b
+    "@babel/traverse": "npm:^7.25.9"
+    "@babel/types": "npm:^7.25.9"
+  checksum: 10/ef8cc1c1e600b012b312315f843226545a1a89f25d2f474ce2503fd939ca3f8585180f291a3a13efc56cf13eddc1d41a3a040eae9a521838fd59a6d04cc82490
   languageName: node
   linkType: hard
 
@@ -1251,6 +1341,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-module-imports@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/helper-module-imports@npm:7.25.9"
+  dependencies:
+    "@babel/traverse": "npm:^7.25.9"
+    "@babel/types": "npm:^7.25.9"
+  checksum: 10/e090be5dee94dda6cd769972231b21ddfae988acd76b703a480ac0c96f3334557d70a965bf41245d6ee43891e7571a8b400ccf2b2be5803351375d0f4e5bcf08
+  languageName: node
+  linkType: hard
+
 "@babel/helper-module-transforms@npm:^7.22.20, @babel/helper-module-transforms@npm:^7.25.7":
   version: 7.25.7
   resolution: "@babel/helper-module-transforms@npm:7.25.7"
@@ -1265,52 +1365,65 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-optimise-call-expression@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/helper-optimise-call-expression@npm:7.25.7"
+"@babel/helper-module-transforms@npm:^7.25.9, @babel/helper-module-transforms@npm:^7.26.0":
+  version: 7.26.0
+  resolution: "@babel/helper-module-transforms@npm:7.26.0"
   dependencies:
-    "@babel/types": "npm:^7.25.7"
-  checksum: 10/8da0d9f5aae15991678ad1bbe58e52cd62a0ed36871075756d9684c0a7a65988ed81bab53ad6436c39a470d3cd690694dd2b07147817217e3ca87178a129c509
+    "@babel/helper-module-imports": "npm:^7.25.9"
+    "@babel/helper-validator-identifier": "npm:^7.25.9"
+    "@babel/traverse": "npm:^7.25.9"
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 10/9841d2a62f61ad52b66a72d08264f23052d533afc4ce07aec2a6202adac0bfe43014c312f94feacb3291f4c5aafe681955610041ece2c276271adce3f570f2f5
+  languageName: node
+  linkType: hard
+
+"@babel/helper-optimise-call-expression@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/helper-optimise-call-expression@npm:7.25.9"
+  dependencies:
+    "@babel/types": "npm:^7.25.9"
+  checksum: 10/f09d0ad60c0715b9a60c31841b3246b47d67650c512ce85bbe24a3124f1a4d66377df793af393273bc6e1015b0a9c799626c48e53747581c1582b99167cc65dc
   languageName: node
   linkType: hard
 
-"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.19.0, @babel/helper-plugin-utils@npm:^7.20.2, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.8.0":
+"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.8.0":
   version: 7.22.5
   resolution: "@babel/helper-plugin-utils@npm:7.22.5"
   checksum: 10/ab220db218089a2aadd0582f5833fd17fa300245999f5f8784b10f5a75267c4e808592284a29438a0da365e702f05acb369f99e1c915c02f9f9210ec60eab8ea
   languageName: node
   linkType: hard
 
-"@babel/helper-plugin-utils@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/helper-plugin-utils@npm:7.25.7"
-  checksum: 10/e1b0ea5e67b05378d6360e3fc370e99bfb247eed9f68145b5cce541da703424e1887fb6fc60ab2f7f743c72dcbfbed79d3032af43f2c251c229c734dc2572a5b
+"@babel/helper-plugin-utils@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/helper-plugin-utils@npm:7.25.9"
+  checksum: 10/e347d87728b1ab10b6976d46403941c8f9008c045ea6d99997a7ffca7b852dc34b6171380f7b17edf94410e0857ff26f3a53d8618f11d73744db86e8ca9b8c64
   languageName: node
   linkType: hard
 
-"@babel/helper-remap-async-to-generator@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/helper-remap-async-to-generator@npm:7.25.7"
+"@babel/helper-remap-async-to-generator@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/helper-remap-async-to-generator@npm:7.25.9"
   dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.25.7"
-    "@babel/helper-wrap-function": "npm:^7.25.7"
-    "@babel/traverse": "npm:^7.25.7"
+    "@babel/helper-annotate-as-pure": "npm:^7.25.9"
+    "@babel/helper-wrap-function": "npm:^7.25.9"
+    "@babel/traverse": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10/3d563ac35cb1306bf70e7353fc807e7b082a7510d955a36db089fa861c6a8b2c470184996f3177d5384e5290a1be9e7eed424efb9e2dd3bed3a8cf6c2d6a9723
+  checksum: 10/ea37ad9f8f7bcc27c109963b8ebb9d22bac7a5db2a51de199cb560e251d5593fe721e46aab2ca7d3e7a24b0aa4aff0eaf9c7307af9c2fd3a1d84268579073052
   languageName: node
   linkType: hard
 
-"@babel/helper-replace-supers@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/helper-replace-supers@npm:7.25.7"
+"@babel/helper-replace-supers@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/helper-replace-supers@npm:7.25.9"
   dependencies:
-    "@babel/helper-member-expression-to-functions": "npm:^7.25.7"
-    "@babel/helper-optimise-call-expression": "npm:^7.25.7"
-    "@babel/traverse": "npm:^7.25.7"
+    "@babel/helper-member-expression-to-functions": "npm:^7.25.9"
+    "@babel/helper-optimise-call-expression": "npm:^7.25.9"
+    "@babel/traverse": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10/87b65c7b278fabcb67458e592082a0b4532d5400acbb51e496ea47763077d0a64dc0531d32bafcb1d51f04d61d4715dadb1fd0301bc8449c26fcfd06913eb45e
+  checksum: 10/8ebf787016953e4479b99007bac735c9c860822fafc51bc3db67bc53814539888797238c81fa8b948b6da897eb7b1c1d4f04df11e501a7f0596b356be02de2ab
   languageName: node
   linkType: hard
 
@@ -1324,13 +1437,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-skip-transparent-expression-wrappers@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.25.7"
+"@babel/helper-simple-access@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/helper-simple-access@npm:7.25.9"
   dependencies:
-    "@babel/traverse": "npm:^7.25.7"
-    "@babel/types": "npm:^7.25.7"
-  checksum: 10/466c81d09981bfb9e10aa6697ecb621389ff92a86187daaca34a969ca990d7327ebe931e87f7d52a200e499542d398469478d83dfaaa244d2f49df4e078490b3
+    "@babel/traverse": "npm:^7.25.9"
+    "@babel/types": "npm:^7.25.9"
+  checksum: 10/a16a6cfa5e8ac7144e856bcdaaf0022cf5de028fc0c56ce21dd664a6e900999a4285c587a209f2acf9de438c0d60bfb497f5f34aa34cbaf29da3e2f8d8d7feb7
+  languageName: node
+  linkType: hard
+
+"@babel/helper-skip-transparent-expression-wrappers@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.25.9"
+  dependencies:
+    "@babel/traverse": "npm:^7.25.9"
+    "@babel/types": "npm:^7.25.9"
+  checksum: 10/fdbb5248932198bc26daa6abf0d2ac42cab9c2dbb75b7e9f40d425c8f28f09620b886d40e7f9e4e08ffc7aaa2cefe6fc2c44be7c20e81f7526634702fb615bdc
   languageName: node
   linkType: hard
 
@@ -1364,6 +1487,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-string-parser@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/helper-string-parser@npm:7.25.9"
+  checksum: 10/c28656c52bd48e8c1d9f3e8e68ecafd09d949c57755b0d353739eb4eae7ba4f7e67e92e4036f1cd43378cc1397a2c943ed7bcaf5949b04ab48607def0258b775
+  languageName: node
+  linkType: hard
+
 "@babel/helper-validator-identifier@npm:^7.22.20, @babel/helper-validator-identifier@npm:^7.25.7":
   version: 7.25.7
   resolution: "@babel/helper-validator-identifier@npm:7.25.7"
@@ -1378,6 +1508,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helper-validator-identifier@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/helper-validator-identifier@npm:7.25.9"
+  checksum: 10/3f9b649be0c2fd457fa1957b694b4e69532a668866b8a0d81eabfa34ba16dbf3107b39e0e7144c55c3c652bf773ec816af8df4a61273a2bb4eb3145ca9cf478e
+  languageName: node
+  linkType: hard
+
 "@babel/helper-validator-option@npm:^7.25.7":
   version: 7.25.7
   resolution: "@babel/helper-validator-option@npm:7.25.7"
@@ -1385,14 +1522,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-wrap-function@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/helper-wrap-function@npm:7.25.7"
+"@babel/helper-validator-option@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/helper-validator-option@npm:7.25.9"
+  checksum: 10/9491b2755948ebbdd68f87da907283698e663b5af2d2b1b02a2765761974b1120d5d8d49e9175b167f16f72748ffceec8c9cf62acfbee73f4904507b246e2b3d
+  languageName: node
+  linkType: hard
+
+"@babel/helper-wrap-function@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/helper-wrap-function@npm:7.25.9"
   dependencies:
-    "@babel/template": "npm:^7.25.7"
-    "@babel/traverse": "npm:^7.25.7"
-    "@babel/types": "npm:^7.25.7"
-  checksum: 10/00e2291a2b67e060b98cae90b4cc9107cff29d7b26bd5eb61149c63fb99418d9bd00bb0708b8b3e733cae4b1ea3a2b41a709d85192accfa15903f8af5c821fe6
+    "@babel/template": "npm:^7.25.9"
+    "@babel/traverse": "npm:^7.25.9"
+    "@babel/types": "npm:^7.25.9"
+  checksum: 10/988dcf49159f1c920d6b9486762a93767a6e84b5e593a6342bc235f3e47cc1cb0c048d8fca531a48143e6b7fce1ff12ddbf735cf5f62cb2f07192cf7c27b89cf
   languageName: node
   linkType: hard
 
@@ -1406,6 +1550,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/helpers@npm:^7.26.0":
+  version: 7.26.0
+  resolution: "@babel/helpers@npm:7.26.0"
+  dependencies:
+    "@babel/template": "npm:^7.25.9"
+    "@babel/types": "npm:^7.26.0"
+  checksum: 10/fd4757f65d10b64cfdbf4b3adb7ea6ffff9497c53e0786452f495d1f7794da7e0898261b4db65e1c62bbb9a360d7d78a1085635c23dfc3af2ab6dcba06585f86
+  languageName: node
+  linkType: hard
+
 "@babel/highlight@npm:^7.23.4":
   version: 7.23.4
   resolution: "@babel/highlight@npm:7.23.4"
@@ -1452,6 +1606,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/parser@npm:^7.16.2, @babel/parser@npm:^7.26.2":
+  version: 7.26.2
+  resolution: "@babel/parser@npm:7.26.2"
+  dependencies:
+    "@babel/types": "npm:^7.26.0"
+  bin:
+    parser: ./bin/babel-parser.js
+  checksum: 10/8baee43752a3678ad9f9e360ec845065eeee806f1fdc8e0f348a8a0e13eef0959dabed4a197c978896c493ea205c804d0a1187cc52e4a1ba017c7935bab4983d
+  languageName: node
+  linkType: hard
+
 "@babel/parser@npm:^7.22.15, @babel/parser@npm:^7.23.5":
   version: 7.23.5
   resolution: "@babel/parser@npm:7.23.5"
@@ -1472,62 +1637,73 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:7.25.7"
+"@babel/parser@npm:^7.25.9, @babel/parser@npm:^7.26.0":
+  version: 7.26.1
+  resolution: "@babel/parser@npm:7.26.1"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
-    "@babel/traverse": "npm:^7.25.7"
+    "@babel/types": "npm:^7.26.0"
+  bin:
+    parser: ./bin/babel-parser.js
+  checksum: 10/87d6248c6a1f962621b4505e24ee89c9869d40640beb231d6befb2d56112a84a654b15980941300617aa3211ca9632cc1644c6d3f72ea3427f220133d11d9c0c
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:7.25.9"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
+    "@babel/traverse": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10/25f1d0a2ec6f9e912d2513b3830b239acdf9c75f453c208f77074687393f380b1150684ca0acb78368391fa1035242ac66e7f3856834d8003f01d1af17747230
+  checksum: 10/3c23ef34e3fd7da3578428cb488180ab6b7b96c9c141438374b6d87fa814d87de099f28098e5fc64726c19193a1da397e4d2351d40b459bcd2489993557e2c74
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-safari-class-field-initializer-scope@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-bugfix-safari-class-field-initializer-scope@npm:7.25.7"
+"@babel/plugin-bugfix-safari-class-field-initializer-scope@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-bugfix-safari-class-field-initializer-scope@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10/52551470b6164a787460c28019428e97d20097d5dffab74f8866512706a3b002e57fdb23fe8e5156149bc4c9cfea48d5a0347b7a9e7e2a05f681941037136ab3
+  checksum: 10/d3e14ab1cb9cb50246d20cab9539f2fbd1e7ef1ded73980c8ad7c0561b4d5e0b144d362225f0976d47898e04cbd40f2000e208b0913bd788346cf7791b96af91
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.25.7"
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10/c37204ec3c82a1babba13f0cc2a68220959224cbab1294b1d7d8501af4734de1664b43c67b97fcaa1b3f53c865b0a4ad6f887102c7d7b913aab43df29ac7da52
+  checksum: 10/a9d1ee3fd100d3eb6799a2f2bbd785296f356c531d75c9369f71541811fa324270258a374db103ce159156d006da2f33370330558d0133e6f7584152c34997ca
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.25.7"
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
-    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.25.7"
-    "@babel/plugin-transform-optional-chaining": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.25.9"
+    "@babel/plugin-transform-optional-chaining": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.13.0
-  checksum: 10/507c92bbcb3d7747c82290370336b50368fbb652af31fea718be8f1928142f1c5f7c6f2b9810d8b9b2905734f8f6b778f9e4b1cfb5a11073a2f1cfe9e5e5b354
+  checksum: 10/5b298b28e156f64de51cdb03a2c5b80c7f978815ef1026f3ae8b9fc48d28bf0a83817d8fbecb61ef8fb94a7201f62cca5103cc6e7b9e8f28e38f766d7905b378
   languageName: node
   linkType: hard
 
-"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:7.25.7"
+"@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
-    "@babel/traverse": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
+    "@babel/traverse": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10/289c6da5840c5049adbeb9b4cfb166d422f0b7b3f3a54aff64e8a053a1249e8eb513eac0fa3d033869372ffc30eda1e8555fa789b9daa1064bfdaf7f4717daa8
+  checksum: 10/cb893e5deb9312a0120a399835b6614a016c036714de7123c8edabccc56a09c4455016e083c5c4dd485248546d4e5e55fc0e9132b3c3a9bd16abf534138fe3f2
   languageName: node
   linkType: hard
 
@@ -1573,25 +1749,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-import-assertions@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-syntax-import-assertions@npm:7.25.7"
+"@babel/plugin-syntax-import-assertions@npm:^7.26.0":
+  version: 7.26.0
+  resolution: "@babel/plugin-syntax-import-assertions@npm:7.26.0"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/d72615f8dcc5ffbcb456bcf7ce27bc22b30cc9ea8d809e461d80af486033d31bd0b6d83c9a7997c9cd36ff283a9c1207f806da4361bb620370659c256c5454e9
+  checksum: 10/b58f2306df4a690ca90b763d832ec05202c50af787158ff8b50cdf3354359710bce2e1eb2b5135fcabf284756ac8eadf09ca74764aa7e76d12a5cac5f6b21e67
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-import-attributes@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-syntax-import-attributes@npm:7.25.7"
+"@babel/plugin-syntax-import-attributes@npm:^7.26.0":
+  version: 7.26.0
+  resolution: "@babel/plugin-syntax-import-attributes@npm:7.26.0"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/7c5451e2d8351693acbc53b1e1f6951026e35899d22847a6d22424a1ee5c92c11ac6c6f209a9e18f85d7bb9267caaf2532653e892997cdcd51784106a5858b7e
+  checksum: 10/c122aa577166c80ee67f75aebebeef4150a132c4d3109d25d7fc058bf802946f883e330f20b78c1d3e3a5ada631c8780c263d2d01b5dbaecc69efefeedd42916
   languageName: node
   linkType: hard
 
@@ -1617,14 +1793,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-jsx@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-syntax-jsx@npm:7.25.7"
+"@babel/plugin-syntax-jsx@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-syntax-jsx@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/243476a943a84b6b86e99076301e66f48268e8799564053e8feccab90da7944a0b42c91360216dbfb0b2958bbd0ed100d2c7b2db688dab83d19ff2745d4892eb
+  checksum: 10/bb609d1ffb50b58f0c1bac8810d0e46a4f6c922aa171c458f3a19d66ee545d36e782d3bffbbc1fed0dc65a558bdce1caf5279316583c0fff5a2c1658982a8563
   languageName: node
   linkType: hard
 
@@ -1716,14 +1892,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-syntax-typescript@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-syntax-typescript@npm:7.25.7"
+"@babel/plugin-syntax-typescript@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-syntax-typescript@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/f1492336230920cc4daa6e7aa3571253fb0c0fd05a1d0a7b5dc0a5b907f31945235ee8bf09c83f7738b89943a2320a61dda95e0db2b6310b07040aeda6be4f44
+  checksum: 10/0e9821e8ba7d660c36c919654e4144a70546942ae184e85b8102f2322451eae102cbfadbcadd52ce077a2b44b400ee52394c616feab7b5b9f791b910e933fd33
   languageName: node
   linkType: hard
 
@@ -1750,751 +1926,764 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-arrow-functions@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-arrow-functions@npm:7.25.7"
+"@babel/plugin-transform-arrow-functions@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-arrow-functions@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/45a6b05acd132bd399ab127d54d43f7117f650908092c15da7c41c61c5e49bfdb63c0e65bd59ad68c94bfc6aade602732a98a55b146b69dfae212516203d43f9
+  checksum: 10/c29f081224859483accf55fb4d091db2aac0dcd0d7954bac5ca889030cc498d3f771aa20eb2e9cd8310084ec394d85fa084b97faf09298b6bc9541182b3eb5bb
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-async-generator-functions@npm:^7.25.8":
-  version: 7.25.8
-  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.25.8"
+"@babel/plugin-transform-async-generator-functions@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-async-generator-functions@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
-    "@babel/helper-remap-async-to-generator": "npm:^7.25.7"
-    "@babel/traverse": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
+    "@babel/helper-remap-async-to-generator": "npm:^7.25.9"
+    "@babel/traverse": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/ab3f74664fc03af357e8450711de60ec77149be668059dbc0c0d616d85253117aec0e5ffb2eccda3449d0099d5fba5ef32f0e6e12a52af5f72fbca437372ece5
+  checksum: 10/99306c44a4a791abd51a56d89fa61c4cfe805a58e070c7fb1cbf950886778a6c8c4f25a92d231f91da1746d14a338436073fd83038e607f03a2a98ac5340406b
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-async-to-generator@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-async-to-generator@npm:7.25.7"
+"@babel/plugin-transform-async-to-generator@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-async-to-generator@npm:7.25.9"
   dependencies:
-    "@babel/helper-module-imports": "npm:^7.25.7"
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
-    "@babel/helper-remap-async-to-generator": "npm:^7.25.7"
+    "@babel/helper-module-imports": "npm:^7.25.9"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
+    "@babel/helper-remap-async-to-generator": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/fdc6161e9027bec8bbe523e40934a2cccf1a30cf241006c98a120b2cda6e4f75d4a4cb4831cf3ece43d9b752183117e4ca5ec43778750146d5fc9a74b22b1acf
+  checksum: 10/b3ad50fb93c171644d501864620ed23952a46648c4df10dc9c62cc9ad08031b66bd272cfdd708faeee07c23b6251b16f29ce0350473e4c79f0c32178d38ce3a6
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-block-scoped-functions@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.25.7"
+"@babel/plugin-transform-block-scoped-functions@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-block-scoped-functions@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/334debb143d002295c6dd5559ebf24483557787621fd1d7283ac748eb401ed96b7d43c981f1d2b6795720979fe7872dd0719aed890d064244d52b1c4fe6f3347
+  checksum: 10/bf31896556b33a80f017af3d445ceb532ec0f5ca9d69bc211a963ac92514d172d5c24c5ac319f384d9dfa7f1a4d8dc23032c2fe3e74f98a59467ecd86f7033ae
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-block-scoping@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-block-scoping@npm:7.25.7"
+"@babel/plugin-transform-block-scoping@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-block-scoping@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/bbc5b815c6850eb798a294a5d31ed09bb0db367a31196e78c0d02ce3f845ddd2e0dcfd7ec70505dfa4e1bd67f13e46b315d290c58aa7531468feed380e267d97
+  checksum: 10/89dcdd7edb1e0c2f44e3c568a8ad8202e2574a8a8308248550a9391540bc3f5c9fbd8352c60ae90769d46f58d3ab36f2c3a0fbc1c3620813d92ff6fccdfa79c8
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-class-properties@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-class-properties@npm:7.25.7"
+"@babel/plugin-transform-class-properties@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-class-properties@npm:7.25.9"
   dependencies:
-    "@babel/helper-create-class-features-plugin": "npm:^7.25.7"
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-create-class-features-plugin": "npm:^7.25.9"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/fe1dbbd77275ade96964fec0c85a1f14e2dac0c6565bccddf00680e43c2e906d289dd9d483aff6359420cef2a044b4aaaeb303f64a3a1a005601c018188368e7
+  checksum: 10/a8d69e2c285486b63f49193cbcf7a15e1d3a5f632c1c07d7a97f65306df7f554b30270b7378dde143f8b557d1f8f6336c643377943dec8ec405e4cd11e90b9ea
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-class-static-block@npm:^7.25.8":
-  version: 7.25.8
-  resolution: "@babel/plugin-transform-class-static-block@npm:7.25.8"
+"@babel/plugin-transform-class-static-block@npm:^7.26.0":
+  version: 7.26.0
+  resolution: "@babel/plugin-transform-class-static-block@npm:7.26.0"
   dependencies:
-    "@babel/helper-create-class-features-plugin": "npm:^7.25.7"
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-create-class-features-plugin": "npm:^7.25.9"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.12.0
-  checksum: 10/160d5f9d1dbe4dc12c2998227b51b1ccfe9f4d11b1031d0698f34403961d5b9bb995cc86acf1855102b9be365370c97d8cea243802b73c7ba7b2b18b2ac3aae9
+  checksum: 10/60cba3f125a7bc4f90706af0a011697c7ffd2eddfba336ed6f84c5f358c44c3161af18b0202475241a96dee7964d96dd3a342f46dbf85b75b38bb789326e1766
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-classes@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-classes@npm:7.25.7"
+"@babel/plugin-transform-classes@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-classes@npm:7.25.9"
   dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.25.7"
-    "@babel/helper-compilation-targets": "npm:^7.25.7"
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
-    "@babel/helper-replace-supers": "npm:^7.25.7"
-    "@babel/traverse": "npm:^7.25.7"
+    "@babel/helper-annotate-as-pure": "npm:^7.25.9"
+    "@babel/helper-compilation-targets": "npm:^7.25.9"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
+    "@babel/helper-replace-supers": "npm:^7.25.9"
+    "@babel/traverse": "npm:^7.25.9"
     globals: "npm:^11.1.0"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/239926ceb7fa926054fe9aabb7a64dba090d8f83d075bcec804d602a5715501c56dc26367bb90e6780e1113cc04cf6ad32c131e2782ccf1768fd059ac7eba04b
+  checksum: 10/1914ebe152f35c667fba7bf17ce0d9d0f33df2fb4491990ce9bb1f9ec5ae8cbd11d95b0dc371f7a4cc5e7ce4cf89467c3e34857302911fc6bfb6494a77f7b37e
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-computed-properties@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-computed-properties@npm:7.25.7"
+"@babel/plugin-transform-computed-properties@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-computed-properties@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
-    "@babel/template": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
+    "@babel/template": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/f25caeb3366847a1f67efe4b250a460f88a5ebb4c12c566d945bf211ef28977dd21f4dd6539f63743f3fabdbb174b4d34e22af2a451aba3bcfd702396442eb53
+  checksum: 10/aa1a9064d6a9d3b569b8cae6972437315a38a8f6553ee618406da5122500a06c2f20b9fa93aeed04dd895923bf6f529c09fc79d4be987ec41785ceb7d2203122
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-destructuring@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-destructuring@npm:7.25.7"
+"@babel/plugin-transform-destructuring@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-destructuring@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/b58347dc1b807ef8e6aaf995d59c6f09aa9de2c590bb90a52bc9c4082836ef72f70f8fc062370138134220de40dad06af6122ffcce77fb97d5e77ca7cd71e5c7
+  checksum: 10/51b24fbead910ad0547463b2d214dd08076b22a66234b9f878b8bac117603dd23e05090ff86e9ffc373214de23d3e5bf1b095fe54cce2ca16b010264d90cf4f5
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-dotall-regex@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-dotall-regex@npm:7.25.7"
+"@babel/plugin-transform-dotall-regex@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-dotall-regex@npm:7.25.9"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": "npm:^7.25.7"
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.25.9"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/a4727ee33b95d1f7e33b277b0003e3e91ebb9c3c611512e1ca5f3f0d99efd552a6c42b09e5520ea686ef0389dd8159a77c7c59fb53d0d1a1ff7d385c362da71b
+  checksum: 10/8bdf1bb9e6e3a2cc8154ae88a3872faa6dc346d6901994505fb43ac85f858728781f1219f40b67f7bb0687c507450236cb7838ac68d457e65637f98500aa161b
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-duplicate-keys@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-duplicate-keys@npm:7.25.7"
+"@babel/plugin-transform-duplicate-keys@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-duplicate-keys@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/b132ce919643f1fa519c8597513fba77155fde2d7689154c73791847efd218ff7ce11694b539ca9dee65538c9e774adf4bd6a6e950800dd648f43d5906a38155
+  checksum: 10/10dbb87bc09582416f9f97ca6c40563655abf33e3fd0fee25eeaeff28e946a06651192112a2bc2b18c314a638fa15c55b8365a677ef67aa490848cefdc57e1d8
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-duplicate-named-capturing-groups-regex@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-duplicate-named-capturing-groups-regex@npm:7.25.7"
+"@babel/plugin-transform-duplicate-named-capturing-groups-regex@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-duplicate-named-capturing-groups-regex@npm:7.25.9"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": "npm:^7.25.7"
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.25.9"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10/688ab66ed249a08d4b2e3ae8a2c10678fbe23f6466d5020d4cc3e031946dc335c028f5a1bee3221acb3875a1e901b0237020463157690fabc06edc4bdd6c6c88
+  checksum: 10/f7233cf596be8c6843d31951afaf2464a62a610cb89c72c818c044765827fab78403ab8a7d3a6386f838c8df574668e2a48f6c206b1d7da965aff9c6886cb8e6
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-dynamic-import@npm:^7.25.8":
-  version: 7.25.8
-  resolution: "@babel/plugin-transform-dynamic-import@npm:7.25.8"
+"@babel/plugin-transform-dynamic-import@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-dynamic-import@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/cf2c105143461876f418d21893ac8f7f2b0a3c3cefb4374c3cd6338a19d3a0deed3565049f7436b94452c6471622958ef9248c7bdfeb34d2917710ac74431203
+  checksum: 10/aaca1ccda819be9b2b85af47ba08ddd2210ff2dbea222f26e4cd33f97ab020884bf81a66197e50872721e9daf36ceb5659502c82199884ea74d5d75ecda5c58b
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-exponentiation-operator@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.25.7"
+"@babel/plugin-transform-exponentiation-operator@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-exponentiation-operator@npm:7.25.9"
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor": "npm:^7.25.7"
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-builder-binary-assignment-operator-visitor": "npm:^7.25.9"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/3371fc79c052a3c63652785284a9f4b943a188ae5aa3e68a760c45afc43739d654ad6d8d24b93ed04fe736f6c0b4a7a11ace56bc954d3a6520d0b3c79e058c03
+  checksum: 10/57e1bb4135dd16782fe84b49dd360cce8f9bf5f62eb10424dcdaf221e54a8bacdf50f2541c5ac01dea9f833a6c628613d71be915290938a93454389cba4de06b
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-export-namespace-from@npm:^7.25.8":
-  version: 7.25.8
-  resolution: "@babel/plugin-transform-export-namespace-from@npm:7.25.8"
+"@babel/plugin-transform-export-namespace-from@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-export-namespace-from@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/439aac4ca1c7dbb63f021142e7abcd746049bf0d44cc5d2eb469ae3b75d90e076a43ff77190b74d8139402b53eea625b08c68651d3ce1d0a0915f5643450b3de
+  checksum: 10/4dfe8df86c5b1d085d591290874bb2d78a9063090d71567ed657a418010ad333c3f48af2c974b865f53bbb718987a065f89828d43279a7751db1a56c9229078d
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-for-of@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-for-of@npm:7.25.7"
+"@babel/plugin-transform-for-of@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-for-of@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
-    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/6fdfc1747283f50ada9f08d4f801d2156658f183db731369ac2b17f5f885661114906b3645c6a38bb6a5e24b771e6bd43c0ea47580c4fcb9347cd1d179e57435
+  checksum: 10/63a2db7fe06c2e3f5fc1926f478dac66a5f7b3eaeb4a0ffae577e6f3cb3d822cb1ed2ed3798f70f5cb1aa06bc2ad8bcd1f557342f5c425fd83c37a8fc1cfd2ba
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-function-name@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-function-name@npm:7.25.7"
+"@babel/plugin-transform-function-name@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-function-name@npm:7.25.9"
   dependencies:
-    "@babel/helper-compilation-targets": "npm:^7.25.7"
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
-    "@babel/traverse": "npm:^7.25.7"
+    "@babel/helper-compilation-targets": "npm:^7.25.9"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
+    "@babel/traverse": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/465d54942c03f77da3be5fb56404c6f8162f0e99034b8aceab6af2d386a77ecaf3df0c5f2dd67a00b66cd8ad970c0a08151026ed14aa44673a33f495e6849cc7
+  checksum: 10/a8d7c8d019a6eb57eab5ca1be3e3236f175557d55b1f3b11f8ad7999e3fbb1cf37905fd8cb3a349bffb4163a558e9f33b63f631597fdc97c858757deac1b2fd7
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-json-strings@npm:^7.25.8":
-  version: 7.25.8
-  resolution: "@babel/plugin-transform-json-strings@npm:7.25.8"
+"@babel/plugin-transform-json-strings@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-json-strings@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/adbc6a5a77b96db0f7e168c5fd2e56941df649808ce960f12447c1ba5d3893e9d458e7e14e3a5bd725ac5f3432ac1b3cf62b7413bbf7168a7c656dce51db711a
+  checksum: 10/e2498d84761cfd05aaea53799933d55af309c9d6204e66b38778792d171e4d1311ad34f334259a3aa3407dd0446f6bd3e390a1fcb8ce2e42fe5aabed0e41bee1
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-literals@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-literals@npm:7.25.7"
+"@babel/plugin-transform-literals@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-literals@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/435d9709204e4cae46f9e75973a1424b98bb71516d9cfb0619260cfb56d445b43fa34aa49dacb0e1fbc2a19fdd9373f4b4db4908007be8f9e9e3f0ccf6c73e71
+  checksum: 10/3cca75823a38aab599bc151b0fa4d816b5e1b62d6e49c156aa90436deb6e13649f5505973151a10418b64f3f9d1c3da53e38a186402e0ed7ad98e482e70c0c14
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-logical-assignment-operators@npm:^7.25.8":
-  version: 7.25.8
-  resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.25.8"
+"@babel/plugin-transform-logical-assignment-operators@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-logical-assignment-operators@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/7af0e4ad63c1a59f24894b64330040966204963b75287752a2d56703c7924d3a883a3c2497e1f03c4b1792f8664e0650cf6687010dc5483444c077de1daae9f5
+  checksum: 10/8c6febb4ac53852314d28b5e2c23d5dbbff7bf1e57d61f9672e0d97531ef7778b3f0ad698dcf1179f5486e626c77127508916a65eb846a89e98a92f70ed3537b
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-member-expression-literals@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-member-expression-literals@npm:7.25.7"
+"@babel/plugin-transform-member-expression-literals@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-member-expression-literals@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/fb2b985cfa0436bfbed6fbcdd430573272518cf3454c9b0de374cfb80ac6fe60b2ebbe0818a83035e436a9ff08b159bb87527dfd712560c52a0ebfabe6f65121
+  checksum: 10/db92041ae87b8f59f98b50359e0bb172480f6ba22e5e76b13bdfe07122cbf0daa9cd8ad2e78dcb47939938fed88ad57ab5989346f64b3a16953fc73dea3a9b1f
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-amd@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-modules-amd@npm:7.25.7"
+"@babel/plugin-transform-modules-amd@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-modules-amd@npm:7.25.9"
   dependencies:
-    "@babel/helper-module-transforms": "npm:^7.25.7"
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-module-transforms": "npm:^7.25.9"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/0d061c91130433fccc723b4eb1359ced515a5dd7196c3ec75f2b2c24613154365ec1c89fe89bee648c1dc28a54c9625dd2b21b6196659a9f2b8ebff0b2352f6c
+  checksum: 10/75d34c6e709a23bcfa0e06f722c9a72b1d9ac3e7d72a07ef54a943d32f65f97cbbf0e387d874eb9d9b4c8d33045edfa8e8441d0f8794f3c2b9f1d71b928acf2c
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-commonjs@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.25.7"
+"@babel/plugin-transform-modules-commonjs@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-modules-commonjs@npm:7.25.9"
   dependencies:
-    "@babel/helper-module-transforms": "npm:^7.25.7"
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
-    "@babel/helper-simple-access": "npm:^7.25.7"
+    "@babel/helper-module-transforms": "npm:^7.25.9"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
+    "@babel/helper-simple-access": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/4b3d038b55bfe5553e9eea360cc1b3dd689068256a9bce1939061ab1dfa194fea0b7b54f10c53b0af0be44508fd0037022c32709a6d96ac1277fb9c7de0f510c
+  checksum: 10/a7390ca999373ccdef91075f274d1ace3a5cb79f9b9118ed6f76e94867ed454cf798a6f312ce2c4cdc1e035a25d810d754e4cb2e4d866acb4219490f3585de60
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-systemjs@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.25.7"
+"@babel/plugin-transform-modules-systemjs@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-modules-systemjs@npm:7.25.9"
   dependencies:
-    "@babel/helper-module-transforms": "npm:^7.25.7"
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
-    "@babel/helper-validator-identifier": "npm:^7.25.7"
-    "@babel/traverse": "npm:^7.25.7"
+    "@babel/helper-module-transforms": "npm:^7.25.9"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
+    "@babel/helper-validator-identifier": "npm:^7.25.9"
+    "@babel/traverse": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/abd3522e60a9b639f8ad58b2ee237debe9e78a3a1462e3c5b17b4fbdc1b4bb2235edb1ed7d204b45701ec99dd3506d87164ece8ac9d9465a3e603cf13170b65b
+  checksum: 10/03145aa89b7c867941a03755216cfb503df6d475a78df84849a157fa5f2fcc17ba114a968d0579ae34e7c61403f35d1ba5d188fdfb9ad05f19354eb7605792f9
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-modules-umd@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-modules-umd@npm:7.25.7"
+"@babel/plugin-transform-modules-umd@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-modules-umd@npm:7.25.9"
   dependencies:
-    "@babel/helper-module-transforms": "npm:^7.25.7"
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-module-transforms": "npm:^7.25.9"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/06d6e95a9948aa91b218ada2940b8f568f78991265f2923f6e69c29e97ef1731c1b79adaf72a072a834a86f98fc0bd0117dfb14a37aaea6337fb4468f757471a
+  checksum: 10/47d03485fedac828832d9fee33b3b982a6db8197e8651ceb5d001890e276150b5a7ee3e9780749e1ba76453c471af907a159108832c24f93453dd45221788e97
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.25.7"
+"@babel/plugin-transform-named-capturing-groups-regex@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-named-capturing-groups-regex@npm:7.25.9"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": "npm:^7.25.7"
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.25.9"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10/4c8340cacb1d21794777abb68db2ea434a89274e9ca539e6f564488f5e8a7f517fdf0f9dc754a14cdb8702a3a488ba2bf0fad404a7da3ba4481f620fa6f234c9
+  checksum: 10/434346ba05cf74e3f4704b3bdd439287b95cd2a8676afcdc607810b8c38b6f4798cd69c1419726b2e4c7204e62e4a04d31b0360e91ca57a930521c9211e07789
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-new-target@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-new-target@npm:7.25.7"
+"@babel/plugin-transform-new-target@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-new-target@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/c410edc9d8800590e34e648851a633534c3d153d0a76a34cc12854a4ecd578ce1b1c121e42e8c8f654757fcba13849a39fccde0d619de9ee3567a8f9fa2c8fc0
+  checksum: 10/07bb3a09028ee7b8e8ede6e6390e3b3aecc5cf9adb2fc5475ff58036c552b8a3f8e63d4c43211a60545f3307cdc15919f0e54cb5455d9546daed162dc54ff94e
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.25.8":
-  version: 7.25.8
-  resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.25.8"
+"@babel/plugin-transform-nullish-coalescing-operator@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-nullish-coalescing-operator@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/d742fedc1abf404d7f40065cdff9afc521236607f0d06c48d1e471f43d3a7471010d1651ba4758d80c73347a39dc278d86c43a9c814382ded4e9c7c519ace021
+  checksum: 10/26e03b1c2c0408cc300e46d8f8cb639653ff3a7b03456d0d8afbb53c44f33a89323f51d99991dade3a5676921119bbdf869728bb7911799b5ef99ffafa2cdd24
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-numeric-separator@npm:^7.25.8":
-  version: 7.25.8
-  resolution: "@babel/plugin-transform-numeric-separator@npm:7.25.8"
+"@babel/plugin-transform-numeric-separator@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-numeric-separator@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/e27779a309dbc5fdba71d7eae0eac5506547632b0cbf8f0add8215797bbda4f4e61595750236fee3292600cc2d13892f133beccc52b2998534e0b10c668db857
+  checksum: 10/0528ef041ed88e8c3f51624ee87b8182a7f246fe4013f0572788e0727d20795b558f2b82e3989b5dd416cbd339500f0d88857de41b6d3b6fdacb1d5344bcc5b1
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-object-rest-spread@npm:^7.25.8":
-  version: 7.25.8
-  resolution: "@babel/plugin-transform-object-rest-spread@npm:7.25.8"
+"@babel/plugin-transform-object-rest-spread@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-object-rest-spread@npm:7.25.9"
   dependencies:
-    "@babel/helper-compilation-targets": "npm:^7.25.7"
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
-    "@babel/plugin-transform-parameters": "npm:^7.25.7"
+    "@babel/helper-compilation-targets": "npm:^7.25.9"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
+    "@babel/plugin-transform-parameters": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/38f0fab8321a0b1e44784b7371f8bd5601eb885a7e9d88d7904dedda33a72f500d84792758c47e1541336c1b7592b6d956a85c2fd8e2e294f34c0303cc73442c
+  checksum: 10/a157ac5af2721090150858f301d9c0a3a0efb8ef66b90fce326d6cc0ae45ab97b6219b3e441bf8d72a2287e95eb04dd6c12544da88ea2345e70b3fac2c0ac9e2
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-object-super@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-object-super@npm:7.25.7"
+"@babel/plugin-transform-object-super@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-object-super@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
-    "@babel/helper-replace-supers": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
+    "@babel/helper-replace-supers": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/c033337d27f98a255509c3ac152a54ce25d707b7969a64ba5262c7ddb54ba962da081fe756ce922caa57d782cacc6705e3d8e74364938391170f043eb9c5905e
+  checksum: 10/1817b5d8b80e451ae1ad9080cca884f4f16df75880a158947df76a2ed8ab404d567a7dce71dd8051ef95f90fbe3513154086a32aba55cc76027f6cbabfbd7f98
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-optional-catch-binding@npm:^7.25.8":
-  version: 7.25.8
-  resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.25.8"
+"@babel/plugin-transform-optional-catch-binding@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-optional-catch-binding@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/9ecf32accc5b12b83ce2f6537c9eac87f2b0f89abfe91a8a8c87ea5ece05820988415271d0fdaf7f565e2c0c837afb24fc644779029b98b1401782d9c0d73642
+  checksum: 10/b46a8d1e91829f3db5c252583eb00d05a779b4660abeea5500fda0f8ffa3584fd18299443c22f7fddf0ed9dfdb73c782c43b445dc468d4f89803f2356963b406
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-optional-chaining@npm:^7.25.7, @babel/plugin-transform-optional-chaining@npm:^7.25.8":
-  version: 7.25.8
-  resolution: "@babel/plugin-transform-optional-chaining@npm:7.25.8"
+"@babel/plugin-transform-optional-chaining@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-optional-chaining@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
-    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/ffb5d81e6dbb28907d5346c8e12a1ed1ea0e30170fbe609d48d0466cdbc9d11b5774c8781682693f7cf7bd39da6111980e54813af96c6b3086dc769369c67d28
+  checksum: 10/bc838a499fd9892e163b8bc9bfbc4bf0b28cc3232ee0a6406ae078257c8096518f871d09b4a32c11f4a2d6953c3bc1984619ef748f7ad45aed0b0d9689a8eb36
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-parameters@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-parameters@npm:7.25.7"
+"@babel/plugin-transform-parameters@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-parameters@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/c6a77fece85b3fd7323ec4ecc62329932b92c2c1ec20f1cc7617d3e49cc175f143988e756f5ccc45deca0fe582040afa67eeefd1704a8188cf2dc437efcfaf53
+  checksum: 10/014009a1763deb41fe9f0dbca2c4489ce0ac83dd87395f488492e8eb52399f6c883d5bd591bae3b8836f2460c3937fcebd07e57dce1e0bfe30cdbc63fdfc9d3a
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-private-methods@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-private-methods@npm:7.25.7"
+"@babel/plugin-transform-private-methods@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-private-methods@npm:7.25.9"
   dependencies:
-    "@babel/helper-create-class-features-plugin": "npm:^7.25.7"
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-create-class-features-plugin": "npm:^7.25.9"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/79506a74334dc77f6c53f44109f0a3fcf6c50410faa5dd5e5d17ac4b73194098de509f5515a7aed3724a4bfa5dd246517e22a1dff4c20fc052df7a189bf2160d
+  checksum: 10/6e3671b352c267847c53a170a1937210fa8151764d70d25005e711ef9b21969aaf422acc14f9f7fb86bc0e4ec43e7aefcc0ad9196ae02d262ec10f509f126a58
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-private-property-in-object@npm:^7.25.8":
-  version: 7.25.8
-  resolution: "@babel/plugin-transform-private-property-in-object@npm:7.25.8"
+"@babel/plugin-transform-private-property-in-object@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-private-property-in-object@npm:7.25.9"
   dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.25.7"
-    "@babel/helper-create-class-features-plugin": "npm:^7.25.7"
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-annotate-as-pure": "npm:^7.25.9"
+    "@babel/helper-create-class-features-plugin": "npm:^7.25.9"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/c612023879930c951e3a993104bbc3b78169aef6c38233758ee3358a7ab76954b41880bca67635df218dc6893aabad138f3783d508dc715419e62c8d1fad9088
+  checksum: 10/aa45bb5669b610afa763d774a4b5583bb60ce7d38e4fd2dedfd0703e73e25aa560e6c6124e155aa90b101601743b127d9e5d3eb00989a7e4b4ab9c2eb88475ba
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-property-literals@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-property-literals@npm:7.25.7"
+"@babel/plugin-transform-property-literals@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-property-literals@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/f8be4090e9ffa9eebaca5eab4534de16acc5c84a476649cfed532de564817fc982a47d9349e6e447c510786897625153f60740fe9128b40d3a1eae3bbb5e1438
+  checksum: 10/436046ab07d54a9b44a384eeffec701d4e959a37a7547dda72e069e751ca7ff753d1782a8339e354b97c78a868b49ea97bf41bf5a44c6d7a3c0a05ad40eeb49c
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-display-name@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-react-display-name@npm:7.25.7"
+"@babel/plugin-transform-react-display-name@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-react-display-name@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/2785dda2f1b5379692f9095bffbd412dd1c49f41096d111c2fba1fba7202f4eed558c675df1bbfdcd44590013f8d2b7e6fc84443866e8a5c9bd51cf95f79cbdb
+  checksum: 10/dc7affde0ed98e40f629ee92a2fc44fbd8008aabda1ddb3f5bd2632699d3289b08dff65b26cf3b89dab46397ec440f453d19856bbb3a9a83df5b4ac6157c5c39
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-jsx-development@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-react-jsx-development@npm:7.25.7"
+"@babel/plugin-transform-react-jsx-development@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-react-jsx-development@npm:7.25.9"
   dependencies:
-    "@babel/plugin-transform-react-jsx": "npm:^7.25.7"
+    "@babel/plugin-transform-react-jsx": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/6e6e8f9f9fc5393b932fb646188d6df9f270b37ab31560a5f3622b373ccb9fbf3d1976b3fb1b899541d25c1fa504d315fb4f8473d53bd57ad614e523f1ecf2c1
+  checksum: 10/537d38369537f1eb56041c4b770bc0733fde1801a7f5ffef40a1217ea448f33ee2fa8e6098a58a82fd00e432c1b9426a66849496da419020c9eca3b1b1a23779
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-jsx-self@npm:^7.21.0":
-  version: 7.21.0
-  resolution: "@babel/plugin-transform-react-jsx-self@npm:7.21.0"
+"@babel/plugin-transform-react-jsx-self@npm:^7.24.7":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-react-jsx-self@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.20.2"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/696f74c04a265409ccd46e333ff762e6011d394e6972128b5d97db4c1647289141bc7ebd45ab2bab99b60932f9793e8f89ee9432d3bde19962de2100456f6147
+  checksum: 10/41c833cd7f91b1432710f91b1325706e57979b2e8da44e83d86312c78bbe96cd9ef778b4e79e4e17ab25fa32c72b909f2be7f28e876779ede28e27506c41f4ae
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-jsx-source@npm:^7.19.6":
-  version: 7.19.6
-  resolution: "@babel/plugin-transform-react-jsx-source@npm:7.19.6"
+"@babel/plugin-transform-react-jsx-source@npm:^7.24.7":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-react-jsx-source@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.19.0"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/1e9e29a4efc5b79840bd4f68e404f5ab7765ce48c7bd22f12f2b185f9c782c66933bdf54a1b21879e4e56e6b50b4e88aca82789ecb1f61123af6dfa9ab16c555
+  checksum: 10/a3e0e5672e344e9d01fb20b504fe29a84918eaa70cec512c4d4b1b035f72803261257343d8e93673365b72c371f35cf34bb0d129720bf178a4c87812c8b9c662
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-jsx@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-react-jsx@npm:7.25.7"
+"@babel/plugin-transform-react-jsx@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-react-jsx@npm:7.25.9"
   dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.25.7"
-    "@babel/helper-module-imports": "npm:^7.25.7"
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
-    "@babel/plugin-syntax-jsx": "npm:^7.25.7"
-    "@babel/types": "npm:^7.25.7"
+    "@babel/helper-annotate-as-pure": "npm:^7.25.9"
+    "@babel/helper-module-imports": "npm:^7.25.9"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
+    "@babel/plugin-syntax-jsx": "npm:^7.25.9"
+    "@babel/types": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/9f87990b39c68dc6441b55bf9b530c89e8cfc7a610e250dfd8002d94a6b806a585fe7cc9318540e4e635eb819fdaf15a42fd5e8a2ec3f8949bd7a5c759b558d3
+  checksum: 10/eb179ecdf0ae19aed254105cf78fbac35f9983f51ed04b7b67c863a4820a70a879bd5da250ac518321f86df20eac010e53e3411c8750c386d51da30e4814bfb6
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-pure-annotations@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-react-pure-annotations@npm:7.25.7"
+"@babel/plugin-transform-react-pure-annotations@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-react-pure-annotations@npm:7.25.9"
   dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.25.7"
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-annotate-as-pure": "npm:^7.25.9"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/a0bb666ef2c0209d5c7f637b17587f7a6782dbb135475f836bfe59b2f9eb193821653d6291866fc643b8ca0cef56989a9648c6127727d630808fc6de6fa180ca
+  checksum: 10/9995c0fc7c25d3aaaa0ce84233de02eab2564ea111d0813ec5baa538eb21520402879cc787ad1ad4c2061b99cebc3beb09910e64c9592e8ccb42ae62d9e4fd9a
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-regenerator@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-regenerator@npm:7.25.7"
+"@babel/plugin-transform-regenerator@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-regenerator@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
     regenerator-transform: "npm:^0.15.2"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/7a68e841b12b5f767d98ee650aa914ea246d99cc84de054bdb331185894c0fa554ec4296f32d65385e3012dcf083a098e06c14e518056d7e8a0804227a12d85d
+  checksum: 10/1c09e8087b476c5967282c9790fb8710e065eda77c60f6cb5da541edd59ded9d003d96f8ef640928faab4a0b35bf997673499a194973da4f0c97f0935807a482
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-reserved-words@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-reserved-words@npm:7.25.7"
+"@babel/plugin-transform-regexp-modifiers@npm:^7.26.0":
+  version: 7.26.0
+  resolution: "@babel/plugin-transform-regexp-modifiers@npm:7.26.0"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.25.9"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
+  peerDependencies:
+    "@babel/core": ^7.0.0
+  checksum: 10/726deca486bbd4b176f8a966eb0f4aabc19d9def3b8dabb8b3a656778eca0df1fda3f3c92b213aa5a184232fdafd5b7bd73b4e24ca4345c498ef6baff2bda4e1
+  languageName: node
+  linkType: hard
+
+"@babel/plugin-transform-reserved-words@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-reserved-words@npm:7.25.9"
+  dependencies:
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/484edb3f4aa52f49914bea5f832fe380d159fff44e007ac9063666cf773bc258ef5b741f5a323167087bfd6a6dd5c2f96556d1ce5b3765bdf3a54fc018f3670d
+  checksum: 10/8beda04481b25767acbd1f6b9ef7b3a9c12fbd9dcb24df45a6ad120e1dc4b247c073db60ac742f9093657d6d8c050501fc0606af042f81a3bb6a3ff862cddc47
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-runtime@npm:~7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-runtime@npm:7.25.7"
+"@babel/plugin-transform-runtime@npm:~7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-runtime@npm:7.25.9"
   dependencies:
-    "@babel/helper-module-imports": "npm:^7.25.7"
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-module-imports": "npm:^7.25.9"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
     babel-plugin-polyfill-corejs2: "npm:^0.4.10"
     babel-plugin-polyfill-corejs3: "npm:^0.10.6"
     babel-plugin-polyfill-regenerator: "npm:^0.6.1"
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/45a829b6748758f311e483ead6e874a8cc885a4cdb258582fd01221d055649f3ccf08e0eee8d2d6611c05affdde3bbda354c08ad0a6b6258c2d45d87399b7660
+  checksum: 10/d8d4f04a47cfc1a6103ecee8604750ba2184cd947ee1696cdc363639f0d4a3848839e20f0ca63511af9ad6742f7dd813cca5b2640353f7b0816bbc17ff0e9e88
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-shorthand-properties@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-shorthand-properties@npm:7.25.7"
+"@babel/plugin-transform-shorthand-properties@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-shorthand-properties@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/71c9c1d77887ffa452b2d7c9026ee8e40596e4b4208b077369a997e4e031b474ab08c2991b882a9883b78d7cd6d0d2a2b73345b17e195577b28538360b36f914
+  checksum: 10/f774995d58d4e3a992b732cf3a9b8823552d471040e280264dd15e0735433d51b468fef04d75853d061309389c66bda10ce1b298297ce83999220eb0ad62741d
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-spread@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-spread@npm:7.25.7"
+"@babel/plugin-transform-spread@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-spread@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
-    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/5dd9e269241fccfdb8c9ac9cb21c53fa776113c3cee0ea92bb029940c6231b3bc7c0c70e13e5df220b80cfafe8683264cadff5b182bed9fd1b1317557f1a6c2d
+  checksum: 10/fe72c6545267176cdc9b6f32f30f9ced37c1cafa1290e4436b83b8f377b4f1c175dad404228c96e3efdec75da692f15bfb9db2108fcd9ad260bc9968778ee41e
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-sticky-regex@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-sticky-regex@npm:7.25.7"
+"@babel/plugin-transform-sticky-regex@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-sticky-regex@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/9f918281fdf2661a095d53ce8b981acaec0fef2a133af4a4fb66132c7a8ad509c49f444ee140bfa5821db24f987d278b3886d3f04e6ba94a6a55c7b2ed024443
+  checksum: 10/7454b00844dbe924030dd15e2b3615b36e196500c4c47e98dabc6b37a054c5b1038ecd437e910aabf0e43bf56b973cb148d3437d50f6e2332d8309568e3e979b
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-template-literals@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-template-literals@npm:7.25.7"
+"@babel/plugin-transform-template-literals@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-template-literals@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/bdb541c31d4890a0aea4cf73a897975b69372cc524302ee9b375424d1706c38d1344b891c14ad2cbc3926e9553ffc2596772e8dab5982e09a9da0d959e4a1e92
+  checksum: 10/92eb1d6e2d95bd24abbb74fa7640d02b66ff6214e0bb616d7fda298a7821ce15132a4265d576a3502a347a3c9e94b6c69ed265bb0784664592fa076785a3d16a
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-typeof-symbol@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.25.7"
+"@babel/plugin-transform-typeof-symbol@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-typeof-symbol@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/1145d65dbf720837b0a1bdcdb2b8b0a761587f3602703ba42209e06b6b8d81801a2041671a881ed0cff6866acec4f7c17031f8540017f2d53913584e152453db
+  checksum: 10/3ae240358f0b0cd59f8610d6c59d395c216fd1bab407f7de58b86d592f030fb42b4d18e2456a29bee4a2ff014c4c1e3404c8ae64462b1155d1c053b2f9d73438
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-typescript@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-typescript@npm:7.25.7"
+"@babel/plugin-transform-typescript@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-typescript@npm:7.25.9"
   dependencies:
-    "@babel/helper-annotate-as-pure": "npm:^7.25.7"
-    "@babel/helper-create-class-features-plugin": "npm:^7.25.7"
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
-    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.25.7"
-    "@babel/plugin-syntax-typescript": "npm:^7.25.7"
+    "@babel/helper-annotate-as-pure": "npm:^7.25.9"
+    "@babel/helper-create-class-features-plugin": "npm:^7.25.9"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
+    "@babel/helper-skip-transparent-expression-wrappers": "npm:^7.25.9"
+    "@babel/plugin-syntax-typescript": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/2648da981cd71c2100a4ea496684f2c0b939fc77eb4bb9cc8f113d433eab17d4930d2e5ed8d280606bcedef58df99002a64dc92579c6cc7f6c6ee71ceaa77418
+  checksum: 10/91e2ec805f89a813e0bf9cf42dffb767f798429e983af3e2f919885a2826b10f29223dd8b40ccc569eb61858d3273620e82e14431603a893e4a7f9b4c1a3a3cf
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-escapes@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-unicode-escapes@npm:7.25.7"
+"@babel/plugin-transform-unicode-escapes@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-unicode-escapes@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/3c8d5b36738690c2d0b843fcc213a18766e617d16b6cfd92f13be2eba025228b6a796fd8e5b6e209daffa1b453c52544bf62e40b917a32c7446184fef52c98fc
+  checksum: 10/f138cbee539963fb3da13f684e6f33c9f7495220369ae12a682b358f1e25ac68936825562c38eae87f01ac9992b2129208b35ec18533567fc805ce5ed0ffd775
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-property-regex@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-unicode-property-regex@npm:7.25.7"
+"@babel/plugin-transform-unicode-property-regex@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-unicode-property-regex@npm:7.25.9"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": "npm:^7.25.7"
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.25.9"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/cccdddc6837f5e82f0aca59fd77dbab5efd5024dcd6d358efc74faccb4892f69e943f7750f613fcc241f33973fe8622a7e96909305697e7e5868f8e9954cb84e
+  checksum: 10/201f6f46c1beb399e79aa208b94c5d54412047511795ce1e790edcd189cef73752e6a099fdfc01b3ad12205f139ae344143b62f21f44bbe02338a95e8506a911
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-regex@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-unicode-regex@npm:7.25.7"
+"@babel/plugin-transform-unicode-regex@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-unicode-regex@npm:7.25.9"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": "npm:^7.25.7"
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.25.9"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/1a5a068d39741febd9b8cfce7bf4abf79b282a13c29d39ef7685bffdeb65e5d595e23d9630fedd34428a144d96701efed5a48ea1db0c250c4daf53f44da52983
+  checksum: 10/e8baae867526e179467c6ef5280d70390fa7388f8763a19a27c21302dd59b121032568be080749514b097097ceb9af716bf4b90638f1b3cf689aa837ba20150f
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-unicode-sets-regex@npm:^7.25.7":
-  version: 7.25.7
-  resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.25.7"
+"@babel/plugin-transform-unicode-sets-regex@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/plugin-transform-unicode-sets-regex@npm:7.25.9"
   dependencies:
-    "@babel/helper-create-regexp-features-plugin": "npm:^7.25.7"
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
+    "@babel/helper-create-regexp-features-plugin": "npm:^7.25.9"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0
-  checksum: 10/c06dd8e66704fc60a97ce2555fa9f6cdfa98bb935a811b15e811cf3a8b5723e508e92b24077163ad704ddce56115062b8cf2f5490d1ad7d23f863d93a8125f89
+  checksum: 10/4445ef20de687cb4dcc95169742a8d9013d680aa5eee9186d8e25875bbfa7ee5e2de26a91177ccf70b1db518e36886abcd44750d28db5d7a9539f0efa6839f4b
   languageName: node
   linkType: hard
 
-"@babel/preset-env@npm:~7.25.8":
-  version: 7.25.8
-  resolution: "@babel/preset-env@npm:7.25.8"
+"@babel/preset-env@npm:~7.26.0":
+  version: 7.26.0
+  resolution: "@babel/preset-env@npm:7.26.0"
   dependencies:
-    "@babel/compat-data": "npm:^7.25.8"
-    "@babel/helper-compilation-targets": "npm:^7.25.7"
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
-    "@babel/helper-validator-option": "npm:^7.25.7"
-    "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "npm:^7.25.7"
-    "@babel/plugin-bugfix-safari-class-field-initializer-scope": "npm:^7.25.7"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "npm:^7.25.7"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "npm:^7.25.7"
-    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "npm:^7.25.7"
+    "@babel/compat-data": "npm:^7.26.0"
+    "@babel/helper-compilation-targets": "npm:^7.25.9"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
+    "@babel/helper-validator-option": "npm:^7.25.9"
+    "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "npm:^7.25.9"
+    "@babel/plugin-bugfix-safari-class-field-initializer-scope": "npm:^7.25.9"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "npm:^7.25.9"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "npm:^7.25.9"
+    "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "npm:^7.25.9"
     "@babel/plugin-proposal-private-property-in-object": "npm:7.21.0-placeholder-for-preset-env.2"
-    "@babel/plugin-syntax-import-assertions": "npm:^7.25.7"
-    "@babel/plugin-syntax-import-attributes": "npm:^7.25.7"
+    "@babel/plugin-syntax-import-assertions": "npm:^7.26.0"
+    "@babel/plugin-syntax-import-attributes": "npm:^7.26.0"
     "@babel/plugin-syntax-unicode-sets-regex": "npm:^7.18.6"
-    "@babel/plugin-transform-arrow-functions": "npm:^7.25.7"
-    "@babel/plugin-transform-async-generator-functions": "npm:^7.25.8"
-    "@babel/plugin-transform-async-to-generator": "npm:^7.25.7"
-    "@babel/plugin-transform-block-scoped-functions": "npm:^7.25.7"
-    "@babel/plugin-transform-block-scoping": "npm:^7.25.7"
-    "@babel/plugin-transform-class-properties": "npm:^7.25.7"
-    "@babel/plugin-transform-class-static-block": "npm:^7.25.8"
-    "@babel/plugin-transform-classes": "npm:^7.25.7"
-    "@babel/plugin-transform-computed-properties": "npm:^7.25.7"
-    "@babel/plugin-transform-destructuring": "npm:^7.25.7"
-    "@babel/plugin-transform-dotall-regex": "npm:^7.25.7"
-    "@babel/plugin-transform-duplicate-keys": "npm:^7.25.7"
-    "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "npm:^7.25.7"
-    "@babel/plugin-transform-dynamic-import": "npm:^7.25.8"
-    "@babel/plugin-transform-exponentiation-operator": "npm:^7.25.7"
-    "@babel/plugin-transform-export-namespace-from": "npm:^7.25.8"
-    "@babel/plugin-transform-for-of": "npm:^7.25.7"
-    "@babel/plugin-transform-function-name": "npm:^7.25.7"
-    "@babel/plugin-transform-json-strings": "npm:^7.25.8"
-    "@babel/plugin-transform-literals": "npm:^7.25.7"
-    "@babel/plugin-transform-logical-assignment-operators": "npm:^7.25.8"
-    "@babel/plugin-transform-member-expression-literals": "npm:^7.25.7"
-    "@babel/plugin-transform-modules-amd": "npm:^7.25.7"
-    "@babel/plugin-transform-modules-commonjs": "npm:^7.25.7"
-    "@babel/plugin-transform-modules-systemjs": "npm:^7.25.7"
-    "@babel/plugin-transform-modules-umd": "npm:^7.25.7"
-    "@babel/plugin-transform-named-capturing-groups-regex": "npm:^7.25.7"
-    "@babel/plugin-transform-new-target": "npm:^7.25.7"
-    "@babel/plugin-transform-nullish-coalescing-operator": "npm:^7.25.8"
-    "@babel/plugin-transform-numeric-separator": "npm:^7.25.8"
-    "@babel/plugin-transform-object-rest-spread": "npm:^7.25.8"
-    "@babel/plugin-transform-object-super": "npm:^7.25.7"
-    "@babel/plugin-transform-optional-catch-binding": "npm:^7.25.8"
-    "@babel/plugin-transform-optional-chaining": "npm:^7.25.8"
-    "@babel/plugin-transform-parameters": "npm:^7.25.7"
-    "@babel/plugin-transform-private-methods": "npm:^7.25.7"
-    "@babel/plugin-transform-private-property-in-object": "npm:^7.25.8"
-    "@babel/plugin-transform-property-literals": "npm:^7.25.7"
-    "@babel/plugin-transform-regenerator": "npm:^7.25.7"
-    "@babel/plugin-transform-reserved-words": "npm:^7.25.7"
-    "@babel/plugin-transform-shorthand-properties": "npm:^7.25.7"
-    "@babel/plugin-transform-spread": "npm:^7.25.7"
-    "@babel/plugin-transform-sticky-regex": "npm:^7.25.7"
-    "@babel/plugin-transform-template-literals": "npm:^7.25.7"
-    "@babel/plugin-transform-typeof-symbol": "npm:^7.25.7"
-    "@babel/plugin-transform-unicode-escapes": "npm:^7.25.7"
-    "@babel/plugin-transform-unicode-property-regex": "npm:^7.25.7"
-    "@babel/plugin-transform-unicode-regex": "npm:^7.25.7"
-    "@babel/plugin-transform-unicode-sets-regex": "npm:^7.25.7"
+    "@babel/plugin-transform-arrow-functions": "npm:^7.25.9"
+    "@babel/plugin-transform-async-generator-functions": "npm:^7.25.9"
+    "@babel/plugin-transform-async-to-generator": "npm:^7.25.9"
+    "@babel/plugin-transform-block-scoped-functions": "npm:^7.25.9"
+    "@babel/plugin-transform-block-scoping": "npm:^7.25.9"
+    "@babel/plugin-transform-class-properties": "npm:^7.25.9"
+    "@babel/plugin-transform-class-static-block": "npm:^7.26.0"
+    "@babel/plugin-transform-classes": "npm:^7.25.9"
+    "@babel/plugin-transform-computed-properties": "npm:^7.25.9"
+    "@babel/plugin-transform-destructuring": "npm:^7.25.9"
+    "@babel/plugin-transform-dotall-regex": "npm:^7.25.9"
+    "@babel/plugin-transform-duplicate-keys": "npm:^7.25.9"
+    "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "npm:^7.25.9"
+    "@babel/plugin-transform-dynamic-import": "npm:^7.25.9"
+    "@babel/plugin-transform-exponentiation-operator": "npm:^7.25.9"
+    "@babel/plugin-transform-export-namespace-from": "npm:^7.25.9"
+    "@babel/plugin-transform-for-of": "npm:^7.25.9"
+    "@babel/plugin-transform-function-name": "npm:^7.25.9"
+    "@babel/plugin-transform-json-strings": "npm:^7.25.9"
+    "@babel/plugin-transform-literals": "npm:^7.25.9"
+    "@babel/plugin-transform-logical-assignment-operators": "npm:^7.25.9"
+    "@babel/plugin-transform-member-expression-literals": "npm:^7.25.9"
+    "@babel/plugin-transform-modules-amd": "npm:^7.25.9"
+    "@babel/plugin-transform-modules-commonjs": "npm:^7.25.9"
+    "@babel/plugin-transform-modules-systemjs": "npm:^7.25.9"
+    "@babel/plugin-transform-modules-umd": "npm:^7.25.9"
+    "@babel/plugin-transform-named-capturing-groups-regex": "npm:^7.25.9"
+    "@babel/plugin-transform-new-target": "npm:^7.25.9"
+    "@babel/plugin-transform-nullish-coalescing-operator": "npm:^7.25.9"
+    "@babel/plugin-transform-numeric-separator": "npm:^7.25.9"
+    "@babel/plugin-transform-object-rest-spread": "npm:^7.25.9"
+    "@babel/plugin-transform-object-super": "npm:^7.25.9"
+    "@babel/plugin-transform-optional-catch-binding": "npm:^7.25.9"
+    "@babel/plugin-transform-optional-chaining": "npm:^7.25.9"
+    "@babel/plugin-transform-parameters": "npm:^7.25.9"
+    "@babel/plugin-transform-private-methods": "npm:^7.25.9"
+    "@babel/plugin-transform-private-property-in-object": "npm:^7.25.9"
+    "@babel/plugin-transform-property-literals": "npm:^7.25.9"
+    "@babel/plugin-transform-regenerator": "npm:^7.25.9"
+    "@babel/plugin-transform-regexp-modifiers": "npm:^7.26.0"
+    "@babel/plugin-transform-reserved-words": "npm:^7.25.9"
+    "@babel/plugin-transform-shorthand-properties": "npm:^7.25.9"
+    "@babel/plugin-transform-spread": "npm:^7.25.9"
+    "@babel/plugin-transform-sticky-regex": "npm:^7.25.9"
+    "@babel/plugin-transform-template-literals": "npm:^7.25.9"
+    "@babel/plugin-transform-typeof-symbol": "npm:^7.25.9"
+    "@babel/plugin-transform-unicode-escapes": "npm:^7.25.9"
+    "@babel/plugin-transform-unicode-property-regex": "npm:^7.25.9"
+    "@babel/plugin-transform-unicode-regex": "npm:^7.25.9"
+    "@babel/plugin-transform-unicode-sets-regex": "npm:^7.25.9"
     "@babel/preset-modules": "npm:0.1.6-no-external-plugins"
     babel-plugin-polyfill-corejs2: "npm:^0.4.10"
     babel-plugin-polyfill-corejs3: "npm:^0.10.6"
@@ -2503,7 +2692,7 @@ __metadata:
     semver: "npm:^6.3.1"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/501d78f56df8bf6f98a42da5db475db183048c4280b3292cf988b6baf01843915161f3b341ed525e2fcafcc47726798532b0e1dc7eb80aa29cc88c9d6f94ee6e
+  checksum: 10/a7a80314f845deea713985a6316361c476621c76cfe5c6c28e8b9558f01634b49bbfdd3581ef94b5d6cff5c2b8830468aa53a73f5b5c1224db2dfea5db7e676f
   languageName: node
   linkType: hard
 
@@ -2520,40 +2709,40 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/preset-react@npm:~7.25.7":
-  version: 7.25.7
-  resolution: "@babel/preset-react@npm:7.25.7"
+"@babel/preset-react@npm:~7.25.9":
+  version: 7.25.9
+  resolution: "@babel/preset-react@npm:7.25.9"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
-    "@babel/helper-validator-option": "npm:^7.25.7"
-    "@babel/plugin-transform-react-display-name": "npm:^7.25.7"
-    "@babel/plugin-transform-react-jsx": "npm:^7.25.7"
-    "@babel/plugin-transform-react-jsx-development": "npm:^7.25.7"
-    "@babel/plugin-transform-react-pure-annotations": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
+    "@babel/helper-validator-option": "npm:^7.25.9"
+    "@babel/plugin-transform-react-display-name": "npm:^7.25.9"
+    "@babel/plugin-transform-react-jsx": "npm:^7.25.9"
+    "@babel/plugin-transform-react-jsx-development": "npm:^7.25.9"
+    "@babel/plugin-transform-react-pure-annotations": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/4701a76b45f33b72efc93540e09204ac84eb2b8054de9570d041b6f952477efca2a6c7c916389a1aea4d408c38ebbc997148d693d9aa72d1b4df9a3b4b557c7c
+  checksum: 10/3c9daf47cf51568d96984d21b9f83992590c0e91f16a333f999100bb3c2c200730cde6806ed37fd2c999e0a63becefc881740b8f765b5a4aff4efc674e3e4197
   languageName: node
   linkType: hard
 
-"@babel/preset-typescript@npm:~7.25.7":
-  version: 7.25.7
-  resolution: "@babel/preset-typescript@npm:7.25.7"
+"@babel/preset-typescript@npm:~7.26.0":
+  version: 7.26.0
+  resolution: "@babel/preset-typescript@npm:7.26.0"
   dependencies:
-    "@babel/helper-plugin-utils": "npm:^7.25.7"
-    "@babel/helper-validator-option": "npm:^7.25.7"
-    "@babel/plugin-syntax-jsx": "npm:^7.25.7"
-    "@babel/plugin-transform-modules-commonjs": "npm:^7.25.7"
-    "@babel/plugin-transform-typescript": "npm:^7.25.7"
+    "@babel/helper-plugin-utils": "npm:^7.25.9"
+    "@babel/helper-validator-option": "npm:^7.25.9"
+    "@babel/plugin-syntax-jsx": "npm:^7.25.9"
+    "@babel/plugin-transform-modules-commonjs": "npm:^7.25.9"
+    "@babel/plugin-transform-typescript": "npm:^7.25.9"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/cf6501971f696800096f3b3aef4f7e2c774210b4204bb3a076b2f253970d6649c28003de3afc620b7c7ad67fb346083819c89bae2c644f59995ddb64d6003541
+  checksum: 10/81a60826160163a3daae017709f42147744757b725b50c9024ef3ee5a402ee45fd2e93eaecdaaa22c81be91f7940916249cfb7711366431cfcacc69c95878c03
   languageName: node
   linkType: hard
 
-"@babel/register@npm:~7.25.7":
-  version: 7.25.7
-  resolution: "@babel/register@npm:7.25.7"
+"@babel/register@npm:~7.25.9":
+  version: 7.25.9
+  resolution: "@babel/register@npm:7.25.9"
   dependencies:
     clone-deep: "npm:^4.0.1"
     find-cache-dir: "npm:^2.0.0"
@@ -2562,7 +2751,7 @@ __metadata:
     source-map-support: "npm:^0.5.16"
   peerDependencies:
     "@babel/core": ^7.0.0-0
-  checksum: 10/bb375399aea6d13b92eb4e40befb5ca8ec226d753aa3ff8d9be2c284805a133e3afe7128a7b103af7abb164868c273bd80ea9a9e55a9ec38ef17df4b977f1cd7
+  checksum: 10/eb0192c2e83566043b9777062c50567c869bbe9ed65cbeece25a3f0c07c7763199d8008b7b860cb0090d6f4f2ab1b590adf29b539115c260566e44296e0559fb
   languageName: node
   linkType: hard
 
@@ -2573,7 +2762,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.20.1, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.22.5, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.2, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2":
+"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.15.4, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.17.8, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.22.5, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.2, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2":
   version: 7.24.4
   resolution: "@babel/runtime@npm:7.24.4"
   dependencies:
@@ -2582,12 +2771,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/runtime@npm:~7.25.7":
-  version: 7.25.7
-  resolution: "@babel/runtime@npm:7.25.7"
+"@babel/runtime@npm:^7.21.0":
+  version: 7.25.9
+  resolution: "@babel/runtime@npm:7.25.9"
   dependencies:
     regenerator-runtime: "npm:^0.14.0"
-  checksum: 10/73411fe0f1bff3a962586cef05b30f49e554b6563767e6d84f7d79d605b2c20e7fc3df291a3aebef69043181a8f893afdab9e6672557a5c2d08b9377d6f678cd
+  checksum: 10/8d904cfcb433374b3bb90369452751c94ae69547cdd3679950de4527ac5d04195b9c4a1840482a6f3a84694cb22a6403a7f98b826d60cd945918223a4a6b479c
+  languageName: node
+  linkType: hard
+
+"@babel/runtime@npm:~7.26.0":
+  version: 7.26.0
+  resolution: "@babel/runtime@npm:7.26.0"
+  dependencies:
+    regenerator-runtime: "npm:^0.14.0"
+  checksum: 10/9f4ea1c1d566c497c052d505587554e782e021e6ccd302c2ad7ae8291c8e16e3f19d4a7726fb64469e057779ea2081c28b7dbefec6d813a22f08a35712c0f699
   languageName: node
   linkType: hard
 
@@ -2624,6 +2822,32 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@babel/template@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/template@npm:7.25.9"
+  dependencies:
+    "@babel/code-frame": "npm:^7.25.9"
+    "@babel/parser": "npm:^7.25.9"
+    "@babel/types": "npm:^7.25.9"
+  checksum: 10/e861180881507210150c1335ad94aff80fd9e9be6202e1efa752059c93224e2d5310186ddcdd4c0f0b0fc658ce48cb47823f15142b5c00c8456dde54f5de80b2
+  languageName: node
+  linkType: hard
+
+"@babel/traverse@npm:^7.16.0, @babel/traverse@npm:^7.25.9":
+  version: 7.25.9
+  resolution: "@babel/traverse@npm:7.25.9"
+  dependencies:
+    "@babel/code-frame": "npm:^7.25.9"
+    "@babel/generator": "npm:^7.25.9"
+    "@babel/parser": "npm:^7.25.9"
+    "@babel/template": "npm:^7.25.9"
+    "@babel/types": "npm:^7.25.9"
+    debug: "npm:^4.3.1"
+    globals: "npm:^11.1.0"
+  checksum: 10/7431614d76d4a053e429208db82f2846a415833f3d9eb2e11ef72eeb3c64dfd71f4a4d983de1a4a047b36165a1f5a64de8ca2a417534cc472005c740ffcb9c6a
+  languageName: node
+  linkType: hard
+
 "@babel/traverse@npm:^7.18.9, @babel/traverse@npm:^7.25.7":
   version: 7.25.7
   resolution: "@babel/traverse@npm:7.25.7"
@@ -2705,10 +2929,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@base2/pretty-print-object@npm:1.0.1":
-  version: 1.0.1
-  resolution: "@base2/pretty-print-object@npm:1.0.1"
-  checksum: 10/c1b78a521ac712baa076589f3bc81318d07c34a5747e9177b6af37043592252587d98f9b7b59ec174968c6bea31a99fe4d7884121173a449b75fe602b7eb2839
+"@babel/types@npm:^7.25.9, @babel/types@npm:^7.26.0":
+  version: 7.26.0
+  resolution: "@babel/types@npm:7.26.0"
+  dependencies:
+    "@babel/helper-string-parser": "npm:^7.25.9"
+    "@babel/helper-validator-identifier": "npm:^7.25.9"
+  checksum: 10/40780741ecec886ed9edae234b5eb4976968cc70d72b4e5a40d55f83ff2cc457de20f9b0f4fe9d858350e43dab0ea496e7ef62e2b2f08df699481a76df02cd6e
   languageName: node
   linkType: hard
 
@@ -2808,15 +3035,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@changesets/apply-release-plan@npm:^6.1.4":
-  version: 6.1.4
-  resolution: "@changesets/apply-release-plan@npm:6.1.4"
+"@changesets/apply-release-plan@npm:^7.0.5":
+  version: 7.0.5
+  resolution: "@changesets/apply-release-plan@npm:7.0.5"
   dependencies:
-    "@babel/runtime": "npm:^7.20.1"
-    "@changesets/config": "npm:^2.3.1"
-    "@changesets/get-version-range-type": "npm:^0.3.2"
-    "@changesets/git": "npm:^2.0.0"
-    "@changesets/types": "npm:^5.2.1"
+    "@changesets/config": "npm:^3.0.3"
+    "@changesets/get-version-range-type": "npm:^0.4.0"
+    "@changesets/git": "npm:^3.0.1"
+    "@changesets/should-skip-package": "npm:^0.1.1"
+    "@changesets/types": "npm:^6.0.0"
     "@manypkg/get-packages": "npm:^1.1.3"
     detect-indent: "npm:^6.0.0"
     fs-extra: "npm:^7.0.1"
@@ -2825,195 +3052,194 @@ __metadata:
     prettier: "npm:^2.7.1"
     resolve-from: "npm:^5.0.0"
     semver: "npm:^7.5.3"
-  checksum: 10/882858d37e988f789102d2aed93b37077461a36f9e7b81ff011726d162bbfd3850d9bda9b900544394cc1f72112581d101ea40edf911a1ca0f6e59a77f482726
+  checksum: 10/4a983e3afb6c3dcd885820eba96189c9e77173ccae94e291cf2eb2264bd9000b4264d1c5295d62f490731beead30dcb6830fcc69e401d3eb80bdd425fb6413c4
   languageName: node
   linkType: hard
 
-"@changesets/assemble-release-plan@npm:^5.2.4":
-  version: 5.2.4
-  resolution: "@changesets/assemble-release-plan@npm:5.2.4"
+"@changesets/assemble-release-plan@npm:^6.0.4":
+  version: 6.0.4
+  resolution: "@changesets/assemble-release-plan@npm:6.0.4"
   dependencies:
-    "@babel/runtime": "npm:^7.20.1"
-    "@changesets/errors": "npm:^0.1.4"
-    "@changesets/get-dependents-graph": "npm:^1.3.6"
-    "@changesets/types": "npm:^5.2.1"
+    "@changesets/errors": "npm:^0.2.0"
+    "@changesets/get-dependents-graph": "npm:^2.1.2"
+    "@changesets/should-skip-package": "npm:^0.1.1"
+    "@changesets/types": "npm:^6.0.0"
     "@manypkg/get-packages": "npm:^1.1.3"
     semver: "npm:^7.5.3"
-  checksum: 10/fc1db5ace2bd96b285719f11c30610b0a66a1ee5c6716cb897c62be6b8d91192f415d3c164a6d02a4efff4ba4a57ea0d29491cb10594a0c365cd0d809633c34b
+  checksum: 10/280f31625bf39763136814a7cf2c0eefa3099c9048a6cdb8ac346fc3c420b111f62186ac436f83fe005ed8384afb3f7e2e88651511c4d9270fcea79ad66bdde7
   languageName: node
   linkType: hard
 
-"@changesets/changelog-git@npm:^0.1.14":
-  version: 0.1.14
-  resolution: "@changesets/changelog-git@npm:0.1.14"
-  dependencies:
-    "@changesets/types": "npm:^5.2.1"
-  checksum: 10/7dde49aced9760c425e10f3c2e83b2fce08bced455476bbaddf929b96d35ee62d2e6bec442b98dc9ea99a771bfdda3706587111578c42d6025e15d32d8f164e8
-  languageName: node
-  linkType: hard
-
-"@changesets/cli@npm:^2.26.2":
-  version: 2.26.2
-  resolution: "@changesets/cli@npm:2.26.2"
-  dependencies:
-    "@babel/runtime": "npm:^7.20.1"
-    "@changesets/apply-release-plan": "npm:^6.1.4"
-    "@changesets/assemble-release-plan": "npm:^5.2.4"
-    "@changesets/changelog-git": "npm:^0.1.14"
-    "@changesets/config": "npm:^2.3.1"
-    "@changesets/errors": "npm:^0.1.4"
-    "@changesets/get-dependents-graph": "npm:^1.3.6"
-    "@changesets/get-release-plan": "npm:^3.0.17"
-    "@changesets/git": "npm:^2.0.0"
-    "@changesets/logger": "npm:^0.0.5"
-    "@changesets/pre": "npm:^1.0.14"
-    "@changesets/read": "npm:^0.5.9"
-    "@changesets/types": "npm:^5.2.1"
-    "@changesets/write": "npm:^0.2.3"
+"@changesets/changelog-git@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "@changesets/changelog-git@npm:0.2.0"
+  dependencies:
+    "@changesets/types": "npm:^6.0.0"
+  checksum: 10/631fcb73cab584fefad30f0e7cc8f7624b36be0f199e526c0d53538da16df2776bef8f8eb6511247b8040d011a2582bdb4840275d3f90a046bacbbd717da6c83
+  languageName: node
+  linkType: hard
+
+"@changesets/cli@npm:^2.27.9":
+  version: 2.27.9
+  resolution: "@changesets/cli@npm:2.27.9"
+  dependencies:
+    "@changesets/apply-release-plan": "npm:^7.0.5"
+    "@changesets/assemble-release-plan": "npm:^6.0.4"
+    "@changesets/changelog-git": "npm:^0.2.0"
+    "@changesets/config": "npm:^3.0.3"
+    "@changesets/errors": "npm:^0.2.0"
+    "@changesets/get-dependents-graph": "npm:^2.1.2"
+    "@changesets/get-release-plan": "npm:^4.0.4"
+    "@changesets/git": "npm:^3.0.1"
+    "@changesets/logger": "npm:^0.1.1"
+    "@changesets/pre": "npm:^2.0.1"
+    "@changesets/read": "npm:^0.6.1"
+    "@changesets/should-skip-package": "npm:^0.1.1"
+    "@changesets/types": "npm:^6.0.0"
+    "@changesets/write": "npm:^0.3.2"
     "@manypkg/get-packages": "npm:^1.1.3"
-    "@types/is-ci": "npm:^3.0.0"
-    "@types/semver": "npm:^7.5.0"
     ansi-colors: "npm:^4.1.3"
-    chalk: "npm:^2.1.0"
+    ci-info: "npm:^3.7.0"
     enquirer: "npm:^2.3.0"
     external-editor: "npm:^3.1.0"
     fs-extra: "npm:^7.0.1"
-    human-id: "npm:^1.0.2"
-    is-ci: "npm:^3.0.1"
-    meow: "npm:^6.0.0"
-    outdent: "npm:^0.5.0"
+    mri: "npm:^1.2.0"
     p-limit: "npm:^2.2.0"
-    preferred-pm: "npm:^3.0.0"
+    package-manager-detector: "npm:^0.2.0"
+    picocolors: "npm:^1.1.0"
     resolve-from: "npm:^5.0.0"
     semver: "npm:^7.5.3"
     spawndamnit: "npm:^2.0.0"
     term-size: "npm:^2.1.0"
-    tty-table: "npm:^4.1.5"
   bin:
     changeset: bin.js
-  checksum: 10/3ea8c1a69c7a0c254e3054d10a5ada503ae17b8863f9de8de5b25f2e475d7213555cca133361ab9b97c69e06574a609449f7177134b3c810919f85f78c4c2758
+  checksum: 10/3bb61ae64d6a7740f96a7bc32676eca8180aa2b17b321f66ed889f8a5f805c7dc351ce7b66a6982065e5c7e4faba131d03deb4ac393c68d7d0b9fd0a86c94de2
   languageName: node
   linkType: hard
 
-"@changesets/config@npm:^2.3.1":
-  version: 2.3.1
-  resolution: "@changesets/config@npm:2.3.1"
+"@changesets/config@npm:^3.0.3":
+  version: 3.0.3
+  resolution: "@changesets/config@npm:3.0.3"
   dependencies:
-    "@changesets/errors": "npm:^0.1.4"
-    "@changesets/get-dependents-graph": "npm:^1.3.6"
-    "@changesets/logger": "npm:^0.0.5"
-    "@changesets/types": "npm:^5.2.1"
+    "@changesets/errors": "npm:^0.2.0"
+    "@changesets/get-dependents-graph": "npm:^2.1.2"
+    "@changesets/logger": "npm:^0.1.1"
+    "@changesets/types": "npm:^6.0.0"
     "@manypkg/get-packages": "npm:^1.1.3"
     fs-extra: "npm:^7.0.1"
     micromatch: "npm:^4.0.2"
-  checksum: 10/5b19831829b8c984620594c89f3ead47494b3dd497c1785d6fc3e06ccb62fd95509219e093f4f325d1f3168d98dc97a84611e4bbea17357cbdb466dbe9a0af8c
+  checksum: 10/4c5bc9f4ea3c8f086a2cf1d83d3b949560ccbc988107d53d4515186373d0c25112d531b2f661fd913a85c8b0b4173a2c4ddae528f70fbd5efacc6e5f652896c5
   languageName: node
   linkType: hard
 
-"@changesets/errors@npm:^0.1.4":
-  version: 0.1.4
-  resolution: "@changesets/errors@npm:0.1.4"
+"@changesets/errors@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "@changesets/errors@npm:0.2.0"
   dependencies:
     extendable-error: "npm:^0.1.5"
-  checksum: 10/10734f1379715bf5a70b566dd42b50a75964d76f382bb67332776614454deda6d04a43dd7e727cd7cba56d7f2f7c95a07c7c0a19dd5d64fb1980b28322840733
+  checksum: 10/4b79373f92287af4f723e8dbbccaf0299aa8735fc043243d0ad587f04a7614615ea50180be575d4438b9f00aa82d1cf85e902b77a55bdd3e0a8dd97e77b18c60
   languageName: node
   linkType: hard
 
-"@changesets/get-dependents-graph@npm:^1.3.6":
-  version: 1.3.6
-  resolution: "@changesets/get-dependents-graph@npm:1.3.6"
+"@changesets/get-dependents-graph@npm:^2.1.2":
+  version: 2.1.2
+  resolution: "@changesets/get-dependents-graph@npm:2.1.2"
   dependencies:
-    "@changesets/types": "npm:^5.2.1"
+    "@changesets/types": "npm:^6.0.0"
     "@manypkg/get-packages": "npm:^1.1.3"
-    chalk: "npm:^2.1.0"
-    fs-extra: "npm:^7.0.1"
+    picocolors: "npm:^1.1.0"
     semver: "npm:^7.5.3"
-  checksum: 10/04626cdc4039fee66b3b828f1c29026c5607d2d35fa05ce6489f257178ab1283ebffe8c9b9b19378d40d310674538677cdc21d10cdf4953b0d86edeb7265f06b
+  checksum: 10/36d9877b0b071183b253d894e0dbef56f764fe2ff592064489d4f122c419ab97f0d023c9e078849d0f48b4129f5018c7c81cb380b02d975db5e0768ab29226c1
   languageName: node
   linkType: hard
 
-"@changesets/get-release-plan@npm:^3.0.17":
-  version: 3.0.17
-  resolution: "@changesets/get-release-plan@npm:3.0.17"
+"@changesets/get-release-plan@npm:^4.0.4":
+  version: 4.0.4
+  resolution: "@changesets/get-release-plan@npm:4.0.4"
   dependencies:
-    "@babel/runtime": "npm:^7.20.1"
-    "@changesets/assemble-release-plan": "npm:^5.2.4"
-    "@changesets/config": "npm:^2.3.1"
-    "@changesets/pre": "npm:^1.0.14"
-    "@changesets/read": "npm:^0.5.9"
-    "@changesets/types": "npm:^5.2.1"
+    "@changesets/assemble-release-plan": "npm:^6.0.4"
+    "@changesets/config": "npm:^3.0.3"
+    "@changesets/pre": "npm:^2.0.1"
+    "@changesets/read": "npm:^0.6.1"
+    "@changesets/types": "npm:^6.0.0"
     "@manypkg/get-packages": "npm:^1.1.3"
-  checksum: 10/0b85dcca9a671cdf1ca1a11cf69f909351507c23961b2948ec49ddd982616ae4f844aff1fd526f3f2960876c7705ce4ccb837395621e2d3b1877669d02e3f0d9
+  checksum: 10/d371f557556d5d8a4cb35f403304581bc8c236cd3fd9d848246382052fe37ec34d741b107f7f1bd6b76f47cf74e66377bf1d3919db61f64647dce34d365818a7
   languageName: node
   linkType: hard
 
-"@changesets/get-version-range-type@npm:^0.3.2":
-  version: 0.3.2
-  resolution: "@changesets/get-version-range-type@npm:0.3.2"
-  checksum: 10/2b82db1eb373546cca646d57da0e32f24455bcb74b7c2dfc262e8e7a744b0aef3d669e2141c08a17192637594466f55cb6ff04f4eb4dec972656646d331c99aa
+"@changesets/get-version-range-type@npm:^0.4.0":
+  version: 0.4.0
+  resolution: "@changesets/get-version-range-type@npm:0.4.0"
+  checksum: 10/9868e99b31af652d3fa08fc33d55b9636f2feed1f4efdb318a6dbb4bb061281868de089b93041ce7f2775ab9cf454b92b1199767d0f4f228d8bbc483e61d2fd8
   languageName: node
   linkType: hard
 
-"@changesets/git@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@changesets/git@npm:2.0.0"
+"@changesets/git@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "@changesets/git@npm:3.0.1"
   dependencies:
-    "@babel/runtime": "npm:^7.20.1"
-    "@changesets/errors": "npm:^0.1.4"
-    "@changesets/types": "npm:^5.2.1"
+    "@changesets/errors": "npm:^0.2.0"
     "@manypkg/get-packages": "npm:^1.1.3"
     is-subdir: "npm:^1.1.1"
     micromatch: "npm:^4.0.2"
     spawndamnit: "npm:^2.0.0"
-  checksum: 10/91811806ef609a3667260c111b5b248a5853cba1f6468184b025aa1a3f19fb4a4b54c7c286a4920f6877599e1641e06a7ee011332c152de5a66df422ac6b55c6
+  checksum: 10/19831196f5e3138dcbb037fd19d641fe1e428e3e4efac3cb25888e3cf8f3f269fab2b1ed270b173a0104b5d1a76d3599232836c75fbc60f4104f8f30141ed9ed
   languageName: node
   linkType: hard
 
-"@changesets/logger@npm:^0.0.5":
-  version: 0.0.5
-  resolution: "@changesets/logger@npm:0.0.5"
+"@changesets/logger@npm:^0.1.1":
+  version: 0.1.1
+  resolution: "@changesets/logger@npm:0.1.1"
   dependencies:
-    chalk: "npm:^2.1.0"
-  checksum: 10/f0edc1edd6bef23d78f4f3fd2028e5230c67d74c00a7318a3ae2aac167a46edaf0701c2cabd441dc10081722e9d6b85ad13e6103a1b08d7fa3b5aca6f5db65b3
+    picocolors: "npm:^1.1.0"
+  checksum: 10/bbfc050ddd0afdaa95bb790e81894b7548a2def059deeaed1685e22c10ede245ec2264df42bb2200cc0c8bd040e427bcd68a7afcca2633dc263a28e923d7c175
   languageName: node
   linkType: hard
 
-"@changesets/parse@npm:^0.3.16":
-  version: 0.3.16
-  resolution: "@changesets/parse@npm:0.3.16"
+"@changesets/parse@npm:^0.4.0":
+  version: 0.4.0
+  resolution: "@changesets/parse@npm:0.4.0"
   dependencies:
-    "@changesets/types": "npm:^5.2.1"
+    "@changesets/types": "npm:^6.0.0"
     js-yaml: "npm:^3.13.1"
-  checksum: 10/769eaceff362748bbfcf3f6a0790cd56b7ee01abee59e03d0a150d66cfcd55e85d276e13c18dd4a9c68cb48140f1cebcabf94c49e72e734febc8eaf34b3e72f8
+  checksum: 10/0a824582306b198cd775048876e62bd39193b921515608504777407d78f1dcc700ec15e1a6bccd8a3514c5acc6c3fb060238fbfeae94e698aa17dad1121c2d43
   languageName: node
   linkType: hard
 
-"@changesets/pre@npm:^1.0.14":
-  version: 1.0.14
-  resolution: "@changesets/pre@npm:1.0.14"
+"@changesets/pre@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@changesets/pre@npm:2.0.1"
   dependencies:
-    "@babel/runtime": "npm:^7.20.1"
-    "@changesets/errors": "npm:^0.1.4"
-    "@changesets/types": "npm:^5.2.1"
+    "@changesets/errors": "npm:^0.2.0"
+    "@changesets/types": "npm:^6.0.0"
     "@manypkg/get-packages": "npm:^1.1.3"
     fs-extra: "npm:^7.0.1"
-  checksum: 10/fb81617af819bd47938c566558194b618dc60d0c8febf856e74076182d1733ed7dec72f486e0ed6589ef8e6ccaaa13008bbec7ee7c79375921a8f175222e14b4
+  checksum: 10/e26ca45a1accc4c79890220acf4c85ff716bc09a8e534c91f08bf7d5272408bd76f54ddf6a01765a1aab2517b7447285ae0a9787a6f2135011ad37bcf3f70e48
   languageName: node
   linkType: hard
 
-"@changesets/read@npm:^0.5.9":
-  version: 0.5.9
-  resolution: "@changesets/read@npm:0.5.9"
-  dependencies:
-    "@babel/runtime": "npm:^7.20.1"
-    "@changesets/git": "npm:^2.0.0"
-    "@changesets/logger": "npm:^0.0.5"
-    "@changesets/parse": "npm:^0.3.16"
-    "@changesets/types": "npm:^5.2.1"
-    chalk: "npm:^2.1.0"
+"@changesets/read@npm:^0.6.1":
+  version: 0.6.1
+  resolution: "@changesets/read@npm:0.6.1"
+  dependencies:
+    "@changesets/git": "npm:^3.0.1"
+    "@changesets/logger": "npm:^0.1.1"
+    "@changesets/parse": "npm:^0.4.0"
+    "@changesets/types": "npm:^6.0.0"
     fs-extra: "npm:^7.0.1"
     p-filter: "npm:^2.1.0"
-  checksum: 10/f12ee06dec2def36d3f6b6d0166fdfcbb95593c6eb911ba516989c304029d4fe9fcb60d3edd36c07f12e95cfa8a807c9b0096d45c74876d896a50ee8dfb721f8
+    picocolors: "npm:^1.1.0"
+  checksum: 10/022e4162e3491144549d9e1e1c2dda92ba7b3bbe9ea5552359b75e52d93e6ad0750f9e5215681a18850178e46fe493bb024b84026ac10ede5c6cddd54aa4c9d0
+  languageName: node
+  linkType: hard
+
+"@changesets/should-skip-package@npm:^0.1.1":
+  version: 0.1.1
+  resolution: "@changesets/should-skip-package@npm:0.1.1"
+  dependencies:
+    "@changesets/types": "npm:^6.0.0"
+    "@manypkg/get-packages": "npm:^1.1.3"
+  checksum: 10/d187ef22495deb63e678d0ff65e8627701e2b52c25bd59dde10ce8646be8d605c0ed0a6af020dd825b137c2fc748fdc6cef52e7774bad4c7a4f404bf182a85cf
   languageName: node
   linkType: hard
 
@@ -3024,13 +3250,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@changesets/types@npm:^5.2.1":
-  version: 5.2.1
-  resolution: "@changesets/types@npm:5.2.1"
-  checksum: 10/0783de5c1544c56c926efdbc1e9f04500e09395156e971e60e8de07a43627328a61d432bade108f15a12cd07776d866cc88fa5c61705dcae8640701327449674
-  languageName: node
-  linkType: hard
-
 "@changesets/types@npm:^6.0.0":
   version: 6.0.0
   resolution: "@changesets/types@npm:6.0.0"
@@ -3038,16 +3257,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@changesets/write@npm:^0.2.3":
-  version: 0.2.3
-  resolution: "@changesets/write@npm:0.2.3"
+"@changesets/write@npm:^0.3.2":
+  version: 0.3.2
+  resolution: "@changesets/write@npm:0.3.2"
   dependencies:
-    "@babel/runtime": "npm:^7.20.1"
-    "@changesets/types": "npm:^5.2.1"
+    "@changesets/types": "npm:^6.0.0"
     fs-extra: "npm:^7.0.1"
     human-id: "npm:^1.0.2"
     prettier: "npm:^2.7.1"
-  checksum: 10/40858ffcda3827f312312fbededbdd58d7ecb20547a501c8eaeedf88453fd3102de431f174beaf8b87adf382528951e223e93af77fc81cf34d184a543d77de26
+  checksum: 10/c16b0a731fa43ae0028fd1f956c7b080030c42ff763f8dac74da8b178a4ea65632831c30550b784286277bdc75a3c44dda46aad8db97f43bb1eb4d61922152aa
   languageName: node
   linkType: hard
 
@@ -3080,18 +3298,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@codemirror/lang-javascript@npm:^6.1.9":
-  version: 6.1.9
-  resolution: "@codemirror/lang-javascript@npm:6.1.9"
+"@codemirror/lang-javascript@npm:^6.2.2":
+  version: 6.2.2
+  resolution: "@codemirror/lang-javascript@npm:6.2.2"
   dependencies:
     "@codemirror/autocomplete": "npm:^6.0.0"
     "@codemirror/language": "npm:^6.6.0"
     "@codemirror/lint": "npm:^6.0.0"
     "@codemirror/state": "npm:^6.0.0"
-    "@codemirror/view": "npm:^6.0.0"
+    "@codemirror/view": "npm:^6.17.0"
     "@lezer/common": "npm:^1.0.0"
     "@lezer/javascript": "npm:^1.0.0"
-  checksum: 10/5b067a4bc1f97e422d54f7e3b6eba534b7a51efee05aa2c561745619080fc5f6748bd2b92f28e11f259297b6e3e7f6ae3f16c8f3d6a417e04ed5f320d6924061
+  checksum: 10/eac2e57a7a595cf0c93afd4bb42034902230c73e5525554ba925bad12aa544ca58014c017466288a2b34f1684d6efa5537507ed8b57e276d02665c2821c7a9d6
   languageName: node
   linkType: hard
 
@@ -3148,6 +3366,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@codemirror/state@npm:^6.4.0":
+  version: 6.4.1
+  resolution: "@codemirror/state@npm:6.4.1"
+  checksum: 10/a9ec56c7d7d52034ce8ebea3a9a4d216b9e972d701b32b5000e56c97790d0d46af129aeba0b80bed36648b4024b3ba3e4910cf5bfed11de4a9e89252e0707a70
+  languageName: node
+  linkType: hard
+
 "@codemirror/view@npm:^6.0.0, @codemirror/view@npm:^6.6.0":
   version: 6.12.0
   resolution: "@codemirror/view@npm:6.12.0"
@@ -3159,6 +3384,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@codemirror/view@npm:^6.17.0":
+  version: 6.34.1
+  resolution: "@codemirror/view@npm:6.34.1"
+  dependencies:
+    "@codemirror/state": "npm:^6.4.0"
+    style-mod: "npm:^4.1.0"
+    w3c-keyname: "npm:^2.2.4"
+  checksum: 10/012f195d7c9da2f9693b2192e0e52c7d3f94d9c887c46e218ddb36ee1a050978ee6a13c7d0207dd3fb970b4454198962112b9afe17e1f23d2b89a274b7d186a0
+  languageName: node
+  linkType: hard
+
 "@colors/colors@npm:1.5.0":
   version: 1.5.0
   resolution: "@colors/colors@npm:1.5.0"
@@ -3182,13 +3418,57 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@csstools/selector-specificity@npm:^2.0.1":
-  version: 2.0.2
-  resolution: "@csstools/selector-specificity@npm:2.0.2"
+"@csstools/cascade-layer-name-parser@npm:^2.0.4":
+  version: 2.0.4
+  resolution: "@csstools/cascade-layer-name-parser@npm:2.0.4"
   peerDependencies:
-    postcss: ^8.2
-    postcss-selector-parser: ^6.0.10
-  checksum: 10/23cddfc930b0d37641c10a1e3c7514732ce3d7f50a474a8f028cfc7d0829bc7dabf5ebd00a112a0bdcaa214c274bffdf81ebc3652ba08b3654c309ae4a3e0f20
+    "@csstools/css-parser-algorithms": ^3.0.4
+    "@csstools/css-tokenizer": ^3.0.3
+  checksum: 10/8c1d92f7840ecb402bce9b5770c9eb8ae000f42cb317a069cb10172a4e63d4dcbe1961f8bcf35f5106f8d162066f2bac3923e151d7cb5380b10fc265a62db5ea
+  languageName: node
+  linkType: hard
+
+"@csstools/css-parser-algorithms@npm:^3.0.1, @csstools/css-parser-algorithms@npm:^3.0.4":
+  version: 3.0.4
+  resolution: "@csstools/css-parser-algorithms@npm:3.0.4"
+  peerDependencies:
+    "@csstools/css-tokenizer": ^3.0.3
+  checksum: 10/dfb6926218d9f8ba25d8b43ea46c03863c819481f8c55e4de4925780eaab9e6bcd6bead1d56b4ef82d09fcd9d69a7db2750fa9db08eece9470fd499dc76d0edb
+  languageName: node
+  linkType: hard
+
+"@csstools/css-tokenizer@npm:^3.0.1, @csstools/css-tokenizer@npm:^3.0.3":
+  version: 3.0.3
+  resolution: "@csstools/css-tokenizer@npm:3.0.3"
+  checksum: 10/6baa3160e426e1f177b8f10d54ec7a4a596090f65a05f16d7e9e4da049962a404eabc5f885f4867093702c259cd4080ac92a438326e22dea015201b3e71f5bbb
+  languageName: node
+  linkType: hard
+
+"@csstools/media-query-list-parser@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "@csstools/media-query-list-parser@npm:3.0.1"
+  peerDependencies:
+    "@csstools/css-parser-algorithms": ^3.0.1
+    "@csstools/css-tokenizer": ^3.0.1
+  checksum: 10/794344c67b126ad93d516ab3f01254d44cfa794c3401e34e8cc62ddc7fc13c9ab6c76cb517b643dbda47b57f2eb578c6a11c4a9a4b516d88e260a4016b64ce7f
+  languageName: node
+  linkType: hard
+
+"@csstools/selector-specificity@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@csstools/selector-specificity@npm:4.0.0"
+  peerDependencies:
+    postcss-selector-parser: ^6.1.0
+  checksum: 10/7076c1d8af0fba94f06718f87fba5bfea583f39089efa906ae38b5ecd6912d3d5865f7047a871ac524b1057e4c970622b2ade456b90d69fb9393902250057994
+  languageName: node
+  linkType: hard
+
+"@csstools/utilities@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "@csstools/utilities@npm:2.0.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10/c9c8d82063ec5156d56b056c9124fed95714f05d7c1a64043174b0559aa099989f17a826579f22045384defe152e32d6355b7a9660cfed96819f43fccf277941
   languageName: node
   linkType: hard
 
@@ -3203,658 +3483,366 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@discoveryjs/json-ext@npm:0.5.7, @discoveryjs/json-ext@npm:^0.5.0":
+"@discoveryjs/json-ext@npm:^0.5.0":
   version: 0.5.7
   resolution: "@discoveryjs/json-ext@npm:0.5.7"
   checksum: 10/b95682a852448e8ef50d6f8e3b7ba288aab3fd98a2bafbe46881a3db0c6e7248a2debe9e1ee0d4137c521e4743ca5bbcb1c0765c9d7b3e0ef53231506fec42b4
   languageName: node
   linkType: hard
 
-"@emotion/hash@npm:^0.9.0":
-  version: 0.9.0
-  resolution: "@emotion/hash@npm:0.9.0"
-  checksum: 10/b63428f7c8186607acdca5d003700cecf0ded519d0b5c5cc3b3154eafcad6ff433f8361bd2bac8882715b557e6f06945694aeb6ba8b25c6095d7a88570e2e0bb
+"@dual-bundle/import-meta-resolve@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "@dual-bundle/import-meta-resolve@npm:4.1.0"
+  checksum: 10/a69d804a8e8e93732ac5525f85b9366ae78ec60fa02f0d5b4f2d625e18b355ba02502cdaef616ab1eac4450b966d2a398b59577a17483e4f8a350d062357bdf4
   languageName: node
   linkType: hard
 
-"@esbuild/aix-ppc64@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/aix-ppc64@npm:0.20.2"
-  conditions: os=aix & cpu=ppc64
+"@emnapi/runtime@npm:^1.2.0":
+  version: 1.3.1
+  resolution: "@emnapi/runtime@npm:1.3.1"
+  dependencies:
+    tslib: "npm:^2.4.0"
+  checksum: 10/619915ee44682356f77f60455025e667b0b04ad3c95ced36c03782aea9ebc066fa73e86c4a59d221177eba5e5533d40b3a6dbff4e58ee5d81db4270185c21e22
   languageName: node
   linkType: hard
 
-"@esbuild/aix-ppc64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/aix-ppc64@npm:0.23.1"
-  conditions: os=aix & cpu=ppc64
+"@emotion/hash@npm:^0.9.0":
+  version: 0.9.0
+  resolution: "@emotion/hash@npm:0.9.0"
+  checksum: 10/b63428f7c8186607acdca5d003700cecf0ded519d0b5c5cc3b3154eafcad6ff433f8361bd2bac8882715b557e6f06945694aeb6ba8b25c6095d7a88570e2e0bb
   languageName: node
   linkType: hard
 
-"@esbuild/android-arm64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/android-arm64@npm:0.17.19"
-  conditions: os=android & cpu=arm64
+"@esbuild/aix-ppc64@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/aix-ppc64@npm:0.21.5"
+  conditions: os=aix & cpu=ppc64
   languageName: node
   linkType: hard
 
-"@esbuild/android-arm64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/android-arm64@npm:0.18.20"
-  conditions: os=android & cpu=arm64
+"@esbuild/aix-ppc64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/aix-ppc64@npm:0.24.0"
+  conditions: os=aix & cpu=ppc64
   languageName: node
   linkType: hard
 
-"@esbuild/android-arm64@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/android-arm64@npm:0.20.2"
+"@esbuild/android-arm64@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/android-arm64@npm:0.21.5"
   conditions: os=android & cpu=arm64
   languageName: node
   linkType: hard
 
-"@esbuild/android-arm64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/android-arm64@npm:0.23.1"
+"@esbuild/android-arm64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/android-arm64@npm:0.24.0"
   conditions: os=android & cpu=arm64
   languageName: node
   linkType: hard
 
-"@esbuild/android-arm@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/android-arm@npm:0.17.19"
+"@esbuild/android-arm@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/android-arm@npm:0.21.5"
   conditions: os=android & cpu=arm
   languageName: node
   linkType: hard
 
-"@esbuild/android-arm@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/android-arm@npm:0.18.20"
-  conditions: os=android & cpu=arm
-  languageName: node
-  linkType: hard
-
-"@esbuild/android-arm@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/android-arm@npm:0.20.2"
-  conditions: os=android & cpu=arm
-  languageName: node
-  linkType: hard
-
-"@esbuild/android-arm@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/android-arm@npm:0.23.1"
+"@esbuild/android-arm@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/android-arm@npm:0.24.0"
   conditions: os=android & cpu=arm
   languageName: node
   linkType: hard
 
-"@esbuild/android-x64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/android-x64@npm:0.17.19"
-  conditions: os=android & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@esbuild/android-x64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/android-x64@npm:0.18.20"
+"@esbuild/android-x64@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/android-x64@npm:0.21.5"
   conditions: os=android & cpu=x64
   languageName: node
   linkType: hard
 
-"@esbuild/android-x64@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/android-x64@npm:0.20.2"
-  conditions: os=android & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@esbuild/android-x64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/android-x64@npm:0.23.1"
+"@esbuild/android-x64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/android-x64@npm:0.24.0"
   conditions: os=android & cpu=x64
   languageName: node
   linkType: hard
 
-"@esbuild/darwin-arm64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/darwin-arm64@npm:0.17.19"
-  conditions: os=darwin & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"@esbuild/darwin-arm64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/darwin-arm64@npm:0.18.20"
-  conditions: os=darwin & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"@esbuild/darwin-arm64@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/darwin-arm64@npm:0.20.2"
+"@esbuild/darwin-arm64@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/darwin-arm64@npm:0.21.5"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@esbuild/darwin-arm64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/darwin-arm64@npm:0.23.1"
+"@esbuild/darwin-arm64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/darwin-arm64@npm:0.24.0"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@esbuild/darwin-x64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/darwin-x64@npm:0.17.19"
-  conditions: os=darwin & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@esbuild/darwin-x64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/darwin-x64@npm:0.18.20"
+"@esbuild/darwin-x64@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/darwin-x64@npm:0.21.5"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@esbuild/darwin-x64@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/darwin-x64@npm:0.20.2"
-  conditions: os=darwin & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@esbuild/darwin-x64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/darwin-x64@npm:0.23.1"
+"@esbuild/darwin-x64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/darwin-x64@npm:0.24.0"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@esbuild/freebsd-arm64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/freebsd-arm64@npm:0.17.19"
-  conditions: os=freebsd & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"@esbuild/freebsd-arm64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/freebsd-arm64@npm:0.18.20"
+"@esbuild/freebsd-arm64@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/freebsd-arm64@npm:0.21.5"
   conditions: os=freebsd & cpu=arm64
   languageName: node
   linkType: hard
 
-"@esbuild/freebsd-arm64@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/freebsd-arm64@npm:0.20.2"
-  conditions: os=freebsd & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"@esbuild/freebsd-arm64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/freebsd-arm64@npm:0.23.1"
+"@esbuild/freebsd-arm64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/freebsd-arm64@npm:0.24.0"
   conditions: os=freebsd & cpu=arm64
   languageName: node
   linkType: hard
 
-"@esbuild/freebsd-x64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/freebsd-x64@npm:0.17.19"
+"@esbuild/freebsd-x64@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/freebsd-x64@npm:0.21.5"
   conditions: os=freebsd & cpu=x64
   languageName: node
   linkType: hard
 
-"@esbuild/freebsd-x64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/freebsd-x64@npm:0.18.20"
-  conditions: os=freebsd & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@esbuild/freebsd-x64@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/freebsd-x64@npm:0.20.2"
-  conditions: os=freebsd & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@esbuild/freebsd-x64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/freebsd-x64@npm:0.23.1"
+"@esbuild/freebsd-x64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/freebsd-x64@npm:0.24.0"
   conditions: os=freebsd & cpu=x64
   languageName: node
   linkType: hard
 
-"@esbuild/linux-arm64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/linux-arm64@npm:0.17.19"
-  conditions: os=linux & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"@esbuild/linux-arm64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/linux-arm64@npm:0.18.20"
+"@esbuild/linux-arm64@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/linux-arm64@npm:0.21.5"
   conditions: os=linux & cpu=arm64
   languageName: node
   linkType: hard
 
-"@esbuild/linux-arm64@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/linux-arm64@npm:0.20.2"
-  conditions: os=linux & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"@esbuild/linux-arm64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/linux-arm64@npm:0.23.1"
+"@esbuild/linux-arm64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/linux-arm64@npm:0.24.0"
   conditions: os=linux & cpu=arm64
   languageName: node
   linkType: hard
 
-"@esbuild/linux-arm@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/linux-arm@npm:0.17.19"
+"@esbuild/linux-arm@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/linux-arm@npm:0.21.5"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"@esbuild/linux-arm@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/linux-arm@npm:0.18.20"
-  conditions: os=linux & cpu=arm
-  languageName: node
-  linkType: hard
-
-"@esbuild/linux-arm@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/linux-arm@npm:0.20.2"
-  conditions: os=linux & cpu=arm
-  languageName: node
-  linkType: hard
-
-"@esbuild/linux-arm@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/linux-arm@npm:0.23.1"
+"@esbuild/linux-arm@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/linux-arm@npm:0.24.0"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"@esbuild/linux-ia32@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/linux-ia32@npm:0.17.19"
+"@esbuild/linux-ia32@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/linux-ia32@npm:0.21.5"
   conditions: os=linux & cpu=ia32
   languageName: node
   linkType: hard
 
-"@esbuild/linux-ia32@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/linux-ia32@npm:0.18.20"
-  conditions: os=linux & cpu=ia32
-  languageName: node
-  linkType: hard
-
-"@esbuild/linux-ia32@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/linux-ia32@npm:0.20.2"
-  conditions: os=linux & cpu=ia32
-  languageName: node
-  linkType: hard
-
-"@esbuild/linux-ia32@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/linux-ia32@npm:0.23.1"
+"@esbuild/linux-ia32@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/linux-ia32@npm:0.24.0"
   conditions: os=linux & cpu=ia32
   languageName: node
   linkType: hard
 
-"@esbuild/linux-loong64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/linux-loong64@npm:0.17.19"
-  conditions: os=linux & cpu=loong64
-  languageName: node
-  linkType: hard
-
-"@esbuild/linux-loong64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/linux-loong64@npm:0.18.20"
+"@esbuild/linux-loong64@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/linux-loong64@npm:0.21.5"
   conditions: os=linux & cpu=loong64
   languageName: node
   linkType: hard
 
-"@esbuild/linux-loong64@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/linux-loong64@npm:0.20.2"
-  conditions: os=linux & cpu=loong64
-  languageName: node
-  linkType: hard
-
-"@esbuild/linux-loong64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/linux-loong64@npm:0.23.1"
+"@esbuild/linux-loong64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/linux-loong64@npm:0.24.0"
   conditions: os=linux & cpu=loong64
   languageName: node
   linkType: hard
 
-"@esbuild/linux-mips64el@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/linux-mips64el@npm:0.17.19"
+"@esbuild/linux-mips64el@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/linux-mips64el@npm:0.21.5"
   conditions: os=linux & cpu=mips64el
   languageName: node
   linkType: hard
 
-"@esbuild/linux-mips64el@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/linux-mips64el@npm:0.18.20"
-  conditions: os=linux & cpu=mips64el
-  languageName: node
-  linkType: hard
-
-"@esbuild/linux-mips64el@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/linux-mips64el@npm:0.20.2"
-  conditions: os=linux & cpu=mips64el
-  languageName: node
-  linkType: hard
-
-"@esbuild/linux-mips64el@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/linux-mips64el@npm:0.23.1"
+"@esbuild/linux-mips64el@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/linux-mips64el@npm:0.24.0"
   conditions: os=linux & cpu=mips64el
   languageName: node
   linkType: hard
 
-"@esbuild/linux-ppc64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/linux-ppc64@npm:0.17.19"
-  conditions: os=linux & cpu=ppc64
-  languageName: node
-  linkType: hard
-
-"@esbuild/linux-ppc64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/linux-ppc64@npm:0.18.20"
+"@esbuild/linux-ppc64@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/linux-ppc64@npm:0.21.5"
   conditions: os=linux & cpu=ppc64
   languageName: node
   linkType: hard
 
-"@esbuild/linux-ppc64@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/linux-ppc64@npm:0.20.2"
-  conditions: os=linux & cpu=ppc64
-  languageName: node
-  linkType: hard
-
-"@esbuild/linux-ppc64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/linux-ppc64@npm:0.23.1"
+"@esbuild/linux-ppc64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/linux-ppc64@npm:0.24.0"
   conditions: os=linux & cpu=ppc64
   languageName: node
   linkType: hard
 
-"@esbuild/linux-riscv64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/linux-riscv64@npm:0.17.19"
-  conditions: os=linux & cpu=riscv64
-  languageName: node
-  linkType: hard
-
-"@esbuild/linux-riscv64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/linux-riscv64@npm:0.18.20"
+"@esbuild/linux-riscv64@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/linux-riscv64@npm:0.21.5"
   conditions: os=linux & cpu=riscv64
   languageName: node
   linkType: hard
 
-"@esbuild/linux-riscv64@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/linux-riscv64@npm:0.20.2"
-  conditions: os=linux & cpu=riscv64
-  languageName: node
-  linkType: hard
-
-"@esbuild/linux-riscv64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/linux-riscv64@npm:0.23.1"
+"@esbuild/linux-riscv64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/linux-riscv64@npm:0.24.0"
   conditions: os=linux & cpu=riscv64
   languageName: node
   linkType: hard
 
-"@esbuild/linux-s390x@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/linux-s390x@npm:0.17.19"
-  conditions: os=linux & cpu=s390x
-  languageName: node
-  linkType: hard
-
-"@esbuild/linux-s390x@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/linux-s390x@npm:0.18.20"
+"@esbuild/linux-s390x@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/linux-s390x@npm:0.21.5"
   conditions: os=linux & cpu=s390x
   languageName: node
   linkType: hard
 
-"@esbuild/linux-s390x@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/linux-s390x@npm:0.20.2"
-  conditions: os=linux & cpu=s390x
-  languageName: node
-  linkType: hard
-
-"@esbuild/linux-s390x@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/linux-s390x@npm:0.23.1"
+"@esbuild/linux-s390x@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/linux-s390x@npm:0.24.0"
   conditions: os=linux & cpu=s390x
   languageName: node
   linkType: hard
 
-"@esbuild/linux-x64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/linux-x64@npm:0.17.19"
-  conditions: os=linux & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@esbuild/linux-x64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/linux-x64@npm:0.18.20"
-  conditions: os=linux & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@esbuild/linux-x64@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/linux-x64@npm:0.20.2"
+"@esbuild/linux-x64@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/linux-x64@npm:0.21.5"
   conditions: os=linux & cpu=x64
   languageName: node
   linkType: hard
 
-"@esbuild/linux-x64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/linux-x64@npm:0.23.1"
+"@esbuild/linux-x64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/linux-x64@npm:0.24.0"
   conditions: os=linux & cpu=x64
   languageName: node
   linkType: hard
 
-"@esbuild/netbsd-x64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/netbsd-x64@npm:0.17.19"
-  conditions: os=netbsd & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@esbuild/netbsd-x64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/netbsd-x64@npm:0.18.20"
+"@esbuild/netbsd-x64@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/netbsd-x64@npm:0.21.5"
   conditions: os=netbsd & cpu=x64
   languageName: node
   linkType: hard
 
-"@esbuild/netbsd-x64@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/netbsd-x64@npm:0.20.2"
-  conditions: os=netbsd & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@esbuild/netbsd-x64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/netbsd-x64@npm:0.23.1"
+"@esbuild/netbsd-x64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/netbsd-x64@npm:0.24.0"
   conditions: os=netbsd & cpu=x64
   languageName: node
   linkType: hard
 
-"@esbuild/openbsd-arm64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/openbsd-arm64@npm:0.23.1"
+"@esbuild/openbsd-arm64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/openbsd-arm64@npm:0.24.0"
   conditions: os=openbsd & cpu=arm64
   languageName: node
   linkType: hard
 
-"@esbuild/openbsd-x64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/openbsd-x64@npm:0.17.19"
-  conditions: os=openbsd & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@esbuild/openbsd-x64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/openbsd-x64@npm:0.18.20"
-  conditions: os=openbsd & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@esbuild/openbsd-x64@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/openbsd-x64@npm:0.20.2"
+"@esbuild/openbsd-x64@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/openbsd-x64@npm:0.21.5"
   conditions: os=openbsd & cpu=x64
   languageName: node
   linkType: hard
 
-"@esbuild/openbsd-x64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/openbsd-x64@npm:0.23.1"
+"@esbuild/openbsd-x64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/openbsd-x64@npm:0.24.0"
   conditions: os=openbsd & cpu=x64
   languageName: node
   linkType: hard
 
-"@esbuild/sunos-x64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/sunos-x64@npm:0.17.19"
-  conditions: os=sunos & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@esbuild/sunos-x64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/sunos-x64@npm:0.18.20"
+"@esbuild/sunos-x64@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/sunos-x64@npm:0.21.5"
   conditions: os=sunos & cpu=x64
   languageName: node
   linkType: hard
 
-"@esbuild/sunos-x64@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/sunos-x64@npm:0.20.2"
-  conditions: os=sunos & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@esbuild/sunos-x64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/sunos-x64@npm:0.23.1"
+"@esbuild/sunos-x64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/sunos-x64@npm:0.24.0"
   conditions: os=sunos & cpu=x64
   languageName: node
   linkType: hard
 
-"@esbuild/win32-arm64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/win32-arm64@npm:0.17.19"
-  conditions: os=win32 & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"@esbuild/win32-arm64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/win32-arm64@npm:0.18.20"
+"@esbuild/win32-arm64@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/win32-arm64@npm:0.21.5"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@esbuild/win32-arm64@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/win32-arm64@npm:0.20.2"
-  conditions: os=win32 & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"@esbuild/win32-arm64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/win32-arm64@npm:0.23.1"
+"@esbuild/win32-arm64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/win32-arm64@npm:0.24.0"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@esbuild/win32-ia32@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/win32-ia32@npm:0.17.19"
-  conditions: os=win32 & cpu=ia32
-  languageName: node
-  linkType: hard
-
-"@esbuild/win32-ia32@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/win32-ia32@npm:0.18.20"
-  conditions: os=win32 & cpu=ia32
-  languageName: node
-  linkType: hard
-
-"@esbuild/win32-ia32@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/win32-ia32@npm:0.20.2"
+"@esbuild/win32-ia32@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/win32-ia32@npm:0.21.5"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@esbuild/win32-ia32@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/win32-ia32@npm:0.23.1"
+"@esbuild/win32-ia32@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/win32-ia32@npm:0.24.0"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@esbuild/win32-x64@npm:0.17.19":
-  version: 0.17.19
-  resolution: "@esbuild/win32-x64@npm:0.17.19"
-  conditions: os=win32 & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@esbuild/win32-x64@npm:0.18.20":
-  version: 0.18.20
-  resolution: "@esbuild/win32-x64@npm:0.18.20"
+"@esbuild/win32-x64@npm:0.21.5":
+  version: 0.21.5
+  resolution: "@esbuild/win32-x64@npm:0.21.5"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
-"@esbuild/win32-x64@npm:0.20.2":
-  version: 0.20.2
-  resolution: "@esbuild/win32-x64@npm:0.20.2"
-  conditions: os=win32 & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@esbuild/win32-x64@npm:0.23.1":
-  version: 0.23.1
-  resolution: "@esbuild/win32-x64@npm:0.23.1"
+"@esbuild/win32-x64@npm:0.24.0":
+  version: 0.24.0
+  resolution: "@esbuild/win32-x64@npm:0.24.0"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
-"@eslint-community/eslint-utils@npm:^4.2.0":
+"@eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.4.0":
   version: 4.4.0
   resolution: "@eslint-community/eslint-utils@npm:4.4.0"
   dependencies:
@@ -3903,6 +3891,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@fastify/busboy@npm:^2.0.0":
+  version: 2.1.1
+  resolution: "@fastify/busboy@npm:2.1.1"
+  checksum: 10/2bb8a7eca8289ed14c9eb15239bc1019797454624e769b39a0b90ed204d032403adc0f8ed0d2aef8a18c772205fa7808cf5a1b91f21c7bfc7b6032150b1062c5
+  languageName: node
+  linkType: hard
+
 "@formatjs/ecma402-abstract@npm:1.12.0":
   version: 1.12.0
   resolution: "@formatjs/ecma402-abstract@npm:1.12.0"
@@ -3983,9 +3978,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@google-cloud/storage@npm:^6.11.0":
-  version: 6.11.0
-  resolution: "@google-cloud/storage@npm:6.11.0"
+"@google-cloud/storage@npm:^6.12.0":
+  version: 6.12.0
+  resolution: "@google-cloud/storage@npm:6.12.0"
   dependencies:
     "@google-cloud/paginator": "npm:^3.0.7"
     "@google-cloud/projectify": "npm:^3.0.0"
@@ -3996,6 +3991,7 @@ __metadata:
     duplexify: "npm:^4.0.0"
     ent: "npm:^2.2.0"
     extend: "npm:^3.0.2"
+    fast-xml-parser: "npm:^4.2.2"
     gaxios: "npm:^5.0.0"
     google-auth-library: "npm:^8.0.1"
     mime: "npm:^3.0.0"
@@ -4004,7 +4000,7 @@ __metadata:
     retry-request: "npm:^5.0.0"
     teeny-request: "npm:^8.0.0"
     uuid: "npm:^8.0.0"
-  checksum: 10/e6f9f07114557e4f7dc58693911940ff862e8036740188b8bae2259b9e8b85fd3b2e30e590cc4610b3d2500d672b3b19356234a6c90caefff5c0be70ce7a2dfc
+  checksum: 10/b19bebb1c1c51a6ad1d5d056bcc22d2f671ad28ce5d6faf35bc08b35eac800987ae39a1da70ccd20b8e3271dbbcf79df474ae3f9265f27e0f5ef6bc993b9f312
   languageName: node
   linkType: hard
 
@@ -4057,6 +4053,181 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@img/sharp-darwin-arm64@npm:0.33.5":
+  version: 0.33.5
+  resolution: "@img/sharp-darwin-arm64@npm:0.33.5"
+  dependencies:
+    "@img/sharp-libvips-darwin-arm64": "npm:1.0.4"
+  dependenciesMeta:
+    "@img/sharp-libvips-darwin-arm64":
+      optional: true
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@img/sharp-darwin-x64@npm:0.33.5":
+  version: 0.33.5
+  resolution: "@img/sharp-darwin-x64@npm:0.33.5"
+  dependencies:
+    "@img/sharp-libvips-darwin-x64": "npm:1.0.4"
+  dependenciesMeta:
+    "@img/sharp-libvips-darwin-x64":
+      optional: true
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@img/sharp-libvips-darwin-arm64@npm:1.0.4":
+  version: 1.0.4
+  resolution: "@img/sharp-libvips-darwin-arm64@npm:1.0.4"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@img/sharp-libvips-darwin-x64@npm:1.0.4":
+  version: 1.0.4
+  resolution: "@img/sharp-libvips-darwin-x64@npm:1.0.4"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@img/sharp-libvips-linux-arm64@npm:1.0.4":
+  version: 1.0.4
+  resolution: "@img/sharp-libvips-linux-arm64@npm:1.0.4"
+  conditions: os=linux & cpu=arm64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@img/sharp-libvips-linux-arm@npm:1.0.5":
+  version: 1.0.5
+  resolution: "@img/sharp-libvips-linux-arm@npm:1.0.5"
+  conditions: os=linux & cpu=arm & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@img/sharp-libvips-linux-s390x@npm:1.0.4":
+  version: 1.0.4
+  resolution: "@img/sharp-libvips-linux-s390x@npm:1.0.4"
+  conditions: os=linux & cpu=s390x & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@img/sharp-libvips-linux-x64@npm:1.0.4":
+  version: 1.0.4
+  resolution: "@img/sharp-libvips-linux-x64@npm:1.0.4"
+  conditions: os=linux & cpu=x64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@img/sharp-libvips-linuxmusl-arm64@npm:1.0.4":
+  version: 1.0.4
+  resolution: "@img/sharp-libvips-linuxmusl-arm64@npm:1.0.4"
+  conditions: os=linux & cpu=arm64 & libc=musl
+  languageName: node
+  linkType: hard
+
+"@img/sharp-libvips-linuxmusl-x64@npm:1.0.4":
+  version: 1.0.4
+  resolution: "@img/sharp-libvips-linuxmusl-x64@npm:1.0.4"
+  conditions: os=linux & cpu=x64 & libc=musl
+  languageName: node
+  linkType: hard
+
+"@img/sharp-linux-arm64@npm:0.33.5":
+  version: 0.33.5
+  resolution: "@img/sharp-linux-arm64@npm:0.33.5"
+  dependencies:
+    "@img/sharp-libvips-linux-arm64": "npm:1.0.4"
+  dependenciesMeta:
+    "@img/sharp-libvips-linux-arm64":
+      optional: true
+  conditions: os=linux & cpu=arm64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@img/sharp-linux-arm@npm:0.33.5":
+  version: 0.33.5
+  resolution: "@img/sharp-linux-arm@npm:0.33.5"
+  dependencies:
+    "@img/sharp-libvips-linux-arm": "npm:1.0.5"
+  dependenciesMeta:
+    "@img/sharp-libvips-linux-arm":
+      optional: true
+  conditions: os=linux & cpu=arm & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@img/sharp-linux-s390x@npm:0.33.5":
+  version: 0.33.5
+  resolution: "@img/sharp-linux-s390x@npm:0.33.5"
+  dependencies:
+    "@img/sharp-libvips-linux-s390x": "npm:1.0.4"
+  dependenciesMeta:
+    "@img/sharp-libvips-linux-s390x":
+      optional: true
+  conditions: os=linux & cpu=s390x & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@img/sharp-linux-x64@npm:0.33.5":
+  version: 0.33.5
+  resolution: "@img/sharp-linux-x64@npm:0.33.5"
+  dependencies:
+    "@img/sharp-libvips-linux-x64": "npm:1.0.4"
+  dependenciesMeta:
+    "@img/sharp-libvips-linux-x64":
+      optional: true
+  conditions: os=linux & cpu=x64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@img/sharp-linuxmusl-arm64@npm:0.33.5":
+  version: 0.33.5
+  resolution: "@img/sharp-linuxmusl-arm64@npm:0.33.5"
+  dependencies:
+    "@img/sharp-libvips-linuxmusl-arm64": "npm:1.0.4"
+  dependenciesMeta:
+    "@img/sharp-libvips-linuxmusl-arm64":
+      optional: true
+  conditions: os=linux & cpu=arm64 & libc=musl
+  languageName: node
+  linkType: hard
+
+"@img/sharp-linuxmusl-x64@npm:0.33.5":
+  version: 0.33.5
+  resolution: "@img/sharp-linuxmusl-x64@npm:0.33.5"
+  dependencies:
+    "@img/sharp-libvips-linuxmusl-x64": "npm:1.0.4"
+  dependenciesMeta:
+    "@img/sharp-libvips-linuxmusl-x64":
+      optional: true
+  conditions: os=linux & cpu=x64 & libc=musl
+  languageName: node
+  linkType: hard
+
+"@img/sharp-wasm32@npm:0.33.5":
+  version: 0.33.5
+  resolution: "@img/sharp-wasm32@npm:0.33.5"
+  dependencies:
+    "@emnapi/runtime": "npm:^1.2.0"
+  conditions: cpu=wasm32
+  languageName: node
+  linkType: hard
+
+"@img/sharp-win32-ia32@npm:0.33.5":
+  version: 0.33.5
+  resolution: "@img/sharp-win32-ia32@npm:0.33.5"
+  conditions: os=win32 & cpu=ia32
+  languageName: node
+  linkType: hard
+
+"@img/sharp-win32-x64@npm:0.33.5":
+  version: 0.33.5
+  resolution: "@img/sharp-win32-x64@npm:0.33.5"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
 "@internationalized/date@npm:3.0.2-nightly.3479+afb946c4a":
   version: 3.0.2-nightly.3479
   resolution: "@internationalized/date@npm:3.0.2-nightly.3479"
@@ -4066,15 +4237,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@internationalized/date@npm:3.5.2-nightly.4409+55aca809c":
-  version: 3.5.2-nightly.4409
-  resolution: "@internationalized/date@npm:3.5.2-nightly.4409"
-  dependencies:
-    "@swc/helpers": "npm:^0.5.0"
-  checksum: 10/f78428be2c2063159afc9c63b77c6d4c020f09d2499d5e481bc14a75bf13529dcb3326234e3b4b7d00268c6c967d17982b38b78b5453e307d617fee849f16a68
-  languageName: node
-  linkType: hard
-
 "@internationalized/date@npm:^3.2.0":
   version: 3.2.0
   resolution: "@internationalized/date@npm:3.2.0"
@@ -4084,6 +4246,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@internationalized/date@npm:^3.5.6":
+  version: 3.5.6
+  resolution: "@internationalized/date@npm:3.5.6"
+  dependencies:
+    "@swc/helpers": "npm:^0.5.0"
+  checksum: 10/54734b53ca74a32aae368a8f963324352b1fd5b13029b6e82555307b8f2ff355658c90e82a4f38f154a3edf874387d1efd26fc80f2edd068ce04f48f6467f26c
+  languageName: node
+  linkType: hard
+
 "@internationalized/message@npm:3.0.10-nightly.3479+afb946c4a":
   version: 3.0.10-nightly.3479
   resolution: "@internationalized/message@npm:3.0.10-nightly.3479"
@@ -4094,16 +4265,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@internationalized/message@npm:3.1.2-nightly.4409+55aca809c":
-  version: 3.1.2-nightly.4409
-  resolution: "@internationalized/message@npm:3.1.2-nightly.4409"
-  dependencies:
-    "@swc/helpers": "npm:^0.5.0"
-    intl-messageformat: "npm:^10.1.0"
-  checksum: 10/8795bcaff70791f6446e00e86c62885a5f3a245a55b271bf0bcc8bc526b2df6a1fa091a0d5d4ec751f698c2a12d72f290d190ae38e61d8d5037cc57c1da52bc4
-  languageName: node
-  linkType: hard
-
 "@internationalized/message@npm:^3.1.0":
   version: 3.1.0
   resolution: "@internationalized/message@npm:3.1.0"
@@ -4114,6 +4275,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@internationalized/message@npm:^3.1.5":
+  version: 3.1.5
+  resolution: "@internationalized/message@npm:3.1.5"
+  dependencies:
+    "@swc/helpers": "npm:^0.5.0"
+    intl-messageformat: "npm:^10.1.0"
+  checksum: 10/210951fd8055af4db70d465e49bcbbdf2545ed223b936af9c1f18b745a51689ecb0ca49cbd5ee2dbfeccce2447808b7fe309bd12ee81f7e09283f20bf04200e9
+  languageName: node
+  linkType: hard
+
 "@internationalized/number@npm:3.1.2-nightly.3479+afb946c4a":
   version: 3.1.2-nightly.3479
   resolution: "@internationalized/number@npm:3.1.2-nightly.3479"
@@ -4123,15 +4294,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@internationalized/number@npm:3.5.1-nightly.4409+55aca809c":
-  version: 3.5.1-nightly.4409
-  resolution: "@internationalized/number@npm:3.5.1-nightly.4409"
-  dependencies:
-    "@swc/helpers": "npm:^0.5.0"
-  checksum: 10/591eadb3a7c829a1fdc2a9a6ed9ee55dc037e279370ad213488d9f77934f56e8554d04f55f63e6e12e3fd9b7d5ea637a2311b117ccc73bdf8f4dac10085f74f6
-  languageName: node
-  linkType: hard
-
 "@internationalized/number@npm:^3.2.0":
   version: 3.2.0
   resolution: "@internationalized/number@npm:3.2.0"
@@ -4141,6 +4303,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@internationalized/number@npm:^3.5.4":
+  version: 3.5.4
+  resolution: "@internationalized/number@npm:3.5.4"
+  dependencies:
+    "@swc/helpers": "npm:^0.5.0"
+  checksum: 10/16641aecb58c075a6322dc6b36a2c6e521845296f81b86a128d015f072d1af998289b71b4d8b9521e7576bdeabfaf8067a3e741b0116c8595d82a4461c1ae03b
+  languageName: node
+  linkType: hard
+
 "@internationalized/string@npm:3.0.1-nightly.3479+afb946c4a":
   version: 3.0.1-nightly.3479
   resolution: "@internationalized/string@npm:3.0.1-nightly.3479"
@@ -4150,15 +4321,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@internationalized/string@npm:3.2.1-nightly.4409+55aca809c":
-  version: 3.2.1-nightly.4409
-  resolution: "@internationalized/string@npm:3.2.1-nightly.4409"
-  dependencies:
-    "@swc/helpers": "npm:^0.5.0"
-  checksum: 10/e5a77fb98b39a84cbd58f93b1f9dc8c78f2d07c3f50f31b89841696e08362ac3864c7f0474b2f0184656709e8aa3a3321487597f14f42b67dbb352f2e795743a
-  languageName: node
-  linkType: hard
-
 "@internationalized/string@npm:^3.1.0":
   version: 3.1.0
   resolution: "@internationalized/string@npm:3.1.0"
@@ -4168,6 +4330,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@internationalized/string@npm:^3.2.4":
+  version: 3.2.4
+  resolution: "@internationalized/string@npm:3.2.4"
+  dependencies:
+    "@swc/helpers": "npm:^0.5.0"
+  checksum: 10/5fdb7f0bf7fa7055cdf62ded4efd6849d3db9cf0e6d53f349889e2ec9517b9135ad38a6bb8dcf25142c69c381618c0dd1a6a072117dd7cf2867ce17374f0f835
+  languageName: node
+  linkType: hard
+
 "@isaacs/cliui@npm:^8.0.2":
   version: 8.0.2
   resolution: "@isaacs/cliui@npm:8.0.2"
@@ -4216,7 +4387,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jest/core@npm:^29.6.4, @jest/core@npm:^29.7.0":
+"@jest/core@npm:^29.7.0":
   version: 29.7.0
   resolution: "@jest/core@npm:29.7.0"
   dependencies:
@@ -4559,13 +4730,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@kaciras/deasync@npm:^1.0.4":
-  version: 1.0.4
-  resolution: "@kaciras/deasync@npm:1.0.4"
+"@kaciras/deasync@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "@kaciras/deasync@npm:1.1.0"
   dependencies:
-    follow-redirects: "npm:^1.15.6"
-    tar-fs: "npm:^3.0.5"
-  checksum: 10/4bb358de84731000f3576dff029f89bf6ddf8628c95fd3661c029716a796fc44eb3769445479c3f4a0990f10617caf7902bf07547df76bf239582f565d3855fc
+    follow-redirects: "npm:^1.15.9"
+    tar-fs: "npm:^3.0.6"
+  checksum: 10/b6d9c5aa2b3886ea5f09d2d67ac0615fdbe8507b30202c36aadacfa72ca4be24c7a425105ae833f48e23118c01a88791d8089cf95e15109188a14fc372e3d3c3
   languageName: node
   linkType: hard
 
@@ -4590,7 +4761,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@lezer/highlight@npm:^1.0.0, @lezer/highlight@npm:^1.1.3, @lezer/highlight@npm:^1.1.6":
+"@lezer/highlight@npm:^1.0.0, @lezer/highlight@npm:^1.1.3":
   version: 1.2.0
   resolution: "@lezer/highlight@npm:1.2.0"
   dependencies:
@@ -4599,6 +4770,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@lezer/highlight@npm:^1.2.1":
+  version: 1.2.1
+  resolution: "@lezer/highlight@npm:1.2.1"
+  dependencies:
+    "@lezer/common": "npm:^1.0.0"
+  checksum: 10/fec3082419ee87fb265039b680fbac6796f862d8e3042dcb860e8c5a34291503a74927302b568ff1a626f0d2b5cf8dae02a51cfd200084eb329e5fd1236c3163
+  languageName: node
+  linkType: hard
+
 "@lezer/javascript@npm:^1.0.0":
   version: 1.4.3
   resolution: "@lezer/javascript@npm:1.4.3"
@@ -4654,9 +4834,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@mapbox/node-pre-gyp@npm:^1.0.0":
-  version: 1.0.9
-  resolution: "@mapbox/node-pre-gyp@npm:1.0.9"
+"@mapbox/node-pre-gyp@npm:^1.0.11":
+  version: 1.0.11
+  resolution: "@mapbox/node-pre-gyp@npm:1.0.11"
   dependencies:
     detect-libc: "npm:^2.0.0"
     https-proxy-agent: "npm:^5.0.0"
@@ -4669,7 +4849,7 @@ __metadata:
     tar: "npm:^6.1.11"
   bin:
     node-pre-gyp: bin/node-pre-gyp
-  checksum: 10/f8c116e1275957add02b501c588cc4c963fe77aaf3fffe8564fbaf61dcf95e965259c448fd7ebbba190cdc4072cd62460538b9b795f4078081f234e455caa354
+  checksum: 10/59529a2444e44fddb63057152452b00705aa58059079191126c79ac1388ae4565625afa84ed4dd1bf017d1111ab6e47907f7c5192e06d83c9496f2f3e708680a
   languageName: node
   linkType: hard
 
@@ -4724,6 +4904,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@mrmlnc/readdir-enhanced@npm:^2.2.1":
+  version: 2.2.1
+  resolution: "@mrmlnc/readdir-enhanced@npm:2.2.1"
+  dependencies:
+    call-me-maybe: "npm:^1.0.1"
+    glob-to-regexp: "npm:^0.3.0"
+  checksum: 10/55d898d3d65b0a3a6029ee4f4c41e1601d0907b45b543edc4b50580848c996046360626480222e10228e1cecb91fc9766526c9dae1817c94d01d25f3376c27dd
+  languageName: node
+  linkType: hard
+
 "@msgpack/msgpack@npm:3.0.0-beta2":
   version: 3.0.0-beta2
   resolution: "@msgpack/msgpack@npm:3.0.0-beta2"
@@ -4887,247 +5077,228 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@nivo/annotations@npm:0.84.0":
-  version: 0.84.0
-  resolution: "@nivo/annotations@npm:0.84.0"
+"@nivo/annotations@npm:0.88.0":
+  version: 0.88.0
+  resolution: "@nivo/annotations@npm:0.88.0"
   dependencies:
-    "@nivo/colors": "npm:0.84.0"
-    "@nivo/core": "npm:0.84.0"
+    "@nivo/colors": "npm:0.88.0"
+    "@nivo/core": "npm:0.88.0"
     "@react-spring/web": "npm:9.4.5 || ^9.7.2"
-    "@types/prop-types": "npm:^15.7.2"
     lodash: "npm:^4.17.21"
-    prop-types: "npm:^15.7.2"
   peerDependencies:
     react: ">= 16.14.0 < 19.0.0"
-  checksum: 10/22e01ebea550237943fd81da78d75a243787dc3ee2af9de5e6053d5b11fb9a4db5d829a36a704a79781c1fa7e4689762008aa09b2faa18ba25d2ca6612151917
+  checksum: 10/d84d67674729c92cfea7fc65deb62700aaaddd98d3793ffdd15c971895234be8e9818e2f89c14d80e9e8485073a08ad3b33d8767e0108af6b2c1abbc36ea03e8
   languageName: node
   linkType: hard
 
-"@nivo/arcs@npm:0.84.0":
-  version: 0.84.0
-  resolution: "@nivo/arcs@npm:0.84.0"
+"@nivo/arcs@npm:0.88.0":
+  version: 0.88.0
+  resolution: "@nivo/arcs@npm:0.88.0"
   dependencies:
-    "@nivo/colors": "npm:0.84.0"
-    "@nivo/core": "npm:0.84.0"
+    "@nivo/colors": "npm:0.88.0"
+    "@nivo/core": "npm:0.88.0"
     "@react-spring/web": "npm:9.4.5 || ^9.7.2"
-    "@types/d3-shape": "npm:^2.0.0"
-    d3-shape: "npm:^1.3.5"
+    "@types/d3-shape": "npm:^3.1.6"
+    d3-shape: "npm:^3.2.0"
   peerDependencies:
     react: ">= 16.14.0 < 19.0.0"
-  checksum: 10/aed01882b79d73edcf5f849ad8fff57f0afc42bebe21c0c462390ef5e6d70ed277ff998b9b0f486ab93fc2a2ea1dd1fbf27da6ea6103da76ae14f5f1f9d9df74
+  checksum: 10/5db68cf5c5b58f1152d3ba5610a96d870389dacf5629de3e1fd9bb85645924daa7006dc9741444ec97035447d57fb0be0d3928eb6f92f2facef409f07244641c
   languageName: node
   linkType: hard
 
-"@nivo/axes@npm:0.84.0":
-  version: 0.84.0
-  resolution: "@nivo/axes@npm:0.84.0"
+"@nivo/axes@npm:0.88.0":
+  version: 0.88.0
+  resolution: "@nivo/axes@npm:0.88.0"
   dependencies:
-    "@nivo/core": "npm:0.84.0"
-    "@nivo/scales": "npm:0.84.0"
+    "@nivo/core": "npm:0.88.0"
+    "@nivo/scales": "npm:0.88.0"
     "@react-spring/web": "npm:9.4.5 || ^9.7.2"
     "@types/d3-format": "npm:^1.4.1"
     "@types/d3-time-format": "npm:^2.3.1"
-    "@types/prop-types": "npm:^15.7.2"
     d3-format: "npm:^1.4.4"
     d3-time-format: "npm:^3.0.0"
-    prop-types: "npm:^15.7.2"
   peerDependencies:
     react: ">= 16.14.0 < 19.0.0"
-  checksum: 10/59e1db46674a409d8b510d61d752aa2446c21d54de5c300b359d55a587b82c5284119a1876e86f7ce260811a54fec1af8eddcd146a57fe333669dea1828b58d6
+  checksum: 10/a5148a73ab73aed69be7bcdbd3939741e54055c1ab477d90de2503e978bd8510514650d3d4fc5c81e3339e4b103611b34402eb050dac6a400f5d5597982e1cd3
   languageName: node
   linkType: hard
 
-"@nivo/bar@npm:0.84.0":
-  version: 0.84.0
-  resolution: "@nivo/bar@npm:0.84.0"
+"@nivo/bar@npm:0.88.0":
+  version: 0.88.0
+  resolution: "@nivo/bar@npm:0.88.0"
   dependencies:
-    "@nivo/annotations": "npm:0.84.0"
-    "@nivo/axes": "npm:0.84.0"
-    "@nivo/colors": "npm:0.84.0"
-    "@nivo/core": "npm:0.84.0"
-    "@nivo/legends": "npm:0.84.0"
-    "@nivo/scales": "npm:0.84.0"
-    "@nivo/tooltip": "npm:0.84.0"
+    "@nivo/annotations": "npm:0.88.0"
+    "@nivo/axes": "npm:0.88.0"
+    "@nivo/colors": "npm:0.88.0"
+    "@nivo/core": "npm:0.88.0"
+    "@nivo/legends": "npm:0.88.0"
+    "@nivo/scales": "npm:0.88.0"
+    "@nivo/tooltip": "npm:0.88.0"
     "@react-spring/web": "npm:9.4.5 || ^9.7.2"
-    "@types/d3-scale": "npm:^3.2.3"
-    "@types/d3-shape": "npm:^2.0.0"
-    d3-scale: "npm:^3.2.3"
-    d3-shape: "npm:^1.3.5"
+    "@types/d3-scale": "npm:^4.0.8"
+    "@types/d3-shape": "npm:^3.1.6"
+    d3-scale: "npm:^4.0.2"
+    d3-shape: "npm:^3.2.0"
     lodash: "npm:^4.17.21"
   peerDependencies:
     react: ">= 16.14.0 < 19.0.0"
-  checksum: 10/6ac13abc7b93c1e1c6e5597be8937fdf26ebe3e8efb9472dd95967796c0753c8be151faace249271ac1662920a8bc2407560e29f06d7a781675d22576381eecf
+  checksum: 10/e1c08ba3879738514eac5142f88a71609f5f7c2ecd120ca6fca436982fd50169bf2376fd69fe03bc3d630be6c58bf5709b12b8e7e25dd1f8915806886649b66f
   languageName: node
   linkType: hard
 
-"@nivo/colors@npm:0.84.0":
-  version: 0.84.0
-  resolution: "@nivo/colors@npm:0.84.0"
+"@nivo/colors@npm:0.88.0":
+  version: 0.88.0
+  resolution: "@nivo/colors@npm:0.88.0"
   dependencies:
-    "@nivo/core": "npm:0.84.0"
-    "@types/d3-color": "npm:^2.0.0"
-    "@types/d3-scale": "npm:^3.2.3"
-    "@types/d3-scale-chromatic": "npm:^2.0.0"
+    "@nivo/core": "npm:0.88.0"
+    "@types/d3-color": "npm:^3.0.0"
+    "@types/d3-scale": "npm:^4.0.8"
+    "@types/d3-scale-chromatic": "npm:^3.0.0"
     "@types/prop-types": "npm:^15.7.2"
     d3-color: "npm:^3.1.0"
-    d3-scale: "npm:^3.2.3"
-    d3-scale-chromatic: "npm:^2.0.0"
+    d3-scale: "npm:^4.0.2"
+    d3-scale-chromatic: "npm:^3.0.0"
     lodash: "npm:^4.17.21"
     prop-types: "npm:^15.7.2"
   peerDependencies:
     react: ">= 16.14.0 < 19.0.0"
-  checksum: 10/1b1aa3d8fc4573446a03d19b423ac8529c66f4eacbb3fe9d371fe019674c40953e65e5db5f8e8fe188c99717109bd40911e0cb1623e2c53b1f22f84990da0d9c
+  checksum: 10/fc8cf07afb4e22115f9584be58142d9b64a88ede8d34d5c647839e4b352f140f07e289f1a90ff9a2036887ba6f46ef31910488deafdd5729550047b19ba7381a
   languageName: node
   linkType: hard
 
-"@nivo/core@npm:0.84.0":
-  version: 0.84.0
-  resolution: "@nivo/core@npm:0.84.0"
+"@nivo/core@npm:0.88.0":
+  version: 0.88.0
+  resolution: "@nivo/core@npm:0.88.0"
   dependencies:
-    "@nivo/recompose": "npm:0.84.0"
-    "@nivo/tooltip": "npm:0.84.0"
+    "@nivo/tooltip": "npm:0.88.0"
     "@react-spring/web": "npm:9.4.5 || ^9.7.2"
-    "@types/d3-shape": "npm:^2.0.0"
+    "@types/d3-shape": "npm:^3.1.6"
     d3-color: "npm:^3.1.0"
     d3-format: "npm:^1.4.4"
     d3-interpolate: "npm:^3.0.1"
-    d3-scale: "npm:^3.2.3"
+    d3-scale: "npm:^4.0.2"
     d3-scale-chromatic: "npm:^3.0.0"
-    d3-shape: "npm:^1.3.5"
+    d3-shape: "npm:^3.2.0"
     d3-time-format: "npm:^3.0.0"
     lodash: "npm:^4.17.21"
+    prop-types: "npm:^15.7.2"
   peerDependencies:
-    prop-types: ">= 15.5.10 < 16.0.0"
     react: ">= 16.14.0 < 19.0.0"
-  checksum: 10/2367b6fab4f091818fa5b2743a98002f6b13acb2b7388ad5a7f047683009a229fa7252669a14055625542105ab4c8553d96a5acea4236d919bdeb3d8f64d7e12
+  checksum: 10/14823e5366dec93827e833d789c001124424c7b43a533a7002ac39d4de4edd55a0d7a3e07eca18df30304515b2fe4ba214d243a8abdc793e434f31cbafd85950
   languageName: node
   linkType: hard
 
-"@nivo/heatmap@npm:0.84.0":
-  version: 0.84.0
-  resolution: "@nivo/heatmap@npm:0.84.0"
+"@nivo/heatmap@npm:0.88.0":
+  version: 0.88.0
+  resolution: "@nivo/heatmap@npm:0.88.0"
   dependencies:
-    "@nivo/annotations": "npm:0.84.0"
-    "@nivo/axes": "npm:0.84.0"
-    "@nivo/colors": "npm:0.84.0"
-    "@nivo/core": "npm:0.84.0"
-    "@nivo/legends": "npm:0.84.0"
-    "@nivo/scales": "npm:0.84.0"
-    "@nivo/tooltip": "npm:0.84.0"
+    "@nivo/annotations": "npm:0.88.0"
+    "@nivo/axes": "npm:0.88.0"
+    "@nivo/colors": "npm:0.88.0"
+    "@nivo/core": "npm:0.88.0"
+    "@nivo/legends": "npm:0.88.0"
+    "@nivo/scales": "npm:0.88.0"
+    "@nivo/tooltip": "npm:0.88.0"
     "@react-spring/web": "npm:9.4.5 || ^9.7.2"
-    "@types/d3-scale": "npm:^3.2.3"
-    d3-scale: "npm:^3.2.3"
+    "@types/d3-scale": "npm:^4.0.8"
+    d3-scale: "npm:^4.0.2"
   peerDependencies:
     react: ">= 16.14.0 < 19.0.0"
-  checksum: 10/331eb282313db87c55ac39b18200b05834c354a41ac80907318d7ac562fe438cbdf4891f1d7bef14d758e31662fc21deba7fd55ba75bfd54b9d179567a297356
+  checksum: 10/62dc1bd3b4a4dedc082ab300f45e3a34dde30b91c4582072abbef7ececbf6eb131d40add6bef1e6a4f932b97b1c48f0935576aab8ece23d810931efb5bb6af6d
   languageName: node
   linkType: hard
 
-"@nivo/legends@npm:0.84.0":
-  version: 0.84.0
-  resolution: "@nivo/legends@npm:0.84.0"
+"@nivo/legends@npm:0.88.0":
+  version: 0.88.0
+  resolution: "@nivo/legends@npm:0.88.0"
   dependencies:
-    "@nivo/colors": "npm:0.84.0"
-    "@nivo/core": "npm:0.84.0"
-    "@types/d3-scale": "npm:^3.2.3"
-    "@types/prop-types": "npm:^15.7.2"
-    d3-scale: "npm:^3.2.3"
-    prop-types: "npm:^15.7.2"
+    "@nivo/colors": "npm:0.88.0"
+    "@nivo/core": "npm:0.88.0"
+    "@types/d3-scale": "npm:^4.0.8"
+    d3-scale: "npm:^4.0.2"
   peerDependencies:
     react: ">= 16.14.0 < 19.0.0"
-  checksum: 10/99968f773ddda72a2792c3b2a576f54af08050a8533907f1ab61d32865bd7dfa2680639965b5102392ac6223f6e272c117e517c381f0f2f008562e1cc267d15b
+  checksum: 10/b50f170bf14c5c944f66a3de2b997102f6037c4b6801f26243d509ac47f608d9db5d9864c5bcc6874a48b2ce956bf4a030793721611c0117089a568f423abe11
   languageName: node
   linkType: hard
 
-"@nivo/line@npm:0.84.0":
-  version: 0.84.0
-  resolution: "@nivo/line@npm:0.84.0"
+"@nivo/line@npm:0.88.0":
+  version: 0.88.0
+  resolution: "@nivo/line@npm:0.88.0"
   dependencies:
-    "@nivo/annotations": "npm:0.84.0"
-    "@nivo/axes": "npm:0.84.0"
-    "@nivo/colors": "npm:0.84.0"
-    "@nivo/core": "npm:0.84.0"
-    "@nivo/legends": "npm:0.84.0"
-    "@nivo/scales": "npm:0.84.0"
-    "@nivo/tooltip": "npm:0.84.0"
-    "@nivo/voronoi": "npm:0.84.0"
+    "@nivo/annotations": "npm:0.88.0"
+    "@nivo/axes": "npm:0.88.0"
+    "@nivo/colors": "npm:0.88.0"
+    "@nivo/core": "npm:0.88.0"
+    "@nivo/legends": "npm:0.88.0"
+    "@nivo/scales": "npm:0.88.0"
+    "@nivo/tooltip": "npm:0.88.0"
+    "@nivo/voronoi": "npm:0.88.0"
     "@react-spring/web": "npm:9.4.5 || ^9.7.2"
-    d3-shape: "npm:^1.3.5"
-    prop-types: "npm:^15.7.2"
-  peerDependencies:
-    react: ">= 16.14.0 < 19.0.0"
-  checksum: 10/f85f9b932f6d8009bdef0fc18d3a516ef2117bf296b415e55738f2993e7ab49aeb4173b464e688c0299401f8c1152638d31d814a56277d3321f675abb63f418d
-  languageName: node
-  linkType: hard
-
-"@nivo/pie@npm:0.84.0":
-  version: 0.84.0
-  resolution: "@nivo/pie@npm:0.84.0"
-  dependencies:
-    "@nivo/arcs": "npm:0.84.0"
-    "@nivo/colors": "npm:0.84.0"
-    "@nivo/core": "npm:0.84.0"
-    "@nivo/legends": "npm:0.84.0"
-    "@nivo/tooltip": "npm:0.84.0"
-    "@types/d3-shape": "npm:^2.0.0"
-    d3-shape: "npm:^1.3.5"
+    d3-shape: "npm:^3.2.0"
   peerDependencies:
     react: ">= 16.14.0 < 19.0.0"
-  checksum: 10/c848726949eb720511686addafa6411d63aee6c26b8ab9aedbd3745be3634e404fd4bf2b752be7c6ab03eb3933ad37e2ffc3cdc91ce85e2fe3894c091d08bf4a
+  checksum: 10/c34729b96a22f7943105471447ef6909568974c54138e57c2376d81a012a38f5c0047651de942ecf7560577e074a357982e39cc3952ae928e7fa2d811dca64de
   languageName: node
   linkType: hard
 
-"@nivo/recompose@npm:0.84.0":
-  version: 0.84.0
-  resolution: "@nivo/recompose@npm:0.84.0"
+"@nivo/pie@npm:0.88.0":
+  version: 0.88.0
+  resolution: "@nivo/pie@npm:0.88.0"
   dependencies:
-    "@types/prop-types": "npm:^15.7.2"
-    "@types/react-lifecycles-compat": "npm:^3.0.1"
-    prop-types: "npm:^15.7.2"
-    react-lifecycles-compat: "npm:^3.0.4"
+    "@nivo/arcs": "npm:0.88.0"
+    "@nivo/colors": "npm:0.88.0"
+    "@nivo/core": "npm:0.88.0"
+    "@nivo/legends": "npm:0.88.0"
+    "@nivo/tooltip": "npm:0.88.0"
+    "@types/d3-shape": "npm:^3.1.6"
+    d3-shape: "npm:^3.2.0"
   peerDependencies:
     react: ">= 16.14.0 < 19.0.0"
-  checksum: 10/d3543d2c6049678c5d9cd77557f7fe6b77ac52f4220879f6b93777d4eb221e164326cd688b2a499204e287dbfcd888319fa867abc0f11c4bcc802ea4b5d33d4b
+  checksum: 10/3c3bf7bd6bf7ddceee6e3bfbc17a3487bbfbe02a97b8cd4ce4bed6673690c6f0694d747da153eaf30e68fb087217c87627e0fada537c65f198f58768ad81a7e8
   languageName: node
   linkType: hard
 
-"@nivo/scales@npm:0.84.0":
-  version: 0.84.0
-  resolution: "@nivo/scales@npm:0.84.0"
+"@nivo/scales@npm:0.88.0":
+  version: 0.88.0
+  resolution: "@nivo/scales@npm:0.88.0"
   dependencies:
-    "@types/d3-scale": "npm:^3.2.3"
+    "@types/d3-scale": "npm:^4.0.8"
     "@types/d3-time": "npm:^1.1.1"
     "@types/d3-time-format": "npm:^3.0.0"
-    d3-scale: "npm:^3.2.3"
+    d3-scale: "npm:^4.0.2"
     d3-time: "npm:^1.0.11"
     d3-time-format: "npm:^3.0.0"
     lodash: "npm:^4.17.21"
-  checksum: 10/56174000fe17fdaba54136a249e0bb99e1f50e92d199ae22f1aec1b1bcd05e92e13c45428f02fd08eac23b5d6ac09a674b58aa9b5b0b381c1cbbff55a157ca16
+  checksum: 10/f585fb03fe38db9b101cee011786a6a5c72992c7e7b50552644d43a31deaac2c293f4580affd41a87460bdfc348dcd8f139d7224a1c66844856c4b9a15dab2d2
   languageName: node
   linkType: hard
 
-"@nivo/tooltip@npm:0.84.0":
-  version: 0.84.0
-  resolution: "@nivo/tooltip@npm:0.84.0"
+"@nivo/tooltip@npm:0.88.0":
+  version: 0.88.0
+  resolution: "@nivo/tooltip@npm:0.88.0"
   dependencies:
-    "@nivo/core": "npm:0.84.0"
+    "@nivo/core": "npm:0.88.0"
     "@react-spring/web": "npm:9.4.5 || ^9.7.2"
-  checksum: 10/91fac6167cf0c2252fe478c6ce193ee4d20dac5704051211a404721e104576fb4b9acee4f26b9ef7187ba2712c3c60778cb12685fb41951de8fb319512fffdd4
+  peerDependencies:
+    react: ">= 16.14.0 < 19.0.0"
+  checksum: 10/1e5c6d72ef47e52b379e5277b615eb893e95814251ef1338ed7a44a080b03a70388f6e92542dd64d6d6fff5df50bf670426622883c21e9b582eb31b37adb08d8
   languageName: node
   linkType: hard
 
-"@nivo/voronoi@npm:0.84.0":
-  version: 0.84.0
-  resolution: "@nivo/voronoi@npm:0.84.0"
+"@nivo/voronoi@npm:0.88.0":
+  version: 0.88.0
+  resolution: "@nivo/voronoi@npm:0.88.0"
   dependencies:
-    "@nivo/core": "npm:0.84.0"
-    "@types/d3-delaunay": "npm:^5.3.0"
-    "@types/d3-scale": "npm:^3.2.3"
-    d3-delaunay: "npm:^5.3.0"
-    d3-scale: "npm:^3.2.3"
+    "@nivo/core": "npm:0.88.0"
+    "@nivo/tooltip": "npm:0.88.0"
+    "@types/d3-delaunay": "npm:^6.0.4"
+    "@types/d3-scale": "npm:^4.0.8"
+    d3-delaunay: "npm:^6.0.4"
+    d3-scale: "npm:^4.0.2"
   peerDependencies:
     react: ">= 16.14.0 < 19.0.0"
-  checksum: 10/417fd9f23ddea95cd3afd22bb5000eec6fb942864612e694ef908ba8dc46a06480951e7768815b6a8d2073e55a66f3310d9fa9ace60b723d5ee73b1a6cc723dc
+  checksum: 10/c22a2bb9e14a95bfca1415007b3534cd8372425eaffaa92b9a27ade5d1a68ecb5d207b2c86322c6b98bc8eab0fad31d91f1bcbd9d38a48f80e02f8129787fb9e
   languageName: node
   linkType: hard
 
@@ -5148,6 +5319,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@nodelib/fs.stat@npm:^1.1.2":
+  version: 1.1.3
+  resolution: "@nodelib/fs.stat@npm:1.1.3"
+  checksum: 10/318deab369b518a34778cdaa0054dd28a4381c0c78e40bbd20252f67d084b1d7bf9295fea4423de2c19ac8e1a34f120add9125f481b2a710f7068bcac7e3e305
+  languageName: node
+  linkType: hard
+
 "@nodelib/fs.walk@npm:^1.2.3, @nodelib/fs.walk@npm:^1.2.8":
   version: 1.2.8
   resolution: "@nodelib/fs.walk@npm:1.2.8"
@@ -5158,6 +5336,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@npmcli/agent@npm:^2.0.0":
+  version: 2.2.2
+  resolution: "@npmcli/agent@npm:2.2.2"
+  dependencies:
+    agent-base: "npm:^7.1.0"
+    http-proxy-agent: "npm:^7.0.0"
+    https-proxy-agent: "npm:^7.0.1"
+    lru-cache: "npm:^10.0.1"
+    socks-proxy-agent: "npm:^8.0.3"
+  checksum: 10/96fc0036b101bae5032dc2a4cd832efb815ce9b33f9ee2f29909ee49d96a0026b3565f73c507a69eb8603f5cb32e0ae45a70cab1e2655990a4e06ae99f7f572a
+  languageName: node
+  linkType: hard
+
 "@npmcli/fs@npm:^1.0.0":
   version: 1.1.1
   resolution: "@npmcli/fs@npm:1.1.1"
@@ -5178,6 +5369,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@npmcli/fs@npm:^3.1.0":
+  version: 3.1.1
+  resolution: "@npmcli/fs@npm:3.1.1"
+  dependencies:
+    semver: "npm:^7.3.5"
+  checksum: 10/1e0e04087049b24b38bc0b30d87a9388ee3ca1d3fdfc347c2f77d84fcfe6a51f250bc57ba2c1f614d7e4285c6c62bf8c769bc19aa0949ea39e5b043ee023b0bd
+  languageName: node
+  linkType: hard
+
 "@npmcli/move-file@npm:^1.0.1, @npmcli/move-file@npm:^1.1.2":
   version: 1.1.2
   resolution: "@npmcli/move-file@npm:1.1.2"
@@ -5188,56 +5388,46 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@octokit/auth-token@npm:^2.4.4":
-  version: 2.5.0
-  resolution: "@octokit/auth-token@npm:2.5.0"
-  dependencies:
-    "@octokit/types": "npm:^6.0.3"
-  checksum: 10/95d7928b6fcddf8960c7da27678e1cb425b4eaef2e6be615abb1f2b076b617dade72e0bf220c28bc5f106d8c029d5d064496657369d6d75372eb0c3b8d766380
+"@octokit/auth-token@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "@octokit/auth-token@npm:4.0.0"
+  checksum: 10/60e42701e341d700f73c518c7a35675d36d79fa9d5e838cc3ade96d147e49f5ba74db2e07b2337c2b95aaa540aa42088116df2122daa25633f9e70a2c8785c44
   languageName: node
   linkType: hard
 
-"@octokit/core@npm:^3.6.0":
-  version: 3.6.0
-  resolution: "@octokit/core@npm:3.6.0"
+"@octokit/core@npm:^5.0.1":
+  version: 5.2.0
+  resolution: "@octokit/core@npm:5.2.0"
   dependencies:
-    "@octokit/auth-token": "npm:^2.4.4"
-    "@octokit/graphql": "npm:^4.5.8"
-    "@octokit/request": "npm:^5.6.3"
-    "@octokit/request-error": "npm:^2.0.5"
-    "@octokit/types": "npm:^6.0.3"
+    "@octokit/auth-token": "npm:^4.0.0"
+    "@octokit/graphql": "npm:^7.1.0"
+    "@octokit/request": "npm:^8.3.1"
+    "@octokit/request-error": "npm:^5.1.0"
+    "@octokit/types": "npm:^13.0.0"
     before-after-hook: "npm:^2.2.0"
     universal-user-agent: "npm:^6.0.0"
-  checksum: 10/71e153cf93694f84fe2e3e78d2ebc7cab175c12c1a96b76a0c65c8965e46df39e3547b6340e87dcf5473dc572dfaf3ecbe800358ad572e120509ba0744a1cb9c
+  checksum: 10/2e40baf0b5c6949922436a653c213be43befd9690c43dd89872f669f3ac23117ae8ae5e5d6c18094813756c71c3f4fbedd575a891f0b89e12f58b2c38b7f3c13
   languageName: node
   linkType: hard
 
-"@octokit/endpoint@npm:^6.0.1":
-  version: 6.0.12
-  resolution: "@octokit/endpoint@npm:6.0.12"
+"@octokit/endpoint@npm:^9.0.1":
+  version: 9.0.5
+  resolution: "@octokit/endpoint@npm:9.0.5"
   dependencies:
-    "@octokit/types": "npm:^6.0.3"
-    is-plain-object: "npm:^5.0.0"
+    "@octokit/types": "npm:^13.1.0"
     universal-user-agent: "npm:^6.0.0"
-  checksum: 10/d1b55a94aa3058f840f89cc8d353ef1c294c061c5a36fe05f09c375a62f82af3068b23ce531cc1802e36ee4a52359862523e454e9d2a81c99a5c09dddffb2925
+  checksum: 10/212122f653bf076ec37dd7de44bd54db74aa3cd16be4c395c91444488331becd83351e26b30248168e2cc28fc07b1a96e8f74adbbab02826f76de92e069f391f
   languageName: node
   linkType: hard
 
-"@octokit/graphql@npm:^4.5.8":
-  version: 4.8.0
-  resolution: "@octokit/graphql@npm:4.8.0"
+"@octokit/graphql@npm:^7.1.0":
+  version: 7.1.0
+  resolution: "@octokit/graphql@npm:7.1.0"
   dependencies:
-    "@octokit/request": "npm:^5.6.0"
-    "@octokit/types": "npm:^6.0.3"
+    "@octokit/request": "npm:^8.3.0"
+    "@octokit/types": "npm:^13.0.0"
     universal-user-agent: "npm:^6.0.0"
-  checksum: 10/e03a3a05b792eee833357a8ed514ebf9bdb7c9e6037c60dc42b13bef83d13b53b6bb5955d24a49321f78e0ef2cb1611ae5cf00eaaa6abd8415884d89f9df6b8b
-  languageName: node
-  linkType: hard
-
-"@octokit/openapi-types@npm:^12.11.0":
-  version: 12.11.0
-  resolution: "@octokit/openapi-types@npm:12.11.0"
-  checksum: 10/579bbbafe816ab02441d3088c04a7728f13b73aafbe306bbdd4deac374b345b453e520c343e45db454ae6091b75a7b3ce5b7f8434d3e53e45d0802023fcb84e0
+  checksum: 10/da6857a69dc93cd20a11d3a905db4214d269d246a6aaee1d8734f922024b08ffdef0b3cba2ac79917633043b4f50464242b0bd92a265c960083dfff5b833dbbe
   languageName: node
   linkType: hard
 
@@ -5248,30 +5438,43 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@octokit/plugin-paginate-rest@npm:^2.17.0":
-  version: 2.21.3
-  resolution: "@octokit/plugin-paginate-rest@npm:2.21.3"
+"@octokit/openapi-types@npm:^20.0.0":
+  version: 20.0.0
+  resolution: "@octokit/openapi-types@npm:20.0.0"
+  checksum: 10/9f60572af1201dd92626c412253d83d986b8ab1956250b95f417013ee8e7baf25870eeb801d16672cabc2c420544bc9c2f0a979e07603ff5997eff038c71a8c3
+  languageName: node
+  linkType: hard
+
+"@octokit/openapi-types@npm:^22.2.0":
+  version: 22.2.0
+  resolution: "@octokit/openapi-types@npm:22.2.0"
+  checksum: 10/0471b0c789fada5aa2390e6f82ba477738228ef7d2d986dda9aab0cb625d1562bd178ba0ba4d2655ce841079cd5efff9e58ece2077c27e569ea22109ea301830
+  languageName: node
+  linkType: hard
+
+"@octokit/plugin-paginate-rest@npm:^9.0.0":
+  version: 9.2.1
+  resolution: "@octokit/plugin-paginate-rest@npm:9.2.1"
   dependencies:
-    "@octokit/types": "npm:^6.40.0"
+    "@octokit/types": "npm:^12.6.0"
   peerDependencies:
-    "@octokit/core": ">=2"
-  checksum: 10/446d5776953ca7e4eddd4f0b9aa35b7bf6bb61991cacdabad321ae8742ccde573d4ecd4e4e6786a673a94fe82ca180bdc22fbb8e17d961c17d2afec67e59e36a
+    "@octokit/core": 5
+  checksum: 10/1528ab17eedb6705e30ad8576493f06b40f29a87c920a4affeb9715fe5f386e064b79eadd401c0cd1e7ec22287a461da4f5353a4ee57bc614fd890b0aa139d77
   languageName: node
   linkType: hard
 
-"@octokit/plugin-rest-endpoint-methods@npm:^5.13.0":
-  version: 5.16.2
-  resolution: "@octokit/plugin-rest-endpoint-methods@npm:5.16.2"
+"@octokit/plugin-rest-endpoint-methods@npm:^10.0.0":
+  version: 10.4.1
+  resolution: "@octokit/plugin-rest-endpoint-methods@npm:10.4.1"
   dependencies:
-    "@octokit/types": "npm:^6.39.0"
-    deprecation: "npm:^2.3.1"
+    "@octokit/types": "npm:^12.6.0"
   peerDependencies:
-    "@octokit/core": ">=3"
-  checksum: 10/e2f2f3189245737c54d50efee5a33e94c8f030c5e53386d38e7c32b4026e0beffaf4e0706d11d175980b9f6cef000c73794d0ac91d2e4645565b8c26c40ea6bb
+    "@octokit/core": 5
+  checksum: 10/1090fc5a1bebb7b48c512e178f8ad69a3ef8332e583274972f3a3035e9be9200093e22a5dbfe0f71aa1a7a8817e54bb915af3c2a3f88db1311a2873cef176552
   languageName: node
   linkType: hard
 
-"@octokit/plugin-throttling@npm:^6.0.0":
+"@octokit/plugin-throttling@npm:^6.1.0":
   version: 6.1.0
   resolution: "@octokit/plugin-throttling@npm:6.1.0"
   dependencies:
@@ -5283,37 +5486,44 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@octokit/request-error@npm:^2.0.5, @octokit/request-error@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "@octokit/request-error@npm:2.1.0"
+"@octokit/request-error@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "@octokit/request-error@npm:5.1.0"
   dependencies:
-    "@octokit/types": "npm:^6.0.3"
+    "@octokit/types": "npm:^13.1.0"
     deprecation: "npm:^2.0.0"
     once: "npm:^1.4.0"
-  checksum: 10/baec2b5700498be01b4d958f9472cb776b3f3b0ea52924323a07e7a88572e24cac2cdf7eb04a0614031ba346043558b47bea2d346e98f0e8385b4261f138ef18
+  checksum: 10/d03f9f7a408af673cd991eeb450b6f4a5cee6c368f6349eb0211dfc0404fddfcff8b5225ef186020a2a1829adba0aa8c9174155b49ab2ed00a94fb9a886a1dd3
   languageName: node
   linkType: hard
 
-"@octokit/request@npm:^5.6.0, @octokit/request@npm:^5.6.3":
-  version: 5.6.3
-  resolution: "@octokit/request@npm:5.6.3"
+"@octokit/request@npm:^8.3.0, @octokit/request@npm:^8.3.1":
+  version: 8.4.0
+  resolution: "@octokit/request@npm:8.4.0"
   dependencies:
-    "@octokit/endpoint": "npm:^6.0.1"
-    "@octokit/request-error": "npm:^2.1.0"
-    "@octokit/types": "npm:^6.16.1"
-    is-plain-object: "npm:^5.0.0"
-    node-fetch: "npm:^2.6.7"
+    "@octokit/endpoint": "npm:^9.0.1"
+    "@octokit/request-error": "npm:^5.1.0"
+    "@octokit/types": "npm:^13.1.0"
     universal-user-agent: "npm:^6.0.0"
-  checksum: 10/0e5dbe6a335d8b1a5064a5305bd23cec20ba2bc9648749b5ab8b31e51e6f4ebbe363c23842fd702ca22f50e434ba963e2883a78604d97b3ddbc2439aeeed3d8c
+  checksum: 10/176cd83c68bde87111a01d50e2d21cf12ec362c1a30b33649eb8771d37397f6d6dd0b0844aab8d59b16d74c825252e39cadd52e37a4b1669d6facd1cb2cdc995
+  languageName: node
+  linkType: hard
+
+"@octokit/types@npm:^12.6.0":
+  version: 12.6.0
+  resolution: "@octokit/types@npm:12.6.0"
+  dependencies:
+    "@octokit/openapi-types": "npm:^20.0.0"
+  checksum: 10/19b77a8d25af2a5df4561f8750f807edfc9fca5b07cfa9fb21dce4665e1b188c966688f5ed5e08089404428100dfe44ad353f8d8532f1d30fe47e61c5faa1440
   languageName: node
   linkType: hard
 
-"@octokit/types@npm:^6.0.3, @octokit/types@npm:^6.16.1, @octokit/types@npm:^6.39.0, @octokit/types@npm:^6.40.0":
-  version: 6.41.0
-  resolution: "@octokit/types@npm:6.41.0"
+"@octokit/types@npm:^13.0.0, @octokit/types@npm:^13.1.0":
+  version: 13.6.1
+  resolution: "@octokit/types@npm:13.6.1"
   dependencies:
-    "@octokit/openapi-types": "npm:^12.11.0"
-  checksum: 10/905c8553e46e1a32b27f3f8c665c6a390648204f0b05c23693cd22a874e0bf654534ae2e51de3e09a794c07cc67cfd7f067b57f93cea0f658a369767537a72f0
+    "@octokit/openapi-types": "npm:^22.2.0"
+  checksum: 10/9ea6189839439e1085799cc16ee699292538d9c14dd15e9e45462377287f863b6be93455d2ad9acffd561018a0c35adbb9d1437e92075c9058d6c6d69ff2f503
   languageName: node
   linkType: hard
 
@@ -5326,154 +5536,154 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@opentelemetry/api-logs@npm:0.53.0":
-  version: 0.53.0
-  resolution: "@opentelemetry/api-logs@npm:0.53.0"
+"@opentelemetry/api-logs@npm:0.54.2":
+  version: 0.54.2
+  resolution: "@opentelemetry/api-logs@npm:0.54.2"
   dependencies:
-    "@opentelemetry/api": "npm:^1.0.0"
-  checksum: 10/347b4554d6ee01afb29bd39e8f9cbbccd80abb0883fe6a84e3bcce8ab4dbfe357a2729246d2f66de0de6272846fd1bb2d71e286e18ad2690d9e7f46f02f00f73
+    "@opentelemetry/api": "npm:^1.3.0"
+  checksum: 10/97d887be03ca4a2e69574cc9160464bda00f2a167cc850656ade44b6690a75855d9334983b73827dc44c3672958bc478197f261eae11c2ac68a6df9260c9c3df
   languageName: node
   linkType: hard
 
-"@opentelemetry/api@npm:^1.0.0, @opentelemetry/api@npm:^1.4.0, @opentelemetry/api@npm:^1.9.0":
+"@opentelemetry/api@npm:^1.3.0, @opentelemetry/api@npm:^1.4.0, @opentelemetry/api@npm:^1.9.0":
   version: 1.9.0
   resolution: "@opentelemetry/api@npm:1.9.0"
   checksum: 10/a607f0eef971893c4f2ee2a4c2069aade6ec3e84e2a1f5c2aac19f65c5d9eeea41aa72db917c1029faafdd71789a1a040bdc18f40d63690e22ccae5d7070f194
   languageName: node
   linkType: hard
 
-"@opentelemetry/context-async-hooks@npm:1.26.0":
-  version: 1.26.0
-  resolution: "@opentelemetry/context-async-hooks@npm:1.26.0"
+"@opentelemetry/context-async-hooks@npm:1.27.0":
+  version: 1.27.0
+  resolution: "@opentelemetry/context-async-hooks@npm:1.27.0"
   peerDependencies:
     "@opentelemetry/api": ">=1.0.0 <1.10.0"
-  checksum: 10/c8824cc00385f21ecdf5b48ac474096687f9ce2e8d34612a62ee8bc7a6e25797c787239349a12bfeefbff200dcb7379ca45355a5684b9755dcf8fbd3b69cf523
+  checksum: 10/a72fdf5754f6e6d829b81031afe1a8e48a66bb02b13014e05c3fbb9c31fc736f7d303b0bb3491d200ce951582fe04a2d1c6246359683e8fe1b544929d5fd16c5
   languageName: node
   linkType: hard
 
-"@opentelemetry/core@npm:1.26.0":
-  version: 1.26.0
-  resolution: "@opentelemetry/core@npm:1.26.0"
+"@opentelemetry/core@npm:1.27.0":
+  version: 1.27.0
+  resolution: "@opentelemetry/core@npm:1.27.0"
   dependencies:
     "@opentelemetry/semantic-conventions": "npm:1.27.0"
   peerDependencies:
     "@opentelemetry/api": ">=1.0.0 <1.10.0"
-  checksum: 10/474b6bcf42cd2825d56f915eb0d6e6cdcb37777a11fc2618fc2fa50754f4b9b5df23944f3aab186cb3ab930db5c3a81efa3183362802314a966930110346e6a4
+  checksum: 10/2e64f35f7f8a53c035eb7e2335c73a6bca0f12a0d45cd8171646492d5efb73f82fb29aae77f34b2d6e93498b38172dee8e5cf769727c44ac08be0d5b21da7512
   languageName: node
   linkType: hard
 
-"@opentelemetry/exporter-logs-otlp-grpc@npm:0.53.0":
-  version: 0.53.0
-  resolution: "@opentelemetry/exporter-logs-otlp-grpc@npm:0.53.0"
+"@opentelemetry/exporter-logs-otlp-grpc@npm:0.54.2":
+  version: 0.54.2
+  resolution: "@opentelemetry/exporter-logs-otlp-grpc@npm:0.54.2"
   dependencies:
     "@grpc/grpc-js": "npm:^1.7.1"
-    "@opentelemetry/core": "npm:1.26.0"
-    "@opentelemetry/otlp-grpc-exporter-base": "npm:0.53.0"
-    "@opentelemetry/otlp-transformer": "npm:0.53.0"
-    "@opentelemetry/sdk-logs": "npm:0.53.0"
+    "@opentelemetry/core": "npm:1.27.0"
+    "@opentelemetry/otlp-grpc-exporter-base": "npm:0.54.2"
+    "@opentelemetry/otlp-transformer": "npm:0.54.2"
+    "@opentelemetry/sdk-logs": "npm:0.54.2"
   peerDependencies:
-    "@opentelemetry/api": ^1.0.0
-  checksum: 10/4a8236acffe847d95ffb9098efdded74ff9ccc1e4f5ad68d7cc110f14a8a29841e2c9e5ee201f38bb49602690bd197c9ef3536ae3f23c012ce3248a65327f2bb
+    "@opentelemetry/api": ^1.3.0
+  checksum: 10/eacb27329ad5a8154f0f075e20de146cd18b673dfc3db88596678f95afa8939bc853e98e397a817dcf4e5cc024ff7e53320041576b2ce7c0dffd1067e7229b9e
   languageName: node
   linkType: hard
 
-"@opentelemetry/exporter-logs-otlp-http@npm:0.53.0":
-  version: 0.53.0
-  resolution: "@opentelemetry/exporter-logs-otlp-http@npm:0.53.0"
+"@opentelemetry/exporter-logs-otlp-http@npm:0.54.2":
+  version: 0.54.2
+  resolution: "@opentelemetry/exporter-logs-otlp-http@npm:0.54.2"
   dependencies:
-    "@opentelemetry/api-logs": "npm:0.53.0"
-    "@opentelemetry/core": "npm:1.26.0"
-    "@opentelemetry/otlp-exporter-base": "npm:0.53.0"
-    "@opentelemetry/otlp-transformer": "npm:0.53.0"
-    "@opentelemetry/sdk-logs": "npm:0.53.0"
+    "@opentelemetry/api-logs": "npm:0.54.2"
+    "@opentelemetry/core": "npm:1.27.0"
+    "@opentelemetry/otlp-exporter-base": "npm:0.54.2"
+    "@opentelemetry/otlp-transformer": "npm:0.54.2"
+    "@opentelemetry/sdk-logs": "npm:0.54.2"
   peerDependencies:
-    "@opentelemetry/api": ^1.0.0
-  checksum: 10/bf0d19a71eed3d90f51f6ab1c5fdbb7837477db50b47a46944efeab42c6d72ef13677487eb1ed4cd0d6e6fccbd41cec33a31e17aaef0e24f9bad5b52ab8b3649
+    "@opentelemetry/api": ^1.3.0
+  checksum: 10/88e99302310cef38002c5cc2c682197b8bc5bee5a1dd139d7a9fb5b2645464071e86a4f55607dbf1afae5a4d91c41ddfc982e7230c7ed6e4667e5709b7a9e3c0
   languageName: node
   linkType: hard
 
-"@opentelemetry/exporter-logs-otlp-proto@npm:0.53.0":
-  version: 0.53.0
-  resolution: "@opentelemetry/exporter-logs-otlp-proto@npm:0.53.0"
+"@opentelemetry/exporter-logs-otlp-proto@npm:0.54.2":
+  version: 0.54.2
+  resolution: "@opentelemetry/exporter-logs-otlp-proto@npm:0.54.2"
   dependencies:
-    "@opentelemetry/api-logs": "npm:0.53.0"
-    "@opentelemetry/core": "npm:1.26.0"
-    "@opentelemetry/otlp-exporter-base": "npm:0.53.0"
-    "@opentelemetry/otlp-transformer": "npm:0.53.0"
-    "@opentelemetry/resources": "npm:1.26.0"
-    "@opentelemetry/sdk-logs": "npm:0.53.0"
-    "@opentelemetry/sdk-trace-base": "npm:1.26.0"
+    "@opentelemetry/api-logs": "npm:0.54.2"
+    "@opentelemetry/core": "npm:1.27.0"
+    "@opentelemetry/otlp-exporter-base": "npm:0.54.2"
+    "@opentelemetry/otlp-transformer": "npm:0.54.2"
+    "@opentelemetry/resources": "npm:1.27.0"
+    "@opentelemetry/sdk-logs": "npm:0.54.2"
+    "@opentelemetry/sdk-trace-base": "npm:1.27.0"
   peerDependencies:
-    "@opentelemetry/api": ^1.0.0
-  checksum: 10/295f73fb7c098e54d83149ab1a681f8f16b379111dc23201b7eaa803eff6ba42bebd99a00df1a02112bd181b341588e8de3e09364b9f28d2c91d8bd2be4824a7
+    "@opentelemetry/api": ^1.3.0
+  checksum: 10/2b2d6bfe1d0799d0f96fac5a15712c8dd3ef132380ee1856d03672c54802fa9f7664a0897310de708cd42942f916d0fdf20916cf4c5459ef7148db836cd5b1f2
   languageName: node
   linkType: hard
 
-"@opentelemetry/exporter-trace-otlp-grpc@npm:0.53.0, @opentelemetry/exporter-trace-otlp-grpc@npm:^0.53.0":
-  version: 0.53.0
-  resolution: "@opentelemetry/exporter-trace-otlp-grpc@npm:0.53.0"
+"@opentelemetry/exporter-trace-otlp-grpc@npm:0.54.2, @opentelemetry/exporter-trace-otlp-grpc@npm:^0.54.2":
+  version: 0.54.2
+  resolution: "@opentelemetry/exporter-trace-otlp-grpc@npm:0.54.2"
   dependencies:
     "@grpc/grpc-js": "npm:^1.7.1"
-    "@opentelemetry/core": "npm:1.26.0"
-    "@opentelemetry/otlp-grpc-exporter-base": "npm:0.53.0"
-    "@opentelemetry/otlp-transformer": "npm:0.53.0"
-    "@opentelemetry/resources": "npm:1.26.0"
-    "@opentelemetry/sdk-trace-base": "npm:1.26.0"
+    "@opentelemetry/core": "npm:1.27.0"
+    "@opentelemetry/otlp-grpc-exporter-base": "npm:0.54.2"
+    "@opentelemetry/otlp-transformer": "npm:0.54.2"
+    "@opentelemetry/resources": "npm:1.27.0"
+    "@opentelemetry/sdk-trace-base": "npm:1.27.0"
   peerDependencies:
-    "@opentelemetry/api": ^1.0.0
-  checksum: 10/3c8a854f9c401549ead8a900d4773de891663ef6233e457d57557834cacc547a637dccf0f4c63e9b367f33925f5a4991e37910566681481169ee17e5253b6894
+    "@opentelemetry/api": ^1.3.0
+  checksum: 10/4fd0f50f1faca2ddc8167420517b0f03760fe113e3240fcfc1324d2e0779065b92f2f08775cae020e7a51bf80d202328e44159e89830b160f41e7c1b507debaf
   languageName: node
   linkType: hard
 
-"@opentelemetry/exporter-trace-otlp-http@npm:0.53.0":
-  version: 0.53.0
-  resolution: "@opentelemetry/exporter-trace-otlp-http@npm:0.53.0"
+"@opentelemetry/exporter-trace-otlp-http@npm:0.54.2":
+  version: 0.54.2
+  resolution: "@opentelemetry/exporter-trace-otlp-http@npm:0.54.2"
   dependencies:
-    "@opentelemetry/core": "npm:1.26.0"
-    "@opentelemetry/otlp-exporter-base": "npm:0.53.0"
-    "@opentelemetry/otlp-transformer": "npm:0.53.0"
-    "@opentelemetry/resources": "npm:1.26.0"
-    "@opentelemetry/sdk-trace-base": "npm:1.26.0"
+    "@opentelemetry/core": "npm:1.27.0"
+    "@opentelemetry/otlp-exporter-base": "npm:0.54.2"
+    "@opentelemetry/otlp-transformer": "npm:0.54.2"
+    "@opentelemetry/resources": "npm:1.27.0"
+    "@opentelemetry/sdk-trace-base": "npm:1.27.0"
   peerDependencies:
-    "@opentelemetry/api": ^1.0.0
-  checksum: 10/28c75e25564833bc448b5733415730483c9f28714577acb679087d5ccfc46d74b3f24996c41f2c93bf6a6406edb1cad7e8cf2a76b61096e3f417f90044e1d795
+    "@opentelemetry/api": ^1.3.0
+  checksum: 10/0826980f3509795b48b694bc5c1035e1800ddc0697e29662dd02a6ec09ebe40a57f3c977482cf91b90a6eb5ed99b6a9b1401a144c868c6f4196c6c50da84600a
   languageName: node
   linkType: hard
 
-"@opentelemetry/exporter-trace-otlp-proto@npm:0.53.0":
-  version: 0.53.0
-  resolution: "@opentelemetry/exporter-trace-otlp-proto@npm:0.53.0"
+"@opentelemetry/exporter-trace-otlp-proto@npm:0.54.2":
+  version: 0.54.2
+  resolution: "@opentelemetry/exporter-trace-otlp-proto@npm:0.54.2"
   dependencies:
-    "@opentelemetry/core": "npm:1.26.0"
-    "@opentelemetry/otlp-exporter-base": "npm:0.53.0"
-    "@opentelemetry/otlp-transformer": "npm:0.53.0"
-    "@opentelemetry/resources": "npm:1.26.0"
-    "@opentelemetry/sdk-trace-base": "npm:1.26.0"
+    "@opentelemetry/core": "npm:1.27.0"
+    "@opentelemetry/otlp-exporter-base": "npm:0.54.2"
+    "@opentelemetry/otlp-transformer": "npm:0.54.2"
+    "@opentelemetry/resources": "npm:1.27.0"
+    "@opentelemetry/sdk-trace-base": "npm:1.27.0"
   peerDependencies:
-    "@opentelemetry/api": ^1.0.0
-  checksum: 10/2d4651db9ef5d5b1b22b84a6d268ae4e020bf107a71f7d96a8b149f3af4680d6087dfdabf3b3a606f862888ccc63bfe4368057c45befc58c60bda48eceab50ea
+    "@opentelemetry/api": ^1.3.0
+  checksum: 10/3f128e60833c6cc896209ee787234be930ea326d9006973f1f0bc61903715c4ae8d60e46ab4b66cd9baa008c8682b9f8ddef6b99ea8b2929aa4745075a593630
   languageName: node
   linkType: hard
 
-"@opentelemetry/exporter-zipkin@npm:1.26.0":
-  version: 1.26.0
-  resolution: "@opentelemetry/exporter-zipkin@npm:1.26.0"
+"@opentelemetry/exporter-zipkin@npm:1.27.0":
+  version: 1.27.0
+  resolution: "@opentelemetry/exporter-zipkin@npm:1.27.0"
   dependencies:
-    "@opentelemetry/core": "npm:1.26.0"
-    "@opentelemetry/resources": "npm:1.26.0"
-    "@opentelemetry/sdk-trace-base": "npm:1.26.0"
+    "@opentelemetry/core": "npm:1.27.0"
+    "@opentelemetry/resources": "npm:1.27.0"
+    "@opentelemetry/sdk-trace-base": "npm:1.27.0"
     "@opentelemetry/semantic-conventions": "npm:1.27.0"
   peerDependencies:
     "@opentelemetry/api": ^1.0.0
-  checksum: 10/155a450a17f1963667dd6b20150858ebcdc9bc358396b2d3df728faa7d66fed68e6c2f0c4cfb4598d3f03aa7ad2ba280e2af033245289d7a5d98b6e5ccd7c54a
+  checksum: 10/c1cf75eae527b9159b9e52b9b073d3a62a8e407812832a10bb1c110aad2764692239cb99e46f56b2d4d72fe548494dd829bbf2c25611827fc1b031d8af69e8ef
   languageName: node
   linkType: hard
 
-"@opentelemetry/instrumentation@npm:0.53.0":
-  version: 0.53.0
-  resolution: "@opentelemetry/instrumentation@npm:0.53.0"
+"@opentelemetry/instrumentation@npm:0.54.2":
+  version: 0.54.2
+  resolution: "@opentelemetry/instrumentation@npm:0.54.2"
   dependencies:
-    "@opentelemetry/api-logs": "npm:0.53.0"
+    "@opentelemetry/api-logs": "npm:0.54.2"
     "@types/shimmer": "npm:^1.2.0"
     import-in-the-middle: "npm:^1.8.1"
     require-in-the-middle: "npm:^7.1.1"
@@ -5481,164 +5691,164 @@ __metadata:
     shimmer: "npm:^1.2.1"
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: 10/4b994c8568a503a15655cba249b1dbdef3f67dfda37938abba6267ba75b6d72a9aa276be4b0c8874e86f98ab89d92877e1874e0565a7e67f062c43dfcbbb16a5
+  checksum: 10/1c570fb2e55d2ea7dcc45103afb53ffc331efb675dc404783639c0ed4c93e4e0fa04751672f75ca2a633ca03943e520cf802ee0291e79fa33be54a097af46fc6
   languageName: node
   linkType: hard
 
-"@opentelemetry/otlp-exporter-base@npm:0.53.0":
-  version: 0.53.0
-  resolution: "@opentelemetry/otlp-exporter-base@npm:0.53.0"
+"@opentelemetry/otlp-exporter-base@npm:0.54.2":
+  version: 0.54.2
+  resolution: "@opentelemetry/otlp-exporter-base@npm:0.54.2"
   dependencies:
-    "@opentelemetry/core": "npm:1.26.0"
-    "@opentelemetry/otlp-transformer": "npm:0.53.0"
+    "@opentelemetry/core": "npm:1.27.0"
+    "@opentelemetry/otlp-transformer": "npm:0.54.2"
   peerDependencies:
-    "@opentelemetry/api": ^1.0.0
-  checksum: 10/ca59d73ae8f83946062b060a9a382fc7db6154c892ed56b6ab7f545530ba4850b4d0a748daaa30d1177ef6a8c2a0fddd34a199080f4474ec445944cece86f1ef
+    "@opentelemetry/api": ^1.3.0
+  checksum: 10/f4eb3009ab87c072b52d33106b60a507b6debbc40ad6762275f6bb48144e1dc401d1100ea87540df08dbdb542f4ea6779aa805313d0b3966eae34ca3dded1436
   languageName: node
   linkType: hard
 
-"@opentelemetry/otlp-grpc-exporter-base@npm:0.53.0":
-  version: 0.53.0
-  resolution: "@opentelemetry/otlp-grpc-exporter-base@npm:0.53.0"
+"@opentelemetry/otlp-grpc-exporter-base@npm:0.54.2":
+  version: 0.54.2
+  resolution: "@opentelemetry/otlp-grpc-exporter-base@npm:0.54.2"
   dependencies:
     "@grpc/grpc-js": "npm:^1.7.1"
-    "@opentelemetry/core": "npm:1.26.0"
-    "@opentelemetry/otlp-exporter-base": "npm:0.53.0"
-    "@opentelemetry/otlp-transformer": "npm:0.53.0"
+    "@opentelemetry/core": "npm:1.27.0"
+    "@opentelemetry/otlp-exporter-base": "npm:0.54.2"
+    "@opentelemetry/otlp-transformer": "npm:0.54.2"
   peerDependencies:
-    "@opentelemetry/api": ^1.0.0
-  checksum: 10/412e0428946277b7fbfb7ceafd9624fa930cbc9ff892cc0f796f712ee4b1a6d53516a2891bce5ffc9e72a209b32953d4d87e726e55c9ea422dc75ed580c0af37
+    "@opentelemetry/api": ^1.3.0
+  checksum: 10/d7647ff72fab06ed410f3782c0199a24a98da61bcc5fbc19aa8afcd2fac2b376aad48f9206504d40bee6070de3a7e4bf03423d438a3daaa3f71c3a95f261f48b
   languageName: node
   linkType: hard
 
-"@opentelemetry/otlp-transformer@npm:0.53.0":
-  version: 0.53.0
-  resolution: "@opentelemetry/otlp-transformer@npm:0.53.0"
+"@opentelemetry/otlp-transformer@npm:0.54.2":
+  version: 0.54.2
+  resolution: "@opentelemetry/otlp-transformer@npm:0.54.2"
   dependencies:
-    "@opentelemetry/api-logs": "npm:0.53.0"
-    "@opentelemetry/core": "npm:1.26.0"
-    "@opentelemetry/resources": "npm:1.26.0"
-    "@opentelemetry/sdk-logs": "npm:0.53.0"
-    "@opentelemetry/sdk-metrics": "npm:1.26.0"
-    "@opentelemetry/sdk-trace-base": "npm:1.26.0"
+    "@opentelemetry/api-logs": "npm:0.54.2"
+    "@opentelemetry/core": "npm:1.27.0"
+    "@opentelemetry/resources": "npm:1.27.0"
+    "@opentelemetry/sdk-logs": "npm:0.54.2"
+    "@opentelemetry/sdk-metrics": "npm:1.27.0"
+    "@opentelemetry/sdk-trace-base": "npm:1.27.0"
     protobufjs: "npm:^7.3.0"
   peerDependencies:
     "@opentelemetry/api": ^1.3.0
-  checksum: 10/578cf13d7984a0b1ba1db3d86d1e358bf70e8b534166f8327a10fccca0afd3900896a80e5e73caae61837b0cbc99d81b44784edee68a3517d73f5330a3624ccd
+  checksum: 10/316fcdeca02666dfb2919746a83b1523f729875efac45075d513789fc534a3aa4a467c9c519c7fd8a16db78274534373bee0f56f95c89ba09dc4868e2fb42c10
   languageName: node
   linkType: hard
 
-"@opentelemetry/propagator-b3@npm:1.26.0":
-  version: 1.26.0
-  resolution: "@opentelemetry/propagator-b3@npm:1.26.0"
+"@opentelemetry/propagator-b3@npm:1.27.0":
+  version: 1.27.0
+  resolution: "@opentelemetry/propagator-b3@npm:1.27.0"
   dependencies:
-    "@opentelemetry/core": "npm:1.26.0"
+    "@opentelemetry/core": "npm:1.27.0"
   peerDependencies:
     "@opentelemetry/api": ">=1.0.0 <1.10.0"
-  checksum: 10/fa99958ccd7e2d8140c6271a6c2bc0b95054691ce227b75272951bb1f387bd442ee0813b5f5e268c837d3a563c36ac516bac37aa821e1b5119c7f21c90742c89
+  checksum: 10/21af4d3416155071d49351087f16ba66d255fba33f7bf6ffded538646e5a2efc53228733466c4419761a8f83aa200a940d6e30a27cdcb45ebd2665351ef4175e
   languageName: node
   linkType: hard
 
-"@opentelemetry/propagator-jaeger@npm:1.26.0":
-  version: 1.26.0
-  resolution: "@opentelemetry/propagator-jaeger@npm:1.26.0"
+"@opentelemetry/propagator-jaeger@npm:1.27.0":
+  version: 1.27.0
+  resolution: "@opentelemetry/propagator-jaeger@npm:1.27.0"
   dependencies:
-    "@opentelemetry/core": "npm:1.26.0"
+    "@opentelemetry/core": "npm:1.27.0"
   peerDependencies:
     "@opentelemetry/api": ">=1.0.0 <1.10.0"
-  checksum: 10/f895186e6c95a1ca9cc172de50867c036f87dacdfd9206df2ab35710134221b0021974eb2ced2453840a4fbb6aae55a732847b898e420b3871b3157eb81183ed
+  checksum: 10/896cf18c3278083caec05b63a622b0e3da9abf658670f9170c4c47fcc3a121d878f7c6708b012490bd466e39f361a58773631fbc4784b4c03ad680002c1df50d
   languageName: node
   linkType: hard
 
-"@opentelemetry/resources@npm:1.26.0":
-  version: 1.26.0
-  resolution: "@opentelemetry/resources@npm:1.26.0"
+"@opentelemetry/resources@npm:1.27.0":
+  version: 1.27.0
+  resolution: "@opentelemetry/resources@npm:1.27.0"
   dependencies:
-    "@opentelemetry/core": "npm:1.26.0"
+    "@opentelemetry/core": "npm:1.27.0"
     "@opentelemetry/semantic-conventions": "npm:1.27.0"
   peerDependencies:
     "@opentelemetry/api": ">=1.0.0 <1.10.0"
-  checksum: 10/ce60dbf2bd424b01824b72f533724eaf64418e01c43bef952b87dbff6d2a0f28cdcbea0d3d95c5e324f609e58721bf52ea91b5518b0e30d6bb03fb95af85cc33
+  checksum: 10/654141ea65854bba84c22eeecc5af0054f14462f2664f36ac1ad8a170404e3218fccb98cafaaff4ec45e85523230e58eafbf222c25d00de8a60141ce77a34bbf
   languageName: node
   linkType: hard
 
-"@opentelemetry/sdk-logs@npm:0.53.0":
-  version: 0.53.0
-  resolution: "@opentelemetry/sdk-logs@npm:0.53.0"
+"@opentelemetry/sdk-logs@npm:0.54.2":
+  version: 0.54.2
+  resolution: "@opentelemetry/sdk-logs@npm:0.54.2"
   dependencies:
-    "@opentelemetry/api-logs": "npm:0.53.0"
-    "@opentelemetry/core": "npm:1.26.0"
-    "@opentelemetry/resources": "npm:1.26.0"
+    "@opentelemetry/api-logs": "npm:0.54.2"
+    "@opentelemetry/core": "npm:1.27.0"
+    "@opentelemetry/resources": "npm:1.27.0"
   peerDependencies:
     "@opentelemetry/api": ">=1.4.0 <1.10.0"
-  checksum: 10/b11b512820f3d55288f7478831587ebe2e7077980f060a779a13848c62cab30023734857c68ef110eebe961884cb8892d7c77841a5f1d22c2426cbb18d762975
+  checksum: 10/c00a01de156d529674ed9b607fbabffd3306aa51b7b1897a670214cab7ba7d07da1f2bc5e8d957b0f441448b8ec22ac0526b1b368e36a61edf2bd54bfe571d2d
   languageName: node
   linkType: hard
 
-"@opentelemetry/sdk-metrics@npm:1.26.0":
-  version: 1.26.0
-  resolution: "@opentelemetry/sdk-metrics@npm:1.26.0"
+"@opentelemetry/sdk-metrics@npm:1.27.0":
+  version: 1.27.0
+  resolution: "@opentelemetry/sdk-metrics@npm:1.27.0"
   dependencies:
-    "@opentelemetry/core": "npm:1.26.0"
-    "@opentelemetry/resources": "npm:1.26.0"
+    "@opentelemetry/core": "npm:1.27.0"
+    "@opentelemetry/resources": "npm:1.27.0"
   peerDependencies:
     "@opentelemetry/api": ">=1.3.0 <1.10.0"
-  checksum: 10/e48e4dd1fed1e501750460e1320f89507c19287c5059cfaccc8268ad8cc3e1de40feeee6584b23626e01f9cde0f10301d08edf6a65bbd1346ef94f70ae8844f5
-  languageName: node
-  linkType: hard
-
-"@opentelemetry/sdk-node@npm:^0.53.0":
-  version: 0.53.0
-  resolution: "@opentelemetry/sdk-node@npm:0.53.0"
-  dependencies:
-    "@opentelemetry/api-logs": "npm:0.53.0"
-    "@opentelemetry/core": "npm:1.26.0"
-    "@opentelemetry/exporter-logs-otlp-grpc": "npm:0.53.0"
-    "@opentelemetry/exporter-logs-otlp-http": "npm:0.53.0"
-    "@opentelemetry/exporter-logs-otlp-proto": "npm:0.53.0"
-    "@opentelemetry/exporter-trace-otlp-grpc": "npm:0.53.0"
-    "@opentelemetry/exporter-trace-otlp-http": "npm:0.53.0"
-    "@opentelemetry/exporter-trace-otlp-proto": "npm:0.53.0"
-    "@opentelemetry/exporter-zipkin": "npm:1.26.0"
-    "@opentelemetry/instrumentation": "npm:0.53.0"
-    "@opentelemetry/resources": "npm:1.26.0"
-    "@opentelemetry/sdk-logs": "npm:0.53.0"
-    "@opentelemetry/sdk-metrics": "npm:1.26.0"
-    "@opentelemetry/sdk-trace-base": "npm:1.26.0"
-    "@opentelemetry/sdk-trace-node": "npm:1.26.0"
+  checksum: 10/0d6061f42879170e4b4cf4847aa658520a7574f287b33562299ddeb97b0145a4ec91abec63d2292af0d632fce3e63b42f6e6e9a0e9698dc01950b6063363bf98
+  languageName: node
+  linkType: hard
+
+"@opentelemetry/sdk-node@npm:^0.54.2":
+  version: 0.54.2
+  resolution: "@opentelemetry/sdk-node@npm:0.54.2"
+  dependencies:
+    "@opentelemetry/api-logs": "npm:0.54.2"
+    "@opentelemetry/core": "npm:1.27.0"
+    "@opentelemetry/exporter-logs-otlp-grpc": "npm:0.54.2"
+    "@opentelemetry/exporter-logs-otlp-http": "npm:0.54.2"
+    "@opentelemetry/exporter-logs-otlp-proto": "npm:0.54.2"
+    "@opentelemetry/exporter-trace-otlp-grpc": "npm:0.54.2"
+    "@opentelemetry/exporter-trace-otlp-http": "npm:0.54.2"
+    "@opentelemetry/exporter-trace-otlp-proto": "npm:0.54.2"
+    "@opentelemetry/exporter-zipkin": "npm:1.27.0"
+    "@opentelemetry/instrumentation": "npm:0.54.2"
+    "@opentelemetry/resources": "npm:1.27.0"
+    "@opentelemetry/sdk-logs": "npm:0.54.2"
+    "@opentelemetry/sdk-metrics": "npm:1.27.0"
+    "@opentelemetry/sdk-trace-base": "npm:1.27.0"
+    "@opentelemetry/sdk-trace-node": "npm:1.27.0"
     "@opentelemetry/semantic-conventions": "npm:1.27.0"
   peerDependencies:
     "@opentelemetry/api": ">=1.3.0 <1.10.0"
-  checksum: 10/ce05610b11336ad8218a39c1798d7090e1c1666956f37347b585e5e51e6e62b0cd24207474fa312528c10c8473dc6cbaefb6fe3647d76613c241795e1cfe6303
+  checksum: 10/36de50763eb13ce720ab50670870562f9d12583d9b18d0d7c9dce8b8d5fa08bee1d0c12e8a3b17b5208e934e65091ab2f21f1828a593ed431d6dde51429b28a3
   languageName: node
   linkType: hard
 
-"@opentelemetry/sdk-trace-base@npm:1.26.0":
-  version: 1.26.0
-  resolution: "@opentelemetry/sdk-trace-base@npm:1.26.0"
+"@opentelemetry/sdk-trace-base@npm:1.27.0":
+  version: 1.27.0
+  resolution: "@opentelemetry/sdk-trace-base@npm:1.27.0"
   dependencies:
-    "@opentelemetry/core": "npm:1.26.0"
-    "@opentelemetry/resources": "npm:1.26.0"
+    "@opentelemetry/core": "npm:1.27.0"
+    "@opentelemetry/resources": "npm:1.27.0"
     "@opentelemetry/semantic-conventions": "npm:1.27.0"
   peerDependencies:
     "@opentelemetry/api": ">=1.0.0 <1.10.0"
-  checksum: 10/e4a3d296ad908b9f58d7aefdcc1f7383fb0eb64fc85b0b5d18c4a7d829ce3d0efa5e53f5fe1a23185d9b5d97b782431384efe01aba8ba788922260a9dbbdb662
+  checksum: 10/e0023dedbf5a50265729dd5467be0504f04f6b43d4cc4b914a9a8c082cca1aec9250a1f31c615f3d4ad03124af6e0ba1e14b39fe745d14291198f2a0990edc9c
   languageName: node
   linkType: hard
 
-"@opentelemetry/sdk-trace-node@npm:1.26.0":
-  version: 1.26.0
-  resolution: "@opentelemetry/sdk-trace-node@npm:1.26.0"
+"@opentelemetry/sdk-trace-node@npm:1.27.0":
+  version: 1.27.0
+  resolution: "@opentelemetry/sdk-trace-node@npm:1.27.0"
   dependencies:
-    "@opentelemetry/context-async-hooks": "npm:1.26.0"
-    "@opentelemetry/core": "npm:1.26.0"
-    "@opentelemetry/propagator-b3": "npm:1.26.0"
-    "@opentelemetry/propagator-jaeger": "npm:1.26.0"
-    "@opentelemetry/sdk-trace-base": "npm:1.26.0"
+    "@opentelemetry/context-async-hooks": "npm:1.27.0"
+    "@opentelemetry/core": "npm:1.27.0"
+    "@opentelemetry/propagator-b3": "npm:1.27.0"
+    "@opentelemetry/propagator-jaeger": "npm:1.27.0"
+    "@opentelemetry/sdk-trace-base": "npm:1.27.0"
     semver: "npm:^7.5.2"
   peerDependencies:
     "@opentelemetry/api": ">=1.0.0 <1.10.0"
-  checksum: 10/ac89d54b65e10928a13e3c0adf4d4997d53baf8b03f376c03d47e921322959a0f8cfae744f4bdc63bfd1ab22d67fcae8d7bd1f6bbfbaad18cd1623543128ac54
+  checksum: 10/53cff496312f0dedd819d2998219596a0d700348bf8ad315ff1d48a9a5e9be070623ed850633436f4ad006263b9cb55ffb6681d4174de99547d4edaa4125c98d
   languageName: node
   linkType: hard
 
@@ -5783,6 +5993,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@peggyjs/from-mem@npm:1.3.4":
+  version: 1.3.4
+  resolution: "@peggyjs/from-mem@npm:1.3.4"
+  dependencies:
+    semver: "npm:7.6.3"
+  checksum: 10/d32ce47af78eb6ccec3cb5b98f4c592bbdb634b05dd99a0fb107cfa48c17069ea0b5fb284705839de7be3a43638e05b0c9733fa83b30e3e2cf608790e42b5e31
+  languageName: node
+  linkType: hard
+
 "@pkgjs/parseargs@npm:^0.11.0":
   version: 0.11.0
   resolution: "@pkgjs/parseargs@npm:0.11.0"
@@ -5790,14 +6009,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@playwright/test@npm:^1.40.1":
-  version: 1.40.1
-  resolution: "@playwright/test@npm:1.40.1"
+"@pkgr/core@npm:^0.1.0":
+  version: 0.1.1
+  resolution: "@pkgr/core@npm:0.1.1"
+  checksum: 10/6f25fd2e3008f259c77207ac9915b02f1628420403b2630c92a07ff963129238c9262afc9e84344c7a23b5cc1f3965e2cd17e3798219f5fd78a63d144d3cceba
+  languageName: node
+  linkType: hard
+
+"@playwright/test@npm:^1.48.2":
+  version: 1.48.2
+  resolution: "@playwright/test@npm:1.48.2"
   dependencies:
-    playwright: "npm:1.40.1"
+    playwright: "npm:1.48.2"
   bin:
     playwright: cli.js
-  checksum: 10/77bfc3d4a101fd996309de3a67256117f671952764404727e520a4d512ba2e528d8f9e0b28ef9b2851664a651a5d002a0b05993e313077a2fa640bb430f38b25
+  checksum: 10/8557f9d60b93b9a60b66599d46f991b56df26b691f9285e8755298dabd9f42d1421c330a7d7578b76445fdd56040fe790d3f1081daa80e5e89a380170e0fd217
   languageName: node
   linkType: hard
 
@@ -5808,13 +6034,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@polka/url@npm:^1.0.0-next.20":
-  version: 1.0.0-next.21
-  resolution: "@polka/url@npm:1.0.0-next.21"
-  checksum: 10/c7654046d38984257dd639eab3dc770d1b0340916097b2fac03ce5d23506ada684e05574a69b255c32ea6a144a957c8cd84264159b545fca031c772289d88788
-  languageName: node
-  linkType: hard
-
 "@protobufjs/aspromise@npm:^1.1.1, @protobufjs/aspromise@npm:^1.1.2":
   version: 1.1.2
   resolution: "@protobufjs/aspromise@npm:1.1.2"
@@ -6092,18 +6311,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@react-aria/focus@npm:3.0.0-nightly.2697+55aca809c":
-  version: 3.0.0-nightly.2697
-  resolution: "@react-aria/focus@npm:3.0.0-nightly.2697"
+"@react-aria/focus@npm:^3.0.0-nightly-fb28ab3b4-241024":
+  version: 3.18.4
+  resolution: "@react-aria/focus@npm:3.18.4"
   dependencies:
-    "@react-aria/interactions": "npm:3.0.0-nightly.2697+55aca809c"
-    "@react-aria/utils": "npm:3.0.0-nightly.2697+55aca809c"
-    "@react-types/shared": "npm:3.0.0-nightly.2697+55aca809c"
+    "@react-aria/interactions": "npm:^3.22.4"
+    "@react-aria/utils": "npm:^3.25.3"
+    "@react-types/shared": "npm:^3.25.0"
     "@swc/helpers": "npm:^0.5.0"
     clsx: "npm:^2.0.0"
   peerDependencies:
-    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-  checksum: 10/dad99aa3eb529e3d6eafab2d0f39d34e4b71fc77c9ab12b0be6685bb1f895a3ad25e8de371d7c488a4fcffccd836800debb504cfdcf74b1d4c625fd2ca238115
+    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  checksum: 10/912cd8a98cbe978240991bec8077c7956ca03ee78cb10152c7a1131a53fb622a5c9b87a4047909f032a7550c37ed9ec50488437a17c761c5c852b721cbaa0bd2
   languageName: node
   linkType: hard
 
@@ -6185,21 +6404,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@react-aria/i18n@npm:3.0.0-nightly.2697+55aca809c":
-  version: 3.0.0-nightly.2697
-  resolution: "@react-aria/i18n@npm:3.0.0-nightly.2697"
+"@react-aria/i18n@npm:^3.0.0-nightly-fb28ab3b4-241024":
+  version: 3.12.3
+  resolution: "@react-aria/i18n@npm:3.12.3"
   dependencies:
-    "@internationalized/date": "npm:3.5.2-nightly.4409+55aca809c"
-    "@internationalized/message": "npm:3.1.2-nightly.4409+55aca809c"
-    "@internationalized/number": "npm:3.5.1-nightly.4409+55aca809c"
-    "@internationalized/string": "npm:3.2.1-nightly.4409+55aca809c"
-    "@react-aria/ssr": "npm:3.9.2-nightly.4409+55aca809c"
-    "@react-aria/utils": "npm:3.0.0-nightly.2697+55aca809c"
-    "@react-types/shared": "npm:3.0.0-nightly.2697+55aca809c"
+    "@internationalized/date": "npm:^3.5.6"
+    "@internationalized/message": "npm:^3.1.5"
+    "@internationalized/number": "npm:^3.5.4"
+    "@internationalized/string": "npm:^3.2.4"
+    "@react-aria/ssr": "npm:^3.9.6"
+    "@react-aria/utils": "npm:^3.25.3"
+    "@react-types/shared": "npm:^3.25.0"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
-    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-  checksum: 10/4da8d7b63725a89cd92bf99bf0ae14fd22bf1fe59a4c7c17326a6937b938d05296bf77fc647cc8a21dad949e1cd5b801a63774409cfa8909122a3630143d2008
+    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  checksum: 10/54f111d9a9da68edcb8b821f7c8ead92f0c4d85307dbabee78bc5c89f5a19cdfa406b1e40b7c6f9dc26f7cedce4c9c5a10f8dcdae289e5a404c07b6fdda98aba
   languageName: node
   linkType: hard
 
@@ -6234,20 +6453,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@react-aria/interactions@npm:3.0.0-nightly.2697+55aca809c":
-  version: 3.0.0-nightly.2697
-  resolution: "@react-aria/interactions@npm:3.0.0-nightly.2697"
-  dependencies:
-    "@react-aria/ssr": "npm:3.9.2-nightly.4409+55aca809c"
-    "@react-aria/utils": "npm:3.0.0-nightly.2697+55aca809c"
-    "@react-types/shared": "npm:3.0.0-nightly.2697+55aca809c"
-    "@swc/helpers": "npm:^0.5.0"
-  peerDependencies:
-    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-  checksum: 10/25b16586b40de90987bcc879761ec0850fa9eb175b76b598afd33e98f387f926031d7d175dedc7c4762e5845f9cbd76581ea971520147afc404cb015df327841
-  languageName: node
-  linkType: hard
-
 "@react-aria/interactions@npm:^3.14.0, @react-aria/interactions@npm:^3.15.0":
   version: 3.15.0
   resolution: "@react-aria/interactions@npm:3.15.0"
@@ -6262,6 +6467,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@react-aria/interactions@npm:^3.22.4":
+  version: 3.22.4
+  resolution: "@react-aria/interactions@npm:3.22.4"
+  dependencies:
+    "@react-aria/ssr": "npm:^3.9.6"
+    "@react-aria/utils": "npm:^3.25.3"
+    "@react-types/shared": "npm:^3.25.0"
+    "@swc/helpers": "npm:^0.5.0"
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  checksum: 10/095d084bd642b47a5cc2a846fa50e0953682ddcad694cc78df344b1f235e292945746692f84d27f465f7ff0117b485c3f5b69f050be196df0c3e7343d3239551
+  languageName: node
+  linkType: hard
+
 "@react-aria/label@npm:3.0.0-nightly.1779+afb946c4a":
   version: 3.0.0-nightly.1779
   resolution: "@react-aria/label@npm:3.0.0-nightly.1779"
@@ -6622,17 +6841,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@react-aria/ssr@npm:3.9.2-nightly.4409+55aca809c":
-  version: 3.9.2-nightly.4409
-  resolution: "@react-aria/ssr@npm:3.9.2-nightly.4409"
-  dependencies:
-    "@swc/helpers": "npm:^0.5.0"
-  peerDependencies:
-    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-  checksum: 10/7842b45007aa1f2223bf879dee5fb5e5c8580315b22f566ec26ce5ae25e7b6f17968bf3b81aa1d7ee67fc744140037a837fff7c58a6cd3420d97a3b30a3d8c57
-  languageName: node
-  linkType: hard
-
 "@react-aria/ssr@npm:^3.5.0, @react-aria/ssr@npm:^3.6.0":
   version: 3.6.0
   resolution: "@react-aria/ssr@npm:3.6.0"
@@ -6644,6 +6852,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@react-aria/ssr@npm:^3.9.6":
+  version: 3.9.6
+  resolution: "@react-aria/ssr@npm:3.9.6"
+  dependencies:
+    "@swc/helpers": "npm:^0.5.0"
+  peerDependencies:
+    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  checksum: 10/ea6b290346ce1e119ed9233fc0e34693d52ab9dc2509f07ab10710409b89484a544b7f26c1438802e97f3fb634844ae54638850cdd95caca0d1f5571781bf982
+  languageName: node
+  linkType: hard
+
 "@react-aria/switch@npm:^3.4.0":
   version: 3.5.0
   resolution: "@react-aria/switch@npm:3.5.0"
@@ -6705,6 +6924,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@react-aria/test-utils@npm:1.0.0-alpha.2":
+  version: 1.0.0-alpha.2
+  resolution: "@react-aria/test-utils@npm:1.0.0-alpha.2"
+  dependencies:
+    "@swc/helpers": "npm:^0.5.0"
+  peerDependencies:
+    "@testing-library/react": ^15.0.7
+    "@testing-library/user-event": ^13.0.0 || ^14.0.0
+    jest: ^29.5.0
+    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  checksum: 10/b4f802492aced144df72c4910a815b04830cdf40817aff13b5106a9760813f6e5d80f2b3b600383900bc6cc6ccbc7fec1f1b4c622b9e618f00e9e3df328567a8
+  languageName: node
+  linkType: hard
+
 "@react-aria/textfield@npm:3.0.0-nightly.1779+afb946c4a":
   version: 3.0.0-nightly.1779
   resolution: "@react-aria/textfield@npm:3.0.0-nightly.1779"
@@ -6755,18 +6988,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@react-aria/toolbar@npm:^3.0.0-beta.1":
-  version: 3.0.0-nightly.4409
-  resolution: "@react-aria/toolbar@npm:3.0.0-nightly.4409"
+"@react-aria/toolbar@npm:^3.0.0-nightly.5042":
+  version: 3.0.0-nightly-fb28ab3b4-241024
+  resolution: "@react-aria/toolbar@npm:3.0.0-nightly-fb28ab3b4-241024"
   dependencies:
-    "@react-aria/focus": "npm:3.0.0-nightly.2697+55aca809c"
-    "@react-aria/i18n": "npm:3.0.0-nightly.2697+55aca809c"
-    "@react-aria/utils": "npm:3.0.0-nightly.2697+55aca809c"
-    "@react-types/shared": "npm:3.0.0-nightly.2697+55aca809c"
+    "@react-aria/focus": "npm:^3.0.0-nightly-fb28ab3b4-241024"
+    "@react-aria/i18n": "npm:^3.0.0-nightly-fb28ab3b4-241024"
+    "@react-aria/utils": "npm:^3.0.0-nightly-fb28ab3b4-241024"
+    "@react-types/shared": "npm:^3.0.0-nightly-fb28ab3b4-241024"
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
-    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-  checksum: 10/be8a1ae694aac90c4dcdbb3be76880d4d72f122e6e8c1405ab4d9a1ba3cb2d8d42e738a8ced045ce0036089303b67e8528cf1a4f6ec2d6c3a4a84740eb9b0938
+    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  checksum: 10/d3f731e60f3a962840f7b896dc796e9500fd5ae880be1984830b18669b9412e0fc9d2b9066ad51547801bcc53e386f0f1968c506457732191dced8e43afbadcf
   languageName: node
   linkType: hard
 
@@ -6802,18 +7035,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@react-aria/utils@npm:3.0.0-nightly.2697+55aca809c":
-  version: 3.0.0-nightly.2697
-  resolution: "@react-aria/utils@npm:3.0.0-nightly.2697"
+"@react-aria/utils@npm:^3.0.0-nightly-fb28ab3b4-241024, @react-aria/utils@npm:^3.25.3":
+  version: 3.25.3
+  resolution: "@react-aria/utils@npm:3.25.3"
   dependencies:
-    "@react-aria/ssr": "npm:3.9.2-nightly.4409+55aca809c"
-    "@react-stately/utils": "npm:3.0.0-nightly.2697+55aca809c"
-    "@react-types/shared": "npm:3.0.0-nightly.2697+55aca809c"
+    "@react-aria/ssr": "npm:^3.9.6"
+    "@react-stately/utils": "npm:^3.10.4"
+    "@react-types/shared": "npm:^3.25.0"
     "@swc/helpers": "npm:^0.5.0"
     clsx: "npm:^2.0.0"
   peerDependencies:
-    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-  checksum: 10/28bc2082e2a5ce1a503c2fdb3d6503106e9b4ccc2aec4da0a541c76f9fe09ecee2cd57e8befe8261feb2998aaf84af60d5759438aee08948c6c848f65cbe9118
+    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  checksum: 10/86aed35da5cb0d48d949e40bf8226d5a6d6c92a8cdc60e3e12d524d1f3cc91ab6b54c5e1642823773cbb889fb61af7da22e89488b704b56fc5f4d8d59da7519b
   languageName: node
   linkType: hard
 
@@ -7022,6 +7255,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@react-spectrum/test-utils@npm:~1.0.0-alpha.2":
+  version: 1.0.0-alpha.2
+  resolution: "@react-spectrum/test-utils@npm:1.0.0-alpha.2"
+  dependencies:
+    "@react-aria/test-utils": "npm:1.0.0-alpha.2"
+    "@swc/helpers": "npm:^0.5.0"
+  peerDependencies:
+    "@testing-library/react": ^15.0.7
+    "@testing-library/user-event": ^13.0.0 || ^14.0.0
+    jest: ^29.5.0
+    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  checksum: 10/f9444cf7b4881b3c86c9142894fd6a5c4790aa5a9aab61a59da270b3b2a959f211aa5bf130e8a9baf4695d01b27a319d1f5bcabb2a14c8fe68be78eaac758fc0
+  languageName: node
+  linkType: hard
+
 "@react-spring/animated@npm:~9.7.3":
   version: 9.7.3
   resolution: "@react-spring/animated@npm:9.7.3"
@@ -7483,14 +7731,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@react-stately/utils@npm:3.0.0-nightly.2697+55aca809c":
-  version: 3.0.0-nightly.2697
-  resolution: "@react-stately/utils@npm:3.0.0-nightly.2697"
+"@react-stately/utils@npm:^3.10.4":
+  version: 3.10.4
+  resolution: "@react-stately/utils@npm:3.10.4"
   dependencies:
     "@swc/helpers": "npm:^0.5.0"
   peerDependencies:
-    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-  checksum: 10/3e6f2b7e498432b5b0eddcfc87a11d06474034f62245d7a89f7749569c6a010b2dd72dfd68627521c4a2ab7632bc7e5657e3f64ffc2d2b747f075273849d73df
+    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  checksum: 10/8a56b4d0cf8d5a7a692d6f94ffff63feac2d7078fbc5642b94b0afcaaf7c8f7f4682cfe546f98265034c52576c198be5502cff3f9b145137884e50eb9ffb96d5
   languageName: node
   linkType: hard
 
@@ -7801,12 +8049,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@react-types/shared@npm:3.0.0-nightly.2697+55aca809c":
-  version: 3.0.0-nightly.2697
-  resolution: "@react-types/shared@npm:3.0.0-nightly.2697"
+"@react-types/shared@npm:^3.0.0-nightly-fb28ab3b4-241024, @react-types/shared@npm:^3.25.0":
+  version: 3.25.0
+  resolution: "@react-types/shared@npm:3.25.0"
   peerDependencies:
-    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-  checksum: 10/dfbbe7e0c02c6aedab330d90e4ced853f46df6bc6170ae53b849e4758c16c4d361c41d6911d3bc7d19cccea43ec4045587f87292b47714e180abc97c3b09ad29
+    react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0
+  checksum: 10/fa31eb6153c223210c2eee46934a63b922917bcde0ee583f2cfe59675db122c10e1cbae6549b1fea4284391fdbeca6888b36e9dc797231ad4a76def01490aea5
   languageName: node
   linkType: hard
 
@@ -7910,37 +8158,37 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@reactflow/background@npm:11.2.2":
-  version: 11.2.2
-  resolution: "@reactflow/background@npm:11.2.2"
+"@reactflow/background@npm:11.3.14":
+  version: 11.3.14
+  resolution: "@reactflow/background@npm:11.3.14"
   dependencies:
-    "@reactflow/core": "npm:11.7.2"
+    "@reactflow/core": "npm:11.11.4"
     classcat: "npm:^5.0.3"
-    zustand: "npm:^4.3.1"
+    zustand: "npm:^4.4.1"
   peerDependencies:
     react: ">=17"
     react-dom: ">=17"
-  checksum: 10/2fb7d9f93f2d4a04a7b91ca36c644ce2ca0a09edff1929e0037dacc708ec1c9941de5bf55850a8cb5d7a6ed92cf8bbce2d04bc67646b0626a4e0841865f4fa11
+  checksum: 10/bf6c5c7eaabc72371ae882407299b130ed56c538a60e460a3aa305c8d0ba5a51b1f3cbf244e0c1768ee85324ce2c8fd23eeaf0ece45b570197dacb6348a1e843
   languageName: node
   linkType: hard
 
-"@reactflow/controls@npm:11.1.13":
-  version: 11.1.13
-  resolution: "@reactflow/controls@npm:11.1.13"
+"@reactflow/controls@npm:11.2.14":
+  version: 11.2.14
+  resolution: "@reactflow/controls@npm:11.2.14"
   dependencies:
-    "@reactflow/core": "npm:11.7.2"
+    "@reactflow/core": "npm:11.11.4"
     classcat: "npm:^5.0.3"
-    zustand: "npm:^4.3.1"
+    zustand: "npm:^4.4.1"
   peerDependencies:
     react: ">=17"
     react-dom: ">=17"
-  checksum: 10/6bd9eaf88ace08b99531fa44ea2a7b60a879bf5fa53582d91b7902693a50fc44e5c5bbf19fd08a7e1c5670acea95b783a3502960650e2afa29f01991f2769d77
+  checksum: 10/5ab2f4ee4daf43f22bae18b3d20e9804c8797a32f194b7fd0bf3d90c17f51db0fd09ba34c31408528ae809530dcdf2fde4d44bc044b1aa41ff0eabd972f52505
   languageName: node
   linkType: hard
 
-"@reactflow/core@npm:11.7.2, @reactflow/core@npm:^11.6.0":
-  version: 11.7.2
-  resolution: "@reactflow/core@npm:11.7.2"
+"@reactflow/core@npm:11.11.4":
+  version: 11.11.4
+  resolution: "@reactflow/core@npm:11.11.4"
   dependencies:
     "@types/d3": "npm:^7.4.0"
     "@types/d3-drag": "npm:^3.0.1"
@@ -7950,66 +8198,66 @@ __metadata:
     d3-drag: "npm:^3.0.0"
     d3-selection: "npm:^3.0.0"
     d3-zoom: "npm:^3.0.0"
-    zustand: "npm:^4.3.1"
+    zustand: "npm:^4.4.1"
   peerDependencies:
     react: ">=17"
     react-dom: ">=17"
-  checksum: 10/22401f03f16d360dfcc78a3ed88058b643dda07fe383631fe1e0d2b9153984c3d7b981f8c884dea8a1a45548515c68e9801521b32270c41ce428d7734282b90d
+  checksum: 10/725a876356f44c0efccb43212beaf2e182481aabfb7b5a139926366c1b97e20cec5ad88cf392a7e0a6be3998422c7719cadfc2ab53ec6ff61fa792a36e899599
   languageName: node
   linkType: hard
 
-"@reactflow/minimap@npm:11.5.2":
-  version: 11.5.2
-  resolution: "@reactflow/minimap@npm:11.5.2"
+"@reactflow/minimap@npm:11.7.14":
+  version: 11.7.14
+  resolution: "@reactflow/minimap@npm:11.7.14"
   dependencies:
-    "@reactflow/core": "npm:11.7.2"
+    "@reactflow/core": "npm:11.11.4"
     "@types/d3-selection": "npm:^3.0.3"
     "@types/d3-zoom": "npm:^3.0.1"
     classcat: "npm:^5.0.3"
     d3-selection: "npm:^3.0.0"
     d3-zoom: "npm:^3.0.0"
-    zustand: "npm:^4.3.1"
+    zustand: "npm:^4.4.1"
   peerDependencies:
     react: ">=17"
     react-dom: ">=17"
-  checksum: 10/a79eb3515114858e3d1d8f167e35610b085f711c5df0b18b1e1dab1fe5abc096224925d058df02622ed34cbc9e3f3c6240e7433e5fc47d2adb5cc726cb750c46
+  checksum: 10/3aa9bbfbe2fcbd874b8b41fe3ddb5d221f90f58d17d093c0d5edbfafb540d0dc4cd9785e8802eb18db5bdd730d5705234ab65bd31cfbb71eabf42e49bf2f7cac
   languageName: node
   linkType: hard
 
-"@reactflow/node-resizer@npm:2.1.0":
-  version: 2.1.0
-  resolution: "@reactflow/node-resizer@npm:2.1.0"
+"@reactflow/node-resizer@npm:2.2.14":
+  version: 2.2.14
+  resolution: "@reactflow/node-resizer@npm:2.2.14"
   dependencies:
-    "@reactflow/core": "npm:^11.6.0"
+    "@reactflow/core": "npm:11.11.4"
     classcat: "npm:^5.0.4"
     d3-drag: "npm:^3.0.0"
     d3-selection: "npm:^3.0.0"
-    zustand: "npm:^4.3.1"
+    zustand: "npm:^4.4.1"
   peerDependencies:
     react: ">=17"
     react-dom: ">=17"
-  checksum: 10/e668ccaea31c60f9a5f550b6a4eaccbffbf40251ffecc363c8d3a37c374b5ff1ea854966cce0fca825d6d8c529ed49ccb5fc17ef4054915754a92516a5ec2f23
+  checksum: 10/0440dd32c6364304f92b12a2d8288260d66a825533b99b7705c112362858c676b0a0221adf983bfdbbacbd70388dfcaec69401129e60bfca5c25c9b8302b0aef
   languageName: node
   linkType: hard
 
-"@reactflow/node-toolbar@npm:1.2.1":
-  version: 1.2.1
-  resolution: "@reactflow/node-toolbar@npm:1.2.1"
+"@reactflow/node-toolbar@npm:1.3.14":
+  version: 1.3.14
+  resolution: "@reactflow/node-toolbar@npm:1.3.14"
   dependencies:
-    "@reactflow/core": "npm:11.7.2"
+    "@reactflow/core": "npm:11.11.4"
     classcat: "npm:^5.0.3"
-    zustand: "npm:^4.3.1"
+    zustand: "npm:^4.4.1"
   peerDependencies:
     react: ">=17"
     react-dom: ">=17"
-  checksum: 10/82818fe01a345bd65df40dea6427744b3624b7f4679a15a77574849d8bc8c48dc876dfc37f714263db9914f83c9d868621038cea7cc626a2e87e0fc56896742e
+  checksum: 10/159566da042f29c15e506d4c49cd938b28644ad7710b266e35293c268286c48488b92d7c621f25700bfbabff84470c181ec2683a44c04d1749370c09d2e4a12b
   languageName: node
   linkType: hard
 
-"@remix-run/router@npm:1.6.2":
-  version: 1.6.2
-  resolution: "@remix-run/router@npm:1.6.2"
-  checksum: 10/c261c3b52f08d7fcacce9c66d68dba3b6f0c8263ea15f69f9f1c89734685cdfe4f383c879324acade68cb331d48e3deca9ec00734abe08d9694e529096907f40
+"@remix-run/router@npm:1.21.0":
+  version: 1.21.0
+  resolution: "@remix-run/router@npm:1.21.0"
+  checksum: 10/cf0fb69d19c1b79095ff67c59cea89086f3982a9a54c8a993818a60fc76e0ebab5a8db647c1a96a662729fad8e806ddd0a96622adf473f5a9f0b99998b2dbad4
   languageName: node
   linkType: hard
 
@@ -8030,23 +8278,23 @@ __metadata:
     "@rocket.chat/tracing": "workspace:^"
     "@types/bcrypt": "npm:^5.0.2"
     "@types/gc-stats": "npm:^1.4.3"
-    "@types/node": "npm:~20.16.12"
+    "@types/node": "npm:~20.16.15"
     "@types/polka": "npm:^0.5.7"
-    bcrypt: "npm:^5.0.1"
+    bcrypt: "npm:^5.1.1"
     ejson: "npm:^2.2.3"
     eslint: "npm:~8.45.0"
     event-loop-stats: "npm:^1.4.1"
-    eventemitter3: "npm:^4.0.7"
+    eventemitter3: "npm:^5.0.1"
     gc-stats: "npm:^1.4.1"
     mem: "npm:^8.1.1"
-    moleculer: "npm:^0.14.34"
+    moleculer: "npm:^0.14.35"
     mongodb: "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch"
-    nats: "npm:^2.4.0"
-    pino: "npm:^8.15.0"
+    nats: "npm:^2.28.2"
+    pino: "npm:^8.21.0"
     polka: "npm:^0.5.2"
     ts-node: "npm:^10.9.2"
     typescript: "npm:~5.6.3"
-    uuid: "npm:^9.0.1"
+    uuid: "npm:^11.0.3"
   languageName: unknown
   linkType: soft
 
@@ -8066,7 +8314,7 @@ __metadata:
     "@types/debug": "npm:^4.1.12"
     cron: "npm:~1.8.2"
     date.js: "npm:~0.3.3"
-    debug: "npm:~4.1.1"
+    debug: "npm:~4.3.7"
     eslint: "npm:~8.45.0"
     human-interval: "npm:^2.0.1"
     moment-timezone: "npm:~0.5.46"
@@ -8082,7 +8330,7 @@ __metadata:
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/rest-typings": "workspace:^"
-    "@types/jest": "npm:~29.5.13"
+    "@types/jest": "npm:~29.5.14"
     "@types/strict-uri-encode": "npm:^2.0.2"
     eslint: "npm:~8.45.0"
     filter-obj: "npm:^3.0.0"
@@ -8102,21 +8350,21 @@ __metadata:
     "@msgpack/msgpack": "npm:3.0.0-beta2"
     "@rocket.chat/eslint-config": "workspace:~"
     "@rocket.chat/ui-kit": "workspace:~"
-    "@types/adm-zip": "npm:^0.5.0"
+    "@types/adm-zip": "npm:^0.5.6"
     "@types/debug": "npm:^4.1.12"
-    "@types/lodash.clonedeep": "npm:^4.5.7"
-    "@types/nedb": "npm:^1.8.12"
-    "@types/node": "npm:~20.16.12"
-    "@types/semver": "npm:^5.5.0"
-    "@types/stack-trace": "npm:0.0.29"
-    "@types/uuid": "npm:~8.3.4"
+    "@types/lodash.clonedeep": "npm:^4.5.9"
+    "@types/nedb": "npm:^1.8.16"
+    "@types/node": "npm:~20.16.15"
+    "@types/semver": "npm:^7.5.8"
+    "@types/stack-trace": "npm:0.0.33"
+    "@types/uuid": "npm:~10.0.0"
     "@typescript-eslint/eslint-plugin": "npm:~5.60.1"
     "@typescript-eslint/parser": "npm:~5.60.1"
     adm-zip: "npm:^0.5.16"
     alsatian: "npm:^2.4.0"
     browserify: "npm:^16.5.2"
     debug: "npm:^4.3.7"
-    esbuild: "npm:^0.20.2"
+    esbuild: "npm:^0.24.0"
     eslint: "npm:~8.45.0"
     jose: "npm:^4.15.9"
     jsonrpc-lite: "npm:^2.2.0"
@@ -8130,9 +8378,9 @@ __metadata:
     tap-bark: "npm:^1.0.0"
     ts-node: "npm:^6.2.0"
     typedoc: "npm:~0.24.8"
-    typescript: "npm:~5.1.6"
+    typescript: "npm:~5.6.3"
     uglify-es: "npm:^3.3.10"
-    uuid: "npm:~8.3.2"
+    uuid: "npm:~11.0.3"
   languageName: unknown
   linkType: soft
 
@@ -8163,18 +8411,18 @@ __metadata:
     "@rocket.chat/string-helpers": "npm:~0.31.25"
     "@rocket.chat/tracing": "workspace:^"
     "@types/gc-stats": "npm:^1.4.3"
-    "@types/node": "npm:~20.16.12"
+    "@types/node": "npm:~20.16.15"
     "@types/polka": "npm:^0.5.7"
     ejson: "npm:^2.2.3"
     eslint: "npm:~8.45.0"
     event-loop-stats: "npm:^1.4.1"
-    eventemitter3: "npm:^4.0.7"
+    eventemitter3: "npm:^5.0.1"
     gc-stats: "npm:^1.4.1"
     mem: "npm:^8.1.1"
-    moleculer: "npm:^0.14.34"
+    moleculer: "npm:^0.14.35"
     mongodb: "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch"
-    nats: "npm:^2.4.0"
-    pino: "npm:^8.15.0"
+    nats: "npm:^2.28.2"
+    pino: "npm:^8.21.0"
     polka: "npm:^0.5.2"
     ts-node: "npm:^10.9.2"
     typescript: "npm:~5.6.3"
@@ -8185,8 +8433,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/base64@workspace:packages/base64"
   dependencies:
-    "@babel/core": "npm:~7.25.8"
-    "@babel/preset-env": "npm:~7.25.8"
+    "@babel/core": "npm:~7.26.0"
+    "@babel/preset-env": "npm:~7.26.0"
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/jest-presets": "workspace:~"
     "@typescript-eslint/eslint-plugin": "npm:~5.60.1"
@@ -8201,7 +8449,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/cas-validate@workspace:packages/cas-validate"
   dependencies:
-    cheerio: "npm:1.0.0-rc.10"
+    cheerio: "npm:1.0.0"
     eslint: "npm:~8.45.0"
     typescript: "npm:~5.6.3"
   languageName: unknown
@@ -8211,25 +8459,25 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/core-services@workspace:packages/core-services"
   dependencies:
-    "@babel/core": "npm:~7.25.8"
-    "@babel/preset-env": "npm:~7.25.8"
-    "@babel/preset-typescript": "npm:~7.25.7"
+    "@babel/core": "npm:~7.26.0"
+    "@babel/preset-env": "npm:~7.26.0"
+    "@babel/preset-typescript": "npm:~7.26.0"
     "@rocket.chat/apps-engine": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/eslint-config": "workspace:^"
-    "@rocket.chat/icons": "npm:~0.38.0"
+    "@rocket.chat/icons": "npm:~0.39.0"
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/message-parser": "workspace:^"
     "@rocket.chat/models": "workspace:^"
     "@rocket.chat/rest-typings": "workspace:^"
     "@rocket.chat/tracing": "workspace:^"
     "@rocket.chat/ui-kit": "workspace:~"
-    "@types/jest": "npm:~29.5.13"
-    babel-jest: "npm:^29.5.0"
+    "@types/jest": "npm:~29.5.14"
+    babel-jest: "npm:^29.7.0"
     eslint: "npm:~8.45.0"
     jest: "npm:~29.7.0"
     mongodb: "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch"
-    prettier: "npm:~2.8.8"
+    prettier: "npm:~3.3.3"
     typescript: "npm:~5.6.3"
   languageName: unknown
   linkType: soft
@@ -8240,13 +8488,13 @@ __metadata:
   dependencies:
     "@rocket.chat/apps-engine": "workspace:^"
     "@rocket.chat/eslint-config": "workspace:^"
-    "@rocket.chat/icons": "npm:~0.38.0"
+    "@rocket.chat/icons": "npm:~0.39.0"
     "@rocket.chat/message-parser": "workspace:^"
     "@rocket.chat/ui-kit": "workspace:~"
     "@types/express": "npm:^4.17.21"
     eslint: "npm:~8.45.0"
     mongodb: "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch"
-    prettier: "npm:~2.8.8"
+    prettier: "npm:~3.3.3"
     typescript: "npm:~5.6.3"
   languageName: unknown
   linkType: soft
@@ -8295,8 +8543,8 @@ __metadata:
     "@rocket.chat/core-typings": "workspace:~"
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/rest-typings": "workspace:^"
-    "@types/jest": "npm:~29.5.13"
-    "@types/ws": "npm:^8.5.12"
+    "@types/jest": "npm:~29.5.14"
+    "@types/ws": "npm:^8.5.13"
     eslint: "npm:~8.45.0"
     jest: "npm:~29.7.0"
     jest-websocket-mock: "npm:~2.5.0"
@@ -8328,30 +8576,29 @@ __metadata:
     "@types/ejson": "npm:^2.2.2"
     "@types/gc-stats": "npm:^1.4.3"
     "@types/meteor": "npm:^2.9.8"
-    "@types/node": "npm:~20.16.12"
+    "@types/node": "npm:~20.16.15"
     "@types/polka": "npm:^0.5.7"
-    "@types/sharp": "npm:^0.30.5"
-    "@types/uuid": "npm:^8.3.4"
-    "@types/ws": "npm:^8.5.12"
+    "@types/uuid": "npm:^10.0.0"
+    "@types/ws": "npm:^8.5.13"
     colorette: "npm:^1.4.0"
     ejson: "npm:^2.2.3"
     eslint: "npm:~8.45.0"
     event-loop-stats: "npm:^1.4.1"
-    eventemitter3: "npm:^4.0.7"
+    eventemitter3: "npm:^5.0.1"
     gc-stats: "npm:^1.4.1"
     jaeger-client: "npm:^3.19.0"
     mem: "npm:^8.1.1"
-    moleculer: "npm:^0.14.34"
+    moleculer: "npm:^0.14.35"
     mongodb: "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch"
-    nats: "npm:^2.4.0"
-    pino: "npm:^8.15.0"
+    nats: "npm:^2.28.2"
+    pino: "npm:^8.21.0"
     pino-pretty: "npm:^7.6.1"
     polka: "npm:^0.5.2"
-    sharp: "npm:^0.32.6"
+    sharp: "npm:^0.33.5"
     ts-node: "npm:^10.9.2"
     typescript: "npm:~5.6.3"
     underscore: "npm:^1.13.7"
-    uuid: "npm:^7.0.3"
+    uuid: "npm:^11.0.3"
     ws: "npm:^8.18.0"
   languageName: unknown
   linkType: soft
@@ -8367,20 +8614,20 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/eslint-config@workspace:packages/eslint-config"
   dependencies:
-    "@babel/core": "npm:^7.25.8"
-    "@babel/eslint-parser": "npm:~7.25.8"
+    "@babel/core": "npm:^7.26.0"
+    "@babel/eslint-parser": "npm:~7.25.9"
     "@types/eslint": "npm:~8.44.9"
-    "@types/prettier": "npm:^2.6.3"
+    "@types/prettier": "npm:^2.7.3"
     "@typescript-eslint/eslint-plugin": "npm:~5.60.1"
     "@typescript-eslint/parser": "npm:~5.60.1"
     eslint: "npm:~8.45.0"
-    eslint-config-prettier: "npm:~8.8.0"
+    eslint-config-prettier: "npm:~9.1.0"
     eslint-plugin-anti-trojan-source: "npm:~1.1.1"
-    eslint-plugin-import: "npm:~2.26.0"
-    eslint-plugin-jest: "npm:~27.2.3"
-    eslint-plugin-jsx-a11y: "npm:^6.8.0"
-    eslint-plugin-prettier: "npm:~4.2.1"
-    prettier: "npm:~2.8.8"
+    eslint-plugin-import: "npm:~2.31.0"
+    eslint-plugin-jest: "npm:~28.8.3"
+    eslint-plugin-jsx-a11y: "npm:^6.10.2"
+    eslint-plugin-prettier: "npm:~5.2.1"
+    prettier: "npm:~3.3.3"
   languageName: unknown
   linkType: soft
 
@@ -8401,11 +8648,11 @@ __metadata:
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/logger": "workspace:^"
     "@rocket.chat/tools": "workspace:^"
-    "@types/jest": "npm:~29.5.12"
+    "@types/jest": "npm:~29.5.14"
     esl: "github:pierre-lehnen-rc/esl"
     eslint: "npm:~8.45.0"
     jest: "npm:~29.7.0"
-    typescript: "npm:~5.3.3"
+    typescript: "npm:~5.6.3"
   languageName: unknown
   linkType: soft
 
@@ -8462,10 +8709,10 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/fuselage-ui-kit@workspace:packages/fuselage-ui-kit"
   dependencies:
-    "@babel/core": "npm:~7.25.8"
-    "@babel/preset-env": "npm:~7.25.8"
-    "@babel/preset-react": "npm:~7.25.7"
-    "@babel/preset-typescript": "npm:~7.25.7"
+    "@babel/core": "npm:~7.26.0"
+    "@babel/preset-env": "npm:~7.26.0"
+    "@babel/preset-react": "npm:~7.25.9"
+    "@babel/preset-typescript": "npm:~7.26.0"
     "@rocket.chat/apps-engine": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/eslint-config": "workspace:^"
@@ -8473,7 +8720,7 @@ __metadata:
     "@rocket.chat/fuselage-hooks": "npm:^0.33.1"
     "@rocket.chat/fuselage-polyfills": "npm:~0.31.25"
     "@rocket.chat/gazzodown": "workspace:^"
-    "@rocket.chat/icons": "npm:~0.38.0"
+    "@rocket.chat/icons": "npm:~0.39.0"
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/mock-providers": "workspace:^"
     "@rocket.chat/prettier-config": "npm:~0.31.25"
@@ -8482,35 +8729,35 @@ __metadata:
     "@rocket.chat/ui-contexts": "workspace:^"
     "@rocket.chat/ui-kit": "workspace:~"
     "@rocket.chat/ui-video-conf": "workspace:^"
-    "@storybook/addon-essentials": "npm:^8.3.5"
-    "@storybook/addon-styling-webpack": "npm:^1.0.0"
+    "@storybook/addon-essentials": "npm:^8.4.4"
+    "@storybook/addon-styling-webpack": "npm:^1.0.1"
     "@storybook/addon-webpack5-compiler-babel": "npm:^3.0.3"
-    "@storybook/blocks": "npm:^8.3.5"
-    "@storybook/react": "npm:^8.3.5"
-    "@storybook/react-webpack5": "npm:^8.3.5"
-    "@storybook/theming": "npm:^8.3.5"
-    "@tanstack/react-query": "npm:^4.16.1"
+    "@storybook/blocks": "npm:^8.4.4"
+    "@storybook/react": "npm:^8.4.4"
+    "@storybook/react-webpack5": "npm:^8.4.4"
+    "@storybook/theming": "npm:^8.4.4"
+    "@tanstack/react-query": "npm:^4.36.1"
     "@testing-library/react": "npm:~16.0.1"
     "@testing-library/user-event": "npm:~14.5.2"
     "@types/react": "npm:~17.0.80"
     "@types/react-dom": "npm:~17.0.25"
-    babel-loader: "npm:~8.2.5"
+    babel-loader: "npm:~9.2.1"
     cross-env: "npm:^7.0.3"
     eslint: "npm:~8.45.0"
     i18next: "npm:^23.10.1"
     jest: "npm:~29.7.0"
     normalize.css: "npm:^8.0.1"
     npm-run-all: "npm:^4.1.5"
-    prettier: "npm:~2.8.8"
+    prettier: "npm:~3.3.3"
     react: "npm:~17.0.2"
     react-dom: "npm:^17.0.2"
     react-i18next: "npm:~13.2.2"
     rimraf: "npm:^6.0.1"
-    storybook: "npm:^8.3.5"
+    storybook: "npm:^8.4.4"
     storybook-dark-mode: "npm:^4.0.2"
     typescript: "npm:~5.6.3"
   peerDependencies:
-    "@rocket.chat/apps-engine": 1.47.0-rc.0
+    "@rocket.chat/apps-engine": 1.48.0-rc.0
     "@rocket.chat/eslint-config": 0.7.0
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/fuselage-hooks": "*"
@@ -8518,10 +8765,10 @@ __metadata:
     "@rocket.chat/icons": "*"
     "@rocket.chat/prettier-config": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 8.0.0-rc.6
-    "@rocket.chat/ui-contexts": 12.0.0-rc.6
-    "@rocket.chat/ui-kit": 0.37.0-rc.0
-    "@rocket.chat/ui-video-conf": 12.0.0-rc.6
+    "@rocket.chat/ui-avatar": 9.0.0-rc.2
+    "@rocket.chat/ui-contexts": 13.0.0-rc.2
+    "@rocket.chat/ui-kit": 0.37.0
+    "@rocket.chat/ui-video-conf": 13.0.0-rc.2
     "@tanstack/react-query": "*"
     react: ~17.0.2
     react-dom: "*"
@@ -8556,7 +8803,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/gazzodown@workspace:packages/gazzodown"
   dependencies:
-    "@babel/core": "npm:~7.25.8"
+    "@babel/core": "npm:~7.26.0"
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/css-in-js": "npm:~0.31.25"
     "@rocket.chat/fuselage": "npm:^0.59.4"
@@ -8566,39 +8813,38 @@ __metadata:
     "@rocket.chat/styled": "npm:~0.31.25"
     "@rocket.chat/ui-client": "workspace:^"
     "@rocket.chat/ui-contexts": "workspace:^"
-    "@storybook/addon-actions": "npm:^8.3.5"
-    "@storybook/addon-docs": "npm:^8.3.5"
-    "@storybook/addon-essentials": "npm:^8.3.5"
-    "@storybook/addon-interactions": "npm:^8.3.5"
-    "@storybook/addon-links": "npm:^8.3.5"
-    "@storybook/addon-styling-webpack": "npm:^1.0.0"
+    "@storybook/addon-actions": "npm:^8.4.4"
+    "@storybook/addon-docs": "npm:^8.4.4"
+    "@storybook/addon-essentials": "npm:^8.4.4"
+    "@storybook/addon-interactions": "npm:^8.4.4"
+    "@storybook/addon-links": "npm:^8.4.4"
+    "@storybook/addon-styling-webpack": "npm:^1.0.1"
     "@storybook/addon-webpack5-compiler-babel": "npm:^3.0.3"
-    "@storybook/react": "npm:^8.3.5"
-    "@storybook/react-webpack5": "npm:^8.3.5"
+    "@storybook/react": "npm:^8.4.4"
+    "@storybook/react-webpack5": "npm:^8.4.4"
     "@testing-library/react": "npm:~16.0.1"
     "@types/dompurify": "npm:^3.0.5"
-    "@types/jest": "npm:~29.5.13"
+    "@types/jest": "npm:~29.5.14"
     "@types/katex": "npm:~0.16.7"
     "@types/react": "npm:~17.0.80"
     "@types/react-dom": "npm:~17.0.25"
     "@typescript-eslint/eslint-plugin": "npm:~5.60.1"
     "@typescript-eslint/parser": "npm:~5.60.1"
-    babel-loader: "npm:^8.3.0"
-    date-fns: "npm:^3.3.1"
-    dompurify: "npm:^3.1.7"
+    babel-loader: "npm:^9.2.1"
+    dompurify: "npm:^3.2.0"
     eslint: "npm:~8.45.0"
     eslint-plugin-anti-trojan-source: "npm:~1.1.1"
-    eslint-plugin-react: "npm:~7.32.2"
-    eslint-plugin-react-hooks: "npm:~4.6.2"
-    eslint-plugin-storybook: "npm:^0.9.0"
-    highlight.js: "npm:^11.5.1"
+    eslint-plugin-react: "npm:~7.37.2"
+    eslint-plugin-react-hooks: "npm:~5.0.0"
+    eslint-plugin-storybook: "npm:^0.11.0"
+    highlight.js: "npm:^11.10.0"
     identity-obj-proxy: "npm:^3.0.0"
     jest: "npm:~29.7.0"
     katex: "npm:~0.16.11"
     outdent: "npm:^0.8.0"
     react-dom: "npm:~17.0.2"
     react-error-boundary: "npm:^3.1.4"
-    storybook: "npm:^8.3.5"
+    storybook: "npm:^8.4.4"
     typescript: "npm:~5.6.3"
   peerDependencies:
     "@rocket.chat/core-typings": "workspace:^"
@@ -8607,8 +8853,8 @@ __metadata:
     "@rocket.chat/fuselage-tokens": "*"
     "@rocket.chat/message-parser": 0.31.31
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-client": 12.0.0-rc.6
-    "@rocket.chat/ui-contexts": 12.0.0-rc.6
+    "@rocket.chat/ui-client": 13.0.0-rc.2
+    "@rocket.chat/ui-contexts": 13.0.0-rc.2
     katex: "*"
     react: "*"
   languageName: unknown
@@ -8621,15 +8867,14 @@ __metadata:
     "@rocket.chat/jest-presets": "workspace:~"
     eslint: "npm:~8.45.0"
     jest: "npm:~29.7.0"
-    tsup: "npm:^6.7.0"
     typescript: "npm:~5.6.3"
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/icons@npm:~0.38.0":
-  version: 0.38.0
-  resolution: "@rocket.chat/icons@npm:0.38.0"
-  checksum: 10/0731b9c4e210d0bcfd770c802b16f987d7932d3141bec862f03ac5913f61aa4bbe79715fe30671e503056dcd099872eb3f24513a73a1ed0111478608f81e02a9
+"@rocket.chat/icons@npm:~0.39.0":
+  version: 0.39.0
+  resolution: "@rocket.chat/icons@npm:0.39.0"
+  checksum: 10/b46bef7658ea90915aed10d3b021ddee0af64a98b463772289db7be9ec3013c8f4fa842b41abc57f0304171cbbf912bc3f5f8abfad8d29cf5c3dcd57c774b647
   languageName: node
   linkType: hard
 
@@ -8642,7 +8887,7 @@ __metadata:
     "@rocket.chat/tracing": "workspace:^"
     eslint: "npm:~8.45.0"
     mongodb: "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch"
-    prettier: "npm:~2.8.8"
+    prettier: "npm:~3.3.3"
     typescript: "npm:~5.6.3"
   languageName: unknown
   linkType: soft
@@ -8652,13 +8897,13 @@ __metadata:
   resolution: "@rocket.chat/jest-presets@workspace:packages/jest-presets"
   dependencies:
     "@rocket.chat/eslint-config": "workspace:~"
-    "@swc/core": "npm:~1.7.26"
-    "@swc/jest": "npm:~0.2.36"
-    "@testing-library/jest-dom": "npm:~6.4.8"
+    "@swc/core": "npm:~1.9.2"
+    "@swc/jest": "npm:~0.2.37"
+    "@testing-library/jest-dom": "npm:~6.6.3"
     "@types/identity-obj-proxy": "npm:^3.0.2"
-    "@types/jest": "npm:~29.5.13"
+    "@types/jest": "npm:~29.5.14"
     "@types/jest-axe": "npm:~3.5.9"
-    "@types/uuid": "npm:^9.0.8"
+    "@types/uuid": "npm:^10.0.0"
     eslint: "npm:~8.45.0"
     identity-obj-proxy: "npm:~3.0.0"
     jest: "npm:~29.7.0"
@@ -8666,7 +8911,7 @@ __metadata:
     jest-environment-jsdom: "npm:~29.7.0"
     jest-environment-node: "npm:~29.7.0"
     typescript: "npm:~5.6.3"
-    uuid: "npm:~9.0.1"
+    uuid: "npm:~11.0.3"
   languageName: unknown
   linkType: soft
 
@@ -8675,7 +8920,7 @@ __metadata:
   resolution: "@rocket.chat/jwt@workspace:packages/jwt"
   dependencies:
     "@rocket.chat/jest-presets": "workspace:~"
-    "@types/jest": "npm:~29.5.13"
+    "@types/jest": "npm:~29.5.14"
     eslint: "npm:~8.45.0"
     jest: "npm:~29.7.0"
     jose: "npm:^4.15.9"
@@ -8704,9 +8949,9 @@ __metadata:
     "@rocket.chat/jwt": "workspace:^"
     "@rocket.chat/logger": "workspace:^"
     "@types/bcrypt": "npm:^5.0.2"
-    "@types/jest": "npm:~29.5.13"
-    "@types/ws": "npm:^8.5.12"
-    bcrypt: "npm:^5.0.1"
+    "@types/jest": "npm:~29.5.14"
+    "@types/ws": "npm:^8.5.13"
+    bcrypt: "npm:^5.1.1"
     eslint: "npm:~8.45.0"
     jest: "npm:~29.7.0"
     jest-websocket-mock: "npm:~2.5.0"
@@ -8718,11 +8963,12 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/livechat@workspace:packages/livechat"
   dependencies:
-    "@babel/eslint-parser": "npm:~7.25.8"
-    "@babel/preset-env": "npm:~7.25.8"
-    "@babel/preset-typescript": "npm:~7.25.7"
+    "@babel/eslint-parser": "npm:~7.25.9"
+    "@babel/preset-env": "npm:~7.26.0"
+    "@babel/preset-typescript": "npm:~7.26.0"
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/ddp-client": "workspace:^"
+    "@rocket.chat/emitter": "npm:~0.31.25"
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/fuselage-hooks": "npm:^0.33.1"
     "@rocket.chat/fuselage-tokens": "npm:^0.33.2"
@@ -8730,81 +8976,74 @@ __metadata:
     "@rocket.chat/logo": "npm:^0.31.30"
     "@rocket.chat/message-parser": "workspace:^"
     "@rocket.chat/random": "workspace:~"
-    "@rocket.chat/sdk": "npm:^1.0.0-alpha.42"
     "@rocket.chat/ui-contexts": "workspace:^"
     "@rocket.chat/ui-kit": "workspace:~"
-    "@storybook/addon-essentials": "npm:^8.3.5"
-    "@storybook/addon-styling-webpack": "npm:~1.0.0"
+    "@storybook/addon-essentials": "npm:^8.4.4"
+    "@storybook/addon-styling-webpack": "npm:~1.0.1"
     "@storybook/addon-webpack5-compiler-babel": "npm:^3.0.3"
-    "@storybook/preact": "npm:^8.3.5"
-    "@storybook/preact-webpack5": "npm:^8.3.5"
-    "@storybook/theming": "npm:^8.3.5"
-    "@types/crypto-js": "npm:~4.1.3"
-    "@types/markdown-it": "npm:^14.0.1"
+    "@storybook/preact": "npm:^8.4.4"
+    "@storybook/preact-webpack5": "npm:^8.4.4"
+    "@storybook/theming": "npm:^8.4.4"
+    "@types/crypto-js": "npm:~4.2.2"
+    "@types/markdown-it": "npm:^14.1.2"
     "@types/mini-css-extract-plugin": "npm:~1.4.3"
-    "@types/webpack-bundle-analyzer": "npm:^4.6.2"
     "@types/webpack-env": "npm:~1.18.5"
     "@types/whatwg-fetch": "npm:~0.0.33"
     "@typescript-eslint/eslint-plugin": "npm:~5.60.1"
     "@typescript-eslint/parser": "npm:~5.60.1"
     autoprefixer: "npm:^9.8.8"
-    babel-loader: "npm:^8.3.0"
+    babel-loader: "npm:^9.2.1"
     cross-env: "npm:^7.0.3"
     css-loader: "npm:^4.3.0"
     css-vars-ponyfill: "npm:^2.4.9"
     cssnano: "npm:^4.1.11"
-    date-fns: "npm:^2.15.0"
+    date-fns: "npm:^2.30.0"
     desvg-loader: "npm:^0.1.0"
     emoji-mart: "npm:^3.0.1"
     eslint: "npm:~8.45.0"
-    eslint-plugin-import: "npm:~2.26.0"
-    eslint-plugin-react: "npm:~7.32.2"
-    eslint-plugin-react-hooks: "npm:~4.6.2"
+    eslint-plugin-import: "npm:~2.31.0"
+    eslint-plugin-react: "npm:~7.37.2"
+    eslint-plugin-react-hooks: "npm:~5.0.0"
     file-loader: "npm:^6.2.0"
-    gh-release: "npm:^3.5.0"
     history: "npm:~5.3.0"
-    html-webpack-plugin: "npm:^5.5.3"
-    husky: "npm:^4.3.8"
+    html-webpack-plugin: "npm:^5.6.3"
     i18next: "npm:~23.4.9"
     if-env: "npm:^1.0.4"
     image-webpack-loader: "npm:~8.1.0"
     lorem-ipsum: "npm:^2.0.8"
     markdown-it: "npm:^14.1.0"
-    mem: "npm:^6.1.1"
+    mem: "npm:^8.1.1"
     mini-css-extract-plugin: "npm:~1.6.2"
-    mitt: "npm:^2.1.0"
     npm-run-all: "npm:^4.1.5"
     path-to-regexp: "npm:^6.3.0"
-    postcss-css-variables: "npm:^0.17.0"
-    postcss-dir-pseudo-class: "npm:^5.0.0"
-    postcss-flexbugs-fixes: "npm:^4.2.1"
+    postcss-css-variables: "npm:^0.19.0"
+    postcss-dir-pseudo-class: "npm:^9.0.1"
+    postcss-flexbugs-fixes: "npm:^5.0.2"
     postcss-ie11-supports: "npm:^0.1.3"
     postcss-loader: "npm:^8.1.1"
-    postcss-logical: "npm:^4.0.2"
+    postcss-logical: "npm:^8.0.0"
     postcss-scss: "npm:^4.0.9"
-    postcss-selector-not: "npm:^4.0.1"
-    preact: "npm:~10.24.2"
-    preact-router: "npm:^3.2.1"
+    postcss-selector-not: "npm:^8.0.1"
+    preact: "npm:~10.24.3"
+    preact-router: "npm:^4.1.2"
     query-string: "npm:^7.1.3"
     react-dom: "npm:~17.0.2"
     react-hook-form: "npm:~7.45.4"
     react-i18next: "npm:~13.2.2"
     resolve-url-loader: "npm:~5.0.0"
     rimraf: "npm:^6.0.1"
-    sass: "npm:~1.79.5"
-    sass-loader: "npm:~16.0.2"
-    serve: "npm:^11.3.2"
-    storybook: "npm:^8.3.5"
+    sass: "npm:~1.80.7"
+    sass-loader: "npm:~16.0.3"
+    storybook: "npm:^8.4.4"
     storybook-dark-mode: "npm:^4.0.2"
-    style-loader: "npm:^1.2.1"
-    stylelint: "npm:^14.9.1"
-    stylelint-order: "npm:^5.0.0"
+    style-loader: "npm:^1.3.0"
+    stylelint: "npm:^16.10.0"
+    stylelint-order: "npm:^6.0.4"
     svg-loader: "npm:^0.0.2"
     terser-webpack-plugin: "npm:~4.2.3"
     typescript: "npm:~5.6.3"
     url-loader: "npm:^4.1.1"
     webpack: "npm:~5.95.0"
-    webpack-bundle-analyzer: "npm:^4.9.1"
     webpack-cli: "npm:~5.1.4"
     webpack-dev-server: "npm:~5.1.0"
     whatwg-fetch: "npm:^3.6.20"
@@ -8818,9 +9057,9 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/log-format@workspace:packages/log-format"
   dependencies:
-    "@types/chalk": "npm:^2.2.0"
+    "@types/chalk": "npm:^2.2.4"
     "@types/ejson": "npm:^2.2.2"
-    chalk: "npm:^4.0.0"
+    chalk: "npm:^4.1.2"
     ejson: "npm:^2.2.3"
     eslint: "npm:~8.45.0"
     typescript: "npm:~5.6.3"
@@ -8833,7 +9072,7 @@ __metadata:
   dependencies:
     "@rocket.chat/emitter": "npm:~0.31.25"
     eslint: "npm:~8.45.0"
-    pino: "npm:^8.15.0"
+    pino: "npm:^8.21.0"
     typescript: "npm:~5.6.3"
   languageName: unknown
   linkType: soft
@@ -8862,26 +9101,26 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/message-parser@workspace:packages/message-parser"
   dependencies:
-    "@babel/core": "npm:~7.25.8"
-    "@babel/eslint-parser": "npm:~7.25.8"
-    "@babel/preset-env": "npm:~7.25.8"
+    "@babel/core": "npm:~7.26.0"
+    "@babel/eslint-parser": "npm:~7.25.9"
+    "@babel/preset-env": "npm:~7.26.0"
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/peggy-loader": "workspace:~"
     "@rocket.chat/prettier-config": "npm:~0.31.25"
-    "@types/jest": "npm:~29.5.13"
-    "@types/node": "npm:~20.16.12"
+    "@types/jest": "npm:~29.5.14"
+    "@types/node": "npm:~20.16.15"
     "@typescript-eslint/parser": "npm:~5.58.0"
-    babel-loader: "npm:~9.1.3"
+    babel-loader: "npm:~9.2.1"
     eslint: "npm:~8.45.0"
     jest: "npm:~29.7.0"
     npm-run-all: "npm:^4.1.5"
-    peggy: "npm:3.0.2"
-    prettier: "npm:~2.8.8"
+    peggy: "npm:4.1.1"
+    prettier: "npm:~3.3.3"
     prettier-plugin-pegjs: "npm:~0.5.4"
     rimraf: "npm:^6.0.1"
-    tldts: "npm:~5.7.112"
-    ts-loader: "npm:~9.4.4"
+    tldts: "npm:~6.1.61"
+    ts-loader: "npm:~9.5.1"
     typedoc: "npm:~0.24.8"
     typescript: "npm:~5.6.3"
     webpack: "npm:~5.95.0"
@@ -8893,29 +9132,29 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/meteor@workspace:apps/meteor"
   dependencies:
-    "@axe-core/playwright": "npm:^4.7.3"
-    "@babel/core": "npm:~7.25.8"
-    "@babel/eslint-parser": "npm:~7.25.8"
-    "@babel/preset-env": "npm:~7.25.8"
-    "@babel/preset-react": "npm:~7.25.7"
-    "@babel/register": "npm:~7.25.7"
-    "@babel/runtime": "npm:~7.25.7"
+    "@axe-core/playwright": "npm:^4.10.1"
+    "@babel/core": "npm:~7.26.0"
+    "@babel/eslint-parser": "npm:~7.25.9"
+    "@babel/preset-env": "npm:~7.26.0"
+    "@babel/preset-react": "npm:~7.25.9"
+    "@babel/register": "npm:~7.25.9"
+    "@babel/runtime": "npm:~7.26.0"
     "@bugsnag/js": "npm:~7.20.2"
     "@bugsnag/plugin-react": "npm:~7.19.0"
     "@faker-js/faker": "npm:~8.0.2"
-    "@google-cloud/storage": "npm:^6.11.0"
-    "@kaciras/deasync": "npm:^1.0.4"
-    "@nivo/bar": "npm:0.84.0"
-    "@nivo/core": "npm:0.84.0"
-    "@nivo/heatmap": "npm:0.84.0"
-    "@nivo/line": "npm:0.84.0"
-    "@nivo/pie": "npm:0.84.0"
+    "@google-cloud/storage": "npm:^6.12.0"
+    "@kaciras/deasync": "npm:^1.1.0"
+    "@nivo/bar": "npm:0.88.0"
+    "@nivo/core": "npm:0.88.0"
+    "@nivo/heatmap": "npm:0.88.0"
+    "@nivo/line": "npm:0.88.0"
+    "@nivo/pie": "npm:0.88.0"
     "@opentelemetry/api": "npm:^1.9.0"
-    "@opentelemetry/exporter-trace-otlp-grpc": "npm:^0.53.0"
-    "@opentelemetry/sdk-node": "npm:^0.53.0"
-    "@playwright/test": "npm:^1.40.1"
+    "@opentelemetry/exporter-trace-otlp-grpc": "npm:^0.54.2"
+    "@opentelemetry/sdk-node": "npm:^0.54.2"
+    "@playwright/test": "npm:^1.48.2"
     "@react-aria/color": "npm:^3.0.0-beta.15"
-    "@react-aria/toolbar": "npm:^3.0.0-beta.1"
+    "@react-aria/toolbar": "npm:^3.0.0-nightly.5042"
     "@react-pdf/renderer": "npm:^3.4.5"
     "@rocket.chat/account-utils": "workspace:^"
     "@rocket.chat/agenda": "workspace:^"
@@ -8940,7 +9179,7 @@ __metadata:
     "@rocket.chat/fuselage-ui-kit": "workspace:^"
     "@rocket.chat/gazzodown": "workspace:^"
     "@rocket.chat/i18n": "workspace:^"
-    "@rocket.chat/icons": "npm:~0.38.0"
+    "@rocket.chat/icons": "npm:~0.39.0"
     "@rocket.chat/instance-status": "workspace:^"
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/jwt": "workspace:^"
@@ -8958,7 +9197,7 @@ __metadata:
     "@rocket.chat/mp3-encoder": "npm:0.24.0"
     "@rocket.chat/network-broker": "workspace:^"
     "@rocket.chat/omnichannel-services": "workspace:^"
-    "@rocket.chat/onboarding-ui": "npm:~0.33.3"
+    "@rocket.chat/onboarding-ui": "npm:~0.34.0"
     "@rocket.chat/password-policies": "workspace:^"
     "@rocket.chat/patch-injection": "workspace:^"
     "@rocket.chat/pdf-worker": "workspace:^"
@@ -8981,26 +9220,26 @@ __metadata:
     "@rocket.chat/ui-video-conf": "workspace:^"
     "@rocket.chat/ui-voip": "workspace:^"
     "@rocket.chat/web-ui-registration": "workspace:^"
-    "@slack/bolt": "npm:^3.14.0"
-    "@slack/rtm-api": "npm:^6.0.0"
-    "@storybook/addon-a11y": "npm:^8.3.5"
-    "@storybook/addon-essentials": "npm:^8.3.5"
-    "@storybook/addon-interactions": "npm:^8.3.5"
-    "@storybook/addon-styling-webpack": "npm:^1.0.0"
+    "@slack/bolt": "npm:^4.1.0"
+    "@slack/rtm-api": "npm:^7.0.1"
+    "@storybook/addon-a11y": "npm:^8.4.4"
+    "@storybook/addon-essentials": "npm:^8.4.4"
+    "@storybook/addon-interactions": "npm:^8.4.4"
+    "@storybook/addon-styling-webpack": "npm:^1.0.1"
     "@storybook/addon-webpack5-compiler-babel": "npm:^3.0.3"
-    "@storybook/react": "npm:^8.3.5"
-    "@storybook/react-webpack5": "npm:^8.3.5"
-    "@tanstack/react-query": "npm:^4.16.1"
-    "@tanstack/react-query-devtools": "npm:^4.19.1"
+    "@storybook/react": "npm:^8.4.4"
+    "@storybook/react-webpack5": "npm:^8.4.4"
+    "@tanstack/react-query": "npm:^4.36.1"
     "@testing-library/react": "npm:~16.0.1"
     "@testing-library/user-event": "npm:~14.5.2"
-    "@types/adm-zip": "npm:^0.5.5"
+    "@types/adm-zip": "npm:^0.5.6"
     "@types/archiver": "npm:^5.3.4"
     "@types/bad-words": "npm:^3.0.3"
     "@types/bcrypt": "npm:^5.0.2"
     "@types/body-parser": "npm:^1.19.5"
     "@types/busboy": "npm:^1.5.4"
-    "@types/chai": "npm:~4.3.19"
+    "@types/bytebuffer": "npm:~5.0.49"
+    "@types/chai": "npm:~4.3.20"
     "@types/chai-as-promised": "npm:^7.1.8"
     "@types/chai-datetime": "npm:0.0.39"
     "@types/chai-dom": "npm:1.11.3"
@@ -9010,39 +9249,39 @@ __metadata:
     "@types/cookie-parser": "npm:^1.4.7"
     "@types/cors": "npm:^2.8.17"
     "@types/cssom": "npm:^0.4.3"
-    "@types/dompurify": "npm:^2.3.3"
     "@types/ejson": "npm:^2.2.2"
     "@types/express": "npm:^4.17.21"
     "@types/express-rate-limit": "npm:^5.1.3"
     "@types/google-libphonenumber": "npm:^7.4.30"
     "@types/gravatar": "npm:^1.8.6"
-    "@types/he": "npm:^1.1.2"
+    "@types/he": "npm:^1.2.3"
     "@types/i18next-sprintf-postprocessor": "npm:^0.2.3"
-    "@types/imap": "npm:^0.8.40"
-    "@types/jest": "npm:~29.5.13"
+    "@types/imap": "npm:^0.8.42"
+    "@types/jest": "npm:~29.5.14"
     "@types/jsdom": "npm:^16.2.15"
     "@types/jsdom-global": "npm:^3.0.7"
     "@types/jsrsasign": "npm:^10.5.14"
-    "@types/katex": "npm:^0.14.0"
+    "@types/katex": "npm:^0.16.7"
     "@types/later": "npm:^1.2.9"
     "@types/ldapjs": "npm:^2.2.5"
     "@types/less": "npm:~3.0.6"
-    "@types/lodash": "npm:^4.14.200"
+    "@types/lodash": "npm:^4.17.13"
     "@types/lodash.clonedeep": "npm:^4.5.9"
     "@types/lodash.debounce": "npm:^4.0.9"
+    "@types/lodash.escape": "npm:^4.0.9"
     "@types/lodash.get": "npm:^4.4.9"
-    "@types/mailparser": "npm:^3.4.4"
-    "@types/marked": "npm:^4.0.8"
+    "@types/mailparser": "npm:^3.4.5"
+    "@types/marked": "npm:^4.3.2"
     "@types/meteor": "npm:^2.9.8"
     "@types/meteor-collection-hooks": "npm:^0.8.9"
     "@types/mkdirp": "npm:^1.0.2"
     "@types/mocha": "github:whitecolor/mocha-types"
     "@types/moment-timezone": "npm:^0.5.30"
-    "@types/node": "npm:~20.16.12"
+    "@types/node": "npm:~20.16.15"
     "@types/node-gcm": "npm:^1.0.5"
     "@types/node-rsa": "npm:^1.1.4"
-    "@types/nodemailer": "npm:^6.4.15"
-    "@types/oauth2-server": "npm:^3.0.17"
+    "@types/nodemailer": "npm:^6.4.16"
+    "@types/oauth2-server": "npm:^3.0.18"
     "@types/object-path": "npm:^0.11.4"
     "@types/parseurl": "npm:^1.3.3"
     "@types/prometheus-gc-stats": "npm:^0.6.4"
@@ -9051,9 +9290,9 @@ __metadata:
     "@types/psl": "npm:^1.1.3"
     "@types/react": "npm:~17.0.80"
     "@types/react-dom": "npm:~17.0.25"
-    "@types/sanitize-html": "npm:^2.9.3"
-    "@types/semver": "npm:^7.3.10"
-    "@types/sharp": "npm:^0.30.5"
+    "@types/sanitize-html": "npm:^2.13.0"
+    "@types/semver": "npm:^7.5.8"
+    "@types/sharp": "npm:^0.32.0"
     "@types/sinon": "npm:^10.0.20"
     "@types/speakeasy": "npm:^2.0.10"
     "@types/strict-uri-encode": "npm:^2.0.2"
@@ -9062,9 +9301,8 @@ __metadata:
     "@types/supports-color": "npm:~7.2.1"
     "@types/textarea-caret": "npm:^3.0.3"
     "@types/ua-parser-js": "npm:^0.7.39"
-    "@types/use-subscription": "npm:^1.0.2"
     "@types/use-sync-external-store": "npm:^0.0.6"
-    "@types/uuid": "npm:^8.3.4"
+    "@types/uuid": "npm:^10.0.0"
     "@types/xml-crypto": "npm:~1.4.6"
     "@types/xml-encryption": "npm:~1.2.4"
     "@typescript-eslint/eslint-plugin": "npm:~5.60.1"
@@ -9072,48 +9310,48 @@ __metadata:
     "@vector-im/matrix-bot-sdk": "npm:0.7.1-element.6"
     "@xmldom/xmldom": "npm:^0.8.10"
     adm-zip: "npm:0.5.16"
-    ajv: "npm:^8.11.0"
-    ajv-formats: "npm:~2.1.1"
+    ajv: "npm:^8.17.1"
+    ajv-formats: "npm:~3.0.1"
     apn: "npm:2.2.0"
-    archiver: "npm:^3.1.1"
+    archiver: "npm:^7.0.1"
     asterisk-manager: "npm:^0.2.0"
     atlassian-crowd-patched: "npm:^0.5.1"
     autoprefixer: "npm:^9.8.8"
-    aws-sdk: "npm:^2.1363.0"
-    babel-loader: "npm:^8.3.0"
+    aws-sdk: "npm:^2.1691.0"
+    babel-loader: "npm:^9.2.1"
     babel-plugin-array-includes: "npm:^2.0.3"
     babel-plugin-istanbul: "npm:^6.1.1"
     bad-words: "npm:^3.0.4"
-    bcrypt: "npm:^5.0.1"
+    bcrypt: "npm:^5.1.1"
     body-parser: "npm:1.20.3"
-    bson: "npm:^4.6.4"
+    bson: "npm:^4.7.2"
     busboy: "npm:^1.6.0"
     bytebuffer: "npm:5.0.1"
-    chai: "npm:^4.3.10"
+    chai: "npm:^4.5.0"
     chai-as-promised: "npm:^7.1.2"
     chai-datetime: "npm:^1.8.1"
-    chai-dom: "npm:^1.11.0"
-    chai-spies: "npm:~1.0.0"
-    chalk: "npm:^4.0.0"
+    chai-dom: "npm:^1.12.0"
+    chai-spies: "npm:~1.1.0"
+    chalk: "npm:^4.1.2"
     change-case: "npm:^4.1.2"
-    chart.js: "npm:^3.8.0"
+    chart.js: "npm:^3.9.1"
     codemirror: "npm:^5.65.18"
     colorette: "npm:^2.0.20"
     colors: "npm:^1.4.0"
     connect: "npm:^3.7.0"
-    cookie: "npm:^0.5.0"
+    cookie: "npm:^0.7.2"
     cookie-parser: "npm:^1.4.7"
     cors: "npm:^2.8.5"
     cron: "npm:~1.8.2"
     cron-validator: "npm:^1.3.1"
     cross-env: "npm:^7.0.3"
     css-vars-ponyfill: "npm:^2.4.9"
-    csv-parse: "npm:^5.2.0"
-    date-fns: "npm:^2.28.0"
+    csv-parse: "npm:^5.5.6"
+    date-fns: "npm:^2.30.0"
     date.js: "npm:~0.3.3"
-    debug: "npm:~4.1.1"
+    debug: "npm:~4.3.7"
     docker-compose: "npm:^0.24.8"
-    dompurify: "npm:^3.1.7"
+    dompurify: "npm:^3.2.0"
     ejson: "npm:^2.2.3"
     emailreplyparser: "npm:^0.0.5"
     emoji-toolkit: "npm:^7.0.1"
@@ -9121,24 +9359,24 @@ __metadata:
     emojione-assets: "npm:^4.5.0"
     esl: "npm:^11.2.1"
     eslint: "npm:~8.45.0"
-    eslint-config-prettier: "npm:~8.8.0"
+    eslint-config-prettier: "npm:~9.1.0"
     eslint-plugin-anti-trojan-source: "npm:~1.1.1"
-    eslint-plugin-import: "npm:~2.26.0"
-    eslint-plugin-no-floating-promise: "npm:~1.0.2"
-    eslint-plugin-playwright: "npm:~0.15.3"
-    eslint-plugin-prettier: "npm:~4.2.1"
-    eslint-plugin-react: "npm:~7.32.2"
-    eslint-plugin-react-hooks: "npm:~4.6.2"
-    eslint-plugin-testing-library: "npm:~6.2.2"
-    eslint-plugin-you-dont-need-lodash-underscore: "npm:~6.12.0"
-    eventemitter3: "npm:^4.0.7"
-    exif-be-gone: "npm:^1.3.2"
+    eslint-plugin-import: "npm:~2.31.0"
+    eslint-plugin-no-floating-promise: "npm:~2.0.0"
+    eslint-plugin-playwright: "npm:~2.0.1"
+    eslint-plugin-prettier: "npm:~5.2.1"
+    eslint-plugin-react: "npm:~7.37.2"
+    eslint-plugin-react-hooks: "npm:~5.0.0"
+    eslint-plugin-testing-library: "npm:~6.4.0"
+    eslint-plugin-you-dont-need-lodash-underscore: "npm:~6.14.0"
+    eventemitter3: "npm:^5.0.1"
+    exif-be-gone: "npm:^1.5.1"
     expiry-map: "npm:^2.0.0"
-    express: "npm:^4.17.3"
+    express: "npm:^4.21.1"
     express-rate-limit: "npm:^5.5.1"
-    fast-glob: "npm:^3.2.12"
-    fastq: "npm:^1.13.0"
-    fflate: "npm:^0.7.4"
+    fast-glob: "npm:^3.3.2"
+    fastq: "npm:^1.17.1"
+    fflate: "npm:^0.8.2"
     file-type: "npm:^16.5.4"
     filenamify: "npm:^4.3.0"
     filesize: "npm:9.0.11"
@@ -9146,25 +9384,25 @@ __metadata:
     google-libphonenumber: "npm:^3.2.38"
     gravatar: "npm:^1.8.2"
     he: "npm:^1.2.0"
-    highlight.js: "npm:^11.6.0"
+    highlight.js: "npm:^11.10.0"
     hljs9: "npm:highlight.js@^9.18.5"
-    http-proxy-agent: "npm:^5.0.0"
+    http-proxy-agent: "npm:^7.0.2"
     human-interval: "npm:^2.0.1"
     i18next: "npm:~23.4.9"
     i18next-http-backend: "npm:^1.4.5"
     i18next-sprintf-postprocessor: "npm:^0.2.2"
     iconv-lite: "npm:^0.6.3"
-    image-size: "npm:^1.0.2"
+    image-size: "npm:^1.1.1"
     imap: "npm:^0.8.19"
     ip-range-check: "npm:^0.2.0"
-    is-svg: "npm:^4.3.2"
+    is-svg: "npm:^4.4.0"
     isolated-vm: "npm:4.7.2"
     jest: "npm:~29.7.0"
-    jschardet: "npm:^3.0.0"
+    jschardet: "npm:^3.1.4"
     jsdom: "npm:^16.7.0"
     jsdom-global: "npm:^3.0.2"
     jsrsasign: "npm:^11.1.0"
-    juice: "npm:^8.0.0"
+    juice: "npm:^8.1.0"
     katex: "npm:~0.16.11"
     ldap-escape: "npm:^2.0.6"
     ldapjs: "npm:^2.3.3"
@@ -9172,26 +9410,27 @@ __metadata:
     localforage: "npm:^1.10.0"
     lodash.clonedeep: "npm:^4.5.0"
     lodash.debounce: "npm:^4.0.8"
+    lodash.escape: "npm:^4.0.1"
     lodash.get: "npm:^4.4.2"
     mailparser: "npm:^3.7.1"
-    marked: "npm:^4.2.5"
+    marked: "npm:^4.3.0"
     matrix-appservice: "npm:^2.0.0"
     matrix-appservice-bridge: "npm:^10.3.1"
     mem: "npm:^8.1.1"
-    meteor-node-stubs: "npm:^1.2.10"
+    meteor-node-stubs: "npm:^1.2.12"
     mime-db: "npm:^1.52.0"
     mime-type: "npm:^4.0.0"
     mkdirp: "npm:^1.0.4"
     mocha: "npm:^9.2.2"
-    moleculer: "npm:^0.14.34"
+    moleculer: "npm:^0.14.35"
     moment: "npm:^2.29.4"
     moment-timezone: "npm:^0.5.46"
-    mongo-message-queue: "npm:^1.0.0"
+    mongo-message-queue: "npm:^1.1.0"
     mongodb: "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch"
-    nats: "npm:^2.6.1"
+    nats: "npm:^2.28.2"
     node-dogstatsd: "npm:^0.0.7"
     node-fetch: "npm:2.7.0"
-    node-gcm: "npm:1.0.5"
+    node-gcm: "npm:1.1.4"
     node-rsa: "npm:^1.1.1"
     nodemailer: "npm:^6.9.16"
     nyc: "npm:^15.1.0"
@@ -9201,28 +9440,29 @@ __metadata:
     path: "npm:^0.12.7"
     path-to-regexp: "npm:^6.3.0"
     pdfjs-dist: "npm:^2.16.105"
-    pino: "npm:^8.15.0"
+    pino: "npm:^8.21.0"
     pino-pretty: "npm:^7.6.1"
     playwright-qase-reporter: "npm:^1.2.2"
-    postcss: "npm:~8.4.47"
-    postcss-custom-properties: "npm:^11.0.0"
-    postcss-easy-import: "npm:^3.0.0"
-    postcss-load-config: "npm:^3.1.4"
+    postcss: "npm:~8.4.49"
+    postcss-custom-properties: "npm:^14.0.4"
+    postcss-easy-import: "npm:^4.0.0"
+    postcss-lit: "npm:^1.1.1"
+    postcss-load-config: "npm:^6.0.1"
     postcss-media-minmax: "npm:^5.0.0"
-    postcss-nested: "npm:^5.0.6"
+    postcss-nested: "npm:^7.0.2"
     postcss-url: "npm:^10.1.3"
     postis: "npm:^2.2.0"
-    prettier: "npm:~2.8.8"
+    prettier: "npm:~3.3.3"
     prom-client: "npm:^14.2.0"
     prometheus-gc-stats: "npm:^0.6.5"
     proxy-from-env: "npm:^1.1.0"
     proxyquire: "npm:^2.1.3"
-    psl: "npm:^1.8.0"
+    psl: "npm:^1.10.0"
     query-string: "npm:^7.1.3"
     queue-fifo: "npm:^0.2.6"
     raw-loader: "npm:~4.0.2"
     rc-scrollbars: "npm:^1.1.6"
-    re-resizable: "npm:^6.9.18"
+    re-resizable: "npm:^6.10.1"
     react: "npm:~17.0.2"
     react-aria: "npm:~3.23.1"
     react-docgen-typescript-plugin: "npm:^1.0.8"
@@ -9230,42 +9470,44 @@ __metadata:
     react-error-boundary: "npm:^3.1.4"
     react-hook-form: "npm:~7.45.4"
     react-i18next: "npm:~13.2.2"
-    react-keyed-flatten-children: "npm:^1.3.0"
-    react-virtuoso: "npm:^4.7.1"
+    react-keyed-flatten-children: "npm:^3.0.2"
+    react-virtuoso: "npm:^4.12.0"
     sanitize-html: "npm:^2.13.1"
     semver: "npm:^7.6.3"
-    sharp: "npm:^0.32.6"
+    sharp: "npm:^0.33.5"
     sinon: "npm:^19.0.2"
-    sip.js: "npm:^0.20.1"
-    sodium-native: "npm:^3.3.0"
+    sip.js: "npm:^0.21.2"
+    sodium-native: "npm:^4.3.1"
     sodium-plus: "npm:^0.9.0"
     source-map: "npm:^0.7.4"
     speakeasy: "npm:^2.0.0"
-    storybook: "npm:^8.3.5"
+    storybook: "npm:^8.4.4"
     stream-buffers: "npm:^3.0.3"
     strict-uri-encode: "npm:^2.0.0"
     string-strip-html: "npm:^7.0.3"
-    stylelint: "npm:^14.9.1"
-    stylelint-order: "npm:^5.0.0"
+    stylelint: "npm:^16.10.0"
+    stylelint-config-rational-order: "npm:^0.1.2"
+    stylelint-config-standard: "npm:^36.0.1"
+    stylelint-order: "npm:^6.0.4"
+    stylelint-selector-bem-pattern: "npm:^4.0.1"
     supertest: "npm:^7.0.0"
     supports-color: "npm:~7.2.0"
     suretype: "npm:~2.4.1"
-    swiper: "npm:^9.4.1"
+    swiper: "patch:swiper@npm%3A11.1.14#~/.yarn/patches/swiper-npm-11.1.14-8126fa478a.patch"
     template-file: "npm:^6.0.1"
     textarea-caret: "npm:^3.1.0"
     tinykeys: "npm:^1.4.0"
     ts-node: "npm:^10.9.2"
-    twilio: "npm:^3.76.1"
+    twilio: "npm:^3.84.1"
     twit: "npm:^2.2.11"
     typescript: "npm:~5.6.3"
-    typia: "npm:~6.9.0"
+    typia: "npm:~6.11.4"
     ua-parser-js: "npm:^1.0.39"
     underscore: "npm:^1.13.7"
     universal-perf-hooks: "npm:^1.0.1"
     url-polyfill: "npm:^1.1.12"
-    use-subscription: "npm:~1.6.0"
     use-sync-external-store: "npm:^1.2.2"
-    uuid: "npm:^8.3.2"
+    uuid: "npm:^11.0.3"
     webdav: "npm:^4.11.4"
     xml-crypto: "npm:~3.1.0"
     xml-encryption: "npm:~3.0.2"
@@ -9282,8 +9524,8 @@ __metadata:
     "@rocket.chat/emitter": "npm:~0.31.25"
     "@rocket.chat/i18n": "workspace:~"
     "@rocket.chat/ui-contexts": "workspace:*"
-    "@storybook/react": "npm:^8.3.5"
-    "@tanstack/react-query": "npm:^4.16.1"
+    "@storybook/react": "npm:^8.4.4"
+    "@tanstack/react-query": "npm:^4.36.1"
     "@types/use-sync-external-store": "npm:^0.0.6"
     eslint: "npm:~8.45.0"
     i18next: "npm:~23.4.9"
@@ -9315,7 +9557,7 @@ __metadata:
   dependencies:
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/model-typings": "workspace:~"
-    "@types/jest": "npm:~29.5.13"
+    "@types/jest": "npm:~29.5.14"
     eslint: "npm:~8.45.0"
     jest: "npm:^29.7.0"
     typescript: "npm:~5.6.3"
@@ -9337,16 +9579,16 @@ __metadata:
   dependencies:
     "@rocket.chat/core-services": "workspace:^"
     "@rocket.chat/eslint-config": "workspace:^"
-    "@types/chai": "npm:~4.3.19"
+    "@types/chai": "npm:~4.3.20"
     "@types/ejson": "npm:^2.2.2"
-    "@types/node": "npm:~20.16.12"
+    "@types/node": "npm:~20.16.15"
     "@types/sinon": "npm:^10.0.20"
-    chai: "npm:^4.3.10"
+    chai: "npm:^4.5.0"
     ejson: "npm:^2.2.3"
     eslint: "npm:~8.45.0"
     jest: "npm:~29.7.0"
-    moleculer: "npm:^0.14.34"
-    pino: "npm:^8.15.0"
+    moleculer: "npm:^0.14.35"
+    pino: "npm:^8.21.0"
     sinon: "npm:^19.0.2"
     typescript: "npm:~5.6.3"
   languageName: unknown
@@ -9368,19 +9610,19 @@ __metadata:
     "@rocket.chat/rest-typings": "workspace:^"
     "@rocket.chat/string-helpers": "npm:~0.31.25"
     "@rocket.chat/tools": "workspace:^"
-    "@types/jest": "npm:~29.5.13"
-    "@types/node": "npm:~20.16.12"
-    date-fns: "npm:^2.28.0"
+    "@types/jest": "npm:~29.5.14"
+    "@types/node": "npm:~20.16.15"
+    date-fns: "npm:^2.30.0"
     ejson: "npm:^2.2.3"
     emoji-toolkit: "npm:^7.0.1"
     eslint: "npm:~8.45.0"
-    eventemitter3: "npm:^4.0.7"
+    eventemitter3: "npm:^5.0.1"
     jest: "npm:~29.7.0"
     mem: "npm:^8.1.1"
     moment-timezone: "npm:^0.5.46"
-    mongo-message-queue: "npm:^1.0.0"
+    mongo-message-queue: "npm:^1.1.0"
     mongodb: "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch"
-    pino: "npm:^8.15.0"
+    pino: "npm:^8.21.0"
     typescript: "npm:~5.6.3"
   languageName: unknown
   linkType: soft
@@ -9403,30 +9645,30 @@ __metadata:
     "@rocket.chat/tools": "workspace:^"
     "@rocket.chat/tracing": "workspace:^"
     "@types/gc-stats": "npm:^1.4.3"
-    "@types/node": "npm:~20.16.12"
+    "@types/node": "npm:~20.16.15"
     "@types/polka": "npm:^0.5.7"
     ejson: "npm:^2.2.3"
     emoji-toolkit: "npm:^7.0.1"
     eslint: "npm:~8.45.0"
     event-loop-stats: "npm:^1.4.1"
-    eventemitter3: "npm:^4.0.7"
+    eventemitter3: "npm:^5.0.1"
     gc-stats: "npm:^1.4.1"
     mem: "npm:^8.1.1"
-    moleculer: "npm:^0.14.34"
+    moleculer: "npm:^0.14.35"
     moment-timezone: "npm:^0.5.46"
-    mongo-message-queue: "npm:^1.0.0"
+    mongo-message-queue: "npm:^1.1.0"
     mongodb: "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch"
-    nats: "npm:^2.4.0"
-    pino: "npm:^8.15.0"
+    nats: "npm:^2.28.2"
+    pino: "npm:^8.21.0"
     polka: "npm:^0.5.2"
     ts-node: "npm:^10.9.2"
     typescript: "npm:~5.6.3"
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/onboarding-ui@npm:~0.33.3":
-  version: 0.33.3
-  resolution: "@rocket.chat/onboarding-ui@npm:0.33.3"
+"@rocket.chat/onboarding-ui@npm:~0.34.0":
+  version: 0.34.0
+  resolution: "@rocket.chat/onboarding-ui@npm:0.34.0"
   dependencies:
     i18next: "npm:~21.6.16"
     react-hook-form: "npm:~7.27.1"
@@ -9441,7 +9683,7 @@ __metadata:
     react: 17.0.2
     react-dom: 17.0.2
     react-i18next: ~11.15.4
-  checksum: 10/c2afbbd3027c85ddaadb164dfa1eaf7c1dc9e583f8419c9dfebe7e099ee9d95171b5b9c46e16dd02ee6936d85bf0ff1b4999fa1b739ce38d053161d118129c8d
+  checksum: 10/9269dd73385ba3a4da88c07a3117ca91dd8206d9b014fd224550db4e56faa1a415b2d2967c6f9e04585226dcef8cacf4d7ce3aed779fb56032d3d3ea25cbbc21
   languageName: node
   linkType: hard
 
@@ -9450,7 +9692,7 @@ __metadata:
   resolution: "@rocket.chat/password-policies@workspace:packages/password-policies"
   dependencies:
     "@rocket.chat/jest-presets": "workspace:~"
-    "@types/jest": "npm:~29.5.13"
+    "@types/jest": "npm:~29.5.14"
     eslint: "npm:~8.45.0"
     jest: "npm:~29.7.0"
     typescript: "npm:~5.6.3"
@@ -9462,7 +9704,7 @@ __metadata:
   resolution: "@rocket.chat/patch-injection@workspace:packages/patch-injection"
   dependencies:
     "@rocket.chat/jest-presets": "workspace:~"
-    "@types/jest": "npm:~29.5.13"
+    "@types/jest": "npm:~29.5.14"
     eslint: "npm:~8.45.0"
     jest: "npm:~29.7.0"
     typescript: "npm:~5.6.3"
@@ -9477,13 +9719,13 @@ __metadata:
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/fuselage-tokens": "npm:^0.33.2"
     "@rocket.chat/jest-presets": "workspace:~"
-    "@storybook/addon-essentials": "npm:^8.3.5"
+    "@storybook/addon-essentials": "npm:^8.4.4"
     "@storybook/addon-webpack5-compiler-babel": "npm:^3.0.3"
-    "@storybook/react": "npm:^8.3.5"
-    "@storybook/react-webpack5": "npm:^8.3.5"
+    "@storybook/react": "npm:^8.4.4"
+    "@storybook/react-webpack5": "npm:^8.4.4"
     "@testing-library/react": "npm:~16.0.1"
     "@types/emojione": "npm:^2.2.9"
-    "@types/jest": "npm:~29.5.13"
+    "@types/jest": "npm:~29.5.14"
     "@types/react": "npm:~17.0.80"
     "@types/react-dom": "npm:~17.0.25"
     buffer: "npm:~6.0.3"
@@ -9495,7 +9737,7 @@ __metadata:
     moment-timezone: "npm:^0.5.46"
     react: "npm:~18.3.1"
     react-dom: "npm:~18.3.1"
-    storybook: "npm:^8.3.5"
+    storybook: "npm:^8.4.4"
     typescript: "npm:~5.6.3"
   languageName: unknown
   linkType: soft
@@ -9506,11 +9748,11 @@ __metadata:
   dependencies:
     "@rocket.chat/eslint-config": "workspace:~"
     "@rocket.chat/prettier-config": "npm:~0.31.25"
-    "@types/node": "npm:~20.16.12"
+    "@types/node": "npm:~20.16.15"
     eslint: "npm:~8.45.0"
     npm-run-all: "npm:^4.1.5"
-    peggy: "npm:3.0.2"
-    prettier: "npm:~2.8.8"
+    peggy: "npm:4.1.1"
+    prettier: "npm:~3.3.3"
     rimraf: "npm:^6.0.1"
     typescript: "npm:~5.6.3"
     webpack: "npm:~5.95.0"
@@ -9544,18 +9786,18 @@ __metadata:
     "@rocket.chat/string-helpers": "npm:~0.31.25"
     "@rocket.chat/tracing": "workspace:^"
     "@types/gc-stats": "npm:^1.4.3"
-    "@types/node": "npm:~20.16.12"
+    "@types/node": "npm:~20.16.15"
     "@types/polka": "npm:^0.5.7"
     ejson: "npm:^2.2.3"
     eslint: "npm:~8.45.0"
     event-loop-stats: "npm:^1.4.1"
-    eventemitter3: "npm:^4.0.7"
+    eventemitter3: "npm:^5.0.1"
     gc-stats: "npm:^1.4.1"
     mem: "npm:^8.1.1"
-    moleculer: "npm:^0.14.34"
+    moleculer: "npm:^0.14.35"
     mongodb: "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch"
-    nats: "npm:^2.4.0"
-    pino: "npm:^8.15.0"
+    nats: "npm:^2.28.2"
+    pino: "npm:^8.21.0"
     polka: "npm:^0.5.2"
     ts-node: "npm:^10.9.2"
     typescript: "npm:~5.6.3"
@@ -9566,17 +9808,17 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/presence@workspace:ee/packages/presence"
   dependencies:
-    "@babel/core": "npm:~7.25.8"
-    "@babel/preset-env": "npm:~7.25.8"
-    "@babel/preset-typescript": "npm:~7.25.7"
+    "@babel/core": "npm:~7.26.0"
+    "@babel/preset-env": "npm:~7.26.0"
+    "@babel/preset-typescript": "npm:~7.26.0"
     "@rocket.chat/apps-engine": "workspace:^"
     "@rocket.chat/core-services": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/models": "workspace:^"
     "@rocket.chat/rest-typings": "workspace:^"
-    "@types/node": "npm:~20.16.12"
-    babel-jest: "npm:^29.0.3"
+    "@types/node": "npm:~20.16.15"
+    babel-jest: "npm:^29.7.0"
     eslint: "npm:~8.45.0"
     jest: "npm:~29.7.0"
     mongodb: "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch"
@@ -9608,21 +9850,21 @@ __metadata:
     "@rocket.chat/omnichannel-services": "workspace:^"
     "@rocket.chat/tracing": "workspace:^"
     "@types/gc-stats": "npm:^1.4.3"
-    "@types/node": "npm:~20.16.12"
+    "@types/node": "npm:~20.16.15"
     "@types/polka": "npm:^0.5.7"
     ejson: "npm:^2.2.3"
     emoji-toolkit: "npm:^7.0.1"
     eslint: "npm:~8.45.0"
     event-loop-stats: "npm:^1.4.1"
-    eventemitter3: "npm:^4.0.7"
+    eventemitter3: "npm:^5.0.1"
     gc-stats: "npm:^1.4.1"
     mem: "npm:^8.1.1"
-    moleculer: "npm:^0.14.34"
+    moleculer: "npm:^0.14.35"
     moment-timezone: "npm:^0.5.46"
-    mongo-message-queue: "npm:^1.0.0"
+    mongo-message-queue: "npm:^1.1.0"
     mongodb: "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch"
-    nats: "npm:^2.4.0"
-    pino: "npm:^8.15.0"
+    nats: "npm:^2.28.2"
+    pino: "npm:^8.21.0"
     polka: "npm:^0.5.2"
     ts-node: "npm:^10.9.2"
     typescript: "npm:~5.6.3"
@@ -9633,8 +9875,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/random@workspace:packages/random"
   dependencies:
-    "@babel/core": "npm:~7.25.8"
-    "@babel/preset-env": "npm:~7.25.8"
+    "@babel/core": "npm:~7.26.0"
+    "@babel/preset-env": "npm:~7.26.0"
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/jest-presets": "workspace:~"
     "@typescript-eslint/eslint-plugin": "npm:~5.60.1"
@@ -9649,12 +9891,12 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/release-action@workspace:packages/release-action"
   dependencies:
-    "@actions/core": "npm:^1.10.1"
+    "@actions/core": "npm:^1.11.1"
     "@actions/exec": "npm:^1.1.1"
-    "@actions/github": "npm:^5.1.1"
-    "@octokit/plugin-throttling": "npm:^6.0.0"
+    "@actions/github": "npm:^6.0.0"
+    "@octokit/plugin-throttling": "npm:^6.1.0"
     "@rocket.chat/eslint-config": "workspace:^"
-    "@types/node": "npm:~20.16.12"
+    "@types/node": "npm:~20.16.15"
     eslint: "npm:~8.45.0"
     mdast-util-to-string: "npm:2.0.0"
     remark-parse: "npm:9.0.0"
@@ -9671,7 +9913,7 @@ __metadata:
   dependencies:
     "@changesets/types": "npm:^6.0.0"
     "@rocket.chat/eslint-config": "workspace:^"
-    "@types/node": "npm:~20.16.12"
+    "@types/node": "npm:~20.16.15"
     dataloader: "npm:^2.2.2"
     eslint: "npm:~8.45.0"
     node-fetch: "npm:^2.7.0"
@@ -9688,9 +9930,9 @@ __metadata:
     "@rocket.chat/eslint-config": "workspace:~"
     "@rocket.chat/message-parser": "workspace:^"
     "@rocket.chat/ui-kit": "workspace:~"
-    "@types/jest": "npm:~29.5.13"
-    ajv: "npm:^8.11.0"
-    ajv-formats: "npm:^2.1.1"
+    "@types/jest": "npm:~29.5.14"
+    ajv: "npm:^8.17.1"
+    ajv-formats: "npm:^3.0.1"
     eslint: "npm:~8.45.0"
     jest: "npm:~29.7.0"
     mongodb: "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch"
@@ -9698,19 +9940,6 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@rocket.chat/sdk@npm:^1.0.0-alpha.42":
-  version: 1.0.0-alpha.42
-  resolution: "@rocket.chat/sdk@npm:1.0.0-alpha.42"
-  dependencies:
-    js-sha256: "npm:^0.9.0"
-    lru-cache: "npm:^4.1.1"
-    mem: "npm:^4.0.0"
-    tiny-events: "npm:^1.0.1"
-    universal-websocket-client: "npm:^1.0.2"
-  checksum: 10/334d63004c92ea6f99de1e88e20737b74db18a9395200270c555dd64cd5a49e205022c11162e85e923c367586c6f3eee44a0b097f4792f648bda8426e64fd652
-  languageName: node
-  linkType: hard
-
 "@rocket.chat/server-cloud-communication@workspace:^, @rocket.chat/server-cloud-communication@workspace:packages/server-cloud-communication":
   version: 0.0.0-use.local
   resolution: "@rocket.chat/server-cloud-communication@workspace:packages/server-cloud-communication"
@@ -9728,8 +9957,8 @@ __metadata:
     "@types/node-fetch": "npm:~2.6.11"
     "@types/proxy-from-env": "npm:^1.0.4"
     eslint: "npm:~8.45.0"
-    http-proxy-agent: "npm:^5.0.0"
-    https-proxy-agent: "npm:^5.0.1"
+    http-proxy-agent: "npm:^7.0.2"
+    https-proxy-agent: "npm:^7.0.5"
     node-fetch: "npm:2.7.0"
     proxy-from-env: "npm:^1.1.0"
     typescript: "npm:~5.6.3"
@@ -9740,8 +9969,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/sha256@workspace:packages/sha256"
   dependencies:
-    "@babel/core": "npm:~7.25.8"
-    "@babel/preset-env": "npm:~7.25.8"
+    "@babel/core": "npm:~7.26.0"
+    "@babel/preset-env": "npm:~7.26.0"
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/jest-presets": "workspace:~"
     "@typescript-eslint/eslint-plugin": "npm:~5.60.1"
@@ -9769,18 +9998,18 @@ __metadata:
     "@rocket.chat/tracing": "workspace:^"
     "@types/bcrypt": "npm:^5.0.2"
     "@types/gc-stats": "npm:^1.4.3"
-    "@types/node": "npm:~20.16.12"
+    "@types/node": "npm:~20.16.15"
     "@types/polka": "npm:^0.5.7"
     ejson: "npm:^2.2.3"
     eslint: "npm:~8.45.0"
     event-loop-stats: "npm:^1.4.1"
-    eventemitter3: "npm:^4.0.7"
+    eventemitter3: "npm:^5.0.1"
     gc-stats: "npm:^1.4.1"
     mem: "npm:^8.1.1"
-    moleculer: "npm:^0.14.34"
+    moleculer: "npm:^0.14.35"
     mongodb: "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch"
-    nats: "npm:^2.4.0"
-    pino: "npm:^8.15.0"
+    nats: "npm:^2.28.2"
+    pino: "npm:^8.21.0"
     polka: "npm:^0.5.2"
     ts-node: "npm:^10.9.2"
     typescript: "npm:~5.6.3"
@@ -9819,7 +10048,7 @@ __metadata:
   resolution: "@rocket.chat/tools@workspace:packages/tools"
   dependencies:
     "@rocket.chat/jest-presets": "workspace:~"
-    "@types/jest": "npm:~29.5.13"
+    "@types/jest": "npm:~29.5.14"
     eslint: "npm:~8.45.0"
     jest: "npm:~29.7.0"
     moment-timezone: "npm:^0.5.46"
@@ -9832,13 +10061,13 @@ __metadata:
   resolution: "@rocket.chat/tracing@workspace:packages/tracing"
   dependencies:
     "@opentelemetry/api": "npm:^1.9.0"
-    "@opentelemetry/exporter-trace-otlp-grpc": "npm:^0.53.0"
-    "@opentelemetry/sdk-node": "npm:^0.53.0"
-    "@types/jest": "npm:~29.5.7"
+    "@opentelemetry/exporter-trace-otlp-grpc": "npm:^0.54.2"
+    "@opentelemetry/sdk-node": "npm:^0.54.2"
+    "@types/jest": "npm:~29.5.14"
     eslint: "npm:~8.45.0"
-    jest: "npm:~29.6.4"
-    ts-jest: "npm:~29.1.1"
-    typescript: "npm:~5.3.3"
+    jest: "npm:~29.7.0"
+    ts-jest: "npm:~29.2.5"
+    typescript: "npm:~5.6.3"
   languageName: unknown
   linkType: soft
 
@@ -9846,21 +10075,21 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/ui-avatar@workspace:packages/ui-avatar"
   dependencies:
-    "@babel/core": "npm:~7.25.8"
+    "@babel/core": "npm:~7.26.0"
     "@rocket.chat/fuselage": "npm:^0.59.4"
     "@rocket.chat/ui-contexts": "workspace:^"
     "@types/react": "npm:~17.0.80"
     "@types/react-dom": "npm:~17.0.25"
     eslint: "npm:~8.45.0"
-    eslint-plugin-react: "npm:~7.32.2"
-    eslint-plugin-react-hooks: "npm:~4.6.2"
-    eslint-plugin-storybook: "npm:~0.6.15"
-    eslint-plugin-testing-library: "npm:~5.11.1"
+    eslint-plugin-react: "npm:~7.37.2"
+    eslint-plugin-react-hooks: "npm:~5.0.0"
+    eslint-plugin-storybook: "npm:~0.11.0"
+    eslint-plugin-testing-library: "npm:~6.4.0"
     react: "npm:^17.0.2"
     typescript: "npm:~5.6.3"
   peerDependencies:
     "@rocket.chat/fuselage": "*"
-    "@rocket.chat/ui-contexts": 12.0.0-rc.6
+    "@rocket.chat/ui-contexts": 13.0.0-rc.2
     react: ~17.0.2
   languageName: unknown
   linkType: soft
@@ -9869,40 +10098,40 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/ui-client@workspace:packages/ui-client"
   dependencies:
-    "@babel/core": "npm:~7.25.8"
-    "@react-aria/toolbar": "npm:^3.0.0-beta.1"
+    "@babel/core": "npm:~7.26.0"
+    "@react-aria/toolbar": "npm:^3.0.0-nightly.5042"
     "@rocket.chat/css-in-js": "npm:~0.31.25"
     "@rocket.chat/fuselage": "npm:^0.59.4"
     "@rocket.chat/fuselage-hooks": "npm:^0.33.1"
-    "@rocket.chat/icons": "npm:~0.38.0"
+    "@rocket.chat/icons": "npm:~0.39.0"
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/mock-providers": "workspace:^"
     "@rocket.chat/ui-avatar": "workspace:~"
     "@rocket.chat/ui-contexts": "workspace:~"
-    "@storybook/addon-actions": "npm:^8.3.5"
-    "@storybook/addon-docs": "npm:^8.3.5"
-    "@storybook/addon-essentials": "npm:^8.3.5"
-    "@storybook/addon-interactions": "npm:^8.3.5"
-    "@storybook/addon-links": "npm:^8.3.5"
-    "@storybook/addon-styling-webpack": "npm:^1.0.0"
+    "@storybook/addon-actions": "npm:^8.4.4"
+    "@storybook/addon-docs": "npm:^8.4.4"
+    "@storybook/addon-essentials": "npm:^8.4.4"
+    "@storybook/addon-interactions": "npm:^8.4.4"
+    "@storybook/addon-links": "npm:^8.4.4"
+    "@storybook/addon-styling-webpack": "npm:^1.0.1"
     "@storybook/addon-webpack5-compiler-babel": "npm:^3.0.3"
-    "@storybook/react": "npm:^8.3.5"
-    "@storybook/react-webpack5": "npm:^8.3.5"
+    "@storybook/react": "npm:^8.4.4"
+    "@storybook/react-webpack5": "npm:^8.4.4"
     "@testing-library/react": "npm:~16.0.1"
-    "@types/jest": "npm:~29.5.13"
+    "@types/jest": "npm:~29.5.14"
     "@types/react": "npm:~17.0.80"
     "@types/react-dom": "npm:~17.0.25"
     eslint: "npm:~8.45.0"
     eslint-plugin-anti-trojan-source: "npm:~1.1.1"
-    eslint-plugin-react: "npm:~7.32.2"
-    eslint-plugin-react-hooks: "npm:~4.6.2"
-    eslint-plugin-storybook: "npm:~0.6.15"
-    eslint-plugin-testing-library: "npm:~5.11.1"
+    eslint-plugin-react: "npm:~7.37.2"
+    eslint-plugin-react-hooks: "npm:~5.0.0"
+    eslint-plugin-storybook: "npm:~0.11.0"
+    eslint-plugin-testing-library: "npm:~6.4.0"
     jest: "npm:~29.7.0"
     react: "npm:^17.0.2"
     react-dom: "npm:^17.0.2"
     react-hook-form: "npm:~7.45.4"
-    storybook: "npm:^8.3.5"
+    storybook: "npm:^8.4.4"
     typescript: "npm:~5.6.3"
   peerDependencies:
     "@react-aria/toolbar": "*"
@@ -9910,8 +10139,8 @@ __metadata:
     "@rocket.chat/fuselage": "*"
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
-    "@rocket.chat/ui-avatar": 8.0.0-rc.6
-    "@rocket.chat/ui-contexts": 12.0.0-rc.6
+    "@rocket.chat/ui-avatar": 9.0.0-rc.2
+    "@rocket.chat/ui-contexts": 13.0.0-rc.2
     react: "*"
     react-i18next: "*"
   languageName: unknown
@@ -9921,27 +10150,27 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/ui-composer@workspace:packages/ui-composer"
   dependencies:
-    "@babel/core": "npm:~7.25.8"
-    "@react-aria/toolbar": "npm:^3.0.0-beta.1"
+    "@babel/core": "npm:~7.26.0"
+    "@react-aria/toolbar": "npm:^3.0.0-nightly.5042"
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/fuselage": "npm:^0.59.4"
-    "@rocket.chat/icons": "npm:~0.38.0"
-    "@storybook/addon-actions": "npm:^8.3.5"
-    "@storybook/addon-docs": "npm:^8.3.5"
-    "@storybook/addon-essentials": "npm:^8.3.5"
-    "@storybook/addon-styling-webpack": "npm:^1.0.0"
+    "@rocket.chat/icons": "npm:~0.39.0"
+    "@storybook/addon-actions": "npm:^8.4.4"
+    "@storybook/addon-docs": "npm:^8.4.4"
+    "@storybook/addon-essentials": "npm:^8.4.4"
+    "@storybook/addon-styling-webpack": "npm:^1.0.1"
     "@storybook/addon-webpack5-compiler-babel": "npm:^3.0.3"
-    "@storybook/react": "npm:^8.3.5"
-    "@storybook/react-webpack5": "npm:^8.3.5"
+    "@storybook/react": "npm:^8.4.4"
+    "@storybook/react-webpack5": "npm:^8.4.4"
     "@types/react": "npm:~17.0.80"
     "@types/react-dom": "npm:~17.0.25"
     eslint: "npm:~8.45.0"
-    eslint-plugin-react: "npm:~7.32.2"
-    eslint-plugin-react-hooks: "npm:~4.6.2"
-    eslint-plugin-storybook: "npm:^0.9.0"
+    eslint-plugin-react: "npm:~7.37.2"
+    eslint-plugin-react-hooks: "npm:~5.0.0"
+    eslint-plugin-storybook: "npm:^0.11.0"
     react: "npm:~17.0.2"
     react-dom: "npm:~17.0.2"
-    storybook: "npm:^8.3.5"
+    storybook: "npm:^8.4.4"
     typescript: "npm:~5.6.3"
   peerDependencies:
     "@react-aria/toolbar": "*"
@@ -9967,7 +10196,7 @@ __metadata:
     "@types/react-dom": "npm:~17.0.25"
     "@types/use-sync-external-store": "npm:^0.0.6"
     eslint: "npm:~8.45.0"
-    eslint-plugin-react-hooks: "npm:^4.6.2"
+    eslint-plugin-react-hooks: "npm:^5.0.0"
     mongodb: "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch"
     react: "npm:~17.0.2"
     typescript: "npm:~5.6.3"
@@ -9988,26 +10217,26 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/ui-kit@workspace:packages/ui-kit"
   dependencies:
-    "@babel/core": "npm:~7.25.8"
-    "@babel/eslint-parser": "npm:~7.25.8"
-    "@babel/plugin-transform-runtime": "npm:~7.25.7"
-    "@babel/preset-env": "npm:~7.25.8"
+    "@babel/core": "npm:~7.26.0"
+    "@babel/eslint-parser": "npm:~7.25.9"
+    "@babel/plugin-transform-runtime": "npm:~7.25.9"
+    "@babel/preset-env": "npm:~7.26.0"
     "@rocket.chat/eslint-config": "workspace:~"
-    "@rocket.chat/icons": "npm:~0.38.0"
+    "@rocket.chat/icons": "npm:~0.39.0"
     "@rocket.chat/jest-presets": "workspace:~"
-    "@types/jest": "npm:~29.5.13"
-    babel-loader: "npm:~9.1.3"
+    "@types/jest": "npm:~29.5.14"
+    babel-loader: "npm:~9.2.1"
     eslint: "npm:~8.45.0"
     jest: "npm:~29.7.0"
     npm-run-all: "npm:~4.1.5"
-    prettier: "npm:~2.8.8"
+    prettier: "npm:~3.3.3"
     rimraf: "npm:~6.0.1"
-    ts-jest: "npm:~29.1.5"
-    ts-loader: "npm:~9.4.4"
+    ts-jest: "npm:~29.2.5"
+    ts-loader: "npm:~9.5.1"
     ts-node: "npm:~10.9.2"
     ts-patch: "npm:~3.2.1"
     typescript: "npm:~5.6.3"
-    typia: "npm:~6.9.0"
+    typia: "npm:~6.11.4"
   peerDependencies:
     "@rocket.chat/icons": "*"
   languageName: unknown
@@ -10020,14 +10249,14 @@ __metadata:
     "@rocket.chat/css-in-js": "npm:~0.31.25"
     "@rocket.chat/fuselage": "npm:^0.59.4"
     "@rocket.chat/fuselage-hooks": "npm:^0.33.1"
-    "@rocket.chat/icons": "npm:~0.38.0"
+    "@rocket.chat/icons": "npm:~0.39.0"
     "@rocket.chat/ui-contexts": "workspace:~"
     "@types/react": "npm:~17.0.80"
     eslint: "npm:~8.45.0"
     eslint-plugin-anti-trojan-source: "npm:~1.1.1"
-    eslint-plugin-react: "npm:~7.32.2"
-    eslint-plugin-react-hooks: "npm:~4.6.2"
-    eslint-plugin-testing-library: "npm:^5.11.1"
+    eslint-plugin-react: "npm:~7.37.2"
+    eslint-plugin-react-hooks: "npm:~5.0.0"
+    eslint-plugin-testing-library: "npm:^6.4.0"
     react: "npm:~17.0.2"
     react-docgen-typescript-plugin: "npm:~1.0.8"
     typescript: "npm:~5.6.3"
@@ -10044,36 +10273,36 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/ui-video-conf@workspace:packages/ui-video-conf"
   dependencies:
-    "@babel/core": "npm:~7.25.8"
+    "@babel/core": "npm:~7.26.0"
     "@rocket.chat/css-in-js": "npm:~0.31.25"
     "@rocket.chat/emitter": "npm:~0.31.25"
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/fuselage": "npm:^0.59.4"
     "@rocket.chat/fuselage-hooks": "npm:^0.33.1"
-    "@rocket.chat/icons": "npm:~0.38.0"
+    "@rocket.chat/icons": "npm:~0.39.0"
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/styled": "npm:~0.31.25"
     "@rocket.chat/ui-avatar": "workspace:^"
     "@rocket.chat/ui-contexts": "workspace:^"
-    "@storybook/addon-a11y": "npm:^8.3.5"
-    "@storybook/addon-actions": "npm:^8.3.5"
-    "@storybook/addon-docs": "npm:^8.3.5"
-    "@storybook/addon-essentials": "npm:^8.3.5"
-    "@storybook/addon-styling-webpack": "npm:^1.0.0"
+    "@storybook/addon-a11y": "npm:^8.4.4"
+    "@storybook/addon-actions": "npm:^8.4.4"
+    "@storybook/addon-docs": "npm:^8.4.4"
+    "@storybook/addon-essentials": "npm:^8.4.4"
+    "@storybook/addon-styling-webpack": "npm:^1.0.1"
     "@storybook/addon-webpack5-compiler-babel": "npm:^3.0.3"
-    "@storybook/react": "npm:^8.3.5"
-    "@storybook/react-webpack5": "npm:^8.3.5"
-    "@types/jest": "npm:~29.5.13"
+    "@storybook/react": "npm:^8.4.4"
+    "@storybook/react-webpack5": "npm:^8.4.4"
+    "@types/jest": "npm:~29.5.14"
     "@types/jest-axe": "npm:~3.5.9"
     "@types/react": "npm:~17.0.80"
     eslint: "npm:~8.45.0"
-    eslint-plugin-react: "npm:~7.32.2"
-    eslint-plugin-react-hooks: "npm:~4.6.2"
-    eslint-plugin-storybook: "npm:~0.6.15"
+    eslint-plugin-react: "npm:~7.37.2"
+    eslint-plugin-react-hooks: "npm:~5.0.0"
+    eslint-plugin-storybook: "npm:~0.11.0"
     jest: "npm:~29.7.0"
     jest-axe: "npm:~9.0.0"
     react: "npm:~17.0.2"
-    storybook: "npm:^8.3.5"
+    storybook: "npm:^8.4.4"
     typescript: "npm:~5.6.3"
   peerDependencies:
     "@rocket.chat/css-in-js": "*"
@@ -10081,8 +10310,8 @@ __metadata:
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 8.0.0-rc.6
-    "@rocket.chat/ui-contexts": 12.0.0-rc.6
+    "@rocket.chat/ui-avatar": 9.0.0-rc.2
+    "@rocket.chat/ui-contexts": 13.0.0-rc.2
     react: ~17.0.2
     react-dom: ^17.0.2
   languageName: unknown
@@ -10092,43 +10321,45 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/ui-voip@workspace:packages/ui-voip"
   dependencies:
-    "@babel/core": "npm:~7.25.8"
+    "@babel/core": "npm:~7.26.0"
     "@faker-js/faker": "npm:~8.0.2"
+    "@react-spectrum/test-utils": "npm:~1.0.0-alpha.2"
     "@rocket.chat/css-in-js": "npm:~0.31.25"
     "@rocket.chat/emitter": "npm:~0.31.25"
     "@rocket.chat/eslint-config": "workspace:^"
     "@rocket.chat/fuselage": "npm:^0.59.4"
     "@rocket.chat/fuselage-hooks": "npm:^0.33.1"
-    "@rocket.chat/icons": "npm:~0.38.0"
+    "@rocket.chat/icons": "npm:~0.39.0"
     "@rocket.chat/jest-presets": "workspace:~"
     "@rocket.chat/mock-providers": "workspace:~"
     "@rocket.chat/styled": "npm:~0.31.25"
     "@rocket.chat/ui-avatar": "workspace:^"
     "@rocket.chat/ui-client": "workspace:^"
     "@rocket.chat/ui-contexts": "workspace:^"
-    "@storybook/addon-a11y": "npm:^8.3.5"
-    "@storybook/addon-actions": "npm:^8.3.5"
-    "@storybook/addon-docs": "npm:^8.3.5"
-    "@storybook/addon-essentials": "npm:^8.3.5"
+    "@storybook/addon-a11y": "npm:^8.4.4"
+    "@storybook/addon-actions": "npm:^8.4.4"
+    "@storybook/addon-docs": "npm:^8.4.4"
+    "@storybook/addon-essentials": "npm:^8.4.4"
     "@storybook/addon-webpack5-compiler-babel": "npm:^3.0.3"
-    "@storybook/react": "npm:^8.3.5"
-    "@storybook/react-webpack5": "npm:^8.3.5"
-    "@tanstack/react-query": "npm:^4.16.1"
+    "@storybook/react": "npm:^8.4.4"
+    "@storybook/react-webpack5": "npm:^8.4.4"
+    "@tanstack/react-query": "npm:^4.36.1"
     "@testing-library/react": "npm:~16.0.1"
     "@testing-library/user-event": "npm:~14.5.2"
-    "@types/jest": "npm:~29.5.12"
+    "@types/jest": "npm:~29.5.14"
     "@types/jest-axe": "npm:~3.5.9"
     "@types/react": "npm:~17.0.80"
+    "@types/react-dom": "npm:~17.0.25"
     eslint: "npm:~8.45.0"
-    eslint-plugin-react: "npm:~7.32.2"
-    eslint-plugin-react-hooks: "npm:~4.6.2"
-    eslint-plugin-storybook: "npm:^0.9.0"
+    eslint-plugin-react: "npm:~7.37.2"
+    eslint-plugin-react-hooks: "npm:~5.0.0"
+    eslint-plugin-storybook: "npm:^0.11.0"
     jest: "npm:~29.7.0"
     jest-axe: "npm:~9.0.0"
     react: "npm:~17.0.2"
     react-i18next: "npm:~13.2.2"
-    sip.js: "npm:^0.20.1"
-    storybook: "npm:^8.3.5"
+    sip.js: "npm:^0.21.2"
+    storybook: "npm:^8.4.4"
     typescript: "npm:~5.6.3"
   peerDependencies:
     "@rocket.chat/css-in-js": "*"
@@ -10136,9 +10367,9 @@ __metadata:
     "@rocket.chat/fuselage-hooks": "*"
     "@rocket.chat/icons": "*"
     "@rocket.chat/styled": "*"
-    "@rocket.chat/ui-avatar": 8.0.0-rc.6
-    "@rocket.chat/ui-client": 12.0.0-rc.6
-    "@rocket.chat/ui-contexts": 12.0.0-rc.6
+    "@rocket.chat/ui-avatar": 9.0.0-rc.2
+    "@rocket.chat/ui-client": 13.0.0-rc.2
+    "@rocket.chat/ui-contexts": 13.0.0-rc.2
     react: ~17.0.2
     react-aria: ~3.23.1
     react-dom: ^17.0.2
@@ -10149,9 +10380,9 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/uikit-playground@workspace:apps/uikit-playground"
   dependencies:
-    "@codemirror/lang-javascript": "npm:^6.1.9"
+    "@codemirror/lang-javascript": "npm:^6.2.2"
     "@codemirror/lang-json": "npm:^6.0.1"
-    "@lezer/highlight": "npm:^1.1.6"
+    "@lezer/highlight": "npm:^1.2.1"
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/css-in-js": "npm:~0.31.25"
     "@rocket.chat/fuselage": "npm:^0.59.4"
@@ -10160,35 +10391,34 @@ __metadata:
     "@rocket.chat/fuselage-toastbar": "npm:^0.33.0"
     "@rocket.chat/fuselage-tokens": "npm:^0.33.2"
     "@rocket.chat/fuselage-ui-kit": "workspace:~"
-    "@rocket.chat/icons": "npm:~0.38.0"
+    "@rocket.chat/icons": "npm:~0.39.0"
     "@rocket.chat/logo": "npm:^0.31.30"
     "@rocket.chat/styled": "npm:~0.31.25"
     "@rocket.chat/ui-avatar": "workspace:^"
     "@rocket.chat/ui-contexts": "workspace:~"
+    "@types/lodash": "npm:~4.17.13"
     "@types/react": "npm:~17.0.80"
     "@types/react-beautiful-dnd": "npm:^13.1.8"
     "@types/react-dom": "npm:~17.0.25"
-    "@types/use-subscription": "npm:^1.0.2"
     "@typescript-eslint/eslint-plugin": "npm:~5.60.1"
     "@typescript-eslint/parser": "npm:~5.60.1"
-    "@vitejs/plugin-react": "npm:^4.0.0"
+    "@vitejs/plugin-react": "npm:^4.3.3"
     codemirror: "npm:^6.0.1"
     eslint: "npm:~8.45.0"
-    eslint-plugin-react-hooks: "npm:^4.6.2"
-    eslint-plugin-react-refresh: "npm:^0.4.12"
+    eslint-plugin-react-hooks: "npm:^5.0.0"
+    eslint-plugin-react-refresh: "npm:^0.4.14"
     eslint4b-prebuilt: "npm:^6.7.2"
     moment: "npm:^2.29.4"
     rc-scrollbars: "npm:^1.1.6"
     react: "npm:^17.0.2"
     react-beautiful-dnd: "npm:^13.1.1"
     react-dom: "npm:^17.0.2"
-    react-router-dom: "npm:^6.11.2"
+    react-router-dom: "npm:^6.28.0"
     react-split-pane: "npm:^0.1.92"
-    react-virtuoso: "npm:^4.7.1"
-    reactflow: "npm:^11.7.2"
+    react-virtuoso: "npm:^4.12.0"
+    reactflow: "npm:^11.11.4"
     typescript: "npm:~5.6.3"
-    use-subscription: "npm:^1.8.2"
-    vite: "npm:^4.5.5"
+    vite: "npm:^5.4.11"
   languageName: unknown
   linkType: soft
 
@@ -10196,38 +10426,38 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@rocket.chat/web-ui-registration@workspace:packages/web-ui-registration"
   dependencies:
-    "@babel/core": "npm:~7.25.8"
-    "@babel/preset-env": "npm:~7.25.8"
-    "@babel/preset-react": "npm:~7.25.7"
-    "@babel/preset-typescript": "npm:~7.25.7"
+    "@babel/core": "npm:~7.26.0"
+    "@babel/preset-env": "npm:~7.26.0"
+    "@babel/preset-react": "npm:~7.25.9"
+    "@babel/preset-typescript": "npm:~7.26.0"
     "@rocket.chat/i18n": "workspace:~"
     "@rocket.chat/layout": "npm:~0.31.27"
     "@rocket.chat/mock-providers": "workspace:~"
     "@rocket.chat/tools": "workspace:~"
     "@rocket.chat/ui-client": "workspace:^"
     "@rocket.chat/ui-contexts": "workspace:^"
-    "@storybook/addon-actions": "npm:^8.3.5"
-    "@storybook/addon-docs": "npm:^8.3.5"
-    "@storybook/addon-essentials": "npm:^8.3.5"
+    "@storybook/addon-actions": "npm:^8.4.4"
+    "@storybook/addon-docs": "npm:^8.4.4"
+    "@storybook/addon-essentials": "npm:^8.4.4"
     "@storybook/addon-webpack5-compiler-babel": "npm:^3.0.3"
-    "@storybook/react": "npm:^8.3.5"
-    "@storybook/react-webpack5": "npm:^8.3.5"
-    "@storybook/theming": "npm:^8.3.5"
-    "@tanstack/react-query": "npm:^4.16.1"
+    "@storybook/react": "npm:^8.4.4"
+    "@storybook/react-webpack5": "npm:^8.4.4"
+    "@storybook/theming": "npm:^8.4.4"
+    "@tanstack/react-query": "npm:^4.36.1"
     "@testing-library/react": "npm:~16.0.1"
     "@types/react": "npm:~17.0.80"
-    babel-loader: "npm:~8.3.0"
+    babel-loader: "npm:~9.2.1"
     eslint: "npm:~8.45.0"
     react: "npm:~17.0.2"
     react-hook-form: "npm:~7.45.4"
     react-i18next: "npm:~13.2.2"
-    storybook: "npm:^8.3.5"
+    storybook: "npm:^8.4.4"
     storybook-dark-mode: "npm:^4.0.2"
     typescript: "npm:~5.6.3"
   peerDependencies:
     "@rocket.chat/layout": "*"
     "@rocket.chat/tools": 0.2.2
-    "@rocket.chat/ui-contexts": 12.0.0-rc.6
+    "@rocket.chat/ui-contexts": 13.0.0-rc.2
     "@tanstack/react-query": "*"
     react: "*"
     react-hook-form: "*"
@@ -10235,10 +10465,143 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@samchon/openapi@npm:^0.4.6":
-  version: 0.4.9
-  resolution: "@samchon/openapi@npm:0.4.9"
-  checksum: 10/0cbcf04697086c2b380a3723a86c9628c9f651a30b631058e59fbb48cf2e1116dd5b58b980f0902bf3bce518ec85bea149e20d922071421d258ff7564cf93fde
+"@rollup/rollup-android-arm-eabi@npm:4.24.4":
+  version: 4.24.4
+  resolution: "@rollup/rollup-android-arm-eabi@npm:4.24.4"
+  conditions: os=android & cpu=arm
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-android-arm64@npm:4.24.4":
+  version: 4.24.4
+  resolution: "@rollup/rollup-android-arm64@npm:4.24.4"
+  conditions: os=android & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-darwin-arm64@npm:4.24.4":
+  version: 4.24.4
+  resolution: "@rollup/rollup-darwin-arm64@npm:4.24.4"
+  conditions: os=darwin & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-darwin-x64@npm:4.24.4":
+  version: 4.24.4
+  resolution: "@rollup/rollup-darwin-x64@npm:4.24.4"
+  conditions: os=darwin & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-freebsd-arm64@npm:4.24.4":
+  version: 4.24.4
+  resolution: "@rollup/rollup-freebsd-arm64@npm:4.24.4"
+  conditions: os=freebsd & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-freebsd-x64@npm:4.24.4":
+  version: 4.24.4
+  resolution: "@rollup/rollup-freebsd-x64@npm:4.24.4"
+  conditions: os=freebsd & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-arm-gnueabihf@npm:4.24.4":
+  version: 4.24.4
+  resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.24.4"
+  conditions: os=linux & cpu=arm & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-arm-musleabihf@npm:4.24.4":
+  version: 4.24.4
+  resolution: "@rollup/rollup-linux-arm-musleabihf@npm:4.24.4"
+  conditions: os=linux & cpu=arm & libc=musl
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-arm64-gnu@npm:4.24.4":
+  version: 4.24.4
+  resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.24.4"
+  conditions: os=linux & cpu=arm64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-arm64-musl@npm:4.24.4":
+  version: 4.24.4
+  resolution: "@rollup/rollup-linux-arm64-musl@npm:4.24.4"
+  conditions: os=linux & cpu=arm64 & libc=musl
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-powerpc64le-gnu@npm:4.24.4":
+  version: 4.24.4
+  resolution: "@rollup/rollup-linux-powerpc64le-gnu@npm:4.24.4"
+  conditions: os=linux & cpu=ppc64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-riscv64-gnu@npm:4.24.4":
+  version: 4.24.4
+  resolution: "@rollup/rollup-linux-riscv64-gnu@npm:4.24.4"
+  conditions: os=linux & cpu=riscv64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-s390x-gnu@npm:4.24.4":
+  version: 4.24.4
+  resolution: "@rollup/rollup-linux-s390x-gnu@npm:4.24.4"
+  conditions: os=linux & cpu=s390x & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-x64-gnu@npm:4.24.4":
+  version: 4.24.4
+  resolution: "@rollup/rollup-linux-x64-gnu@npm:4.24.4"
+  conditions: os=linux & cpu=x64 & libc=glibc
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-linux-x64-musl@npm:4.24.4":
+  version: 4.24.4
+  resolution: "@rollup/rollup-linux-x64-musl@npm:4.24.4"
+  conditions: os=linux & cpu=x64 & libc=musl
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-win32-arm64-msvc@npm:4.24.4":
+  version: 4.24.4
+  resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.24.4"
+  conditions: os=win32 & cpu=arm64
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-win32-ia32-msvc@npm:4.24.4":
+  version: 4.24.4
+  resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.24.4"
+  conditions: os=win32 & cpu=ia32
+  languageName: node
+  linkType: hard
+
+"@rollup/rollup-win32-x64-msvc@npm:4.24.4":
+  version: 4.24.4
+  resolution: "@rollup/rollup-win32-x64-msvc@npm:4.24.4"
+  conditions: os=win32 & cpu=x64
+  languageName: node
+  linkType: hard
+
+"@rtsao/scc@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "@rtsao/scc@npm:1.1.0"
+  checksum: 10/17d04adf404e04c1e61391ed97bca5117d4c2767a76ae3e879390d6dec7b317fcae68afbf9e98badee075d0b64fa60f287729c4942021b4d19cd01db77385c01
+  languageName: node
+  linkType: hard
+
+"@samchon/openapi@npm:^1.1.2":
+  version: 1.2.2
+  resolution: "@samchon/openapi@npm:1.2.2"
+  checksum: 10/f6f40a5d6f554080dc8e9967ffd34f781d5e39c91f502d605a63c7c00bc54a551dba583fe74a257351df2a7ff339f439a75e4192077ac2a6c1cf7f6d4618bb61
   languageName: node
   linkType: hard
 
@@ -10320,48 +10683,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@slack/bolt@npm:^3.14.0":
-  version: 3.14.0
-  resolution: "@slack/bolt@npm:3.14.0"
+"@slack/bolt@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "@slack/bolt@npm:4.1.0"
   dependencies:
     "@slack/logger": "npm:^4.0.0"
-    "@slack/oauth": "npm:^2.6.1"
-    "@slack/socket-mode": "npm:^1.3.2"
-    "@slack/types": "npm:^2.8.0"
-    "@slack/web-api": "npm:^6.7.1"
-    "@types/express": "npm:^4.16.1"
-    "@types/promise.allsettled": "npm:^1.0.3"
-    "@types/tsscmp": "npm:^1.0.0"
-    axios: "npm:^0.27.2"
-    express: "npm:^4.16.4"
-    path-to-regexp: "npm:^6.2.1"
-    please-upgrade-node: "npm:^3.2.0"
-    promise.allsettled: "npm:^1.0.2"
-    raw-body: "npm:^2.3.3"
+    "@slack/oauth": "npm:^3"
+    "@slack/socket-mode": "npm:^2.0.2"
+    "@slack/types": "npm:^2.13.0"
+    "@slack/web-api": "npm:^7"
+    "@types/express": "npm:^4.17.21"
+    axios: "npm:^1.7.4"
+    express: "npm:^5.0.0"
+    path-to-regexp: "npm:^8.1.0"
+    raw-body: "npm:^3"
     tsscmp: "npm:^1.0.6"
-  checksum: 10/cfedd86b9be05303dee8828e4e03261c734cb9524bbaf0dfc956ec913787666fd046320c1213782ce9af94ea589988311d6276be3b9c43b7110d0af4a2a835e8
+  checksum: 10/725f7a3a6557bba835860a8f24e70b54f6e66015798917f64ed319cbe5992988a9fea1dff45684635a28cb7d8d447eb36c386a1f964db9e6684a7231c6822e5e
   languageName: node
   linkType: hard
 
-"@slack/logger@npm:>=1.0.0 <3.0.0":
-  version: 2.0.0
-  resolution: "@slack/logger@npm:2.0.0"
-  dependencies:
-    "@types/node": "npm:>=8.9.0"
-  checksum: 10/15badf5c1d8a828ba5019b4294178ce7ee666a9c081fa6dc44bdb971d63fc2d2c34020b146465b93fbaa6e6d312470b3341ab6b5b4b981ddd0a54d2c466b3d96
-  languageName: node
-  linkType: hard
-
-"@slack/logger@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@slack/logger@npm:3.0.0"
-  dependencies:
-    "@types/node": "npm:>=12.0.0"
-  checksum: 10/6512d0e9e4be47ea465705ab9b6e6901f36fa981da0d4a657fde649d452b567b351002049b5ee0a22569b5119bf6c2f61befd5b8022d878addb7a99c91b03389
-  languageName: node
-  linkType: hard
-
-"@slack/logger@npm:^4.0.0":
+"@slack/logger@npm:^4, @slack/logger@npm:^4.0.0":
   version: 4.0.0
   resolution: "@slack/logger@npm:4.0.0"
   dependencies:
@@ -10370,122 +10711,92 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@slack/oauth@npm:^2.6.1":
-  version: 2.6.1
-  resolution: "@slack/oauth@npm:2.6.1"
+"@slack/oauth@npm:^3":
+  version: 3.0.1
+  resolution: "@slack/oauth@npm:3.0.1"
   dependencies:
-    "@slack/logger": "npm:^3.0.0"
-    "@slack/web-api": "npm:^6.3.0"
-    "@types/jsonwebtoken": "npm:^8.3.7"
-    "@types/node": "npm:>=12"
-    jsonwebtoken: "npm:^9.0.0"
-    lodash.isstring: "npm:^4.0.1"
-  checksum: 10/187f03648e253f1678ae6cab47fe5f48cf267e13fcffea2e2788bdfb397f60c43b0337ce67450b1b4db86a79f47d7f2b86c19a9df1eadcf257098f27cca8ac7c
-  languageName: node
-  linkType: hard
-
-"@slack/rtm-api@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "@slack/rtm-api@npm:6.0.0"
-  dependencies:
-    "@slack/logger": "npm:>=1.0.0 <3.0.0"
-    "@slack/web-api": "npm:^5.3.0"
-    "@types/node": "npm:>=12.0.0"
-    "@types/p-queue": "npm:^2.3.2"
-    "@types/ws": "npm:^7.2.5"
-    eventemitter3: "npm:^3.1.0"
-    finity: "npm:^0.5.4"
-    p-cancelable: "npm:^1.1.0"
-    p-queue: "npm:^2.4.2"
-    ws: "npm:^5.2.0"
-  checksum: 10/e7ec61b559b63028665cd99cbc3aa6e296334b8e8f8f2faf92a9c0cef364732835847a909cc1c2305da889a47e4236f9a7e175a0809db142a370a13714af9264
+    "@slack/logger": "npm:^4"
+    "@slack/web-api": "npm:^7.3.4"
+    "@types/jsonwebtoken": "npm:^9"
+    "@types/node": "npm:>=18"
+    jsonwebtoken: "npm:^9"
+    lodash.isstring: "npm:^4"
+  checksum: 10/03317e8179b66adc1557180e5d6356f601fd6633b474a7edbbc0265d93dad78636ccc76c4d09cd400e7acd1e33536a0774297a9018e1e127304e65e24c446c05
   languageName: node
   linkType: hard
 
-"@slack/socket-mode@npm:^1.3.2":
-  version: 1.3.2
-  resolution: "@slack/socket-mode@npm:1.3.2"
-  dependencies:
-    "@slack/logger": "npm:^3.0.0"
-    "@slack/web-api": "npm:^6.2.3"
-    "@types/node": "npm:>=12.0.0"
-    "@types/p-queue": "npm:^2.3.2"
-    "@types/ws": "npm:^7.4.7"
-    eventemitter3: "npm:^3.1.0"
+"@slack/rtm-api@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "@slack/rtm-api@npm:7.0.1"
+  dependencies:
+    "@slack/logger": "npm:^4"
+    "@slack/web-api": "npm:^7.3.4"
+    "@types/node": "npm:>=18"
+    eventemitter3: "npm:^5"
     finity: "npm:^0.5.4"
-    p-cancelable: "npm:^1.1.0"
-    p-queue: "npm:^2.4.2"
-    ws: "npm:^7.5.3"
-  checksum: 10/9bf7e2562ba6dbb52ee85073e64359d06d0ae0817094e530090ce222454f1d18d56e5f778659c8e947b6b70a16ab743913c84f43f769cfdb03227bff81b5bf3d
-  languageName: node
-  linkType: hard
-
-"@slack/types@npm:^1.7.0":
-  version: 1.10.0
-  resolution: "@slack/types@npm:1.10.0"
-  checksum: 10/f03fec434d042c2f9a495168ddbec8f89347cc93e62e379cfaff41b18d0a1757a4833dd87d201f9e9bae57b7b25d61f508ab23ae89bf33a3595de70701e9a029
+    p-cancelable: "npm:^2"
+    p-queue: "npm:^6"
+    ws: "npm:^8"
+  checksum: 10/2b34ef1560ac74ad8cc1545bef1b81ef2cf1fa07cb20e60e0fa9f9e10fbc84547c0d7d9a8abef5771da2c1b5ff03cbf3e9968e36649f46c18aec56f137adc98d
   languageName: node
   linkType: hard
 
-"@slack/types@npm:^2.8.0":
-  version: 2.9.0
-  resolution: "@slack/types@npm:2.9.0"
-  checksum: 10/56a38a08acf62da21847d24cb2d54fd77abdc229532e6b1900a08de81ef74c0eaca5729ce34b3db11bcb3a6fb05a16e5ef4c12b3e581a6c6a5d9ff472463e07c
+"@slack/socket-mode@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "@slack/socket-mode@npm:2.0.2"
+  dependencies:
+    "@slack/logger": "npm:^4"
+    "@slack/web-api": "npm:^7.3.4"
+    "@types/node": "npm:>=18"
+    "@types/ws": "npm:^8"
+    eventemitter3: "npm:^5"
+    ws: "npm:^8"
+  checksum: 10/3403d8d7e91b9ed27216588cb7bd45415d54051a23f88d510196febad8fd592a41b6c5bddf9075fd26a0a513300569ebb077c2cda487eb350b38af6da55d395c
   languageName: node
   linkType: hard
 
-"@slack/web-api@npm:^5.3.0":
-  version: 5.15.0
-  resolution: "@slack/web-api@npm:5.15.0"
-  dependencies:
-    "@slack/logger": "npm:>=1.0.0 <3.0.0"
-    "@slack/types": "npm:^1.7.0"
-    "@types/is-stream": "npm:^1.1.0"
-    "@types/node": "npm:>=8.9.0"
-    axios: "npm:^0.21.1"
-    eventemitter3: "npm:^3.1.0"
-    form-data: "npm:^2.5.0"
-    is-stream: "npm:^1.1.0"
-    p-queue: "npm:^6.6.1"
-    p-retry: "npm:^4.0.0"
-  checksum: 10/fcd5a089b1d0c001bea9af811a6e2aaf16100a2ef6b918bdbe554e3c725a866dc4296f89eceadda97760306a0ba0bc9bd4f1dba94933233c63747f6657a9ac8d
+"@slack/types@npm:^2.13.0, @slack/types@npm:^2.9.0":
+  version: 2.14.0
+  resolution: "@slack/types@npm:2.14.0"
+  checksum: 10/fa24a113b88e087f899078504c2ba50ab9795f7c2dd1a2d95b28217a3af20e554494f9cc3b8c8ce173120990d98e19400c95369f9067cecfcc46c08b59d2a46f
   languageName: node
   linkType: hard
 
-"@slack/web-api@npm:^6.2.3, @slack/web-api@npm:^6.3.0, @slack/web-api@npm:^6.7.1":
-  version: 6.9.0
-  resolution: "@slack/web-api@npm:6.9.0"
+"@slack/web-api@npm:^7, @slack/web-api@npm:^7.3.4":
+  version: 7.7.0
+  resolution: "@slack/web-api@npm:7.7.0"
   dependencies:
-    "@slack/logger": "npm:^3.0.0"
-    "@slack/types": "npm:^2.8.0"
-    "@types/is-stream": "npm:^1.1.0"
-    "@types/node": "npm:>=12.0.0"
-    axios: "npm:^0.27.2"
-    eventemitter3: "npm:^3.1.0"
-    form-data: "npm:^2.5.0"
+    "@slack/logger": "npm:^4.0.0"
+    "@slack/types": "npm:^2.9.0"
+    "@types/node": "npm:>=18.0.0"
+    "@types/retry": "npm:0.12.0"
+    axios: "npm:^1.7.4"
+    eventemitter3: "npm:^5.0.1"
+    form-data: "npm:^4.0.0"
     is-electron: "npm:2.2.2"
-    is-stream: "npm:^1.1.0"
-    p-queue: "npm:^6.6.1"
-    p-retry: "npm:^4.0.0"
-  checksum: 10/19961f752470f119aba8d2967661747b15f426a4825c26679d8a792d9e5388eb34b33c620caad83f34ddc2c15589b3d87c47e13cda909ef0e312cbc85a856252
+    is-stream: "npm:^2"
+    p-queue: "npm:^6"
+    p-retry: "npm:^4"
+    retry: "npm:^0.13.1"
+  checksum: 10/465031984036532eb7291df9b686ea143795ecfc3b235e2b759ea8790965abbee9da349c6184a49ec0425d76251d9e35237ee0b1c8cf20dcac1df82db8f95b93
   languageName: node
   linkType: hard
 
-"@storybook/addon-a11y@npm:^8.3.5":
-  version: 8.3.5
-  resolution: "@storybook/addon-a11y@npm:8.3.5"
+"@storybook/addon-a11y@npm:^8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/addon-a11y@npm:8.4.4"
   dependencies:
-    "@storybook/addon-highlight": "npm:8.3.5"
+    "@storybook/addon-highlight": "npm:8.4.4"
     axe-core: "npm:^4.2.0"
   peerDependencies:
-    storybook: ^8.3.5
-  checksum: 10/331fd13048a4781039f4a25de3a38967499495a4144bd72c2cf9058a37fbfc476d6f351d123066025778cd490ef3136ced8646553ccc0a717e7b3ad3b2010e7e
+    storybook: ^8.4.4
+  checksum: 10/1621f3f94adac5cd860c8e80d9efa005300ce1ef52afd6f5d61e44fcd7f8967d94499cb640b86c1f731a67d9a4d1e1db77d403d431a67c4689571f826bbaf151
   languageName: node
   linkType: hard
 
-"@storybook/addon-actions@npm:8.3.5, @storybook/addon-actions@npm:^8.3.5":
-  version: 8.3.5
-  resolution: "@storybook/addon-actions@npm:8.3.5"
+"@storybook/addon-actions@npm:8.4.4, @storybook/addon-actions@npm:^8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/addon-actions@npm:8.4.4"
   dependencies:
     "@storybook/global": "npm:^5.0.0"
     "@types/uuid": "npm:^9.0.1"
@@ -10493,175 +10804,169 @@ __metadata:
     polished: "npm:^4.2.2"
     uuid: "npm:^9.0.0"
   peerDependencies:
-    storybook: ^8.3.5
-  checksum: 10/01a4a3a634f5e47a2bf8ed8d695b4b35053157bdd8531db1903970c7cb395266a63b02b39bc1824f89f3163d9ede9f567763722fa135326efff2e075b461834f
+    storybook: ^8.4.4
+  checksum: 10/e8af0e8af39fecff49948b7baf2957e54b53b505f1ae4dec29e9284db75405868f7fed9c692b045bbc6a606cb8c03c26563a717c6521d52ca04eebef4e6a4897
   languageName: node
   linkType: hard
 
-"@storybook/addon-backgrounds@npm:8.3.5":
-  version: 8.3.5
-  resolution: "@storybook/addon-backgrounds@npm:8.3.5"
+"@storybook/addon-backgrounds@npm:8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/addon-backgrounds@npm:8.4.4"
   dependencies:
     "@storybook/global": "npm:^5.0.0"
     memoizerific: "npm:^1.11.3"
     ts-dedent: "npm:^2.0.0"
   peerDependencies:
-    storybook: ^8.3.5
-  checksum: 10/da917719b3aaa79e6ba3dde7b68c3c9b8867dfba43a4e89ccd48817303701de60ac4b9cc3835e2a30b03db0903bd4cf09e7dc4640d388a3bc04e2d2fc3ffd9b3
+    storybook: ^8.4.4
+  checksum: 10/1b45008c1b7da28e331f90f825fbff497af793665e79bdb4b36767bf1943e5df55f8d1d4fa27a4c4329991aaecbb911a447c119dc2fd094962a22276889e944f
   languageName: node
   linkType: hard
 
-"@storybook/addon-controls@npm:8.3.5":
-  version: 8.3.5
-  resolution: "@storybook/addon-controls@npm:8.3.5"
+"@storybook/addon-controls@npm:8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/addon-controls@npm:8.4.4"
   dependencies:
     "@storybook/global": "npm:^5.0.0"
     dequal: "npm:^2.0.2"
-    lodash: "npm:^4.17.21"
     ts-dedent: "npm:^2.0.0"
   peerDependencies:
-    storybook: ^8.3.5
-  checksum: 10/21bfe45bfd73b91396c523398958253a9e98e6b667b703273763fa95e8fb90c985237126e35a838f087f59289b96175ba02c75ab0f1626da65d94c4b7973f027
+    storybook: ^8.4.4
+  checksum: 10/4008300f0cb02c140685a435e4c7a8af6a981c3f21b101add66a503b848f9785ddfcc623389718f3aa14a95308b9715eac16787feb9377da2aad88711e0f365b
   languageName: node
   linkType: hard
 
-"@storybook/addon-docs@npm:8.3.5, @storybook/addon-docs@npm:^8.3.5":
-  version: 8.3.5
-  resolution: "@storybook/addon-docs@npm:8.3.5"
+"@storybook/addon-docs@npm:8.4.4, @storybook/addon-docs@npm:^8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/addon-docs@npm:8.4.4"
   dependencies:
     "@mdx-js/react": "npm:^3.0.0"
-    "@storybook/blocks": "npm:8.3.5"
-    "@storybook/csf-plugin": "npm:8.3.5"
-    "@storybook/global": "npm:^5.0.0"
-    "@storybook/react-dom-shim": "npm:8.3.5"
-    "@types/react": "npm:^16.8.0 || ^17.0.0 || ^18.0.0"
-    fs-extra: "npm:^11.1.0"
+    "@storybook/blocks": "npm:8.4.4"
+    "@storybook/csf-plugin": "npm:8.4.4"
+    "@storybook/react-dom-shim": "npm:8.4.4"
     react: "npm:^16.8.0 || ^17.0.0 || ^18.0.0"
     react-dom: "npm:^16.8.0 || ^17.0.0 || ^18.0.0"
-    rehype-external-links: "npm:^3.0.0"
-    rehype-slug: "npm:^6.0.0"
     ts-dedent: "npm:^2.0.0"
   peerDependencies:
-    storybook: ^8.3.5
-  checksum: 10/a60cd3af679c8754252da2d5ee8a7a1ce6f7efdbe16f08394caf434931fae4a08f802c9226d6af9eff395cb2aab46fb29da755d2789ef4361d66f5dd6c6e5e0c
+    storybook: ^8.4.4
+  checksum: 10/991c766ea4366bae9fb0b65d7e86a8325231e3e1f5ee6924d2bb9cdbba9a66d3b20780787987d6dd9c4f9977708f0321791820004b33fd5f5255294ce9786f8c
   languageName: node
   linkType: hard
 
-"@storybook/addon-essentials@npm:^8.3.5":
-  version: 8.3.5
-  resolution: "@storybook/addon-essentials@npm:8.3.5"
-  dependencies:
-    "@storybook/addon-actions": "npm:8.3.5"
-    "@storybook/addon-backgrounds": "npm:8.3.5"
-    "@storybook/addon-controls": "npm:8.3.5"
-    "@storybook/addon-docs": "npm:8.3.5"
-    "@storybook/addon-highlight": "npm:8.3.5"
-    "@storybook/addon-measure": "npm:8.3.5"
-    "@storybook/addon-outline": "npm:8.3.5"
-    "@storybook/addon-toolbars": "npm:8.3.5"
-    "@storybook/addon-viewport": "npm:8.3.5"
+"@storybook/addon-essentials@npm:^8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/addon-essentials@npm:8.4.4"
+  dependencies:
+    "@storybook/addon-actions": "npm:8.4.4"
+    "@storybook/addon-backgrounds": "npm:8.4.4"
+    "@storybook/addon-controls": "npm:8.4.4"
+    "@storybook/addon-docs": "npm:8.4.4"
+    "@storybook/addon-highlight": "npm:8.4.4"
+    "@storybook/addon-measure": "npm:8.4.4"
+    "@storybook/addon-outline": "npm:8.4.4"
+    "@storybook/addon-toolbars": "npm:8.4.4"
+    "@storybook/addon-viewport": "npm:8.4.4"
     ts-dedent: "npm:^2.0.0"
   peerDependencies:
-    storybook: ^8.3.5
-  checksum: 10/59de2351eab3d49c83f130f6c6ae999600b506056b6503c41c462efadebd9a7dcdec846762faaa9bcf63557bd2c24b8b33fdd2d214b9b24f2265a4c2cc088236
+    storybook: ^8.4.4
+  checksum: 10/c8dfe7be1eac6280e4ae801a33a02f99f47e0430920d22505b80fe8684eaabaa9c977a34f90c3265185f11ded930c5b29cdc11fbaa715eec57cab95ad4343750
   languageName: node
   linkType: hard
 
-"@storybook/addon-highlight@npm:8.3.5":
-  version: 8.3.5
-  resolution: "@storybook/addon-highlight@npm:8.3.5"
+"@storybook/addon-highlight@npm:8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/addon-highlight@npm:8.4.4"
   dependencies:
     "@storybook/global": "npm:^5.0.0"
   peerDependencies:
-    storybook: ^8.3.5
-  checksum: 10/243b6cd5183c47b7401655b556bf74bf71441c7dfd89798879df0d8a05c26681f4457d92157bb480b9d3368933226c967dab3da26aae807e62bdfa4930a00490
+    storybook: ^8.4.4
+  checksum: 10/9944ce08c8f36dc4bbdf24536b5ffde328b4032e7165e15f7bd7af5ab5adb0b9a5be49f43ab96068ea00d8acd1450f10436daa70b32ae3492364fe86a31dffb7
   languageName: node
   linkType: hard
 
-"@storybook/addon-interactions@npm:^8.3.5":
-  version: 8.3.5
-  resolution: "@storybook/addon-interactions@npm:8.3.5"
+"@storybook/addon-interactions@npm:^8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/addon-interactions@npm:8.4.4"
   dependencies:
     "@storybook/global": "npm:^5.0.0"
-    "@storybook/instrumenter": "npm:8.3.5"
-    "@storybook/test": "npm:8.3.5"
+    "@storybook/instrumenter": "npm:8.4.4"
+    "@storybook/test": "npm:8.4.4"
     polished: "npm:^4.2.2"
     ts-dedent: "npm:^2.2.0"
   peerDependencies:
-    storybook: ^8.3.5
-  checksum: 10/9ed92e3b8068e22106da52ad7cc9970acb86493acf5fc44e1bb8bb5c37ed74f9f090e2a13825a708f90c5a23f508420226d266d35eb1659fa24af472b5d2256f
+    storybook: ^8.4.4
+  checksum: 10/db6788898564ed4ca20a7651e951c670c01301aaadcad3c6fbc6e04e6b4f65c43e4f40e0dd128ca82a60c9ade583dc7ff72f85fc757dbb524f39df4a94f92425
   languageName: node
   linkType: hard
 
-"@storybook/addon-links@npm:^8.3.5":
-  version: 8.3.5
-  resolution: "@storybook/addon-links@npm:8.3.5"
+"@storybook/addon-links@npm:^8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/addon-links@npm:8.4.4"
   dependencies:
     "@storybook/csf": "npm:^0.1.11"
     "@storybook/global": "npm:^5.0.0"
     ts-dedent: "npm:^2.0.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
-    storybook: ^8.3.5
+    storybook: ^8.4.4
   peerDependenciesMeta:
     react:
       optional: true
-  checksum: 10/24ca01676b7983b8db0555b14cdcc9b9e3a1a5409f5d7ced5aa03880b2d0219fed3bd1b9db90a2e2449707d2d7361aa06882a938e483be075bfdc77956fee6da
+  checksum: 10/cae8eaf94047a6521c488053279f906b140d0a017fa732527ba63fa0d692a379c8c0bc88248a02025c08563c652e86048ae2749adf619ff54dbfb17f4a60b609
   languageName: node
   linkType: hard
 
-"@storybook/addon-measure@npm:8.3.5":
-  version: 8.3.5
-  resolution: "@storybook/addon-measure@npm:8.3.5"
+"@storybook/addon-measure@npm:8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/addon-measure@npm:8.4.4"
   dependencies:
     "@storybook/global": "npm:^5.0.0"
     tiny-invariant: "npm:^1.3.1"
   peerDependencies:
-    storybook: ^8.3.5
-  checksum: 10/e272c0253d58a55b4e52ae7b03b8a487a765ad9cec083bb4337236f61572c1c91fc328b425eadd86b1d08c554faa9ce0b38c546b3f9baba4dc9928f94308778a
+    storybook: ^8.4.4
+  checksum: 10/cebd85f454026cdf46eac29a80725bb7a353b9e08c7553e2b948488413092b8d85ab1667ed1381dfcede92fd289707b1092d217df7ecc7cd5ea6d8da356b9e48
   languageName: node
   linkType: hard
 
-"@storybook/addon-outline@npm:8.3.5":
-  version: 8.3.5
-  resolution: "@storybook/addon-outline@npm:8.3.5"
+"@storybook/addon-outline@npm:8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/addon-outline@npm:8.4.4"
   dependencies:
     "@storybook/global": "npm:^5.0.0"
     ts-dedent: "npm:^2.0.0"
   peerDependencies:
-    storybook: ^8.3.5
-  checksum: 10/09ad99593a0f839f92cf13ebca2d60be5c43dc696f56013639a731a8522a0acf9ec17a91611f0999415017b1c42e1c8b1b9d02ba3f6c1c00da403aa61e9f276e
+    storybook: ^8.4.4
+  checksum: 10/1405f812b780b2179f611be6404eeb6ce3bc7760372753c6bc176c298e396b1d90b997e1f31a9e8f828fd4f897489ce17158498c82e4a2c139c1576e250d8102
   languageName: node
   linkType: hard
 
-"@storybook/addon-styling-webpack@npm:^1.0.0, @storybook/addon-styling-webpack@npm:~1.0.0":
-  version: 1.0.0
-  resolution: "@storybook/addon-styling-webpack@npm:1.0.0"
+"@storybook/addon-styling-webpack@npm:^1.0.1, @storybook/addon-styling-webpack@npm:~1.0.1":
+  version: 1.0.1
+  resolution: "@storybook/addon-styling-webpack@npm:1.0.1"
   dependencies:
     "@storybook/node-logger": "npm:^8.0.0-alpha.10"
   peerDependencies:
     webpack: ^5.0.0
-  checksum: 10/af8f4a48737034a9ad2013cf117a8631c43a9ce0554ed46f52f252150bee519c416964ae16a4418db3dd730a7af89b7c18690d8f0b95d4db05f7f1b65656d10d
+  checksum: 10/449682f8897cc7c7a8b0098d8c6399455f2c87c625cc2e2bd5a6cf3b747a0c16c4e09d90d0cab6acf8a5a022e7e223b915c02aad988a990ae0357144bf09a50b
   languageName: node
   linkType: hard
 
-"@storybook/addon-toolbars@npm:8.3.5":
-  version: 8.3.5
-  resolution: "@storybook/addon-toolbars@npm:8.3.5"
+"@storybook/addon-toolbars@npm:8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/addon-toolbars@npm:8.4.4"
   peerDependencies:
-    storybook: ^8.3.5
-  checksum: 10/a426bc7d566c31c85273b872f42c2a6508ba7046ed4a4e6b62066c46a046a1717f33174857c83ca7c703577838e15ced746cf88aa9c4205b9b7ea96fde3ae3b3
+    storybook: ^8.4.4
+  checksum: 10/efd3cbf3e63f103aacd2471a319ea46ca666f1b6be65c9fe7518322eaf149ea18aefc1146ec2abca2231edb7c2b55f430306d77e041ff10493e79b6b353b9b04
   languageName: node
   linkType: hard
 
-"@storybook/addon-viewport@npm:8.3.5":
-  version: 8.3.5
-  resolution: "@storybook/addon-viewport@npm:8.3.5"
+"@storybook/addon-viewport@npm:8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/addon-viewport@npm:8.4.4"
   dependencies:
     memoizerific: "npm:^1.11.3"
   peerDependencies:
-    storybook: ^8.3.5
-  checksum: 10/faa03683e9e40f9ebc677ee25a5bccca262beb45ee2bed755206a581608cb257447c3767b3e2a11073679e7108f36d066f9883d3006d8d831c060cfb18e22498
+    storybook: ^8.4.4
+  checksum: 10/94c193f3cc4d759a696ba8f15d0211ea74af8640f79428040eb6914e153308ac54ba0b82e6dff0769ae05c02d229a74809c5999a7631aef5987e00361af4dab2
   languageName: node
   linkType: hard
 
@@ -10675,42 +10980,31 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/blocks@npm:8.3.5, @storybook/blocks@npm:^8.3.5":
-  version: 8.3.5
-  resolution: "@storybook/blocks@npm:8.3.5"
+"@storybook/blocks@npm:8.4.4, @storybook/blocks@npm:^8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/blocks@npm:8.4.4"
   dependencies:
     "@storybook/csf": "npm:^0.1.11"
-    "@storybook/global": "npm:^5.0.0"
-    "@storybook/icons": "npm:^1.2.10"
-    "@types/lodash": "npm:^4.14.167"
-    color-convert: "npm:^2.0.1"
-    dequal: "npm:^2.0.2"
-    lodash: "npm:^4.17.21"
-    markdown-to-jsx: "npm:^7.4.5"
-    memoizerific: "npm:^1.11.3"
-    polished: "npm:^4.2.2"
-    react-colorful: "npm:^5.1.2"
-    telejson: "npm:^7.2.0"
+    "@storybook/icons": "npm:^1.2.12"
     ts-dedent: "npm:^2.0.0"
-    util-deprecate: "npm:^1.0.2"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
-    storybook: ^8.3.5
+    storybook: ^8.4.4
   peerDependenciesMeta:
     react:
       optional: true
     react-dom:
       optional: true
-  checksum: 10/06e423ef6d180e6decab4ed5140d1b415327201fc098a61cf330f9123af6582b847c9a077aed12d78eace06f0002150a586ba2ea16784a53938e7198f5506ce8
+  checksum: 10/1b4686d9f819b8718edadefa0a7fb911a5a7ac80c2d2abbb281c153a84546c2332eb9be062eb31e7a49fa5c9bbc76878dd4afd4629895674a821e37ec00cdb40
   languageName: node
   linkType: hard
 
-"@storybook/builder-webpack5@npm:8.3.5":
-  version: 8.3.5
-  resolution: "@storybook/builder-webpack5@npm:8.3.5"
+"@storybook/builder-webpack5@npm:8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/builder-webpack5@npm:8.4.4"
   dependencies:
-    "@storybook/core-webpack": "npm:8.3.5"
+    "@storybook/core-webpack": "npm:8.4.4"
     "@types/node": "npm:^22.0.0"
     "@types/semver": "npm:^7.3.4"
     browser-assert: "npm:^1.2.1"
@@ -10719,9 +11013,7 @@ __metadata:
     constants-browserify: "npm:^1.0.0"
     css-loader: "npm:^6.7.1"
     es-module-lexer: "npm:^1.5.0"
-    express: "npm:^4.19.2"
     fork-ts-checker-webpack-plugin: "npm:^8.0.0"
-    fs-extra: "npm:^11.1.0"
     html-webpack-plugin: "npm:^5.5.0"
     magic-string: "npm:^0.30.5"
     path-browserify: "npm:^1.0.1"
@@ -10738,15 +11030,24 @@ __metadata:
     webpack-hot-middleware: "npm:^2.25.1"
     webpack-virtual-modules: "npm:^0.6.0"
   peerDependencies:
-    storybook: ^8.3.5
+    storybook: ^8.4.4
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10/91560da162624e4c076ae1143d836e83ca034aa145a420102b2fb4d855eabe923637e934bc081eed001d5d93289c4350bc790bed814e4f8191b42ac97e1e78f7
+  checksum: 10/9894450cf1985b32947a2b27a091d4d5ac23c03f179a4653b7e98fd136b80ff6f4fce663c471eeda7db118d4c8b4bd1256dad5aea2d684bef00b7319aa11fe0c
+  languageName: node
+  linkType: hard
+
+"@storybook/components@npm:8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/components@npm:8.4.4"
+  peerDependencies:
+    storybook: ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0
+  checksum: 10/ca60bd5911669112af8d59e1b424e564a681e37c3f6ac59bceea69a08adddb478b965a7207f266591ec0daca74c8f674fdf3e21fdba5c794b80f13331667913a
   languageName: node
   linkType: hard
 
-"@storybook/components@npm:^8.0.0, @storybook/components@npm:^8.3.5":
+"@storybook/components@npm:^8.0.0":
   version: 8.3.5
   resolution: "@storybook/components@npm:8.3.5"
   peerDependencies:
@@ -10764,56 +11065,50 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/core-webpack@npm:8.3.5":
-  version: 8.3.5
-  resolution: "@storybook/core-webpack@npm:8.3.5"
+"@storybook/core-webpack@npm:8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/core-webpack@npm:8.4.4"
   dependencies:
     "@types/node": "npm:^22.0.0"
     ts-dedent: "npm:^2.0.0"
   peerDependencies:
-    storybook: ^8.3.5
-  checksum: 10/577a450cead6129d828cd9c83646ab0b4e3d3409caa8413b016f2c3423ef9441279cc8b1187382ad243b104679e8b6fef14ec97129ba99927a48354d0fdcbc18
+    storybook: ^8.4.4
+  checksum: 10/e9f7677e45eaa7eee5d97b745fc9e64a83f13895e42fdc7eb71285a2e2295140b075e74b8b37d4eda2eb488327b4ec9b83201562b27204f93dc8d246929c04a5
   languageName: node
   linkType: hard
 
-"@storybook/core@npm:8.3.5":
-  version: 8.3.5
-  resolution: "@storybook/core@npm:8.3.5"
+"@storybook/core@npm:8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/core@npm:8.4.4"
   dependencies:
     "@storybook/csf": "npm:^0.1.11"
-    "@types/express": "npm:^4.17.21"
     better-opn: "npm:^3.0.2"
     browser-assert: "npm:^1.2.1"
-    esbuild: "npm:^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0"
+    esbuild: "npm:^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0"
     esbuild-register: "npm:^3.5.0"
-    express: "npm:^4.19.2"
     jsdoc-type-pratt-parser: "npm:^4.0.0"
     process: "npm:^0.11.10"
     recast: "npm:^0.23.5"
     semver: "npm:^7.6.2"
     util: "npm:^0.12.5"
     ws: "npm:^8.2.3"
-  checksum: 10/54daa08a779cd4ff314a9ef213c45f97ccb0805baec819a317ea166cd6a184776b42b5164da3f4c19c2bb2c8728cd58d0e86202048b50a63ec6d370271c622f0
+  peerDependencies:
+    prettier: ^2 || ^3
+  peerDependenciesMeta:
+    prettier:
+      optional: true
+  checksum: 10/94458d2768e0fe28e75359a13fa15c80080b62f102a1283a6b4eb8a793ecd8d32d3544fc5c3eddfedfb69830bb88f264f72d034daea2a85e1fd7a102f3d57327
   languageName: node
   linkType: hard
 
-"@storybook/csf-plugin@npm:8.3.5":
-  version: 8.3.5
-  resolution: "@storybook/csf-plugin@npm:8.3.5"
+"@storybook/csf-plugin@npm:8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/csf-plugin@npm:8.4.4"
   dependencies:
     unplugin: "npm:^1.3.1"
   peerDependencies:
-    storybook: ^8.3.5
-  checksum: 10/5cb5db819296cab32a5ce477448b0c398f4f0affb9b2f27dff9f23fdc0386fb2e114203a2b7e93290e040c89ea7962d9e6ef8d4634b2440eafa2e2dc39583725
-  languageName: node
-  linkType: hard
-
-"@storybook/csf@npm:^0.0.1":
-  version: 0.0.1
-  resolution: "@storybook/csf@npm:0.0.1"
-  dependencies:
-    lodash: "npm:^4.17.15"
-  checksum: 10/f6bb019bccd8abc14e45a85258158b7bd8cc525887ac8dc9151ed8c4908be3b5f5523da8a7a9b96ff11b13b6c1744e1a0e070560d63d836b950f595f9a5719d4
+    storybook: ^8.4.4
+  checksum: 10/109c54af8aabaa64c2eeb8b0b6f1379b3588b8c1c3d4da828e0a0c8f6479960d64adc4635e911484915ac651061aa15e218cde1dd7be27562ce8e6ba79be7cae
   languageName: node
   linkType: hard
 
@@ -10833,7 +11128,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/icons@npm:^1.2.10, @storybook/icons@npm:^1.2.5":
+"@storybook/icons@npm:^1.2.12, @storybook/icons@npm:^1.2.5":
   version: 1.2.12
   resolution: "@storybook/icons@npm:1.2.12"
   peerDependencies:
@@ -10843,20 +11138,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/instrumenter@npm:8.3.5":
-  version: 8.3.5
-  resolution: "@storybook/instrumenter@npm:8.3.5"
+"@storybook/instrumenter@npm:8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/instrumenter@npm:8.4.4"
   dependencies:
     "@storybook/global": "npm:^5.0.0"
-    "@vitest/utils": "npm:^2.0.5"
-    util: "npm:^0.12.4"
+    "@vitest/utils": "npm:^2.1.1"
   peerDependencies:
-    storybook: ^8.3.5
-  checksum: 10/79769e4bab3b39bb2997fa718a8ff5aad444a97cc37bcd21bb574b6feb85cca0dd2f1581ab2cf1f0ab624a4f96312bb64fbc4570ef5970fff1f272c2ec8a566d
+    storybook: ^8.4.4
+  checksum: 10/5e5ce491064fc713f7f15ae49f6c8dd12efd0f373111aef0c1e93e4f400bd535ae6375a72b7c8303349ca1eee825b510cc66beafd764eb38a4e17468a168eb38
   languageName: node
   linkType: hard
 
-"@storybook/manager-api@npm:^8.0.0, @storybook/manager-api@npm:^8.3.5":
+"@storybook/manager-api@npm:8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/manager-api@npm:8.4.4"
+  peerDependencies:
+    storybook: ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0
+  checksum: 10/9eac4488f55e1860940e0e850a48f4278a7b6e6325c7381007447626715a8f8e52d6f876f6caaa2597787fb19c40a33f96d34b56558190f7be4772cac7805ebc
+  languageName: node
+  linkType: hard
+
+"@storybook/manager-api@npm:^8.0.0":
   version: 8.3.5
   resolution: "@storybook/manager-api@npm:8.3.5"
   peerDependencies:
@@ -10874,62 +11177,61 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/preact-webpack5@npm:^8.3.5":
-  version: 8.3.5
-  resolution: "@storybook/preact-webpack5@npm:8.3.5"
+"@storybook/preact-webpack5@npm:^8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/preact-webpack5@npm:8.4.4"
   dependencies:
-    "@storybook/builder-webpack5": "npm:8.3.5"
-    "@storybook/preact": "npm:8.3.5"
-    "@storybook/preset-preact-webpack": "npm:8.3.5"
+    "@storybook/builder-webpack5": "npm:8.4.4"
+    "@storybook/preact": "npm:8.4.4"
+    "@storybook/preset-preact-webpack": "npm:8.4.4"
     "@types/node": "npm:^22.0.0"
   peerDependencies:
     preact: ">=10.0.0"
-    storybook: ^8.3.5
-  checksum: 10/9bccc696ad0e98f2cfe9c7a6a7c50db2f7d83014d34168cc1ea476c8236b48329ee3b861d91e652f081d8ad9d85e5cccbef51a221d450da0f22f20ba81610db4
+    storybook: ^8.4.4
+  checksum: 10/8daa546e2e6c24d53fa05d5e5919aaea0ba1cb61fce60a510577979133af45ab80c3c0558dcaa7c5b029bca5d55881ca45ad0e63ac6488d64bb5c4868c81a6a5
   languageName: node
   linkType: hard
 
-"@storybook/preact@npm:8.3.5, @storybook/preact@npm:^8.3.5":
-  version: 8.3.5
-  resolution: "@storybook/preact@npm:8.3.5"
+"@storybook/preact@npm:8.4.4, @storybook/preact@npm:^8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/preact@npm:8.4.4"
   dependencies:
-    "@storybook/components": "npm:^8.3.5"
+    "@storybook/components": "npm:8.4.4"
     "@storybook/global": "npm:^5.0.0"
-    "@storybook/manager-api": "npm:^8.3.5"
-    "@storybook/preview-api": "npm:^8.3.5"
-    "@storybook/theming": "npm:^8.3.5"
+    "@storybook/manager-api": "npm:8.4.4"
+    "@storybook/preview-api": "npm:8.4.4"
+    "@storybook/theming": "npm:8.4.4"
     ts-dedent: "npm:^2.0.0"
   peerDependencies:
     preact: ^8.0.0||^10.0.0
-    storybook: ^8.3.5
-  checksum: 10/6e5e8a812e7e15ff8c2d64c71add111ac430466ab5c7043370614b454a3196e687d5730f5c66d1e7efd299883de4784cb09d1179441b2eabbbab1d15f9efc7ec
+    storybook: ^8.4.4
+  checksum: 10/cfe53bcecca1f986588aa0e8367d9bae30e1034514e817894f327f018ddc31d25995430c43d878f1cafae4a7d40b845da965a717c6cd465e09ebe03773e8f04d
   languageName: node
   linkType: hard
 
-"@storybook/preset-preact-webpack@npm:8.3.5":
-  version: 8.3.5
-  resolution: "@storybook/preset-preact-webpack@npm:8.3.5"
+"@storybook/preset-preact-webpack@npm:8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/preset-preact-webpack@npm:8.4.4"
   dependencies:
-    "@storybook/core-webpack": "npm:8.3.5"
+    "@storybook/core-webpack": "npm:8.4.4"
     "@types/node": "npm:^22.0.0"
   peerDependencies:
     preact: ^8.0.0||^10.0.0
-    storybook: ^8.3.5
-  checksum: 10/1a0df34b73bb63cba7bbefa00876a03e3614d7bfdf3b23b785478474c57df44b199b8726a0ff3dc27aee048dc1aa57a158f14f66b4ce3f1fd04f9d023b9c00e8
+    storybook: ^8.4.4
+  checksum: 10/651c6174c05b98aedeb373d97d39fcddc474f511a1cb7e6b999114ce2d4821284a3377d879b7bb2533b589492cc1a146cc649e616fce8b298ee3a3ed69824f59
   languageName: node
   linkType: hard
 
-"@storybook/preset-react-webpack@npm:8.3.5":
-  version: 8.3.5
-  resolution: "@storybook/preset-react-webpack@npm:8.3.5"
+"@storybook/preset-react-webpack@npm:8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/preset-react-webpack@npm:8.4.4"
   dependencies:
-    "@storybook/core-webpack": "npm:8.3.5"
-    "@storybook/react": "npm:8.3.5"
+    "@storybook/core-webpack": "npm:8.4.4"
+    "@storybook/react": "npm:8.4.4"
     "@storybook/react-docgen-typescript-plugin": "npm:1.0.6--canary.9.0c3f3b7.0"
     "@types/node": "npm:^22.0.0"
     "@types/semver": "npm:^7.3.4"
     find-up: "npm:^5.0.0"
-    fs-extra: "npm:^11.1.0"
     magic-string: "npm:^0.30.5"
     react-docgen: "npm:^7.0.0"
     resolve: "npm:^1.22.8"
@@ -10939,20 +11241,20 @@ __metadata:
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
-    storybook: ^8.3.5
+    storybook: ^8.4.4
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10/bb387417a0a0bba3bf1f442b847c6288e00834b01084d20dc95161bfa6c594c74bf56a0b3c041b20031607e041536e8c4f638d68381781af1a294c6108fe745e
+  checksum: 10/acff2bec1907610cca8e17d4e782d1ebe1747861a77426ed2d20f403a6f022c006ac56d9eb085c1ae6110f7630ccc8a8a2c154d9a9f90fb54e082f45f0002d98
   languageName: node
   linkType: hard
 
-"@storybook/preview-api@npm:^8.3.5":
-  version: 8.3.5
-  resolution: "@storybook/preview-api@npm:8.3.5"
+"@storybook/preview-api@npm:8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/preview-api@npm:8.4.4"
   peerDependencies:
-    storybook: ^8.3.5
-  checksum: 10/9d605197376e218967332daaaf4958c908593663fa1e34fb65fd56d3783f74a32c82f345cbdcb6b7efa946dcb6b2d07de88f940761794326f24f8f1116e9c44f
+    storybook: ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0
+  checksum: 10/ad95ce132d598e8b13da70a319ffdfaf41e5f8629cfb4552a577f3624a92d4a168e1de5220fe7c735babbd5945dd2182448a910b246a458cddde2afe7378461e
   languageName: node
   linkType: hard
 
@@ -10974,96 +11276,90 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@storybook/react-dom-shim@npm:8.3.5":
-  version: 8.3.5
-  resolution: "@storybook/react-dom-shim@npm:8.3.5"
+"@storybook/react-dom-shim@npm:8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/react-dom-shim@npm:8.4.4"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
-    storybook: ^8.3.5
-  checksum: 10/8e1c73ae08d3263918fdea7f04644613e3ce6281275f5210dadb13db38f4fd7e7d574b2ed5d713dd2f3f4467f36ea8ec694edd77127521990368245080800b91
+    storybook: ^8.4.4
+  checksum: 10/151b4669746da46d7c24531d0f33dc1e99301d45c4653de4dcf02c557adc2d8eea305963a681ff0eb47c8e175065928509924c69f3007e5a5cafe3a048a9c344
   languageName: node
   linkType: hard
 
-"@storybook/react-webpack5@npm:^8.3.5":
-  version: 8.3.5
-  resolution: "@storybook/react-webpack5@npm:8.3.5"
+"@storybook/react-webpack5@npm:^8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/react-webpack5@npm:8.4.4"
   dependencies:
-    "@storybook/builder-webpack5": "npm:8.3.5"
-    "@storybook/preset-react-webpack": "npm:8.3.5"
-    "@storybook/react": "npm:8.3.5"
+    "@storybook/builder-webpack5": "npm:8.4.4"
+    "@storybook/preset-react-webpack": "npm:8.4.4"
+    "@storybook/react": "npm:8.4.4"
     "@types/node": "npm:^22.0.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
-    storybook: ^8.3.5
+    storybook: ^8.4.4
     typescript: ">= 4.2.x"
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 10/51a39dbf4b7f285ac3776ede8d03c210fba6c3d3a01cec8d2d08f0a05f04e99fd62a02c2fbf005cc416b13225bb9e45c1fec938c9df7e1e08de9ef015dffb291
+  checksum: 10/baa0c17c87d5c21c55cd485a7aea96c3314241c44064b1812be0b5d6bba7ae39521f3d030a0a0f1a155f4de4b5f444a3d61d47dcffa801e19410bac00cd9dfb3
   languageName: node
   linkType: hard
 
-"@storybook/react@npm:8.3.5, @storybook/react@npm:^8.3.5":
-  version: 8.3.5
-  resolution: "@storybook/react@npm:8.3.5"
+"@storybook/react@npm:8.4.4, @storybook/react@npm:^8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/react@npm:8.4.4"
   dependencies:
-    "@storybook/components": "npm:^8.3.5"
+    "@storybook/components": "npm:8.4.4"
     "@storybook/global": "npm:^5.0.0"
-    "@storybook/manager-api": "npm:^8.3.5"
-    "@storybook/preview-api": "npm:^8.3.5"
-    "@storybook/react-dom-shim": "npm:8.3.5"
-    "@storybook/theming": "npm:^8.3.5"
-    "@types/escodegen": "npm:^0.0.6"
-    "@types/estree": "npm:^0.0.51"
-    "@types/node": "npm:^22.0.0"
-    acorn: "npm:^7.4.1"
-    acorn-jsx: "npm:^5.3.1"
-    acorn-walk: "npm:^7.2.0"
-    escodegen: "npm:^2.1.0"
-    html-tags: "npm:^3.1.0"
-    prop-types: "npm:^15.7.2"
-    react-element-to-jsx-string: "npm:^15.0.0"
-    semver: "npm:^7.3.7"
-    ts-dedent: "npm:^2.0.0"
-    type-fest: "npm:~2.19"
-    util-deprecate: "npm:^1.0.2"
+    "@storybook/manager-api": "npm:8.4.4"
+    "@storybook/preview-api": "npm:8.4.4"
+    "@storybook/react-dom-shim": "npm:8.4.4"
+    "@storybook/theming": "npm:8.4.4"
   peerDependencies:
-    "@storybook/test": 8.3.5
+    "@storybook/test": 8.4.4
     react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0-beta
-    storybook: ^8.3.5
+    storybook: ^8.4.4
     typescript: ">= 4.2.x"
   peerDependenciesMeta:
     "@storybook/test":
       optional: true
     typescript:
       optional: true
-  checksum: 10/cd6b081399374d7c2f23c8bc466490105e9bb1beec64cfc9f94263b2c511ddcdfe6941963f456451afba1dbc04e4e491608707400bd89854291db1fc3f96ec56
+  checksum: 10/06be762e00ebf06398ed233dc6347ab058f4a26c99f373a3d5f8f089fa2b68b4d328e5304e30d3e2aee049d0d947c1627637f0ceb38edc715d4a58bb9256b758
   languageName: node
   linkType: hard
 
-"@storybook/test@npm:8.3.5":
-  version: 8.3.5
-  resolution: "@storybook/test@npm:8.3.5"
+"@storybook/test@npm:8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/test@npm:8.4.4"
   dependencies:
     "@storybook/csf": "npm:^0.1.11"
     "@storybook/global": "npm:^5.0.0"
-    "@storybook/instrumenter": "npm:8.3.5"
+    "@storybook/instrumenter": "npm:8.4.4"
     "@testing-library/dom": "npm:10.4.0"
     "@testing-library/jest-dom": "npm:6.5.0"
     "@testing-library/user-event": "npm:14.5.2"
     "@vitest/expect": "npm:2.0.5"
     "@vitest/spy": "npm:2.0.5"
-    util: "npm:^0.12.4"
   peerDependencies:
-    storybook: ^8.3.5
-  checksum: 10/7a1d948e83eb4f12a04117b17e5026ce0d776c04e25f1960ac3285561dfecd8f5e9a3e678520437473cd258467f67cf6a547dd1d9efcf1a409e3031350f7c2c5
+    storybook: ^8.4.4
+  checksum: 10/6d74b7a58f62dbdbcfc21ce3c9f57591c0d4ec0d16249c36372881e320848d28b0a33a1d92828dcd8cd451dfe40a99ef3f3282da0508ef8fe5703da4209d5a13
   languageName: node
   linkType: hard
 
-"@storybook/theming@npm:^8.0.0, @storybook/theming@npm:^8.3.5":
+"@storybook/theming@npm:8.4.4, @storybook/theming@npm:^8.4.4":
+  version: 8.4.4
+  resolution: "@storybook/theming@npm:8.4.4"
+  peerDependencies:
+    storybook: ^8.2.0 || ^8.3.0-0 || ^8.4.0-0 || ^8.5.0-0 || ^8.6.0-0
+  checksum: 10/8a39c0c0c519a98491de3c8f29d3c9ab2d2bb5ee616933dd07aaed276cd46635e1b3019902b40dc073e7ee0679b5760234c920e455817a13e8d1d753811553ee
+  languageName: node
+  linkType: hard
+
+"@storybook/theming@npm:^8.0.0":
   version: 8.3.5
   resolution: "@storybook/theming@npm:8.3.5"
   peerDependencies:
@@ -11072,92 +11368,92 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-arm64@npm:1.7.26":
-  version: 1.7.26
-  resolution: "@swc/core-darwin-arm64@npm:1.7.26"
+"@swc/core-darwin-arm64@npm:1.9.2":
+  version: 1.9.2
+  resolution: "@swc/core-darwin-arm64@npm:1.9.2"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-darwin-x64@npm:1.7.26":
-  version: 1.7.26
-  resolution: "@swc/core-darwin-x64@npm:1.7.26"
+"@swc/core-darwin-x64@npm:1.9.2":
+  version: 1.9.2
+  resolution: "@swc/core-darwin-x64@npm:1.9.2"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm-gnueabihf@npm:1.7.26":
-  version: 1.7.26
-  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.7.26"
+"@swc/core-linux-arm-gnueabihf@npm:1.9.2":
+  version: 1.9.2
+  resolution: "@swc/core-linux-arm-gnueabihf@npm:1.9.2"
   conditions: os=linux & cpu=arm
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-gnu@npm:1.7.26":
-  version: 1.7.26
-  resolution: "@swc/core-linux-arm64-gnu@npm:1.7.26"
+"@swc/core-linux-arm64-gnu@npm:1.9.2":
+  version: 1.9.2
+  resolution: "@swc/core-linux-arm64-gnu@npm:1.9.2"
   conditions: os=linux & cpu=arm64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-arm64-musl@npm:1.7.26":
-  version: 1.7.26
-  resolution: "@swc/core-linux-arm64-musl@npm:1.7.26"
+"@swc/core-linux-arm64-musl@npm:1.9.2":
+  version: 1.9.2
+  resolution: "@swc/core-linux-arm64-musl@npm:1.9.2"
   conditions: os=linux & cpu=arm64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-gnu@npm:1.7.26":
-  version: 1.7.26
-  resolution: "@swc/core-linux-x64-gnu@npm:1.7.26"
+"@swc/core-linux-x64-gnu@npm:1.9.2":
+  version: 1.9.2
+  resolution: "@swc/core-linux-x64-gnu@npm:1.9.2"
   conditions: os=linux & cpu=x64 & libc=glibc
   languageName: node
   linkType: hard
 
-"@swc/core-linux-x64-musl@npm:1.7.26":
-  version: 1.7.26
-  resolution: "@swc/core-linux-x64-musl@npm:1.7.26"
+"@swc/core-linux-x64-musl@npm:1.9.2":
+  version: 1.9.2
+  resolution: "@swc/core-linux-x64-musl@npm:1.9.2"
   conditions: os=linux & cpu=x64 & libc=musl
   languageName: node
   linkType: hard
 
-"@swc/core-win32-arm64-msvc@npm:1.7.26":
-  version: 1.7.26
-  resolution: "@swc/core-win32-arm64-msvc@npm:1.7.26"
+"@swc/core-win32-arm64-msvc@npm:1.9.2":
+  version: 1.9.2
+  resolution: "@swc/core-win32-arm64-msvc@npm:1.9.2"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"@swc/core-win32-ia32-msvc@npm:1.7.26":
-  version: 1.7.26
-  resolution: "@swc/core-win32-ia32-msvc@npm:1.7.26"
+"@swc/core-win32-ia32-msvc@npm:1.9.2":
+  version: 1.9.2
+  resolution: "@swc/core-win32-ia32-msvc@npm:1.9.2"
   conditions: os=win32 & cpu=ia32
   languageName: node
   linkType: hard
 
-"@swc/core-win32-x64-msvc@npm:1.7.26":
-  version: 1.7.26
-  resolution: "@swc/core-win32-x64-msvc@npm:1.7.26"
+"@swc/core-win32-x64-msvc@npm:1.9.2":
+  version: 1.9.2
+  resolution: "@swc/core-win32-x64-msvc@npm:1.9.2"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
-"@swc/core@npm:~1.7.26":
-  version: 1.7.26
-  resolution: "@swc/core@npm:1.7.26"
+"@swc/core@npm:~1.9.2":
+  version: 1.9.2
+  resolution: "@swc/core@npm:1.9.2"
   dependencies:
-    "@swc/core-darwin-arm64": "npm:1.7.26"
-    "@swc/core-darwin-x64": "npm:1.7.26"
-    "@swc/core-linux-arm-gnueabihf": "npm:1.7.26"
-    "@swc/core-linux-arm64-gnu": "npm:1.7.26"
-    "@swc/core-linux-arm64-musl": "npm:1.7.26"
-    "@swc/core-linux-x64-gnu": "npm:1.7.26"
-    "@swc/core-linux-x64-musl": "npm:1.7.26"
-    "@swc/core-win32-arm64-msvc": "npm:1.7.26"
-    "@swc/core-win32-ia32-msvc": "npm:1.7.26"
-    "@swc/core-win32-x64-msvc": "npm:1.7.26"
+    "@swc/core-darwin-arm64": "npm:1.9.2"
+    "@swc/core-darwin-x64": "npm:1.9.2"
+    "@swc/core-linux-arm-gnueabihf": "npm:1.9.2"
+    "@swc/core-linux-arm64-gnu": "npm:1.9.2"
+    "@swc/core-linux-arm64-musl": "npm:1.9.2"
+    "@swc/core-linux-x64-gnu": "npm:1.9.2"
+    "@swc/core-linux-x64-musl": "npm:1.9.2"
+    "@swc/core-win32-arm64-msvc": "npm:1.9.2"
+    "@swc/core-win32-ia32-msvc": "npm:1.9.2"
+    "@swc/core-win32-x64-msvc": "npm:1.9.2"
     "@swc/counter": "npm:^0.1.3"
-    "@swc/types": "npm:^0.1.12"
+    "@swc/types": "npm:^0.1.15"
   peerDependencies:
     "@swc/helpers": "*"
   dependenciesMeta:
@@ -11184,7 +11480,7 @@ __metadata:
   peerDependenciesMeta:
     "@swc/helpers":
       optional: true
-  checksum: 10/8fb43420bdd1b774dc054c6629f87f733e76860b97130609c7374f3a48406bc0ae1a2dd0b3e3c10317c692b2eaa64747f1a690b309727a8d1411112e2d2a884e
+  checksum: 10/6793f2014a016f90b1c41a695f6d3a14d574e129e78f651fe3d6dbacbc6d0836ab7a7eb445d873a302b060b25ae34c4e09d0f94574a71da47c6424c5fa58aa10
   languageName: node
   linkType: hard
 
@@ -11213,64 +11509,40 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@swc/jest@npm:~0.2.36":
-  version: 0.2.36
-  resolution: "@swc/jest@npm:0.2.36"
+"@swc/jest@npm:~0.2.37":
+  version: 0.2.37
+  resolution: "@swc/jest@npm:0.2.37"
   dependencies:
     "@jest/create-cache-key-function": "npm:^29.7.0"
     "@swc/counter": "npm:^0.1.3"
     jsonc-parser: "npm:^3.2.0"
   peerDependencies:
     "@swc/core": "*"
-  checksum: 10/39c5699646f0e90400af106156e5604069e8a7d8216f2421e171837b086839176c16f69925ce6a5c4c48182005eed649bdf9664023708e169aa48814feecc0d8
+  checksum: 10/bbec37079b4f5c1ff1c95aeec07d08277c646a0c5e16e057ea3a8fe5c6e2bd59bbfc4312e53ddd05d25fa4de20a03607be274f560f28bb5e229dd08124780e16
   languageName: node
   linkType: hard
 
-"@swc/types@npm:^0.1.12":
-  version: 0.1.12
-  resolution: "@swc/types@npm:0.1.12"
+"@swc/types@npm:^0.1.15":
+  version: 0.1.15
+  resolution: "@swc/types@npm:0.1.15"
   dependencies:
     "@swc/counter": "npm:^0.1.3"
-  checksum: 10/92dbbc70cd068ea30fb6fbdc1ae8599d6c058a5d09b2923d6e4e24fab5ad7c86a19dd01f349a8e03e300a9321e06911a24df18303b40e307fbd4109372cef2ef
-  languageName: node
-  linkType: hard
-
-"@tanstack/match-sorter-utils@npm:^8.7.0":
-  version: 8.7.2
-  resolution: "@tanstack/match-sorter-utils@npm:8.7.2"
-  dependencies:
-    remove-accents: "npm:0.4.2"
-  checksum: 10/388e1c4230183d169fff5ec268b10670125b1cd6db02b2ca8a91fd2dc4c83b68fd9fd744aa0a700badfb59e0a92d68ab102e33219047087b3f2c24591cf22c62
-  languageName: node
-  linkType: hard
-
-"@tanstack/query-core@npm:4.15.1":
-  version: 4.15.1
-  resolution: "@tanstack/query-core@npm:4.15.1"
-  checksum: 10/59cd08fd4aa093049d7dccc77f0d97bef9709d6e0fa6f76dee719900ea70369fc001f2204494a14a14262f83e302fc6fafc3958fcbf8d3f86c70636b397ebb18
+  checksum: 10/d8bf063aeebac51290d1edf0cec52e2e5b5afced0dc6933510a86947e10f0f77976bc14c3efb5e8f265a9cbdeb0929e00e44b2f82c6d0f273997c5029417b769
   languageName: node
   linkType: hard
 
-"@tanstack/react-query-devtools@npm:^4.19.1":
-  version: 4.20.4
-  resolution: "@tanstack/react-query-devtools@npm:4.20.4"
-  dependencies:
-    "@tanstack/match-sorter-utils": "npm:^8.7.0"
-    superjson: "npm:^1.10.0"
-    use-sync-external-store: "npm:^1.2.0"
-  peerDependencies:
-    "@tanstack/react-query": 4.20.4
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0
-    react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 10/4f3a3d7b697fb18343188925e976762b2fb1be10f0e6a9192c1b5975749a5351c9f9c2b4124fe6860c9d689605966a41e8d5184d454b7dd06deb877bc1c38e8d
+"@tanstack/query-core@npm:4.36.1":
+  version: 4.36.1
+  resolution: "@tanstack/query-core@npm:4.36.1"
+  checksum: 10/7c648872cd491bcab2aa4c18e0b7ca130c072f05c277a5876977fa3bfa87634bbfde46e9d249236587d78c39866889a02e4e202b478dc6074ff96093732ae56d
   languageName: node
   linkType: hard
 
-"@tanstack/react-query@npm:^4.16.1":
-  version: 4.16.1
-  resolution: "@tanstack/react-query@npm:4.16.1"
+"@tanstack/react-query@npm:^4.36.1":
+  version: 4.36.1
+  resolution: "@tanstack/react-query@npm:4.36.1"
   dependencies:
-    "@tanstack/query-core": "npm:4.15.1"
+    "@tanstack/query-core": "npm:4.36.1"
     use-sync-external-store: "npm:^1.2.0"
   peerDependencies:
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -11281,7 +11553,7 @@ __metadata:
       optional: true
     react-native:
       optional: true
-  checksum: 10/b296c487c94558ae0c2159b8bfd8bc30076af98e0a2472a061fa3af4fc4b0760368cdb55a6b6aff5c7c29395645b98b472551a089046219c0e36778d667e8753
+  checksum: 10/764b860c3ac8d254fc6b07e01054a0f58058644d59626c724b213293fbf1e31c198cbb26e4c32c0d16dcaec0353c0ae19147d9c667675b31f8cea1d64f1ff4ac
   languageName: node
   linkType: hard
 
@@ -11316,19 +11588,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@testing-library/jest-dom@npm:~6.4.8":
-  version: 6.4.8
-  resolution: "@testing-library/jest-dom@npm:6.4.8"
+"@testing-library/jest-dom@npm:~6.6.3":
+  version: 6.6.3
+  resolution: "@testing-library/jest-dom@npm:6.6.3"
   dependencies:
     "@adobe/css-tools": "npm:^4.4.0"
-    "@babel/runtime": "npm:^7.9.2"
     aria-query: "npm:^5.0.0"
     chalk: "npm:^3.0.0"
     css.escape: "npm:^1.5.1"
     dom-accessibility-api: "npm:^0.6.3"
     lodash: "npm:^4.17.21"
     redent: "npm:^3.0.0"
-  checksum: 10/011e5a309e2cfc0c5cee6454427030d9a5d690df212bedcc78c15ee8d23218c3e51be32617ca879f060445ba0ba38e1b8d224b5ab11444ee076c37ed8c1c123a
+  checksum: 10/1f3427e45870eab9dcc59d6504b780d4a595062fe1687762ae6e67d06a70bf439b40ab64cf58cbace6293a99e3764d4647fdc8300a633b721764f5ce39dade18
   languageName: node
   linkType: hard
 
@@ -11417,12 +11688,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/adm-zip@npm:^0.5.0, @types/adm-zip@npm:^0.5.5":
-  version: 0.5.5
-  resolution: "@types/adm-zip@npm:0.5.5"
+"@types/adm-zip@npm:^0.5.6":
+  version: 0.5.6
+  resolution: "@types/adm-zip@npm:0.5.6"
   dependencies:
     "@types/node": "npm:*"
-  checksum: 10/78c5e7472d21eeaf11738c6127e9a774fedf8fd94fdc9a96807930337fadb09ac6d3a264f69d0e15dffb2608d415a97457095e9e50d4c221bd43249d371f33fd
+  checksum: 10/2d0b16a83d3f7e842f24ba73ab1f098cb289446c1af7c6600f7c208d95b6801ad87bf5e6164f380da5af0b3f4f921c8f29d850a3091dadb26560fb81fc11df55
   languageName: node
   linkType: hard
 
@@ -11442,7 +11713,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/babel__core@npm:^7.1.14, @types/babel__core@npm:^7.18.0":
+"@types/babel__core@npm:^7.1.14, @types/babel__core@npm:^7.18.0, @types/babel__core@npm:^7.20.5":
   version: 7.20.5
   resolution: "@types/babel__core@npm:7.20.5"
   dependencies:
@@ -11527,6 +11798,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/bytebuffer@npm:~5.0.49":
+  version: 5.0.49
+  resolution: "@types/bytebuffer@npm:5.0.49"
+  dependencies:
+    "@types/long": "npm:^3.0.0"
+    "@types/node": "npm:*"
+  checksum: 10/31eb2521d2710f256c3d17a3e8d87f04394f335b29f7276c31c054ddbf4795146f2663effa3b6e910442da69238e994d2db9f7d5918eead4313e3f9e29165932
+  languageName: node
+  linkType: hard
+
 "@types/chai-as-promised@npm:^7.1.8":
   version: 7.1.8
   resolution: "@types/chai-as-promised@npm:7.1.8"
@@ -11563,19 +11844,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/chai@npm:*, @types/chai@npm:~4.3.19":
+"@types/chai@npm:*":
   version: 4.3.19
   resolution: "@types/chai@npm:4.3.19"
   checksum: 10/5ca7a48ec1c792e536bc228911f442c31eb8a24f1c3531f8a5e1e949590a6a045be17a2ec5a3d83f63dae8d59dd93dc5f6ca7355b9c1a9f003c553a733b2e591
   languageName: node
   linkType: hard
 
-"@types/chalk@npm:^2.2.0":
-  version: 2.2.0
-  resolution: "@types/chalk@npm:2.2.0"
+"@types/chai@npm:~4.3.20":
+  version: 4.3.20
+  resolution: "@types/chai@npm:4.3.20"
+  checksum: 10/94fd87036fb63f62c79caf58ccaec88e23cc109e4d41607d83adc609acd6b24eabc345feb7850095a53f76f99c470888251da9bd1b90849c8b2b5a813296bb19
+  languageName: node
+  linkType: hard
+
+"@types/chalk@npm:^2.2.4":
+  version: 2.2.4
+  resolution: "@types/chalk@npm:2.2.4"
   dependencies:
     chalk: "npm:*"
-  checksum: 10/846437590d0bf0026d8c2f454e5d91a486becfabde61c0441025e791a0fed75304e143717bc4d025569394dcce5a32f2c53d97253d0c735ac1abae63f1b25c3e
+  checksum: 10/e8a905a4688e9bb97fc83055ebfc041a0245449ea5174f9e637f26a940dc2e2f8d5cc2e2f192ef85e418a032b051fde3cf84c47945521a821a9d425cdd7332b6
   languageName: node
   linkType: hard
 
@@ -11648,10 +11936,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/crypto-js@npm:~4.1.3":
-  version: 4.1.3
-  resolution: "@types/crypto-js@npm:4.1.3"
-  checksum: 10/66d2153d109ae3b353ad9bd77726323f56d7c252f22f8b36edb9fef5bc80f4765c024fd8102cf6a5c6415fd847565687e7a97eb840979e38030d8c41358fa344
+"@types/crypto-js@npm:~4.2.2":
+  version: 4.2.2
+  resolution: "@types/crypto-js@npm:4.2.2"
+  checksum: 10/a40fc5a9219fd33f54ba3e094c5e5ab2904d3106681a76f1029bb038976591e9c8959099963bf4474fde21c2d8d00c1f896445206a3a58f85588f9cb1bd96a9a
   languageName: node
   linkType: hard
 
@@ -11701,10 +11989,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/d3-color@npm:^2.0.0":
-  version: 2.0.6
-  resolution: "@types/d3-color@npm:2.0.6"
-  checksum: 10/dd4cdb61577a57f49b464a02e5d65c3f856d922f40092569b6752f624d94571d14489e9d32816e93d96fc71494f4b575b2afcf461d247ec348ce5cde64d62a1b
+"@types/d3-color@npm:^3.0.0":
+  version: 3.1.3
+  resolution: "@types/d3-color@npm:3.1.3"
+  checksum: 10/1cf0f512c09357b25d644ab01b54200be7c9b15c808333b0ccacf767fff36f17520b2fcde9dad45e1bd7ce84befad39b43da42b4fded57680fa2127006ca3ece
   languageName: node
   linkType: hard
 
@@ -11725,10 +12013,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/d3-delaunay@npm:^5.3.0":
-  version: 5.3.4
-  resolution: "@types/d3-delaunay@npm:5.3.4"
-  checksum: 10/b43a26ed2eab890258a6a890a47ec7165e65dd03ec72782376fb19656e75e33ae5cf3ce1496bd566e4ee3dead2dd2f13dedb5f82fc8068b819d7d8c7abd64b20
+"@types/d3-delaunay@npm:^6.0.4":
+  version: 6.0.4
+  resolution: "@types/d3-delaunay@npm:6.0.4"
+  checksum: 10/cb8d2c9ed0b39ade3107b9792544a745b2de3811a6bd054813e9dc708b1132fbacd796e54c0602c11b3a14458d14487c5276c1affb7c2b9f25fe55fff88d6d25
   languageName: node
   linkType: hard
 
@@ -11824,13 +12112,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/d3-path@npm:^2":
-  version: 2.0.4
-  resolution: "@types/d3-path@npm:2.0.4"
-  checksum: 10/aa5e429dfb69e1a051530b77cf6383d062645ed313d09848485c30c0518a464aef1db0a1ea5769d31e644a16fc521f4ee2a1ebdb0a445ae0856e3c05e2d8a9f1
-  languageName: node
-  linkType: hard
-
 "@types/d3-polygon@npm:*":
   version: 3.0.0
   resolution: "@types/d3-polygon@npm:3.0.0"
@@ -11859,10 +12140,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/d3-scale-chromatic@npm:^2.0.0":
-  version: 2.0.4
-  resolution: "@types/d3-scale-chromatic@npm:2.0.4"
-  checksum: 10/a038225314ba634f48d3534e7a6f33802a424753d1c1fd8d9531a925b8b26b049f1bca87884577daf5fb6fc05ccc18dc6848b7e47d4e01fe390997481814e560
+"@types/d3-scale-chromatic@npm:^3.0.0":
+  version: 3.0.3
+  resolution: "@types/d3-scale-chromatic@npm:3.0.3"
+  checksum: 10/cc5488af1136c3f9e28aa3c3ee2dc3e5e843c666f64360fb3870f0b8679cd2ee844edaa5a93504a9665deb98cb3c2ae2257d610c338fa8caa4a31ab6fdeb2f15
   languageName: node
   linkType: hard
 
@@ -11875,12 +12156,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/d3-scale@npm:^3.2.3":
-  version: 3.3.5
-  resolution: "@types/d3-scale@npm:3.3.5"
+"@types/d3-scale@npm:^4.0.8":
+  version: 4.0.8
+  resolution: "@types/d3-scale@npm:4.0.8"
   dependencies:
-    "@types/d3-time": "npm:^2"
-  checksum: 10/5e0d95ca15297b05301a329ddf36a90ee6ea6187f4bd8db175647773514d7adedbe05b790ffdf0a88c4fbae2c817300610fe694ad554e8981f434596c123ac26
+    "@types/d3-time": "npm:*"
+  checksum: 10/376e4f2199ee6db70906651587a4521976920fa5eaa847a976c434e7a8171cbfeeab515cc510c5130b1f64fcf95b9750a7fd21dfc0a40fc3398641aa7dd4e7e2
   languageName: node
   linkType: hard
 
@@ -11900,12 +12181,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/d3-shape@npm:^2.0.0":
-  version: 2.1.7
-  resolution: "@types/d3-shape@npm:2.1.7"
+"@types/d3-shape@npm:^3.1.6":
+  version: 3.1.6
+  resolution: "@types/d3-shape@npm:3.1.6"
   dependencies:
-    "@types/d3-path": "npm:^2"
-  checksum: 10/28847bb0ebbf044f4ca31bf2042f0bd4d60e2e0b6892ebd35110739816bc08640433cb8b6abbefcfb130d5cf789a0c151cd7375097b169850c603c1fffa44fe5
+    "@types/d3-path": "npm:*"
+  checksum: 10/75abf403ec5b8c11e761256aa6b3546533d61e2e12f15c82bed6b606e963dcdfb9868a2038c46099173c8830423b35ddaf14d1162f96ad9da18a2e90b0fa7d25
   languageName: node
   linkType: hard
 
@@ -11944,13 +12225,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/d3-time@npm:^2":
-  version: 2.1.4
-  resolution: "@types/d3-time@npm:2.1.4"
-  checksum: 10/a99d4b9cc23882a6197054932db1e26d93a9d4811fdd6a97339b7781c0afa2863db01a3631ce509077502d65cdc24c282a8d8649a2dc74ef2753faf5a7eeba92
-  languageName: node
-  linkType: hard
-
 "@types/d3-timer@npm:*":
   version: 3.0.0
   resolution: "@types/d3-timer@npm:3.0.0"
@@ -12031,15 +12305,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/dompurify@npm:^2.3.3":
-  version: 2.3.3
-  resolution: "@types/dompurify@npm:2.3.3"
-  dependencies:
-    "@types/trusted-types": "npm:*"
-  checksum: 10/fc6287cccfe1befafabf8f3e50edced8eba3c6b4974f712c18032fe97aa734a6f1a30c11b4de65d3e63f6bde615417063ed207d9bcd90f1417528bb17f6583da
-  languageName: node
-  linkType: hard
-
 "@types/dompurify@npm:^3.0.5":
   version: 3.0.5
   resolution: "@types/dompurify@npm:3.0.5"
@@ -12063,13 +12328,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/escodegen@npm:^0.0.6":
-  version: 0.0.6
-  resolution: "@types/escodegen@npm:0.0.6"
-  checksum: 10/2e91554a47eb98076a3ba6e3548640e50b28a0f5b69134f99dd1e0ce5223c0a1726f23d25aafd40e4c7961d7c3c519782949aa606d58d0e7431c7fb1ec011c4c
-  languageName: node
-  linkType: hard
-
 "@types/eslint-scope@npm:^3.7.3":
   version: 3.7.4
   resolution: "@types/eslint-scope@npm:3.7.4"
@@ -12100,20 +12358,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/estree@npm:*, @types/estree@npm:^1.0.5":
+"@types/estree@npm:*, @types/estree@npm:1.0.6, @types/estree@npm:^1.0.5":
   version: 1.0.6
   resolution: "@types/estree@npm:1.0.6"
   checksum: 10/9d35d475095199c23e05b431bcdd1f6fec7380612aed068b14b2a08aa70494de8a9026765a5a91b1073f636fb0368f6d8973f518a31391d519e20c59388ed88d
   languageName: node
   linkType: hard
 
-"@types/estree@npm:^0.0.51":
-  version: 0.0.51
-  resolution: "@types/estree@npm:0.0.51"
-  checksum: 10/b566c7a3fc8a81ca3d9e00a717e90b8f5d567e2476b4f6d76a20ec6da33ec28165b8f989ed8dd0c9df41405199777ec36a4f85f32a347fbc6c3f696a3128b6e7
-  languageName: node
-  linkType: hard
-
 "@types/estree@npm:^1.0.0":
   version: 1.0.1
   resolution: "@types/estree@npm:1.0.1"
@@ -12142,7 +12393,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/express@npm:*, @types/express@npm:^4.16.1":
+"@types/express@npm:*":
   version: 4.17.20
   resolution: "@types/express@npm:4.17.20"
   dependencies:
@@ -12222,19 +12473,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/hast@npm:^3.0.0":
-  version: 3.0.4
-  resolution: "@types/hast@npm:3.0.4"
-  dependencies:
-    "@types/unist": "npm:*"
-  checksum: 10/732920d81bb7605895776841b7658b4d8cc74a43a8fa176017cc0fb0ecc1a4c82a2b75a4fe6b71aa262b649d3fb62858c6789efa3793ea1d40269953af96ecb5
-  languageName: node
-  linkType: hard
-
-"@types/he@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "@types/he@npm:1.1.2"
-  checksum: 10/71e9786c35330a2003a7692d5dc4f70946e4c45486f84d7a5792360c6c234cd34bf53421856de40a2c4bead9c21a805c309d72d012467f46bb2cce0571a9ba08
+"@types/he@npm:^1.2.3":
+  version: 1.2.3
+  resolution: "@types/he@npm:1.2.3"
+  checksum: 10/e77851c73dd7b9902d92fe0118a26246a7f3676a3a1c6eb1408305187ef73b57c22550b1435946b983267f961d935554d5d0e1b458416932552f31e763e1aa41
   languageName: node
   linkType: hard
 
@@ -12287,30 +12529,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/imap@npm:^0.8.40":
-  version: 0.8.40
-  resolution: "@types/imap@npm:0.8.40"
-  dependencies:
-    "@types/node": "npm:*"
-  checksum: 10/7ba0ae94909fb6a0f52b462799e88271903bca193fcfed545401fb2e5376f7905643cc90f02d2e9207c667f368032d2344d133e6fe9e9af23e0dae00f5402849
-  languageName: node
-  linkType: hard
-
-"@types/is-ci@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@types/is-ci@npm:3.0.0"
-  dependencies:
-    ci-info: "npm:^3.1.0"
-  checksum: 10/7c1f1f16c1fa2134de7400d82766c83fa76057261ba890628af77a09382ebb92d945bb077b98cfcf3d40ab1469c9ffbd2278112867edbe57aa655f53547eb139
-  languageName: node
-  linkType: hard
-
-"@types/is-stream@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "@types/is-stream@npm:1.1.0"
+"@types/imap@npm:^0.8.42":
+  version: 0.8.42
+  resolution: "@types/imap@npm:0.8.42"
   dependencies:
     "@types/node": "npm:*"
-  checksum: 10/03ca9635bdea282da17135d297085c325e965af09fecaa0678bb9c5302b9ffa61d089a5056ad4980b6b1871dfd9e6420f0d35da9729fcffeee6bd6348e7c9010
+  checksum: 10/26057e06ece6482314e1517969fe6b43693b00898c2b11b39edb95de6abac3ed3a388144602197f4c64d986989d42a8b767223e445b22afc90d42d31480c65d8
   languageName: node
   linkType: hard
 
@@ -12349,7 +12573,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/jest@npm:*, @types/jest@npm:~29.5.12, @types/jest@npm:~29.5.13, @types/jest@npm:~29.5.7":
+"@types/jest@npm:*":
   version: 29.5.13
   resolution: "@types/jest@npm:29.5.13"
   dependencies:
@@ -12359,6 +12583,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/jest@npm:~29.5.14":
+  version: 29.5.14
+  resolution: "@types/jest@npm:29.5.14"
+  dependencies:
+    expect: "npm:^29.0.0"
+    pretty-format: "npm:^29.0.0"
+  checksum: 10/59ec7a9c4688aae8ee529316c43853468b6034f453d08a2e1064b281af9c81234cec986be796288f1bbb29efe943bc950e70c8fa8faae1e460d50e3cf9760f9b
+  languageName: node
+  linkType: hard
+
 "@types/jquery@npm:*":
   version: 3.5.14
   resolution: "@types/jquery@npm:3.5.14"
@@ -12420,12 +12654,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/jsonwebtoken@npm:^8.3.7":
-  version: 8.5.9
-  resolution: "@types/jsonwebtoken@npm:8.5.9"
+"@types/jsonwebtoken@npm:^9":
+  version: 9.0.7
+  resolution: "@types/jsonwebtoken@npm:9.0.7"
   dependencies:
     "@types/node": "npm:*"
-  checksum: 10/4654f8429e943eeb0fa968f15137adc1be35930e33b641cce39e8876dca6ddd0c4c7308384d042963caaf2e15efe74303269bc46c0a7a07ec4a9a2242a4bbe9e
+  checksum: 10/4c0cffc488ba200765b50004de5e046c55360121a91ad9520d904e303cdd217b3f77b51b6ba8b9cbdd03d73876d546cbd0d9992d6e205d97decba918aee5b395
   languageName: node
   linkType: hard
 
@@ -12436,14 +12670,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/katex@npm:^0.14.0":
-  version: 0.14.0
-  resolution: "@types/katex@npm:0.14.0"
-  checksum: 10/f7a617fca68f91e17dcebdc5beff2998c807c1a84b55d29e3317ef389b1058b85750cb5df2e98eb9a220ee8fbdabf5aba4d5abf48206826ee2ad2648f4a79aa7
-  languageName: node
-  linkType: hard
-
-"@types/katex@npm:~0.16.7":
+"@types/katex@npm:^0.16.7, @types/katex@npm:~0.16.7":
   version: 0.16.7
   resolution: "@types/katex@npm:0.16.7"
   checksum: 10/4fd15d93553be97c02c064e16be18d7ccbabf66ec72a9dc7fd5bfa47f0c7581da2f942f693c7cb59499de4c843c2189796e49c9647d336cbd52b777b6722a95a
@@ -12482,14 +12709,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/linkify-it@npm:*":
-  version: 3.0.5
-  resolution: "@types/linkify-it@npm:3.0.5"
-  checksum: 10/fac28f41a6e576282300a459d70ea0d33aab70dbb77c3d09582bb0335bb00d862b6de69585792a4d590aae4173fbab0bf28861e2d90ca7b2b1439b52688e9ff6
+"@types/linkify-it@npm:^5":
+  version: 5.0.0
+  resolution: "@types/linkify-it@npm:5.0.0"
+  checksum: 10/c3919044d4876f9d71d037e861745cd2485c95ac8c36a4fa67b132d4e60eb1d067e123cc7965c9cf5110eea351517d767f0d306af5e9147d6d0af87bc374ddcf
   languageName: node
   linkType: hard
 
-"@types/lodash.clonedeep@npm:^4.5.7, @types/lodash.clonedeep@npm:^4.5.9":
+"@types/lodash.clonedeep@npm:^4.5.9":
   version: 4.5.9
   resolution: "@types/lodash.clonedeep@npm:4.5.9"
   dependencies:
@@ -12507,6 +12734,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/lodash.escape@npm:^4.0.9":
+  version: 4.0.9
+  resolution: "@types/lodash.escape@npm:4.0.9"
+  dependencies:
+    "@types/lodash": "npm:*"
+  checksum: 10/bae0be4bddefaacfb8e96afec895138643cb59d1d5d8c29fda0d61ed77468a8a2d9f913d51cd67ab08afc7a09f2602fec1a289abd9aab335821671a4b3c1245f
+  languageName: node
+  linkType: hard
+
 "@types/lodash.get@npm:^4.4.9":
   version: 4.4.9
   resolution: "@types/lodash.get@npm:4.4.9"
@@ -12516,37 +12752,51 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/lodash@npm:*, @types/lodash@npm:^4.14.167, @types/lodash@npm:^4.14.200":
+"@types/lodash@npm:*":
   version: 4.14.200
   resolution: "@types/lodash@npm:4.14.200"
   checksum: 10/aed5943a4f43b898c18e7148b6ad825dba4611230c8dc12126f20ab4ffc9250794d9134fca0c17218ad7594879835438e9c95e57b801ca6c8da0d3fbc6ef811d
   languageName: node
   linkType: hard
 
-"@types/mailparser@npm:^3.4.4":
-  version: 3.4.4
-  resolution: "@types/mailparser@npm:3.4.4"
+"@types/lodash@npm:^4.17.13, @types/lodash@npm:~4.17.13":
+  version: 4.17.13
+  resolution: "@types/lodash@npm:4.17.13"
+  checksum: 10/ddb34e20810c71be2d9445bcc4b64ec25b83976738454de709854b79c7f655b03704b76235445699956d65012987720e0e429a35489de65495cdb5420202d905
+  languageName: node
+  linkType: hard
+
+"@types/long@npm:^3.0.0":
+  version: 3.0.32
+  resolution: "@types/long@npm:3.0.32"
+  checksum: 10/cc5422875a085b49b74ffeb5c60a8681d30f700859a8931012b4a58c5c6005cdacb4d3ce3e5af7a7f579ee20d5c2e442a773a83b3a4f7a2d39795a7a8e9a962d
+  languageName: node
+  linkType: hard
+
+"@types/mailparser@npm:^3.4.5":
+  version: 3.4.5
+  resolution: "@types/mailparser@npm:3.4.5"
   dependencies:
     "@types/node": "npm:*"
     iconv-lite: "npm:^0.6.3"
-  checksum: 10/4f587e0667c1573bdc4481a520005e377a27d9604dd0ffdab5e86b4f6474a8625122b1c78b3f9536c674ffbc94d367cd0f9b51fe0c502e6752bc53100e1a6e84
+  checksum: 10/8caeb4f164d11960c0439fe80ea029d54f7b4fa86455b8922813813e8cd3233e4b6f67908ed75111fc9394998020bee30805f38020a7c0bf197eddb2e3692a64
   languageName: node
   linkType: hard
 
-"@types/markdown-it@npm:^14.0.1":
-  version: 14.0.1
-  resolution: "@types/markdown-it@npm:14.0.1"
+"@types/markdown-it@npm:^14.1.2":
+  version: 14.1.2
+  resolution: "@types/markdown-it@npm:14.1.2"
   dependencies:
-    "@types/linkify-it": "npm:*"
-    "@types/mdurl": "npm:*"
-  checksum: 10/5bb909022ceac3dd813e6a571252e5ecbc24352bec6d0da3dd25b039c43dd181928845f9d4c69b105b5e682bb05a81c7f454efe825294b6b83db058184a5ea1c
+    "@types/linkify-it": "npm:^5"
+    "@types/mdurl": "npm:^2"
+  checksum: 10/ca2f239c8d59610b9f936fd40261a6ccf2fa1ae27a21816c031e5712542dcf9ee01e2fe29b31118df90716e11ade54e47d92a498e9b6488800e77ca8827255a2
   languageName: node
   linkType: hard
 
-"@types/marked@npm:^4.0.8":
-  version: 4.0.8
-  resolution: "@types/marked@npm:4.0.8"
-  checksum: 10/93f0be34b5bdb2ac97d7c895e44b9d77d84aabe4f6e5a419889556d3867f15c00fcf35b88f4712f04e37870a40e2ac41e50de09ea10f9805a9688c8c9b526cbe
+"@types/marked@npm:^4.3.2":
+  version: 4.3.2
+  resolution: "@types/marked@npm:4.3.2"
+  checksum: 10/c1b5aa2cee0b8929164f4a8d206d7f89256ebde0d5b9998e9cdf6da2a5fa71162f66ef30e80b98213ee2c3372514b39b756e8494980174a4907a4aa4690b4d1d
   languageName: node
   linkType: hard
 
@@ -12559,10 +12809,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/mdurl@npm:*":
-  version: 1.0.5
-  resolution: "@types/mdurl@npm:1.0.5"
-  checksum: 10/e8e872e8da8f517a9c748b06cec61c947cb73fd3069e8aeb0926670ec5dfac5d30549b3d0f1634950401633e812f9b7263f2d5dbe7e98fce12bcb2c659aa4b21
+"@types/mdurl@npm:^2":
+  version: 2.0.0
+  resolution: "@types/mdurl@npm:2.0.0"
+  checksum: 10/78746e96c655ceed63db06382da466fd52c7e9dc54d60b12973dfdd110cae06b9439c4b90e17bb8d4461109184b3ea9f3e9f96b3e4bf4aa9fe18b6ac35f283c8
   languageName: node
   linkType: hard
 
@@ -12636,7 +12886,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/minimist@npm:^1.2.0, @types/minimist@npm:^1.2.2":
+"@types/minimist@npm:^1.2.2":
   version: 1.2.2
   resolution: "@types/minimist@npm:1.2.2"
   checksum: 10/b8da83c66eb4aac0440e64674b19564d9d86c80ae273144db9681e5eeff66f238ade9515f5006ffbfa955ceff8b89ad2bd8ec577d7caee74ba101431fb07045d
@@ -12675,7 +12925,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/nedb@npm:^1.8.12, @types/nedb@npm:^1.8.16":
+"@types/nedb@npm:^1.8.16":
   version: 1.8.16
   resolution: "@types/nedb@npm:1.8.16"
   dependencies:
@@ -12719,7 +12969,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:*, @types/node@npm:>=12, @types/node@npm:>=12.0.0, @types/node@npm:>=18.0.0, @types/node@npm:>=8.9.0":
+"@types/node@npm:*, @types/node@npm:>=18.0.0":
   version: 20.8.4
   resolution: "@types/node@npm:20.8.4"
   dependencies:
@@ -12746,6 +12996,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/node@npm:>=18":
+  version: 22.9.0
+  resolution: "@types/node@npm:22.9.0"
+  dependencies:
+    undici-types: "npm:~6.19.8"
+  checksum: 10/a7df3426891868b0f5fb03e46aeddd8446178233521c624a44531c92a040cf08a82d8235f7e1e02af731fd16984665d4d71f3418caf9c2788313b10f040d615d
+  languageName: node
+  linkType: hard
+
 "@types/node@npm:^12.7.1":
   version: 12.20.55
   resolution: "@types/node@npm:12.20.55"
@@ -12753,23 +13012,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:^14.0.26, @types/node@npm:^14.14.37":
+"@types/node@npm:^14.14.37":
   version: 14.18.63
   resolution: "@types/node@npm:14.18.63"
   checksum: 10/82a7775898c2ea6db0b610a463512206fb2c7adc1af482c7eb44b99d94375fff51c74f67ae75a63c5532971159f30c866a4d308000624ef02fd9a7175e277019
   languageName: node
   linkType: hard
 
-"@types/node@npm:~20.16.12":
-  version: 20.16.12
-  resolution: "@types/node@npm:20.16.12"
+"@types/node@npm:~20.16.15":
+  version: 20.16.15
+  resolution: "@types/node@npm:20.16.15"
   dependencies:
     undici-types: "npm:~6.19.2"
-  checksum: 10/689badb5af2a1a03553a6d21880fa4aabb8cf028b7db1a03be889c0026047a780ac37c83df5dca036f02f5dc3cc4000254fa40d2cadd5df0e9bd6f43dae6eac6
+  checksum: 10/f4706676fdff05c7fb188399da578bbcce9260f889cfd767f1c3ee4fb33c369eb1ffa24161651ea3ef5b6a33e2e9b66f393949cab2be77d019277a1e16a7af36
   languageName: node
   linkType: hard
 
-"@types/nodemailer@npm:*, @types/nodemailer@npm:^6.4.15":
+"@types/nodemailer@npm:*":
   version: 6.4.15
   resolution: "@types/nodemailer@npm:6.4.15"
   dependencies:
@@ -12778,6 +13037,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/nodemailer@npm:^6.4.16":
+  version: 6.4.16
+  resolution: "@types/nodemailer@npm:6.4.16"
+  dependencies:
+    "@types/node": "npm:*"
+  checksum: 10/38e612fef3963c7ae7563f039a8b26d8d4371a7feeedaf38a534f889094f6727fb0d52f565902b01099cfe0b4be7956125ebdae312b9ab3905929df5c815bd95
+  languageName: node
+  linkType: hard
+
 "@types/normalize-package-data@npm:^2.4.0":
   version: 2.4.1
   resolution: "@types/normalize-package-data@npm:2.4.1"
@@ -12785,12 +13053,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/oauth2-server@npm:^3.0.17":
-  version: 3.0.17
-  resolution: "@types/oauth2-server@npm:3.0.17"
+"@types/oauth2-server@npm:^3.0.18":
+  version: 3.0.18
+  resolution: "@types/oauth2-server@npm:3.0.18"
   dependencies:
     "@types/express": "npm:*"
-  checksum: 10/469f40fe38006d8de142f25536a083f234f8ba2801062604b97402f7890b6262aaf9914e76447dbab54c097ea9f29e1253dfe844d6b612059150c423dccc0888
+  checksum: 10/885cd132cddd49e13461feba1dbb6f7725172d06ae5e93b9c07d9db8e6a2e36e5e6f3eb4c245bba8a0e697894f6e899e2abc8982200e697fa3d8fa69327b939c
   languageName: node
   linkType: hard
 
@@ -12801,13 +13069,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/p-queue@npm:^2.3.2":
-  version: 2.3.2
-  resolution: "@types/p-queue@npm:2.3.2"
-  checksum: 10/5eb36eafdf2e0522565ec8de704a02a12cdb948cace2556a59e2e394858d121952aa6ef1e8036e883509797f28cd90112cd3691d8bacbec9015ee2e9c28052bb
-  languageName: node
-  linkType: hard
-
 "@types/parse-json@npm:^4.0.0":
   version: 4.0.0
   resolution: "@types/parse-json@npm:4.0.0"
@@ -12843,10 +13104,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/prettier@npm:^2.6.3":
-  version: 2.6.3
-  resolution: "@types/prettier@npm:2.6.3"
-  checksum: 10/fbaba4bfe1b4543bed6e62db0f9ae734b4536ff3dc83a1b8bb79835928fb0f653de626edae530703a20c5023546fdf2ba7e307c60f8544c9e65d0f8e196a9b72
+"@types/prettier@npm:^2.7.3":
+  version: 2.7.3
+  resolution: "@types/prettier@npm:2.7.3"
+  checksum: 10/cda84c19acc3bf327545b1ce71114a7d08efbd67b5030b9e8277b347fa57b05178045f70debe1d363ff7efdae62f237260713aafc2d7217e06fc99b048a88497
   languageName: node
   linkType: hard
 
@@ -12857,13 +13118,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/promise.allsettled@npm:^1.0.3":
-  version: 1.0.4
-  resolution: "@types/promise.allsettled@npm:1.0.4"
-  checksum: 10/239fd638f8d96153759c68af486cbe643f1025f05a32a6a3f66471090b8aaf04c4e88bc345f6170d3870f9d47ee262967640cdf9f776ae4a3e53b26c98e90523
-  languageName: node
-  linkType: hard
-
 "@types/prop-types@npm:*, @types/prop-types@npm:^15.7.2":
   version: 15.7.11
   resolution: "@types/prop-types@npm:15.7.11"
@@ -12895,9 +13149,9 @@ __metadata:
   linkType: hard
 
 "@types/q@npm:^1.5.1":
-  version: 1.5.5
-  resolution: "@types/q@npm:1.5.5"
-  checksum: 10/37bb27dbd602650577052a3c1ee749b0d027caa6ff06ea307f3f2012ee64fa5740e9bf5fe548c8377f319797a5ecb28a602fb2be977339bc9e035f42d91601a3
+  version: 1.5.8
+  resolution: "@types/q@npm:1.5.8"
+  checksum: 10/eaa21cd2cf562956433937e728301ee8c63fe6dd91718cd4a1005744ec5a70c4ebe8e45e26af83ecbe45aa12ef0bf1646e42dac868780d1f3a99044547035706
   languageName: node
   linkType: hard
 
@@ -12933,15 +13187,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react-lifecycles-compat@npm:^3.0.1":
-  version: 3.0.4
-  resolution: "@types/react-lifecycles-compat@npm:3.0.4"
-  dependencies:
-    "@types/react": "npm:*"
-  checksum: 10/504665a1a83be43ab43cbd3d19fd94d0de6634543f06351cce80c844628048650f2cf063048e5dc39effdf0053565ae60a04427e79d094714d6aeb84d5c9643e
-  languageName: node
-  linkType: hard
-
 "@types/react-redux@npm:^7.1.20":
   version: 7.1.25
   resolution: "@types/react-redux@npm:7.1.25"
@@ -12965,16 +13210,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react@npm:^16.8.0 || ^17.0.0 || ^18.0.0":
-  version: 18.3.11
-  resolution: "@types/react@npm:18.3.11"
-  dependencies:
-    "@types/prop-types": "npm:*"
-    csstype: "npm:^3.0.2"
-  checksum: 10/a36f0707fdfe9fe19cbe5892bcdab0f042ecadb501ea4e1c39519943f3e74cffbd31e892d3860f5c87cf33f5f223552b246a552bed0087b95954f2cb39d5cf65
-  languageName: node
-  linkType: hard
-
 "@types/readdir-glob@npm:*":
   version: 1.1.1
   resolution: "@types/readdir-glob@npm:1.1.1"
@@ -13014,12 +13249,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/sanitize-html@npm:^2.9.3":
-  version: 2.9.3
-  resolution: "@types/sanitize-html@npm:2.9.3"
+"@types/sanitize-html@npm:^2.13.0":
+  version: 2.13.0
+  resolution: "@types/sanitize-html@npm:2.13.0"
   dependencies:
     htmlparser2: "npm:^8.0.0"
-  checksum: 10/882a39ec767e0c5fd4402108db4b8e4f85ff555cf490ad8c7340d9c58c57c3ffefa33c0d248d5e67047df6f744ca60e125da5485efc18ac450783f3900178373
+  checksum: 10/a32c67bdf86048efa8ee5cdc1a68351758bae888956010eea58e694c1f9fc580632d1ce0478d31984559e0b03282d130ffe3e87479838c8da92cf1ac06626edc
   languageName: node
   linkType: hard
 
@@ -13030,21 +13265,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/semver@npm:^5.5.0":
-  version: 5.5.0
-  resolution: "@types/semver@npm:5.5.0"
-  checksum: 10/ed79e6806dd6228f953294460a8d9194e307150bbaaa91e2abfa39cbd74d77e1ddfa59e598721ef90845f41e780b69311b3badb9341b124aa2ec14e13222f306
-  languageName: node
-  linkType: hard
-
-"@types/semver@npm:^7.3.10, @types/semver@npm:^7.3.12, @types/semver@npm:^7.5.0":
+"@types/semver@npm:^7.3.12":
   version: 7.5.4
   resolution: "@types/semver@npm:7.5.4"
   checksum: 10/e99c3edc8d64f56abcd891b9e44a45c4ae3cab551c8af5aa67b5df2b49e5fd03f74aac9da71fd5357a50a08d5deb95014516956b15b407052e07f25c7a4a606e
   languageName: node
   linkType: hard
 
-"@types/semver@npm:^7.3.4":
+"@types/semver@npm:^7.3.4, @types/semver@npm:^7.5.8":
   version: 7.5.8
   resolution: "@types/semver@npm:7.5.8"
   checksum: 10/3496808818ddb36deabfe4974fd343a78101fa242c4690044ccdc3b95dcf8785b494f5d628f2f47f38a702f8db9c53c67f47d7818f2be1b79f2efb09692e1178
@@ -13091,12 +13319,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/sharp@npm:^0.30.5":
-  version: 0.30.5
-  resolution: "@types/sharp@npm:0.30.5"
+"@types/sharp@npm:^0.32.0":
+  version: 0.32.0
+  resolution: "@types/sharp@npm:0.32.0"
   dependencies:
-    "@types/node": "npm:*"
-  checksum: 10/ce7d7ef26c18463bed644b676b928e83fb596e2e4a8fa39b448948f9158c43965a13dc3cdf713fe9c8263c070c1d6667cbf9d565fb1c1ecf5522b148150096ad
+    sharp: "npm:*"
+  checksum: 10/9d0ca925ebb18e870740db0e0abcaaa2458645673068166b9f26e042640fa430644fe39aada320e03834f7ba3600e678de822201ffc312f9df1f515ba107ebd5
   languageName: node
   linkType: hard
 
@@ -13148,10 +13376,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/stack-trace@npm:0.0.29":
-  version: 0.0.29
-  resolution: "@types/stack-trace@npm:0.0.29"
-  checksum: 10/7316911982deb29fe89bebd87f2e00493915af8271834c098c0ae7fdebb01613db92b567d087a8fef4d1fd7afd945f3bad30ed411a614efa119e6ae2183ae977
+"@types/stack-trace@npm:0.0.33":
+  version: 0.0.33
+  resolution: "@types/stack-trace@npm:0.0.33"
+  checksum: 10/cec5fbbe3bdcdef82763f917e99ca35a1b92ac96aa7982d09548072c5eff219d8216cf75f1ccfeec9686c91a035cc0d55dda6a76a222022616de275dc5d3a8c1
   languageName: node
   linkType: hard
 
@@ -13162,12 +13390,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/stream-buffers@npm:^3.0.3":
-  version: 3.0.4
-  resolution: "@types/stream-buffers@npm:3.0.4"
+"@types/stream-buffers@npm:^3.0.7":
+  version: 3.0.7
+  resolution: "@types/stream-buffers@npm:3.0.7"
   dependencies:
     "@types/node": "npm:*"
-  checksum: 10/5b432b2bf963d612747b79ac317562888236d6a9ea14414fb055c24e7be9643b5e3c7b7470841fa82802aa1c1c0d752a4ba935bbc0cfb12de6b89f7e1dadee92
+  checksum: 10/b5cf12f69ba866035207e2313bd795166c30ca18329b8c07a96ec5e30d702a0c23b12fa789c7ebc3a08091ea01eca8db84203c93b6823e7477df016a49540f84
   languageName: node
   linkType: hard
 
@@ -13260,13 +13488,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/tsscmp@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "@types/tsscmp@npm:1.0.0"
-  checksum: 10/64855ef7282ee4cdd0d9066924b358c8d41e7771699d30b1cc0a32dd516431893f2da7bdc55fdbb023c66effcb3aad9406ec2a90922d58a1152965ca7412356b
-  languageName: node
-  linkType: hard
-
 "@types/ua-parser-js@npm:^0.7.39":
   version: 0.7.39
   resolution: "@types/ua-parser-js@npm:0.7.39"
@@ -13288,20 +13509,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/unist@npm:^3.0.0":
-  version: 3.0.3
-  resolution: "@types/unist@npm:3.0.3"
-  checksum: 10/96e6453da9e075aaef1dc22482463898198acdc1eeb99b465e65e34303e2ec1e3b1ed4469a9118275ec284dc98019f63c3f5d49422f0e4ac707e5ab90fb3b71a
-  languageName: node
-  linkType: hard
-
-"@types/use-subscription@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "@types/use-subscription@npm:1.0.2"
-  checksum: 10/e547d8ffdf8410c985c271a30903cd754687a6514a67192378213590f707a0f516e0c11930cba10bd7e98dc4f7917e066b3b8d37a622d02b6fcf3c5df530e467
-  languageName: node
-  linkType: hard
-
 "@types/use-sync-external-store@npm:^0.0.6":
   version: 0.0.6
   resolution: "@types/use-sync-external-store@npm:0.0.6"
@@ -13309,35 +13516,45 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/uuid@npm:^8.3.4, @types/uuid@npm:~8.3.4":
-  version: 8.3.4
-  resolution: "@types/uuid@npm:8.3.4"
-  checksum: 10/6f11f3ff70f30210edaa8071422d405e9c1d4e53abbe50fdce365150d3c698fe7bbff65c1e71ae080cbfb8fded860dbb5e174da96fdbbdfcaa3fb3daa474d20f
+"@types/uuid@npm:^10.0.0, @types/uuid@npm:~10.0.0":
+  version: 10.0.0
+  resolution: "@types/uuid@npm:10.0.0"
+  checksum: 10/e3958f8b0fe551c86c14431f5940c3470127293280830684154b91dc7eb3514aeb79fe3216968833cf79d4d1c67f580f054b5be2cd562bebf4f728913e73e944
   languageName: node
   linkType: hard
 
-"@types/uuid@npm:^9.0.1, @types/uuid@npm:^9.0.8":
+"@types/uuid@npm:^9.0.1":
   version: 9.0.8
   resolution: "@types/uuid@npm:9.0.8"
   checksum: 10/b8c60b7ba8250356b5088302583d1704a4e1a13558d143c549c408bf8920535602ffc12394ede77f8a8083511b023704bc66d1345792714002bfa261b17c5275
   languageName: node
   linkType: hard
 
-"@types/webidl-conversions@npm:*":
-  version: 6.1.1
-  resolution: "@types/webidl-conversions@npm:6.1.1"
-  checksum: 10/bd0faad4dfec232010d96a42fbd7b5ac4df557899050a6676a75d30ced8553f19e5a3c747fd2b4317f2810d4cf5d2d6dd47ad22ecfb9e6b21119aba678b8897f
+"@types/vfile-message@npm:*":
+  version: 1.0.1
+  resolution: "@types/vfile-message@npm:1.0.1"
+  dependencies:
+    "@types/node": "npm:*"
+    "@types/unist": "npm:*"
+  checksum: 10/a5fd80df8d7092e06a888b9ed1277ba556241bc7f3cca8d57661d31e31620b8148c7730fcd2576d216ba764ad32dc8baa79d0f0b3e4e4ee689c2772acf334e8d
   languageName: node
   linkType: hard
 
-"@types/webpack-bundle-analyzer@npm:^4.6.2":
-  version: 4.6.2
-  resolution: "@types/webpack-bundle-analyzer@npm:4.6.2"
+"@types/vfile@npm:^3.0.0":
+  version: 3.0.2
+  resolution: "@types/vfile@npm:3.0.2"
   dependencies:
     "@types/node": "npm:*"
-    tapable: "npm:^2.2.0"
-    webpack: "npm:^5"
-  checksum: 10/ac92adc2b1b128119fd867f31bbadf0a0f5f159a2c551665def34bbb8265ecd46bfa28c39683d043eac6e7e8499182e25eb5f57690b9772e5f42aa76948ebc37
+    "@types/unist": "npm:*"
+    "@types/vfile-message": "npm:*"
+  checksum: 10/a720d3efb63da6c1ad720965680041776decaa870e4c7d1c5bc6b62cbc8e5eaa7f7de0eca86078095baf62a0d9f693b6c5300fc9b95976e280c508e62358099a
+  languageName: node
+  linkType: hard
+
+"@types/webidl-conversions@npm:*":
+  version: 6.1.1
+  resolution: "@types/webidl-conversions@npm:6.1.1"
+  checksum: 10/bd0faad4dfec232010d96a42fbd7b5ac4df557899050a6676a75d30ced8553f19e5a3c747fd2b4317f2810d4cf5d2d6dd47ad22ecfb9e6b21119aba678b8897f
   languageName: node
   linkType: hard
 
@@ -13374,16 +13591,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/ws@npm:^7.2.5, @types/ws@npm:^7.4.7":
-  version: 7.4.7
-  resolution: "@types/ws@npm:7.4.7"
+"@types/ws@npm:^8, @types/ws@npm:^8.5.13":
+  version: 8.5.13
+  resolution: "@types/ws@npm:8.5.13"
   dependencies:
     "@types/node": "npm:*"
-  checksum: 10/5236b6c54817bdf17674337db5776bb34a876b77a90d885d0f70084c9d453cc2f21703207cc1147d33a9e49a4306773830fbade4729b01ffe33ef0c82cd4c701
+  checksum: 10/21369beafa75c91ae3b00d3a2671c7408fceae1d492ca2abd5ac7c8c8bf4596d513c1599ebbddeae82c27c4a2d248976d0d714c4b3d34362b2ae35b964e2e637
   languageName: node
   linkType: hard
 
-"@types/ws@npm:^8.5.10, @types/ws@npm:^8.5.12":
+"@types/ws@npm:^8.5.10":
   version: 8.5.12
   resolution: "@types/ws@npm:8.5.12"
   dependencies:
@@ -13515,6 +13732,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/scope-manager@npm:8.11.0":
+  version: 8.11.0
+  resolution: "@typescript-eslint/scope-manager@npm:8.11.0"
+  dependencies:
+    "@typescript-eslint/types": "npm:8.11.0"
+    "@typescript-eslint/visitor-keys": "npm:8.11.0"
+  checksum: 10/8f1e776fc0687f86cf7246c94098121224d0a69ffcaeb9a207b672889a4c42b94304664ed45d0b982c542bf7737bcec3649470d3db281b625a1e77736308ae37
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/scope-manager@npm:8.12.2":
+  version: 8.12.2
+  resolution: "@typescript-eslint/scope-manager@npm:8.12.2"
+  dependencies:
+    "@typescript-eslint/types": "npm:8.12.2"
+    "@typescript-eslint/visitor-keys": "npm:8.12.2"
+  checksum: 10/a2cd6ad4b31f4d0ca6f94c4df8a94bdee762abd556686817ab4143d80a27506f43fbf96769b44e698d573784a464bfd78e0cbc17ac61c36a868e02311c754ce1
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/type-utils@npm:5.60.1":
   version: 5.60.1
   resolution: "@typescript-eslint/type-utils@npm:5.60.1"
@@ -13553,6 +13790,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/types@npm:8.11.0":
+  version: 8.11.0
+  resolution: "@typescript-eslint/types@npm:8.11.0"
+  checksum: 10/424986bae7c48677a843ff2dee5cb0fed293f7bebd71803901c8fc80ddeed65e4857f77083f17775d0bfd6dab5092ef556f354e7420ea4fd6c7861d0368d002e
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/types@npm:8.12.2":
+  version: 8.12.2
+  resolution: "@typescript-eslint/types@npm:8.12.2"
+  checksum: 10/57981e5fa45b03a0398ffb82418fdb716f476aa0b9c17d96edeb7fd3e3f4a720466868af7c2a02ddca65c27e70bfaff50c523b2a570582c4645a2702e17dc94a
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/typescript-estree@npm:5.58.0":
   version: 5.58.0
   resolution: "@typescript-eslint/typescript-estree@npm:5.58.0"
@@ -13607,7 +13858,45 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:5.60.1, @typescript-eslint/utils@npm:^5.10.0, @typescript-eslint/utils@npm:^5.45.0, @typescript-eslint/utils@npm:^5.58.0":
+"@typescript-eslint/typescript-estree@npm:8.11.0":
+  version: 8.11.0
+  resolution: "@typescript-eslint/typescript-estree@npm:8.11.0"
+  dependencies:
+    "@typescript-eslint/types": "npm:8.11.0"
+    "@typescript-eslint/visitor-keys": "npm:8.11.0"
+    debug: "npm:^4.3.4"
+    fast-glob: "npm:^3.3.2"
+    is-glob: "npm:^4.0.3"
+    minimatch: "npm:^9.0.4"
+    semver: "npm:^7.6.0"
+    ts-api-utils: "npm:^1.3.0"
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 10/cec7c5768c4e6cceb095fe8fbd57098d16d226a981143a335a62c6f30d8a1707974e86eeabe5ad33bfb4dd4eb582cba1d4f2e7cec65f71871d7d559ff9bec5f9
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/typescript-estree@npm:8.12.2":
+  version: 8.12.2
+  resolution: "@typescript-eslint/typescript-estree@npm:8.12.2"
+  dependencies:
+    "@typescript-eslint/types": "npm:8.12.2"
+    "@typescript-eslint/visitor-keys": "npm:8.12.2"
+    debug: "npm:^4.3.4"
+    fast-glob: "npm:^3.3.2"
+    is-glob: "npm:^4.0.3"
+    minimatch: "npm:^9.0.4"
+    semver: "npm:^7.6.0"
+    ts-api-utils: "npm:^1.3.0"
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 10/9995929ec4b66afa53d52c16f5cecd7c9aa45994f943c41e9ec91fe178593e83d9049ff056fe2638c3cf7da01476861eff0dc3cb76c314cc130458d3f828930d
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/utils@npm:5.60.1":
   version: 5.60.1
   resolution: "@typescript-eslint/utils@npm:5.60.1"
   dependencies:
@@ -13643,6 +13932,34 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/utils@npm:^6.0.0 || ^7.0.0 || ^8.0.0":
+  version: 8.12.2
+  resolution: "@typescript-eslint/utils@npm:8.12.2"
+  dependencies:
+    "@eslint-community/eslint-utils": "npm:^4.4.0"
+    "@typescript-eslint/scope-manager": "npm:8.12.2"
+    "@typescript-eslint/types": "npm:8.12.2"
+    "@typescript-eslint/typescript-estree": "npm:8.12.2"
+  peerDependencies:
+    eslint: ^8.57.0 || ^9.0.0
+  checksum: 10/4588866ca43314692a0e685d8936c470dca4e6d119a4a1adefbc2fd54682ff081bc21d60bf4e8077d3668aa680bada851b88566264d09c92a840fe2e4feb331b
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/utils@npm:^8.8.1":
+  version: 8.11.0
+  resolution: "@typescript-eslint/utils@npm:8.11.0"
+  dependencies:
+    "@eslint-community/eslint-utils": "npm:^4.4.0"
+    "@typescript-eslint/scope-manager": "npm:8.11.0"
+    "@typescript-eslint/types": "npm:8.11.0"
+    "@typescript-eslint/typescript-estree": "npm:8.11.0"
+  peerDependencies:
+    eslint: ^8.57.0 || ^9.0.0
+  checksum: 10/1b80312a15313b549ff5906da2189d0ad60abe9c6d02d65366156e00a97644e2af313ce3fb7424417b4b63b6de25a2dd8c2cf17ab8152fbd5d2a8ca3593a4df5
+  languageName: node
+  linkType: hard
+
 "@typescript-eslint/visitor-keys@npm:5.58.0":
   version: 5.58.0
   resolution: "@typescript-eslint/visitor-keys@npm:5.58.0"
@@ -13673,6 +13990,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@typescript-eslint/visitor-keys@npm:8.11.0":
+  version: 8.11.0
+  resolution: "@typescript-eslint/visitor-keys@npm:8.11.0"
+  dependencies:
+    "@typescript-eslint/types": "npm:8.11.0"
+    eslint-visitor-keys: "npm:^3.4.3"
+  checksum: 10/8d2bed15cc17c3de67414afb343a2b5974ab4120a9bb4759f3d42accbc3f247d14d3c824772da1d452b99fd42b3d9856c04fb836be50ffbff4aa7323eca197c6
+  languageName: node
+  linkType: hard
+
+"@typescript-eslint/visitor-keys@npm:8.12.2":
+  version: 8.12.2
+  resolution: "@typescript-eslint/visitor-keys@npm:8.12.2"
+  dependencies:
+    "@typescript-eslint/types": "npm:8.12.2"
+    eslint-visitor-keys: "npm:^3.4.3"
+  checksum: 10/42795ad1c71520a367e2b53c3511b6cf922dcee05d61f6b0ec56b71c0b89a58889e0c3282b1bb13befc69df07204d0e4e053436d0c2b808460ce310b58a2a92e
+  languageName: node
+  linkType: hard
+
 "@ungap/promise-all-settled@npm:1.1.2":
   version: 1.1.2
   resolution: "@ungap/promise-all-settled@npm:1.1.2"
@@ -13680,13 +14017,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@ungap/structured-clone@npm:^1.0.0":
-  version: 1.2.0
-  resolution: "@ungap/structured-clone@npm:1.2.0"
-  checksum: 10/c6fe89a505e513a7592e1438280db1c075764793a2397877ff1351721fe8792a966a5359769e30242b3cd023f2efb9e63ca2ca88019d73b564488cc20e3eab12
-  languageName: node
-  linkType: hard
-
 "@vector-im/matrix-bot-sdk@npm:0.7.1-element.6, @vector-im/matrix-bot-sdk@npm:^0.7.1-element.6":
   version: 0.7.1-element.6
   resolution: "@vector-im/matrix-bot-sdk@npm:0.7.1-element.6"
@@ -13713,17 +14043,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vitejs/plugin-react@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "@vitejs/plugin-react@npm:4.0.0"
+"@vitejs/plugin-react@npm:^4.3.3":
+  version: 4.3.3
+  resolution: "@vitejs/plugin-react@npm:4.3.3"
   dependencies:
-    "@babel/core": "npm:^7.21.4"
-    "@babel/plugin-transform-react-jsx-self": "npm:^7.21.0"
-    "@babel/plugin-transform-react-jsx-source": "npm:^7.19.6"
-    react-refresh: "npm:^0.14.0"
+    "@babel/core": "npm:^7.25.2"
+    "@babel/plugin-transform-react-jsx-self": "npm:^7.24.7"
+    "@babel/plugin-transform-react-jsx-source": "npm:^7.24.7"
+    "@types/babel__core": "npm:^7.20.5"
+    react-refresh: "npm:^0.14.2"
   peerDependencies:
-    vite: ^4.2.0
-  checksum: 10/9e7378621cb7e4dacd7277cd83b55382febdd3ff4c8a47793895caa8bfe3ce42c3ebe4e4cc49c29b53846d28c2796cf32c5727a3f9e784f7855f4421a80fcf42
+    vite: ^4.2.0 || ^5.0.0
+  checksum: 10/816b47c54aefce198ce2fb2b3e63b5f158ab33b04713dbec0e780a89c5126d4ea6b08544972464c43096b16e90e7f467fcf19692fad30d4f8ca5bf9a386f38b3
   languageName: node
   linkType: hard
 
@@ -13748,12 +14079,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vitest/pretty-format@npm:2.1.3":
-  version: 2.1.3
-  resolution: "@vitest/pretty-format@npm:2.1.3"
+"@vitest/pretty-format@npm:2.1.4":
+  version: 2.1.4
+  resolution: "@vitest/pretty-format@npm:2.1.4"
   dependencies:
     tinyrainbow: "npm:^1.2.0"
-  checksum: 10/d9382ee93f0f32e2ef8fe03bda818e5277f052a50ddb05b6a6cf0864b2ccb228484f12f130c05faf62dc2140292ffafc213f2941b0fa24058b3ee2943daa286c
+  checksum: 10/434e6a7903f72a3796f26516ad728aca92724909e18fd3f2cd4b9b8b0ae2cc7b4cd86e92ab9f2ac7bc005c7a7ef0bcb9d768c0264b4b0625f1f0748cc615f1f6
   languageName: node
   linkType: hard
 
@@ -13778,14 +14109,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vitest/utils@npm:^2.0.5":
-  version: 2.1.3
-  resolution: "@vitest/utils@npm:2.1.3"
+"@vitest/utils@npm:^2.1.1":
+  version: 2.1.4
+  resolution: "@vitest/utils@npm:2.1.4"
   dependencies:
-    "@vitest/pretty-format": "npm:2.1.3"
-    loupe: "npm:^3.1.1"
+    "@vitest/pretty-format": "npm:2.1.4"
+    loupe: "npm:^3.1.2"
     tinyrainbow: "npm:^1.2.0"
-  checksum: 10/f064e6634cb84c925a17d8937df7441d150c3e24fa5bbd6304151d11dab6cdeb0cb3d5a95a9aacb8b416c87fb0d9aa8c6b9cc5e174191784231e8345948d6d18
+  checksum: 10/aaaf5310943abca0f0080d9638e67838f7e519d5670ec32e61184915efdfa5ec61d9b495cad6cb7dc492e8caeed14593e78dda77c8ea59c1671a231661f57142
   languageName: node
   linkType: hard
 
@@ -14095,13 +14426,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@zeit/schemas@npm:2.6.0":
-  version: 2.6.0
-  resolution: "@zeit/schemas@npm:2.6.0"
-  checksum: 10/63d4e79dd8ffb29dc4b9660070af08d8a32c00e4a09726e571b9d817abd4c8e600cf9135bee0a463463b5d8586eef48a8020b437e27574e4cc5c7cf352899cb1
-  languageName: node
-  linkType: hard
-
 "JSONStream@npm:^1.0.3":
   version: 1.3.5
   resolution: "JSONStream@npm:1.3.5"
@@ -14121,13 +14445,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"abbrev@npm:1, abbrev@npm:^1.0.0":
+"abbrev@npm:1":
   version: 1.1.1
   resolution: "abbrev@npm:1.1.1"
   checksum: 10/2d882941183c66aa665118bafdab82b7a177e9add5eb2776c33e960a4f3c89cff88a1b38aba13a456de01d0dd9d66a8bea7c903268b21ea91dd1097e1e2e8243
   languageName: node
   linkType: hard
 
+"abbrev@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "abbrev@npm:2.0.0"
+  checksum: 10/ca0a54e35bea4ece0ecb68a47b312e1a9a6f772408d5bcb9051230aaa94b0460671c5b5c9cb3240eb5b7bc94c52476550eb221f65a0bbd0145bdc9f3113a6707
+  languageName: node
+  linkType: hard
+
 "abort-controller@npm:^3.0.0":
   version: 3.0.0
   resolution: "abort-controller@npm:3.0.0"
@@ -14151,6 +14482,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"accepts@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "accepts@npm:2.0.0"
+  dependencies:
+    mime-types: "npm:^3.0.0"
+    negotiator: "npm:^1.0.0"
+  checksum: 10/ea1343992b40b2bfb3a3113fa9c3c2f918ba0f9197ae565c48d3f84d44b174f6b1d5cd9989decd7655963eb03a272abc36968cc439c2907f999bd5ef8653d5a7
+  languageName: node
+  linkType: hard
+
 "accepts@npm:~1.3.4, accepts@npm:~1.3.5, accepts@npm:~1.3.8":
   version: 1.3.8
   resolution: "accepts@npm:1.3.8"
@@ -14199,7 +14540,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn-jsx@npm:^5.3.1, acorn-jsx@npm:^5.3.2":
+"acorn-jsx@npm:^5.3.2":
   version: 5.3.2
   resolution: "acorn-jsx@npm:5.3.2"
   peerDependencies:
@@ -14219,21 +14560,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn-walk@npm:^7.0.0, acorn-walk@npm:^7.1.1, acorn-walk@npm:^7.2.0":
+"acorn-walk@npm:^7.0.0, acorn-walk@npm:^7.1.1":
   version: 7.2.0
   resolution: "acorn-walk@npm:7.2.0"
   checksum: 10/4d3e186f729474aed3bc3d0df44692f2010c726582655b20a23347bef650867655521c48ada444cb4fda241ee713dcb792da363ec74c6282fa884fb7144171bb
   languageName: node
   linkType: hard
 
-"acorn-walk@npm:^8.0.0, acorn-walk@npm:^8.0.2, acorn-walk@npm:^8.1.1":
+"acorn-walk@npm:^8.0.2, acorn-walk@npm:^8.1.1":
   version: 8.3.2
   resolution: "acorn-walk@npm:8.3.2"
   checksum: 10/57dbe2fd8cf744f562431775741c5c087196cd7a65ce4ccb3f3981cdfad25cd24ad2bad404997b88464ac01e789a0a61e5e355b2a84876f13deef39fb39686ca
   languageName: node
   linkType: hard
 
-"acorn@npm:^7.0.0, acorn@npm:^7.1.1, acorn@npm:^7.4.1":
+"acorn@npm:^7.0.0, acorn@npm:^7.1.1":
   version: 7.4.1
   resolution: "acorn@npm:7.4.1"
   bin:
@@ -14242,7 +14583,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"acorn@npm:^8.0.4, acorn@npm:^8.1.0, acorn@npm:^8.2.4, acorn@npm:^8.4.1, acorn@npm:^8.7.1, acorn@npm:^8.8.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0":
+"acorn@npm:^8.1.0, acorn@npm:^8.2.4, acorn@npm:^8.4.1, acorn@npm:^8.7.1, acorn@npm:^8.8.1, acorn@npm:^8.8.2, acorn@npm:^8.9.0":
   version: 8.11.3
   resolution: "acorn@npm:8.11.3"
   bin:
@@ -14293,6 +14634,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"agent-base@npm:^7.0.2, agent-base@npm:^7.1.0, agent-base@npm:^7.1.1":
+  version: 7.1.1
+  resolution: "agent-base@npm:7.1.1"
+  dependencies:
+    debug: "npm:^4.3.4"
+  checksum: 10/c478fec8f79953f118704d007a38f2a185458853f5c45579b9669372bd0e12602e88dc2ad0233077831504f7cd6fcc8251c383375bba5eaaf563b102938bda26
+  languageName: node
+  linkType: hard
+
 "agentkeepalive@npm:^4.2.1":
   version: 4.2.1
   resolution: "agentkeepalive@npm:4.2.1"
@@ -14314,7 +14664,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ajv-formats@npm:^2.1.1, ajv-formats@npm:~2.1.1":
+"ajv-formats@npm:^2.1.1":
   version: 2.1.1
   resolution: "ajv-formats@npm:2.1.1"
   dependencies:
@@ -14328,6 +14678,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ajv-formats@npm:^3.0.1, ajv-formats@npm:~3.0.1":
+  version: 3.0.1
+  resolution: "ajv-formats@npm:3.0.1"
+  dependencies:
+    ajv: "npm:^8.0.0"
+  peerDependencies:
+    ajv: ^8.0.0
+  peerDependenciesMeta:
+    ajv:
+      optional: true
+  checksum: 10/5679b9f9ced9d0213a202a37f3aa91efcffe59a6de1a6e3da5c873344d3c161820a1f11cc29899661fee36271fd2895dd3851b6461c902a752ad661d1c1e8722
+  languageName: node
+  linkType: hard
+
 "ajv-keywords@npm:^3.5.2":
   version: 3.5.2
   resolution: "ajv-keywords@npm:3.5.2"
@@ -14348,19 +14712,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ajv@npm:6.5.3":
-  version: 6.5.3
-  resolution: "ajv@npm:6.5.3"
-  dependencies:
-    fast-deep-equal: "npm:^2.0.1"
-    fast-json-stable-stringify: "npm:^2.0.0"
-    json-schema-traverse: "npm:^0.4.1"
-    uri-js: "npm:^4.2.2"
-  checksum: 10/f7ac791b1e572594f4314a5a2e89999fd0d209a241b6576987016a0903bea7cb158fee267717a8b1408af27ae63bba2b041053f47c4000ba0199d1712adf4b3b
-  languageName: node
-  linkType: hard
-
-"ajv@npm:^6.10.0, ajv@npm:^6.11.0, ajv@npm:^6.12.3, ajv@npm:^6.12.4, ajv@npm:^6.12.5":
+"ajv@npm:^6.10.0, ajv@npm:^6.10.2, ajv@npm:^6.11.0, ajv@npm:^6.12.3, ajv@npm:^6.12.4, ajv@npm:^6.12.5":
   version: 6.12.6
   resolution: "ajv@npm:6.12.6"
   dependencies:
@@ -14372,7 +14724,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ajv@npm:^8.0.0, ajv@npm:^8.0.1, ajv@npm:^8.11.0, ajv@npm:^8.8.0":
+"ajv@npm:^8.0.0, ajv@npm:^8.0.1, ajv@npm:^8.8.0":
   version: 8.12.0
   resolution: "ajv@npm:8.12.0"
   dependencies:
@@ -14384,7 +14736,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ajv@npm:^8.9.0":
+"ajv@npm:^8.17.1, ajv@npm:^8.9.0":
   version: 8.17.1
   resolution: "ajv@npm:8.17.1"
   dependencies:
@@ -14426,15 +14778,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ansi-align@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "ansi-align@npm:2.0.0"
-  dependencies:
-    string-width: "npm:^2.0.0"
-  checksum: 10/ddf3714c9395bc5e69dc0bfad0a545934c66c4a543e861f590a717581b1e903ea72f587f21f5698b7b670d35162f035839ba1a5bde551b3ac779392c101186ec
-  languageName: node
-  linkType: hard
-
 "ansi-color@npm:^0.2.1":
   version: 0.2.1
   resolution: "ansi-color@npm:0.2.1"
@@ -14456,13 +14799,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ansi-escapes@npm:^3.2.0":
-  version: 3.2.0
-  resolution: "ansi-escapes@npm:3.2.0"
-  checksum: 10/0f94695b677ea742f7f1eed961f7fd8d05670f744c6ad1f8f635362f6681dcfbc1575cb05b43abc7bb6d67e25a75fb8c7ea8f2a57330eb2c76b33f18cb2cef0a
-  languageName: node
-  linkType: hard
-
 "ansi-escapes@npm:^4.2.1":
   version: 4.3.2
   resolution: "ansi-escapes@npm:4.3.2"
@@ -14488,13 +14824,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ansi-regex@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "ansi-regex@npm:3.0.1"
-  checksum: 10/09daf180c5f59af9850c7ac1bd7fda85ba596cc8cbeb210826e90755f06c818af86d9fa1e6e8322fab2c3b9e9b03f56c537b42241139f824dd75066a1e7257cc
-  languageName: node
-  linkType: hard
-
 "ansi-regex@npm:^4.1.0":
   version: 4.1.1
   resolution: "ansi-regex@npm:4.1.1"
@@ -14574,13 +14903,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"any-promise@npm:^1.0.0":
-  version: 1.3.0
-  resolution: "any-promise@npm:1.3.0"
-  checksum: 10/6737469ba353b5becf29e4dc3680736b9caa06d300bda6548812a8fee63ae7d336d756f88572fa6b5219aed36698d808fa55f62af3e7e6845c7a1dc77d240edb
-  languageName: node
-  linkType: hard
-
 "anymatch@npm:^3.0.3, anymatch@npm:~3.1.2":
   version: 3.1.2
   resolution: "anymatch@npm:3.1.2"
@@ -14622,30 +14944,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"application-config-path@npm:^0.1.0":
-  version: 0.1.0
-  resolution: "application-config-path@npm:0.1.0"
-  checksum: 10/bbf52e906f798748086ba82a0a33f35d25f469c5bdb4b9398462b9c757c3b9d68b3720e11955264859f75120b07b63580d1980a92fc8b119fd8525517ff05737
-  languageName: node
-  linkType: hard
-
-"application-config@npm:~1.0.0":
-  version: 1.0.1
-  resolution: "application-config@npm:1.0.1"
-  dependencies:
-    application-config-path: "npm:^0.1.0"
-    mkdirp: "npm:^0.5.1"
-  checksum: 10/3b313a5151377b7521f795573be84d0b2245d4a11980acf9052733a5ae7605bd4c8deae4089880a57ca24ab554c3f7ce0e81a6101935d2bbed89b5e1b7a316b8
-  languageName: node
-  linkType: hard
-
-"aproba@npm:^1.0.3":
-  version: 1.2.0
-  resolution: "aproba@npm:1.2.0"
-  checksum: 10/48def777330afca699880126b555273cd9912525500edc5866b527da6fd6c54badd3ae6cc6039081e5bc22e9b349d8e65fd70f8499beb090f86aa6261e4242dd
-  languageName: node
-  linkType: hard
-
 "aproba@npm:^1.0.3 || ^2.0.0":
   version: 2.0.0
   resolution: "aproba@npm:2.0.0"
@@ -14669,36 +14967,33 @@ __metadata:
   languageName: node
   linkType: hard
 
-"archiver-utils@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "archiver-utils@npm:2.1.0"
+"archiver-utils@npm:^5.0.0, archiver-utils@npm:^5.0.2":
+  version: 5.0.2
+  resolution: "archiver-utils@npm:5.0.2"
   dependencies:
-    glob: "npm:^7.1.4"
+    glob: "npm:^10.0.0"
     graceful-fs: "npm:^4.2.0"
+    is-stream: "npm:^2.0.1"
     lazystream: "npm:^1.0.0"
-    lodash.defaults: "npm:^4.2.0"
-    lodash.difference: "npm:^4.5.0"
-    lodash.flatten: "npm:^4.4.0"
-    lodash.isplainobject: "npm:^4.0.6"
-    lodash.union: "npm:^4.6.0"
+    lodash: "npm:^4.17.15"
     normalize-path: "npm:^3.0.0"
-    readable-stream: "npm:^2.0.0"
-  checksum: 10/4df493c0e6a3a544119b08b350308923500e2c6efee6a283cba4c3202293ce3acb70897e54e24f735e3a38ff43e5a65f66e2e5225fdfc955bf2335491377be2e
+    readable-stream: "npm:^4.0.0"
+  checksum: 10/9dde4aa3f0cb1bdfe0b3d4c969f82e6cca9ae76338b7fee6f0071a14a2a38c0cdd1c41ecd3e362466585aa6cc5d07e9e435abea8c94fd9c7ace35f184abef9e4
   languageName: node
   linkType: hard
 
-"archiver@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "archiver@npm:3.1.1"
+"archiver@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "archiver@npm:7.0.1"
   dependencies:
-    archiver-utils: "npm:^2.1.0"
-    async: "npm:^2.6.3"
-    buffer-crc32: "npm:^0.2.1"
-    glob: "npm:^7.1.4"
-    readable-stream: "npm:^3.4.0"
-    tar-stream: "npm:^2.1.0"
-    zip-stream: "npm:^2.1.2"
-  checksum: 10/259a5c224264a22204ad7a3b1273fe69fa8387b9d4bf47eecd8a97e28349c42780eb6c01b4535bdc16178252104f59a8857e82759e771bf3a3c35d9d1a1d3abf
+    archiver-utils: "npm:^5.0.2"
+    async: "npm:^3.2.4"
+    buffer-crc32: "npm:^1.0.0"
+    readable-stream: "npm:^4.0.0"
+    readdir-glob: "npm:^1.1.2"
+    tar-stream: "npm:^3.0.0"
+    zip-stream: "npm:^6.0.1"
+  checksum: 10/81c6102db99d7ffd5cb2aed02a678f551c6603991a059ca66ef59249942b835a651a3d3b5240af4f8bec4e61e13790357c9d1ad4a99982bd2cc4149575c31d67
   languageName: node
   linkType: hard
 
@@ -14729,13 +15024,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"arg@npm:2.0.0":
-  version: 2.0.0
-  resolution: "arg@npm:2.0.0"
-  checksum: 10/3083ebcd5720ff11f9b9a73078cf520e14d0c266617168072d36a9a04ccf64cf8bb16a3d72a646c897b3f7cb1f20f3082e04823e799c56aada9ce6e46207b722
-  languageName: node
-  linkType: hard
-
 "arg@npm:^4.1.0":
   version: 4.1.3
   resolution: "arg@npm:4.1.3"
@@ -14771,7 +15059,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"aria-query@npm:5.3.0, aria-query@npm:^5.0.0, aria-query@npm:^5.3.0":
+"aria-query@npm:5.3.0, aria-query@npm:^5.0.0":
   version: 5.3.0
   resolution: "aria-query@npm:5.3.0"
   dependencies:
@@ -14780,6 +15068,34 @@ __metadata:
   languageName: node
   linkType: hard
 
+"aria-query@npm:^5.3.2":
+  version: 5.3.2
+  resolution: "aria-query@npm:5.3.2"
+  checksum: 10/b2fe9bc98bd401bc322ccb99717c1ae2aaf53ea0d468d6e7aebdc02fac736e4a99b46971ee05b783b08ade23c675b2d8b60e4a1222a95f6e27bc4d2a0bfdcc03
+  languageName: node
+  linkType: hard
+
+"arr-diff@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "arr-diff@npm:4.0.0"
+  checksum: 10/ea7c8834842ad3869297f7915689bef3494fd5b102ac678c13ffccab672d3d1f35802b79e90c4cfec2f424af3392e44112d1ccf65da34562ed75e049597276a0
+  languageName: node
+  linkType: hard
+
+"arr-flatten@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "arr-flatten@npm:1.1.0"
+  checksum: 10/963fe12564fca2f72c055f3f6c206b9e031f7c433a0c66ca9858b484821f248c5b1e5d53c8e4989d80d764cd776cf6d9b160ad05f47bdc63022bfd63b5455e22
+  languageName: node
+  linkType: hard
+
+"arr-union@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "arr-union@npm:3.1.0"
+  checksum: 10/b5b0408c6eb7591143c394f3be082fee690ddd21f0fdde0a0a01106799e847f67fcae1b7e56b0a0c173290e29c6aca9562e82b300708a268bc8f88f3d6613cb9
+  languageName: node
+  linkType: hard
+
 "array-buffer-byte-length@npm:^1.0.1":
   version: 1.0.1
   resolution: "array-buffer-byte-length@npm:1.0.1"
@@ -14790,6 +15106,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"array-find-index@npm:^1.0.1":
+  version: 1.0.2
+  resolution: "array-find-index@npm:1.0.2"
+  checksum: 10/aac128bf369e1ac6c06ff0bb330788371c0e256f71279fb92d745e26fb4b9db8920e485b4ec25e841c93146bf71a34dcdbcefa115e7e0f96927a214d237b7081
+  languageName: node
+  linkType: hard
+
 "array-flatten@npm:1.1.1":
   version: 1.1.1
   resolution: "array-flatten@npm:1.1.1"
@@ -14797,7 +15120,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array-includes@npm:^3.1.4, array-includes@npm:^3.1.6, array-includes@npm:^3.1.7":
+"array-flatten@npm:3.0.0":
+  version: 3.0.0
+  resolution: "array-flatten@npm:3.0.0"
+  checksum: 10/e1b11b51c0e0f0b1315ddab1d8e1760bbc76b4387290f73232d71195aa93e3f55179c434cac48f2c1446c614758b073b059bb0b2b545b8f0ec4af0cae9dc4371
+  languageName: node
+  linkType: hard
+
+"array-includes@npm:^3.1.6, array-includes@npm:^3.1.8":
   version: 3.1.8
   resolution: "array-includes@npm:3.1.8"
   dependencies:
@@ -14818,7 +15148,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array-union@npm:^1.0.1":
+"array-union@npm:^1.0.1, array-union@npm:^1.0.2":
   version: 1.0.2
   resolution: "array-union@npm:1.0.2"
   dependencies:
@@ -14848,7 +15178,42 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array.prototype.flat@npm:^1.2.3, array.prototype.flat@npm:^1.2.5, array.prototype.flat@npm:^1.3.1":
+"array-unique@npm:^0.3.2":
+  version: 0.3.2
+  resolution: "array-unique@npm:0.3.2"
+  checksum: 10/da344b89cfa6b0a5c221f965c21638bfb76b57b45184a01135382186924f55973cd9b171d4dad6bf606c6d9d36b0d721d091afdc9791535ead97ccbe78f8a888
+  languageName: node
+  linkType: hard
+
+"array.prototype.findlast@npm:^1.2.5":
+  version: 1.2.5
+  resolution: "array.prototype.findlast@npm:1.2.5"
+  dependencies:
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.2"
+    es-errors: "npm:^1.3.0"
+    es-object-atoms: "npm:^1.0.0"
+    es-shim-unscopables: "npm:^1.0.2"
+  checksum: 10/7dffcc665aa965718ad6de7e17ac50df0c5e38798c0a5bf9340cf24feb8594df6ec6f3fcbe714c1577728a1b18b5704b15669474b27bceeca91ef06ce2a23c31
+  languageName: node
+  linkType: hard
+
+"array.prototype.findlastindex@npm:^1.2.5":
+  version: 1.2.5
+  resolution: "array.prototype.findlastindex@npm:1.2.5"
+  dependencies:
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.2"
+    es-errors: "npm:^1.3.0"
+    es-object-atoms: "npm:^1.0.0"
+    es-shim-unscopables: "npm:^1.0.2"
+  checksum: 10/7c5c821f357cd53ab6cc305de8086430dd8d7a2485db87b13f843e868055e9582b1fd338f02338f67fc3a1603ceaf9610dd2a470b0b506f9d18934780f95b246
+  languageName: node
+  linkType: hard
+
+"array.prototype.flat@npm:^1.3.1, array.prototype.flat@npm:^1.3.2":
   version: 1.3.2
   resolution: "array.prototype.flat@npm:1.3.2"
   dependencies:
@@ -14860,7 +15225,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array.prototype.flatmap@npm:^1.3.1, array.prototype.flatmap@npm:^1.3.2":
+"array.prototype.flatmap@npm:^1.3.2":
   version: 1.3.2
   resolution: "array.prototype.flatmap@npm:1.3.2"
   dependencies:
@@ -14872,29 +15237,31 @@ __metadata:
   languageName: node
   linkType: hard
 
-"array.prototype.map@npm:^1.0.5":
-  version: 1.0.6
-  resolution: "array.prototype.map@npm:1.0.6"
+"array.prototype.reduce@npm:^1.0.6":
+  version: 1.0.7
+  resolution: "array.prototype.reduce@npm:1.0.7"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.2.0"
-    es-abstract: "npm:^1.22.1"
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.2"
     es-array-method-boxes-properly: "npm:^1.0.0"
+    es-errors: "npm:^1.3.0"
+    es-object-atoms: "npm:^1.0.0"
     is-string: "npm:^1.0.7"
-  checksum: 10/9af3eea249848fc092b8aa8f2e8d62108ebe67cb4b969f3faf7cb4729124a11d215399dfc0330fc9102b942015355004d834da8116ba4a0edce33699cbaccbc8
+  checksum: 10/3a4fa56cf5843d821e97680861c8edfdfe6684a7f7cd1145ed611b5fa611fd62d1b149a438ae24ae884c843876a6539b67fbcacdd3276f89731eee9415dc9012
   languageName: node
   linkType: hard
 
-"array.prototype.tosorted@npm:^1.1.1":
-  version: 1.1.1
-  resolution: "array.prototype.tosorted@npm:1.1.1"
+"array.prototype.tosorted@npm:^1.1.4":
+  version: 1.1.4
+  resolution: "array.prototype.tosorted@npm:1.1.4"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.1.4"
-    es-abstract: "npm:^1.20.4"
-    es-shim-unscopables: "npm:^1.0.0"
-    get-intrinsic: "npm:^1.1.3"
-  checksum: 10/23e86074d0dda9260aaa137ec45ae5a8196916ee3f256e41665381f120fdb5921bd84ad93eeba8d0234e5cd355093049585167ba2307fde340e5cee15b12415d
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.3"
+    es-errors: "npm:^1.3.0"
+    es-shim-unscopables: "npm:^1.0.2"
+  checksum: 10/874694e5d50e138894ff5b853e639c29b0aa42bbd355acda8e8e9cd337f1c80565f21edc15e8c727fa4c0877fd9d8783c575809e440cc4d2d19acaa048bf967d
   languageName: node
   linkType: hard
 
@@ -14999,6 +15366,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"assign-symbols@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "assign-symbols@npm:1.0.0"
+  checksum: 10/c0eb895911d05b6b2d245154f70461c5e42c107457972e5ebba38d48967870dee53bcdf6c7047990586daa80fab8dab3cc6300800fbd47b454247fdedd859a2c
+  languageName: node
+  linkType: hard
+
 "ast-types-flow@npm:^0.0.8":
   version: 0.0.8
   resolution: "ast-types-flow@npm:0.0.8"
@@ -15022,6 +15396,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"astral-regex@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "astral-regex@npm:1.0.0"
+  checksum: 10/93417fc0879531cd95ace2560a54df865c9461a3ac0714c60cbbaa5f1f85d2bee85489e78d82f70b911b71ac25c5f05fc5a36017f44c9bb33c701bee229ff848
+  languageName: node
+  linkType: hard
+
 "astral-regex@npm:^2.0.0":
   version: 2.0.0
   resolution: "astral-regex@npm:2.0.0"
@@ -15029,13 +15410,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"async-limiter@npm:~1.0.0":
-  version: 1.0.1
-  resolution: "async-limiter@npm:1.0.1"
-  checksum: 10/2b849695b465d93ad44c116220dee29a5aeb63adac16c1088983c339b0de57d76e82533e8e364a93a9f997f28bbfc6a92948cefc120652bd07f3b59f8d75cf2b
-  languageName: node
-  linkType: hard
-
 "async-lock@npm:^1.4.0":
   version: 1.4.1
   resolution: "async-lock@npm:1.4.1"
@@ -15059,22 +15433,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"async@npm:^0.9.0":
-  version: 0.9.2
-  resolution: "async@npm:0.9.2"
-  checksum: 10/69b95732694464bc43da32ac26e39e5a193008a528a1d689b687bbc82355496c0270bbd9885ee8c3d0eeff794e2ac4ce93499a7bcbde5e010697d93d45254b61
-  languageName: node
-  linkType: hard
-
-"async@npm:^2.6.3":
-  version: 2.6.4
-  resolution: "async@npm:2.6.4"
-  dependencies:
-    lodash: "npm:^4.17.14"
-  checksum: 10/df8e52817d74677ab50c438d618633b9450aff26deb274da6dfedb8014130909482acdc7753bce9b72e6171ce9a9f6a92566c4ced34c3cb3714d57421d58ad27
-  languageName: node
-  linkType: hard
-
 "async@npm:^3.2.3":
   version: 3.2.3
   resolution: "async@npm:3.2.3"
@@ -15082,6 +15440,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"async@npm:^3.2.4":
+  version: 3.2.6
+  resolution: "async@npm:3.2.6"
+  checksum: 10/cb6e0561a3c01c4b56a799cc8bab6ea5fef45f069ab32500b6e19508db270ef2dffa55e5aed5865c5526e9907b1f8be61b27530823b411ffafb5e1538c86c368
+  languageName: node
+  linkType: hard
+
 "asynckit@npm:^0.4.0":
   version: 0.4.0
   resolution: "asynckit@npm:0.4.0"
@@ -15096,6 +15461,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"atob@npm:^2.1.2":
+  version: 2.1.2
+  resolution: "atob@npm:2.1.2"
+  bin:
+    atob: bin/atob.js
+  checksum: 10/0624406cc0295533b38b60ab2e3b028aa7b8225f37e0cde6be3bc5c13a8015c889b192e874fd7660671179cef055f2e258855f372b0e495bd4096cf0b4785c25
+  languageName: node
+  linkType: hard
+
 "atomic-sleep@npm:^1.0.0":
   version: 1.0.0
   resolution: "atomic-sleep@npm:1.0.0"
@@ -15103,7 +15477,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"autoprefixer@npm:^9.8.8":
+"autoprefixer@npm:^9.0.0, autoprefixer@npm:^9.8.8":
   version: 9.8.8
   resolution: "autoprefixer@npm:9.8.8"
   dependencies:
@@ -15144,9 +15518,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"aws-sdk@npm:^2.1363.0":
-  version: 2.1363.0
-  resolution: "aws-sdk@npm:2.1363.0"
+"aws-sdk@npm:^2.1691.0":
+  version: 2.1691.0
+  resolution: "aws-sdk@npm:2.1691.0"
   dependencies:
     buffer: "npm:4.9.2"
     events: "npm:1.1.1"
@@ -15157,8 +15531,8 @@ __metadata:
     url: "npm:0.10.3"
     util: "npm:^0.12.4"
     uuid: "npm:8.0.0"
-    xml2js: "npm:0.5.0"
-  checksum: 10/6fe201bc5c0bf5b1837b7e15ec35bea4cb8ec65dcb748c9716a219a50ddd99762fe507c90b2b9c8fd4f9f3a7ed26a334e43114dbd5c821292994e9f7e9c20fb2
+    xml2js: "npm:0.6.2"
+  checksum: 10/387de8206cc134516aea8d7357a3c9a07317c0976bbc70f346981261fe57130eaecc4b74ca7feddc5c09a588a8cc2bd7d5cf13115c3a9f3ea76ce4c07992cbd8
   languageName: node
   linkType: hard
 
@@ -15183,13 +15557,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axe-core@npm:=4.7.0":
-  version: 4.7.0
-  resolution: "axe-core@npm:4.7.0"
-  checksum: 10/615c0f7722c3c9fcf353dbd70b00e2ceae234d4c17cbc839dd85c01d16797c4e4da45f8d27c6118e9e6b033fb06efd196106e13651a1b2f3a10e0f11c7b2f660
-  languageName: node
-  linkType: hard
-
 "axe-core@npm:^3.5.5":
   version: 3.5.6
   resolution: "axe-core@npm:3.5.6"
@@ -15197,19 +15564,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axe-core@npm:^4.2.0, axe-core@npm:^4.7.0":
-  version: 4.7.2
-  resolution: "axe-core@npm:4.7.2"
-  checksum: 10/1b94fcbe203296fc7174992a3d70dbcd477d88b933afa045aaffa1704fe63d8da8945e4b38fc576f9c7384abeb353e2d6607ab54d25b5c90b255ef2244bda29a
+"axe-core@npm:^4.10.0, axe-core@npm:~4.10.2":
+  version: 4.10.2
+  resolution: "axe-core@npm:4.10.2"
+  checksum: 10/a69423b2ff16c15922c4ea7cf9cc5112728a2817bbe0f2cc212248d648885ffd1ba554e3a341dfc289cd9e67fc0d06f333b5c6837c5c38ca6652507381216fc1
   languageName: node
   linkType: hard
 
-"axios@npm:^0.21.1":
-  version: 0.21.4
-  resolution: "axios@npm:0.21.4"
-  dependencies:
-    follow-redirects: "npm:^1.14.0"
-  checksum: 10/da644592cb6f8f9f8c64fdabd7e1396d6769d7a4c1ea5f8ae8beb5c2eb90a823e3a574352b0b934ac62edc762c0f52647753dc54f7d07279127a7e5c4cd20272
+"axe-core@npm:^4.2.0":
+  version: 4.7.2
+  resolution: "axe-core@npm:4.7.2"
+  checksum: 10/1b94fcbe203296fc7174992a3d70dbcd477d88b933afa045aaffa1704fe63d8da8945e4b38fc576f9c7384abeb353e2d6607ab54d25b5c90b255ef2244bda29a
   languageName: node
   linkType: hard
 
@@ -15241,12 +15606,32 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axobject-query@npm:^3.2.1":
-  version: 3.2.1
-  resolution: "axobject-query@npm:3.2.1"
+"axios@npm:^1.7.4":
+  version: 1.7.7
+  resolution: "axios@npm:1.7.7"
   dependencies:
-    dequal: "npm:^2.0.3"
-  checksum: 10/675af2548ed4ece75ad6d50cc0473cfdec7579eac77ec9861e7088d03ffb171aa697b70d2877423bee2ce16460ef62c698c6442a105612cc015719e8ea06b0bd
+    follow-redirects: "npm:^1.15.6"
+    form-data: "npm:^4.0.0"
+    proxy-from-env: "npm:^1.1.0"
+  checksum: 10/7f875ea13b9298cd7b40fd09985209f7a38d38321f1118c701520939de2f113c4ba137832fe8e3f811f99a38e12c8225481011023209a77b0c0641270e20cde1
+  languageName: node
+  linkType: hard
+
+"axios@npm:~1.6.8":
+  version: 1.6.8
+  resolution: "axios@npm:1.6.8"
+  dependencies:
+    follow-redirects: "npm:^1.15.6"
+    form-data: "npm:^4.0.0"
+    proxy-from-env: "npm:^1.1.0"
+  checksum: 10/3f9a79eaf1d159544fca9576261ff867cbbff64ed30017848e4210e49f3b01e97cf416390150e6fdf6633f336cd43dc1151f890bbd09c3c01ad60bb0891eee63
+  languageName: node
+  linkType: hard
+
+"axobject-query@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "axobject-query@npm:4.1.0"
+  checksum: 10/e275dea9b673f71170d914f2d2a18be5d57d8d29717b629e7fedd907dcc2ebdc7a37803ff975874810bd423f222f299c020d28fde40a146f537448bf6bfecb6e
   languageName: node
   linkType: hard
 
@@ -15257,7 +15642,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-jest@npm:^29.0.3, babel-jest@npm:^29.5.0, babel-jest@npm:^29.7.0":
+"babel-jest@npm:^29.7.0":
   version: 29.7.0
   resolution: "babel-jest@npm:29.7.0"
   dependencies:
@@ -15274,22 +15659,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-loader@npm:^8.3.0, babel-loader@npm:~8.3.0":
-  version: 8.3.0
-  resolution: "babel-loader@npm:8.3.0"
-  dependencies:
-    find-cache-dir: "npm:^3.3.1"
-    loader-utils: "npm:^2.0.0"
-    make-dir: "npm:^3.1.0"
-    schema-utils: "npm:^2.6.5"
-  peerDependencies:
-    "@babel/core": ^7.0.0
-    webpack: ">=2"
-  checksum: 10/e775e96f605f10d68adc693403ccda2470e856cc52e6017f3621c17dade003d0fc53facfce7b4ada02273a1c0a6a48167f798cc81b73110585d74bf890b39bd5
-  languageName: node
-  linkType: hard
-
-"babel-loader@npm:^9.1.3":
+"babel-loader@npm:^9.1.3, babel-loader@npm:^9.2.1, babel-loader@npm:~9.2.1":
   version: 9.2.1
   resolution: "babel-loader@npm:9.2.1"
   dependencies:
@@ -15302,34 +15672,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-loader@npm:~8.2.5":
-  version: 8.2.5
-  resolution: "babel-loader@npm:8.2.5"
-  dependencies:
-    find-cache-dir: "npm:^3.3.1"
-    loader-utils: "npm:^2.0.0"
-    make-dir: "npm:^3.1.0"
-    schema-utils: "npm:^2.6.5"
-  peerDependencies:
-    "@babel/core": ^7.0.0
-    webpack: ">=2"
-  checksum: 10/2b40b410cb452f2a31e733f4493008aed42151d8787d2b5891cb0e58e795f97f9288f7274319eaa2d0b84c3d0d478dbdc0c2cd17c9bc3489e45ef504171e0e18
-  languageName: node
-  linkType: hard
-
-"babel-loader@npm:~9.1.3":
-  version: 9.1.3
-  resolution: "babel-loader@npm:9.1.3"
-  dependencies:
-    find-cache-dir: "npm:^4.0.0"
-    schema-utils: "npm:^4.0.0"
-  peerDependencies:
-    "@babel/core": ^7.12.0
-    webpack: ">=5"
-  checksum: 10/7086e678273b5d1261141dca84ed784caab9f7921c8c24d7278c8ee3088235a9a9fd85caac9f0fa687336cb3c27248ca22dbf431469769b1b995d55aec606992
-  languageName: node
-  linkType: hard
-
 "babel-plugin-array-includes@npm:^2.0.3":
   version: 2.0.3
   resolution: "babel-plugin-array-includes@npm:2.0.3"
@@ -15564,6 +15906,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"base@npm:^0.11.1":
+  version: 0.11.2
+  resolution: "base@npm:0.11.2"
+  dependencies:
+    cache-base: "npm:^1.0.1"
+    class-utils: "npm:^0.3.5"
+    component-emitter: "npm:^1.2.1"
+    define-property: "npm:^1.0.0"
+    isobject: "npm:^3.0.1"
+    mixin-deep: "npm:^1.2.0"
+    pascalcase: "npm:^0.1.1"
+  checksum: 10/33b0c5d570840873cf370248e653d43e8d82ce4f03161ad3c58b7da6238583cfc65bf4bbb06b27050d6c2d8f40628777f3933f483c0a7c0274fcef4c51f70a7e
+  languageName: node
+  linkType: hard
+
 "basic-auth@npm:2.0.1, basic-auth@npm:~2.0.1":
   version: 2.0.1
   resolution: "basic-auth@npm:2.0.1"
@@ -15589,13 +15946,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bcrypt@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "bcrypt@npm:5.0.1"
+"bcrypt@npm:^5.1.1":
+  version: 5.1.1
+  resolution: "bcrypt@npm:5.1.1"
   dependencies:
-    "@mapbox/node-pre-gyp": "npm:^1.0.0"
-    node-addon-api: "npm:^3.1.0"
-  checksum: 10/50dc6aea8fad09a0b8619231c569061efe04daea24d72d251c4a096985283c529c4599ac685c67060e8be7391488f2ea3bd455a8b65c26755cdc80cce2e227c8
+    "@mapbox/node-pre-gyp": "npm:^1.0.11"
+    node-addon-api: "npm:^5.0.0"
+  checksum: 10/be6af3a93d90a0071c3b4412e8b82e2f319e26cb4e6cb14a1790cfe7c164792fa8add3ac9f30278a017d7d332ee8852601ce81a69737e9bfb9f10c878dd3d0dd
   languageName: node
   linkType: hard
 
@@ -15756,15 +16113,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bl@npm:~1.1.2":
-  version: 1.1.2
-  resolution: "bl@npm:1.1.2"
-  dependencies:
-    readable-stream: "npm:~2.0.5"
-  checksum: 10/a95b7fabf104bbadca966e3c4c5356bc31e5a45d848245015c783ac9e47b849cd07f657c66e5da042401c4e7911881927a5320a1bac41d6838c90c017e2dd083
-  languageName: node
-  linkType: hard
-
 "bluebird@npm:3.7.2, bluebird@npm:^3.1.5, bluebird@npm:^3.5.0":
   version: 3.7.2
   resolution: "bluebird@npm:3.7.2"
@@ -15800,26 +16148,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"body-parser@npm:1.20.1":
-  version: 1.20.1
-  resolution: "body-parser@npm:1.20.1"
-  dependencies:
-    bytes: "npm:3.1.2"
-    content-type: "npm:~1.0.4"
-    debug: "npm:2.6.9"
-    depd: "npm:2.0.0"
-    destroy: "npm:1.2.0"
-    http-errors: "npm:2.0.0"
-    iconv-lite: "npm:0.4.24"
-    on-finished: "npm:2.4.1"
-    qs: "npm:6.11.0"
-    raw-body: "npm:2.5.1"
-    type-is: "npm:~1.6.18"
-    unpipe: "npm:1.0.0"
-  checksum: 10/5f8d128022a2fb8b6e7990d30878a0182f300b70e46b3f9d358a9433ad6275f0de46add6d63206da3637c01c3b38b6111a7480f7e7ac2e9f7b989f6133fe5510
-  languageName: node
-  linkType: hard
-
 "body-parser@npm:1.20.3, body-parser@npm:^1.20.3":
   version: 1.20.3
   resolution: "body-parser@npm:1.20.3"
@@ -15860,6 +16188,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"body-parser@npm:^2.0.1":
+  version: 2.0.2
+  resolution: "body-parser@npm:2.0.2"
+  dependencies:
+    bytes: "npm:3.1.2"
+    content-type: "npm:~1.0.5"
+    debug: "npm:3.1.0"
+    destroy: "npm:1.2.0"
+    http-errors: "npm:2.0.0"
+    iconv-lite: "npm:0.5.2"
+    on-finished: "npm:2.4.1"
+    qs: "npm:6.13.0"
+    raw-body: "npm:^3.0.0"
+    type-is: "npm:~1.6.18"
+  checksum: 10/3b381210daa9bbe90b6dc21fa9d4580b6842f7620437ec89c2522461150ceea11701ed6d7b23876d61056e9d64ee66a29ce00c0ef252a810edf4d7d45aa94455
+  languageName: node
+  linkType: hard
+
 "bonjour-service@npm:^1.2.1":
   version: 1.2.1
   resolution: "bonjour-service@npm:1.2.1"
@@ -15891,21 +16237,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"boxen@npm:1.3.0, boxen@npm:^1.2.1":
-  version: 1.3.0
-  resolution: "boxen@npm:1.3.0"
-  dependencies:
-    ansi-align: "npm:^2.0.0"
-    camelcase: "npm:^4.0.0"
-    chalk: "npm:^2.0.1"
-    cli-boxes: "npm:^1.0.0"
-    string-width: "npm:^2.0.0"
-    term-size: "npm:^1.2.0"
-    widest-line: "npm:^2.0.0"
-  checksum: 10/8dad2081bfaf5a86cb85685882b5f22027c5c430ee0974894078f521a44d92a90222fb4391b41fc4575aa1215c9133ea2c6b7feadcd1cb2fae8f4e97c05dbf11
-  languageName: node
-  linkType: hard
-
 "brace-expansion@npm:^1.1.7":
   version: 1.1.11
   resolution: "brace-expansion@npm:1.1.11"
@@ -15925,6 +16256,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"braces@npm:^2.3.1":
+  version: 2.3.2
+  resolution: "braces@npm:2.3.2"
+  dependencies:
+    arr-flatten: "npm:^1.1.0"
+    array-unique: "npm:^0.3.2"
+    extend-shallow: "npm:^2.0.1"
+    fill-range: "npm:^4.0.0"
+    isobject: "npm:^3.0.1"
+    repeat-element: "npm:^1.1.2"
+    snapdragon: "npm:^0.8.1"
+    snapdragon-node: "npm:^2.0.1"
+    split-string: "npm:^3.0.2"
+    to-regex: "npm:^3.0.1"
+  checksum: 10/7c0f0d962570812009b050ee2e6243fd425ea80d3136aace908d0038bde9e7a43e9326fa35538cebf7c753f0482655f08ea11be074c9a140394287980a5c66c9
+  languageName: node
+  linkType: hard
+
 "braces@npm:^3.0.2, braces@npm:~3.0.2":
   version: 3.0.2
   resolution: "braces@npm:3.0.2"
@@ -15934,12 +16283,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"breakword@npm:^1.0.5":
-  version: 1.0.5
-  resolution: "breakword@npm:1.0.5"
+"braces@npm:^3.0.3":
+  version: 3.0.3
+  resolution: "braces@npm:3.0.3"
   dependencies:
-    wcwidth: "npm:^1.0.1"
-  checksum: 10/b8fe081fc2e039a6a51ef9b78e0e32b6d9a5a6873c104cded5b93608896fd95a5a27cd95bc7fa037d1b2ccf53b89c088d8bfdaf5d15664e71ae19cda0057506f
+    fill-range: "npm:^7.1.1"
+  checksum: 10/fad11a0d4697a27162840b02b1fad249c1683cbc510cd5bf1a471f2f8085c046d41094308c577a50a03a579dd99d5a6b3724c4b5e8b14df2c4443844cfcda2c6
   languageName: node
   linkType: hard
 
@@ -16165,7 +16514,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bs-logger@npm:0.x":
+"bs-logger@npm:^0.2.6":
   version: 0.2.6
   resolution: "bs-logger@npm:0.2.6"
   dependencies:
@@ -16183,7 +16532,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bson@npm:^4.6.4, bson@npm:^4.7.2":
+"bson@npm:^4.7.2":
   version: 4.7.2
   resolution: "bson@npm:4.7.2"
   dependencies:
@@ -16209,7 +16558,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"buffer-crc32@npm:^0.2.1, buffer-crc32@npm:^0.2.13, buffer-crc32@npm:~0.2.3":
+"buffer-crc32@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "buffer-crc32@npm:1.0.0"
+  checksum: 10/ef3b7c07622435085c04300c9a51e850ec34a27b2445f758eef69b859c7827848c2282f3840ca6c1eef3829145a1580ce540cab03ccf4433827a2b95d3b09ca7
+  languageName: node
+  linkType: hard
+
+"buffer-crc32@npm:~0.2.3":
   version: 0.2.13
   resolution: "buffer-crc32@npm:0.2.13"
   checksum: 10/06252347ae6daca3453b94e4b2f1d3754a3b146a111d81c68924c22d91889a40623264e95e67955b1cb4a68cbedf317abeabb5140a9766ed248973096db5ce1c
@@ -16255,7 +16611,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"buffer@npm:^5.1.0, buffer@npm:^5.2.1, buffer@npm:^5.5.0, buffer@npm:^5.6.0, buffer@npm:^5.7.1":
+"buffer@npm:^5.2.1, buffer@npm:^5.5.0, buffer@npm:^5.6.0, buffer@npm:^5.7.1":
   version: 5.7.1
   resolution: "buffer@npm:5.7.1"
   dependencies:
@@ -16320,17 +16676,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bundle-require@npm:^4.0.0":
-  version: 4.0.1
-  resolution: "bundle-require@npm:4.0.1"
-  dependencies:
-    load-tsconfig: "npm:^0.2.3"
-  peerDependencies:
-    esbuild: ">=0.17"
-  checksum: 10/f11d75a402398de8cc3be30529fe799a338c4b7e4efa58ff37271f3e34425e50d0f9955eaf0be5c4cd6edc2abe2226d75f1610cf56726458fd3b5e061826da50
-  languageName: node
-  linkType: hard
-
 "busboy@npm:^1.6.0":
   version: 1.6.0
   resolution: "busboy@npm:1.6.0"
@@ -16377,13 +16722,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cac@npm:^6.7.12":
-  version: 6.7.14
-  resolution: "cac@npm:6.7.14"
-  checksum: 10/002769a0fbfc51c062acd2a59df465a2a947916b02ac50b56c69ec6c018ee99ac3e7f4dd7366334ea847f1ecacf4defaa61bcd2ac283db50156ce1f1d8c8ad42
-  languageName: node
-  linkType: hard
-
 "cacache@npm:^15.0.5":
   version: 15.3.0
   resolution: "cacache@npm:15.3.0"
@@ -16436,6 +16774,43 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cacache@npm:^18.0.0":
+  version: 18.0.4
+  resolution: "cacache@npm:18.0.4"
+  dependencies:
+    "@npmcli/fs": "npm:^3.1.0"
+    fs-minipass: "npm:^3.0.0"
+    glob: "npm:^10.2.2"
+    lru-cache: "npm:^10.0.1"
+    minipass: "npm:^7.0.3"
+    minipass-collect: "npm:^2.0.1"
+    minipass-flush: "npm:^1.0.5"
+    minipass-pipeline: "npm:^1.2.4"
+    p-map: "npm:^4.0.0"
+    ssri: "npm:^10.0.0"
+    tar: "npm:^6.1.11"
+    unique-filename: "npm:^3.0.0"
+  checksum: 10/ca2f7b2d3003f84d362da9580b5561058ccaecd46cba661cbcff0375c90734b610520d46b472a339fd032d91597ad6ed12dde8af81571197f3c9772b5d35b104
+  languageName: node
+  linkType: hard
+
+"cache-base@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "cache-base@npm:1.0.1"
+  dependencies:
+    collection-visit: "npm:^1.0.0"
+    component-emitter: "npm:^1.2.1"
+    get-value: "npm:^2.0.6"
+    has-value: "npm:^1.0.0"
+    isobject: "npm:^3.0.1"
+    set-value: "npm:^2.0.0"
+    to-object-path: "npm:^0.3.0"
+    union-value: "npm:^1.0.0"
+    unset-value: "npm:^1.0.0"
+  checksum: 10/50dd11af5ce4aaa8a8bff190a870c940db80234cf087cd47dd177be8629c36ad8cd0716e62418ec1e135f2d01b28aafff62cd22d33412c3d18b2109dd9073711
+  languageName: node
+  linkType: hard
+
 "cacheable-request@npm:^2.1.1":
   version: 2.1.4
   resolution: "cacheable-request@npm:2.1.4"
@@ -16495,6 +16870,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"call-me-maybe@npm:^1.0.1":
+  version: 1.0.2
+  resolution: "call-me-maybe@npm:1.0.2"
+  checksum: 10/3d375b6f810a82c751157b199daba60452876186c19ac653e81bfc5fc10d1e2ba7aedb8622367c3a8aca6879f0e6a29435a1193b35edb8f7fd8267a67ea32373
+  languageName: node
+  linkType: hard
+
 "caller-callsite@npm:^2.0.0":
   version: 2.0.0
   resolution: "caller-callsite@npm:2.0.0"
@@ -16537,14 +16919,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"camelcase-keys@npm:^6.2.2":
-  version: 6.2.2
-  resolution: "camelcase-keys@npm:6.2.2"
+"camelcase-keys@npm:^4.0.0":
+  version: 4.2.0
+  resolution: "camelcase-keys@npm:4.2.0"
   dependencies:
-    camelcase: "npm:^5.3.1"
-    map-obj: "npm:^4.0.0"
-    quick-lru: "npm:^4.0.1"
-  checksum: 10/c1999f5b6d03bee7be9a36e48eef3da9e93e51b000677348ec8d15d51fc4418375890fb6c7155e387322d2ebb2a2cdebf9cd96607a6753d1d6c170d9b1e2eed5
+    camelcase: "npm:^4.1.0"
+    map-obj: "npm:^2.0.0"
+    quick-lru: "npm:^1.0.0"
+  checksum: 10/8cb52633f2d335bf7efd9ec4169df3174047dbeadbe9b7604fb4a24cbc53a976bc26bb8557f6e9da5feff139bf94e36f40e2636b31225670f9524f586070c3ec
   languageName: node
   linkType: hard
 
@@ -16567,7 +16949,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"camelcase@npm:^4.0.0":
+"camelcase@npm:^4.1.0":
   version: 4.1.0
   resolution: "camelcase@npm:4.1.0"
   checksum: 10/9683356daf9b64fae4b30c91f8ceb1f34f22746e03d1804efdbe738357d38b47f206cdd71efcf2ed72018b2e88eeb8ec3f79adb09c02f1253a4b6d5d405ff2ae
@@ -16625,13 +17007,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"capture-stack-trace@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "capture-stack-trace@npm:1.0.1"
-  checksum: 10/493668211de1307009589aeba5c382dc8b1011a41ca02f033b5f5a489ee174323a4b31d5afdc4bd48f64e1dd23b2521ddda4dbdcd382767e140f94b555f8f332
-  languageName: node
-  linkType: hard
-
 "case-sensitive-paths-webpack-plugin@npm:^2.4.0":
   version: 2.4.0
   resolution: "case-sensitive-paths-webpack-plugin@npm:2.4.0"
@@ -16658,6 +17033,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ccount@npm:^1.0.0":
+  version: 1.1.0
+  resolution: "ccount@npm:1.1.0"
+  checksum: 10/b335a79d0aa4308919cf7507babcfa04ac63d389ebed49dbf26990d4607c8a4713cde93cc83e707d84571ddfe1e7615dad248be9bc422ae4c188210f71b08b78
+  languageName: node
+  linkType: hard
+
 "chai-as-promised@npm:^7.1.2":
   version: 7.1.2
   resolution: "chai-as-promised@npm:7.1.2"
@@ -16678,26 +17060,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chai-dom@npm:^1.11.0":
-  version: 1.11.0
-  resolution: "chai-dom@npm:1.11.0"
+"chai-dom@npm:^1.12.0":
+  version: 1.12.0
+  resolution: "chai-dom@npm:1.12.0"
   peerDependencies:
     chai: ">= 3"
-    mocha: ">= 2"
-  checksum: 10/b66f78d331af1833c5bcfcebdfd2bce8988dd2667861b79134001d32f8907dead1c138f026669839d1a97dc5d91f03081d5d06f5869cf93fac55e18d1a4d74f9
+  checksum: 10/64c84e57ae43ad9c10309409d8b4a1ff052627122eb4d5eeb595adee838daefbe86a1b7879f02b6bb43862d64aefb04b226c352e2b6fef8ec121a7b0e85894bd
   languageName: node
   linkType: hard
 
-"chai-spies@npm:~1.0.0":
-  version: 1.0.0
-  resolution: "chai-spies@npm:1.0.0"
+"chai-spies@npm:~1.1.0":
+  version: 1.1.0
+  resolution: "chai-spies@npm:1.1.0"
   peerDependencies:
     chai: "*"
-  checksum: 10/dcde5e05644409127270727cc32851498cd781be6555cd8ab4956ff31e74603f804298cef8dc5c95de151c746f1e93f9876a3b3b8fc3e41d670072384af53f95
+  checksum: 10/652983d777fa882de61c1ee87c41fa358452f0093a47637fefd85ee2bb0f4e6a259bbe9a17214629597072439ca853182ca1c4523fe0d53f63fc7cbef3afd259
   languageName: node
   linkType: hard
 
-"chai@npm:>1.9.0, chai@npm:^4.3.10":
+"chai@npm:>1.9.0":
   version: 4.3.10
   resolution: "chai@npm:4.3.10"
   dependencies:
@@ -16712,6 +17093,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"chai@npm:^4.5.0":
+  version: 4.5.0
+  resolution: "chai@npm:4.5.0"
+  dependencies:
+    assertion-error: "npm:^1.1.0"
+    check-error: "npm:^1.0.3"
+    deep-eql: "npm:^4.1.3"
+    get-func-name: "npm:^2.0.2"
+    loupe: "npm:^2.3.6"
+    pathval: "npm:^1.1.1"
+    type-detect: "npm:^4.1.0"
+  checksum: 10/cde341aee15b0a51559c7cfc20788dcfb4d586a498cfb93b937bb568fd45c777b73b1461274be6092b6bf868adb4e3a63f3fec13c89f7d8fb194f84c6fa42d5f
+  languageName: node
+  linkType: hard
+
 "chai@npm:^5.1.1":
   version: 5.1.1
   resolution: "chai@npm:5.1.1"
@@ -16732,18 +17128,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chalk@npm:2.4.1":
-  version: 2.4.1
-  resolution: "chalk@npm:2.4.1"
-  dependencies:
-    ansi-styles: "npm:^3.2.1"
-    escape-string-regexp: "npm:^1.0.5"
-    supports-color: "npm:^5.3.0"
-  checksum: 10/de21ab0fc0d736de91749d8001c354f11976d238c156784ebdc39bb1a04f9b4b129c88723ddf6e16e6873c08a686c9f2d6b1c01a5cbacc8592ef0932e39acd7f
-  languageName: node
-  linkType: hard
-
-"chalk@npm:2.4.2, chalk@npm:^2.0.1, chalk@npm:^2.1.0, chalk@npm:^2.4.1, chalk@npm:^2.4.2":
+"chalk@npm:2.4.2, chalk@npm:^2.0.1, chalk@npm:^2.4.1, chalk@npm:^2.4.2":
   version: 2.4.2
   resolution: "chalk@npm:2.4.2"
   dependencies:
@@ -16754,7 +17139,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chalk@npm:4, chalk@npm:4.1.2, chalk@npm:^4.0.0, chalk@npm:^4.1.0, chalk@npm:^4.1.1, chalk@npm:^4.1.2":
+"chalk@npm:4, chalk@npm:4.1.2, chalk@npm:^4.0.0, chalk@npm:^4.0.2, chalk@npm:^4.1.0, chalk@npm:^4.1.1, chalk@npm:^4.1.2":
   version: 4.1.2
   resolution: "chalk@npm:4.1.2"
   dependencies:
@@ -16764,7 +17149,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chalk@npm:^1.0.0, chalk@npm:^1.1.3":
+"chalk@npm:^1.1.3":
   version: 1.1.3
   resolution: "chalk@npm:1.1.3"
   dependencies:
@@ -16807,18 +17192,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"changelog-parser@npm:^2.0.0":
-  version: 2.8.1
-  resolution: "changelog-parser@npm:2.8.1"
-  dependencies:
-    line-reader: "npm:^0.2.4"
-    remove-markdown: "npm:^0.2.2"
-  bin:
-    changelog-parser: bin/cli.js
-  checksum: 10/b8d69534e7a017a2b1a0a6f4d209f5f04c1461e353b2b3ae11ddd5102c326cbe42e1ff11ce1cf139d430135ef6a321da14baec7fb27595a3c6090edc6645bcd9
-  languageName: node
-  linkType: hard
-
 "char-regex@npm:^1.0.2":
   version: 1.0.2
   resolution: "char-regex@npm:1.0.2"
@@ -16826,6 +17199,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"character-entities-html4@npm:^1.0.0":
+  version: 1.1.4
+  resolution: "character-entities-html4@npm:1.1.4"
+  checksum: 10/22536aba07a378a2326420423ceadd65c0121032c527f80e84dfc648381992ed5aa666d7c2b267cd269864b3682d5b0315fc2f03a9e7c017d1a96d24ec292d5f
+  languageName: node
+  linkType: hard
+
 "character-entities-legacy@npm:^1.0.0":
   version: 1.1.4
   resolution: "character-entities-legacy@npm:1.1.4"
@@ -16861,10 +17241,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chart.js@npm:^3.8.0":
-  version: 3.8.0
-  resolution: "chart.js@npm:3.8.0"
-  checksum: 10/c73aabaa8c310e777e33b6df3623d5eaab9e36d820878c555105ad3491288f55546af0898c80f1ac7c4000ac0f62e0e714b0598783df53190ff9191f308a7f39
+"chart.js@npm:^3.9.1":
+  version: 3.9.1
+  resolution: "chart.js@npm:3.9.1"
+  checksum: 10/62ee137b296181d8d12e428cb83a02351768039ff672b8ff775534f844777e9c91a3213fc8c6c46b59175a47f23d1547178fdd64ff9afc37c2c1703b2cede93e
   languageName: node
   linkType: hard
 
@@ -16897,7 +17277,40 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cheerio@npm:1.0.0-rc.10, cheerio@npm:^1.0.0-rc.3":
+"cheerio-select@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "cheerio-select@npm:2.1.0"
+  dependencies:
+    boolbase: "npm:^1.0.0"
+    css-select: "npm:^5.1.0"
+    css-what: "npm:^6.1.0"
+    domelementtype: "npm:^2.3.0"
+    domhandler: "npm:^5.0.3"
+    domutils: "npm:^3.0.1"
+  checksum: 10/b5d89208c23468c3a32d1e04f88b9e8c6e332e3649650c5cd29255e2cebc215071ae18563f58c3dc3f6ef4c234488fc486035490fceb78755572288245e2931a
+  languageName: node
+  linkType: hard
+
+"cheerio@npm:1.0.0":
+  version: 1.0.0
+  resolution: "cheerio@npm:1.0.0"
+  dependencies:
+    cheerio-select: "npm:^2.1.0"
+    dom-serializer: "npm:^2.0.0"
+    domhandler: "npm:^5.0.3"
+    domutils: "npm:^3.1.0"
+    encoding-sniffer: "npm:^0.2.0"
+    htmlparser2: "npm:^9.1.0"
+    parse5: "npm:^7.1.2"
+    parse5-htmlparser2-tree-adapter: "npm:^7.0.0"
+    parse5-parser-stream: "npm:^7.1.2"
+    undici: "npm:^6.19.5"
+    whatwg-mimetype: "npm:^4.0.0"
+  checksum: 10/b535070add0f86b0a1f234274ad3ffb2c1c375c05b322d8057e89c3c797b3b4d2f05826c34a04df218bec9abf21b9f0d0bd71974a8dfe28b943fb87ab0170c38
+  languageName: node
+  linkType: hard
+
+"cheerio@npm:1.0.0-rc.10":
   version: 1.0.0-rc.10
   resolution: "cheerio@npm:1.0.0-rc.10"
   dependencies:
@@ -16912,7 +17325,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chokidar@npm:3.5.3, chokidar@npm:^3.5.1, chokidar@npm:^3.5.3":
+"chokidar@npm:3.5.3, chokidar@npm:^3.5.3":
   version: 3.5.3
   resolution: "chokidar@npm:3.5.3"
   dependencies:
@@ -16980,27 +17393,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ci-info@npm:^1.5.0":
-  version: 1.6.0
-  resolution: "ci-info@npm:1.6.0"
-  checksum: 10/dfc058f60c3889793befe77349c3cd1a5452d21bed5ff60cb34382bee7bbdccc5c4c2ff2b77eab8c411c54d84f93963dacf593b9d901b43b93b7ad2a422aa163
-  languageName: node
-  linkType: hard
-
-"ci-info@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "ci-info@npm:2.0.0"
-  checksum: 10/3b374666a85ea3ca43fa49aa3a048d21c9b475c96eb13c133505d2324e7ae5efd6a454f41efe46a152269e9b6a00c9edbe63ec7fa1921957165aae16625acd67
-  languageName: node
-  linkType: hard
-
-"ci-info@npm:^3.1.0, ci-info@npm:^3.2.0":
+"ci-info@npm:^3.2.0":
   version: 3.8.0
   resolution: "ci-info@npm:3.8.0"
   checksum: 10/b00e9313c1f7042ca8b1297c157c920d6d69f0fbad7b867910235676df228c4b4f4df33d06cacae37f9efba7a160b0a167c6be85492b419ef71d85660e60606b
   languageName: node
   linkType: hard
 
+"ci-info@npm:^3.7.0":
+  version: 3.9.0
+  resolution: "ci-info@npm:3.9.0"
+  checksum: 10/75bc67902b4d1c7b435497adeb91598f6d52a3389398e44294f6601b20cfef32cf2176f7be0eb961d9e085bb333a8a5cae121cb22f81cf238ae7f58eb80e9397
+  languageName: node
+  linkType: hard
+
 "cipher-base@npm:^1.0.0, cipher-base@npm:^1.0.1, cipher-base@npm:^1.0.3":
   version: 1.0.4
   resolution: "cipher-base@npm:1.0.4"
@@ -17018,6 +17424,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"class-utils@npm:^0.3.5":
+  version: 0.3.6
+  resolution: "class-utils@npm:0.3.6"
+  dependencies:
+    arr-union: "npm:^3.1.0"
+    define-property: "npm:^0.2.5"
+    isobject: "npm:^3.0.0"
+    static-extend: "npm:^0.1.1"
+  checksum: 10/b236d9deb6594828966e45c5f48abac9a77453ee0dbdb89c635ce876f59755d7952309d554852b6f7d909198256c335a4bd51b09c1d238b36b92152eb2b9d47a
+  languageName: node
+  linkType: hard
+
 "classcat@npm:^5.0.3, classcat@npm:^5.0.4":
   version: 5.0.4
   resolution: "classcat@npm:5.0.4"
@@ -17041,22 +17459,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cli-boxes@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "cli-boxes@npm:1.0.0"
-  checksum: 10/101cfd6464a418a76523c332665eaf0641522f30ecc2492de48263ada6b0852333b2ed47b2998ddda621e7008471c51f597f813be798db237c33ba45b27e802a
-  languageName: node
-  linkType: hard
-
-"cli-cursor@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "cli-cursor@npm:2.1.0"
-  dependencies:
-    restore-cursor: "npm:^2.0.0"
-  checksum: 10/d88e97bfdac01046a3ffe7d49f06757b3126559d7e44aa2122637eb179284dc6cd49fca2fac4f67c19faaf7e6dab716b6fe1dfcd309977407d8c7578ec2d044d
-  languageName: node
-  linkType: hard
-
 "cli-cursor@npm:^3.1.0":
   version: 3.1.0
   resolution: "cli-cursor@npm:3.1.0"
@@ -17073,13 +17475,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cli-width@npm:^2.0.0":
-  version: 2.2.1
-  resolution: "cli-width@npm:2.2.1"
-  checksum: 10/e173dbe2bb70821dfc6a790183c949ed41cfc573bbabd700db64c6e21d19d8ce937dce84340b6bc225fb4ac99d9aaa54a46dcce5150e7cbd9b7ad7120301ee8d
-  languageName: node
-  linkType: hard
-
 "cli-width@npm:^3.0.0":
   version: 3.0.0
   resolution: "cli-width@npm:3.0.0"
@@ -17094,16 +17489,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"clipboardy@npm:1.2.3":
-  version: 1.2.3
-  resolution: "clipboardy@npm:1.2.3"
-  dependencies:
-    arch: "npm:^2.1.0"
-    execa: "npm:^0.8.0"
-  checksum: 10/72cdfc9e14025e1c83ade82b38848f3849f3d770c50e85492b84a4e6495a3f3053bd30809d407d69cbc7745bceb28ac55bd1ddb68b577671da28524d71b4927f
-  languageName: node
-  linkType: hard
-
 "cliui@npm:^5.0.0":
   version: 5.0.0
   resolution: "cliui@npm:5.0.0"
@@ -17159,12 +17544,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"clone-regexp@npm:^2.1.0":
-  version: 2.2.0
-  resolution: "clone-regexp@npm:2.2.0"
+"clone-regexp@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "clone-regexp@npm:1.0.1"
   dependencies:
-    is-regexp: "npm:^2.0.0"
-  checksum: 10/3624905a98920ad5c196080f4ea4379fa42b12f3b1d1272d958bb79c194508d2aec85160c25846f0016ca861a064316b213a565cf53b81a513047f89cf877803
+    is-regexp: "npm:^1.0.0"
+    is-supported-regexp-flag: "npm:^1.0.0"
+  checksum: 10/a2d891aa08e63236fc93262b963d707731a203e5a957bce295e69f8c80dbc4ac5f29e2165641deff81d70ab570724628aabc8a1506774d09eac9dc67166e7ce8
   languageName: node
   linkType: hard
 
@@ -17247,13 +17633,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"code-point-at@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "code-point-at@npm:1.1.0"
-  checksum: 10/17d5666611f9b16d64fdf48176d9b7fb1c7d1c1607a189f7e600040a11a6616982876af148230336adb7d8fe728a559f743a4e29db3747e3b1a32fa7f4529681
-  languageName: node
-  linkType: hard
-
 "codemirror@npm:^5.65.18":
   version: 5.65.18
   resolution: "codemirror@npm:5.65.18"
@@ -17276,6 +17655,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"collapse-white-space@npm:^1.0.2":
+  version: 1.0.6
+  resolution: "collapse-white-space@npm:1.0.6"
+  checksum: 10/9673fb797952c5c888341435596c69388b22cd5560c8cd3f40edb72734a9c820f56a7c9525166bcb7068b5d5805372e6fd0c4b9f2869782ad070cb5d3faf26e7
+  languageName: node
+  linkType: hard
+
 "collect-v8-coverage@npm:^1.0.0":
   version: 1.0.1
   resolution: "collect-v8-coverage@npm:1.0.1"
@@ -17283,6 +17669,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"collection-visit@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "collection-visit@npm:1.0.0"
+  dependencies:
+    map-visit: "npm:^1.0.0"
+    object-visit: "npm:^1.0.0"
+  checksum: 10/15d9658fe6eb23594728346adad5433b86bb7a04fd51bbab337755158722f9313a5376ef479de5b35fbc54140764d0d39de89c339f5d25b959ed221466981da9
+  languageName: node
+  linkType: hard
+
 "color-convert@npm:^1.9.0, color-convert@npm:^1.9.3":
   version: 1.9.3
   resolution: "color-convert@npm:1.9.3"
@@ -17308,7 +17704,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"color-name@npm:^1.0.0, color-name@npm:^1.1.4, color-name@npm:~1.1.4":
+"color-name@npm:^1.0.0, color-name@npm:~1.1.4":
   version: 1.1.4
   resolution: "color-name@npm:1.1.4"
   checksum: 10/b0445859521eb4021cd0fb0cc1a75cecf67fceecae89b63f62b201cca8d345baf8b952c966862a9d9a2632987d4f6581f0ec8d957dfacece86f0a7919316f610
@@ -17354,10 +17750,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"colord@npm:^2.9.2":
-  version: 2.9.2
-  resolution: "colord@npm:2.9.2"
-  checksum: 10/a412b4f7a0cfff0ce05d55fadd2ac49c9ba7dafc38dc0cd8fb32c56d98702c3c32d080a9c9d3c8cbbab38daf3cf1aebbe225dd0392f2222128c19cca977933e5
+"colord@npm:^2.9.3":
+  version: 2.9.3
+  resolution: "colord@npm:2.9.3"
+  checksum: 10/907a4506d7307e2f580b471b581e992181ed75ab0c6925ece9ca46d88161d2fc50ed15891cd0556d0d9321237ca75afc9d462e4c050b939ef88428517f047f30
   languageName: node
   linkType: hard
 
@@ -17420,6 +17816,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"commander@npm:^12.1.0":
+  version: 12.1.0
+  resolution: "commander@npm:12.1.0"
+  checksum: 10/cdaeb672d979816853a4eed7f1310a9319e8b976172485c2a6b437ed0db0a389a44cfb222bfbde772781efa9f215bdd1b936f80d6b249485b465c6cb906e1f93
+  languageName: node
+  linkType: hard
+
 "commander@npm:^2.20.0, commander@npm:^2.8.1":
   version: 2.20.3
   resolution: "commander@npm:2.20.3"
@@ -17427,13 +17830,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"commander@npm:^4.0.0":
-  version: 4.1.1
-  resolution: "commander@npm:4.1.1"
-  checksum: 10/3b2dc4125f387dab73b3294dbcb0ab2a862f9c0ad748ee2b27e3544d25325b7a8cdfbcc228d103a98a716960b14478114a5206b5415bd48cdafa38797891562c
-  languageName: node
-  linkType: hard
-
 "commander@npm:^6.1.0":
   version: 6.2.1
   resolution: "commander@npm:6.2.1"
@@ -17496,10 +17892,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"compare-versions@npm:^3.6.0":
-  version: 3.6.0
-  resolution: "compare-versions@npm:3.6.0"
-  checksum: 10/7492a50cdaa2c27f5254eee7c4b38856e1c164991bab3d98d7fd067fe4b570d47123ecb92523b78338be86aa221668fd3868bfe8caa5587dc3ebbe1a03d52b5d
+"component-emitter@npm:^1.2.1":
+  version: 1.3.1
+  resolution: "component-emitter@npm:1.3.1"
+  checksum: 10/94550aa462c7bd5a61c1bc480e28554aa306066930152d1b1844a0dd3845d4e5db7e261ddec62ae184913b3e59b55a2ad84093b9d3596a8f17c341514d6c483d
   languageName: node
   linkType: hard
 
@@ -17510,19 +17906,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"compress-commons@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "compress-commons@npm:2.1.1"
+"compress-commons@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "compress-commons@npm:6.0.2"
   dependencies:
-    buffer-crc32: "npm:^0.2.13"
-    crc32-stream: "npm:^3.0.1"
+    crc-32: "npm:^1.2.0"
+    crc32-stream: "npm:^6.0.0"
+    is-stream: "npm:^2.0.1"
     normalize-path: "npm:^3.0.0"
-    readable-stream: "npm:^2.3.6"
-  checksum: 10/dae3afea6488ebed85bfd1ab201607f4297932c6d609dcec5c6915c1f874bb3c8c89d32803b326080fb98eaf7bc1b99a3c2bcc12d42aa5f625441f921fe29ba0
+    readable-stream: "npm:^4.0.0"
+  checksum: 10/78e3ba10aeef919a1c5bbac21e120f3e1558a31b2defebbfa1635274fc7f7e8a3a0ee748a06249589acd0b33a0d58144b8238ff77afc3220f8d403a96fcc13aa
   languageName: node
   linkType: hard
 
-"compressible@npm:^2.0.12, compressible@npm:~2.0.14, compressible@npm:~2.0.16":
+"compressible@npm:^2.0.12, compressible@npm:~2.0.16":
   version: 2.0.18
   resolution: "compressible@npm:2.0.18"
   dependencies:
@@ -17531,21 +17928,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"compression@npm:1.7.3":
-  version: 1.7.3
-  resolution: "compression@npm:1.7.3"
-  dependencies:
-    accepts: "npm:~1.3.5"
-    bytes: "npm:3.0.0"
-    compressible: "npm:~2.0.14"
-    debug: "npm:2.6.9"
-    on-headers: "npm:~1.0.1"
-    safe-buffer: "npm:5.1.2"
-    vary: "npm:~1.1.2"
-  checksum: 10/4a98288ca82bfe64de72fa1e00f1ecc07dc70a5697f69034a5035bcae1a6ef5072ccef128cd9d40483d56437c977e3ffd54e54a418d0cce3f758689e8a78d038
-  languageName: node
-  linkType: hard
-
 "compression@npm:^1.7.4":
   version: 1.7.4
   resolution: "compression@npm:1.7.4"
@@ -17590,20 +17972,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"configstore@npm:^3.0.0":
-  version: 3.1.5
-  resolution: "configstore@npm:3.1.5"
-  dependencies:
-    dot-prop: "npm:^4.2.1"
-    graceful-fs: "npm:^4.1.2"
-    make-dir: "npm:^1.0.0"
-    unique-string: "npm:^1.0.0"
-    write-file-atomic: "npm:^2.0.0"
-    xdg-basedir: "npm:^3.0.0"
-  checksum: 10/948b50af436f72723b464440f5cfe7b5bc34729bd0709892d71e09517f179773f439a185d0b7bec7acbb183e2b53df8f02176e5be26c7f15382d073740ffad67
-  languageName: node
-  linkType: hard
-
 "connect-history-api-fallback@npm:^2.0.0":
   version: 2.0.0
   resolution: "connect-history-api-fallback@npm:2.0.0"
@@ -17655,13 +18023,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"content-disposition@npm:0.5.2":
-  version: 0.5.2
-  resolution: "content-disposition@npm:0.5.2"
-  checksum: 10/97c5e7c8c72a0524c5d92866ecd3da28d4596925321aa3252d7ce3122d354b099d73cc1981fec8f24848d74314089928f626af8f9d7b51c3bc625d47f11e1d90
-  languageName: node
-  linkType: hard
-
 "content-disposition@npm:0.5.4, content-disposition@npm:^0.5.2":
   version: 0.5.4
   resolution: "content-disposition@npm:0.5.4"
@@ -17671,7 +18032,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"content-type@npm:~1.0.4, content-type@npm:~1.0.5":
+"content-disposition@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "content-disposition@npm:1.0.0"
+  dependencies:
+    safe-buffer: "npm:5.2.1"
+  checksum: 10/0dcc1a2d7874526b0072df3011b134857b49d97a3bc135bb464a299525d4972de6f5f464fd64da6c4d8406d26a1ffb976f62afaffef7723b1021a44498d10e08
+  languageName: node
+  linkType: hard
+
+"content-type@npm:^1.0.5, content-type@npm:~1.0.4, content-type@npm:~1.0.5":
   version: 1.0.5
   resolution: "content-type@npm:1.0.5"
   checksum: 10/585847d98dc7fb8035c02ae2cb76c7a9bd7b25f84c447e5ed55c45c2175e83617c8813871b4ee22f368126af6b2b167df655829007b21aa10302873ea9c62662
@@ -17718,10 +18088,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cookie@npm:0.5.0, cookie@npm:^0.5.0":
-  version: 0.5.0
-  resolution: "cookie@npm:0.5.0"
-  checksum: 10/aae7911ddc5f444a9025fbd979ad1b5d60191011339bce48e555cb83343d0f98b865ff5c4d71fecdfb8555a5cafdc65632f6fce172f32aaf6936830a883a0380
+"cookie-signature@npm:^1.2.1":
+  version: 1.2.2
+  resolution: "cookie-signature@npm:1.2.2"
+  checksum: 10/be44a3c9a56f3771aea3a8bd8ad8f0a8e2679bcb967478267f41a510b4eb5ec55085386ba79c706c4ac21605ca76f4251973444b90283e0eb3eeafe8a92c7708
   languageName: node
   linkType: hard
 
@@ -17732,7 +18102,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cookie@npm:0.7.2":
+"cookie@npm:0.7.2, cookie@npm:^0.7.2":
   version: 0.7.2
   resolution: "cookie@npm:0.7.2"
   checksum: 10/24b286c556420d4ba4e9bc09120c9d3db7d28ace2bd0f8ccee82422ce42322f73c8312441271e5eefafbead725980e5996cc02766dbb89a90ac7f5636ede608f
@@ -17746,12 +18116,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"copy-anything@npm:^3.0.2":
-  version: 3.0.3
-  resolution: "copy-anything@npm:3.0.3"
-  dependencies:
-    is-what: "npm:^4.1.8"
-  checksum: 10/d376bfd5f657c96e9b0ef5e8709dcb52bc085c0af7b1c30c6c0337fa9ce56287bf0aaf4db13f9931b504ee5f6beb4494d9ca1b6e947a12995476ca288b3653c6
+"copy-descriptor@npm:^0.1.0":
+  version: 0.1.1
+  resolution: "copy-descriptor@npm:0.1.1"
+  checksum: 10/edf4651bce36166c7fcc60b5c1db2c5dad1d87820f468507331dd154b686ece8775f5d383127d44aeef813462520c866f83908aa2d4291708f898df776816860
   languageName: node
   linkType: hard
 
@@ -17807,7 +18175,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cosmiconfig@npm:^7.0.0, cosmiconfig@npm:^7.0.1":
+"cosmiconfig@npm:^7.0.1":
   version: 7.0.1
   resolution: "cosmiconfig@npm:7.0.1"
   dependencies:
@@ -17850,22 +18218,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"crc32-stream@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "crc32-stream@npm:3.0.1"
-  dependencies:
-    crc: "npm:^3.4.4"
-    readable-stream: "npm:^3.4.0"
-  checksum: 10/14dcb506438574c992ebbf04bfcb075d3055cd478404c1fa4dfcfce139bef87378a5ea438e57792b57313fb52e58676493b4e4da1f9be7577440b0d70781dff2
+"crc-32@npm:^1.2.0":
+  version: 1.2.2
+  resolution: "crc-32@npm:1.2.2"
+  bin:
+    crc32: bin/crc32.njs
+  checksum: 10/824f696a5baaf617809aa9cd033313c8f94f12d15ebffa69f10202480396be44aef9831d900ab291638a8022ed91c360696dd5b1ba691eb3f34e60be8835b7c3
   languageName: node
   linkType: hard
 
-"crc@npm:^3.4.4":
-  version: 3.8.0
-  resolution: "crc@npm:3.8.0"
+"crc32-stream@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "crc32-stream@npm:6.0.0"
   dependencies:
-    buffer: "npm:^5.1.0"
-  checksum: 10/3a43061e692113d60fbaf5e438c5f6aa3374fe2368244a75cc083ecee6762513bcee8583f67c2c56feea0b0c72b41b7304fbd3c1e26cfcfaec310b9a18543fa8
+    crc-32: "npm:^1.2.0"
+    readable-stream: "npm:^4.0.0"
+  checksum: 10/e6edc2f81bc387daef6d18b2ac18c2ffcb01b554d3b5c7d8d29b177505aafffba574658fdd23922767e8dab1183d1962026c98c17e17fb272794c33293ef607c
   languageName: node
   linkType: hard
 
@@ -17879,15 +18247,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"create-error-class@npm:^3.0.0":
-  version: 3.0.2
-  resolution: "create-error-class@npm:3.0.2"
-  dependencies:
-    capture-stack-trace: "npm:^1.0.0"
-  checksum: 10/7254a6f96002d3226d3c1fec952473398761eb4fb12624c5dce6ed0017cdfad6de39b29aa7139680d7dcf416c25f2f308efda6eb6d9b7123f829b19ef8271511
-  languageName: node
-  linkType: hard
-
 "create-hash@npm:^1.1.0, create-hash@npm:^1.1.2, create-hash@npm:^1.2.0":
   version: 1.2.0
   resolution: "create-hash@npm:1.2.0"
@@ -18070,13 +18429,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"crypto-random-string@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "crypto-random-string@npm:1.0.0"
-  checksum: 10/6fc61a46c18547b49a93da24f4559c4a1c859f4ee730ecc9533c1ba89fa2a9e9d81f390c2789467afbbd0d1c55a6e96a71e4716b6cd3e77736ed5fced7a2df9a
-  languageName: node
-  linkType: hard
-
 "css-box-model@npm:^1.2.0":
   version: 1.2.1
   resolution: "css-box-model@npm:1.2.1"
@@ -18103,10 +18455,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-functions-list@npm:^3.1.0":
-  version: 3.1.0
-  resolution: "css-functions-list@npm:3.1.0"
-  checksum: 10/8a7c9d4ae57cb2f01500263e65a21372048d359ca7aa6430a32a736fe2a421decfebe45e579124b9a158ec68aba2eadcd733e568495a7698240d9607d31f681b
+"css-functions-list@npm:^3.2.3":
+  version: 3.2.3
+  resolution: "css-functions-list@npm:3.2.3"
+  checksum: 10/25f12fb0ef1384b1cf45a6e7e0afd596a19bee90b90316d9e50f7820888f4a8f265be7a6a96b10a5c81e403bd7a5ff8010fa936144f84959d9d91c9350cda0d4
   languageName: node
   linkType: hard
 
@@ -18188,6 +18540,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"css-select@npm:^5.1.0":
+  version: 5.1.0
+  resolution: "css-select@npm:5.1.0"
+  dependencies:
+    boolbase: "npm:^1.0.0"
+    css-what: "npm:^6.1.0"
+    domhandler: "npm:^5.0.2"
+    domutils: "npm:^3.0.1"
+    nth-check: "npm:^2.0.1"
+  checksum: 10/d486b1e7eb140468218a5ab5af53257e01f937d2173ac46981f6b7de9c5283d55427a36715dc8decfc0c079cf89259ac5b41ef58f6e1a422eee44ab8bfdc78da
+  languageName: node
+  linkType: hard
+
 "css-tree@npm:1.0.0-alpha.37":
   version: 1.0.0-alpha.37
   resolution: "css-tree@npm:1.0.0-alpha.37"
@@ -18208,6 +18573,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"css-tree@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "css-tree@npm:3.0.1"
+  dependencies:
+    mdn-data: "npm:2.12.1"
+    source-map-js: "npm:^1.0.1"
+  checksum: 10/877a77669739f94e57589c94c1ea8b7b105e373d4855e94375638b411e2913337a900120dc45c13511d0f7c339b73cecf8dc61ce28034984dbf75993dac756b0
+  languageName: node
+  linkType: hard
+
 "css-vars-ponyfill@npm:^2.4.9":
   version: 2.4.9
   resolution: "css-vars-ponyfill@npm:2.4.9"
@@ -18225,7 +18600,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"css-what@npm:^6.0.1":
+"css-what@npm:^6.0.1, css-what@npm:^6.1.0":
   version: 6.1.0
   resolution: "css-what@npm:6.1.0"
   checksum: 10/c67a3a2d0d81843af87f8bf0a4d0845b0f952377714abbb2884e48942409d57a2110eabee003609d02ee487b054614bdfcfc59ee265728ff105bd5aa221c1d0e
@@ -18239,15 +18614,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cssesc@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "cssesc@npm:2.0.0"
-  bin:
-    cssesc: bin/cssesc
-  checksum: 10/330239463b5e2963382ffc8ebd5664bc962672f3dae8459837e0f1dfbd1ac60179326878c0403ec41e1e5d8e23cf3d35462213c89987bf5be9d34b39b86c9636
-  languageName: node
-  linkType: hard
-
 "cssesc@npm:^3.0.0":
   version: 3.0.0
   resolution: "cssesc@npm:3.0.0"
@@ -18383,43 +18749,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"csv-generate@npm:^3.4.3":
-  version: 3.4.3
-  resolution: "csv-generate@npm:3.4.3"
-  checksum: 10/93f18eb1897a886ca5e45d22e82b6c026ac3e9dc3f04918e797d14b1f8e22234a14c018bbbf55a3cc2cfe4284bfa6b8a45097f902451af738911f0e2b0c6d0ed
-  languageName: node
-  linkType: hard
-
-"csv-parse@npm:^4.16.3":
-  version: 4.16.3
-  resolution: "csv-parse@npm:4.16.3"
-  checksum: 10/b873dd2d312ac0329200f13788176bae3073862241483b0339a4777c9eddcebd9f2f48f13d02dc0baf4bc02e957f886ea03a9cb22160d70836b0017432f8fa41
-  languageName: node
-  linkType: hard
-
-"csv-parse@npm:^5.2.0":
-  version: 5.2.2
-  resolution: "csv-parse@npm:5.2.2"
-  checksum: 10/6e9ea7dd938baef3a57315c9ea8a7ce5b7ef5c4c1ec21939de0b2a74a0a82f1e731ad87561b869bd4658cd51d7fe2c481169532caac7e80217a4368bc0a04c4a
-  languageName: node
-  linkType: hard
-
-"csv-stringify@npm:^5.6.5":
-  version: 5.6.5
-  resolution: "csv-stringify@npm:5.6.5"
-  checksum: 10/efed94869b8426e6a983f2237bd74eff15953e2e27affee9c1324f66a67dabe948573c4c21a8661a79aa20b58efbcafcf11c34e80bdd532a43f35e9cde5985b9
-  languageName: node
-  linkType: hard
-
-"csv@npm:^5.5.3":
-  version: 5.5.3
-  resolution: "csv@npm:5.5.3"
-  dependencies:
-    csv-generate: "npm:^3.4.3"
-    csv-parse: "npm:^4.16.3"
-    csv-stringify: "npm:^5.6.5"
-    stream-transform: "npm:^2.1.3"
-  checksum: 10/3928e1d88b98f0c3aa26e078cfca36086e0953afa5e83f45fa769b0f6fb4f79e82b4dfd400e8c61637edf144b2650f6ba8c585ec1aad11a6cda84aa04da5bc38
+"csv-parse@npm:^5.5.6":
+  version: 5.5.6
+  resolution: "csv-parse@npm:5.5.6"
+  checksum: 10/8682bd3846d8159eb6f686423d16493fffeceeef742d947e39ea3a3fb9b4a243b41a4cfbac56d721a2f7825b01335ba9b993bf68c4817e7abee0bd20754ee78d
   languageName: node
   linkType: hard
 
@@ -18430,6 +18763,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"currently-unhandled@npm:^0.4.1":
+  version: 0.4.1
+  resolution: "currently-unhandled@npm:0.4.1"
+  dependencies:
+    array-find-index: "npm:^1.0.1"
+  checksum: 10/53fb803e582737bdb5de6b150f0924dd9abf7be606648b4c2871db1c682bf288e248e8066ef10548979732a680cfb6c047294e3877846c2cf2f8d40437d8a741
+  languageName: node
+  linkType: hard
+
 "cwebp-bin@npm:^7.0.1":
   version: 7.0.1
   resolution: "cwebp-bin@npm:7.0.1"
@@ -18442,7 +18784,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"d3-array@npm:2, d3-array@npm:^2.3.0":
+"d3-array@npm:2":
   version: 2.12.1
   resolution: "d3-array@npm:2.12.1"
   dependencies:
@@ -18451,10 +18793,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"d3-color@npm:1 - 2":
-  version: 2.0.0
-  resolution: "d3-color@npm:2.0.0"
-  checksum: 10/f8902fa788320e7fc6ff49254e22b4d1b22d2eef5d7c2df36d180e202bdc7fc1a2a3daefbc0cb69b3e0cf6cd331704e044568e3ded70037f39a5a50f6164238d
+"d3-array@npm:2 - 3, d3-array@npm:2.10.0 - 3":
+  version: 3.2.4
+  resolution: "d3-array@npm:3.2.4"
+  dependencies:
+    internmap: "npm:1 - 2"
+  checksum: 10/5800c467f89634776a5977f6dae3f4e127d91be80f1d07e3e6e35303f9de93e6636d014b234838eea620f7469688d191b3f41207a30040aab750a63c97ec1d7c
   languageName: node
   linkType: hard
 
@@ -18465,12 +18809,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"d3-delaunay@npm:^5.3.0":
-  version: 5.3.0
-  resolution: "d3-delaunay@npm:5.3.0"
+"d3-delaunay@npm:^6.0.4":
+  version: 6.0.4
+  resolution: "d3-delaunay@npm:6.0.4"
   dependencies:
-    delaunator: "npm:4"
-  checksum: 10/27515c9d7f8b065edcc49e596177461cf3bb521eb06b14e051b02ba07d2cadd0a1586e1289fa63da41d82574f3410b13fdd64d2f45d8cbe964d29c46cfc24ce1
+    delaunator: "npm:5"
+  checksum: 10/4588e2872d4154daaf2c3f34fefe74e43b909cc460238a7b02823907ca6dd109f2c488c57c8551f1a2607fe4b44fdf24e3a190cea29bca70ef5606678dd9e2de
   languageName: node
   linkType: hard
 
@@ -18498,10 +18842,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"d3-format@npm:1 - 2":
-  version: 2.0.0
-  resolution: "d3-format@npm:2.0.0"
-  checksum: 10/7f87226c4c649889d5d3a19fd404b4c74d4468a2a80d91c31fd149bb8b1091ed315bc2b0233f9c3346fe2d6cdc083fb1c3b4053b02d286c695edbf9bd4819019
+"d3-format@npm:1 - 3":
+  version: 3.1.0
+  resolution: "d3-format@npm:3.1.0"
+  checksum: 10/a0fe23d2575f738027a3db0ce57160e5a473ccf24808c1ed46d45ef4f3211076b34a18b585547d34e365e78dcc26dd4ab15c069731fc4b1c07a26bfced09ea31
   languageName: node
   linkType: hard
 
@@ -18512,16 +18856,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"d3-interpolate@npm:1 - 2, d3-interpolate@npm:1.2.0 - 2":
-  version: 2.0.1
-  resolution: "d3-interpolate@npm:2.0.1"
-  dependencies:
-    d3-color: "npm:1 - 2"
-  checksum: 10/2f59f311ea1bff8b8a5e2834752b7b7515ac2428b15ea2b8af49bdb0f13489332e6068c7f1e663ef3f01743552be15686ddc7ba51b8d13e4f9d94c860b1163a4
-  languageName: node
-  linkType: hard
-
-"d3-interpolate@npm:1 - 3, d3-interpolate@npm:^3.0.1":
+"d3-interpolate@npm:1 - 3, d3-interpolate@npm:1.2.0 - 3, d3-interpolate@npm:^3.0.1":
   version: 3.0.1
   resolution: "d3-interpolate@npm:3.0.1"
   dependencies:
@@ -18530,20 +18865,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"d3-path@npm:1":
-  version: 1.0.9
-  resolution: "d3-path@npm:1.0.9"
-  checksum: 10/6ce1747837ea2a449d9ea32e169a382978ab09a4805eb408feb6bbc12cb5f5f6ce29aefc252dd9a815d420f4813d672f75578b78b3bbaf7811f54d8c7f93fd11
-  languageName: node
-  linkType: hard
-
-"d3-scale-chromatic@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "d3-scale-chromatic@npm:2.0.0"
-  dependencies:
-    d3-color: "npm:1 - 2"
-    d3-interpolate: "npm:1 - 2"
-  checksum: 10/f31c339c000e0cfd4149a564ee555b2a3d1f3e5bed533de866ce20b150b2bcfb0237ee89044af9068b9c6eed83114eca5b34718c6873470980fde9ec5bb8011e
+"d3-path@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "d3-path@npm:3.1.0"
+  checksum: 10/8e97a9ab4930a05b18adda64cf4929219bac913a5506cf8585631020253b39309549632a5cbeac778c0077994442ddaaee8316ee3f380e7baf7566321b84e76a
   languageName: node
   linkType: hard
 
@@ -18557,16 +18882,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"d3-scale@npm:^3.2.3":
-  version: 3.3.0
-  resolution: "d3-scale@npm:3.3.0"
+"d3-scale@npm:^4.0.2":
+  version: 4.0.2
+  resolution: "d3-scale@npm:4.0.2"
   dependencies:
-    d3-array: "npm:^2.3.0"
-    d3-format: "npm:1 - 2"
-    d3-interpolate: "npm:1.2.0 - 2"
-    d3-time: "npm:^2.1.1"
-    d3-time-format: "npm:2 - 3"
-  checksum: 10/54eea262b5aada3b23983e2ee299df7f4afee693c564174ef3755510c5c9c505b431e5f63a51e1080827002a17477c28e8a39326300a9f68360834125fffdf37
+    d3-array: "npm:2.10.0 - 3"
+    d3-format: "npm:1 - 3"
+    d3-interpolate: "npm:1.2.0 - 3"
+    d3-time: "npm:2.1.1 - 3"
+    d3-time-format: "npm:2 - 4"
+  checksum: 10/e2dc4243586eae2a0fdf91de1df1a90d51dfacb295933f0ca7e9184c31203b01436bef69906ad40f1100173a5e6197ae753cb7b8a1a8fcfda43194ea9cad6493
   languageName: node
   linkType: hard
 
@@ -18577,16 +18902,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"d3-shape@npm:^1.3.5":
-  version: 1.3.7
-  resolution: "d3-shape@npm:1.3.7"
+"d3-shape@npm:^3.2.0":
+  version: 3.2.0
+  resolution: "d3-shape@npm:3.2.0"
+  dependencies:
+    d3-path: "npm:^3.1.0"
+  checksum: 10/2e861f4d4781ee8abd85d2b435f848d667479dcf01a4e0db3a06600a5bdeddedb240f88229ec7b3bf7fa300c2b3526faeaf7e75f9a24dbf4396d3cc5358ff39d
+  languageName: node
+  linkType: hard
+
+"d3-time-format@npm:2 - 4":
+  version: 4.1.0
+  resolution: "d3-time-format@npm:4.1.0"
   dependencies:
-    d3-path: "npm:1"
-  checksum: 10/1e40fdcfdc8edc9c53a77a6aaea2dbf31bf06df12ebd66cc8d91f76bbde753049ad21dfee0577f7dc5d0a4468554ede4783f6df7d809e291745334dba977c09e
+    d3-time: "npm:1 - 3"
+  checksum: 10/ffc0959258fbb90e3890bfb31b43b764f51502b575e87d0af2c85b85ac379120d246914d07fca9f533d1bcedc27b2841d308a00fd64848c3e2cad9eff5c9a0aa
   languageName: node
   linkType: hard
 
-"d3-time-format@npm:2 - 3, d3-time-format@npm:^3.0.0":
+"d3-time-format@npm:^3.0.0":
   version: 3.0.0
   resolution: "d3-time-format@npm:3.0.0"
   dependencies:
@@ -18595,7 +18929,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"d3-time@npm:1 - 2, d3-time@npm:^2.1.1":
+"d3-time@npm:1 - 2":
   version: 2.1.1
   resolution: "d3-time@npm:2.1.1"
   dependencies:
@@ -18604,6 +18938,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"d3-time@npm:1 - 3, d3-time@npm:2.1.1 - 3":
+  version: 3.1.0
+  resolution: "d3-time@npm:3.1.0"
+  dependencies:
+    d3-array: "npm:2 - 3"
+  checksum: 10/c110bed295ce63e8180e45b82a9b0ba114d5f33ff315871878f209c1a6d821caa505739a2b07f38d1396637155b8e7372632dacc018e11fbe8ceef58f6af806d
+  languageName: node
+  linkType: hard
+
 "d3-time@npm:^1.0.11":
   version: 1.1.0
   resolution: "d3-time@npm:1.1.0"
@@ -18731,17 +19074,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"date-fns@npm:^2.15.0, date-fns@npm:^2.28.0":
-  version: 2.28.0
-  resolution: "date-fns@npm:2.28.0"
-  checksum: 10/2d99e884f7dc020971a394deef35cc4a2685cdf6c99585a79d64d271eb639e0e483f17948ec06c2820b01cc662b6e76b7be2aa3d671d530444447bf836cd40f8
-  languageName: node
-  linkType: hard
-
-"date-fns@npm:^3.3.1":
-  version: 3.3.1
-  resolution: "date-fns@npm:3.3.1"
-  checksum: 10/98231936765dfb6fc6897676319b500a06a39f051b2c3ecbdd541a07ce9b1344b770277b8bfb1049fb7a2f70bf365ac8e6f1e2bb452b10e1a8101d518ca7f95d
+"date-fns@npm:^2.30.0":
+  version: 2.30.0
+  resolution: "date-fns@npm:2.30.0"
+  dependencies:
+    "@babel/runtime": "npm:^7.21.0"
+  checksum: 10/70b3e8ea7aaaaeaa2cd80bd889622a4bcb5d8028b4de9162cbcda359db06e16ff6e9309e54eead5341e71031818497f19aaf9839c87d1aba1e27bb4796e758a9
   languageName: node
   linkType: hard
 
@@ -18777,7 +19115,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:2.6.9, debug@npm:^2.6.9":
+"debug@npm:2.6.9, debug@npm:^2.2.0, debug@npm:^2.3.3":
   version: 2.6.9
   resolution: "debug@npm:2.6.9"
   dependencies:
@@ -18786,7 +19124,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4, debug@npm:^4.3.5, debug@npm:^4.3.7":
+"debug@npm:3.1.0, debug@npm:~3.1.0":
+  version: 3.1.0
+  resolution: "debug@npm:3.1.0"
+  dependencies:
+    ms: "npm:2.0.0"
+  checksum: 10/f5fd4b1390dd3b03a78aa30133a4b4db62acc3e6cd86af49f114bf7f7bd57c41a5c5c2eced2ad2c8190d70c60309f2dd5782feeaa0704dbaa5697890e3c5ad07
+  languageName: node
+  linkType: hard
+
+"debug@npm:4, debug@npm:^4.0.0, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.4, debug@npm:^4.3.5, debug@npm:^4.3.7, debug@npm:~4.3.7":
   version: 4.3.7
   resolution: "debug@npm:4.3.7"
   dependencies:
@@ -18810,6 +19157,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"debug@npm:4.3.6":
+  version: 4.3.6
+  resolution: "debug@npm:4.3.6"
+  dependencies:
+    ms: "npm:2.1.2"
+  peerDependenciesMeta:
+    supports-color:
+      optional: true
+  checksum: 10/d3adb9af7d57a9e809a68f404490cf776122acca16e6359a2702c0f462e510e91f9765c07f707b8ab0d91e03bad57328f3256f5082631cefb5393d0394d50fb7
+  languageName: node
+  linkType: hard
+
 "debug@npm:^3.1.0, debug@npm:^3.2.7":
   version: 3.2.7
   resolution: "debug@npm:3.2.7"
@@ -18819,21 +19178,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debug@npm:~3.1.0":
-  version: 3.1.0
-  resolution: "debug@npm:3.1.0"
-  dependencies:
-    ms: "npm:2.0.0"
-  checksum: 10/f5fd4b1390dd3b03a78aa30133a4b4db62acc3e6cd86af49f114bf7f7bd57c41a5c5c2eced2ad2c8190d70c60309f2dd5782feeaa0704dbaa5697890e3c5ad07
-  languageName: node
-  linkType: hard
-
-"debug@npm:~4.1.1":
-  version: 4.1.1
-  resolution: "debug@npm:4.1.1"
+"decamelize-keys@npm:^1.0.0":
+  version: 1.1.1
+  resolution: "decamelize-keys@npm:1.1.1"
   dependencies:
-    ms: "npm:^2.1.1"
-  checksum: 10/19bd01e5b1e5869eacfb8e1ee9873dc90e1f90edfd9c460e388326b163e662189af291fcb67e3614dcfbeae29c1c7780a9a7b4bcea39b201316abdc058be89be
+    decamelize: "npm:^1.1.0"
+    map-obj: "npm:^1.0.0"
+  checksum: 10/71d5898174f17a8d2303cecc98ba0236e842948c4d042a8180d5e749be8442220bca2d16dd93bebd7b49e86c807814273212e4da0fae67be7c58c282ff76057a
   languageName: node
   linkType: hard
 
@@ -19106,6 +19457,34 @@ __metadata:
   languageName: node
   linkType: hard
 
+"define-property@npm:^0.2.5":
+  version: 0.2.5
+  resolution: "define-property@npm:0.2.5"
+  dependencies:
+    is-descriptor: "npm:^0.1.0"
+  checksum: 10/85af107072b04973b13f9e4128ab74ddfda48ec7ad2e54b193c0ffb57067c4ce5b7786a7b4ae1f24bd03e87c5d18766b094571810b314d7540f86d4354dbd394
+  languageName: node
+  linkType: hard
+
+"define-property@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "define-property@npm:1.0.0"
+  dependencies:
+    is-descriptor: "npm:^1.0.0"
+  checksum: 10/5fbed11dace44dd22914035ba9ae83ad06008532ca814d7936a53a09e897838acdad5b108dd0688cc8d2a7cf0681acbe00ee4136cf36743f680d10517379350a
+  languageName: node
+  linkType: hard
+
+"define-property@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "define-property@npm:2.0.2"
+  dependencies:
+    is-descriptor: "npm:^1.0.2"
+    isobject: "npm:^3.0.1"
+  checksum: 10/3217ed53fc9eed06ba8da6f4d33e28c68a82e2f2a8ab4d562c4920d8169a166fe7271453675e6c69301466f36a65d7f47edf0cf7f474b9aa52a5ead9c1b13c99
+  languageName: node
+  linkType: hard
+
 "defined@npm:^1.0.0":
   version: 1.0.1
   resolution: "defined@npm:1.0.1"
@@ -19113,10 +19492,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"delaunator@npm:4":
-  version: 4.0.1
-  resolution: "delaunator@npm:4.0.1"
-  checksum: 10/b4c1f65a4f0c4e58428725a34edee9089cd72cc3ee998c8b2fa1bc9e8f654ca1afe2fad42607085b15a7dd4dbe71ba2ce75a8c3c867a49fab6e4769b0854189d
+"delaunator@npm:5":
+  version: 5.0.1
+  resolution: "delaunator@npm:5.0.1"
+  dependencies:
+    robust-predicates: "npm:^3.0.2"
+  checksum: 10/c378a55138d81d471a7214635b1a2c5e74f8ee06582f558df72f0c7c82c25868599ce9a18fb25a245c6c03cab886d17fb574681c78371b539dd069818703f53a
   languageName: node
   linkType: hard
 
@@ -19148,7 +19529,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"deprecation@npm:^2.0.0, deprecation@npm:^2.3.1":
+"deprecation@npm:^2.0.0":
   version: 2.3.1
   resolution: "deprecation@npm:2.3.1"
   checksum: 10/f56a05e182c2c195071385455956b0c4106fe14e36245b00c689ceef8e8ab639235176a96977ba7c74afb173317fac2e0ec6ec7a1c6d1e6eaa401c586c714132
@@ -19186,7 +19567,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"destroy@npm:1.2.0":
+"destroy@npm:1.2.0, destroy@npm:^1.2.0":
   version: 1.2.0
   resolution: "destroy@npm:1.2.0"
   checksum: 10/0acb300b7478a08b92d810ab229d5afe0d2f4399272045ab22affa0d99dbaf12637659411530a6fcd597a9bdac718fc94373a61a95b4651bbc7b83684a565e38
@@ -19218,13 +19599,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"detect-libc@npm:^2.0.0, detect-libc@npm:^2.0.2":
+"detect-libc@npm:^2.0.0":
   version: 2.0.2
   resolution: "detect-libc@npm:2.0.2"
   checksum: 10/6118f30c0c425b1e56b9d2609f29bec50d35a6af0b762b6ad127271478f3bbfda7319ce869230cf1a351f2b219f39332cde290858553336d652c77b970f15de8
   languageName: node
   linkType: hard
 
+"detect-libc@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "detect-libc@npm:2.0.3"
+  checksum: 10/b4ea018d623e077bd395f168a9e81db77370dde36a5b01d067f2ad7989924a81d31cb547ff764acb2aa25d50bb7fdde0b0a93bec02212b0cb430621623246d39
+  languageName: node
+  linkType: hard
+
 "detect-newline@npm:^3.0.0":
   version: 3.1.0
   resolution: "detect-newline@npm:3.1.0"
@@ -19315,6 +19703,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"dir-glob@npm:^2.2.2":
+  version: 2.2.2
+  resolution: "dir-glob@npm:2.2.2"
+  dependencies:
+    path-type: "npm:^3.0.0"
+  checksum: 10/3aa48714a9f7845ffc30ab03a5c674fe760477cc55e67b0847333371549227d93953e6627ec160f75140c5bea5c5f88d13c01de79bd1997a588efbcf06980842
+  languageName: node
+  linkType: hard
+
 "dir-glob@npm:^3.0.1":
   version: 3.0.1
   resolution: "dir-glob@npm:3.0.1"
@@ -19440,7 +19837,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"domelementtype@npm:1":
+"domelementtype@npm:1, domelementtype@npm:^1.3.1":
   version: 1.3.1
   resolution: "domelementtype@npm:1.3.1"
   checksum: 10/7893da40218ae2106ec6ffc146b17f203487a52f5228b032ea7aa470e41dfe03e1bd762d0ee0139e792195efda765434b04b43cddcf63207b098f6ae44b36ad6
@@ -19472,7 +19869,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"domhandler@npm:^3.0.0":
+"domhandler@npm:^2.3.0":
+  version: 2.4.2
+  resolution: "domhandler@npm:2.4.2"
+  dependencies:
+    domelementtype: "npm:1"
+  checksum: 10/d8b0303c53c0eda912e45820ef8f6023f8462a724e8b824324f27923970222a250c7569e067de398c4d9ca3ce0f2b2d2818bc632d6fa72956721d6729479a9b9
+  languageName: node
+  linkType: hard
+
+"domhandler@npm:^3.3.0":
   version: 3.3.0
   resolution: "domhandler@npm:3.3.0"
   dependencies:
@@ -19506,14 +19912,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dompurify@npm:^3.1.7":
-  version: 3.1.7
-  resolution: "dompurify@npm:3.1.7"
-  checksum: 10/dc637a064306f83cf911caa267ffe1f973552047602020e3b6723c90f67962813edf8a65a0b62e8c9bc13fcd173a2691212a3719bc116226967f46bcd6181277
+"dompurify@npm:^3.2.0":
+  version: 3.2.0
+  resolution: "dompurify@npm:3.2.0"
+  checksum: 10/d9139fdc69e95efe43d154362216a9a6768c3a238b02b988a7ac0ddd044a992422d6c5fae5b319ab47aef8465824a815d104b843800b294352657f70d5168bfa
   languageName: node
   linkType: hard
 
-"domutils@npm:^1.7.0":
+"domutils@npm:^1.5.1, domutils@npm:^1.7.0":
   version: 1.7.0
   resolution: "domutils@npm:1.7.0"
   dependencies:
@@ -19523,7 +19929,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"domutils@npm:^2.0.0, domutils@npm:^2.5.2, domutils@npm:^2.8.0":
+"domutils@npm:^2.4.2, domutils@npm:^2.5.2, domutils@npm:^2.8.0":
   version: 2.8.0
   resolution: "domutils@npm:2.8.0"
   dependencies:
@@ -19534,7 +19940,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"domutils@npm:^3.0.1":
+"domutils@npm:^3.0.1, domutils@npm:^3.1.0":
   version: 3.1.0
   resolution: "domutils@npm:3.1.0"
   dependencies:
@@ -19555,15 +19961,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dot-prop@npm:^4.2.1":
-  version: 4.2.1
-  resolution: "dot-prop@npm:4.2.1"
-  dependencies:
-    is-obj: "npm:^1.0.0"
-  checksum: 10/25372bc0a4c3921d8056b8f14f44758154cfbd80e85f5fc35fef278b88c320921213d5d8ba64cff8cfc58a57f3e2f10e10e59a48d0bf146a23cf2a7ebe0292f1
-  languageName: node
-  linkType: hard
-
 "dot-prop@npm:^5.2.0":
   version: 5.3.0
   resolution: "dot-prop@npm:5.3.0"
@@ -19628,15 +20025,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"duplexer2@npm:~0.0.2":
-  version: 0.0.2
-  resolution: "duplexer2@npm:0.0.2"
-  dependencies:
-    readable-stream: "npm:~1.1.9"
-  checksum: 10/8c52e4a592dfdaa067dce9c14f4e0cd41f809b7bac38304b12902a452c5cc3692e5657a084b612c6a18ee982b4562524a15ec9e29bccaf774aace4879c82a8fa
-  languageName: node
-  linkType: hard
-
 "duplexer3@npm:^0.1.4":
   version: 0.1.4
   resolution: "duplexer3@npm:0.1.4"
@@ -19644,7 +20032,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"duplexer@npm:^0.1.1, duplexer@npm:^0.1.2, duplexer@npm:~0.1.1":
+"duplexer@npm:^0.1.1, duplexer@npm:~0.1.1":
   version: 0.1.2
   resolution: "duplexer@npm:0.1.2"
   checksum: 10/62ba61a830c56801db28ff6305c7d289b6dc9f859054e8c982abd8ee0b0a14d2e9a8e7d086ffee12e868d43e2bbe8a964be55ddbd8c8957714c87373c7a4f9b0
@@ -19696,6 +20084,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ejs@npm:^3.1.10":
+  version: 3.1.10
+  resolution: "ejs@npm:3.1.10"
+  dependencies:
+    jake: "npm:^10.8.5"
+  bin:
+    ejs: bin/cli.js
+  checksum: 10/a9cb7d7cd13b7b1cd0be5c4788e44dd10d92f7285d2f65b942f33e127230c054f99a42db4d99f766d8dbc6c57e94799593ee66a14efd7c8dd70c4812bf6aa384
+  languageName: node
+  linkType: hard
+
 "ejson@npm:^2.2.3":
   version: 2.2.3
   resolution: "ejson@npm:2.2.3"
@@ -19724,9 +20123,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"elliptic@npm:^6.5.3, elliptic@npm:^6.5.5, elliptic@npm:^6.5.7":
-  version: 6.5.7
-  resolution: "elliptic@npm:6.5.7"
+"elliptic@npm:^6.5.3, elliptic@npm:^6.5.5, elliptic@npm:^6.6.0":
+  version: 6.6.0
+  resolution: "elliptic@npm:6.6.0"
   dependencies:
     bn.js: "npm:^4.11.9"
     brorand: "npm:^1.1.0"
@@ -19735,7 +20134,7 @@ __metadata:
     inherits: "npm:^2.0.4"
     minimalistic-assert: "npm:^1.0.1"
     minimalistic-crypto-utils: "npm:^1.0.1"
-  checksum: 10/fbad1fad0a5cc07df83f80cc1f7a784247ef59075194d3e340eaeb2f4dd594825ee24c7e9b0cf279c9f1982efe610503bb3139737926428c4821d4fca1bcf348
+  checksum: 10/27575b0403e010e5d7e7a131fcadce6a7dd1ae82ccb24cc7c20b275d32ab1cb7ecb6a070225795df08407441dc8c7a32efd986596d48d1d6846f64ff8f094af7
   languageName: node
   linkType: hard
 
@@ -19842,6 +20241,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"encodeurl@npm:^2.0.0, encodeurl@npm:~2.0.0":
+  version: 2.0.0
+  resolution: "encodeurl@npm:2.0.0"
+  checksum: 10/abf5cd51b78082cf8af7be6785813c33b6df2068ce5191a40ca8b1afe6a86f9230af9a9ce694a5ce4665955e5c1120871826df9c128a642e09c58d592e2807fe
+  languageName: node
+  linkType: hard
+
 "encodeurl@npm:~1.0.2":
   version: 1.0.2
   resolution: "encodeurl@npm:1.0.2"
@@ -19849,13 +20255,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"encodeurl@npm:~2.0.0":
-  version: 2.0.0
-  resolution: "encodeurl@npm:2.0.0"
-  checksum: 10/abf5cd51b78082cf8af7be6785813c33b6df2068ce5191a40ca8b1afe6a86f9230af9a9ce694a5ce4665955e5c1120871826df9c128a642e09c58d592e2807fe
-  languageName: node
-  linkType: hard
-
 "encoding-japanese@npm:2.0.0":
   version: 2.0.0
   resolution: "encoding-japanese@npm:2.0.0"
@@ -19870,6 +20269,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"encoding-sniffer@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "encoding-sniffer@npm:0.2.0"
+  dependencies:
+    iconv-lite: "npm:^0.6.3"
+    whatwg-encoding: "npm:^3.1.1"
+  checksum: 10/fe61a759dbef4d94ddc6f4fa645459897f4275eba04f0135d0459099b5f62fbba8a7ae57d23c9ec9b118c4c39ce056b51f1b8e62ad73a8ab365699448d655f4c
+  languageName: node
+  linkType: hard
+
 "encoding@npm:^0.1.13":
   version: 0.1.13
   resolution: "encoding@npm:0.1.13"
@@ -19935,6 +20344,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"entities@npm:^1.1.1":
+  version: 1.1.2
+  resolution: "entities@npm:1.1.2"
+  checksum: 10/4a707022f4e932060f03df2526be55d085a2576fe534421e5b22bc62abb0d1f04241c171f9981e3d7baa4f4160606cad72a2f7eb01b6a25e279e3f31a2be4bf2
+  languageName: node
+  linkType: hard
+
 "entities@npm:^2.0.0":
   version: 2.2.0
   resolution: "entities@npm:2.2.0"
@@ -19942,7 +20358,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"entities@npm:^4.2.0, entities@npm:^4.4.0":
+"entities@npm:^4.2.0, entities@npm:^4.4.0, entities@npm:^4.5.0":
   version: 4.5.0
   resolution: "entities@npm:4.5.0"
   checksum: 10/ede2a35c9bce1aeccd055a1b445d41c75a14a2bb1cd22e242f20cf04d236cdcd7f9c859eb83f76885327bfae0c25bf03303665ee1ce3d47c5927b98b0e3e3d48
@@ -20009,7 +20425,61 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es-abstract@npm:^1.17.2, es-abstract@npm:^1.19.1, es-abstract@npm:^1.20.4, es-abstract@npm:^1.22.1, es-abstract@npm:^1.22.3, es-abstract@npm:^1.23.0, es-abstract@npm:^1.23.1, es-abstract@npm:^1.23.2":
+"es-abstract@npm:^1.17.2":
+  version: 1.23.5
+  resolution: "es-abstract@npm:1.23.5"
+  dependencies:
+    array-buffer-byte-length: "npm:^1.0.1"
+    arraybuffer.prototype.slice: "npm:^1.0.3"
+    available-typed-arrays: "npm:^1.0.7"
+    call-bind: "npm:^1.0.7"
+    data-view-buffer: "npm:^1.0.1"
+    data-view-byte-length: "npm:^1.0.1"
+    data-view-byte-offset: "npm:^1.0.0"
+    es-define-property: "npm:^1.0.0"
+    es-errors: "npm:^1.3.0"
+    es-object-atoms: "npm:^1.0.0"
+    es-set-tostringtag: "npm:^2.0.3"
+    es-to-primitive: "npm:^1.2.1"
+    function.prototype.name: "npm:^1.1.6"
+    get-intrinsic: "npm:^1.2.4"
+    get-symbol-description: "npm:^1.0.2"
+    globalthis: "npm:^1.0.4"
+    gopd: "npm:^1.0.1"
+    has-property-descriptors: "npm:^1.0.2"
+    has-proto: "npm:^1.0.3"
+    has-symbols: "npm:^1.0.3"
+    hasown: "npm:^2.0.2"
+    internal-slot: "npm:^1.0.7"
+    is-array-buffer: "npm:^3.0.4"
+    is-callable: "npm:^1.2.7"
+    is-data-view: "npm:^1.0.1"
+    is-negative-zero: "npm:^2.0.3"
+    is-regex: "npm:^1.1.4"
+    is-shared-array-buffer: "npm:^1.0.3"
+    is-string: "npm:^1.0.7"
+    is-typed-array: "npm:^1.1.13"
+    is-weakref: "npm:^1.0.2"
+    object-inspect: "npm:^1.13.3"
+    object-keys: "npm:^1.1.1"
+    object.assign: "npm:^4.1.5"
+    regexp.prototype.flags: "npm:^1.5.3"
+    safe-array-concat: "npm:^1.1.2"
+    safe-regex-test: "npm:^1.0.3"
+    string.prototype.trim: "npm:^1.2.9"
+    string.prototype.trimend: "npm:^1.0.8"
+    string.prototype.trimstart: "npm:^1.0.8"
+    typed-array-buffer: "npm:^1.0.2"
+    typed-array-byte-length: "npm:^1.0.1"
+    typed-array-byte-offset: "npm:^1.0.2"
+    typed-array-length: "npm:^1.0.6"
+    unbox-primitive: "npm:^1.0.2"
+    which-typed-array: "npm:^1.1.15"
+  checksum: 10/2170afde7e1d2497586ad74176c2e12196db947fb1b3287fc097781a871b75ebe3aef5247e951e3bb3972a830b8d0eaa82a509518836a6d9f9fb4934b9294467
+  languageName: node
+  linkType: hard
+
+"es-abstract@npm:^1.17.5, es-abstract@npm:^1.19.1, es-abstract@npm:^1.20.4, es-abstract@npm:^1.22.1, es-abstract@npm:^1.22.3, es-abstract@npm:^1.23.0, es-abstract@npm:^1.23.1, es-abstract@npm:^1.23.2, es-abstract@npm:^1.23.3":
   version: 1.23.3
   resolution: "es-abstract@npm:1.23.3"
   dependencies:
@@ -20086,42 +20556,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"es-get-iterator@npm:^1.0.2":
-  version: 1.1.3
-  resolution: "es-get-iterator@npm:1.1.3"
-  dependencies:
-    call-bind: "npm:^1.0.2"
-    get-intrinsic: "npm:^1.1.3"
-    has-symbols: "npm:^1.0.3"
-    is-arguments: "npm:^1.1.1"
-    is-map: "npm:^2.0.2"
-    is-set: "npm:^2.0.2"
-    is-string: "npm:^1.0.7"
-    isarray: "npm:^2.0.5"
-    stop-iteration-iterator: "npm:^1.0.0"
-  checksum: 10/bc2194befbe55725f9489098626479deee3c801eda7e83ce0dff2eb266a28dc808edb9b623ff01d31ebc1328f09d661333d86b601036692c2e3c1a6942319433
-  languageName: node
-  linkType: hard
-
-"es-iterator-helpers@npm:^1.0.15":
-  version: 1.0.18
-  resolution: "es-iterator-helpers@npm:1.0.18"
+"es-iterator-helpers@npm:^1.1.0":
+  version: 1.2.0
+  resolution: "es-iterator-helpers@npm:1.2.0"
   dependencies:
     call-bind: "npm:^1.0.7"
     define-properties: "npm:^1.2.1"
-    es-abstract: "npm:^1.23.0"
+    es-abstract: "npm:^1.23.3"
     es-errors: "npm:^1.3.0"
     es-set-tostringtag: "npm:^2.0.3"
     function-bind: "npm:^1.1.2"
     get-intrinsic: "npm:^1.2.4"
-    globalthis: "npm:^1.0.3"
+    globalthis: "npm:^1.0.4"
+    gopd: "npm:^1.0.1"
     has-property-descriptors: "npm:^1.0.2"
     has-proto: "npm:^1.0.3"
     has-symbols: "npm:^1.0.3"
     internal-slot: "npm:^1.0.7"
-    iterator.prototype: "npm:^1.1.2"
+    iterator.prototype: "npm:^1.1.3"
     safe-array-concat: "npm:^1.1.2"
-  checksum: 10/a4fd067e148736fbe6a9883f449e0de88be14a4dff9065c457572ede10ba02a4a15c4ae18b9b7baa5c868860d2be9a6764906c3308135e57ec5bfd386bbd2836
+  checksum: 10/a4159e36c6bae03d4b636894fff2ff1acfcedc16c622939298b00adf4d2da6356ad92f682cc75c037a012a4b06adb903f67dfdfd05bac61847e9b763de2acbcb
   languageName: node
   linkType: hard
 
@@ -20161,6 +20615,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"es-shim-unscopables@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "es-shim-unscopables@npm:1.0.2"
+  dependencies:
+    hasown: "npm:^2.0.0"
+  checksum: 10/6d3bf91f658a27cc7217cd32b407a0d714393a84d125ad576319b9e83a893bea165cf41270c29e9ceaa56d3cf41608945d7e2a2c31fd51c0009b0c31402b91c7
+  languageName: node
+  linkType: hard
+
 "es-to-primitive@npm:^1.2.1":
   version: 1.2.1
   resolution: "es-to-primitive@npm:1.2.1"
@@ -20190,111 +20653,34 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esbuild@npm:^0.17.6":
-  version: 0.17.19
-  resolution: "esbuild@npm:0.17.19"
-  dependencies:
-    "@esbuild/android-arm": "npm:0.17.19"
-    "@esbuild/android-arm64": "npm:0.17.19"
-    "@esbuild/android-x64": "npm:0.17.19"
-    "@esbuild/darwin-arm64": "npm:0.17.19"
-    "@esbuild/darwin-x64": "npm:0.17.19"
-    "@esbuild/freebsd-arm64": "npm:0.17.19"
-    "@esbuild/freebsd-x64": "npm:0.17.19"
-    "@esbuild/linux-arm": "npm:0.17.19"
-    "@esbuild/linux-arm64": "npm:0.17.19"
-    "@esbuild/linux-ia32": "npm:0.17.19"
-    "@esbuild/linux-loong64": "npm:0.17.19"
-    "@esbuild/linux-mips64el": "npm:0.17.19"
-    "@esbuild/linux-ppc64": "npm:0.17.19"
-    "@esbuild/linux-riscv64": "npm:0.17.19"
-    "@esbuild/linux-s390x": "npm:0.17.19"
-    "@esbuild/linux-x64": "npm:0.17.19"
-    "@esbuild/netbsd-x64": "npm:0.17.19"
-    "@esbuild/openbsd-x64": "npm:0.17.19"
-    "@esbuild/sunos-x64": "npm:0.17.19"
-    "@esbuild/win32-arm64": "npm:0.17.19"
-    "@esbuild/win32-ia32": "npm:0.17.19"
-    "@esbuild/win32-x64": "npm:0.17.19"
-  dependenciesMeta:
-    "@esbuild/android-arm":
-      optional: true
-    "@esbuild/android-arm64":
-      optional: true
-    "@esbuild/android-x64":
-      optional: true
-    "@esbuild/darwin-arm64":
-      optional: true
-    "@esbuild/darwin-x64":
-      optional: true
-    "@esbuild/freebsd-arm64":
-      optional: true
-    "@esbuild/freebsd-x64":
-      optional: true
-    "@esbuild/linux-arm":
-      optional: true
-    "@esbuild/linux-arm64":
-      optional: true
-    "@esbuild/linux-ia32":
-      optional: true
-    "@esbuild/linux-loong64":
-      optional: true
-    "@esbuild/linux-mips64el":
-      optional: true
-    "@esbuild/linux-ppc64":
-      optional: true
-    "@esbuild/linux-riscv64":
-      optional: true
-    "@esbuild/linux-s390x":
-      optional: true
-    "@esbuild/linux-x64":
-      optional: true
-    "@esbuild/netbsd-x64":
-      optional: true
-    "@esbuild/openbsd-x64":
-      optional: true
-    "@esbuild/sunos-x64":
-      optional: true
-    "@esbuild/win32-arm64":
-      optional: true
-    "@esbuild/win32-ia32":
-      optional: true
-    "@esbuild/win32-x64":
-      optional: true
-  bin:
-    esbuild: bin/esbuild
-  checksum: 10/86ada7cad6d37a3445858fee31ca39fc6c0436c7c00b2e07b9ce308235be67f36aefe0dda25da9ab08653fde496d1e759d6ad891ce9479f9e1fb4964c8f2a0fa
-  languageName: node
-  linkType: hard
-
-"esbuild@npm:^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0":
-  version: 0.23.1
-  resolution: "esbuild@npm:0.23.1"
-  dependencies:
-    "@esbuild/aix-ppc64": "npm:0.23.1"
-    "@esbuild/android-arm": "npm:0.23.1"
-    "@esbuild/android-arm64": "npm:0.23.1"
-    "@esbuild/android-x64": "npm:0.23.1"
-    "@esbuild/darwin-arm64": "npm:0.23.1"
-    "@esbuild/darwin-x64": "npm:0.23.1"
-    "@esbuild/freebsd-arm64": "npm:0.23.1"
-    "@esbuild/freebsd-x64": "npm:0.23.1"
-    "@esbuild/linux-arm": "npm:0.23.1"
-    "@esbuild/linux-arm64": "npm:0.23.1"
-    "@esbuild/linux-ia32": "npm:0.23.1"
-    "@esbuild/linux-loong64": "npm:0.23.1"
-    "@esbuild/linux-mips64el": "npm:0.23.1"
-    "@esbuild/linux-ppc64": "npm:0.23.1"
-    "@esbuild/linux-riscv64": "npm:0.23.1"
-    "@esbuild/linux-s390x": "npm:0.23.1"
-    "@esbuild/linux-x64": "npm:0.23.1"
-    "@esbuild/netbsd-x64": "npm:0.23.1"
-    "@esbuild/openbsd-arm64": "npm:0.23.1"
-    "@esbuild/openbsd-x64": "npm:0.23.1"
-    "@esbuild/sunos-x64": "npm:0.23.1"
-    "@esbuild/win32-arm64": "npm:0.23.1"
-    "@esbuild/win32-ia32": "npm:0.23.1"
-    "@esbuild/win32-x64": "npm:0.23.1"
+"esbuild@npm:^0.18.0 || ^0.19.0 || ^0.20.0 || ^0.21.0 || ^0.22.0 || ^0.23.0 || ^0.24.0, esbuild@npm:^0.24.0":
+  version: 0.24.0
+  resolution: "esbuild@npm:0.24.0"
+  dependencies:
+    "@esbuild/aix-ppc64": "npm:0.24.0"
+    "@esbuild/android-arm": "npm:0.24.0"
+    "@esbuild/android-arm64": "npm:0.24.0"
+    "@esbuild/android-x64": "npm:0.24.0"
+    "@esbuild/darwin-arm64": "npm:0.24.0"
+    "@esbuild/darwin-x64": "npm:0.24.0"
+    "@esbuild/freebsd-arm64": "npm:0.24.0"
+    "@esbuild/freebsd-x64": "npm:0.24.0"
+    "@esbuild/linux-arm": "npm:0.24.0"
+    "@esbuild/linux-arm64": "npm:0.24.0"
+    "@esbuild/linux-ia32": "npm:0.24.0"
+    "@esbuild/linux-loong64": "npm:0.24.0"
+    "@esbuild/linux-mips64el": "npm:0.24.0"
+    "@esbuild/linux-ppc64": "npm:0.24.0"
+    "@esbuild/linux-riscv64": "npm:0.24.0"
+    "@esbuild/linux-s390x": "npm:0.24.0"
+    "@esbuild/linux-x64": "npm:0.24.0"
+    "@esbuild/netbsd-x64": "npm:0.24.0"
+    "@esbuild/openbsd-arm64": "npm:0.24.0"
+    "@esbuild/openbsd-x64": "npm:0.24.0"
+    "@esbuild/sunos-x64": "npm:0.24.0"
+    "@esbuild/win32-arm64": "npm:0.24.0"
+    "@esbuild/win32-ia32": "npm:0.24.0"
+    "@esbuild/win32-x64": "npm:0.24.0"
   dependenciesMeta:
     "@esbuild/aix-ppc64":
       optional: true
@@ -20346,114 +20732,37 @@ __metadata:
       optional: true
   bin:
     esbuild: bin/esbuild
-  checksum: 10/f55fbd0bfb0f86ce67a6d2c6f6780729d536c330999ecb9f5a38d578fb9fda820acbbc67d6d1d377eed8fed50fc38f14ff9cb014f86dafab94269a7fb2177018
-  languageName: node
-  linkType: hard
-
-"esbuild@npm:^0.18.10":
-  version: 0.18.20
-  resolution: "esbuild@npm:0.18.20"
-  dependencies:
-    "@esbuild/android-arm": "npm:0.18.20"
-    "@esbuild/android-arm64": "npm:0.18.20"
-    "@esbuild/android-x64": "npm:0.18.20"
-    "@esbuild/darwin-arm64": "npm:0.18.20"
-    "@esbuild/darwin-x64": "npm:0.18.20"
-    "@esbuild/freebsd-arm64": "npm:0.18.20"
-    "@esbuild/freebsd-x64": "npm:0.18.20"
-    "@esbuild/linux-arm": "npm:0.18.20"
-    "@esbuild/linux-arm64": "npm:0.18.20"
-    "@esbuild/linux-ia32": "npm:0.18.20"
-    "@esbuild/linux-loong64": "npm:0.18.20"
-    "@esbuild/linux-mips64el": "npm:0.18.20"
-    "@esbuild/linux-ppc64": "npm:0.18.20"
-    "@esbuild/linux-riscv64": "npm:0.18.20"
-    "@esbuild/linux-s390x": "npm:0.18.20"
-    "@esbuild/linux-x64": "npm:0.18.20"
-    "@esbuild/netbsd-x64": "npm:0.18.20"
-    "@esbuild/openbsd-x64": "npm:0.18.20"
-    "@esbuild/sunos-x64": "npm:0.18.20"
-    "@esbuild/win32-arm64": "npm:0.18.20"
-    "@esbuild/win32-ia32": "npm:0.18.20"
-    "@esbuild/win32-x64": "npm:0.18.20"
-  dependenciesMeta:
-    "@esbuild/android-arm":
-      optional: true
-    "@esbuild/android-arm64":
-      optional: true
-    "@esbuild/android-x64":
-      optional: true
-    "@esbuild/darwin-arm64":
-      optional: true
-    "@esbuild/darwin-x64":
-      optional: true
-    "@esbuild/freebsd-arm64":
-      optional: true
-    "@esbuild/freebsd-x64":
-      optional: true
-    "@esbuild/linux-arm":
-      optional: true
-    "@esbuild/linux-arm64":
-      optional: true
-    "@esbuild/linux-ia32":
-      optional: true
-    "@esbuild/linux-loong64":
-      optional: true
-    "@esbuild/linux-mips64el":
-      optional: true
-    "@esbuild/linux-ppc64":
-      optional: true
-    "@esbuild/linux-riscv64":
-      optional: true
-    "@esbuild/linux-s390x":
-      optional: true
-    "@esbuild/linux-x64":
-      optional: true
-    "@esbuild/netbsd-x64":
-      optional: true
-    "@esbuild/openbsd-x64":
-      optional: true
-    "@esbuild/sunos-x64":
-      optional: true
-    "@esbuild/win32-arm64":
-      optional: true
-    "@esbuild/win32-ia32":
-      optional: true
-    "@esbuild/win32-x64":
-      optional: true
-  bin:
-    esbuild: bin/esbuild
-  checksum: 10/1f723ec71c3aa196473bf3298316eedc3f62d523924652dfeb60701b609792f918fc60db84b420d1d8ba9bfa7d69de2fc1d3157ba47c028bdae5d507a26a3c64
-  languageName: node
-  linkType: hard
-
-"esbuild@npm:^0.20.2":
-  version: 0.20.2
-  resolution: "esbuild@npm:0.20.2"
-  dependencies:
-    "@esbuild/aix-ppc64": "npm:0.20.2"
-    "@esbuild/android-arm": "npm:0.20.2"
-    "@esbuild/android-arm64": "npm:0.20.2"
-    "@esbuild/android-x64": "npm:0.20.2"
-    "@esbuild/darwin-arm64": "npm:0.20.2"
-    "@esbuild/darwin-x64": "npm:0.20.2"
-    "@esbuild/freebsd-arm64": "npm:0.20.2"
-    "@esbuild/freebsd-x64": "npm:0.20.2"
-    "@esbuild/linux-arm": "npm:0.20.2"
-    "@esbuild/linux-arm64": "npm:0.20.2"
-    "@esbuild/linux-ia32": "npm:0.20.2"
-    "@esbuild/linux-loong64": "npm:0.20.2"
-    "@esbuild/linux-mips64el": "npm:0.20.2"
-    "@esbuild/linux-ppc64": "npm:0.20.2"
-    "@esbuild/linux-riscv64": "npm:0.20.2"
-    "@esbuild/linux-s390x": "npm:0.20.2"
-    "@esbuild/linux-x64": "npm:0.20.2"
-    "@esbuild/netbsd-x64": "npm:0.20.2"
-    "@esbuild/openbsd-x64": "npm:0.20.2"
-    "@esbuild/sunos-x64": "npm:0.20.2"
-    "@esbuild/win32-arm64": "npm:0.20.2"
-    "@esbuild/win32-ia32": "npm:0.20.2"
-    "@esbuild/win32-x64": "npm:0.20.2"
+  checksum: 10/500f83a1216d6548053007b85c070d8293395db344605b17418c6cf1217e5e8d338fa77fc8af27c23faa121c5528e5b0004d46d3a0cdeb87d48f1b5fa0164bc5
+  languageName: node
+  linkType: hard
+
+"esbuild@npm:^0.21.3":
+  version: 0.21.5
+  resolution: "esbuild@npm:0.21.5"
+  dependencies:
+    "@esbuild/aix-ppc64": "npm:0.21.5"
+    "@esbuild/android-arm": "npm:0.21.5"
+    "@esbuild/android-arm64": "npm:0.21.5"
+    "@esbuild/android-x64": "npm:0.21.5"
+    "@esbuild/darwin-arm64": "npm:0.21.5"
+    "@esbuild/darwin-x64": "npm:0.21.5"
+    "@esbuild/freebsd-arm64": "npm:0.21.5"
+    "@esbuild/freebsd-x64": "npm:0.21.5"
+    "@esbuild/linux-arm": "npm:0.21.5"
+    "@esbuild/linux-arm64": "npm:0.21.5"
+    "@esbuild/linux-ia32": "npm:0.21.5"
+    "@esbuild/linux-loong64": "npm:0.21.5"
+    "@esbuild/linux-mips64el": "npm:0.21.5"
+    "@esbuild/linux-ppc64": "npm:0.21.5"
+    "@esbuild/linux-riscv64": "npm:0.21.5"
+    "@esbuild/linux-s390x": "npm:0.21.5"
+    "@esbuild/linux-x64": "npm:0.21.5"
+    "@esbuild/netbsd-x64": "npm:0.21.5"
+    "@esbuild/openbsd-x64": "npm:0.21.5"
+    "@esbuild/sunos-x64": "npm:0.21.5"
+    "@esbuild/win32-arm64": "npm:0.21.5"
+    "@esbuild/win32-ia32": "npm:0.21.5"
+    "@esbuild/win32-x64": "npm:0.21.5"
   dependenciesMeta:
     "@esbuild/aix-ppc64":
       optional: true
@@ -20503,7 +20812,7 @@ __metadata:
       optional: true
   bin:
     esbuild: bin/esbuild
-  checksum: 10/663215ab7e599651e00d61b528a63136e1f1d397db8b9c3712540af928c9476d61da95aefa81b7a8dfc7a9fdd7616fcf08395c27be68be8c99953fb461863ce4
+  checksum: 10/d2ff2ca84d30cce8e871517374d6c2290835380dc7cd413b2d49189ed170d45e407be14de2cb4794cf76f75cf89955c4714726ebd3de7444b3046f5cab23ab6b
   languageName: node
   linkType: hard
 
@@ -20549,7 +20858,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"escodegen@npm:^2.0.0, escodegen@npm:^2.1.0":
+"escodegen@npm:^2.0.0":
   version: 2.1.0
   resolution: "escodegen@npm:2.1.0"
   dependencies:
@@ -20581,37 +20890,37 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-config-prettier@npm:~8.8.0":
-  version: 8.8.0
-  resolution: "eslint-config-prettier@npm:8.8.0"
+"eslint-config-prettier@npm:~9.1.0":
+  version: 9.1.0
+  resolution: "eslint-config-prettier@npm:9.1.0"
   peerDependencies:
     eslint: ">=7.0.0"
   bin:
     eslint-config-prettier: bin/cli.js
-  checksum: 10/3638144cecada897105ff9442bc85aba71c4f44d7d25b576cb34d50a207f6655f7cc55e729aad1a934a9f15e55c88e7adcbd1067d6582325fc89864c879b52f1
+  checksum: 10/411e3b3b1c7aa04e3e0f20d561271b3b909014956c4dba51c878bf1a23dbb8c800a3be235c46c4732c70827276e540b6eed4636d9b09b444fd0a8e07f0fcd830
   languageName: node
   linkType: hard
 
-"eslint-import-resolver-node@npm:^0.3.6":
-  version: 0.3.7
-  resolution: "eslint-import-resolver-node@npm:0.3.7"
+"eslint-import-resolver-node@npm:^0.3.9":
+  version: 0.3.9
+  resolution: "eslint-import-resolver-node@npm:0.3.9"
   dependencies:
     debug: "npm:^3.2.7"
-    is-core-module: "npm:^2.11.0"
-    resolve: "npm:^1.22.1"
-  checksum: 10/31c6dfbd3457d1e6170ac2326b7ba9c323ff1ea68e3fcc5309f234bd1cefed050ee9b35e458b5eaed91323ab0d29bb2eddb41a1720ba7ca09bbacb00a0339d64
+    is-core-module: "npm:^2.13.0"
+    resolve: "npm:^1.22.4"
+  checksum: 10/d52e08e1d96cf630957272e4f2644dcfb531e49dcfd1edd2e07e43369eb2ec7a7d4423d417beee613201206ff2efa4eb9a582b5825ee28802fc7c71fcd53ca83
   languageName: node
   linkType: hard
 
-"eslint-module-utils@npm:^2.7.3":
-  version: 2.7.4
-  resolution: "eslint-module-utils@npm:2.7.4"
+"eslint-module-utils@npm:^2.12.0":
+  version: 2.12.0
+  resolution: "eslint-module-utils@npm:2.12.0"
   dependencies:
     debug: "npm:^3.2.7"
   peerDependenciesMeta:
     eslint:
       optional: true
-  checksum: 10/25527e03d4245d1d0b2ff1f752aaa02a34520c2a56403fd316e7ea54dcbbdd68089d490c6db2b79bfd4de57287535ade9fef6e024caa6310fc664289899a672d
+  checksum: 10/dd27791147eca17366afcb83f47d6825b6ce164abb256681e5de4ec1d7e87d8605641eb869298a0dbc70665e2446dbcc2f40d3e1631a9475dd64dd23d4ca5dee
   languageName: node
   linkType: hard
 
@@ -20624,209 +20933,194 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-import@npm:~2.26.0":
-  version: 2.26.0
-  resolution: "eslint-plugin-import@npm:2.26.0"
+"eslint-plugin-import@npm:~2.31.0":
+  version: 2.31.0
+  resolution: "eslint-plugin-import@npm:2.31.0"
   dependencies:
-    array-includes: "npm:^3.1.4"
-    array.prototype.flat: "npm:^1.2.5"
-    debug: "npm:^2.6.9"
+    "@rtsao/scc": "npm:^1.1.0"
+    array-includes: "npm:^3.1.8"
+    array.prototype.findlastindex: "npm:^1.2.5"
+    array.prototype.flat: "npm:^1.3.2"
+    array.prototype.flatmap: "npm:^1.3.2"
+    debug: "npm:^3.2.7"
     doctrine: "npm:^2.1.0"
-    eslint-import-resolver-node: "npm:^0.3.6"
-    eslint-module-utils: "npm:^2.7.3"
-    has: "npm:^1.0.3"
-    is-core-module: "npm:^2.8.1"
+    eslint-import-resolver-node: "npm:^0.3.9"
+    eslint-module-utils: "npm:^2.12.0"
+    hasown: "npm:^2.0.2"
+    is-core-module: "npm:^2.15.1"
     is-glob: "npm:^4.0.3"
     minimatch: "npm:^3.1.2"
-    object.values: "npm:^1.1.5"
-    resolve: "npm:^1.22.0"
-    tsconfig-paths: "npm:^3.14.1"
+    object.fromentries: "npm:^2.0.8"
+    object.groupby: "npm:^1.0.3"
+    object.values: "npm:^1.2.0"
+    semver: "npm:^6.3.1"
+    string.prototype.trimend: "npm:^1.0.8"
+    tsconfig-paths: "npm:^3.15.0"
   peerDependencies:
-    eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8
-  checksum: 10/80322d0414c6d6b6f8ddb77a87ede733d7af8536461cbc977e0da9a9e7bd976aa588488a5f310383b914111f496c0a259d2752f402e5880b16ecc48aca89b29e
+    eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9
+  checksum: 10/6b76bd009ac2db0615d9019699d18e2a51a86cb8c1d0855a35fb1b418be23b40239e6debdc6e8c92c59f1468ed0ea8d7b85c817117a113d5cc225be8a02ad31c
   languageName: node
   linkType: hard
 
-"eslint-plugin-jest@npm:~27.2.3":
-  version: 27.2.3
-  resolution: "eslint-plugin-jest@npm:27.2.3"
+"eslint-plugin-jest@npm:~28.8.3":
+  version: 28.8.3
+  resolution: "eslint-plugin-jest@npm:28.8.3"
   dependencies:
-    "@typescript-eslint/utils": "npm:^5.10.0"
+    "@typescript-eslint/utils": "npm:^6.0.0 || ^7.0.0 || ^8.0.0"
   peerDependencies:
-    "@typescript-eslint/eslint-plugin": ^5.0.0 || ^6.0.0
-    eslint: ^7.0.0 || ^8.0.0
+    "@typescript-eslint/eslint-plugin": ^6.0.0 || ^7.0.0 || ^8.0.0
+    eslint: ^7.0.0 || ^8.0.0 || ^9.0.0
     jest: "*"
   peerDependenciesMeta:
     "@typescript-eslint/eslint-plugin":
       optional: true
     jest:
       optional: true
-  checksum: 10/1fdbced06d2683fb8c769b00f9cc905305ead6e086644c2e94736c5904da3ad321747b124e2afecdef55c366938c0586b70900123bcb2d7d9ee1a299a18cfa86
+  checksum: 10/3f1798c61e143981eefcfb2fbc4b2e5b329378ebaafdec6485f443c79ee0d3304e9409e8ea8ce089ac15abb4e700d8d838e0a1da29feb528d77a2b3cce6989ec
   languageName: node
   linkType: hard
 
-"eslint-plugin-jsx-a11y@npm:^6.8.0":
-  version: 6.8.0
-  resolution: "eslint-plugin-jsx-a11y@npm:6.8.0"
+"eslint-plugin-jsx-a11y@npm:^6.10.2":
+  version: 6.10.2
+  resolution: "eslint-plugin-jsx-a11y@npm:6.10.2"
   dependencies:
-    "@babel/runtime": "npm:^7.23.2"
-    aria-query: "npm:^5.3.0"
-    array-includes: "npm:^3.1.7"
+    aria-query: "npm:^5.3.2"
+    array-includes: "npm:^3.1.8"
     array.prototype.flatmap: "npm:^1.3.2"
     ast-types-flow: "npm:^0.0.8"
-    axe-core: "npm:=4.7.0"
-    axobject-query: "npm:^3.2.1"
+    axe-core: "npm:^4.10.0"
+    axobject-query: "npm:^4.1.0"
     damerau-levenshtein: "npm:^1.0.8"
     emoji-regex: "npm:^9.2.2"
-    es-iterator-helpers: "npm:^1.0.15"
-    hasown: "npm:^2.0.0"
+    hasown: "npm:^2.0.2"
     jsx-ast-utils: "npm:^3.3.5"
     language-tags: "npm:^1.0.9"
     minimatch: "npm:^3.1.2"
-    object.entries: "npm:^1.1.7"
-    object.fromentries: "npm:^2.0.7"
+    object.fromentries: "npm:^2.0.8"
+    safe-regex-test: "npm:^1.0.3"
+    string.prototype.includes: "npm:^2.0.1"
   peerDependencies:
-    eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
-  checksum: 10/7a8e4498531a43d988ce2f12502a3f5ce96eacfec13f956cf927f24bb041b724fb7fc0f0306ea19d143bfc79e138bf25e25acca0822847206ac6bf5ce095e846
+    eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9
+  checksum: 10/388550798548d911e2286d530a29153ca00434a06fcfc0e31e0dda46a5e7960005e532fb29ce1ccbf1e394a3af3e5cf70c47ca43778861eacc5e3ed799adb79c
   languageName: node
   linkType: hard
 
-"eslint-plugin-no-floating-promise@npm:~1.0.2":
-  version: 1.0.2
-  resolution: "eslint-plugin-no-floating-promise@npm:1.0.2"
+"eslint-plugin-no-floating-promise@npm:~2.0.0":
+  version: 2.0.0
+  resolution: "eslint-plugin-no-floating-promise@npm:2.0.0"
   dependencies:
     requireindex: "npm:1.2.0"
-  checksum: 10/8ce9b38f6c1d0275d8b211e564038f60988be26fbf5f5866967f4e618e084d666b1365ea5ab7eb75c8364fd97cb766a99cc70a8ced5a53e403e4b5f4b276c931
+  checksum: 10/4f56c5acfc7ba3189b6a5428cdc97aa1004f7ba69784949d193a9a88ef9766e2b2070463eedbb26f17e3852ea7362c4205eaa026ea2e0af5471a9daa1469096e
   languageName: node
   linkType: hard
 
-"eslint-plugin-playwright@npm:~0.15.3":
-  version: 0.15.3
-  resolution: "eslint-plugin-playwright@npm:0.15.3"
+"eslint-plugin-playwright@npm:~2.0.1":
+  version: 2.0.1
+  resolution: "eslint-plugin-playwright@npm:2.0.1"
+  dependencies:
+    globals: "npm:^13.23.0"
   peerDependencies:
-    eslint: ">=7"
-    eslint-plugin-jest: ">=25"
-  peerDependenciesMeta:
-    eslint-plugin-jest:
-      optional: true
-  checksum: 10/222012ee1bf331631d8eee4e04132255f27a0654f919d40b3e9152026f6c971dbb31ca347846675d0a7499931744d67b17173b991198efbbba8f5c49ef937cc0
+    eslint: ">=8.40.0"
+  checksum: 10/a22e3e62c1523d2ac221736dc9d05d8f4fcc745a01dd43eecef3a477c16864394685ff007f55f283eb8346abbd897cf195cdcc3b1a05c8adfbe8c73c479e8fb3
   languageName: node
   linkType: hard
 
-"eslint-plugin-prettier@npm:~4.2.1":
-  version: 4.2.1
-  resolution: "eslint-plugin-prettier@npm:4.2.1"
+"eslint-plugin-prettier@npm:~5.2.1":
+  version: 5.2.1
+  resolution: "eslint-plugin-prettier@npm:5.2.1"
   dependencies:
     prettier-linter-helpers: "npm:^1.0.0"
+    synckit: "npm:^0.9.1"
   peerDependencies:
-    eslint: ">=7.28.0"
-    prettier: ">=2.0.0"
+    "@types/eslint": ">=8.0.0"
+    eslint: ">=8.0.0"
+    eslint-config-prettier: "*"
+    prettier: ">=3.0.0"
   peerDependenciesMeta:
+    "@types/eslint":
+      optional: true
     eslint-config-prettier:
       optional: true
-  checksum: 10/d387f85dd1bfcb6bc6b794845fee6afb9ebb2375653de6bcde6e615892fb97f85121a7c012a4651b181fc09953bdf54c9bc70cab7ad297019d89ae87dd007e28
+  checksum: 10/10ddf68215237e327af09a47adab4c63f3885fda4fb28c4c42d1fc5f47d8a0cc45df6484799360ff1417a0aa3c77c3aaac49d7e9dfd145557b17e2d7ecc2a27c
   languageName: node
   linkType: hard
 
-"eslint-plugin-react-hooks@npm:^4.6.2, eslint-plugin-react-hooks@npm:~4.6.2":
-  version: 4.6.2
-  resolution: "eslint-plugin-react-hooks@npm:4.6.2"
+"eslint-plugin-react-hooks@npm:^5.0.0, eslint-plugin-react-hooks@npm:~5.0.0":
+  version: 5.0.0
+  resolution: "eslint-plugin-react-hooks@npm:5.0.0"
   peerDependencies:
-    eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0
-  checksum: 10/5a0680941f34e70cf505bcb6082df31a3e445d193ee95a88ff3483041eb944f4cefdaf7e81b0eb1feb4eeceee8c7c6ddb8a2a6e8c4c0388514a42e16ac7b7a69
+    eslint: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0
+  checksum: 10/b762789832806b6981e2d910994e72aa7a85136fe0880572334b26cf1274ba37bd3b1365e77d2c2f92465337c4a65c84ef647bc499d33b86fc1110f2df7ef1bb
   languageName: node
   linkType: hard
 
-"eslint-plugin-react-refresh@npm:^0.4.12":
-  version: 0.4.12
-  resolution: "eslint-plugin-react-refresh@npm:0.4.12"
+"eslint-plugin-react-refresh@npm:^0.4.14":
+  version: 0.4.14
+  resolution: "eslint-plugin-react-refresh@npm:0.4.14"
   peerDependencies:
     eslint: ">=7"
-  checksum: 10/448d0a387ca4d7913534ac7bee3e7b8708236a6cef4cccf9a50e739d6d3c8d236cdbd7e360ea643c7767092a93acf30a8e5fac91f05b175c45d20ce138947bcc
+  checksum: 10/295ddf50cbe03187133f855f76baf88c92ce487971cdbc0ab33e037dc5d3d187fe2f809633eaa94da2769859963664b8c5b745db4812c644a1c535fe8823a045
   languageName: node
   linkType: hard
 
-"eslint-plugin-react@npm:~7.32.2":
-  version: 7.32.2
-  resolution: "eslint-plugin-react@npm:7.32.2"
+"eslint-plugin-react@npm:~7.37.2":
+  version: 7.37.2
+  resolution: "eslint-plugin-react@npm:7.37.2"
   dependencies:
-    array-includes: "npm:^3.1.6"
-    array.prototype.flatmap: "npm:^1.3.1"
-    array.prototype.tosorted: "npm:^1.1.1"
+    array-includes: "npm:^3.1.8"
+    array.prototype.findlast: "npm:^1.2.5"
+    array.prototype.flatmap: "npm:^1.3.2"
+    array.prototype.tosorted: "npm:^1.1.4"
     doctrine: "npm:^2.1.0"
+    es-iterator-helpers: "npm:^1.1.0"
     estraverse: "npm:^5.3.0"
+    hasown: "npm:^2.0.2"
     jsx-ast-utils: "npm:^2.4.1 || ^3.0.0"
     minimatch: "npm:^3.1.2"
-    object.entries: "npm:^1.1.6"
-    object.fromentries: "npm:^2.0.6"
-    object.hasown: "npm:^1.1.2"
-    object.values: "npm:^1.1.6"
+    object.entries: "npm:^1.1.8"
+    object.fromentries: "npm:^2.0.8"
+    object.values: "npm:^1.2.0"
     prop-types: "npm:^15.8.1"
-    resolve: "npm:^2.0.0-next.4"
-    semver: "npm:^6.3.0"
-    string.prototype.matchall: "npm:^4.0.8"
-  peerDependencies:
-    eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8
-  checksum: 10/5ca7959c85fa557bcd25c4b9b3f81fbfae974e8fb16172e31a275712cc71da8ecbb9436da2d3130a8b24dd7a4bbe69d37d4392944aecc4821618717ba156caf4
-  languageName: node
-  linkType: hard
-
-"eslint-plugin-storybook@npm:^0.9.0":
-  version: 0.9.0
-  resolution: "eslint-plugin-storybook@npm:0.9.0"
-  dependencies:
-    "@storybook/csf": "npm:^0.0.1"
-    "@typescript-eslint/utils": "npm:^5.62.0"
-    requireindex: "npm:^1.2.0"
-    ts-dedent: "npm:^2.2.0"
+    resolve: "npm:^2.0.0-next.5"
+    semver: "npm:^6.3.1"
+    string.prototype.matchall: "npm:^4.0.11"
+    string.prototype.repeat: "npm:^1.0.0"
   peerDependencies:
-    eslint: ">=6"
-  checksum: 10/5207e016cca6e095ddce911acfa12e973092fdc1ec716dfb54be70b859ac9be7ebde9ba6baa04a0e2fc4e34c772c4e9261d36a78c2cd5a873eeebf6087073b9f
+    eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7
+  checksum: 10/df2f7ab198018d3378f305a8a5ceceebc9bd31f019fc7567a2ef9c77789dc8a6a2c3c3957f8b0805f26c11c02f9f86c972e02cd0eda12f4d0370526c11f8a9a3
   languageName: node
   linkType: hard
 
-"eslint-plugin-storybook@npm:~0.6.15":
-  version: 0.6.15
-  resolution: "eslint-plugin-storybook@npm:0.6.15"
+"eslint-plugin-storybook@npm:^0.11.0, eslint-plugin-storybook@npm:~0.11.0":
+  version: 0.11.0
+  resolution: "eslint-plugin-storybook@npm:0.11.0"
   dependencies:
-    "@storybook/csf": "npm:^0.0.1"
-    "@typescript-eslint/utils": "npm:^5.45.0"
-    requireindex: "npm:^1.1.0"
+    "@storybook/csf": "npm:^0.1.11"
+    "@typescript-eslint/utils": "npm:^8.8.1"
     ts-dedent: "npm:^2.2.0"
   peerDependencies:
     eslint: ">=6"
-  checksum: 10/0c278594c8474ce2f176ffc6610240ae9d6c8f9dafbff02be61e6ae05f15081ce858c5b16e64d8995a3a3777c9d1725953fcde4312efab9118aa544a75b27c46
+  checksum: 10/fb9b2a23add084d8184c20571ca4cfd099eda22ba465e3ecfc2c109317235209eabdd6b30a19cb5f352f70ddd8083e10cf82a38233dfe4d02b3b0f753f86a18b
   languageName: node
   linkType: hard
 
-"eslint-plugin-testing-library@npm:^5.11.1, eslint-plugin-testing-library@npm:~5.11.1":
-  version: 5.11.1
-  resolution: "eslint-plugin-testing-library@npm:5.11.1"
-  dependencies:
-    "@typescript-eslint/utils": "npm:^5.58.0"
-  peerDependencies:
-    eslint: ^7.5.0 || ^8.0.0
-  checksum: 10/3b2f010b13fbffd9a2018815cdca7edfce64523d9263ed376b33bdc43fca297100dab755a40f5b8be0f8e76b44bc7883590acfa9016fbff20888d9ee67f964d0
-  languageName: node
-  linkType: hard
-
-"eslint-plugin-testing-library@npm:~6.2.2":
-  version: 6.2.2
-  resolution: "eslint-plugin-testing-library@npm:6.2.2"
+"eslint-plugin-testing-library@npm:^6.4.0, eslint-plugin-testing-library@npm:~6.4.0":
+  version: 6.4.0
+  resolution: "eslint-plugin-testing-library@npm:6.4.0"
   dependencies:
-    "@typescript-eslint/utils": "npm:^5.58.0"
+    "@typescript-eslint/utils": "npm:^5.62.0"
   peerDependencies:
-    eslint: ^7.5.0 || ^8.0.0
-  checksum: 10/61947d0b81de1565c8627ec2d1e6636a8b6613cfe554a4671d011b3e88dfd77b498ce83b15bcf0a2df5570c44ad1d46d54058ed488f4e515d764196cbc6d65cf
+    eslint: ^7.5.0 || ^8.0.0 || ^9.0.0
+  checksum: 10/b9461e6662542fbfb3c0b768e6038bbaa56e345cb0600c7f07e26ff8154166abb9f7dcdc08d565c314cd9ccf0416eca8c3ce3c235b375c5fbf3f152a81142969
   languageName: node
   linkType: hard
 
-"eslint-plugin-you-dont-need-lodash-underscore@npm:~6.12.0":
-  version: 6.12.0
-  resolution: "eslint-plugin-you-dont-need-lodash-underscore@npm:6.12.0"
+"eslint-plugin-you-dont-need-lodash-underscore@npm:~6.14.0":
+  version: 6.14.0
+  resolution: "eslint-plugin-you-dont-need-lodash-underscore@npm:6.14.0"
   dependencies:
     kebab-case: "npm:^1.0.0"
-  checksum: 10/0c42cd57682a3b8210bcb85cfc6dfe6c6b9e50db74c23d1d0993fb3d44c558881aa7da305aa75d697aac0bc0d57a5b98c54c8069aefa04d106ba5662b3ac974d
+  checksum: 10/b92739fb4870b0e17c83d5977fcc3e6fb7f721db04aa0984b4a1a873dd29ca5138e1c2ac0f769b355786c3d4f91deb812cca91189cb547e539685e2d2c3d97b1
   languageName: node
   linkType: hard
 
@@ -20864,6 +21158,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eslint-visitor-keys@npm:^3.4.3":
+  version: 3.4.3
+  resolution: "eslint-visitor-keys@npm:3.4.3"
+  checksum: 10/3f357c554a9ea794b094a09bd4187e5eacd1bc0d0653c3adeb87962c548e6a1ab8f982b86963ae1337f5d976004146536dcee5d0e2806665b193fbfbf1a9231b
+  languageName: node
+  linkType: hard
+
 "eslint4b-prebuilt@npm:^6.7.2":
   version: 6.7.2
   resolution: "eslint4b-prebuilt@npm:6.7.2"
@@ -20987,7 +21288,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"etag@npm:~1.8.1":
+"etag@npm:^1.8.1, etag@npm:~1.8.1":
   version: 1.8.1
   resolution: "etag@npm:1.8.1"
   checksum: 10/571aeb3dbe0f2bbd4e4fadbdb44f325fc75335cd5f6f6b6a091e6a06a9f25ed5392f0863c5442acb0646787446e816f13cbfc6edce5b07658541dff573cab1ff
@@ -21033,20 +21334,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eventemitter3@npm:^3.1.0":
-  version: 3.1.2
-  resolution: "eventemitter3@npm:3.1.2"
-  checksum: 10/e2886001beb52cd2fe47d2470fd6266b7c70bd3ac356c0041a7e64336ed57bb1fc9b07bc9043d34b39913488a8d81bfcde62d3af597974980aa01b50844d869b
-  languageName: node
-  linkType: hard
-
-"eventemitter3@npm:^4.0.0, eventemitter3@npm:^4.0.4, eventemitter3@npm:^4.0.7":
+"eventemitter3@npm:^4.0.0, eventemitter3@npm:^4.0.4":
   version: 4.0.7
   resolution: "eventemitter3@npm:4.0.7"
   checksum: 10/8030029382404942c01d0037079f1b1bc8fed524b5849c237b80549b01e2fc49709e1d0c557fa65ca4498fc9e24cff1475ef7b855121fcc15f9d61f93e282346
   languageName: node
   linkType: hard
 
+"eventemitter3@npm:^5, eventemitter3@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "eventemitter3@npm:5.0.1"
+  checksum: 10/ac6423ec31124629c84c7077eed1e6987f6d66c31cf43c6fcbf6c87791d56317ce808d9ead483652436df171b526fc7220eccdc9f3225df334e81582c3cf7dd5
+  languageName: node
+  linkType: hard
+
 "events-to-array@npm:^1.0.1":
   version: 1.1.2
   resolution: "events-to-array@npm:1.1.2"
@@ -21114,21 +21415,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"execa@npm:^0.8.0":
-  version: 0.8.0
-  resolution: "execa@npm:0.8.0"
-  dependencies:
-    cross-spawn: "npm:^5.0.1"
-    get-stream: "npm:^3.0.0"
-    is-stream: "npm:^1.1.0"
-    npm-run-path: "npm:^2.0.0"
-    p-finally: "npm:^1.0.0"
-    signal-exit: "npm:^3.0.0"
-    strip-eof: "npm:^1.0.0"
-  checksum: 10/1e255f4381714402aa85605057b9a8bbb2ea6b59eae12affad3b1233aae0109cece49f1f842453e97976a537db62a0d91969d52557bd1a66badd01a926b33b67
-  languageName: node
-  linkType: hard
-
 "execa@npm:^1.0.0":
   version: 1.0.0
   resolution: "execa@npm:1.0.0"
@@ -21178,12 +21464,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"execall@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "execall@npm:2.0.0"
+"execall@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "execall@npm:1.0.0"
   dependencies:
-    clone-regexp: "npm:^2.1.0"
-  checksum: 10/d98ee3e33f6c9001e80970e927fb9f16c6a121d5e250b2f4d6764d4157974f58cbe88613bbf073db05d5342677012002c5de956f4f0c32d10d092b6ff03a085c
+    clone-regexp: "npm:^1.0.0"
+  checksum: 10/3801e15635071fe12aa4ec6075b7706ed1dd8c3a3968022436ac116a8c359d14ec0ac53c37adf2831f2acb5c9e8ae2cd5695c05202cef07b1b34e7509c02bf92
   languageName: node
   linkType: hard
 
@@ -21196,14 +21482,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"exif-be-gone@npm:^1.3.2":
-  version: 1.3.2
-  resolution: "exif-be-gone@npm:1.3.2"
-  dependencies:
-    "@types/stream-buffers": "npm:^3.0.3"
+"exif-be-gone@npm:^1.5.1":
+  version: 1.5.1
+  resolution: "exif-be-gone@npm:1.5.1"
   bin:
     exif-be-gone: cli.js
-  checksum: 10/b1344c438c434215234bd2c31d5663dc6a9b4fe04f1d13943b68f19072bd44138d7e19e0d2ffbf43792b6471054c07c538ef6be6357228ec34130a48f0174818
+  checksum: 10/0b45fa4d34a08be379f19c5e3bcfdd3cdd9ce1cc728a8664ffff65d9eb9bb639c7727e38f6ec1b330f030cc5f90baa2d1b171c1bb85abb981e16e19f03818f2c
   languageName: node
   linkType: hard
 
@@ -21214,6 +21498,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"expand-brackets@npm:^2.1.4":
+  version: 2.1.4
+  resolution: "expand-brackets@npm:2.1.4"
+  dependencies:
+    debug: "npm:^2.3.3"
+    define-property: "npm:^0.2.5"
+    extend-shallow: "npm:^2.0.1"
+    posix-character-classes: "npm:^0.1.0"
+    regex-not: "npm:^1.0.0"
+    snapdragon: "npm:^0.8.1"
+    to-regex: "npm:^3.0.1"
+  checksum: 10/aa4acc62084638c761ecdbe178bd3136f01121939f96bbfc3be27c46c66625075f77fe0a446b627c9071b1aaf6d93ccf5bde5ff34b7ef883e4f46067a8e63e41
+  languageName: node
+  linkType: hard
+
 "expand-template@npm:^2.0.3":
   version: 2.0.3
   resolution: "expand-template@npm:2.0.3"
@@ -21266,81 +21565,82 @@ __metadata:
   languageName: node
   linkType: hard
 
-"express@npm:^4.16.4, express@npm:^4.17.3":
-  version: 4.18.2
-  resolution: "express@npm:4.18.2"
+"express@npm:^4.18.1, express@npm:^4.18.2, express@npm:^4.19.2, express@npm:^4.21.1":
+  version: 4.21.1
+  resolution: "express@npm:4.21.1"
   dependencies:
     accepts: "npm:~1.3.8"
     array-flatten: "npm:1.1.1"
-    body-parser: "npm:1.20.1"
+    body-parser: "npm:1.20.3"
     content-disposition: "npm:0.5.4"
     content-type: "npm:~1.0.4"
-    cookie: "npm:0.5.0"
+    cookie: "npm:0.7.1"
     cookie-signature: "npm:1.0.6"
     debug: "npm:2.6.9"
     depd: "npm:2.0.0"
-    encodeurl: "npm:~1.0.2"
+    encodeurl: "npm:~2.0.0"
     escape-html: "npm:~1.0.3"
     etag: "npm:~1.8.1"
-    finalhandler: "npm:1.2.0"
+    finalhandler: "npm:1.3.1"
     fresh: "npm:0.5.2"
     http-errors: "npm:2.0.0"
-    merge-descriptors: "npm:1.0.1"
+    merge-descriptors: "npm:1.0.3"
     methods: "npm:~1.1.2"
     on-finished: "npm:2.4.1"
     parseurl: "npm:~1.3.3"
-    path-to-regexp: "npm:0.1.7"
+    path-to-regexp: "npm:0.1.10"
     proxy-addr: "npm:~2.0.7"
-    qs: "npm:6.11.0"
+    qs: "npm:6.13.0"
     range-parser: "npm:~1.2.1"
     safe-buffer: "npm:5.2.1"
-    send: "npm:0.18.0"
-    serve-static: "npm:1.15.0"
+    send: "npm:0.19.0"
+    serve-static: "npm:1.16.2"
     setprototypeof: "npm:1.2.0"
     statuses: "npm:2.0.1"
     type-is: "npm:~1.6.18"
     utils-merge: "npm:1.0.1"
     vary: "npm:~1.1.2"
-  checksum: 10/869ae89ed6ff4bed7b373079dc58e5dddcf2915a2669b36037ff78c99d675ae930e5fe052b35c24f56557d28a023bb1cbe3e2f2fb87eaab96a1cedd7e597809d
+  checksum: 10/5d4a36dd03c1d1cce93172e9b185b5cd13a978d29ee03adc51cd278be7b4a514ae2b63e2fdaec0c00fdc95c6cfb396d9dd1da147917ffd337d6cd0778e08c9bc
   languageName: node
   linkType: hard
 
-"express@npm:^4.18.1, express@npm:^4.18.2, express@npm:^4.19.2":
-  version: 4.21.1
-  resolution: "express@npm:4.21.1"
+"express@npm:^5.0.0":
+  version: 5.0.1
+  resolution: "express@npm:5.0.1"
   dependencies:
-    accepts: "npm:~1.3.8"
-    array-flatten: "npm:1.1.1"
-    body-parser: "npm:1.20.3"
-    content-disposition: "npm:0.5.4"
+    accepts: "npm:^2.0.0"
+    body-parser: "npm:^2.0.1"
+    content-disposition: "npm:^1.0.0"
     content-type: "npm:~1.0.4"
     cookie: "npm:0.7.1"
-    cookie-signature: "npm:1.0.6"
-    debug: "npm:2.6.9"
+    cookie-signature: "npm:^1.2.1"
+    debug: "npm:4.3.6"
     depd: "npm:2.0.0"
     encodeurl: "npm:~2.0.0"
     escape-html: "npm:~1.0.3"
     etag: "npm:~1.8.1"
-    finalhandler: "npm:1.3.1"
-    fresh: "npm:0.5.2"
+    finalhandler: "npm:^2.0.0"
+    fresh: "npm:2.0.0"
     http-errors: "npm:2.0.0"
-    merge-descriptors: "npm:1.0.3"
+    merge-descriptors: "npm:^2.0.0"
     methods: "npm:~1.1.2"
+    mime-types: "npm:^3.0.0"
     on-finished: "npm:2.4.1"
+    once: "npm:1.4.0"
     parseurl: "npm:~1.3.3"
-    path-to-regexp: "npm:0.1.10"
     proxy-addr: "npm:~2.0.7"
     qs: "npm:6.13.0"
     range-parser: "npm:~1.2.1"
+    router: "npm:^2.0.0"
     safe-buffer: "npm:5.2.1"
-    send: "npm:0.19.0"
-    serve-static: "npm:1.16.2"
+    send: "npm:^1.1.0"
+    serve-static: "npm:^2.1.0"
     setprototypeof: "npm:1.2.0"
     statuses: "npm:2.0.1"
-    type-is: "npm:~1.6.18"
+    type-is: "npm:^2.0.0"
     utils-merge: "npm:1.0.1"
     vary: "npm:~1.1.2"
-  checksum: 10/5d4a36dd03c1d1cce93172e9b185b5cd13a978d29ee03adc51cd278be7b4a514ae2b63e2fdaec0c00fdc95c6cfb396d9dd1da147917ffd337d6cd0778e08c9bc
+  checksum: 10/b6afed019b6c22cb697a658d4dd70966e34f117ad6c83a2d32080c3ec4541443b15be770b4f7ac58bc6c07451a9bd0788121c5c4583c930beea48d8a17ee5c60
   languageName: node
   linkType: hard
 
@@ -21363,6 +21663,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"extend-shallow@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "extend-shallow@npm:2.0.1"
+  dependencies:
+    is-extendable: "npm:^0.1.0"
+  checksum: 10/8fb58d9d7a511f4baf78d383e637bd7d2e80843bd9cd0853649108ea835208fb614da502a553acc30208e1325240bb7cc4a68473021612496bb89725483656d8
+  languageName: node
+  linkType: hard
+
+"extend-shallow@npm:^3.0.0, extend-shallow@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "extend-shallow@npm:3.0.2"
+  dependencies:
+    assign-symbols: "npm:^1.0.0"
+    is-extendable: "npm:^1.0.1"
+  checksum: 10/a920b0cd5838a9995ace31dfd11ab5e79bf6e295aa566910ce53dff19f4b1c0fda2ef21f26b28586c7a2450ca2b42d97bd8c0f5cec9351a819222bf861e02461
+  languageName: node
+  linkType: hard
+
 "extend@npm:^3.0.0, extend@npm:^3.0.1, extend@npm:^3.0.2, extend@npm:~3.0.2":
   version: 3.0.2
   resolution: "extend@npm:3.0.2"
@@ -21395,6 +21714,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"extglob@npm:^2.0.4":
+  version: 2.0.4
+  resolution: "extglob@npm:2.0.4"
+  dependencies:
+    array-unique: "npm:^0.3.2"
+    define-property: "npm:^1.0.0"
+    expand-brackets: "npm:^2.1.4"
+    extend-shallow: "npm:^2.0.1"
+    fragment-cache: "npm:^0.2.1"
+    regex-not: "npm:^1.0.0"
+    snapdragon: "npm:^0.8.1"
+    to-regex: "npm:^3.0.1"
+  checksum: 10/6869edd48d40c322e1cda9bf494ed2407c69a19063fd2897184cb62d6d35c14fa7402b01d9dedd65d77ed1ccc74a291235a702c68b4f28a7314da0cdee97c85b
+  languageName: node
+  linkType: hard
+
 "extsprintf@npm:1.3.0":
   version: 1.3.0
   resolution: "extsprintf@npm:1.3.0"
@@ -21409,13 +21744,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-deep-equal@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "fast-deep-equal@npm:2.0.1"
-  checksum: 10/b701835a87985e0ec4925bdf1f0c1e7eb56309b5d12d534d5b4b69d95a54d65bb16861c081781ead55f73f12d6c60ba668713391ee7fbf6b0567026f579b7b0b
-  languageName: node
-  linkType: hard
-
 "fast-deep-equal@npm:^3.1.1, fast-deep-equal@npm:^3.1.3":
   version: 3.1.3
   resolution: "fast-deep-equal@npm:3.1.3"
@@ -21437,7 +21765,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-glob@npm:^3.0.3, fast-glob@npm:^3.2.11, fast-glob@npm:^3.2.12, fast-glob@npm:^3.2.7, fast-glob@npm:^3.2.9":
+"fast-glob@npm:^2.2.6":
+  version: 2.2.7
+  resolution: "fast-glob@npm:2.2.7"
+  dependencies:
+    "@mrmlnc/readdir-enhanced": "npm:^2.2.1"
+    "@nodelib/fs.stat": "npm:^1.1.2"
+    glob-parent: "npm:^3.1.0"
+    is-glob: "npm:^4.0.0"
+    merge2: "npm:^1.2.3"
+    micromatch: "npm:^3.1.10"
+  checksum: 10/9e7d4e4d99ee8cd5a409b862ce9837b0c1d00e179810b820ee3274e22179ecc92a6a2f93f6119781e9bc44945e87c9a8920fa02280ebbb532381730ebe26e138
+  languageName: node
+  linkType: hard
+
+"fast-glob@npm:^3.0.3, fast-glob@npm:^3.2.7, fast-glob@npm:^3.2.9":
   version: 3.2.12
   resolution: "fast-glob@npm:3.2.12"
   dependencies:
@@ -21450,6 +21792,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fast-glob@npm:^3.3.2":
+  version: 3.3.2
+  resolution: "fast-glob@npm:3.3.2"
+  dependencies:
+    "@nodelib/fs.stat": "npm:^2.0.2"
+    "@nodelib/fs.walk": "npm:^1.2.3"
+    glob-parent: "npm:^5.1.2"
+    merge2: "npm:^1.3.0"
+    micromatch: "npm:^4.0.4"
+  checksum: 10/222512e9315a0efca1276af9adb2127f02105d7288fa746145bf45e2716383fb79eb983c89601a72a399a56b7c18d38ce70457c5466218c5f13fad957cee16df
+  languageName: node
+  linkType: hard
+
 "fast-json-parse@npm:^1.0.3":
   version: 1.0.3
   resolution: "fast-json-parse@npm:1.0.3"
@@ -21499,15 +21854,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-url-parser@npm:1.1.3":
-  version: 1.1.3
-  resolution: "fast-url-parser@npm:1.1.3"
-  dependencies:
-    punycode: "npm:^1.3.2"
-  checksum: 10/6d33f46ce9776f7f3017576926207a950ca39bc5eb78fc794404f2288fe494720f9a119084b75569bd9eb09d2b46678bfaf39c191fb2c808ef3c833dc8982752
-  languageName: node
-  linkType: hard
-
 "fast-xml-parser@npm:4.0.11":
   version: 4.0.11
   resolution: "fast-xml-parser@npm:4.0.11"
@@ -21530,6 +21876,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fast-xml-parser@npm:^4.1.3, fast-xml-parser@npm:^4.2.2":
+  version: 4.5.0
+  resolution: "fast-xml-parser@npm:4.5.0"
+  dependencies:
+    strnum: "npm:^1.0.5"
+  bin:
+    fxparser: src/cli/cli.js
+  checksum: 10/dc9571c10e7b57b5be54bcd2d92f50c446eb42ea5df347d253e94dd14eb99b5300a6d172e840f151e0721933ca2406165a8d9b316a6d777bf0596dc4fe1df756
+  languageName: node
+  linkType: hard
+
 "fast-xml-parser@npm:^4.2.4":
   version: 4.3.2
   resolution: "fast-xml-parser@npm:4.3.2"
@@ -21548,6 +21905,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fastest-levenshtein@npm:^1.0.16":
+  version: 1.0.16
+  resolution: "fastest-levenshtein@npm:1.0.16"
+  checksum: 10/ee85d33b5cef592033f70e1c13ae8624055950b4eb832435099cd56aa313d7f251b873bedbc06a517adfaff7b31756d139535991e2406967438e03a1bf1b008e
+  languageName: node
+  linkType: hard
+
 "fastest-validator@npm:^1.19.0":
   version: 1.19.0
   resolution: "fastest-validator@npm:1.19.0"
@@ -21555,7 +21919,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fastq@npm:^1.13.0, fastq@npm:^1.6.0":
+"fastq@npm:^1.17.1":
+  version: 1.17.1
+  resolution: "fastq@npm:1.17.1"
+  dependencies:
+    reusify: "npm:^1.0.4"
+  checksum: 10/a443180068b527dd7b3a63dc7f2a47ceca2f3e97b9c00a1efe5538757e6cc4056a3526df94308075d7727561baf09ebaa5b67da8dcbddb913a021c5ae69d1f69
+  languageName: node
+  linkType: hard
+
+"fastq@npm:^1.6.0":
   version: 1.13.0
   resolution: "fastq@npm:1.13.0"
   dependencies:
@@ -21598,19 +21971,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fflate@npm:^0.7.4":
-  version: 0.7.4
-  resolution: "fflate@npm:0.7.4"
-  checksum: 10/27f61b3536c3a23b0ccdab4b616103be0e8e7241924cda063486822c50ae11930eb1ce6e34dedbfccb2705d04a66380d04e28c67387e1dd48159d41ea14bfda5
-  languageName: node
-  linkType: hard
-
-"figures@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "figures@npm:2.0.0"
-  dependencies:
-    escape-string-regexp: "npm:^1.0.5"
-  checksum: 10/0e5bba8d2b8847c6844a476113d8d283af8757143d7760cc1a5422cceec5e8dd68c15ba50e0847597bc2c4e3865711657aeef394478c6ddce8aed7e0cd18beca
+"fflate@npm:^0.8.2":
+  version: 0.8.2
+  resolution: "fflate@npm:0.8.2"
+  checksum: 10/2bd26ba6d235d428de793c6a0cd1aaa96a06269ebd4e21b46c8fd1bd136abc631acf27e188d47c3936db090bf3e1ede11d15ce9eae9bffdc4bfe1b9dc66ca9cb
   languageName: node
   linkType: hard
 
@@ -21623,6 +21987,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"file-entry-cache@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "file-entry-cache@npm:4.0.0"
+  dependencies:
+    flat-cache: "npm:^2.0.1"
+  checksum: 10/6f68b74ca9f661c5db787d10fe632c1aa6570dcbe75b76a51594a6978f2d1566109dd5765c6385d1359a2776d08e7ba51c6cfe0e98afc9b8ede0a67cd7262bcc
+  languageName: node
+  linkType: hard
+
 "file-entry-cache@npm:^6.0.1":
   version: 6.0.1
   resolution: "file-entry-cache@npm:6.0.1"
@@ -21632,6 +22005,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"file-entry-cache@npm:^9.1.0":
+  version: 9.1.0
+  resolution: "file-entry-cache@npm:9.1.0"
+  dependencies:
+    flat-cache: "npm:^5.0.0"
+  checksum: 10/fd67a9552f272ac4a1731c545e1350bd135e208659144cc5311baac6b8bbf55da7c8c3a0bf25c71ed78eff2bdd26d2a3a8f9ba3d8bec968fe8d1eeba6ab14a96
+  languageName: node
+  linkType: hard
+
 "file-loader@npm:^6.2.0":
   version: 6.2.0
   resolution: "file-loader@npm:6.2.0"
@@ -21713,6 +22095,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"filelist@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "filelist@npm:1.0.4"
+  dependencies:
+    minimatch: "npm:^5.0.1"
+  checksum: 10/4b436fa944b1508b95cffdfc8176ae6947b92825483639ef1b9a89b27d82f3f8aa22b21eed471993f92709b431670d4e015b39c087d435a61e1bb04564cf51de
+  languageName: node
+  linkType: hard
+
 "filename-reserved-regex@npm:^2.0.0":
   version: 2.0.0
   resolution: "filename-reserved-regex@npm:2.0.0"
@@ -21759,6 +22150,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fill-range@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "fill-range@npm:4.0.0"
+  dependencies:
+    extend-shallow: "npm:^2.0.1"
+    is-number: "npm:^3.0.0"
+    repeat-string: "npm:^1.6.1"
+    to-regex-range: "npm:^2.1.0"
+  checksum: 10/68be23b3c40d5a3fd2847ce18e3a5eac25d9f4c05627291e048ba1346ed0e429668b58a3429e61c0db9fa5954c4402fe99322a65d8a0eb06ebed8d3a18fbb09a
+  languageName: node
+  linkType: hard
+
 "fill-range@npm:^7.0.1":
   version: 7.0.1
   resolution: "fill-range@npm:7.0.1"
@@ -21768,6 +22171,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fill-range@npm:^7.1.1":
+  version: 7.1.1
+  resolution: "fill-range@npm:7.1.1"
+  dependencies:
+    to-regex-range: "npm:^5.0.1"
+  checksum: 10/a7095cb39e5bc32fada2aa7c7249d3f6b01bd1ce461a61b0adabacccabd9198500c6fb1f68a7c851a657e273fce2233ba869638897f3d7ed2e87a2d89b4436ea
+  languageName: node
+  linkType: hard
+
 "filter-obj@npm:^1.1.0":
   version: 1.1.0
   resolution: "filter-obj@npm:1.1.0"
@@ -21797,33 +22209,33 @@ __metadata:
   languageName: node
   linkType: hard
 
-"finalhandler@npm:1.2.0":
-  version: 1.2.0
-  resolution: "finalhandler@npm:1.2.0"
+"finalhandler@npm:1.3.1":
+  version: 1.3.1
+  resolution: "finalhandler@npm:1.3.1"
   dependencies:
     debug: "npm:2.6.9"
-    encodeurl: "npm:~1.0.2"
+    encodeurl: "npm:~2.0.0"
     escape-html: "npm:~1.0.3"
     on-finished: "npm:2.4.1"
     parseurl: "npm:~1.3.3"
     statuses: "npm:2.0.1"
     unpipe: "npm:~1.0.0"
-  checksum: 10/635718cb203c6d18e6b48dfbb6c54ccb08ea470e4f474ddcef38c47edcf3227feec316f886dd701235997d8af35240cae49856721ce18f539ad038665ebbf163
+  checksum: 10/4babe72969b7373b5842bc9f75c3a641a4d0f8eb53af6b89fa714d4460ce03fb92b28de751d12ba415e96e7e02870c436d67412120555e2b382640535697305b
   languageName: node
   linkType: hard
 
-"finalhandler@npm:1.3.1":
-  version: 1.3.1
-  resolution: "finalhandler@npm:1.3.1"
+"finalhandler@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "finalhandler@npm:2.0.0"
   dependencies:
     debug: "npm:2.6.9"
-    encodeurl: "npm:~2.0.0"
+    encodeurl: "npm:~1.0.2"
     escape-html: "npm:~1.0.3"
     on-finished: "npm:2.4.1"
     parseurl: "npm:~1.3.3"
     statuses: "npm:2.0.1"
     unpipe: "npm:~1.0.0"
-  checksum: 10/4babe72969b7373b5842bc9f75c3a641a4d0f8eb53af6b89fa714d4460ce03fb92b28de751d12ba415e96e7e02870c436d67412120555e2b382640535697305b
+  checksum: 10/59b941fd40fcd2e173c858a47cccd493abf9709df54d5e06ef51be910957b6de7518af79110851f721e826dc246ce4456290d8dfe24a58b13488264690f76ed8
   languageName: node
   linkType: hard
 
@@ -21869,6 +22281,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"find-up@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "find-up@npm:2.1.0"
+  dependencies:
+    locate-path: "npm:^2.0.0"
+  checksum: 10/43284fe4da09f89011f08e3c32cd38401e786b19226ea440b75386c1b12a4cb738c94969808d53a84f564ede22f732c8409e3cfc3f7fb5b5c32378ad0bbf28bd
+  languageName: node
+  linkType: hard
+
 "find-up@npm:^3.0.0":
   version: 3.0.0
   resolution: "find-up@npm:3.0.0"
@@ -21907,25 +22328,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"find-versions@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "find-versions@npm:4.0.0"
-  dependencies:
-    semver-regex: "npm:^3.1.2"
-  checksum: 10/2b4c749dc33e3fa73a457ca4df616ac13b4b32c53f6297bc862b0814d402a6cfec93a0d308d5502eeb47f2c125906e0f861bf01b756f08395640892186357711
-  languageName: node
-  linkType: hard
-
-"find-yarn-workspace-root2@npm:1.2.16":
-  version: 1.2.16
-  resolution: "find-yarn-workspace-root2@npm:1.2.16"
-  dependencies:
-    micromatch: "npm:^4.0.2"
-    pkg-dir: "npm:^4.2.0"
-  checksum: 10/398aa473ac245d9c9e9af5a75806b5a6828bd9a759f138faf4666f00c5fcb78af679d43f5cfbe73fe667cf6ec3ef6c9e157b09400181e5b9edc3adc47080e9bb
-  languageName: node
-  linkType: hard
-
 "finity@npm:^0.5.4":
   version: 0.5.4
   resolution: "finity@npm:0.5.4"
@@ -21933,6 +22335,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"flat-cache@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "flat-cache@npm:2.0.1"
+  dependencies:
+    flatted: "npm:^2.0.0"
+    rimraf: "npm:2.6.3"
+    write: "npm:1.0.3"
+  checksum: 10/334891772e9af0e860e1e602f0e577c2b0ac5af4e7fbc672f8396b08a48a4dbe9001f7a7e1d8f8060da4cfe592bb51b35d8a8e6159c1cd62337d97c0847fdb44
+  languageName: node
+  linkType: hard
+
 "flat-cache@npm:^3.0.4":
   version: 3.0.4
   resolution: "flat-cache@npm:3.0.4"
@@ -21943,6 +22356,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"flat-cache@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "flat-cache@npm:5.0.0"
+  dependencies:
+    flatted: "npm:^3.3.1"
+    keyv: "npm:^4.5.4"
+  checksum: 10/42570762052b17a1dec221d73a1e417d0ba07137de6debaabb51389cac265a12a027a895dc84e1725bc5cdde04fe8b706ad836860b05488e9a04bda9301d2529
+  languageName: node
+  linkType: hard
+
 "flat@npm:^5.0.2":
   version: 5.0.2
   resolution: "flat@npm:5.0.2"
@@ -21952,6 +22375,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"flatted@npm:^2.0.0":
+  version: 2.0.2
+  resolution: "flatted@npm:2.0.2"
+  checksum: 10/473c754db7a529e125a22057098f1a4c905ba17b8cc269c3acf77352f0ffa6304c851eb75f6a1845f74461f560e635129ca6b0b8a78fb253c65cea4de3d776f2
+  languageName: node
+  linkType: hard
+
 "flatted@npm:^3.1.0":
   version: 3.2.5
   resolution: "flatted@npm:3.2.5"
@@ -21959,6 +22389,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"flatted@npm:^3.3.1":
+  version: 3.3.1
+  resolution: "flatted@npm:3.3.1"
+  checksum: 10/7b8376061d5be6e0d3658bbab8bde587647f68797cf6bfeae9dea0e5137d9f27547ab92aaff3512dd9d1299086a6d61be98e9d48a56d17531b634f77faadbc49
+  languageName: node
+  linkType: hard
+
 "fn.name@npm:1.x.x":
   version: 1.1.0
   resolution: "fn.name@npm:1.1.0"
@@ -21980,17 +22417,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.7, follow-redirects@npm:^1.14.8, follow-redirects@npm:^1.14.9":
-  version: 1.15.4
-  resolution: "follow-redirects@npm:1.15.4"
-  peerDependenciesMeta:
-    debug:
-      optional: true
-  checksum: 10/2e8f5f259a6b02dfa8dc199e08431848a7c3beed32eb4c19945966164a52c89f07b86c3afcc32ebe4279cf0a960520e45a63013d6350309c5ec90133c5d9351a
-  languageName: node
-  linkType: hard
-
-"follow-redirects@npm:^1.15.6":
+"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.7, follow-redirects@npm:^1.14.8, follow-redirects@npm:^1.14.9, follow-redirects@npm:^1.15.6, follow-redirects@npm:^1.15.9":
   version: 1.15.9
   resolution: "follow-redirects@npm:1.15.9"
   peerDependenciesMeta:
@@ -22026,6 +22453,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"for-in@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "for-in@npm:1.0.2"
+  checksum: 10/09f4ae93ce785d253ac963d94c7f3432d89398bf25ac7a24ed034ca393bf74380bdeccc40e0f2d721a895e54211b07c8fad7132e8157827f6f7f059b70b4043d
+  languageName: node
+  linkType: hard
+
 "foreground-child@npm:^1.5.6":
   version: 1.5.6
   resolution: "foreground-child@npm:1.5.6"
@@ -22086,17 +22520,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"form-data@npm:^2.5.0":
-  version: 2.5.1
-  resolution: "form-data@npm:2.5.1"
-  dependencies:
-    asynckit: "npm:^0.4.0"
-    combined-stream: "npm:^1.0.6"
-    mime-types: "npm:^2.1.12"
-  checksum: 10/2e2e5e927979ba3623f9b4c4bcc939275fae3f2dea9dafc8db3ca656a3d75476605de2c80f0e6f1487987398e056f0b4c738972d6e1edd83392d5686d0952eed
-  languageName: node
-  linkType: hard
-
 "form-data@npm:^3.0.0":
   version: 3.0.1
   resolution: "form-data@npm:3.0.1"
@@ -22148,13 +22571,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fresh@npm:0.5.2":
+"fragment-cache@npm:^0.2.1":
+  version: 0.2.1
+  resolution: "fragment-cache@npm:0.2.1"
+  dependencies:
+    map-cache: "npm:^0.2.2"
+  checksum: 10/1cbbd0b0116b67d5790175de0038a11df23c1cd2e8dcdbade58ebba5594c2d641dade6b4f126d82a7b4a6ffc2ea12e3d387dbb64ea2ae97cf02847d436f60fdc
+  languageName: node
+  linkType: hard
+
+"fresh@npm:0.5.2, fresh@npm:^0.5.2":
   version: 0.5.2
   resolution: "fresh@npm:0.5.2"
   checksum: 10/64c88e489b5d08e2f29664eb3c79c705ff9a8eb15d3e597198ef76546d4ade295897a44abb0abd2700e7ef784b2e3cbf1161e4fbf16f59129193fd1030d16da1
   languageName: node
   linkType: hard
 
+"fresh@npm:2.0.0":
+  version: 2.0.0
+  resolution: "fresh@npm:2.0.0"
+  checksum: 10/44e1468488363074641991c1340d2a10c5a6f6d7c353d89fd161c49d120c58ebf9890720f7584f509058385836e3ce50ddb60e9f017315a4ba8c6c3461813bfc
+  languageName: node
+  linkType: hard
+
 "from2@npm:^2.1.1":
   version: 2.3.0
   resolution: "from2@npm:2.3.0"
@@ -22197,17 +22636,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fs-extra@npm:^11.1.0":
-  version: 11.2.0
-  resolution: "fs-extra@npm:11.2.0"
-  dependencies:
-    graceful-fs: "npm:^4.2.0"
-    jsonfile: "npm:^6.0.1"
-    universalify: "npm:^2.0.0"
-  checksum: 10/0579bf6726a4cd054d4aa308f10b483f52478bb16284f32cf60b4ce0542063d551fca1a08a2af365e35db21a3fa5a06cf2a6ed614004b4368982bc754cb816b3
-  languageName: node
-  linkType: hard
-
 "fs-extra@npm:^7.0.1":
   version: 7.0.1
   resolution: "fs-extra@npm:7.0.1"
@@ -22239,6 +22667,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fs-minipass@npm:^3.0.0":
+  version: 3.0.3
+  resolution: "fs-minipass@npm:3.0.3"
+  dependencies:
+    minipass: "npm:^7.0.3"
+  checksum: 10/af143246cf6884fe26fa281621d45cfe111d34b30535a475bfa38dafe343dadb466c047a924ffc7d6b7b18265df4110224ce3803806dbb07173bf2087b648d7f
+  languageName: node
+  linkType: hard
+
 "fs-monkey@npm:^1.0.4":
   version: 1.0.4
   resolution: "fs-monkey@npm:1.0.4"
@@ -22263,6 +22700,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fsevents@npm:~2.3.3":
+  version: 2.3.3
+  resolution: "fsevents@npm:2.3.3"
+  dependencies:
+    node-gyp: "npm:latest"
+  checksum: 10/4c1ade961ded57cdbfbb5cac5106ec17bc8bccd62e16343c569a0ceeca83b9dfef87550b4dc5cbb89642da412b20c5071f304c8c464b80415446e8e155a038c0
+  conditions: os=darwin
+  languageName: node
+  linkType: hard
+
 "fsevents@patch:fsevents@npm%3A2.3.2#optional!builtin<compat/fsevents>, fsevents@patch:fsevents@npm%3A^2.3.2#optional!builtin<compat/fsevents>, fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin<compat/fsevents>":
   version: 2.3.2
   resolution: "fsevents@patch:fsevents@npm%3A2.3.2#optional!builtin<compat/fsevents>::version=2.3.2&hash=df0bf1"
@@ -22272,6 +22719,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"fsevents@patch:fsevents@npm%3A~2.3.3#optional!builtin<compat/fsevents>":
+  version: 2.3.3
+  resolution: "fsevents@patch:fsevents@npm%3A2.3.3#optional!builtin<compat/fsevents>::version=2.3.3&hash=df0bf1"
+  dependencies:
+    node-gyp: "npm:latest"
+  conditions: os=darwin
+  languageName: node
+  linkType: hard
+
 "function-bind@npm:^1.1.1, function-bind@npm:^1.1.2":
   version: 1.1.2
   resolution: "function-bind@npm:1.1.2"
@@ -22279,7 +22735,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"function.prototype.name@npm:^1.1.5, function.prototype.name@npm:^1.1.6":
+"function.prototype.name@npm:^1.1.6":
   version: 1.1.6
   resolution: "function.prototype.name@npm:1.1.6"
   dependencies:
@@ -22298,22 +22754,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"gauge@npm:^2.7.4":
-  version: 2.7.4
-  resolution: "gauge@npm:2.7.4"
-  dependencies:
-    aproba: "npm:^1.0.3"
-    console-control-strings: "npm:^1.0.0"
-    has-unicode: "npm:^2.0.0"
-    object-assign: "npm:^4.1.0"
-    signal-exit: "npm:^3.0.0"
-    string-width: "npm:^1.0.1"
-    strip-ansi: "npm:^3.0.1"
-    wide-align: "npm:^1.1.0"
-  checksum: 10/0db20a7def238f0e8eab50226247e1f94f1446ab24700eab0a56e5ccf23ce85ccf8f0c0c462112b89beb964431b1edabd3f7b31f1f6d5f62294c453594523993
-  languageName: node
-  linkType: hard
-
 "gauge@npm:^3.0.0":
   version: 3.0.2
   resolution: "gauge@npm:3.0.2"
@@ -22440,7 +22880,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.1, get-intrinsic@npm:^1.2.3, get-intrinsic@npm:^1.2.4":
+"get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.1, get-intrinsic@npm:^1.2.3, get-intrinsic@npm:^1.2.4":
   version: 1.2.4
   resolution: "get-intrinsic@npm:1.2.4"
   dependencies:
@@ -22469,10 +22909,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"get-stdin@npm:^8.0.0":
-  version: 8.0.0
-  resolution: "get-stdin@npm:8.0.0"
-  checksum: 10/40128b6cd25781ddbd233344f1a1e4006d4284906191ed0a7d55ec2c1a3e44d650f280b2c9eeab79c03ac3037da80257476c0e4e5af38ddfb902d6ff06282d77
+"get-stdin@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "get-stdin@npm:6.0.0"
+  checksum: 10/593f6fb4fff4c8d49ec93a07c430c1edc6bd4fe7e429d222b5da2f367276a98809af9e90467ad88a2d83722ff95b9b35bbaba02b56801421c5e3668173fe12b4
   languageName: node
   linkType: hard
 
@@ -22529,6 +22969,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"get-value@npm:^2.0.3, get-value@npm:^2.0.6":
+  version: 2.0.6
+  resolution: "get-value@npm:2.0.6"
+  checksum: 10/5c3b99cb5398ea8016bf46ff17afc5d1d286874d2ad38ca5edb6e87d75c0965b0094cb9a9dddef2c59c23d250702323539a7fbdd870620db38c7e7d7ec87c1eb
+  languageName: node
+  linkType: hard
+
 "getpass@npm:^0.1.1":
   version: 0.1.7
   resolution: "getpass@npm:0.1.7"
@@ -22538,55 +22985,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"gh-release-assets@npm:^1.1.0":
-  version: 1.1.2
-  resolution: "gh-release-assets@npm:1.1.2"
-  dependencies:
-    async: "npm:^0.9.0"
-    mime: "npm:^1.3.4"
-    progress-stream: "npm:^2.0.0"
-    request: "npm:^2.85.0"
-    util-extend: "npm:^1.0.1"
-  checksum: 10/9568aee9fe2d6b53be9f0b97d7d2aff5c3ce22c947f153f651d1ac45ec6f5e9cfeeb016ded075eb3560ebee08e0541c3e57a805b19e265dcc26d613b0a8b0ed7
-  languageName: node
-  linkType: hard
-
-"gh-release@npm:^3.5.0":
-  version: 3.5.0
-  resolution: "gh-release@npm:3.5.0"
-  dependencies:
-    chalk: "npm:^1.0.0"
-    changelog-parser: "npm:^2.0.0"
-    deep-extend: "npm:^0.6.0"
-    gauge: "npm:^2.7.4"
-    gh-release-assets: "npm:^1.1.0"
-    ghauth: "npm:^3.2.0"
-    github-url-to-object: "npm:^3.0.0"
-    inquirer: "npm:^6.2.0"
-    request: "npm:^2.82.0"
-    shelljs: "npm:^0.3.0"
-    update-notifier: "npm:^2.2.0"
-    yargs: "npm:^2.1.1"
-  bin:
-    gh-release: ./bin/cli.js
-  checksum: 10/4101926e6032cef3a53f388a082c4a3bf9c8f8064c62d79fe061b39d9e3f0e71a0cdf6fcd96c3226f5d557dc2a6b75ea3fa91d8cee36b1f30fe6a406b4075b2d
-  languageName: node
-  linkType: hard
-
-"ghauth@npm:^3.2.0":
-  version: 3.2.1
-  resolution: "ghauth@npm:3.2.1"
-  dependencies:
-    application-config: "npm:~1.0.0"
-    bl: "npm:~1.1.2"
-    hyperquest: "npm:~2.0.0"
-    mkdirp: "npm:~0.5.1"
-    read: "npm:~1.0.7"
-    xtend: "npm:~4.0.1"
-  checksum: 10/d006f19dde8ed9f4ed739440e8d2585f7ab3f316bcaa9b10750bda4a37c481680b6d976cb04678441a3a9457ba12f72fbf816f6c2274845e2ebad88aa186ce8f
-  languageName: node
-  linkType: hard
-
 "gifsicle@npm:^5.0.0":
   version: 5.3.0
   resolution: "gifsicle@npm:5.3.0"
@@ -22607,19 +23005,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"github-slugger@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "github-slugger@npm:2.0.0"
-  checksum: 10/2fb15d78262eeba1e68671f048c62d05ed21e51281cccc7b1c9e8e089e8510b3037fb648b8ba27290e60534df2cb251312a1e7e813204495df621220192fd600
-  languageName: node
-  linkType: hard
-
-"github-url-to-object@npm:^3.0.0":
+"glob-parent@npm:^3.1.0":
   version: 3.1.0
-  resolution: "github-url-to-object@npm:3.1.0"
+  resolution: "glob-parent@npm:3.1.0"
   dependencies:
-    is-url: "npm:^1.1.0"
-  checksum: 10/ad7c7abaf49bdd8e78a2f1a28f7d09a2aeb76b3c59e2aa29730135f00588bd8882380ce4a31d708c70e3721930f9369849fd18c63cfad37f55980d3fcaf54fad
+    is-glob: "npm:^3.1.0"
+    path-dirname: "npm:^1.0.0"
+  checksum: 10/653d559237e89a11b9934bef3f392ec42335602034c928590544d383ff5ef449f7b12f3cfa539708e74bc0a6c28ab1fe51d663cc07463cdf899ba92afd85a855
   languageName: node
   linkType: hard
 
@@ -22641,6 +23033,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"glob-to-regexp@npm:^0.3.0":
+  version: 0.3.0
+  resolution: "glob-to-regexp@npm:0.3.0"
+  checksum: 10/a716708f7887a1d3c46188dbbd5baf6b1647fa670e458d49db949369e20eb79fad9828d6601f618455f87fd13041b6087b01233d95ba7092aba7acb7491c9d39
+  languageName: node
+  linkType: hard
+
 "glob-to-regexp@npm:^0.4.1":
   version: 0.4.1
   resolution: "glob-to-regexp@npm:0.4.1"
@@ -22648,20 +23047,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"glob@npm:7.1.6":
-  version: 7.1.6
-  resolution: "glob@npm:7.1.6"
-  dependencies:
-    fs.realpath: "npm:^1.0.0"
-    inflight: "npm:^1.0.4"
-    inherits: "npm:2"
-    minimatch: "npm:^3.0.4"
-    once: "npm:^1.3.0"
-    path-is-absolute: "npm:^1.0.0"
-  checksum: 10/7d6ec98bc746980d5fe4d764b9c7ada727e3fbd2a7d85cd96dd95fb18638c9c54a70c692fd2ab5d68a186dc8cd9d6a4192d3df220beed891f687db179c430237
-  languageName: node
-  linkType: hard
-
 "glob@npm:7.2.0":
   version: 7.2.0
   resolution: "glob@npm:7.2.0"
@@ -22676,6 +23061,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"glob@npm:^10.0.0, glob@npm:^10.2.2, glob@npm:^10.3.10":
+  version: 10.4.5
+  resolution: "glob@npm:10.4.5"
+  dependencies:
+    foreground-child: "npm:^3.1.0"
+    jackspeak: "npm:^3.1.2"
+    minimatch: "npm:^9.0.4"
+    minipass: "npm:^7.1.2"
+    package-json-from-dist: "npm:^1.0.0"
+    path-scurry: "npm:^1.11.1"
+  bin:
+    glob: dist/esm/bin.mjs
+  checksum: 10/698dfe11828b7efd0514cd11e573eaed26b2dff611f0400907281ce3eab0c1e56143ef9b35adc7c77ecc71fba74717b510c7c223d34ca8a98ec81777b293d4ac
+  languageName: node
+  linkType: hard
+
 "glob@npm:^11.0.0":
   version: 11.0.0
   resolution: "glob@npm:11.0.0"
@@ -22706,15 +23107,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"global-dirs@npm:^0.1.0":
-  version: 0.1.1
-  resolution: "global-dirs@npm:0.1.1"
-  dependencies:
-    ini: "npm:^1.3.4"
-  checksum: 10/10624f5a8ddb8634c22804c6b24f93fb591c3639a6bc78e3584e01a238fc6f7b7965824184e57d63f6df36980b6c191484ad7bc6c35a1599b8f1d64be64c2a4a
-  languageName: node
-  linkType: hard
-
 "global-modules@npm:^2.0.0":
   version: 2.0.0
   resolution: "global-modules@npm:2.0.0"
@@ -22751,6 +23143,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"globals@npm:^13.23.0":
+  version: 13.24.0
+  resolution: "globals@npm:13.24.0"
+  dependencies:
+    type-fest: "npm:^0.20.2"
+  checksum: 10/62c5b1997d06674fc7191d3e01e324d3eda4d65ac9cc4e78329fa3b5c4fd42a0e1c8722822497a6964eee075255ce21ccf1eec2d83f92ef3f06653af4d0ee28e
+  languageName: node
+  linkType: hard
+
 "globalthis@npm:^1.0.3":
   version: 1.0.3
   resolution: "globalthis@npm:1.0.3"
@@ -22760,6 +23161,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"globalthis@npm:^1.0.4":
+  version: 1.0.4
+  resolution: "globalthis@npm:1.0.4"
+  dependencies:
+    define-properties: "npm:^1.2.1"
+    gopd: "npm:^1.0.1"
+  checksum: 10/1f1fd078fb2f7296306ef9dd51019491044ccf17a59ed49d375b576ca108ff37e47f3d29aead7add40763574a992f16a5367dd1e2173b8634ef18556ab719ac4
+  languageName: node
+  linkType: hard
+
 "globby@npm:^10.0.0":
   version: 10.0.2
   resolution: "globby@npm:10.0.2"
@@ -22776,7 +23187,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"globby@npm:^11.0.0, globby@npm:^11.0.3, globby@npm:^11.1.0":
+"globby@npm:^11.0.0, globby@npm:^11.1.0":
   version: 11.1.0
   resolution: "globby@npm:11.1.0"
   dependencies:
@@ -22817,6 +23228,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"globby@npm:^9.0.0":
+  version: 9.2.0
+  resolution: "globby@npm:9.2.0"
+  dependencies:
+    "@types/glob": "npm:^7.1.1"
+    array-union: "npm:^1.0.2"
+    dir-glob: "npm:^2.2.2"
+    fast-glob: "npm:^2.2.6"
+    glob: "npm:^7.1.3"
+    ignore: "npm:^4.0.3"
+    pify: "npm:^4.0.1"
+    slash: "npm:^2.0.0"
+  checksum: 10/8035f1e5d8f3fd9df6e4b475f4e2b17ace1ac679bb8477fbfaefea6958cc9c4cfbe50080fd7e76a821501ecd28bf94cc1bd9e42ed127723dbeefee31d0e198fe
+  languageName: node
+  linkType: hard
+
 "globjoin@npm:^0.1.4":
   version: 0.1.4
   resolution: "globjoin@npm:0.1.4"
@@ -22824,6 +23251,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"gonzales-pe@npm:^4.2.3":
+  version: 4.3.0
+  resolution: "gonzales-pe@npm:4.3.0"
+  dependencies:
+    minimist: "npm:^1.2.5"
+  bin:
+    gonzales: bin/gonzales.js
+  checksum: 10/d1676546bcaa4cb1c6c1fc5de5d62e85960665a13a4c489b02baeb58a10c53a249beef05ceaf21ea801813a559ff17d7b61158aa417211c135bcb8bdcb1701ca
+  languageName: node
+  linkType: hard
+
 "google-auth-library@npm:^8.0.1":
   version: 8.7.0
   resolution: "google-auth-library@npm:8.7.0"
@@ -22868,25 +23306,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"got@npm:^6.7.1":
-  version: 6.7.1
-  resolution: "got@npm:6.7.1"
-  dependencies:
-    create-error-class: "npm:^3.0.0"
-    duplexer3: "npm:^0.1.4"
-    get-stream: "npm:^3.0.0"
-    is-redirect: "npm:^1.0.0"
-    is-retry-allowed: "npm:^1.0.0"
-    is-stream: "npm:^1.0.0"
-    lowercase-keys: "npm:^1.0.0"
-    safe-buffer: "npm:^5.0.1"
-    timed-out: "npm:^4.0.0"
-    unzip-response: "npm:^2.0.1"
-    url-parse-lax: "npm:^1.0.0"
-  checksum: 10/1b1aa4bb08743d16c2349948b8318c8f4dd152fa58a15dba6d5c2695c31688a71169e3256446ca43bbfaf815c8bef12683dc9f325b7f69e9af849483bf487405
-  languageName: node
-  linkType: hard
-
 "got@npm:^7.0.0":
   version: 7.1.0
   resolution: "got@npm:7.1.0"
@@ -22987,15 +23406,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"gzip-size@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "gzip-size@npm:6.0.0"
-  dependencies:
-    duplexer: "npm:^0.1.2"
-  checksum: 10/2df97f359696ad154fc171dcb55bc883fe6e833bca7a65e457b9358f3cb6312405ed70a8da24a77c1baac0639906cd52358dc0ce2ec1a937eaa631b934c94194
-  languageName: node
-  linkType: hard
-
 "handle-thing@npm:^2.0.0":
   version: 2.0.1
   resolution: "handle-thing@npm:2.0.1"
@@ -23119,13 +23529,52 @@ __metadata:
   languageName: node
   linkType: hard
 
-"has-unicode@npm:^2.0.0, has-unicode@npm:^2.0.1":
+"has-unicode@npm:^2.0.1":
   version: 2.0.1
   resolution: "has-unicode@npm:2.0.1"
   checksum: 10/041b4293ad6bf391e21c5d85ed03f412506d6623786b801c4ab39e4e6ca54993f13201bceb544d92963f9e0024e6e7fbf0cb1d84c9d6b31cb9c79c8c990d13d8
   languageName: node
   linkType: hard
 
+"has-value@npm:^0.3.1":
+  version: 0.3.1
+  resolution: "has-value@npm:0.3.1"
+  dependencies:
+    get-value: "npm:^2.0.3"
+    has-values: "npm:^0.1.4"
+    isobject: "npm:^2.0.0"
+  checksum: 10/29e2a1e6571dad83451b769c7ce032fce6009f65bccace07c2962d3ad4d5530b6743d8f3229e4ecf3ea8e905d23a752c5f7089100c1f3162039fa6dc3976558f
+  languageName: node
+  linkType: hard
+
+"has-value@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "has-value@npm:1.0.0"
+  dependencies:
+    get-value: "npm:^2.0.6"
+    has-values: "npm:^1.0.0"
+    isobject: "npm:^3.0.0"
+  checksum: 10/b9421d354e44f03d3272ac39fd49f804f19bc1e4fa3ceef7745df43d6b402053f828445c03226b21d7d934a21ac9cf4bc569396dc312f496ddff873197bbd847
+  languageName: node
+  linkType: hard
+
+"has-values@npm:^0.1.4":
+  version: 0.1.4
+  resolution: "has-values@npm:0.1.4"
+  checksum: 10/ab1c4bcaf811ccd1856c11cfe90e62fca9e2b026ebe474233a3d282d8d67e3b59ed85b622c7673bac3db198cb98bd1da2b39300a2f98e453729b115350af49bc
+  languageName: node
+  linkType: hard
+
+"has-values@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "has-values@npm:1.0.0"
+  dependencies:
+    is-number: "npm:^3.0.0"
+    kind-of: "npm:^4.0.0"
+  checksum: 10/77e6693f732b5e4cf6c38dfe85fdcefad0fab011af74995c3e83863fabf5e3a836f406d83565816baa0bc0a523c9410db8b990fe977074d61aeb6d8f4fcffa11
+  languageName: node
+  linkType: hard
+
 "has@npm:^1.0.0, has@npm:^1.0.3":
   version: 1.0.3
   resolution: "has@npm:1.0.3"
@@ -23194,33 +23643,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"hast-util-heading-rank@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "hast-util-heading-rank@npm:3.0.0"
-  dependencies:
-    "@types/hast": "npm:^3.0.0"
-  checksum: 10/e5ce4ec9e8017b24ab72702fa0dd401ec6eaf32574120d71c2aa4e8e0f43829dba2e291f49d305a47e8d65b82a9c5adad7985385dc5bc8370f8cec7c8f9313d3
-  languageName: node
-  linkType: hard
-
-"hast-util-is-element@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "hast-util-is-element@npm:3.0.0"
-  dependencies:
-    "@types/hast": "npm:^3.0.0"
-  checksum: 10/b4e6d84c763ffdc44198ba0c4a5a7430794a7b2c1eec699d37776ea9832eef79f129726c175982103eb3b21f531a6bfd2fa43ce26e1ed6d8f6a87c102ba212c8
-  languageName: node
-  linkType: hard
-
-"hast-util-to-string@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "hast-util-to-string@npm:3.0.1"
-  dependencies:
-    "@types/hast": "npm:^3.0.0"
-  checksum: 10/a569518313a648bc86e712858bc907d1f65137ebba87bc71180dbc2f24f194f6035019ffa8e38b1f7897672d45a337046a4c9964ce6d2593953b5069e10d31c2
-  languageName: node
-  linkType: hard
-
 "he@npm:1.2.0, he@npm:^1.2.0":
   version: 1.2.0
   resolution: "he@npm:1.2.0"
@@ -23277,10 +23699,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"highlight.js@npm:^11.5.1, highlight.js@npm:^11.6.0":
-  version: 11.6.0
-  resolution: "highlight.js@npm:11.6.0"
-  checksum: 10/7ba8a09e9388f1495b3123ac2c0d12557ae43dd14746aff024db7555b22b6ff5cf1f5124bd0f5127a21af79fcbfea58547f9e8c428ded85a2a6dd5b64d47417b
+"highlight.js@npm:^11.10.0":
+  version: 11.10.0
+  resolution: "highlight.js@npm:11.10.0"
+  checksum: 10/fc8747bcd4a491fc6a47ff80536881dcc9ea9b36cdc2a22a7be5670b89d76ca6c26df9d749017a23bbb2eb708331097a5ecbcee6330fb9064512d80cc3369d99
   languageName: node
   linkType: hard
 
@@ -23450,10 +23872,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"html-tags@npm:^3.1.0, html-tags@npm:^3.2.0":
-  version: 3.2.0
-  resolution: "html-tags@npm:3.2.0"
-  checksum: 10/a0c9e96ac26c84adad9cc66d15d6711a17f60acda8d987218f1d4cbaacd52864939b230e635cce5a1179f3ddab2a12b9231355617dfbae7945fcfec5e96d2041
+"html-tags@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "html-tags@npm:2.0.0"
+  checksum: 10/a02b47dd71de5572f16c9a1d88e2876fcc4d60bb36b7effce48cd3cd0bdd8fdcbf2602d968d2268d134767620d876edc08d8a6fc0abd9dc59a05e89d56251fbb
+  languageName: node
+  linkType: hard
+
+"html-tags@npm:^3.3.1":
+  version: 3.3.1
+  resolution: "html-tags@npm:3.3.1"
+  checksum: 10/d0e808544b92d8b999cbcc86d539577255a2f0f2f4f73110d10749d1d36e6fe6ad706a0355a8477afb6e000ecdc93d8455b3602951f9a2b694ac9e28f1b52878
   languageName: node
   linkType: hard
 
@@ -23491,9 +23920,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"html-webpack-plugin@npm:^5.5.3":
-  version: 5.5.3
-  resolution: "html-webpack-plugin@npm:5.5.3"
+"html-webpack-plugin@npm:^5.6.3":
+  version: 5.6.3
+  resolution: "html-webpack-plugin@npm:5.6.3"
   dependencies:
     "@types/html-minifier-terser": "npm:^6.0.0"
     html-minifier-terser: "npm:^6.0.2"
@@ -23501,8 +23930,14 @@ __metadata:
     pretty-error: "npm:^4.0.0"
     tapable: "npm:^2.0.0"
   peerDependencies:
+    "@rspack/core": 0.x || 1.x
     webpack: ^5.20.0
-  checksum: 10/01d302a434e3db9f0e2db370f06300fb613de0fb8bdcafd4693e44c2528b8608621e5e7ca5d8302446db3f20c5f8875f1f675926d469b13ebab139954d241055
+  peerDependenciesMeta:
+    "@rspack/core":
+      optional: true
+    webpack:
+      optional: true
+  checksum: 10/fd2bf1ac04823526c8b609555d027b38b9d61b4ba9f5c8116a37cc6b62d5b86cab1f478616e8c5344fee13663d2566f5c470c66265ecb1e9574dc38d0459889d
   languageName: node
   linkType: hard
 
@@ -23520,15 +23955,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"htmlparser2@npm:^4.0.0":
-  version: 4.1.0
-  resolution: "htmlparser2@npm:4.1.0"
+"htmlparser2@npm:^3.10.0":
+  version: 3.10.1
+  resolution: "htmlparser2@npm:3.10.1"
+  dependencies:
+    domelementtype: "npm:^1.3.1"
+    domhandler: "npm:^2.3.0"
+    domutils: "npm:^1.5.1"
+    entities: "npm:^1.1.1"
+    inherits: "npm:^2.0.1"
+    readable-stream: "npm:^3.1.1"
+  checksum: 10/d5297fe76c0d6b0f35f39781417eb560ef12fa121953578083f3f2b240c74d5c35a38185689d181b6a82b66a3025436f14aa3413b94f3cd50ba15733f2f72389
+  languageName: node
+  linkType: hard
+
+"htmlparser2@npm:^5.0.0":
+  version: 5.0.1
+  resolution: "htmlparser2@npm:5.0.1"
   dependencies:
     domelementtype: "npm:^2.0.1"
-    domhandler: "npm:^3.0.0"
-    domutils: "npm:^2.0.0"
+    domhandler: "npm:^3.3.0"
+    domutils: "npm:^2.4.2"
     entities: "npm:^2.0.0"
-  checksum: 10/e8ed0d9a4cae2d8d311e7f1d4ca2008c89b3fb20f864e30e77fe63182e671912fcd8d1c7a5780c515cec32d539553a5cb31d1f0802730cd107107b58ae657458
+  checksum: 10/789904b9a9f3d2f2d6b63e32aeb8b4cc03d6f5f751c5db86fbdf32c83570f5a5fc827fe664701ec4c5f940c49cf73ceffc93658ce116225f949e29a67dcc8629
   languageName: node
   linkType: hard
 
@@ -23556,6 +24005,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"htmlparser2@npm:^9.1.0":
+  version: 9.1.0
+  resolution: "htmlparser2@npm:9.1.0"
+  dependencies:
+    domelementtype: "npm:^2.3.0"
+    domhandler: "npm:^5.0.3"
+    domutils: "npm:^3.1.0"
+    entities: "npm:^4.5.0"
+  checksum: 10/6352fa2a5495781fa9a02c9049908334cd068ff36d753870d30cd13b841e99c19646717567a2f9e9c44075bbe43d364e102f9d013a731ce962226d63746b794f
+  languageName: node
+  linkType: hard
+
 "http-cache-semantics@npm:3.8.1":
   version: 3.8.1
   resolution: "http-cache-semantics@npm:3.8.1"
@@ -23570,6 +24031,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"http-cache-semantics@npm:^4.1.1":
+  version: 4.1.1
+  resolution: "http-cache-semantics@npm:4.1.1"
+  checksum: 10/362d5ed66b12ceb9c0a328fb31200b590ab1b02f4a254a697dc796850cc4385603e75f53ec59f768b2dad3bfa1464bd229f7de278d2899a0e3beffc634b6683f
+  languageName: node
+  linkType: hard
+
 "http-deceiver@npm:^1.2.7":
   version: 1.2.7
   resolution: "http-deceiver@npm:1.2.7"
@@ -23577,7 +24045,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"http-errors@npm:2.0.0":
+"http-errors@npm:2.0.0, http-errors@npm:^2.0.0":
   version: 2.0.0
   resolution: "http-errors@npm:2.0.0"
   dependencies:
@@ -23631,6 +24099,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"http-proxy-agent@npm:^7.0.0, http-proxy-agent@npm:^7.0.2":
+  version: 7.0.2
+  resolution: "http-proxy-agent@npm:7.0.2"
+  dependencies:
+    agent-base: "npm:^7.1.0"
+    debug: "npm:^4.3.4"
+  checksum: 10/d062acfa0cb82beeb558f1043c6ba770ea892b5fb7b28654dbc70ea2aeea55226dd34c02a294f6c1ca179a5aa483c4ea641846821b182edbd9cc5d89b54c6848
+  languageName: node
+  linkType: hard
+
 "http-proxy-middleware@npm:^2.0.3":
   version: 2.0.6
   resolution: "http-proxy-middleware@npm:2.0.6"
@@ -23695,6 +24173,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"https-proxy-agent@npm:^7.0.1, https-proxy-agent@npm:^7.0.5":
+  version: 7.0.5
+  resolution: "https-proxy-agent@npm:7.0.5"
+  dependencies:
+    agent-base: "npm:^7.0.2"
+    debug: "npm:4"
+  checksum: 10/6679d46159ab3f9a5509ee80c3a3fc83fba3a920a5e18d32176c3327852c3c00ad640c0c4210a8fd70ea3c4a6d3a1b375bf01942516e7df80e2646bdc77658ab
+  languageName: node
+  linkType: hard
+
 "human-id@npm:^1.0.2":
   version: 1.0.2
   resolution: "human-id@npm:1.0.2"
@@ -23734,27 +24222,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"husky@npm:^4.3.8":
-  version: 4.3.8
-  resolution: "husky@npm:4.3.8"
-  dependencies:
-    chalk: "npm:^4.0.0"
-    ci-info: "npm:^2.0.0"
-    compare-versions: "npm:^3.6.0"
-    cosmiconfig: "npm:^7.0.0"
-    find-versions: "npm:^4.0.0"
-    opencollective-postinstall: "npm:^2.0.2"
-    pkg-dir: "npm:^5.0.0"
-    please-upgrade-node: "npm:^3.2.0"
-    slash: "npm:^3.0.0"
-    which-pm-runs: "npm:^1.0.0"
-  bin:
-    husky-run: bin/run.js
-    husky-upgrade: lib/upgrader/bin.js
-  checksum: 10/bf525b1133ac68131a50acfea1b6348ed4b3230ff471492852edd97f3038e858ccf075eac431db47c27d928638a108eef70bc3940f289f5a3ac0eca20808969a
-  languageName: node
-  linkType: hard
-
 "hyperdyperid@npm:^1.2.0":
   version: 1.2.0
   resolution: "hyperdyperid@npm:1.2.0"
@@ -23762,16 +24229,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"hyperquest@npm:~2.0.0":
-  version: 2.0.0
-  resolution: "hyperquest@npm:2.0.0"
-  dependencies:
-    duplexer2: "npm:~0.0.2"
-    through2: "npm:~0.6.3"
-  checksum: 10/622ce494665de5d09b07f2bab3c4d938df47b62cca17da18ea64f63798cb4b4d4cbfe64e4b4ac7fcf3cfc3cd6d18f23456d16aa3f8c12976f11766956118f666
-  languageName: node
-  linkType: hard
-
 "hyphen@npm:^1.6.4":
   version: 1.6.4
   resolution: "hyphen@npm:1.6.4"
@@ -23831,6 +24288,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"iconv-lite@npm:0.5.2":
+  version: 0.5.2
+  resolution: "iconv-lite@npm:0.5.2"
+  dependencies:
+    safer-buffer: "npm:>= 2.1.2 < 3"
+  checksum: 10/b48a1c8a173b638cb3d9a21674acbfed1c1fd8e81f6dc52e63cf44d3b56f37fd48f8ff81d93a71c8b60b4dfb464d3e87f606df5f8a0f0247c21737665059565c
+  languageName: node
+  linkType: hard
+
 "iconv-lite@npm:0.6.3, iconv-lite@npm:^0.6.2, iconv-lite@npm:^0.6.3":
   version: 0.6.3
   resolution: "iconv-lite@npm:0.6.3"
@@ -23892,6 +24358,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ignore@npm:^4.0.3":
+  version: 4.0.6
+  resolution: "ignore@npm:4.0.6"
+  checksum: 10/e04d6bd60d9da12cfe8896acf470824172843dddc25a9be0726199d5e031254634a69ce8479a82f194154b9b28cb3b08bb7a53e56f7f7eba2663e04791e74742
+  languageName: node
+  linkType: hard
+
+"ignore@npm:^5.0.4":
+  version: 5.3.2
+  resolution: "ignore@npm:5.3.2"
+  checksum: 10/cceb6a457000f8f6a50e1196429750d782afce5680dd878aa4221bd79972d68b3a55b4b1458fc682be978f4d3c6a249046aa0880637367216444ab7b014cfc98
+  languageName: node
+  linkType: hard
+
 "ignore@npm:^5.1.1, ignore@npm:^5.1.9, ignore@npm:^5.2.0":
   version: 5.2.0
   resolution: "ignore@npm:5.2.0"
@@ -23899,14 +24379,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"image-size@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "image-size@npm:1.0.2"
+"ignore@npm:^6.0.2":
+  version: 6.0.2
+  resolution: "ignore@npm:6.0.2"
+  checksum: 10/af39e49996cd989763920e445eff897d0ae1e36b5f27b0e09e14a4fd2df89b362f92e720ecf06ef729056842366527db8561d310e904718810b92ffbcd23056d
+  languageName: node
+  linkType: hard
+
+"image-size@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "image-size@npm:1.1.1"
   dependencies:
     queue: "npm:6.0.2"
   bin:
     image-size: bin/image-size.js
-  checksum: 10/693dfb2f8bfda2aacd087ef7130fd997fd0aceca838291bae400646db1826b80108185d0062ea3c0365b12c3ab5145bb923fdc777fd94c4991840d47fe44ade3
+  checksum: 10/f28966dd3f6d4feccc4028400bb7e8047c28b073ab0aa90c7c53039288139dd416c6bc254a976d4bf61113d4bc84871786804113099701cbfe9ccf377effdb54
   languageName: node
   linkType: hard
 
@@ -24040,10 +24527,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"immutable@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "immutable@npm:4.0.0"
-  checksum: 10/bc8e3f46a539ca060531d3e94bb691a75b3acf75abbe856cb1c3365f7cff2c12f51bdd0ec428ce7fc6283ee5d284867dbfcb08baf12e08242185cdb13f4ad151
+"immutable@npm:^5.0.2":
+  version: 5.0.2
+  resolution: "immutable@npm:5.0.2"
+  checksum: 10/89b1117c610024b7a9214eade8b9f1ed38b00c82235f119515cfa5eaf26270eccbc803296d4c3c12f53e50802f042f84d811998910b866363913720da768472e
   languageName: node
   linkType: hard
 
@@ -24079,13 +24566,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"import-lazy@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "import-lazy@npm:2.1.0"
-  checksum: 10/05294f3b9dd4971d3a996f0d2f176410fb6745d491d6e73376429189f5c1c3d290548116b2960a7cf3e89c20cdf11431739d1d2d8c54b84061980795010e803a
-  languageName: node
-  linkType: hard
-
 "import-lazy@npm:^3.1.0":
   version: 3.1.0
   resolution: "import-lazy@npm:3.1.0"
@@ -24093,13 +24573,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"import-lazy@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "import-lazy@npm:4.0.0"
-  checksum: 10/943309cc8eb01ada12700448c288b0384f77a1bc33c7e00fa4cb223c665f467a13ce9aaceb8d2e4cf586b07c1d2828040263dcc069873ce63cfc2ac6fd087971
-  languageName: node
-  linkType: hard
-
 "import-local@npm:^3.0.2":
   version: 3.1.0
   resolution: "import-local@npm:3.1.0"
@@ -24119,6 +24592,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"indent-string@npm:^3.0.0":
+  version: 3.2.0
+  resolution: "indent-string@npm:3.2.0"
+  checksum: 10/a0b72603bba6c985d367fda3a25aad16423d2056b22a7e83ee2dd9ce0ce3d03d1e078644b679087aa7edf1cfb457f0d96d9eeadc0b12f38582088cc00e995d2f
+  languageName: node
+  linkType: hard
+
 "indent-string@npm:^4.0.0":
   version: 4.0.0
   resolution: "indent-string@npm:4.0.0"
@@ -24164,7 +24644,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.1, inherits@npm:^2.0.3, inherits@npm:^2.0.4, inherits@npm:~2.0.1, inherits@npm:~2.0.3, inherits@npm:~2.0.4":
+"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.0, inherits@npm:^2.0.1, inherits@npm:^2.0.3, inherits@npm:^2.0.4, inherits@npm:~2.0.1, inherits@npm:~2.0.3, inherits@npm:~2.0.4":
   version: 2.0.4
   resolution: "inherits@npm:2.0.4"
   checksum: 10/cd45e923bee15186c07fa4c89db0aace24824c482fb887b528304694b2aa6ff8a898da8657046a5dcf3e46cd6db6c61629551f9215f208d7c3f157cf9b290521
@@ -24194,27 +24674,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"inquirer@npm:^6.2.0":
-  version: 6.5.2
-  resolution: "inquirer@npm:6.5.2"
-  dependencies:
-    ansi-escapes: "npm:^3.2.0"
-    chalk: "npm:^2.4.2"
-    cli-cursor: "npm:^2.1.0"
-    cli-width: "npm:^2.0.0"
-    external-editor: "npm:^3.0.3"
-    figures: "npm:^2.0.0"
-    lodash: "npm:^4.17.12"
-    mute-stream: "npm:0.0.7"
-    run-async: "npm:^2.2.0"
-    rxjs: "npm:^6.4.0"
-    string-width: "npm:^2.1.0"
-    strip-ansi: "npm:^5.1.0"
-    through: "npm:^2.3.6"
-  checksum: 10/4041bbc2759bd579882f609c703aa3ce2faac47f0403008aec590d859d804cca085fe00d034bdce4282a290135a2f2d657653e6593652bd068e9b5571674825b
-  languageName: node
-  linkType: hard
-
 "inquirer@npm:^8.2.5":
   version: 8.2.6
   resolution: "inquirer@npm:8.2.6"
@@ -24258,7 +24717,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"internal-slot@npm:^1.0.3, internal-slot@npm:^1.0.4, internal-slot@npm:^1.0.7":
+"internal-slot@npm:^1.0.7":
   version: 1.0.7
   resolution: "internal-slot@npm:1.0.7"
   dependencies:
@@ -24269,6 +24728,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"internmap@npm:1 - 2":
+  version: 2.0.3
+  resolution: "internmap@npm:2.0.3"
+  checksum: 10/873e0e7fcfe32f999aa0997a0b648b1244508e56e3ea6b8259b5245b50b5eeb3853fba221f96692bd6d1def501da76c32d64a5cb22a0b26cdd9b445664f805e0
+  languageName: node
+  linkType: hard
+
 "internmap@npm:^1.0.0":
   version: 1.0.1
   resolution: "internmap@npm:1.0.1"
@@ -24324,6 +24790,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ip-address@npm:^9.0.5":
+  version: 9.0.5
+  resolution: "ip-address@npm:9.0.5"
+  dependencies:
+    jsbn: "npm:1.1.0"
+    sprintf-js: "npm:^1.1.3"
+  checksum: 10/1ed81e06721af012306329b31f532b5e24e00cb537be18ddc905a84f19fe8f83a09a1699862bf3a1ec4b9dea93c55a3fa5faf8b5ea380431469df540f38b092c
+  languageName: node
+  linkType: hard
+
 "ip-cidr@npm:^3.0.0":
   version: 3.1.0
   resolution: "ip-cidr@npm:3.1.0"
@@ -24371,10 +24847,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-absolute-url@npm:^4.0.0":
-  version: 4.0.1
-  resolution: "is-absolute-url@npm:4.0.1"
-  checksum: 10/de172a718439982a54477fdae55f21be69ec0e6a4b205db5484975d2f4ee749851fd46c28f3790dfc51a274c2ed1d0f8457b6d1fff02ab829069fd9cc761e48c
+"is-accessor-descriptor@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "is-accessor-descriptor@npm:1.0.1"
+  dependencies:
+    hasown: "npm:^2.0.0"
+  checksum: 10/df0d1da1a320e57c594e6f9b52dab8a6bece6dc90e51689d05ac8e5247164aa3eb3e9c66b37027bebfc0ea5fcce6d9503dbc41dccd82f4b57add79a307735365
   languageName: node
   linkType: hard
 
@@ -24385,6 +24863,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-alphanumeric@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "is-alphanumeric@npm:1.0.0"
+  checksum: 10/2f4f4f227fe4cae977529f628021655edc172e1e5debfb3c30efd547f32e8d390c9bb7a71f3e9fea4187fe6598980072323d5a1b1abd3368379e33ba6504558c
+  languageName: node
+  linkType: hard
+
 "is-alphanumerical@npm:^1.0.0":
   version: 1.0.4
   resolution: "is-alphanumerical@npm:1.0.4"
@@ -24395,7 +24880,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-arguments@npm:^1.0.4, is-arguments@npm:^1.1.1":
+"is-arguments@npm:^1.0.4":
   version: 1.1.1
   resolution: "is-arguments@npm:1.1.1"
   dependencies:
@@ -24466,7 +24951,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-buffer@npm:^1.1.0, is-buffer@npm:~1.1.6":
+"is-buffer@npm:^1.1.0, is-buffer@npm:^1.1.5, is-buffer@npm:~1.1.6":
   version: 1.1.6
   resolution: "is-buffer@npm:1.1.6"
   checksum: 10/f63da109e74bbe8947036ed529d43e4ae0c5fcd0909921dce4917ad3ea212c6a87c29f525ba1d17c0858c18331cf1046d4fc69ef59ed26896b25c8288a627133
@@ -24487,28 +24972,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-ci@npm:^1.0.10":
-  version: 1.2.1
-  resolution: "is-ci@npm:1.2.1"
-  dependencies:
-    ci-info: "npm:^1.5.0"
-  bin:
-    is-ci: bin.js
-  checksum: 10/eca06c5626e54ec01be6f9114a8f19b3f571602cfe66458e42ccc42e401e2ebbe1bd3b2fcaa93b5896b9c759e964f3c7f4d9b2d0f4fc4ef5dba78a7c4825e0be
-  languageName: node
-  linkType: hard
-
-"is-ci@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "is-ci@npm:3.0.1"
-  dependencies:
-    ci-info: "npm:^3.2.0"
-  bin:
-    is-ci: bin.js
-  checksum: 10/192c66dc7826d58f803ecae624860dccf1899fc1f3ac5505284c0a5cf5f889046ffeb958fa651e5725d5705c5bcb14f055b79150ea5fcad7456a9569de60260e
-  languageName: node
-  linkType: hard
-
 "is-color-stop@npm:^1.0.0":
   version: 1.1.0
   resolution: "is-color-stop@npm:1.1.0"
@@ -24523,7 +24986,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-core-module@npm:^2.11.0, is-core-module@npm:^2.13.0, is-core-module@npm:^2.5.0, is-core-module@npm:^2.8.1, is-core-module@npm:^2.9.0":
+"is-core-module@npm:^2.13.0, is-core-module@npm:^2.5.0":
   version: 2.13.1
   resolution: "is-core-module@npm:2.13.1"
   dependencies:
@@ -24532,6 +24995,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-core-module@npm:^2.15.1":
+  version: 2.15.1
+  resolution: "is-core-module@npm:2.15.1"
+  dependencies:
+    hasown: "npm:^2.0.2"
+  checksum: 10/77316d5891d5743854bcef2cd2f24c5458fb69fbc9705c12ca17d54a2017a67d0693bbf1ba8c77af376c0eef6bf6d1b27a4ab08e4db4e69914c3789bdf2ceec5
+  languageName: node
+  linkType: hard
+
 "is-cwebp-readable@npm:^3.0.0":
   version: 3.0.0
   resolution: "is-cwebp-readable@npm:3.0.0"
@@ -24541,6 +25013,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-data-descriptor@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "is-data-descriptor@npm:1.0.1"
+  dependencies:
+    hasown: "npm:^2.0.0"
+  checksum: 10/49b36e903b31623b0c5b416e182e366810ef97a3a19ab0e6cd501eb5599112680b7d9e768b07a84fb52aa2510a92b3eb51a3e18ce8d5f7978a49f4b50e6ec6dd
+  languageName: node
+  linkType: hard
+
 "is-data-view@npm:^1.0.1":
   version: 1.0.1
   resolution: "is-data-view@npm:1.0.1"
@@ -24566,6 +25047,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-descriptor@npm:^0.1.0":
+  version: 0.1.7
+  resolution: "is-descriptor@npm:0.1.7"
+  dependencies:
+    is-accessor-descriptor: "npm:^1.0.1"
+    is-data-descriptor: "npm:^1.0.1"
+  checksum: 10/38783182c3d83f839a9fa3e87b4d6de11fa9639833ed98993ea51aea2296b2da155121956e148695a738228871d1057c5f963d0b1c857bb8a4a38d8dd9ceeb56
+  languageName: node
+  linkType: hard
+
+"is-descriptor@npm:^1.0.0, is-descriptor@npm:^1.0.2":
+  version: 1.0.3
+  resolution: "is-descriptor@npm:1.0.3"
+  dependencies:
+    is-accessor-descriptor: "npm:^1.0.1"
+    is-data-descriptor: "npm:^1.0.1"
+  checksum: 10/b940d04d93adaffb749b3ca7f7f6d73dd3c5582b674f372513ecb5511a8a3f3ff4a24f4c1161cb10e48fe4886f9e84c09fa71785def27905ca8df1197e563dc6
+  languageName: node
+  linkType: hard
+
 "is-directory@npm:^0.3.1":
   version: 0.3.1
   resolution: "is-directory@npm:0.3.1"
@@ -24598,7 +25099,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-extglob@npm:^2.1.1":
+"is-extendable@npm:^0.1.0, is-extendable@npm:^0.1.1":
+  version: 0.1.1
+  resolution: "is-extendable@npm:0.1.1"
+  checksum: 10/3875571d20a7563772ecc7a5f36cb03167e9be31ad259041b4a8f73f33f885441f778cee1f1fe0085eb4bc71679b9d8c923690003a36a6a5fdf8023e6e3f0672
+  languageName: node
+  linkType: hard
+
+"is-extendable@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "is-extendable@npm:1.0.1"
+  dependencies:
+    is-plain-object: "npm:^2.0.4"
+  checksum: 10/db07bc1e9de6170de70eff7001943691f05b9d1547730b11be01c0ebfe67362912ba743cf4be6fd20a5e03b4180c685dad80b7c509fe717037e3eee30ad8e84f
+  languageName: node
+  linkType: hard
+
+"is-extglob@npm:^2.1.0, is-extglob@npm:^2.1.1":
   version: 2.1.1
   resolution: "is-extglob@npm:2.1.1"
   checksum: 10/df033653d06d0eb567461e58a7a8c9f940bd8c22274b94bf7671ab36df5719791aae15eef6d83bbb5e23283967f2f984b8914559d4449efda578c775c4be6f85
@@ -24614,15 +25131,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-fullwidth-code-point@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "is-fullwidth-code-point@npm:1.0.0"
-  dependencies:
-    number-is-nan: "npm:^1.0.0"
-  checksum: 10/4d46a7465a66a8aebcc5340d3b63a56602133874af576a9ca42c6f0f4bd787a743605771c5f246db77da96605fefeffb65fc1dbe862dcc7328f4b4d03edf5a57
-  languageName: node
-  linkType: hard
-
 "is-fullwidth-code-point@npm:^2.0.0":
   version: 2.0.0
   resolution: "is-fullwidth-code-point@npm:2.0.0"
@@ -24669,6 +25177,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-glob@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "is-glob@npm:3.1.0"
+  dependencies:
+    is-extglob: "npm:^2.1.0"
+  checksum: 10/9d483bca84f16f01230f7c7c8c63735248fe1064346f292e0f6f8c76475fd20c6f50fc19941af5bec35f85d6bf26f4b7768f39a48a5f5fdc72b408dc74e07afc
+  languageName: node
+  linkType: hard
+
 "is-glob@npm:^4.0.0, is-glob@npm:^4.0.1, is-glob@npm:^4.0.3, is-glob@npm:~4.0.1":
   version: 4.0.3
   resolution: "is-glob@npm:4.0.3"
@@ -24696,16 +25213,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-installed-globally@npm:^0.1.0":
-  version: 0.1.0
-  resolution: "is-installed-globally@npm:0.1.0"
-  dependencies:
-    global-dirs: "npm:^0.1.0"
-    is-path-inside: "npm:^1.0.0"
-  checksum: 10/45a27b3cfa46a174d1b430102cab7a6b5cd7da5d0e0917d3c3478a9f18b9974892534025ab1115d790cfb1d3958f2736fd22057e2eef289cf31820dafdc486e6
-  languageName: node
-  linkType: hard
-
 "is-interactive@npm:^1.0.0":
   version: 1.0.0
   resolution: "is-interactive@npm:1.0.0"
@@ -24727,10 +25234,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-map@npm:^2.0.1, is-map@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "is-map@npm:2.0.2"
-  checksum: 10/60ba910f835f2eacb1fdf5b5a6c60fe1c702d012a7673e6546992bcc0c873f62ada6e13d327f9e48f1720d49c152d6cdecae1fa47a261ef3d247c3ce6f0e1d39
+"is-map@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "is-map@npm:2.0.3"
+  checksum: 10/8de7b41715b08bcb0e5edb0fb9384b80d2d5bcd10e142188f33247d19ff078abaf8e9b6f858e2302d8d05376a26a55cd23a3c9f8ab93292b02fcd2cc9e4e92bb
   languageName: node
   linkType: hard
 
@@ -24785,13 +25292,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-npm@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "is-npm@npm:1.0.0"
-  checksum: 10/74aba3d390aaf4e263de628010a95ae52af71437b7a6d200b10f401c42c8d40972eaccc40101e837b12459083bcbd22e6f63d5b080a4c3c6d8e7c50941054f0a
-  languageName: node
-  linkType: hard
-
 "is-number-object@npm:^1.0.4":
   version: 1.0.7
   resolution: "is-number-object@npm:1.0.7"
@@ -24801,6 +25301,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-number@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "is-number@npm:3.0.0"
+  dependencies:
+    kind-of: "npm:^3.0.2"
+  checksum: 10/0c62bf8e9d72c4dd203a74d8cfc751c746e75513380fef420cda8237e619a988ee43e678ddb23c87ac24d91ac0fe9f22e4ffb1301a50310c697e9d73ca3994e9
+  languageName: node
+  linkType: hard
+
 "is-number@npm:^7.0.0":
   version: 7.0.0
   resolution: "is-number@npm:7.0.0"
@@ -24808,13 +25317,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-obj@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "is-obj@npm:1.0.1"
-  checksum: 10/3ccf0efdea12951e0b9c784e2b00e77e87b2f8bd30b42a498548a8afcc11b3287342a2030c308e473e93a7a19c9ea7854c99a8832a476591c727df2a9c79796c
-  languageName: node
-  linkType: hard
-
 "is-obj@npm:^2.0.0":
   version: 2.0.0
   resolution: "is-obj@npm:2.0.0"
@@ -24829,15 +25331,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-path-inside@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "is-path-inside@npm:1.0.1"
-  dependencies:
-    path-is-inside: "npm:^1.0.1"
-  checksum: 10/07e52c81163937ff89b4700b7ad474de3b396846b55ed87530fb0a22cb9103926152939f673bc1a0592448e7e4e9d75eb734be21b4ad411311065c6a509fae54
-  languageName: node
-  linkType: hard
-
 "is-path-inside@npm:^3.0.3":
   version: 3.0.3
   resolution: "is-path-inside@npm:3.0.3"
@@ -24866,14 +25359,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-plain-object@npm:5.0.0, is-plain-object@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "is-plain-object@npm:5.0.0"
-  checksum: 10/e32d27061eef62c0847d303125440a38660517e586f2f3db7c9d179ae5b6674ab0f469d519b2e25c147a1a3bc87156d0d5f4d8821e0ce4a9ee7fe1fcf11ce45c
-  languageName: node
-  linkType: hard
-
-"is-plain-object@npm:^2.0.4":
+"is-plain-object@npm:^2.0.3, is-plain-object@npm:^2.0.4":
   version: 2.0.4
   resolution: "is-plain-object@npm:2.0.4"
   dependencies:
@@ -24882,6 +25368,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-plain-object@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "is-plain-object@npm:5.0.0"
+  checksum: 10/e32d27061eef62c0847d303125440a38660517e586f2f3db7c9d179ae5b6674ab0f469d519b2e25c147a1a3bc87156d0d5f4d8821e0ce4a9ee7fe1fcf11ce45c
+  languageName: node
+  linkType: hard
+
 "is-png@npm:^2.0.0":
   version: 2.0.0
   resolution: "is-png@npm:2.0.0"
@@ -24896,6 +25389,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-promise@npm:4.0.0":
+  version: 4.0.0
+  resolution: "is-promise@npm:4.0.0"
+  checksum: 10/0b46517ad47b00b6358fd6553c83ec1f6ba9acd7ffb3d30a0bf519c5c69e7147c132430452351b8a9fc198f8dd6c4f76f8e6f5a7f100f8c77d57d9e0f4261a8a
+  languageName: node
+  linkType: hard
+
 "is-promise@npm:^2.1.0":
   version: 2.2.2
   resolution: "is-promise@npm:2.2.2"
@@ -24910,13 +25410,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-redirect@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "is-redirect@npm:1.0.0"
-  checksum: 10/25dd3d9943f57ef0f29d28e2d9deda8288e0c7098ddc65abec3364ced9a6491ea06cfaf5110c61fc40ec1fde706b73cee5d171f85278edbf4e409b85725bfea7
-  languageName: node
-  linkType: hard
-
 "is-regex@npm:^1.1.4":
   version: 1.1.4
   resolution: "is-regex@npm:1.1.4"
@@ -24927,10 +25420,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-regexp@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "is-regexp@npm:2.1.0"
-  checksum: 10/919a5a838bfa5e193770f2fbb054a6899ee1ad2ba598b74e2d328570a22c1b0a677d4338518b8a74c3f46881a37bb7e23767a6f44495803cbaf828a5b9c44e05
+"is-regexp@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "is-regexp@npm:1.0.0"
+  checksum: 10/be692828e24cba479ec33644326fa98959ec68ba77965e0291088c1a741feaea4919d79f8031708f85fd25e39de002b4520622b55460660b9c369e6f7187faef
   languageName: node
   linkType: hard
 
@@ -24948,10 +25441,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-set@npm:^2.0.1, is-set@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "is-set@npm:2.0.2"
-  checksum: 10/d89e82acdc7760993474f529e043f9c4a1d63ed4774d21cc2e331d0e401e5c91c27743cd7c889137028f6a742234759a4bd602368fbdbf0b0321994aefd5603f
+"is-set@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "is-set@npm:2.0.3"
+  checksum: 10/5685df33f0a4a6098a98c72d94d67cad81b2bc72f1fb2091f3d9283c4a1c582123cd709145b02a9745f0ce6b41e3e43f1c944496d1d74d4ea43358be61308669
   languageName: node
   linkType: hard
 
@@ -24971,7 +25464,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-stream@npm:^2.0.0":
+"is-stream@npm:^2, is-stream@npm:^2.0.0, is-stream@npm:^2.0.1":
   version: 2.0.1
   resolution: "is-stream@npm:2.0.1"
   checksum: 10/b8e05ccdf96ac330ea83c12450304d4a591f9958c11fd17bed240af8d5ffe08aedafa4c0f4cfccd4d28dc9d4d129daca1023633d5c11601a6cbc77521f6fae66
@@ -24996,7 +25489,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-svg@npm:^4.2.1, is-svg@npm:^4.3.2":
+"is-supported-regexp-flag@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "is-supported-regexp-flag@npm:1.0.1"
+  checksum: 10/b14f219ec11d246e41b249bbff17b29f85d274215b7ce8fb695789aa9ba877e761f6cee8d839d6270d38a60873450e1137d5eb24e4c45a61532b2ea4f417584f
+  languageName: node
+  linkType: hard
+
+"is-svg@npm:^4.2.1":
   version: 4.3.2
   resolution: "is-svg@npm:4.3.2"
   dependencies:
@@ -25005,6 +25505,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-svg@npm:^4.4.0":
+  version: 4.4.0
+  resolution: "is-svg@npm:4.4.0"
+  dependencies:
+    fast-xml-parser: "npm:^4.1.3"
+  checksum: 10/cd5a0ba1af653e4897721913b0b80de968fa5b19eb1a592412f4672d3a1203935d183c2a9dbf61d68023739ee43d3761ea795ae1a9f618c6098a9e89eacdd256
+  languageName: node
+  linkType: hard
+
 "is-symbol@npm:^1.0.2, is-symbol@npm:^1.0.3":
   version: 1.0.4
   resolution: "is-symbol@npm:1.0.4"
@@ -25037,24 +25546,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-url-superb@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "is-url-superb@npm:4.0.0"
-  checksum: 10/fd55e91c96349acb0d688f95fcb1ac67450e5db934976e3a8ff13ef446841e779a6f4d18b15f02331f05a3429c8fdaba2382ac1ab444059e86e9ffcde1ec8db0
-  languageName: node
-  linkType: hard
-
-"is-url@npm:^1.1.0, is-url@npm:^1.2.4":
+"is-url@npm:^1.2.4":
   version: 1.2.4
   resolution: "is-url@npm:1.2.4"
   checksum: 10/100e74b3b1feab87a43ef7653736e88d997eb7bd32e71fd3ebc413e58c1cbe56269699c776aaea84244b0567f2a7d68dfaa512a062293ed2f9fdecb394148432
   languageName: node
   linkType: hard
 
-"is-weakmap@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "is-weakmap@npm:2.0.1"
-  checksum: 10/289fa4e8ba1bdda40ca78481266f6925b7c46a85599e6a41a77010bf91e5a24dfb660db96863bbf655ecdbda0ab517204d6a4e0c151dbec9d022c556321f3776
+"is-weakmap@npm:^2.0.2":
+  version: 2.0.2
+  resolution: "is-weakmap@npm:2.0.2"
+  checksum: 10/a7b7e23206c542dcf2fa0abc483142731788771527e90e7e24f658c0833a0d91948a4f7b30d78f7a65255a48512e41a0288b778ba7fc396137515c12e201fd11
   languageName: node
   linkType: hard
 
@@ -25067,20 +25569,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-weakset@npm:^2.0.1":
-  version: 2.0.2
-  resolution: "is-weakset@npm:2.0.2"
+"is-weakset@npm:^2.0.3":
+  version: 2.0.3
+  resolution: "is-weakset@npm:2.0.3"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    get-intrinsic: "npm:^1.1.1"
-  checksum: 10/8f2ddb9639716fd7936784e175ea1183c5c4c05274c34f34f6a53175313cb1c9c35a8b795623306995e2f7cc8f25aa46302f15a2113e51c5052d447be427195c
+    call-bind: "npm:^1.0.7"
+    get-intrinsic: "npm:^1.2.4"
+  checksum: 10/40159582ff1b44fc40085f631baf19f56479b05af2faede65b4e6a0b6acab745c13fd070e35b475aafd8a1ee50879ba5a3f1265125b46bebdb446b6be1f62165
   languageName: node
   linkType: hard
 
-"is-what@npm:^4.1.8":
-  version: 4.1.8
-  resolution: "is-what@npm:4.1.8"
-  checksum: 10/943eca6c1e64df487060857a4b6ac2e584b99e633a96e64c82bd49584a85d91f6f3e22d4a2d28c1243522152b261f50021db40a5ef7d98c754ebc7209c87b071
+"is-whitespace-character@npm:^1.0.0":
+  version: 1.0.4
+  resolution: "is-whitespace-character@npm:1.0.4"
+  checksum: 10/adab8ad9847ccfcb6f1b7000b8f622881b5ba2a09ce8be2794a6d2b10c3af325b469fc562c9fb889f468eed27be06e227ac609d0aa1e3a59b4dbcc88e2b0418e
   languageName: node
   linkType: hard
 
@@ -25091,6 +25593,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-word-character@npm:^1.0.0":
+  version: 1.0.4
+  resolution: "is-word-character@npm:1.0.4"
+  checksum: 10/1821d6c6abe5bc0b3abe3fdc565d66d7c8a74ea4e93bc77b4a47d26e2e2a306d6ab7d92b353b0d2b182869e3ecaa8f4a346c62d0e31d38ebc0ceaf7cae182c3f
+  languageName: node
+  linkType: hard
+
 "is-wsl@npm:^2.2.0":
   version: 2.2.0
   resolution: "is-wsl@npm:2.2.0"
@@ -25116,7 +25625,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"isarray@npm:^1.0.0, isarray@npm:~1.0.0":
+"isarray@npm:1.0.0, isarray@npm:^1.0.0, isarray@npm:~1.0.0":
   version: 1.0.0
   resolution: "isarray@npm:1.0.0"
   checksum: 10/f032df8e02dce8ec565cf2eb605ea939bdccea528dbcf565cdf92bfa2da9110461159d86a537388ef1acef8815a330642d7885b29010e8f7eac967c9993b65ab
@@ -25144,7 +25653,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"isobject@npm:^3.0.1":
+"isexe@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "isexe@npm:3.1.1"
+  checksum: 10/7fe1931ee4e88eb5aa524cd3ceb8c882537bc3a81b02e438b240e47012eef49c86904d0f0e593ea7c3a9996d18d0f1f3be8d3eaa92333977b0c3a9d353d5563e
+  languageName: node
+  linkType: hard
+
+"isobject@npm:^2.0.0":
+  version: 2.1.0
+  resolution: "isobject@npm:2.1.0"
+  dependencies:
+    isarray: "npm:1.0.0"
+  checksum: 10/811c6f5a866877d31f0606a88af4a45f282544de886bf29f6a34c46616a1ae2ed17076cc6bf34c0128f33eecf7e1fcaa2c82cf3770560d3e26810894e96ae79f
+  languageName: node
+  linkType: hard
+
+"isobject@npm:^3.0.0, isobject@npm:^3.0.1":
   version: 3.0.1
   resolution: "isobject@npm:3.0.1"
   checksum: 10/db85c4c970ce30693676487cca0e61da2ca34e8d4967c2e1309143ff910c207133a969f9e4ddb2dc6aba670aabce4e0e307146c310350b298e74a31f7d464703
@@ -25342,33 +25867,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"iterate-iterator@npm:^1.0.1":
-  version: 1.0.2
-  resolution: "iterate-iterator@npm:1.0.2"
-  checksum: 10/3528a3668eb9c146bcda4f616166cfa8e49e01e8302ffcfc7b4c923f9862a20d9dc4e3336c8517695bea22036686fde98a43718718ce188d1fead4dc1603a94f
-  languageName: node
-  linkType: hard
-
-"iterate-value@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "iterate-value@npm:1.0.2"
-  dependencies:
-    es-get-iterator: "npm:^1.0.2"
-    iterate-iterator: "npm:^1.0.1"
-  checksum: 10/fc426ba672e8ef9bec471fb1990a0914c9c3640d64bfc365068ea17ec537388058942b896adc29c9151d8c99e745dcfe2c5e3161475c040d5228dd2c6856a24d
-  languageName: node
-  linkType: hard
-
-"iterator.prototype@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "iterator.prototype@npm:1.1.2"
+"iterator.prototype@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "iterator.prototype@npm:1.1.3"
   dependencies:
     define-properties: "npm:^1.2.1"
     get-intrinsic: "npm:^1.2.1"
     has-symbols: "npm:^1.0.3"
     reflect.getprototypeof: "npm:^1.0.4"
     set-function-name: "npm:^2.0.1"
-  checksum: 10/b5013967ad8f28c9ca1be8e159eb10f591b8e46deae87476fe39d668c04374fe9158c815e8b6d2f45885b0a3fd842a8ba13f497ec762b3a0eff49bec278670b1
+  checksum: 10/1a2a508d3baac121b76c834404ff552d1bb96a173b1d74ff947b2c5763840c0b1e5be01be7e2183a19b08e99e38729812668ff1f23b35f6655a366017bc32519
+  languageName: node
+  linkType: hard
+
+"jackspeak@npm:^3.1.2":
+  version: 3.4.3
+  resolution: "jackspeak@npm:3.4.3"
+  dependencies:
+    "@isaacs/cliui": "npm:^8.0.2"
+    "@pkgjs/parseargs": "npm:^0.11.0"
+  dependenciesMeta:
+    "@pkgjs/parseargs":
+      optional: true
+  checksum: 10/96f8786eaab98e4bf5b2a5d6d9588ea46c4d06bbc4f2eb861fdd7b6b182b16f71d8a70e79820f335d52653b16d4843b29dd9cdcf38ae80406756db9199497cf3
   languageName: node
   linkType: hard
 
@@ -25398,6 +25919,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jake@npm:^10.8.5":
+  version: 10.9.2
+  resolution: "jake@npm:10.9.2"
+  dependencies:
+    async: "npm:^3.2.3"
+    chalk: "npm:^4.0.2"
+    filelist: "npm:^1.0.4"
+    minimatch: "npm:^3.1.2"
+  bin:
+    jake: bin/cli.js
+  checksum: 10/3be324708f99f031e0aec49ef8fd872eb4583cbe8a29a0c875f554f6ac638ee4ea5aa759bb63723fd54f77ca6d7db851eaa78353301734ed3700db9cb109a0cd
+  languageName: node
+  linkType: hard
+
 "jay-peg@npm:^1.0.2":
   version: 1.1.0
   resolution: "jay-peg@npm:1.1.0"
@@ -25458,7 +25993,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest-cli@npm:^29.6.4, jest-cli@npm:^29.7.0":
+"jest-cli@npm:^29.7.0":
   version: 29.7.0
   resolution: "jest-cli@npm:29.7.0"
   dependencies:
@@ -25933,25 +26468,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jest@npm:~29.6.4":
-  version: 29.6.4
-  resolution: "jest@npm:29.6.4"
-  dependencies:
-    "@jest/core": "npm:^29.6.4"
-    "@jest/types": "npm:^29.6.3"
-    import-local: "npm:^3.0.2"
-    jest-cli: "npm:^29.6.4"
-  peerDependencies:
-    node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
-  peerDependenciesMeta:
-    node-notifier:
-      optional: true
-  bin:
-    jest: bin/jest.js
-  checksum: 10/d747e293bd63f583e7978ac0693ab7a019812fa44b9bf3b3fe20e75e8a343bcd8251d292326d73151dc0b8a2b5a974d878b3aa9ffb146dfa7980553f64a35b43
-  languageName: node
-  linkType: hard
-
 "jiti@npm:^1.20.0":
   version: 1.21.6
   resolution: "jiti@npm:1.21.6"
@@ -25975,20 +26491,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"joycon@npm:^3.0.1, joycon@npm:^3.1.1":
+"joycon@npm:^3.1.1":
   version: 3.1.1
   resolution: "joycon@npm:3.1.1"
   checksum: 10/4b36e3479144ec196425f46b3618f8a96ce7e1b658f091a309cd4906215f5b7a402d7df331a3e0a09681381a658d0c5f039cb3cf6907e0a1e17ed847f5d37775
   languageName: node
   linkType: hard
 
-"js-sha256@npm:^0.9.0":
-  version: 0.9.0
-  resolution: "js-sha256@npm:0.9.0"
-  checksum: 10/4dc16be74bf4e60d8ee2a482cc822c4d4f5cd060d9f92a060fe3ab1f143cd0946edda552cd274459251c279073df15872a5df47fc4bff054bbc3812e396e990b
-  languageName: node
-  linkType: hard
-
 "js-tokens@npm:^3.0.0 || ^4.0.0, js-tokens@npm:^4.0.0":
   version: 4.0.0
   resolution: "js-tokens@npm:4.0.0"
@@ -26007,7 +26516,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"js-yaml@npm:^3.13.0, js-yaml@npm:^3.13.1, js-yaml@npm:^3.2.7, js-yaml@npm:^3.6.1":
+"js-yaml@npm:^3.13.1, js-yaml@npm:^3.2.7, js-yaml@npm:^3.6.1":
   version: 3.14.1
   resolution: "js-yaml@npm:3.14.1"
   dependencies:
@@ -26033,10 +26542,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jschardet@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "jschardet@npm:3.0.0"
-  checksum: 10/b5a87e188beb4cda1d1c8a76a734017309c610caf17b4cb058c319d45f6179e247792393c34e597c311f04662f00b12784311804e4211e6da784b99e8e581814
+"jschardet@npm:^3.1.4":
+  version: 3.1.4
+  resolution: "jschardet@npm:3.1.4"
+  checksum: 10/6181afe289ab5a69ed3d9f0d2544002824781aa8dbd21f5cef633ff9b6910d159345f73aafed7926cf8ff887b2caa79f4c963f0eaf6f228864612580ea1b7df7
   languageName: node
   linkType: hard
 
@@ -26178,6 +26687,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"json-buffer@npm:3.0.1":
+  version: 3.0.1
+  resolution: "json-buffer@npm:3.0.1"
+  checksum: 10/82876154521b7b68ba71c4f969b91572d1beabadd87bd3a6b236f85fbc7dc4695089191ed60bb59f9340993c51b33d479f45b6ba9f3548beb519705281c32c3c
+  languageName: node
+  linkType: hard
+
 "json-parse-better-errors@npm:^1.0.1":
   version: 1.0.2
   resolution: "json-parse-better-errors@npm:1.0.2"
@@ -26246,14 +26762,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"json5@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "json5@npm:1.0.1"
+"json5@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "json5@npm:1.0.2"
   dependencies:
     minimist: "npm:^1.2.0"
   bin:
     json5: lib/cli.js
-  checksum: 10/ecb5ab4e233322169b0c4b29e698c116277c45654d3b70a707d00802042b536be54345ce664523bba83e5afedfeaf643539a7667144f99d6da1dcaaa02336d80
+  checksum: 10/a78d812dbbd5642c4f637dd130954acfd231b074965871c3e28a5bbd571f099d623ecf9161f1960c4ddf68e0cc98dee8bebfdb94a71ad4551f85a1afc94b63f6
   languageName: node
   linkType: hard
 
@@ -26360,7 +26876,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jsonwebtoken@npm:^9.0.0":
+"jsonwebtoken@npm:^9":
   version: 9.0.2
   resolution: "jsonwebtoken@npm:9.0.2"
   dependencies:
@@ -26409,18 +26925,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"juice@npm:^8.0.0":
-  version: 8.0.0
-  resolution: "juice@npm:8.0.0"
+"juice@npm:^8.1.0":
+  version: 8.1.0
+  resolution: "juice@npm:8.1.0"
   dependencies:
-    cheerio: "npm:^1.0.0-rc.3"
+    cheerio: "npm:1.0.0-rc.10"
     commander: "npm:^6.1.0"
     mensch: "npm:^0.3.4"
     slick: "npm:^1.12.2"
-    web-resource-inliner: "npm:^5.0.0"
+    web-resource-inliner: "npm:^6.0.1"
   bin:
     juice: bin/juice
-  checksum: 10/a28269f34912bd6acad49585cd5e2067e0f7cab47b37b98b559fe9bb115e5969ce5de59ecb5959e099a396788d0aa00a951e48cf0bfd54c4db2880a7e2d352a9
+  checksum: 10/595fa7e449a72335cb62170bf6ff7d54c52d3d966210ffb6c6dd210d70831a5c9c9798e1289b53ba303313e780685d3f9053c11013c6773e4c6fb9afec81d323
   languageName: node
   linkType: hard
 
@@ -26507,6 +27023,33 @@ __metadata:
   languageName: node
   linkType: hard
 
+"keyv@npm:^4.5.4":
+  version: 4.5.4
+  resolution: "keyv@npm:4.5.4"
+  dependencies:
+    json-buffer: "npm:3.0.1"
+  checksum: 10/167eb6ef64cc84b6fa0780ee50c9de456b422a1e18802209234f7c2cf7eae648c7741f32e50d7e24ccb22b24c13154070b01563d642755b156c357431a191e75
+  languageName: node
+  linkType: hard
+
+"kind-of@npm:^3.0.2, kind-of@npm:^3.0.3, kind-of@npm:^3.2.0":
+  version: 3.2.2
+  resolution: "kind-of@npm:3.2.2"
+  dependencies:
+    is-buffer: "npm:^1.1.5"
+  checksum: 10/b6e7eed10f9dea498500e73129c9bf289bc417568658648aecfc2e104aa32683b908e5d349563fc78d6752da0ea60c9ed1dda4b24dd85a0c8fc0c7376dc0acac
+  languageName: node
+  linkType: hard
+
+"kind-of@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "kind-of@npm:4.0.0"
+  dependencies:
+    is-buffer: "npm:^1.1.5"
+  checksum: 10/b35a90e0690f06bf07c8970b5290256b1740625fb3bf17ef8c9813a9e197302dbe9ad710b0d97a44556c9280becfc2132cbc3b370056f63b7e350a85f79088f1
+  languageName: node
+  linkType: hard
+
 "kind-of@npm:^6.0.2, kind-of@npm:^6.0.3":
   version: 6.0.3
   resolution: "kind-of@npm:6.0.3"
@@ -26528,10 +27071,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"known-css-properties@npm:^0.25.0":
-  version: 0.25.0
-  resolution: "known-css-properties@npm:0.25.0"
-  checksum: 10/fb3604e7c6f896a82fd8ba10ef1e9b720ed593d5381829acd6cf460b60743982285345ae68aa0526ffdfae743f2b579ac6bca0d79eb09c03a83b4e11f6976a48
+"known-css-properties@npm:^0.11.0":
+  version: 0.11.0
+  resolution: "known-css-properties@npm:0.11.0"
+  checksum: 10/31f11d1170352a8c9f37cd47644ac75ea5df6a7fceb52dd8ac84094b101664baaee9719372917e45cd07506e2deafbaaf54cdb58ee8fd60babbee9aec9d13c1b
+  languageName: node
+  linkType: hard
+
+"known-css-properties@npm:^0.34.0":
+  version: 0.34.0
+  resolution: "known-css-properties@npm:0.34.0"
+  checksum: 10/0e93e83f84537e89b9dc56c16aff511ed9f24128fe509c3f601ce495eb10bf6678e2f4ff521f6b53feabc7bd18088e43efb31aae4cb771da831ef1408c23211a
   languageName: node
   linkType: hard
 
@@ -26577,15 +27127,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"latest-version@npm:^3.0.0":
-  version: 3.1.0
-  resolution: "latest-version@npm:3.1.0"
-  dependencies:
-    package-json: "npm:^4.0.0"
-  checksum: 10/f2e7e4fb16ace74a9220c40d0476d04e72c208f6c91dd7f3b34cdd9fb9f4c39f8db452fe9270c8537afbf84626eff86a3fb8766d51332620b62ab6804fe03f7f
-  languageName: node
-  linkType: hard
-
 "launch-editor@npm:^2.6.1":
   version: 2.9.1
   resolution: "launch-editor@npm:2.9.1"
@@ -26651,7 +27192,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"leven@npm:2.1.0":
+"leven@npm:2.1.0, leven@npm:^2.1.0":
   version: 2.1.0
   resolution: "leven@npm:2.1.0"
   checksum: 10/f7b4a01b15c0ee2f92a04c0367ea025d10992b044df6f0d4ee1a845d4a488b343e99799e2f31212d72a2b1dea67124f57c1bb1b4561540df45190e44b5b8b394
@@ -26752,10 +27293,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lilconfig@npm:^2.0.5":
-  version: 2.0.5
-  resolution: "lilconfig@npm:2.0.5"
-  checksum: 10/a6e201bcb5b2f876cdd8b1cb7d20b126156aff976e29a184b62e6408e1c7da127603390543441fda8656a34d710113d74bb1551317e0cdc9dcb6e96dfbf6c525
+"lilconfig@npm:^2.0.6":
+  version: 2.1.0
+  resolution: "lilconfig@npm:2.1.0"
+  checksum: 10/b1314a2e55319013d5e7d7d08be39015829d2764a1eaee130129545d40388499d81b1c31b0f9b3417d4db12775a88008b72ec33dd06e0184cf7503b32ca7cc0b
+  languageName: node
+  linkType: hard
+
+"lilconfig@npm:^3.1.1":
+  version: 3.1.2
+  resolution: "lilconfig@npm:3.1.2"
+  checksum: 10/8058403850cfad76d6041b23db23f730e52b6c17a8c28d87b90766639ca0ee40c748a3e85c2d7bd133d572efabff166c4b015e5d25e01fd666cb4b13cfada7f0
   languageName: node
   linkType: hard
 
@@ -26770,13 +27318,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"line-reader@npm:^0.2.4":
-  version: 0.2.4
-  resolution: "line-reader@npm:0.2.4"
-  checksum: 10/62ea55882df41938b5a5d93cfa4fdc06d263b206d7b97b0b9a1ddb10b0907debd36770931fd788c233ffcff724fd67ec15444f1f4c62e229fd8eb684991a6c62
-  languageName: node
-  linkType: hard
-
 "lines-and-columns@npm:^1.1.6":
   version: 1.2.4
   resolution: "lines-and-columns@npm:1.2.4"
@@ -26805,25 +27346,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"load-tsconfig@npm:^0.2.3":
-  version: 0.2.5
-  resolution: "load-tsconfig@npm:0.2.5"
-  checksum: 10/b3176f6f0c86dbdbbc7e337440a803b0b4407c55e2e1cfc53bd3db68e0211448f36428a6075ecf5e286db5d1bf791da756fc0ac4d2447717140fb6a5218ecfb4
-  languageName: node
-  linkType: hard
-
-"load-yaml-file@npm:^0.2.0":
-  version: 0.2.0
-  resolution: "load-yaml-file@npm:0.2.0"
-  dependencies:
-    graceful-fs: "npm:^4.1.5"
-    js-yaml: "npm:^3.13.0"
-    pify: "npm:^4.0.1"
-    strip-bom: "npm:^3.0.0"
-  checksum: 10/b1bfa7e80114933e43ccc1cf3772582b7e13c8a71dc8d560de2aeecdabf545014daf8a5afabe634c1e9f71c75f6f8528bbd944c9cbbbdf2ab8c927118bd48fd2
-  languageName: node
-  linkType: hard
-
 "loader-runner@npm:^4.2.0":
   version: 4.3.0
   resolution: "loader-runner@npm:4.3.0"
@@ -26851,6 +27373,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"locate-path@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "locate-path@npm:2.0.0"
+  dependencies:
+    p-locate: "npm:^2.0.0"
+    path-exists: "npm:^3.0.0"
+  checksum: 10/02d581edbbbb0fa292e28d96b7de36b5b62c2fa8b5a7e82638ebb33afa74284acf022d3b1e9ae10e3ffb7658fbc49163fcd5e76e7d1baaa7801c3e05a81da755
+  languageName: node
+  linkType: hard
+
 "locate-path@npm:^3.0.0":
   version: 3.0.0
   resolution: "locate-path@npm:3.0.0"
@@ -26909,20 +27441,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash.defaults@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "lodash.defaults@npm:4.2.0"
-  checksum: 10/6a2a9ea5ad7585aff8d76836c9e1db4528e5f5fa50fc4ad81183152ba8717d83aef8aec4fa88bf3417ed946fd4b4358f145ee08fbc77fb82736788714d3e12db
-  languageName: node
-  linkType: hard
-
-"lodash.difference@npm:^4.5.0":
-  version: 4.5.0
-  resolution: "lodash.difference@npm:4.5.0"
-  checksum: 10/b22adb1be9c60e5997b8b483f8bab19878cb40eda65437907958e5d27990214716e1b00ebe312a97f47e63d8b891e4ae30947d08e1f0861ccdb9462f56ab9d77
-  languageName: node
-  linkType: hard
-
 "lodash.escape@npm:^4.0.1":
   version: 4.0.1
   resolution: "lodash.escape@npm:4.0.1"
@@ -26930,13 +27448,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash.flatten@npm:^4.4.0":
-  version: 4.4.0
-  resolution: "lodash.flatten@npm:4.4.0"
-  checksum: 10/a2b192f220b0b6c78a6c0175e96bad888b9e0f2a887a8e8c1d0c29d03231fbf110bbb9be0d9de5f936537d143eeb9d5b4f44c4a44f5592c195bf2fae6a6b1e3a
-  languageName: node
-  linkType: hard
-
 "lodash.flattendeep@npm:^4.4.0":
   version: 4.4.0
   resolution: "lodash.flattendeep@npm:4.4.0"
@@ -26958,13 +27469,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash.invokemap@npm:^4.6.0":
-  version: 4.6.0
-  resolution: "lodash.invokemap@npm:4.6.0"
-  checksum: 10/70e629f78dc0e7aabfabf0ef575cc0b3d3b207699a5c91788bf5363d8f53764b80afd5c1985a98043ecc23095a145b271101626ed62dbb785ffcb22237b731c9
-  languageName: node
-  linkType: hard
-
 "lodash.isboolean@npm:^3.0.3":
   version: 3.0.3
   resolution: "lodash.isboolean@npm:3.0.3"
@@ -27000,14 +27504,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash.isstring@npm:^4.0.1":
+"lodash.isstring@npm:^4, lodash.isstring@npm:^4.0.1":
   version: 4.0.1
   resolution: "lodash.isstring@npm:4.0.1"
   checksum: 10/eaac87ae9636848af08021083d796e2eea3d02e80082ab8a9955309569cb3a463ce97fd281d7dc119e402b2e7d8c54a23914b15d2fc7fff56461511dc8937ba0
   languageName: node
   linkType: hard
 
-"lodash.memoize@npm:4.x, lodash.memoize@npm:^4.1.2":
+"lodash.memoize@npm:^4.1.2":
   version: 4.1.2
   resolution: "lodash.memoize@npm:4.1.2"
   checksum: 10/192b2168f310c86f303580b53acf81ab029761b9bd9caa9506a019ffea5f3363ea98d7e39e7e11e6b9917066c9d36a09a11f6fe16f812326390d8f3a54a1a6da
@@ -27035,20 +27539,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash.pullall@npm:^4.2.0":
-  version: 4.2.0
-  resolution: "lodash.pullall@npm:4.2.0"
-  checksum: 10/ec2aa1a1eea37226ef7b69041779221ef6fdc6472589dd4d89cec2a0f3d067301a0274abc6a0522797f9958497c79d8bc754825f23ea21e0e053ef8bdfe742ad
-  languageName: node
-  linkType: hard
-
-"lodash.sortby@npm:^4.7.0":
-  version: 4.7.0
-  resolution: "lodash.sortby@npm:4.7.0"
-  checksum: 10/38df19ae28608af2c50ac342fc1f414508309d53e1d58ed9adfb2c3cd17c3af290058c0a0478028d932c5404df3d53349d19fa364ef6bed6145a6bc21320399e
-  languageName: node
-  linkType: hard
-
 "lodash.startcase@npm:^4.4.0":
   version: 4.4.0
   resolution: "lodash.startcase@npm:4.4.0"
@@ -27070,13 +27560,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash.union@npm:^4.6.0":
-  version: 4.6.0
-  resolution: "lodash.union@npm:4.6.0"
-  checksum: 10/175f5786efc527238c1350ce561c28e5ba527b5957605f9e5b8a804fce78801d09ced7b72de0302325e5b14c711f94690b1a733c13ad3674cc1a76e1172db1f8
-  languageName: node
-  linkType: hard
-
 "lodash.uniq@npm:^4.5.0":
   version: 4.5.0
   resolution: "lodash.uniq@npm:4.5.0"
@@ -27084,13 +27567,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash.uniqby@npm:^4.7.0":
-  version: 4.7.0
-  resolution: "lodash.uniqby@npm:4.7.0"
-  checksum: 10/256616bd1bd6be84d8a5eceb61338a0ab8d8b34314ba7bfd5f0de35227d0e2c1e659c61ff4ac31eba6a664085cc7e397bc34c3534fba208102db660a4f98f211
-  languageName: node
-  linkType: hard
-
 "lodash.without@npm:^4.4.0":
   version: 4.4.0
   resolution: "lodash.without@npm:4.4.0"
@@ -27115,6 +27591,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"log-symbols@npm:^2.0.0, log-symbols@npm:^2.2.0":
+  version: 2.2.0
+  resolution: "log-symbols@npm:2.2.0"
+  dependencies:
+    chalk: "npm:^2.0.1"
+  checksum: 10/4c95e3b65f0352dbe91dc4989c10baf7a44e2ef5b0db7e6721e1476268e2b6f7090c3aa880d4f833a05c5c3ff18f4ec5215a09bd0099986d64a8186cfeb48ac8
+  languageName: node
+  linkType: hard
+
 "logform@npm:^2.3.2":
   version: 2.4.0
   resolution: "logform@npm:2.4.0"
@@ -27163,7 +27648,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"longest-streak@npm:^2.0.0":
+"longest-streak@npm:^2.0.0, longest-streak@npm:^2.0.1":
   version: 2.0.4
   resolution: "longest-streak@npm:2.0.4"
   checksum: 10/28b8234a14963002c5c71035dee13a0a11e9e9d18ffa320fdc8796ed7437399204495702ed69cd2a7087b0af041a2a8b562829b7c1e2042e73a3374d1ecf6580
@@ -27192,6 +27677,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"loud-rejection@npm:^1.0.0":
+  version: 1.6.0
+  resolution: "loud-rejection@npm:1.6.0"
+  dependencies:
+    currently-unhandled: "npm:^0.4.1"
+    signal-exit: "npm:^3.0.0"
+  checksum: 10/750e12defde34e8cbf263c2bff16f028a89b56e022ad6b368aa7c39495b5ac33f2349a8d00665a9b6d25c030b376396524d8a31eb0dde98aaa97956d7324f927
+  languageName: node
+  linkType: hard
+
 "loupe@npm:^2.3.6":
   version: 2.3.7
   resolution: "loupe@npm:2.3.7"
@@ -27201,7 +27696,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"loupe@npm:^3.1.0, loupe@npm:^3.1.1":
+"loupe@npm:^3.1.0, loupe@npm:^3.1.1, loupe@npm:^3.1.2":
   version: 3.1.2
   resolution: "loupe@npm:3.1.2"
   checksum: 10/8f5734e53fb64cd914aa7d986e01b6d4c2e3c6c56dcbd5428d71c2703f0ab46b5ab9f9eeaaf2b485e8a1c43f865bdd16ec08ae1a661c8f55acdbd9f4d59c607a
@@ -27244,7 +27739,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lru-cache@npm:^10.0.1":
+"lru-cache@npm:^10.0.1, lru-cache@npm:^10.2.0":
   version: 10.4.3
   resolution: "lru-cache@npm:10.4.3"
   checksum: 10/e6e90267360476720fa8e83cc168aa2bf0311f3f2eea20a6ba78b90a885ae72071d9db132f40fda4129c803e7dcec3a6b6a6fbb44ca90b081630b810b5d6a41a
@@ -27258,7 +27753,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lru-cache@npm:^4.0.1, lru-cache@npm:^4.1.1":
+"lru-cache@npm:^4.0.1":
   version: 4.1.5
   resolution: "lru-cache@npm:4.1.5"
   dependencies:
@@ -27375,7 +27870,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"make-error@npm:1.x, make-error@npm:^1.1.1":
+"make-error@npm:^1.1.1, make-error@npm:^1.3.6":
   version: 1.3.6
   resolution: "make-error@npm:1.3.6"
   checksum: 10/b86e5e0e25f7f777b77fabd8e2cbf15737972869d852a22b7e73c17623928fccb826d8e46b9951501d3f20e51ad74ba8c59ed584f610526a48f8ccf88aaec402
@@ -27406,6 +27901,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"make-fetch-happen@npm:^13.0.0":
+  version: 13.0.1
+  resolution: "make-fetch-happen@npm:13.0.1"
+  dependencies:
+    "@npmcli/agent": "npm:^2.0.0"
+    cacache: "npm:^18.0.0"
+    http-cache-semantics: "npm:^4.1.1"
+    is-lambda: "npm:^1.0.1"
+    minipass: "npm:^7.0.2"
+    minipass-fetch: "npm:^3.0.0"
+    minipass-flush: "npm:^1.0.5"
+    minipass-pipeline: "npm:^1.2.4"
+    negotiator: "npm:^0.6.3"
+    proc-log: "npm:^4.2.0"
+    promise-retry: "npm:^2.0.1"
+    ssri: "npm:^10.0.0"
+  checksum: 10/11bae5ad6ac59b654dbd854f30782f9de052186c429dfce308eda42374528185a100ee40ac9ffdc36a2b6c821ecaba43913e4730a12f06f15e895ea9cb23fa59
+  languageName: node
+  linkType: hard
+
 "makeerror@npm:1.0.12":
   version: 1.0.12
   resolution: "makeerror@npm:1.0.12"
@@ -27415,7 +27930,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"map-age-cleaner@npm:^0.1.1, map-age-cleaner@npm:^0.1.3":
+"map-age-cleaner@npm:^0.1.3":
   version: 0.1.3
   resolution: "map-age-cleaner@npm:0.1.3"
   dependencies:
@@ -27433,6 +27948,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"map-cache@npm:^0.2.2":
+  version: 0.2.2
+  resolution: "map-cache@npm:0.2.2"
+  checksum: 10/3067cea54285c43848bb4539f978a15dedc63c03022abeec6ef05c8cb6829f920f13b94bcaf04142fc6a088318e564c4785704072910d120d55dbc2e0c421969
+  languageName: node
+  linkType: hard
+
 "map-obj@npm:^1.0.0":
   version: 1.0.1
   resolution: "map-obj@npm:1.0.1"
@@ -27440,7 +27962,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"map-obj@npm:^4.0.0, map-obj@npm:^4.1.0":
+"map-obj@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "map-obj@npm:2.0.0"
+  checksum: 10/77d2b7b03398a71c84bd7df8ab7be2139e5459fc1e18dbb5f15055fe7284bec0fc37fe410185b5f8ca2e3c3e01fd0fd1f946c579607878adb26cad1cd75314aa
+  languageName: node
+  linkType: hard
+
+"map-obj@npm:^4.1.0":
   version: 4.3.0
   resolution: "map-obj@npm:4.3.0"
   checksum: 10/fbc554934d1a27a1910e842bc87b177b1a556609dd803747c85ece420692380827c6ae94a95cce4407c054fa0964be3bf8226f7f2cb2e9eeee432c7c1985684e
@@ -27461,6 +27990,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"map-visit@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "map-visit@npm:1.0.0"
+  dependencies:
+    object-visit: "npm:^1.0.0"
+  checksum: 10/c27045a5021c344fc19b9132eb30313e441863b2951029f8f8b66f79d3d8c1e7e5091578075a996f74e417479506fe9ede28c44ca7bc351a61c9d8073daec36a
+  languageName: node
+  linkType: hard
+
+"markdown-escapes@npm:^1.0.0":
+  version: 1.0.4
+  resolution: "markdown-escapes@npm:1.0.4"
+  checksum: 10/6833a93d72d3f70a500658872312c6fa8015c20cc835a85ae6901fa232683fbc6ed7118ebe920fea7c80039a560f339c026597d96eee0e9de602a36921804997
+  languageName: node
+  linkType: hard
+
 "markdown-it@npm:^14.1.0":
   version: 14.1.0
   resolution: "markdown-it@npm:14.1.0"
@@ -27477,16 +28022,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"markdown-to-jsx@npm:^7.4.5":
-  version: 7.5.0
-  resolution: "markdown-to-jsx@npm:7.5.0"
-  peerDependencies:
-    react: ">= 0.14.0"
-  checksum: 10/b1fbe4429b968aefe02d4549eebb8d7456ccd7a8417805bb7f4bde1b466bdd0c81df3b14c5a1d9dcc49c6451ae50cf23cd04228fb6a0e1f8579ad0b76adae044
+"markdown-table@npm:^1.1.0":
+  version: 1.1.3
+  resolution: "markdown-table@npm:1.1.3"
+  checksum: 10/ca94e8a84c467f9da963d1888aa298939f137d792b39259bf971d01d6fb534e02c0435e10dcccdc0b11d9e29bf6eb7dffacb007b07e3038b68b2e6eb02990fb1
   languageName: node
   linkType: hard
 
-"marked@npm:^4.2.5, marked@npm:^4.3.0":
+"marked@npm:^4.3.0":
   version: 4.3.0
   resolution: "marked@npm:4.3.0"
   bin:
@@ -27504,7 +28047,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mathml-tag-names@npm:^2.1.3":
+"mathml-tag-names@npm:^2.0.1, mathml-tag-names@npm:^2.1.3":
   version: 2.1.3
   resolution: "mathml-tag-names@npm:2.1.3"
   checksum: 10/1201a25a137d6b9e328facd67912058b8b45b19a6c4cc62641c9476195da28a275ca6e0eca070af5378b905c2b11abc1114676ba703411db0b9ce007de921ad0
@@ -27573,6 +28116,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"mdast-util-compact@npm:^1.0.0":
+  version: 1.0.4
+  resolution: "mdast-util-compact@npm:1.0.4"
+  dependencies:
+    unist-util-visit: "npm:^1.1.0"
+  checksum: 10/e26f584e214023ae471f5fafcd95bebb9a187660dd7fd86f3e3a71bf883e0ec0d209109aee53173856aa3f20fe4f1fa9f84ce698c0a0489c71e011d37b199cca
+  languageName: node
+  linkType: hard
+
 "mdast-util-from-markdown@npm:^0.8.0":
   version: 0.8.5
   resolution: "mdast-util-from-markdown@npm:0.8.5"
@@ -27621,6 +28173,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"mdn-data@npm:2.12.1":
+  version: 2.12.1
+  resolution: "mdn-data@npm:2.12.1"
+  checksum: 10/7928cfc828b0ebbde84ce56be2e3aa729c1770bfbc83ef1dadf5f98346ab003ca0a1b3339076115d77acf623719efa3f9f2be8c69f73c453fe887cb982bfa625
+  languageName: node
+  linkType: hard
+
 "mdurl@npm:^2.0.0":
   version: 2.0.0
   resolution: "mdurl@npm:2.0.0"
@@ -27642,24 +28201,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mem@npm:^4.0.0":
-  version: 4.3.0
-  resolution: "mem@npm:4.3.0"
-  dependencies:
-    map-age-cleaner: "npm:^0.1.1"
-    mimic-fn: "npm:^2.0.0"
-    p-is-promise: "npm:^2.0.0"
-  checksum: 10/ae4afa1cac2b4d64e089ecd54e06ae857b6e5aae410802564032cb407aad13aa598c5aededae8cca6c5827f4057ec3f58415a078c80181dd08019ae1a9aa1226
-  languageName: node
-  linkType: hard
-
-"mem@npm:^6.1.1":
-  version: 6.1.1
-  resolution: "mem@npm:6.1.1"
-  dependencies:
-    map-age-cleaner: "npm:^0.1.3"
-    mimic-fn: "npm:^3.0.0"
-  checksum: 10/1715876faa47907683baffa55eb302eb254fad3e3fdd1716535108c434498cb0d15dbb4261c29f28e8a712ac3568b70c0849048a5d113da57536e1508410422f
+"media-typer@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "media-typer@npm:1.1.0"
+  checksum: 10/a58dd60804df73c672942a7253ccc06815612326dc1c0827984b1a21704466d7cde351394f47649e56cf7415e6ee2e26e000e81b51b3eebb5a93540e8bf93cbd
   languageName: node
   linkType: hard
 
@@ -27751,49 +28296,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"meow@npm:^6.0.0":
-  version: 6.1.1
-  resolution: "meow@npm:6.1.1"
-  dependencies:
-    "@types/minimist": "npm:^1.2.0"
-    camelcase-keys: "npm:^6.2.2"
-    decamelize-keys: "npm:^1.1.0"
-    hard-rejection: "npm:^2.1.0"
-    minimist-options: "npm:^4.0.2"
-    normalize-package-data: "npm:^2.5.0"
-    read-pkg-up: "npm:^7.0.1"
-    redent: "npm:^3.0.0"
-    trim-newlines: "npm:^3.0.0"
-    type-fest: "npm:^0.13.1"
-    yargs-parser: "npm:^18.1.3"
-  checksum: 10/507ea2e7d61f6afe17e8f57323e190ddc8bd4ad0921db75920cf9d6f0f686828d3fe3b18a0a09ee6a5c27e070a3ca69133a7a095e57703b2e8d46eb56ee7d66f
+"meow@npm:^13.2.0":
+  version: 13.2.0
+  resolution: "meow@npm:13.2.0"
+  checksum: 10/4eff5bc921fed0b8a471ad79069d741a0210036d717547d0c7f36fdaf84ef7a3036225f38b6a53830d84dc9cbf8b944b097fde62381b8b5b215119e735ce1063
   languageName: node
   linkType: hard
 
-"meow@npm:^9.0.0":
-  version: 9.0.0
-  resolution: "meow@npm:9.0.0"
+"meow@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "meow@npm:5.0.0"
   dependencies:
-    "@types/minimist": "npm:^1.2.0"
-    camelcase-keys: "npm:^6.2.2"
-    decamelize: "npm:^1.2.0"
-    decamelize-keys: "npm:^1.1.0"
-    hard-rejection: "npm:^2.1.0"
-    minimist-options: "npm:4.1.0"
-    normalize-package-data: "npm:^3.0.0"
-    read-pkg-up: "npm:^7.0.1"
-    redent: "npm:^3.0.0"
-    trim-newlines: "npm:^3.0.0"
-    type-fest: "npm:^0.18.0"
-    yargs-parser: "npm:^20.2.3"
-  checksum: 10/3d0f199b9ccd81856a112f651290676f6816833626df53cee72b8e2c9acbd95beea4fa1f9fa729a553b5a0e74b18954f9fbc74c3ab837b3fc44e57de98f6c18f
-  languageName: node
-  linkType: hard
-
-"merge-descriptors@npm:1.0.1":
-  version: 1.0.1
-  resolution: "merge-descriptors@npm:1.0.1"
-  checksum: 10/5abc259d2ae25bb06d19ce2b94a21632583c74e2a9109ee1ba7fd147aa7362b380d971e0251069f8b3eb7d48c21ac839e21fa177b335e82c76ec172e30c31a26
+    camelcase-keys: "npm:^4.0.0"
+    decamelize-keys: "npm:^1.0.0"
+    loud-rejection: "npm:^1.0.0"
+    minimist-options: "npm:^3.0.1"
+    normalize-package-data: "npm:^2.3.4"
+    read-pkg-up: "npm:^3.0.0"
+    redent: "npm:^2.0.0"
+    trim-newlines: "npm:^2.0.0"
+    yargs-parser: "npm:^10.0.0"
+  checksum: 10/921efd57a9155fa1cd8d431f9642aebd1aa342921e1d9bbf45baa7f1f6328c73ece1c1063443f003e512e91b2d48a2ef50672e5394436aa2cbce02c620d25edd
   languageName: node
   linkType: hard
 
@@ -27804,6 +28327,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"merge-descriptors@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "merge-descriptors@npm:2.0.0"
+  checksum: 10/e383332e700a94682d0125a36c8be761142a1320fc9feeb18e6e36647c9edf064271645f5669b2c21cf352116e561914fd8aa831b651f34db15ef4038c86696a
+  languageName: node
+  linkType: hard
+
 "merge-source-map@npm:^1.1.0":
   version: 1.1.0
   resolution: "merge-source-map@npm:1.1.0"
@@ -27834,9 +28364,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"meteor-node-stubs@npm:^1.2.10":
-  version: 1.2.10
-  resolution: "meteor-node-stubs@npm:1.2.10"
+"meteor-node-stubs@npm:^1.2.12":
+  version: 1.2.12
+  resolution: "meteor-node-stubs@npm:1.2.12"
   dependencies:
     "@meteorjs/crypto-browserify": "npm:^3.12.1"
     assert: "npm:^2.1.0"
@@ -27845,7 +28375,7 @@ __metadata:
     console-browserify: "npm:^1.2.0"
     constants-browserify: "npm:^1.0.0"
     domain-browser: "npm:^4.23.0"
-    elliptic: "npm:^6.5.7"
+    elliptic: "npm:^6.6.0"
     events: "npm:^3.3.0"
     https-browserify: "npm:^1.0.0"
     os-browserify: "npm:^0.3.0"
@@ -27862,7 +28392,7 @@ __metadata:
     url: "npm:^0.11.4"
     util: "npm:^0.12.5"
     vm-browserify: "npm:^1.1.2"
-  checksum: 10/60191ec8e16ab21fcd8191d8c419412e6db5746ed8db1cf5636c401c28cb53495f6d217f61bcdb783da9d5fa171d35d4719d4a0c0948dcf03a1e155d4d9daa1a
+  checksum: 10/d42a26894b15a306979f1afee9ab27ff66027e2ac2e236c348c9f3ca8f537c63bcad49a2efe3cfe57162ff6b93b07bb786174777868e2370b1073720f5e5f49d
   languageName: node
   linkType: hard
 
@@ -27890,6 +28420,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"micromatch@npm:^3.1.10":
+  version: 3.1.10
+  resolution: "micromatch@npm:3.1.10"
+  dependencies:
+    arr-diff: "npm:^4.0.0"
+    array-unique: "npm:^0.3.2"
+    braces: "npm:^2.3.1"
+    define-property: "npm:^2.0.2"
+    extend-shallow: "npm:^3.0.2"
+    extglob: "npm:^2.0.4"
+    fragment-cache: "npm:^0.2.1"
+    kind-of: "npm:^6.0.2"
+    nanomatch: "npm:^1.2.9"
+    object.pick: "npm:^1.3.0"
+    regex-not: "npm:^1.0.0"
+    snapdragon: "npm:^0.8.1"
+    to-regex: "npm:^3.0.2"
+  checksum: 10/4102bac83685dc7882ca1a28443d158b464653f84450de68c07cf77dbd531ed98c25006e9d9f6082bf3b95aabbff4cf231b26fd3bc84f7c4e7f263376101fad6
+  languageName: node
+  linkType: hard
+
 "micromatch@npm:^4.0.0, micromatch@npm:^4.0.2, micromatch@npm:^4.0.4, micromatch@npm:^4.0.5":
   version: 4.0.5
   resolution: "micromatch@npm:4.0.5"
@@ -27900,6 +28451,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"micromatch@npm:^4.0.8":
+  version: 4.0.8
+  resolution: "micromatch@npm:4.0.8"
+  dependencies:
+    braces: "npm:^3.0.3"
+    picomatch: "npm:^2.3.1"
+  checksum: 10/6bf2a01672e7965eb9941d1f02044fad2bd12486b5553dc1116ff24c09a8723157601dc992e74c911d896175918448762df3b3fd0a6b61037dd1a9766ddfbf58
+  languageName: node
+  linkType: hard
+
 "miller-rabin@npm:^4.0.0":
   version: 4.0.1
   resolution: "miller-rabin@npm:4.0.1"
@@ -27919,10 +28480,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mime-db@npm:~1.33.0":
-  version: 1.33.0
-  resolution: "mime-db@npm:1.33.0"
-  checksum: 10/b3b89cff1d3569d02280f8d5b3b6e3c6df4dd340647b48228b2624293a73da0a7c784712aec8eac0aaccd353ac04b4d50309ab9f6a87d7ee79b4dca0ebb70ed8
+"mime-db@npm:^1.53.0":
+  version: 1.53.0
+  resolution: "mime-db@npm:1.53.0"
+  checksum: 10/82409c568a20254cc67a763a25e581d2213e1ef5d070a0af805239634f8a655f5d8a15138200f5f81c5b06fc6623d27f6168c612d447642d59e37eb7f20f7412
   languageName: node
   linkType: hard
 
@@ -27937,16 +28498,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mime-types@npm:2.1.18":
-  version: 2.1.18
-  resolution: "mime-types@npm:2.1.18"
-  dependencies:
-    mime-db: "npm:~1.33.0"
-  checksum: 10/65d69085abda6732d4372e9874018fbe491894ff25f7329b8c8815fe40989599488567e08dcee39f1bb54729c4311fb660195ab551603d1cb97d7f2bf33ca8a2
-  languageName: node
-  linkType: hard
-
-"mime-types@npm:^2.0.8, mime-types@npm:^2.1.12, mime-types@npm:^2.1.27, mime-types@npm:^2.1.31, mime-types@npm:~2.1.17, mime-types@npm:~2.1.19, mime-types@npm:~2.1.24, mime-types@npm:~2.1.34":
+"mime-types@npm:^2.0.8, mime-types@npm:^2.1.12, mime-types@npm:^2.1.27, mime-types@npm:^2.1.31, mime-types@npm:^2.1.35, mime-types@npm:~2.1.17, mime-types@npm:~2.1.19, mime-types@npm:~2.1.24, mime-types@npm:~2.1.34":
   version: 2.1.35
   resolution: "mime-types@npm:2.1.35"
   dependencies:
@@ -27955,6 +28507,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"mime-types@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "mime-types@npm:3.0.0"
+  dependencies:
+    mime-db: "npm:^1.53.0"
+  checksum: 10/819584a951124b1cdee21e0c5515d174e1df018407b837297cef0da0620e4c0551336909fc3704166fca3a3fc141d19976bcc34e94eb720af04bbf4b50b43545
+  languageName: node
+  linkType: hard
+
 "mime@npm:1.6.0, mime@npm:^1.3.4":
   version: 1.6.0
   resolution: "mime@npm:1.6.0"
@@ -27991,21 +28552,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mimic-fn@npm:^1.0.0":
-  version: 1.2.0
-  resolution: "mimic-fn@npm:1.2.0"
-  checksum: 10/69c08205156a1f4906d9c46f9b4dc08d18a50176352e77fdeb645cedfe9f20c0b19865d465bd2dec27a5c432347f24dc07fc3695e11159d193f892834233e939
-  languageName: node
-  linkType: hard
-
-"mimic-fn@npm:^2.0.0, mimic-fn@npm:^2.1.0":
+"mimic-fn@npm:^2.1.0":
   version: 2.1.0
   resolution: "mimic-fn@npm:2.1.0"
   checksum: 10/d2421a3444848ce7f84bd49115ddacff29c15745db73f54041edc906c14b131a38d05298dae3081667627a59b2eb1ca4b436ff2e1b80f69679522410418b478a
   languageName: node
   linkType: hard
 
-"mimic-fn@npm:^3.0.0, mimic-fn@npm:^3.1.0":
+"mimic-fn@npm:^3.1.0":
   version: 3.1.0
   resolution: "mimic-fn@npm:3.1.0"
   checksum: 10/f7b167f9115b8bbdf2c3ee55dce9149d14be9e54b237259c4bc1d8d0512ea60f25a1b323f814eb1fe8f5a541662804bcfcfff3202ca58df143edb986849d58db
@@ -28060,15 +28614,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minimatch@npm:3.0.4":
-  version: 3.0.4
-  resolution: "minimatch@npm:3.0.4"
-  dependencies:
-    brace-expansion: "npm:^1.1.7"
-  checksum: 10/3b3f17f76582417dd139646505f1d1bb5f148ea5191eb98fe73cd41224a678dadb94cc674c7d06b36de4ab5c303f039cfd7cd2d089348d6f70d04db169cf3770
-  languageName: node
-  linkType: hard
-
 "minimatch@npm:4.2.1":
   version: 4.2.1
   resolution: "minimatch@npm:4.2.1"
@@ -28096,6 +28641,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"minimatch@npm:^5.0.1":
+  version: 5.1.6
+  resolution: "minimatch@npm:5.1.6"
+  dependencies:
+    brace-expansion: "npm:^2.0.1"
+  checksum: 10/126b36485b821daf96d33b5c821dac600cc1ab36c87e7a532594f9b1652b1fa89a1eebcaad4dff17c764dce1a7ac1531327f190fed5f97d8f6e5f889c116c429
+  languageName: node
+  linkType: hard
+
 "minimatch@npm:^5.1.0":
   version: 5.1.0
   resolution: "minimatch@npm:5.1.0"
@@ -28105,12 +28659,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minimatch@npm:^9.0.0":
-  version: 9.0.3
-  resolution: "minimatch@npm:9.0.3"
+"minimatch@npm:^9.0.0, minimatch@npm:^9.0.4":
+  version: 9.0.5
+  resolution: "minimatch@npm:9.0.5"
   dependencies:
     brace-expansion: "npm:^2.0.1"
-  checksum: 10/c81b47d28153e77521877649f4bab48348d10938df9e8147a58111fe00ef89559a2938de9f6632910c4f7bf7bb5cd81191a546167e58d357f0cfb1e18cecc1c5
+  checksum: 10/dd6a8927b063aca6d910b119e1f2df6d2ce7d36eab91de83167dd136bb85e1ebff97b0d3de1cb08bd1f7e018ca170b4962479fefab5b2a69e2ae12cb2edc8348
   languageName: node
   linkType: hard
 
@@ -28123,7 +28677,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minimist-options@npm:4.1.0, minimist-options@npm:^4.0.2":
+"minimist-options@npm:4.1.0":
   version: 4.1.0
   resolution: "minimist-options@npm:4.1.0"
   dependencies:
@@ -28134,6 +28688,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"minimist-options@npm:^3.0.1":
+  version: 3.0.2
+  resolution: "minimist-options@npm:3.0.2"
+  dependencies:
+    arrify: "npm:^1.0.1"
+    is-plain-obj: "npm:^1.1.0"
+  checksum: 10/f111ff4a3371312f3827bc5a519d757bd5bd8406599193b6cd32b8137eeaee74dd8f1896b66778ac26069ecbaee0659dd0ca4b65c6ec9d0683b09a9573e4f389
+  languageName: node
+  linkType: hard
+
 "minimist@npm:1.2.6":
   version: 1.2.6
   resolution: "minimist@npm:1.2.6"
@@ -28150,6 +28714,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"minipass-collect@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "minipass-collect@npm:2.0.1"
+  dependencies:
+    minipass: "npm:^7.0.3"
+  checksum: 10/b251bceea62090f67a6cced7a446a36f4cd61ee2d5cea9aee7fff79ba8030e416327a1c5aa2908dc22629d06214b46d88fdab8c51ac76bacbf5703851b5ad342
+  languageName: node
+  linkType: hard
+
 "minipass-fetch@npm:^2.0.3":
   version: 2.1.0
   resolution: "minipass-fetch@npm:2.1.0"
@@ -28165,6 +28738,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"minipass-fetch@npm:^3.0.0":
+  version: 3.0.5
+  resolution: "minipass-fetch@npm:3.0.5"
+  dependencies:
+    encoding: "npm:^0.1.13"
+    minipass: "npm:^7.0.3"
+    minipass-sized: "npm:^1.0.3"
+    minizlib: "npm:^2.1.2"
+  dependenciesMeta:
+    encoding:
+      optional: true
+  checksum: 10/c669948bec1373313aaa8f104b962a3ced9f45c49b26366a4b0ae27ccdfa9c5740d72c8a84d3f8623d7a61c5fc7afdfda44789008c078f61a62441142efc4a97
+  languageName: node
+  linkType: hard
+
 "minipass-flush@npm:^1.0.5":
   version: 1.0.5
   resolution: "minipass-flush@npm:1.0.5"
@@ -28201,7 +28789,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minipass@npm:^7.1.2":
+"minipass@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "minipass@npm:5.0.0"
+  checksum: 10/61682162d29f45d3152b78b08bab7fb32ca10899bc5991ffe98afc18c9e9543bd1e3be94f8b8373ba6262497db63607079dc242ea62e43e7b2270837b7347c93
+  languageName: node
+  linkType: hard
+
+"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3, minipass@npm:^7.1.2":
   version: 7.1.2
   resolution: "minipass@npm:7.1.2"
   checksum: 10/c25f0ee8196d8e6036661104bacd743785b2599a21de5c516b32b3fa2b83113ac89a2358465bc04956baab37ffb956ae43be679b2262bf7be15fce467ccd7950
@@ -28218,17 +28813,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mitt@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "mitt@npm:2.1.0"
-  checksum: 10/d4087f8678ef9de18af10171ed39c14fc9282532f9104b522265e4a206f81630767bce5e3ae2405e9d863d7f6a7f3095f738c33c55c06872ed25978f1c8ea9f3
-  languageName: node
-  linkType: hard
-
-"mixme@npm:^0.5.1":
-  version: 0.5.9
-  resolution: "mixme@npm:0.5.9"
-  checksum: 10/6c5712074130d8dbcc7678c42d9cbea4d30f7574bb62a29084cc01dcf45d3f5140bcaa5a27502cde3ee97b3cd24c52420f8416067eac8dec0bb58d563c47e421
+"mixin-deep@npm:^1.2.0":
+  version: 1.3.2
+  resolution: "mixin-deep@npm:1.3.2"
+  dependencies:
+    for-in: "npm:^1.0.2"
+    is-extendable: "npm:^1.0.1"
+  checksum: 10/820d5a51fcb7479f2926b97f2c3bb223546bc915e6b3a3eb5d906dda871bba569863595424a76682f2b15718252954644f3891437cb7e3f220949bed54b1750d
   languageName: node
   linkType: hard
 
@@ -28349,9 +28940,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"moleculer@npm:0.14.34":
-  version: 0.14.34
-  resolution: "moleculer@npm:0.14.34"
+"moleculer@npm:^0.14.35":
+  version: 0.14.35
+  resolution: "moleculer@npm:0.14.35"
   dependencies:
     args: "npm:^5.0.3"
     eventemitter2: "npm:^6.4.9"
@@ -28380,7 +28971,7 @@ __metadata:
     nats: ^1.0.0 || ^2.0.0
     node-nats-streaming: ^0.0.51 || ^0.2.0 || ^0.3.0
     notepack.io: ^2.0.0 || ^3.0.0
-    pino: ^6.0.0 || ^7.0.0 || ^8.0.0
+    pino: ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0
     protobufjs: ^6.0.0 || ^7.0.0
     redlock: ^4.0.0
     rhea-promise: ^1.0.0 || ^2.0.0
@@ -28434,96 +29025,7 @@ __metadata:
   bin:
     moleculer-runner: bin/moleculer-runner.js
     moleculer-runner-esm: bin/moleculer-runner.mjs
-  checksum: 10/44a1b9bc24004f92cc776580ed4ddcedec6737749adfb01608089357329c0eb2d05350295b4fbb120e04962638658b2339c0bbc33bf195b8dce9dec2f4046639
-  languageName: node
-  linkType: hard
-
-"moleculer@patch:moleculer@npm%3A0.14.34#./.yarn/patches/moleculer-npm-0.14.34-440e26767d.patch::locator=rocket.chat%40workspace%3A.":
-  version: 0.14.34
-  resolution: "moleculer@patch:moleculer@npm%3A0.14.34#./.yarn/patches/moleculer-npm-0.14.34-440e26767d.patch::version=0.14.34&hash=e1c8f3&locator=rocket.chat%40workspace%3A."
-  dependencies:
-    args: "npm:^5.0.3"
-    eventemitter2: "npm:^6.4.9"
-    fastest-validator: "npm:^1.19.0"
-    glob: "npm:^7.2.0"
-    ipaddr.js: "npm:^2.2.0"
-    kleur: "npm:^4.1.5"
-    lodash: "npm:^4.17.21"
-    lru-cache: "npm:^6.0.0"
-    node-fetch: "npm:^2.6.7"
-    recursive-watch: "npm:^1.1.4"
-  peerDependencies:
-    amqplib: ^0.7.0 || ^0.8.0 || ^0.9.0 || ^0.10.0
-    avsc: ^5.0.0
-    bunyan: ^1.0.0
-    cbor-x: ^0.8.3 || ^0.9.0 || ^1.2.0
-    dd-trace: ^0.33.0 || ^0.34.0 || ^0.35.0 || ^0.36.0 || >=1.0.0 <1.6.0
-    debug: ^4.0.0
-    etcd3: ^1.0.0
-    ioredis: ^4.0.0 || ^5.0.0
-    jaeger-client: ^3.0.0
-    kafka-node: ^5.0.0
-    log4js: ^6.0.0
-    mqtt: ^4.0.0 || ^5.0.0
-    msgpack5: ^5.0.0 || ^6.0.0
-    nats: ^1.0.0 || ^2.0.0
-    node-nats-streaming: ^0.0.51 || ^0.2.0 || ^0.3.0
-    notepack.io: ^2.0.0 || ^3.0.0
-    pino: ^6.0.0 || ^7.0.0 || ^8.0.0
-    protobufjs: ^6.0.0 || ^7.0.0
-    redlock: ^4.0.0
-    rhea-promise: ^1.0.0 || ^2.0.0
-    thrift: ^0.12.0 || ^0.16.0
-    winston: ^3.0.0
-  peerDependenciesMeta:
-    amqplib:
-      optional: true
-    avsc:
-      optional: true
-    bunyan:
-      optional: true
-    cbor-x:
-      optional: true
-    dd-trace:
-      optional: true
-    debug:
-      optional: true
-    etcd3:
-      optional: true
-    ioredis:
-      optional: true
-    jaeger-client:
-      optional: true
-    kafka-node:
-      optional: true
-    log4js:
-      optional: true
-    mqtt:
-      optional: true
-    msgpack5:
-      optional: true
-    nats:
-      optional: true
-    node-nats-streaming:
-      optional: true
-    notepack.io:
-      optional: true
-    pino:
-      optional: true
-    protobufjs:
-      optional: true
-    redlock:
-      optional: true
-    rhea-promise:
-      optional: true
-    thrift:
-      optional: true
-    winston:
-      optional: true
-  bin:
-    moleculer-runner: bin/moleculer-runner.js
-    moleculer-runner-esm: bin/moleculer-runner.mjs
-  checksum: 10/72ce914b62a6c15f16829f15b5c782c50a0ffec398f6ef4622b4d31c1838d783ee97d6f7dfa4d703a5d8f715e0b07f1e1caf84b5b3f3b6335d00e4204c733b0f
+  checksum: 10/a9584194d07bf7c275186bffad73f3816270d1bd467da6f17346bb211a7ff1a52f8114e1b967ac7882e854ea0bd244ffdf7220fcb52d16596cc6bb4639209c6c
   languageName: node
   linkType: hard
 
@@ -28552,14 +29054,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mongo-message-queue@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "mongo-message-queue@npm:1.0.0"
+"mongo-message-queue@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "mongo-message-queue@npm:1.1.0"
   dependencies:
     lodash: "npm:>=3.8.0"
   peerDependencies:
-    mongodb: ">= 4.0.0 < 5"
-  checksum: 10/076f77f3381d6640df200ea8a3fcc96e9fa0d02d4a6276e2f43588696adfcb5d674236be218345c07fbd590727a0fcc7fcc443bcff45abf4452aaf7938b403ac
+    mongodb: ">= 4.0.0 < 7"
+  checksum: 10/6607ae93118664d522f99d480519ef0a9b4259c0366a4665b4e63647681dcac1c25454bd248578cdec6b7849d360963bf917f17fdfb3589308dfb6935321499a
   languageName: node
   linkType: hard
 
@@ -28641,10 +29143,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mrmime@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "mrmime@npm:1.0.1"
-  checksum: 10/a157e833ffe76648ab2107319deeff024b80b136ec66c60fae9d339009a1bb72c57ec1feecfd6a905dfd3df29e2299e850bff84b69cad790cc9bd9ab075834d1
+"mri@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "mri@npm:1.2.0"
+  checksum: 10/6775a1d2228bb9d191ead4efc220bd6be64f943ad3afd4dcb3b3ac8fc7b87034443f666e38805df38e8d047b29f910c3cc7810da0109af83e42c82c73bd3f6bc
   languageName: node
   linkType: hard
 
@@ -28681,31 +29183,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mute-stream@npm:0.0.7":
-  version: 0.0.7
-  resolution: "mute-stream@npm:0.0.7"
-  checksum: 10/63c177ae8ba754cf4618be635a3863078767d29a80a931ba714fc08b0a7ac8028bd373ec71b48bb22d91f6e8b62a186206aca79a16c9860d8e1027358f2a7c1a
-  languageName: node
-  linkType: hard
-
-"mute-stream@npm:0.0.8, mute-stream@npm:~0.0.4":
+"mute-stream@npm:0.0.8":
   version: 0.0.8
   resolution: "mute-stream@npm:0.0.8"
   checksum: 10/a2d2e79dde87e3424ffc8c334472c7f3d17b072137734ca46e6f221131f1b014201cc593b69a38062e974fb2394d3d1cb4349f80f012bbf8b8ac1b28033e515f
   languageName: node
   linkType: hard
 
-"mz@npm:^2.7.0":
-  version: 2.7.0
-  resolution: "mz@npm:2.7.0"
-  dependencies:
-    any-promise: "npm:^1.0.0"
-    object-assign: "npm:^4.0.1"
-    thenify-all: "npm:^1.0.0"
-  checksum: 10/8427de0ece99a07e9faed3c0c6778820d7543e3776f9a84d22cf0ec0a8eb65f6e9aee9c9d353ff9a105ff62d33a9463c6ca638974cc652ee8140cd1e35951c87
-  languageName: node
-  linkType: hard
-
 "nan@npm:^2.14.0, nan@npm:^2.18.0":
   version: 2.20.0
   resolution: "nan@npm:2.20.0"
@@ -28742,6 +29226,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"nanomatch@npm:^1.2.9":
+  version: 1.2.13
+  resolution: "nanomatch@npm:1.2.13"
+  dependencies:
+    arr-diff: "npm:^4.0.0"
+    array-unique: "npm:^0.3.2"
+    define-property: "npm:^2.0.2"
+    extend-shallow: "npm:^3.0.2"
+    fragment-cache: "npm:^0.2.1"
+    is-windows: "npm:^1.0.2"
+    kind-of: "npm:^6.0.2"
+    object.pick: "npm:^1.3.0"
+    regex-not: "npm:^1.0.0"
+    snapdragon: "npm:^0.8.1"
+    to-regex: "npm:^3.0.1"
+  checksum: 10/5c4ec7d6264b93795248f22d19672f0b972f900772c057bc67e43ae4999165b5fea7b937359efde78707930a460ceaa6d93e0732ac1d993dab8654655a2e959b
+  languageName: node
+  linkType: hard
+
 "napi-build-utils@npm:^1.0.1":
   version: 1.0.2
   resolution: "napi-build-utils@npm:1.0.2"
@@ -28749,12 +29252,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nats@npm:^2.4.0, nats@npm:^2.6.1":
-  version: 2.7.1
-  resolution: "nats@npm:2.7.1"
+"nats@npm:^2.28.2":
+  version: 2.28.2
+  resolution: "nats@npm:2.28.2"
   dependencies:
-    nkeys.js: "npm:^1.0.0-9"
-  checksum: 10/8825a855a73ae399b3d1212c04ddf41a77fcb515c1010894f2da2e4f6df1a9787c76ffe0f341db5b2c743a12d7ad0cefb78af0ae96c00b9ec1b0333f87e944a4
+    nkeys.js: "npm:1.1.0"
+  checksum: 10/09fff7e163c40e4c99be97cfc5a094572cd98258411e5dbdd40183409196fb432b810dbda8dd7cfc96e059b66edcd2bb29c7b42e93bc57a66ff6a5b0e6da05c2
   languageName: node
   linkType: hard
 
@@ -28792,6 +29295,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"negotiator@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "negotiator@npm:1.0.0"
+  checksum: 10/b5734e87295324fabf868e36fb97c84b7d7f3156ec5f4ee5bf6e488079c11054f818290fc33804cef7b1ee21f55eeb14caea83e7dafae6492a409b3e573153e5
+  languageName: node
+  linkType: hard
+
 "neo-async@npm:^2.6.2":
   version: 2.6.2
   resolution: "neo-async@npm:2.6.2"
@@ -28840,13 +29350,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nkeys.js@npm:^1.0.0-9":
-  version: 1.0.0-9
-  resolution: "nkeys.js@npm:1.0.0-9"
+"nkeys.js@npm:1.1.0":
+  version: 1.1.0
+  resolution: "nkeys.js@npm:1.1.0"
   dependencies:
-    "@types/node": "npm:^14.0.26"
-    tweetnacl: "npm:^1.0.3"
-  checksum: 10/62c4096ebd99ff3069f1865e7a490dd036b264473b22d44d246818266bcefac37ca31c70408bbe3b8b2996680658f5e07cd5c0a7687a4311dbb3162dc5c46a15
+    tweetnacl: "npm:1.0.3"
+  checksum: 10/54ee6a141cadb1dd58d8739bb98424adbdb866256496e022c2ceee793581cfe774e51fd18b50563d4145ff647f670c73e30c0b164b0edfe4f91330187fe3eeb0
   languageName: node
   linkType: hard
 
@@ -28876,21 +29385,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-addon-api@npm:^3.1.0":
-  version: 3.2.1
-  resolution: "node-addon-api@npm:3.2.1"
-  dependencies:
-    node-gyp: "npm:latest"
-  checksum: 10/681b52dfa3e15b0a8e5cf283cc0d8cd5fd2a57c559ae670fcfd20544cbb32f75de7648674110defcd17ab2c76ebef630aa7d2d2f930bc7a8cc439b20fe233518
-  languageName: node
-  linkType: hard
-
-"node-addon-api@npm:^6.1.0":
-  version: 6.1.0
-  resolution: "node-addon-api@npm:6.1.0"
+"node-addon-api@npm:^5.0.0":
+  version: 5.1.0
+  resolution: "node-addon-api@npm:5.1.0"
   dependencies:
     node-gyp: "npm:latest"
-  checksum: 10/8eea1d4d965930a177a0508695beb0d89b4c1d80bf330646a035357a1e8fc31e0d09686e2374996e96e757b947a7ece319f98ede3146683f162597c0bcb4df90
+  checksum: 10/595f59ffb4630564f587c502119cbd980d302e482781021f3b479f5fc7e41cf8f2f7280fdc2795f32d148e4f3259bd15043c52d4a3442796aa6f1ae97b959636
   languageName: node
   linkType: hard
 
@@ -28961,18 +29461,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-gcm@npm:1.0.5":
-  version: 1.0.5
-  resolution: "node-gcm@npm:1.0.5"
+"node-gcm@npm:1.1.4":
+  version: 1.1.4
+  resolution: "node-gcm@npm:1.1.4"
   dependencies:
+    axios: "npm:~1.6.8"
     debug: "npm:^3.1.0"
     lodash: "npm:^4.17.21"
-    request: "npm:^2.88.0"
-  checksum: 10/f9878afd256d026095abd648d585fde95904d22e9e1eaad1a12eadacb5073ded335e4bfa585160524d576c5140e11d8bb66fabe78e552d9c4585db4d9078dd5a
+  checksum: 10/4654838afd5ade1c5943bada8bc6208c4d2c27dd43c99efd68bb06ae8880cdc25bdb2ab457e381b85c2240daeb7b35fbd85351cccbcb0afe5b3f9d92c8a50572
   languageName: node
   linkType: hard
 
-"node-gyp-build@npm:^4.3.0, node-gyp-build@npm:^4.8.0":
+"node-gyp-build@npm:^4.8.0":
   version: 4.8.2
   resolution: "node-gyp-build@npm:4.8.2"
   bin:
@@ -28983,24 +29483,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-gyp@npm:^9.4.1":
-  version: 9.4.1
-  resolution: "node-gyp@npm:9.4.1"
+"node-gyp@npm:^10.2.0":
+  version: 10.2.0
+  resolution: "node-gyp@npm:10.2.0"
   dependencies:
     env-paths: "npm:^2.2.0"
     exponential-backoff: "npm:^3.1.1"
-    glob: "npm:^7.1.4"
+    glob: "npm:^10.3.10"
     graceful-fs: "npm:^4.2.6"
-    make-fetch-happen: "npm:^10.0.3"
-    nopt: "npm:^6.0.0"
-    npmlog: "npm:^6.0.0"
-    rimraf: "npm:^3.0.2"
+    make-fetch-happen: "npm:^13.0.0"
+    nopt: "npm:^7.0.0"
+    proc-log: "npm:^4.1.0"
     semver: "npm:^7.3.5"
-    tar: "npm:^6.1.2"
-    which: "npm:^2.0.2"
+    tar: "npm:^6.2.1"
+    which: "npm:^4.0.0"
   bin:
     node-gyp: bin/node-gyp.js
-  checksum: 10/329b109b138e48cb0416a6bca56e171b0e479d6360a548b80f06eced4bef3cf37652a3d20d171c20023fb18d996bd7446a49d4297ddb59fc48100178a92f432d
+  checksum: 10/41773093b1275751dec942b985982fd4e7a69b88cae719b868babcef3880ee6168aaec8dcaa8cd0b9fa7c84873e36cc549c6cac6a124ee65ba4ce1f1cc108cfe
   languageName: node
   linkType: hard
 
@@ -29088,18 +29587,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nopt@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "nopt@npm:6.0.0"
+"nopt@npm:^7.0.0":
+  version: 7.2.1
+  resolution: "nopt@npm:7.2.1"
   dependencies:
-    abbrev: "npm:^1.0.0"
+    abbrev: "npm:^2.0.0"
   bin:
     nopt: bin/nopt.js
-  checksum: 10/3c1128e07cd0241ae66d6e6a472170baa9f3e84dd4203950ba8df5bafac4efa2166ce917a57ef02b01ba7c40d18b2cc64b29b225fd3640791fe07b24f0b33a32
+  checksum: 10/95a1f6dec8a81cd18cdc2fed93e6f0b4e02cf6bdb4501c848752c6e34f9883d9942f036a5e3b21a699047d8a448562d891e67492df68ec9c373e6198133337ae
   languageName: node
   linkType: hard
 
-"normalize-package-data@npm:^2.3.2, normalize-package-data@npm:^2.5.0":
+"normalize-package-data@npm:^2.3.2, normalize-package-data@npm:^2.3.4":
   version: 2.5.0
   resolution: "normalize-package-data@npm:2.5.0"
   dependencies:
@@ -29111,7 +29610,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"normalize-package-data@npm:^3.0.0, normalize-package-data@npm:^3.0.2":
+"normalize-package-data@npm:^3.0.2":
   version: 3.0.3
   resolution: "normalize-package-data@npm:3.0.3"
   dependencies:
@@ -29137,6 +29636,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"normalize-selector@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "normalize-selector@npm:0.2.0"
+  checksum: 10/fefce9ecdb3794993a33954d1d755e33ccc4735b64f4951f21080f58dabbce2e4b09b7ca7f0b3f36693120abf107011e142220db67c12fe98deda12ec4725c0b
+  languageName: node
+  linkType: hard
+
 "normalize-svg-path@npm:^1.1.0":
   version: 1.1.0
   resolution: "normalize-svg-path@npm:1.1.0"
@@ -29284,13 +29790,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"number-is-nan@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "number-is-nan@npm:1.0.1"
-  checksum: 10/13656bc9aa771b96cef209ffca31c31a03b507ca6862ba7c3f638a283560620d723d52e626d57892c7fff475f4c36ac07f0600f14544692ff595abff214b9ffb
-  languageName: node
-  linkType: hard
-
 "numbered@npm:^1.1.0":
   version: 1.1.0
   resolution: "numbered@npm:1.1.0"
@@ -29405,6 +29904,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"object-copy@npm:^0.1.0":
+  version: 0.1.0
+  resolution: "object-copy@npm:0.1.0"
+  dependencies:
+    copy-descriptor: "npm:^0.1.0"
+    define-property: "npm:^0.2.5"
+    kind-of: "npm:^3.0.3"
+  checksum: 10/a9e35f07e3a2c882a7e979090360d1a20ab51d1fa19dfdac3aa8873b328a7c4c7683946ee97c824ae40079d848d6740a3788fa14f2185155dab7ed970a72c783
+  languageName: node
+  linkType: hard
+
 "object-hash@npm:^2.0.1":
   version: 2.2.0
   resolution: "object-hash@npm:2.2.0"
@@ -29419,6 +29929,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"object-inspect@npm:^1.13.3":
+  version: 1.13.3
+  resolution: "object-inspect@npm:1.13.3"
+  checksum: 10/14cb973d8381c69e14d7f1c8c75044eb4caf04c6dabcf40ca5c2ce42dc2073ae0bb2a9939eeca142b0c05215afaa1cd5534adb7c8879c32cba2576e045ed8368
+  languageName: node
+  linkType: hard
+
 "object-is@npm:^1.1.5":
   version: 1.1.6
   resolution: "object-is@npm:1.1.6"
@@ -29443,6 +29960,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"object-visit@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "object-visit@npm:1.0.1"
+  dependencies:
+    isobject: "npm:^3.0.0"
+  checksum: 10/77abf807de86fa65bf1ba92699b45b1e5485f2d899300d5cb92cca0863909e9528b6cbf366c237c9f5d2264dab6cfbeda2201252ed0e605ae1b3e263515c5cea
+  languageName: node
+  linkType: hard
+
 "object.assign@npm:^4.1.4, object.assign@npm:^4.1.5":
   version: 4.1.5
   resolution: "object.assign@npm:4.1.5"
@@ -29455,7 +29981,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object.entries@npm:^1.1.6, object.entries@npm:^1.1.7":
+"object.entries@npm:^1.1.8":
   version: 1.1.8
   resolution: "object.entries@npm:1.1.8"
   dependencies:
@@ -29466,7 +29992,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"object.fromentries@npm:^2.0.6, object.fromentries@npm:^2.0.7":
+"object.fromentries@npm:^2.0.8":
   version: 2.0.8
   resolution: "object.fromentries@npm:2.0.8"
   dependencies:
@@ -29479,27 +30005,52 @@ __metadata:
   linkType: hard
 
 "object.getownpropertydescriptors@npm:^2.1.0":
-  version: 2.1.3
-  resolution: "object.getownpropertydescriptors@npm:2.1.3"
+  version: 2.1.8
+  resolution: "object.getownpropertydescriptors@npm:2.1.8"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.1.3"
-    es-abstract: "npm:^1.19.1"
-  checksum: 10/786df4a87c0a1d8216aa52fc5d75b1ef93c2b226bb2a40097f03401e62e49a027c5cce1b3dc277818ba57cb823aaaa8fa0849d04cbb2ec92cb4c091c29da06d7
+    array.prototype.reduce: "npm:^1.0.6"
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.2"
+    es-object-atoms: "npm:^1.0.0"
+    gopd: "npm:^1.0.1"
+    safe-array-concat: "npm:^1.1.2"
+  checksum: 10/8c50f52e0d702d30836f3d2772ba02807ca25a5381be6f9470c6d143ee0bad01bce3fff0fedea2bdbc0c9297e4eb7785ffee5739f6a3a7c60fcd622b42f8a9fb
   languageName: node
   linkType: hard
 
-"object.hasown@npm:^1.1.2":
-  version: 1.1.2
-  resolution: "object.hasown@npm:1.1.2"
+"object.groupby@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "object.groupby@npm:1.0.3"
   dependencies:
-    define-properties: "npm:^1.1.4"
-    es-abstract: "npm:^1.20.4"
-  checksum: 10/94031022a2ba6006c15c6f1e0c4f51a7fa5b36aee64800192335b979fcc8bd823b18c35cb1a728af68fdfdbbe6d765f77a3c5437306c031f63654b8a34b9e639
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.2"
+  checksum: 10/44cb86dd2c660434be65f7585c54b62f0425b0c96b5c948d2756be253ef06737da7e68d7106e35506ce4a44d16aa85a413d11c5034eb7ce5579ec28752eb42d0
+  languageName: node
+  linkType: hard
+
+"object.pick@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "object.pick@npm:1.3.0"
+  dependencies:
+    isobject: "npm:^3.0.1"
+  checksum: 10/92d7226a6b581d0d62694a5632b6a1594c81b3b5a4eb702a7662e0b012db532557067d6f773596c577f75322eba09cdca37ca01ea79b6b29e3e17365f15c615e
+  languageName: node
+  linkType: hard
+
+"object.values@npm:^1.1.0, object.values@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "object.values@npm:1.2.0"
+  dependencies:
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-object-atoms: "npm:^1.0.0"
+  checksum: 10/db2e498019c354428c5dd30d02980d920ac365b155fce4dcf63eb9433f98ccf0f72624309e182ce7cc227c95e45d474e1d483418e60de2293dd23fa3ebe34903
   languageName: node
   linkType: hard
 
-"object.values@npm:^1.1.0, object.values@npm:^1.1.5, object.values@npm:^1.1.6":
+"object.values@npm:^1.1.6":
   version: 1.1.6
   resolution: "object.values@npm:1.1.6"
   dependencies:
@@ -29556,14 +30107,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"on-headers@npm:~1.0.1, on-headers@npm:~1.0.2":
+"on-headers@npm:~1.0.2":
   version: 1.0.2
   resolution: "on-headers@npm:1.0.2"
   checksum: 10/870766c16345855e2012e9422ba1ab110c7e44ad5891a67790f84610bd70a72b67fdd71baf497295f1d1bf38dd4c92248f825d48729c53c0eae5262fb69fa171
   languageName: node
   linkType: hard
 
-"once@npm:^1.3.0, once@npm:^1.3.1, once@npm:^1.4.0":
+"once@npm:1.4.0, once@npm:^1.3.0, once@npm:^1.3.1, once@npm:^1.4.0":
   version: 1.4.0
   resolution: "once@npm:1.4.0"
   dependencies:
@@ -29581,15 +30132,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"onetime@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "onetime@npm:2.0.1"
-  dependencies:
-    mimic-fn: "npm:^1.0.0"
-  checksum: 10/5b4f6079e6b4973244017e157833ab5a7a3de4bd2612d69411e3ee46f61fe8bb57b7c2e243b0b23dbaa5bad7641a15f9100a5c80295ff64c0d87aab5d1576ef9
-  languageName: node
-  linkType: hard
-
 "onetime@npm:^5.1.0, onetime@npm:^5.1.2":
   version: 5.1.2
   resolution: "onetime@npm:5.1.2"
@@ -29622,24 +30164,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"opencollective-postinstall@npm:^2.0.2":
-  version: 2.0.3
-  resolution: "opencollective-postinstall@npm:2.0.3"
-  bin:
-    opencollective-postinstall: index.js
-  checksum: 10/69d63778087cd10c9d707d9ed360556780cfdd0cd6241ded0e26632f467f1d5a064f4a9aec19a30c187770c17adba034d988f7684b226f3a73e79f44e73fab0e
-  languageName: node
-  linkType: hard
-
-"opener@npm:^1.5.2":
-  version: 1.5.2
-  resolution: "opener@npm:1.5.2"
-  bin:
-    opener: bin/opener-bin.js
-  checksum: 10/0504efcd6546e14c016a261f58a68acf9f2e5c23d84865d7d5470d5169788327ceaa5386253682f533b3fba4821748aa37ecb395f3dae7acb3261b9b22e36814
-  languageName: node
-  linkType: hard
-
 "opentracing@npm:^0.14.4":
   version: 0.14.7
   resolution: "opentracing@npm:0.14.7"
@@ -29764,10 +30288,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"p-cancelable@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "p-cancelable@npm:1.1.0"
-  checksum: 10/2db3814fef6d9025787f30afaee4496a8857a28be3c5706432cbad76c688a6db1874308f48e364a42f5317f5e41e8e7b4f2ff5c8ff2256dbb6264bc361704ece
+"p-cancelable@npm:^2":
+  version: 2.1.1
+  resolution: "p-cancelable@npm:2.1.1"
+  checksum: 10/7f1b64db17fc54acf359167d62898115dcf2a64bf6b3b038e4faf36fc059e5ed762fb9624df8ed04b25bee8de3ab8d72dea9879a2a960cd12e23c420a4aca6ed
   languageName: node
   linkType: hard
 
@@ -29819,10 +30343,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"p-is-promise@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "p-is-promise@npm:2.1.0"
-  checksum: 10/c9a8248c8b5e306475a5d55ce7808dbce4d4da2e3d69526e4991a391a7809bfd6cfdadd9bf04f1c96a3db366c93d9a0f5ee81d949e7b1684c4e0f61f747199ef
+"p-limit@npm:^1.1.0":
+  version: 1.3.0
+  resolution: "p-limit@npm:1.3.0"
+  dependencies:
+    p-try: "npm:^1.0.0"
+  checksum: 10/eb9d9bc378d48ab1998d2a2b2962a99eddd3e3726c82d3258ecc1a475f22907968edea4fec2736586d100366a001c6bb449a2abe6cd65e252e9597394f01e789
   languageName: node
   linkType: hard
 
@@ -29853,6 +30379,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"p-locate@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "p-locate@npm:2.0.0"
+  dependencies:
+    p-limit: "npm:^1.1.0"
+  checksum: 10/e2dceb9b49b96d5513d90f715780f6f4972f46987dc32a0e18bc6c3fc74a1a5d73ec5f81b1398af5e58b99ea1ad03fd41e9181c01fa81b4af2833958696e3081
+  languageName: node
+  linkType: hard
+
 "p-locate@npm:^3.0.0":
   version: 3.0.0
   resolution: "p-locate@npm:3.0.0"
@@ -29930,14 +30465,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"p-queue@npm:^2.4.2":
-  version: 2.4.2
-  resolution: "p-queue@npm:2.4.2"
-  checksum: 10/0da957f9abd8d0c5b2479376a0da60441413df99d8094c65a97c6dbef9cf6ebc0b97599522df04f34c46db071b780072c9826691c1ebd196329e32ade6e4ddc0
-  languageName: node
-  linkType: hard
-
-"p-queue@npm:^6.6.1, p-queue@npm:^6.6.2":
+"p-queue@npm:^6, p-queue@npm:^6.6.2":
   version: 6.6.2
   resolution: "p-queue@npm:6.6.2"
   dependencies:
@@ -29954,7 +30482,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"p-retry@npm:^4.0.0":
+"p-retry@npm:^4":
   version: 4.6.2
   resolution: "p-retry@npm:4.6.2"
   dependencies:
@@ -30002,6 +30530,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"p-try@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "p-try@npm:1.0.0"
+  checksum: 10/20d9735f57258158df50249f172c77fe800d31e80f11a3413ac9e68ccbe6b11798acb3f48f2df8cea7ba2b56b753ce695a4fe2a2987c3c7691c44226b6d82b6f
+  languageName: node
+  linkType: hard
+
 "p-try@npm:^2.0.0":
   version: 2.2.0
   resolution: "p-try@npm:2.2.0"
@@ -30040,15 +30575,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"package-json@npm:^4.0.0":
-  version: 4.0.1
-  resolution: "package-json@npm:4.0.1"
-  dependencies:
-    got: "npm:^6.7.1"
-    registry-auth-token: "npm:^3.0.1"
-    registry-url: "npm:^3.0.3"
-    semver: "npm:^5.1.0"
-  checksum: 10/1870dc37d65cdbeb133620ac4abc4d090f3843f0565bd378507425ef0ca335073cf3101a86007ace3b1bcd16e7e0a3232953525e6d9c40d72fc1d03eed131466
+"package-manager-detector@npm:^0.2.0":
+  version: 0.2.2
+  resolution: "package-manager-detector@npm:0.2.2"
+  checksum: 10/2dc2914aeff0729c37c1cf9762f65c0a6f09d6c64f666cc187e34de95bca54f16b4ca2e3c1e9ced87ea0637cfdb3c98261a838de04d9f1b1b26b6ae72bd55b80
   languageName: node
   linkType: hard
 
@@ -30108,6 +30638,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"parse-entities@npm:^1.0.2, parse-entities@npm:^1.1.0":
+  version: 1.2.2
+  resolution: "parse-entities@npm:1.2.2"
+  dependencies:
+    character-entities: "npm:^1.0.0"
+    character-entities-legacy: "npm:^1.0.0"
+    character-reference-invalid: "npm:^1.0.0"
+    is-alphanumerical: "npm:^1.0.0"
+    is-decimal: "npm:^1.0.0"
+    is-hexadecimal: "npm:^1.0.0"
+  checksum: 10/8ec5ab637664ee06f645cbb1912eb42e6685a3063e195e17da0e1d3781d847b302515546d6bc1c5575d0a1effdcef437a47c757f0ccae7b41d963fe8877878a6
+  languageName: node
+  linkType: hard
+
 "parse-entities@npm:^2.0.0":
   version: 2.0.0
   resolution: "parse-entities@npm:2.0.0"
@@ -30167,6 +30711,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"parse5-htmlparser2-tree-adapter@npm:^7.0.0":
+  version: 7.1.0
+  resolution: "parse5-htmlparser2-tree-adapter@npm:7.1.0"
+  dependencies:
+    domhandler: "npm:^5.0.3"
+    parse5: "npm:^7.0.0"
+  checksum: 10/75910af9137451e9c53e1e0d712f7393f484e89e592b1809ee62ad6cedd61b98daeaa5206ff5d9f06778002c91fac311afedde4880e1916fdb44fa71199dae73
+  languageName: node
+  linkType: hard
+
+"parse5-parser-stream@npm:^7.1.2":
+  version: 7.1.2
+  resolution: "parse5-parser-stream@npm:7.1.2"
+  dependencies:
+    parse5: "npm:^7.0.0"
+  checksum: 10/75b232d460bce6bd0e35012750a78ef034f40ccf550b7c6cec3122395af6b4553202ad3663ad468cf537ead5a2e13b6727670395fd0ff548faccad1dc2dc93cf
+  languageName: node
+  linkType: hard
+
 "parse5@npm:6.0.1, parse5@npm:^6.0.1":
   version: 6.0.1
   resolution: "parse5@npm:6.0.1"
@@ -30183,6 +30746,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"parse5@npm:^7.1.2":
+  version: 7.2.1
+  resolution: "parse5@npm:7.2.1"
+  dependencies:
+    entities: "npm:^4.5.0"
+  checksum: 10/fd1a8ad1540d871e1ad6ca9bf5b67e30280886f1ce4a28052c0cb885723aa984d8cb1ec3da998349a6146960c8a84aa87b1a42600eb3b94495c7303476f2f88e
+  languageName: node
+  linkType: hard
+
 "parseley@npm:^0.12.0":
   version: 0.12.1
   resolution: "parseley@npm:0.12.1"
@@ -30193,7 +30765,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"parseurl@npm:~1.3.2, parseurl@npm:~1.3.3":
+"parseurl@npm:^1.3.3, parseurl@npm:~1.3.2, parseurl@npm:~1.3.3":
   version: 1.3.3
   resolution: "parseurl@npm:1.3.3"
   checksum: 10/407cee8e0a3a4c5cd472559bca8b6a45b82c124e9a4703302326e9ab60fc1081442ada4e02628efef1eb16197ddc7f8822f5a91fd7d7c86b51f530aedb17dfa2
@@ -30210,6 +30782,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"pascalcase@npm:^0.1.1":
+  version: 0.1.1
+  resolution: "pascalcase@npm:0.1.1"
+  checksum: 10/f83681c3c8ff75fa473a2bb2b113289952f802ff895d435edd717e7cb898b0408cbdb247117a938edcbc5d141020909846cc2b92c47213d764e2a94d2ad2b925
+  languageName: node
+  linkType: hard
+
 "path-browserify@npm:^1.0.1":
   version: 1.0.1
   resolution: "path-browserify@npm:1.0.1"
@@ -30234,6 +30813,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"path-dirname@npm:^1.0.0":
+  version: 1.0.2
+  resolution: "path-dirname@npm:1.0.2"
+  checksum: 10/0d2f6604ae05a252a0025318685f290e2764ecf9c5436f203cdacfc8c0b17c24cdedaa449d766beb94ab88cc7fc70a09ec21e7933f31abc2b719180883e5e33f
+  languageName: node
+  linkType: hard
+
 "path-exists@npm:^3.0.0":
   version: 3.0.0
   resolution: "path-exists@npm:3.0.0"
@@ -30262,13 +30848,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-is-inside@npm:1.0.2, path-is-inside@npm:^1.0.1":
-  version: 1.0.2
-  resolution: "path-is-inside@npm:1.0.2"
-  checksum: 10/0b5b6c92d3018b82afb1f74fe6de6338c4c654de4a96123cb343f2b747d5606590ac0c890f956ed38220a4ab59baddfd7b713d78a62d240b20b14ab801fa02cb
-  languageName: node
-  linkType: hard
-
 "path-key@npm:^2.0.0, path-key@npm:^2.0.1":
   version: 2.0.1
   resolution: "path-key@npm:2.0.1"
@@ -30304,6 +30883,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"path-scurry@npm:^1.11.1":
+  version: 1.11.1
+  resolution: "path-scurry@npm:1.11.1"
+  dependencies:
+    lru-cache: "npm:^10.2.0"
+    minipass: "npm:^5.0.0 || ^6.0.2 || ^7.0.0"
+  checksum: 10/5e8845c159261adda6f09814d7725683257fcc85a18f329880ab4d7cc1d12830967eae5d5894e453f341710d5484b8fdbbd4d75181b4d6e1eb2f4dc7aeadc434
+  languageName: node
+  linkType: hard
+
 "path-scurry@npm:^2.0.0":
   version: 2.0.0
   resolution: "path-scurry@npm:2.0.0"
@@ -30321,27 +30910,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-to-regexp@npm:0.1.7":
-  version: 0.1.7
-  resolution: "path-to-regexp@npm:0.1.7"
-  checksum: 10/701c99e1f08e3400bea4d701cf6f03517474bb1b608da71c78b1eb261415b645c5670dfae49808c89e12cea2dccd113b069f040a80de012da0400191c6dbd1c8
-  languageName: node
-  linkType: hard
-
-"path-to-regexp@npm:2.2.1":
-  version: 2.2.1
-  resolution: "path-to-regexp@npm:2.2.1"
-  checksum: 10/1a7125f8c1b5904d556a29722333219df4aa779039e903efe2fbfe0cc3ae9246672846fc8ad285664020b70e434347e0bc9af691fd7d61df8eaa7b018dcd56fb
-  languageName: node
-  linkType: hard
-
-"path-to-regexp@npm:^6.2.1":
-  version: 6.2.1
-  resolution: "path-to-regexp@npm:6.2.1"
-  checksum: 10/1e266be712d1a08086ee77beab12a1804842ec635dfed44f9ee1ba960a0e01cec8063fb8c92561115cdc0ce73158cdc7766e353ffa039340b4a85b370084c4d4
-  languageName: node
-  linkType: hard
-
 "path-to-regexp@npm:^6.3.0":
   version: 6.3.0
   resolution: "path-to-regexp@npm:6.3.0"
@@ -30349,7 +30917,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-to-regexp@npm:^8.1.0":
+"path-to-regexp@npm:^8.0.0, path-to-regexp@npm:^8.1.0":
   version: 8.2.0
   resolution: "path-to-regexp@npm:8.2.0"
   checksum: 10/23378276a172b8ba5f5fb824475d1818ca5ccee7bbdb4674701616470f23a14e536c1db11da9c9e6d82b82c556a817bbf4eee6e41b9ed20090ef9427cbb38e13
@@ -30465,15 +31033,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"peggy@npm:3.0.2":
-  version: 3.0.2
-  resolution: "peggy@npm:3.0.2"
+"peggy@npm:4.1.1":
+  version: 4.1.1
+  resolution: "peggy@npm:4.1.1"
   dependencies:
-    commander: "npm:^10.0.0"
+    "@peggyjs/from-mem": "npm:1.3.4"
+    commander: "npm:^12.1.0"
     source-map-generator: "npm:0.8.0"
   bin:
     peggy: bin/peggy.js
-  checksum: 10/dd1a169153d1a51d81d856af4c7e1c56874d2385092bc0cb3f2d5890779fde67f5219a9f060d855cd86664d7923e8e27140b845b856f77b93f043f34e6178c90
+  checksum: 10/a2531d6a2448addd7a38640c5f73ba1a762f5974caa33f44c8f0dff735d7a701c4befe630ad2b0ed8e46ffda1f3ea503c3844e477cb7e55b62759918a365585f
   languageName: node
   linkType: hard
 
@@ -30505,6 +31074,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"picocolors@npm:^1.0.1, picocolors@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "picocolors@npm:1.1.1"
+  checksum: 10/e1cf46bf84886c79055fdfa9dcb3e4711ad259949e3565154b004b260cd356c5d54b31a1437ce9782624bf766272fe6b0154f5f0c744fb7af5d454d2b60db045
+  languageName: node
+  linkType: hard
+
 "picomatch@npm:^2.0.4, picomatch@npm:^2.2.1, picomatch@npm:^2.2.3, picomatch@npm:^2.3.1":
   version: 2.3.1
   resolution: "picomatch@npm:2.3.1"
@@ -30535,7 +31111,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pify@npm:^4.0.1":
+"pify@npm:^4.0.0, pify@npm:^4.0.1":
   version: 4.0.1
   resolution: "pify@npm:4.0.1"
   checksum: 10/8b97cbf9dc6d4c1320cc238a2db0fc67547f9dc77011729ff353faf34f1936ea1a4d7f3c63b2f4980b253be77bcc72ea1e9e76ee3fd53cce2aafb6a8854d07ec
@@ -30568,13 +31144,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pino-abstract-transport@npm:v1.0.0":
-  version: 1.0.0
-  resolution: "pino-abstract-transport@npm:1.0.0"
+"pino-abstract-transport@npm:^1.2.0":
+  version: 1.2.0
+  resolution: "pino-abstract-transport@npm:1.2.0"
   dependencies:
     readable-stream: "npm:^4.0.0"
     split2: "npm:^4.0.0"
-  checksum: 10/9241490465d7ebeaf842eb866cb884abbe8a7e24b12439b9b09e57bd0bb0fb94951059374f3cea69c12e12129efed0734b254b8485fcab9988cc7f4d69085f6f
+  checksum: 10/6ec1d19a7ff3347fd21576f744c31c3e38ca4463ae638818408f43698c936f96be6a0bc750af5f7c1ae81873183bfcb062b7a0d12dc159a1813ea900c388c693
   languageName: node
   linkType: hard
 
@@ -30608,28 +31184,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pino@npm:^8.15.0":
-  version: 8.15.0
-  resolution: "pino@npm:8.15.0"
+"pino@npm:^8.21.0":
+  version: 8.21.0
+  resolution: "pino@npm:8.21.0"
   dependencies:
     atomic-sleep: "npm:^1.0.0"
     fast-redact: "npm:^3.1.1"
     on-exit-leak-free: "npm:^2.1.0"
-    pino-abstract-transport: "npm:v1.0.0"
+    pino-abstract-transport: "npm:^1.2.0"
     pino-std-serializers: "npm:^6.0.0"
-    process-warning: "npm:^2.0.0"
+    process-warning: "npm:^3.0.0"
     quick-format-unescaped: "npm:^4.0.3"
     real-require: "npm:^0.2.0"
     safe-stable-stringify: "npm:^2.3.1"
-    sonic-boom: "npm:^3.1.0"
-    thread-stream: "npm:^2.0.0"
+    sonic-boom: "npm:^3.7.0"
+    thread-stream: "npm:^2.6.0"
   bin:
     pino: bin.js
-  checksum: 10/be635068a214261a8183331bd360c3e01ebed2ed01919694a64271549d4accc6163d470de85be8d54de9144ff90a83520021c0f1530999c283ee9de13143864c
+  checksum: 10/5a054eab533ab91b20f63497b86070f0a6b40e4688cde9de66d23e03d6046c4e95d69c3f526dea9f30bcbc5874c7fbf0f91660cded4753946fd02261ca8ac340
   languageName: node
   linkType: hard
 
-"pirates@npm:^4.0.1, pirates@npm:^4.0.4":
+"pirates@npm:^4.0.4":
   version: 4.0.5
   resolution: "pirates@npm:4.0.5"
   checksum: 10/3728bae0cf6c18c3d25f5449ee8c5bc1a6a83bca688abe0e1654ce8c069bfd408170397cef133ed9ec8b0faeb4093c5c728d0e72ab7b3385256cd87008c40364
@@ -30661,15 +31237,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pkg-dir@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "pkg-dir@npm:5.0.0"
-  dependencies:
-    find-up: "npm:^5.0.0"
-  checksum: 10/b167bb8dac7bbf22b1d5e30ec223e6b064b84b63010c9d49384619a36734caf95ed23ad23d4f9bd975e8e8082b60a83395f43a89bb192df53a7c25a38ecb57d9
-  languageName: node
-  linkType: hard
-
 "pkg-dir@npm:^7.0.0":
   version: 7.0.0
   resolution: "pkg-dir@npm:7.0.0"
@@ -30686,12 +31253,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"playwright-core@npm:1.40.1":
-  version: 1.40.1
-  resolution: "playwright-core@npm:1.40.1"
+"playwright-core@npm:1.48.2":
+  version: 1.48.2
+  resolution: "playwright-core@npm:1.48.2"
   bin:
     playwright-core: cli.js
-  checksum: 10/b8945a5eec68a2772be537219c81f74b8fbd1545650c908c41fdcb2b9eb40f488968d1fb59c61ca58afb923af1e390dd621bba3099521fcd3d9a63ef3645a203
+  checksum: 10/dd029f797b1afb2240713a032fecc50e1ffc5464a39c075570cf10e929c145da3a8d0951a3f2b279e33b2f09cbeb8ff4330822cb1078452c0c75cc4ce34ca171
   languageName: node
   linkType: hard
 
@@ -30706,27 +31273,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"playwright@npm:1.40.1":
-  version: 1.40.1
-  resolution: "playwright@npm:1.40.1"
+"playwright@npm:1.48.2":
+  version: 1.48.2
+  resolution: "playwright@npm:1.48.2"
   dependencies:
     fsevents: "npm:2.3.2"
-    playwright-core: "npm:1.40.1"
+    playwright-core: "npm:1.48.2"
   dependenciesMeta:
     fsevents:
       optional: true
   bin:
     playwright: cli.js
-  checksum: 10/95cf79f1574accbff18fac4b876aa3811640314ee74cf4cd1c249398cd49824e55dc664039342a18d2d2fa4f5ad460ce91a97cb15942ab5d71c8ab04f442dc32
-  languageName: node
-  linkType: hard
-
-"please-upgrade-node@npm:^3.2.0":
-  version: 3.2.0
-  resolution: "please-upgrade-node@npm:3.2.0"
-  dependencies:
-    semver-compare: "npm:^1.0.0"
-  checksum: 10/d87c41581a2a022fbe25965a97006238cd9b8cbbf49b39f78d262548149a9d30bd2bdf35fec3d810e0001e630cd46ef13c7e19c389dea8de7e64db271a2381bb
+  checksum: 10/331af352504336f419cdf1369f0ef399c6f0e905fdb79a5e97c41f33e74766efd21430ab6ae2de0b237ae765ebfbe701e119a990d8dc01bcdac3bc43c1fa1fbf
   languageName: node
   linkType: hard
 
@@ -30778,6 +31336,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"posix-character-classes@npm:^0.1.0":
+  version: 0.1.1
+  resolution: "posix-character-classes@npm:0.1.1"
+  checksum: 10/dedb99913c60625a16050cfed2fb5c017648fc075be41ac18474e1c6c3549ef4ada201c8bd9bd006d36827e289c571b6092e1ef6e756cdbab2fd7046b25c6442
+  languageName: node
+  linkType: hard
+
 "possible-typed-array-names@npm:^1.0.0":
   version: 1.0.0
   resolution: "possible-typed-array-names@npm:1.0.0"
@@ -30785,6 +31350,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"postcss-bem-linter@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "postcss-bem-linter@npm:4.0.1"
+  dependencies:
+    minimatch: "npm:^3.1.2"
+    postcss-resolve-nested-selector: "npm:^0.1.1"
+  peerDependencies:
+    postcss: ^8.4.21
+  checksum: 10/e6535551c308334dd22a8192ef70177f2edc647ad736f8e944dec39b5617c17c0ee974e511588c97ce1b9a7679b413477c2206740cb106427154f0c961fac5cd
+  languageName: node
+  linkType: hard
+
 "postcss-calc@npm:^7.0.1":
   version: 7.0.5
   resolution: "postcss-calc@npm:7.0.5"
@@ -30819,36 +31396,42 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-css-variables@npm:^0.17.0":
-  version: 0.17.0
-  resolution: "postcss-css-variables@npm:0.17.0"
+"postcss-css-variables@npm:^0.19.0":
+  version: 0.19.0
+  resolution: "postcss-css-variables@npm:0.19.0"
   dependencies:
     balanced-match: "npm:^1.0.0"
     escape-string-regexp: "npm:^1.0.3"
     extend: "npm:^3.0.1"
-    postcss: "npm:^6.0.8"
-  checksum: 10/dc313f52ada736541c311e865506eefb2cc0574dde9e3731a4cbf46c0c98c75fe8ac813c5d0828a699916c47f84a42599c2355699842180441dc63564e9c108b
+  peerDependencies:
+    postcss: ^8.2.6
+  checksum: 10/4f72d74ee9708c9343fe91f8a0f135aad5c88ce56061d8c5f2b9b957c0467b68a246e9f24726b23c338d1ef0244abab4eac56f0cae1618c47a81dcd66f14f53d
   languageName: node
   linkType: hard
 
-"postcss-custom-properties@npm:^11.0.0":
-  version: 11.0.0
-  resolution: "postcss-custom-properties@npm:11.0.0"
+"postcss-custom-properties@npm:^14.0.4":
+  version: 14.0.4
+  resolution: "postcss-custom-properties@npm:14.0.4"
   dependencies:
-    postcss-values-parser: "npm:^4.0.0"
+    "@csstools/cascade-layer-name-parser": "npm:^2.0.4"
+    "@csstools/css-parser-algorithms": "npm:^3.0.4"
+    "@csstools/css-tokenizer": "npm:^3.0.3"
+    "@csstools/utilities": "npm:^2.0.0"
+    postcss-value-parser: "npm:^4.2.0"
   peerDependencies:
-    postcss: ^8.1.0
-  checksum: 10/883c5dd8b393daa5dd1bb57e6bbea1e42bdae8dec44eb692c4d4d4855898c6d43c23a87e3e4393dcfb7e333cc85ce4929ede8b7f413418dc76ea11f0fd5e6555
+    postcss: ^8.4
+  checksum: 10/69271500e2530a736c888cc34c2c3fa92d5bd95f261ba43073807dacba91df41cb1eeb2d137f4038662f5ff921b45bc1d05f66d6f2a79a9b468de0cb91571c19
   languageName: node
   linkType: hard
 
-"postcss-dir-pseudo-class@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "postcss-dir-pseudo-class@npm:5.0.0"
+"postcss-dir-pseudo-class@npm:^9.0.1":
+  version: 9.0.1
+  resolution: "postcss-dir-pseudo-class@npm:9.0.1"
   dependencies:
-    postcss: "npm:^7.0.2"
-    postcss-selector-parser: "npm:^5.0.0-rc.3"
-  checksum: 10/e6634eadb0ef7003fcd025217b4f140194740d419521e3856873e9c6ea9c70f984243eac51af3aa24d378d188216a4d9148f133ce74ab88d7ac8752396dc2d7b
+    postcss-selector-parser: "npm:^7.0.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10/7f6212fe7f2a83e95d85df14208df3edb75b6b8f89ad865fdfbd1abf5765b6649ff46bb7ff56f7788ff8cfe60546ff305cc2fd2f9b1f9e1647a4386507714070
   languageName: node
   linkType: hard
 
@@ -30888,28 +31471,41 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-easy-import@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "postcss-easy-import@npm:3.0.0"
+"postcss-easy-import@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "postcss-easy-import@npm:4.0.0"
   dependencies:
     globby: "npm:^6.1.0"
     is-glob: "npm:^4.0.0"
     lodash: "npm:^4.17.4"
     object-assign: "npm:^4.0.1"
     pify: "npm:^3.0.0"
-    postcss: "npm:^6.0.11"
-    postcss-import: "npm:^10.0.0"
+    postcss-import: "npm:^14.0.0"
     resolve: "npm:^1.1.7"
-  checksum: 10/c00e13292c0d763dfdb14c64edd04181928d005aabf265c487c90e15936f0b0a7024006d23057fd884943a70c02bde4bf7c79633f0078d021501fae440c1c9ea
+  peerDependencies:
+    postcss: ^8.4.6
+  checksum: 10/3d24becf1f714faf19868f1bc8dbc047d8b41af70f32aeb499025c188c64f06aa2d66dde77973984d579f231ff59596fc4161fd14b8949b1ee96fc18e988af11
   languageName: node
   linkType: hard
 
-"postcss-flexbugs-fixes@npm:^4.2.1":
-  version: 4.2.1
-  resolution: "postcss-flexbugs-fixes@npm:4.2.1"
+"postcss-flexbugs-fixes@npm:^5.0.2":
+  version: 5.0.2
+  resolution: "postcss-flexbugs-fixes@npm:5.0.2"
+  peerDependencies:
+    postcss: ^8.1.4
+  checksum: 10/022ddbcca8987303b9be75ff259e9de81b98643adac87a5fc6b52a0fcbbf95e1ac9fd508c4ed67cad76ac5d039b7123de8a0832329481b3c626f5d63f7a28f47
+  languageName: node
+  linkType: hard
+
+"postcss-html@npm:^0.36.0":
+  version: 0.36.0
+  resolution: "postcss-html@npm:0.36.0"
   dependencies:
-    postcss: "npm:^7.0.26"
-  checksum: 10/51a626bc80dbe42fcc8b0895b4f23a558bb809ec52cdc05aa27fb24cdffd4c9dc53f25218085ddf407c53d76573bc6d7568219c912161609f02532a8f5f59b43
+    htmlparser2: "npm:^3.10.0"
+  peerDependencies:
+    postcss: ">=5.0.0"
+    postcss-syntax: ">=0.36.0"
+  checksum: 10/5f340df1d9e1595a6d0051cca408efa86efa77a51efe570ab4db6c463b05936f9582b143be8eedc3ba7fd3ed313f6a6838e11e31abcefc3543486b45ba3893e1
   languageName: node
   linkType: hard
 
@@ -30922,34 +31518,74 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-import@npm:^10.0.0":
-  version: 10.0.0
-  resolution: "postcss-import@npm:10.0.0"
+"postcss-import@npm:^14.0.0":
+  version: 14.1.0
+  resolution: "postcss-import@npm:14.1.0"
   dependencies:
-    object-assign: "npm:^4.0.1"
-    postcss: "npm:^6.0.1"
-    postcss-value-parser: "npm:^3.2.3"
+    postcss-value-parser: "npm:^4.0.0"
     read-cache: "npm:^1.0.0"
     resolve: "npm:^1.1.7"
-  checksum: 10/3590c888357790effef69a039226f43f2f42e5f2d8bb3bc546dc7b419ba054caff56dd99c61ba5d285f367f68d563a9b4cab02ac35020080aa8e4dee5830fa24
+  peerDependencies:
+    postcss: ^8.0.0
+  checksum: 10/434ab43145ad6beeb3cd7405596cb29920061e9d55091196e0264daf0a4e543a8cf1568c233e5a4466786749f904c03a9d51d406685055af2a14a8337d8773d5
   languageName: node
   linkType: hard
 
-"postcss-load-config@npm:^3.0.1, postcss-load-config@npm:^3.1.4":
+"postcss-jsx@npm:^0.36.0":
+  version: 0.36.4
+  resolution: "postcss-jsx@npm:0.36.4"
+  dependencies:
+    "@babel/core": "npm:>=7.2.2"
+  peerDependencies:
+    postcss: ">=5.0.0"
+    postcss-syntax: ">=0.36.0"
+  checksum: 10/b914748f4d2c5936ac5a947e380d5877468867eb742d745dffb094cd7b6e4565a5fa0606711bf4dbcdb6a73a3f01a628728aaf677c227610a346ca22538ff12c
+  languageName: node
+  linkType: hard
+
+"postcss-less@npm:^3.1.0":
   version: 3.1.4
-  resolution: "postcss-load-config@npm:3.1.4"
+  resolution: "postcss-less@npm:3.1.4"
+  dependencies:
+    postcss: "npm:^7.0.14"
+  checksum: 10/9d821585d0262e1417415fcc7f7f8ded7925b4b27b3234467a988ed3292280c1af8582480defd88e6b58bc1a7e7653f9229670e27f1d183ad81c453a3ceb3da1
+  languageName: node
+  linkType: hard
+
+"postcss-lit@npm:^1.1.1":
+  version: 1.1.1
+  resolution: "postcss-lit@npm:1.1.1"
   dependencies:
-    lilconfig: "npm:^2.0.5"
-    yaml: "npm:^1.10.2"
+    "@babel/generator": "npm:^7.16.5"
+    "@babel/parser": "npm:^7.16.2"
+    "@babel/traverse": "npm:^7.16.0"
+    lilconfig: "npm:^2.0.6"
   peerDependencies:
+    postcss: ^8.3.11
+  checksum: 10/e8dd1afdc09ec14de507f80604740b7451e330fde53b62f3a84d869597e639035be141130e24ffbc473cdea6505a07f52d02d56e8021b41990a135d7c557043f
+  languageName: node
+  linkType: hard
+
+"postcss-load-config@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "postcss-load-config@npm:6.0.1"
+  dependencies:
+    lilconfig: "npm:^3.1.1"
+  peerDependencies:
+    jiti: ">=1.21.0"
     postcss: ">=8.0.9"
-    ts-node: ">=9.0.0"
+    tsx: ^4.8.1
+    yaml: ^2.4.2
   peerDependenciesMeta:
+    jiti:
+      optional: true
     postcss:
       optional: true
-    ts-node:
+    tsx:
+      optional: true
+    yaml:
       optional: true
-  checksum: 10/75fa409d77b96e6f53e99f680c550f25ca8922c1150d3d368ded1f6bd8e0d4d67a615fe1f1c5d409aefb6e66fb4b5e48e86856d581329913de84578def078b19
+  checksum: 10/1691cfc94948a9373d4f7b3b7a8500cfaf8cb2dcc2107c14f90f2a711a9892a362b0866894ac5bb723455fa685a15116d9ed3252188689c4502b137c19d6bdc4
   languageName: node
   linkType: hard
 
@@ -30973,12 +31609,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-logical@npm:^4.0.2":
-  version: 4.0.2
-  resolution: "postcss-logical@npm:4.0.2"
+"postcss-logical@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "postcss-logical@npm:8.0.0"
   dependencies:
-    postcss: "npm:^7.0.17"
-  checksum: 10/0378d99635bb739a6932e592c605b43e2cd4773962e3078936d18a6f88dc4a5832a61bc67bbd77d648ee9ea50978fa1920409d381a0d3acf601822b6da601918
+    postcss-value-parser: "npm:^4.2.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10/bdaceacdc80b9b03e2af9e8eb5c195a96cd0a525836a362db357574293189c5ec0f581c71d1ec97856cfbb9ebd4239c24a0593e1f4e32b59aa878a98b5a6ae27
+  languageName: node
+  linkType: hard
+
+"postcss-markdown@npm:^0.36.0":
+  version: 0.36.0
+  resolution: "postcss-markdown@npm:0.36.0"
+  dependencies:
+    remark: "npm:^10.0.1"
+    unist-util-find-all-after: "npm:^1.0.2"
+  peerDependencies:
+    postcss: ">=5.0.0"
+    postcss-syntax: ">=0.36.0"
+  checksum: 10/d311259c18138502ffe9e29522849e3df2f12c35084227690c25175d0f2c908418c77aaab236e02a3c6f75b0e2bc2e5c0d50d38c5c687e5b792fc842ee25ff20
   languageName: node
   linkType: hard
 
@@ -31157,14 +31808,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-nested@npm:^5.0.6":
-  version: 5.0.6
-  resolution: "postcss-nested@npm:5.0.6"
+"postcss-nested@npm:^7.0.2":
+  version: 7.0.2
+  resolution: "postcss-nested@npm:7.0.2"
   dependencies:
-    postcss-selector-parser: "npm:^6.0.6"
+    postcss-selector-parser: "npm:^7.0.0"
   peerDependencies:
     postcss: ^8.2.14
-  checksum: 10/713ec75c156e9a428c37767ea24c676e06e24a9a9bf9300372b61f038cc564d2af0bc7f5b8076c313cf583c62902a08de4e52ba0094e3a35554a2541942ee66a
+  checksum: 10/adcb74bb94869f7313f2677bcdf5dd9e368602ca6d3e1c1e3da514ee00ccf5c2bdd414fdb9141de65b0b7aee83d8f2b149c0d3723bc4af5ee8b8062dc6e09c3d
   languageName: node
   linkType: hard
 
@@ -31302,19 +31953,59 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-resolve-nested-selector@npm:^0.1.1":
-  version: 0.1.1
-  resolution: "postcss-resolve-nested-selector@npm:0.1.1"
-  checksum: 10/b08fb76ab092a09ee01328bad620a01dcb445ac5eb02dd0ed9ed75217c2f779ecb3bf99a361c46e695689309c08c09f1a1ad7354c8d58c2c2c40d364657fcb08
+"postcss-reporter@npm:^6.0.0":
+  version: 6.0.1
+  resolution: "postcss-reporter@npm:6.0.1"
+  dependencies:
+    chalk: "npm:^2.4.1"
+    lodash: "npm:^4.17.11"
+    log-symbols: "npm:^2.2.0"
+    postcss: "npm:^7.0.7"
+  checksum: 10/32628ace65d27963c804797926603851b47fd3cdf127838d6a694702ea273b37ecd3816c12e3ee4c6334f21d7fde62647423c634911f2662e6cd0ca99d03ea0d
   languageName: node
   linkType: hard
 
-"postcss-safe-parser@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "postcss-safe-parser@npm:6.0.0"
+"postcss-resolve-nested-selector@npm:^0.1.1, postcss-resolve-nested-selector@npm:^0.1.6":
+  version: 0.1.6
+  resolution: "postcss-resolve-nested-selector@npm:0.1.6"
+  checksum: 10/85453901afe2a4db497b4e0d2c9cf2a097a08fa5d45bc646547025176217050334e423475519a1e6c74a1f31ade819d16bb37a39914e5321e250695ee3feea14
+  languageName: node
+  linkType: hard
+
+"postcss-safe-parser@npm:^4.0.0":
+  version: 4.0.2
+  resolution: "postcss-safe-parser@npm:4.0.2"
+  dependencies:
+    postcss: "npm:^7.0.26"
+  checksum: 10/5af5d526a051b45a211d9244d2083e3de2e90d6aa20e4ef2dec404c08efd268ca329279a4fcef7f52e272e91dc748b4da76d080b2dabaf1ca16620ca04b7c6cc
+  languageName: node
+  linkType: hard
+
+"postcss-safe-parser@npm:^7.0.1":
+  version: 7.0.1
+  resolution: "postcss-safe-parser@npm:7.0.1"
   peerDependencies:
-    postcss: ^8.3.3
-  checksum: 10/06c733eaad83a3954367e7ee02ddfe3796e7a44d4299ccf9239f40964a4daac153c7d77613f32964b5a86c0c6c2f6167738f31d578b73b17cb69d0c4446f0ebe
+    postcss: ^8.4.31
+  checksum: 10/285f30877f3ef5d43586432394ef4fcab904cd5bcfff5c26f586eb630fbee490abf2ac6d81e64fa212fb64d03630d12c2f3c5196f5637bec5ba3d043562ddf30
+  languageName: node
+  linkType: hard
+
+"postcss-sass@npm:^0.3.5":
+  version: 0.3.5
+  resolution: "postcss-sass@npm:0.3.5"
+  dependencies:
+    gonzales-pe: "npm:^4.2.3"
+    postcss: "npm:^7.0.1"
+  checksum: 10/130454aab4467dabdcad63940481cadc00715a2629c2bd5bb1a53c9e29fc1fcf3a106a296ec79bd0b21abe7bc61a626b241501ebe6f21de684f17f7ba3d0c9a1
+  languageName: node
+  linkType: hard
+
+"postcss-scss@npm:^2.0.0":
+  version: 2.1.1
+  resolution: "postcss-scss@npm:2.1.1"
+  dependencies:
+    postcss: "npm:^7.0.6"
+  checksum: 10/2ea50f550e7391091a7a11b2ac3d20b4219389f75527dc373d4687d5baf45f4078bac32d6462ea7131d6d3727cf9f2a3a458e0e33f07c3f47b9af4adda8d42a4
   languageName: node
   linkType: hard
 
@@ -31327,17 +32018,18 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-selector-not@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "postcss-selector-not@npm:4.0.1"
+"postcss-selector-not@npm:^8.0.1":
+  version: 8.0.1
+  resolution: "postcss-selector-not@npm:8.0.1"
   dependencies:
-    balanced-match: "npm:^1.0.0"
-    postcss: "npm:^7.0.2"
-  checksum: 10/08fbd3e5ca273f3b767bd35d6bd033647a68f59b596d8aec19a9089b750539bdf85121ed7fd00a7763174a55c75c22a309d75d306127e23dc396069781efbaa4
+    postcss-selector-parser: "npm:^7.0.0"
+  peerDependencies:
+    postcss: ^8.4
+  checksum: 10/28c1f7863ac85016ecd695304ee1eb21b1128eacba333d6d4540fd93691c58ff6329ac323b6a640f2da918e95c7b58e8f534c8b6e2ed016f6e31cdfdc743edbc
   languageName: node
   linkType: hard
 
-"postcss-selector-parser@npm:^3.0.0":
+"postcss-selector-parser@npm:^3.0.0, postcss-selector-parser@npm:^3.1.0":
   version: 3.1.2
   resolution: "postcss-selector-parser@npm:3.1.2"
   dependencies:
@@ -31348,18 +32040,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-selector-parser@npm:^5.0.0-rc.3":
-  version: 5.0.0
-  resolution: "postcss-selector-parser@npm:5.0.0"
+"postcss-selector-parser@npm:^6.0.0, postcss-selector-parser@npm:^6.0.4, postcss-selector-parser@npm:^6.1.2":
+  version: 6.1.2
+  resolution: "postcss-selector-parser@npm:6.1.2"
   dependencies:
-    cssesc: "npm:^2.0.0"
-    indexes-of: "npm:^1.0.1"
-    uniq: "npm:^1.0.1"
-  checksum: 10/0bfba73eb4e0a192052f008a03b15bd47539b28627b622f3cfe592c1bdc691501db28c9f703748e5ab0b015af8edb937370c8dca58ab85cb8c5e597865ef43be
+    cssesc: "npm:^3.0.0"
+    util-deprecate: "npm:^1.0.2"
+  checksum: 10/190034c94d809c115cd2f32ee6aade84e933450a43ec3899c3e78e7d7b33efd3a2a975bb45d7700b6c5b196c06a7d9acf3f1ba6f1d87032d9675a29d8bca1dd3
   languageName: node
   linkType: hard
 
-"postcss-selector-parser@npm:^6.0.0, postcss-selector-parser@npm:^6.0.10, postcss-selector-parser@npm:^6.0.2, postcss-selector-parser@npm:^6.0.6":
+"postcss-selector-parser@npm:^6.0.2":
   version: 6.0.13
   resolution: "postcss-selector-parser@npm:6.0.13"
   dependencies:
@@ -31369,22 +32060,32 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-selector-parser@npm:^6.0.4":
-  version: 6.1.2
-  resolution: "postcss-selector-parser@npm:6.1.2"
+"postcss-selector-parser@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "postcss-selector-parser@npm:7.0.0"
   dependencies:
     cssesc: "npm:^3.0.0"
     util-deprecate: "npm:^1.0.2"
-  checksum: 10/190034c94d809c115cd2f32ee6aade84e933450a43ec3899c3e78e7d7b33efd3a2a975bb45d7700b6c5b196c06a7d9acf3f1ba6f1d87032d9675a29d8bca1dd3
+  checksum: 10/0e92be7281e2b440a8be8cf207de40a24ca7bc765577916499614d5a47827a3e658206728cc559db96803e554270516104aad919a04f91bfa8914ccef1ba14ca
   languageName: node
   linkType: hard
 
-"postcss-sorting@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "postcss-sorting@npm:7.0.1"
+"postcss-sorting@npm:^4.1.0":
+  version: 4.1.0
+  resolution: "postcss-sorting@npm:4.1.0"
+  dependencies:
+    lodash: "npm:^4.17.4"
+    postcss: "npm:^7.0.0"
+  checksum: 10/ee1017e584c2fdc5b10801fc60ed7fc077e111ee2f0a326f9ebbb4b10a9d57d21e47db7be9821061d7239c7384ea94869c627c5b5f344ec42c8393152f4cbb10
+  languageName: node
+  linkType: hard
+
+"postcss-sorting@npm:^8.0.2":
+  version: 8.0.2
+  resolution: "postcss-sorting@npm:8.0.2"
   peerDependencies:
-    postcss: ^8.3.9
-  checksum: 10/52d5d67f24cc54c559d8d508b02868c2a7a66f7c0a9e357e410c607af530998a5d509fabe6fcfa6a920ff413d3e85df932e3b32940d5afc16e7dbbbb27da6bb7
+    postcss: ^8.4.20
+  checksum: 10/2496713e31c3d07c6d650d6ca4734489c2440fbbdd5c109ae5192178e6637e255bdd77dd52a0171f773c00df49bb8e0a7077c67aa0ab3b3c93a1934372318dff
   languageName: node
   linkType: hard
 
@@ -31399,6 +32100,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"postcss-syntax@npm:^0.36.2":
+  version: 0.36.2
+  resolution: "postcss-syntax@npm:0.36.2"
+  peerDependencies:
+    postcss: ">=5.0.0"
+  checksum: 10/dfaabd32d3d657d61123b708bc4dbe757538f35d48ff32ce8619d53305d35c1a79fce33b3319d38b01e8139dc122e37a4ba2f356d85def54ea22db83b4c3aedd
+  languageName: node
+  linkType: hard
+
 "postcss-unique-selectors@npm:^4.0.1":
   version: 4.0.1
   resolution: "postcss-unique-selectors@npm:4.0.1"
@@ -31424,32 +32134,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss-value-parser@npm:^3.0.0, postcss-value-parser@npm:^3.2.3":
+"postcss-value-parser@npm:^3.0.0, postcss-value-parser@npm:^3.3.0":
   version: 3.3.1
   resolution: "postcss-value-parser@npm:3.3.1"
   checksum: 10/e8bc676092ad0c4a628e8d7b06ef1844a157bcce22e489d72ac661d6d47b8e8e7c342e5e0da807056a0a2fced1372fff0f67fbfd6e06fd8509828ac6190b54ae
   languageName: node
   linkType: hard
 
-"postcss-value-parser@npm:^4.0.2, postcss-value-parser@npm:^4.1.0, postcss-value-parser@npm:^4.2.0":
+"postcss-value-parser@npm:^4.0.0, postcss-value-parser@npm:^4.0.2, postcss-value-parser@npm:^4.1.0, postcss-value-parser@npm:^4.2.0":
   version: 4.2.0
   resolution: "postcss-value-parser@npm:4.2.0"
   checksum: 10/e4e4486f33b3163a606a6ed94f9c196ab49a37a7a7163abfcd469e5f113210120d70b8dd5e33d64636f41ad52316a3725655421eb9a1094f1bcab1db2f555c62
   languageName: node
   linkType: hard
 
-"postcss-values-parser@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "postcss-values-parser@npm:4.0.0"
-  dependencies:
-    color-name: "npm:^1.1.4"
-    is-url-superb: "npm:^4.0.0"
-    postcss: "npm:^7.0.5"
-  checksum: 10/6d7433835ff24de0b759feaeae76277858a4da6446e73183de4fa200a743eb290d7021936c49c7676d625876fbb89985364b8f64a35b2b0705554f620e95d863
-  languageName: node
-  linkType: hard
-
-"postcss@npm:^6.0.1, postcss@npm:^6.0.11, postcss@npm:^6.0.21, postcss@npm:^6.0.8":
+"postcss@npm:^6.0.21":
   version: 6.0.23
   resolution: "postcss@npm:6.0.23"
   dependencies:
@@ -31460,7 +32159,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:^7.0.0, postcss@npm:^7.0.1, postcss@npm:^7.0.14, postcss@npm:^7.0.17, postcss@npm:^7.0.2, postcss@npm:^7.0.26, postcss@npm:^7.0.27, postcss@npm:^7.0.32, postcss@npm:^7.0.5, postcss@npm:^7.0.6":
+"postcss@npm:^7.0.0, postcss@npm:^7.0.1, postcss@npm:^7.0.13, postcss@npm:^7.0.14, postcss@npm:^7.0.2, postcss@npm:^7.0.26, postcss@npm:^7.0.27, postcss@npm:^7.0.32, postcss@npm:^7.0.5, postcss@npm:^7.0.6, postcss@npm:^7.0.7":
   version: 7.0.39
   resolution: "postcss@npm:7.0.39"
   dependencies:
@@ -31470,7 +32169,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:^8.2.14, postcss@npm:^8.4.27, postcss@npm:^8.4.33, postcss@npm:~8.4.47":
+"postcss@npm:^8.2.14, postcss@npm:^8.4.24, postcss@npm:^8.4.32, postcss@npm:^8.4.33, postcss@npm:^8.4.43, postcss@npm:^8.4.47":
   version: 8.4.47
   resolution: "postcss@npm:8.4.47"
   dependencies:
@@ -31481,7 +32180,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"postcss@npm:^8.3.11, postcss@npm:^8.4.14":
+"postcss@npm:^8.3.11":
   version: 8.4.31
   resolution: "postcss@npm:8.4.31"
   dependencies:
@@ -31492,6 +32191,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"postcss@npm:~8.4.49":
+  version: 8.4.49
+  resolution: "postcss@npm:8.4.49"
+  dependencies:
+    nanoid: "npm:^3.3.7"
+    picocolors: "npm:^1.1.1"
+    source-map-js: "npm:^1.2.1"
+  checksum: 10/28fe1005b1339870e0a5006375ba5ac1213fd69800f79e7db09c398e074421ba6e162898e94f64942fed554037fd292db3811d87835d25ab5ef7f3c9daacb6ca
+  languageName: node
+  linkType: hard
+
 "postgres@npm:^3.4.1, postgres@npm:^3.4.3":
   version: 3.4.4
   resolution: "postgres@npm:3.4.4"
@@ -31506,19 +32216,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"preact-router@npm:^3.2.1":
-  version: 3.2.1
-  resolution: "preact-router@npm:3.2.1"
+"preact-router@npm:^4.1.2":
+  version: 4.1.2
+  resolution: "preact-router@npm:4.1.2"
   peerDependencies:
     preact: ">=10"
-  checksum: 10/0c1f7759372d11cd45baa690991fb87d4da42e437493eb3dd1884aed74c868346c9e16ea66792ac38ef4e9127f1afe36c9f4e1fc4a30d803436eda8bdb61025b
+  checksum: 10/f743a01fc49e3930c74c4328425847c103d93d830779cd5d764ff27878b643c14e1ba150f19334811498c73cd00d8af7adf0a8fbf105d24457fe219605b1cb85
   languageName: node
   linkType: hard
 
-"preact@npm:~10.24.2":
-  version: 10.24.2
-  resolution: "preact@npm:10.24.2"
-  checksum: 10/12b13122ccddb06533daef5ff00ddd4c6a4307f008a235c0b006e72a63c99a33403428f76e8e5e184af8daec344c10a26ce082fb07a62d7c4d6383e9f8e71ee4
+"preact@npm:~10.24.3":
+  version: 10.24.3
+  resolution: "preact@npm:10.24.3"
+  checksum: 10/e9c4c901a4ddd475a1072355b5c6c944b05797445e0d68f317ad0dbc976b831523573693ea75d2e12e7902042e3729af435377816d25558bf693ecf6b516c707
   languageName: node
   linkType: hard
 
@@ -31551,18 +32261,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"preferred-pm@npm:^3.0.0":
-  version: 3.0.3
-  resolution: "preferred-pm@npm:3.0.3"
-  dependencies:
-    find-up: "npm:^5.0.0"
-    find-yarn-workspace-root2: "npm:1.2.16"
-    path-exists: "npm:^4.0.0"
-    which-pm: "npm:2.0.0"
-  checksum: 10/0de0948cb6ae22213f2ad7868032d89f1e1443d9caabc22ceeb9d284f19d359d65b67fab178f4db5c8c6ca6ae34642bdc72730b70ab1899ea158e2677a88a6d0
-  languageName: node
-  linkType: hard
-
 "prefix-style@npm:2.0.1":
   version: 2.0.1
   resolution: "prefix-style@npm:2.0.1"
@@ -31609,7 +32307,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prettier@npm:^2.7.1, prettier@npm:^2.8.4, prettier@npm:~2.8.8":
+"prettier@npm:^2.7.1, prettier@npm:^2.8.4":
   version: 2.8.8
   resolution: "prettier@npm:2.8.8"
   bin:
@@ -31618,6 +32316,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"prettier@npm:~3.3.3":
+  version: 3.3.3
+  resolution: "prettier@npm:3.3.3"
+  bin:
+    prettier: bin/prettier.cjs
+  checksum: 10/5beac1f30b5b40162532b8e2f7c3a4eb650910a2695e9c8512a62ffdc09dae93190c29db9107fa7f26d1b6c71aad3628ecb9b5de1ecb0911191099be109434d7
+  languageName: node
+  linkType: hard
+
 "pretty-error@npm:^4.0.0":
   version: 4.0.0
   resolution: "pretty-error@npm:4.0.0"
@@ -31650,10 +32357,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"process-nextick-args@npm:~1.0.6":
-  version: 1.0.7
-  resolution: "process-nextick-args@npm:1.0.7"
-  checksum: 10/f3b0e2f762e4fc03d02779fbf434caff82d27439ba2ecd82f7f95439e56dc23e367a8c1d3919533bd961b8e447d8ad0d941d6a3acda48ddcb80fe1b45b423579
+"proc-log@npm:^4.1.0, proc-log@npm:^4.2.0":
+  version: 4.2.0
+  resolution: "proc-log@npm:4.2.0"
+  checksum: 10/4e1394491b717f6c1ade15c570ecd4c2b681698474d3ae2d303c1e4b6ab9455bd5a81566211e82890d5a5ae9859718cc6954d5150bb18b09b72ecb297beae90a
   languageName: node
   linkType: hard
 
@@ -31673,10 +32380,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"process-warning@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "process-warning@npm:2.0.0"
-  checksum: 10/efbf769c41898ec68d57a523cbde5a8c1e792261a36362129c9788101342aac85b4cb8261448165d0a4b78115f9c7bc827f3a98d193bca86c8d67c7412dbe272
+"process-warning@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "process-warning@npm:3.0.0"
+  checksum: 10/2d82fa641e50a5789eaf0f2b33453760996e373d4591aac576a22d696186ab7e240a0592db86c264d4f28a46c2abbe9b94689752017db7dadc90f169f12b0924
   languageName: node
   linkType: hard
 
@@ -31694,16 +32401,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"progress-stream@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "progress-stream@npm:2.0.0"
-  dependencies:
-    speedometer: "npm:~1.0.0"
-    through2: "npm:~2.0.3"
-  checksum: 10/839f1009f9feb3d14cbb9bef16eebaecf9560af7b7f64003bfb42c4db1a8e52b32d6bb5a14299a38522046c26bac1bbad1a99eec6fb8fc42b1d4ed3f21f22a41
-  languageName: node
-  linkType: hard
-
 "prom-client@npm:^14.2.0":
   version: 14.2.0
   resolution: "prom-client@npm:14.2.0"
@@ -31762,20 +32459,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"promise.allsettled@npm:^1.0.2":
-  version: 1.0.7
-  resolution: "promise.allsettled@npm:1.0.7"
-  dependencies:
-    array.prototype.map: "npm:^1.0.5"
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.2.0"
-    es-abstract: "npm:^1.22.1"
-    get-intrinsic: "npm:^1.2.1"
-    iterate-value: "npm:^1.0.2"
-  checksum: 10/8d2ddf495543e4d184db3842a7251a812e4e1907688475c9a545ae9ae922b59c0dc83d97af9a084d99cc2ab20ee3254ee0b37803e0c39bca681fb633133d6bd8
-  languageName: node
-  linkType: hard
-
 "promisify-any@npm:2.0.1":
   version: 2.0.1
   resolution: "promisify-any@npm:2.0.1"
@@ -31881,13 +32564,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"psl@npm:^1.1.28, psl@npm:^1.1.33, psl@npm:^1.8.0":
+"psl@npm:^1.1.28, psl@npm:^1.1.33":
   version: 1.8.0
   resolution: "psl@npm:1.8.0"
   checksum: 10/5f62a8eca06cb4a017983d15b92b0d38dc8699d637eabc8cb482c59b4106c9760f59cc8afabcb8bb7b98f0322907680d8f0f59226386fffab5248d180bc04578
   languageName: node
   linkType: hard
 
+"psl@npm:^1.10.0":
+  version: 1.10.0
+  resolution: "psl@npm:1.10.0"
+  dependencies:
+    punycode: "npm:^2.3.1"
+  checksum: 10/17b493648cc16e32c41681a4648db0c7235fbe83c78b0789b519aaccd1240fe739f9a5f4c4b55cb9e3094190ddf16e38f34f5ada179d518593ded42c957bdd8b
+  languageName: node
+  linkType: hard
+
 "public-encrypt@npm:^4.0.0, public-encrypt@npm:^4.0.3":
   version: 4.0.3
   resolution: "public-encrypt@npm:4.0.3"
@@ -31940,6 +32632,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"punycode@npm:^2.3.1":
+  version: 2.3.1
+  resolution: "punycode@npm:2.3.1"
+  checksum: 10/febdc4362bead22f9e2608ff0171713230b57aff9dddc1c273aa2a651fbd366f94b7d6a71d78342a7c0819906750351ca7f2edd26ea41b626d87d6a13d1bd059
+  languageName: node
+  linkType: hard
+
 "pure-rand@npm:^6.0.0":
   version: 6.0.1
   resolution: "pure-rand@npm:6.0.1"
@@ -32090,10 +32789,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"quick-lru@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "quick-lru@npm:4.0.1"
-  checksum: 10/5c7c75f1c696750f619b165cc9957382f919e4207dabf04597a64f0298861391cdc5ee91a1dde1a5d460ecf7ee1af7fc36fef6d155bef2be66f05d43fd63d4f0
+"quick-lru@npm:^1.0.0":
+  version: 1.1.0
+  resolution: "quick-lru@npm:1.1.0"
+  checksum: 10/7fd3fb3fb19dfc1d32bc0799c336f5867adc9ba3d9a662a50fdb463d2bb27d9c89b5e55b01a51fe09c3e251389ea858e1c38326bac8f550ff92dcebbf26665a3
   languageName: node
   linkType: hard
 
@@ -32149,13 +32848,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"range-parser@npm:1.2.0":
-  version: 1.2.0
-  resolution: "range-parser@npm:1.2.0"
-  checksum: 10/1a561fef1feae1cee3a3cb2440d4d9d3ab96cf2eebaf0d3a5cf06aecf91bc869f273ca0e2f05f73a4c530e751e4af0ed2723b7b86aeef296e3eaea7cfd0a5bfb
-  languageName: node
-  linkType: hard
-
 "range-parser@npm:^1.2.1, range-parser@npm:~1.2.1":
   version: 1.2.1
   resolution: "range-parser@npm:1.2.1"
@@ -32236,27 +32928,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"raw-body@npm:2.5.1":
-  version: 2.5.1
-  resolution: "raw-body@npm:2.5.1"
+"raw-body@npm:2.5.2":
+  version: 2.5.2
+  resolution: "raw-body@npm:2.5.2"
   dependencies:
     bytes: "npm:3.1.2"
     http-errors: "npm:2.0.0"
     iconv-lite: "npm:0.4.24"
     unpipe: "npm:1.0.0"
-  checksum: 10/280bedc12db3490ecd06f740bdcf66093a07535374b51331242382c0e130bb273ebb611b7bc4cba1b4b4e016cc7b1f4b05a6df885a6af39c2bc3b94c02291c84
+  checksum: 10/863b5171e140546a4d99f349b720abac4410338e23df5e409cfcc3752538c9caf947ce382c89129ba976f71894bd38b5806c774edac35ebf168d02aa1ac11a95
   languageName: node
   linkType: hard
 
-"raw-body@npm:2.5.2, raw-body@npm:^2.3.3":
-  version: 2.5.2
-  resolution: "raw-body@npm:2.5.2"
+"raw-body@npm:^3, raw-body@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "raw-body@npm:3.0.0"
   dependencies:
     bytes: "npm:3.1.2"
     http-errors: "npm:2.0.0"
-    iconv-lite: "npm:0.4.24"
+    iconv-lite: "npm:0.6.3"
     unpipe: "npm:1.0.0"
-  checksum: 10/863b5171e140546a4d99f349b720abac4410338e23df5e409cfcc3752538c9caf947ce382c89129ba976f71894bd38b5806c774edac35ebf168d02aa1ac11a95
+  checksum: 10/2443429bbb2f9ae5c50d3d2a6c342533dfbde6b3173740b70fa0302b30914ff400c6d31a46b3ceacbe7d0925dc07d4413928278b494b04a65736fc17ca33e30c
   languageName: node
   linkType: hard
 
@@ -32285,7 +32977,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rc@npm:^1.0.1, rc@npm:^1.1.6, rc@npm:^1.2.7":
+"rc@npm:^1.2.7":
   version: 1.2.8
   resolution: "rc@npm:1.2.8"
   dependencies:
@@ -32299,13 +32991,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"re-resizable@npm:^6.9.18":
-  version: 6.9.18
-  resolution: "re-resizable@npm:6.9.18"
+"re-resizable@npm:^6.10.1":
+  version: 6.10.1
+  resolution: "re-resizable@npm:6.10.1"
   peerDependencies:
     react: ^16.13.1 || ^17.0.0 || ^18.0.0
     react-dom: ^16.13.1 || ^17.0.0 || ^18.0.0
-  checksum: 10/cdb2ee8544a2b30053af5cc74ccf56e8d3e470e8e0ed8572424049297cf234d002870dd56c13ce352f222d0dbbc53830c6d07d2cabc83b7aa0311a21361160bf
+  checksum: 10/91e1a9738aaae640696de6b4e286075dd9eb9bf5599edcbcbaa6db0df1f5280213b6d832af69417247cea07f95a2e9be1486fdecde51840c796788b5a8cbaf3d
   languageName: node
   linkType: hard
 
@@ -32372,16 +33064,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-colorful@npm:^5.1.2":
-  version: 5.6.1
-  resolution: "react-colorful@npm:5.6.1"
-  peerDependencies:
-    react: ">=16.8.0"
-    react-dom: ">=16.8.0"
-  checksum: 10/3e02ba013454818d0c323949bd961fb2c19ac18130dfc67a4032aa5b03787c5ffe7ff159c4b97dc3475072d576828ca0c4b8e8ce85b55eaf484180596cdf0403
-  languageName: node
-  linkType: hard
-
 "react-docgen-typescript-plugin@npm:^1.0.8, react-docgen-typescript-plugin@npm:~1.0.8":
   version: 1.0.8
   resolution: "react-docgen-typescript-plugin@npm:1.0.8"
@@ -32451,20 +33133,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-element-to-jsx-string@npm:^15.0.0":
-  version: 15.0.0
-  resolution: "react-element-to-jsx-string@npm:15.0.0"
-  dependencies:
-    "@base2/pretty-print-object": "npm:1.0.1"
-    is-plain-object: "npm:5.0.0"
-    react-is: "npm:18.1.0"
-  peerDependencies:
-    react: ^0.14.8 || ^15.0.1 || ^16.0.0 || ^17.0.1 || ^18.0.0
-    react-dom: ^0.14.8 || ^15.0.1 || ^16.0.0 || ^17.0.1 || ^18.0.0
-  checksum: 10/9a874b2f16b4624a72c4b766b096d693a382b9dc7f2264f802395852ae3435ccde8e9e47bbe45cf5f30eba70f8126af6aca832190e285b0096af3ecade994df1
-  languageName: node
-  linkType: hard
-
 "react-error-boundary@npm:^3.1.4":
   version: 3.1.4
   resolution: "react-error-boundary@npm:3.1.4"
@@ -32512,13 +33180,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-is@npm:18.1.0":
-  version: 18.1.0
-  resolution: "react-is@npm:18.1.0"
-  checksum: 10/fe09c86d5e12a8531bf3e748660f3dffbe900a6da0b488c7efaf0a866e16b74ecc1b0011b0960b13594f8719f39f87a987c0c85edff0b2d3e2f14b87e7230ad2
-  languageName: node
-  linkType: hard
-
 "react-is@npm:^16.13.1, react-is@npm:^16.7.0, react-is@npm:^16.8.6":
   version: 16.13.1
   resolution: "react-is@npm:16.13.1"
@@ -32540,6 +33201,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-is@npm:^18.2.0":
+  version: 18.3.1
+  resolution: "react-is@npm:18.3.1"
+  checksum: 10/d5f60c87d285af24b1e1e7eaeb123ec256c3c8bdea7061ab3932e3e14685708221bf234ec50b21e10dd07f008f1b966a2730a0ce4ff67905b3872ff2042aec22
+  languageName: node
+  linkType: hard
+
 "react-keyed-flatten-children@npm:^1.3.0":
   version: 1.3.0
   resolution: "react-keyed-flatten-children@npm:1.3.0"
@@ -32551,6 +33219,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-keyed-flatten-children@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "react-keyed-flatten-children@npm:3.0.2"
+  dependencies:
+    react-is: "npm:^18.2.0"
+  peerDependencies:
+    react: ">=15.0.0"
+  checksum: 10/58b53ccc707543b3b2f3615a6efe890b1302bf38d68df9239cb4d1ca4e8d8d9c05d670039c08e77befd27b1210c61290d6308a2f8439363e6699fecb94b69ebd
+  languageName: node
+  linkType: hard
+
 "react-lifecycles-compat@npm:^3.0.4":
   version: 3.0.4
   resolution: "react-lifecycles-compat@npm:3.0.4"
@@ -32579,34 +33258,34 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-refresh@npm:^0.14.0":
-  version: 0.14.0
-  resolution: "react-refresh@npm:0.14.0"
-  checksum: 10/75941262ce3ed4fc79b52492943fd59692f29b84f30f3822713b7e920f28e85c62a4386f85cbfbaea95ed62d3e74209f0a0bb065904b7ab2f166a74ac3812e2a
+"react-refresh@npm:^0.14.2":
+  version: 0.14.2
+  resolution: "react-refresh@npm:0.14.2"
+  checksum: 10/512abf97271ab8623486061be04b608c39d932e3709f9af1720b41573415fa4993d0009fa5138b6705b60a98f4102f744d4e26c952b14f41a0e455521c6be4cc
   languageName: node
   linkType: hard
 
-"react-router-dom@npm:^6.11.2":
-  version: 6.11.2
-  resolution: "react-router-dom@npm:6.11.2"
+"react-router-dom@npm:^6.28.0":
+  version: 6.28.0
+  resolution: "react-router-dom@npm:6.28.0"
   dependencies:
-    "@remix-run/router": "npm:1.6.2"
-    react-router: "npm:6.11.2"
+    "@remix-run/router": "npm:1.21.0"
+    react-router: "npm:6.28.0"
   peerDependencies:
     react: ">=16.8"
     react-dom: ">=16.8"
-  checksum: 10/85575793cbdb84b05e9c33fef6f81e6b09e9f2606d2ba03392f83689dbb240212e5b22634b95049fc19364e9b44d45a519387d1bff4eba8a163548aa3376bc0f
+  checksum: 10/e637825132ea96c3514ef7b8322f9bf0b752a942d6b4ffc4c20e389b5911726adf3dba8208ed4b97bf5b9c3bd465d9d1a1db1a58a610a8d528f18d890e0b143f
   languageName: node
   linkType: hard
 
-"react-router@npm:6.11.2":
-  version: 6.11.2
-  resolution: "react-router@npm:6.11.2"
+"react-router@npm:6.28.0":
+  version: 6.28.0
+  resolution: "react-router@npm:6.28.0"
   dependencies:
-    "@remix-run/router": "npm:1.6.2"
+    "@remix-run/router": "npm:1.21.0"
   peerDependencies:
     react: ">=16.8"
-  checksum: 10/a40d1ea78e3b5b3167ed6cbaf74b2e60592fd1822b9f94a2499933bf699130a81f669bc06bdf34f38489a96d31510848c21254a48e49038b18ecbf42993eaa34
+  checksum: 10/f021a644513144884a567d9c2dcc432e8e3233f931378c219c5a3b5b842340f0faca86225a708bafca1e9010965afe1a7dada28aef5b7b6138c885c0552d9a7d
   languageName: node
   linkType: hard
 
@@ -32673,13 +33352,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-virtuoso@npm:^4.7.1":
-  version: 4.7.1
-  resolution: "react-virtuoso@npm:4.7.1"
+"react-virtuoso@npm:^4.12.0":
+  version: 4.12.0
+  resolution: "react-virtuoso@npm:4.12.0"
   peerDependencies:
     react: ">=16 || >=17 || >= 18"
     react-dom: ">=16 || >=17 || >= 18"
-  checksum: 10/c223ef8af0d2186c5469f3a512ad68f98c86e39572e220607e0ff0e441a5b03ea238f0075f183de30c6f3e8d0c42a6af8c8e5a555f1c1122141bf65386e31189
+  checksum: 10/f9d899dc7747e475efb793b849de9bac4f71209f3a74238a4d58d7c0c81543cca35179d64029f014fb6ebad2eab18d9a852444a49c8fe7c5177a18f09b9924d4
   languageName: node
   linkType: hard
 
@@ -32702,20 +33381,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"reactflow@npm:^11.7.2":
-  version: 11.7.2
-  resolution: "reactflow@npm:11.7.2"
+"reactflow@npm:^11.11.4":
+  version: 11.11.4
+  resolution: "reactflow@npm:11.11.4"
   dependencies:
-    "@reactflow/background": "npm:11.2.2"
-    "@reactflow/controls": "npm:11.1.13"
-    "@reactflow/core": "npm:11.7.2"
-    "@reactflow/minimap": "npm:11.5.2"
-    "@reactflow/node-resizer": "npm:2.1.0"
-    "@reactflow/node-toolbar": "npm:1.2.1"
+    "@reactflow/background": "npm:11.3.14"
+    "@reactflow/controls": "npm:11.2.14"
+    "@reactflow/core": "npm:11.11.4"
+    "@reactflow/minimap": "npm:11.7.14"
+    "@reactflow/node-resizer": "npm:2.2.14"
+    "@reactflow/node-toolbar": "npm:1.3.14"
   peerDependencies:
     react: ">=17"
     react-dom: ">=17"
-  checksum: 10/024f413cbfc00fb334a3a514d65fe58c5688f5b8c402afcb98d3ca9d4b9631a520247b757bda15d377bd7b8ec4fb80a8ce24f6332d13546c1760d53e4cae5413
+  checksum: 10/d3322b9971d69762ee4afe5eab16c3d9a2cd362923ad2385d3751ba51f0081a91100c7018597ee0b5eee4b3037ae8ccbded0a27c1bac711252197d8eeaebbe40
   languageName: node
   linkType: hard
 
@@ -32737,6 +33416,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"read-pkg-up@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "read-pkg-up@npm:3.0.0"
+  dependencies:
+    find-up: "npm:^2.0.0"
+    read-pkg: "npm:^3.0.0"
+  checksum: 10/16175573f2914ab9788897bcbe2a62b5728d0075e62285b3680cebe97059e2911e0134a062cf6e51ebe3e3775312bc788ac2039ed6af38ec68d2c10c6f2b30fb
+  languageName: node
+  linkType: hard
+
 "read-pkg-up@npm:^4.0.0":
   version: 4.0.0
   resolution: "read-pkg-up@npm:4.0.0"
@@ -32747,17 +33436,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"read-pkg-up@npm:^7.0.1":
-  version: 7.0.1
-  resolution: "read-pkg-up@npm:7.0.1"
-  dependencies:
-    find-up: "npm:^4.1.0"
-    read-pkg: "npm:^5.2.0"
-    type-fest: "npm:^0.8.1"
-  checksum: 10/e4e93ce70e5905b490ca8f883eb9e48b5d3cebc6cd4527c25a0d8f3ae2903bd4121c5ab9c5a3e217ada0141098eeb661313c86fa008524b089b8ed0b7f165e44
-  languageName: node
-  linkType: hard
-
 "read-pkg-up@npm:^8.0.0":
   version: 8.0.0
   resolution: "read-pkg-up@npm:8.0.0"
@@ -32780,18 +33458,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"read-pkg@npm:^5.2.0":
-  version: 5.2.0
-  resolution: "read-pkg@npm:5.2.0"
-  dependencies:
-    "@types/normalize-package-data": "npm:^2.4.0"
-    normalize-package-data: "npm:^2.5.0"
-    parse-json: "npm:^5.0.0"
-    type-fest: "npm:^0.6.0"
-  checksum: 10/eb696e60528b29aebe10e499ba93f44991908c57d70f2d26f369e46b8b9afc208ef11b4ba64f67630f31df8b6872129e0a8933c8c53b7b4daf0eace536901222
-  languageName: node
-  linkType: hard
-
 "read-pkg@npm:^6.0.0":
   version: 6.0.0
   resolution: "read-pkg@npm:6.0.0"
@@ -32816,16 +33482,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"read@npm:~1.0.7":
-  version: 1.0.7
-  resolution: "read@npm:1.0.7"
-  dependencies:
-    mute-stream: "npm:~0.0.4"
-  checksum: 10/2777c254e5732cac96f5d0a1c0f6b836c89ae23d8febd405b206f6f24d5de1873420f1a0795e0e3721066650d19adf802c7882c4027143ee0acf942a4f34f97b
-  languageName: node
-  linkType: hard
-
-"readable-stream@npm:1.1.x, readable-stream@npm:~1.1.9":
+"readable-stream@npm:1.1.x":
   version: 1.1.14
   resolution: "readable-stream@npm:1.1.14"
   dependencies:
@@ -32837,18 +33494,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"readable-stream@npm:>=1.0.33-1 <1.1.0-0":
-  version: 1.0.34
-  resolution: "readable-stream@npm:1.0.34"
-  dependencies:
-    core-util-is: "npm:~1.0.0"
-    inherits: "npm:~2.0.1"
-    isarray: "npm:0.0.1"
-    string_decoder: "npm:~0.10.x"
-  checksum: 10/20537fca5a8ffd4af0f483be1cce0e981ed8cbb1087e0c762e2e92ae77f1005627272cebed8422f28047b465056aa1961fefd24baf532ca6a3616afea6811ae0
-  languageName: node
-  linkType: hard
-
 "readable-stream@npm:^2, readable-stream@npm:^2.3.8":
   version: 2.3.8
   resolution: "readable-stream@npm:2.3.8"
@@ -32864,7 +33509,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"readable-stream@npm:^2.0.0, readable-stream@npm:^2.0.1, readable-stream@npm:^2.0.2, readable-stream@npm:^2.0.5, readable-stream@npm:^2.2.2, readable-stream@npm:^2.3.0, readable-stream@npm:^2.3.5, readable-stream@npm:^2.3.6, readable-stream@npm:~2.3.6":
+"readable-stream@npm:^2.0.0, readable-stream@npm:^2.0.1, readable-stream@npm:^2.0.2, readable-stream@npm:^2.0.5, readable-stream@npm:^2.2.2, readable-stream@npm:^2.3.0, readable-stream@npm:^2.3.5, readable-stream@npm:~2.3.6":
   version: 2.3.7
   resolution: "readable-stream@npm:2.3.7"
   dependencies:
@@ -32912,20 +33557,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"readable-stream@npm:~2.0.5":
-  version: 2.0.6
-  resolution: "readable-stream@npm:2.0.6"
-  dependencies:
-    core-util-is: "npm:~1.0.0"
-    inherits: "npm:~2.0.1"
-    isarray: "npm:~1.0.0"
-    process-nextick-args: "npm:~1.0.6"
-    string_decoder: "npm:~0.10.x"
-    util-deprecate: "npm:~1.0.1"
-  checksum: 10/c98b8bc4881e27550fd44853b2153c78eb60a693d9fa06c5f44da52f0a7cedf91973caed7b2201cb9031d04b4b6b116f1c58462cc44f3524fe09c1a7c4c37ec1
-  languageName: node
-  linkType: hard
-
 "readable-web-to-node-stream@npm:^3.0.0":
   version: 3.0.2
   resolution: "readable-web-to-node-stream@npm:3.0.2"
@@ -32935,6 +33566,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"readdir-glob@npm:^1.1.2":
+  version: 1.1.3
+  resolution: "readdir-glob@npm:1.1.3"
+  dependencies:
+    minimatch: "npm:^5.1.0"
+  checksum: 10/ca3a20aa1e715d671302d4ec785a32bf08e59d6d0dd25d5fc03e9e5a39f8c612cdf809ab3e638a79973db7ad6868492edf38504701e313328e767693671447d6
+  languageName: node
+  linkType: hard
+
 "readdirp@npm:^4.0.1":
   version: 4.0.2
   resolution: "readdirp@npm:4.0.2"
@@ -32991,6 +33631,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"redent@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "redent@npm:2.0.0"
+  dependencies:
+    indent-string: "npm:^3.0.0"
+    strip-indent: "npm:^2.0.0"
+  checksum: 10/c3bcea97de01023efbe826cd72abf2e5948e096acd808a498b4de5dd25e64ad8df0cb4218403197b4ea050ce73f2264a318bf469a27f87ba8ca31543892011d4
+  languageName: node
+  linkType: hard
+
 "redent@npm:^3.0.0":
   version: 3.0.0
   resolution: "redent@npm:3.0.0"
@@ -33097,6 +33747,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"regex-not@npm:^1.0.0, regex-not@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "regex-not@npm:1.0.2"
+  dependencies:
+    extend-shallow: "npm:^3.0.2"
+    safe-regex: "npm:^1.1.0"
+  checksum: 10/3081403de79559387a35ef9d033740e41818a559512668cef3d12da4e8a29ef34ee13c8ed1256b07e27ae392790172e8a15c8a06b72962fd4550476cde3d8f77
+  languageName: node
+  linkType: hard
+
 "regex-parser@npm:^2.2.11":
   version: 2.3.0
   resolution: "regex-parser@npm:2.3.0"
@@ -33104,7 +33764,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"regexp.prototype.flags@npm:^1.4.3, regexp.prototype.flags@npm:^1.5.2":
+"regexp.prototype.flags@npm:^1.5.2":
   version: 1.5.2
   resolution: "regexp.prototype.flags@npm:1.5.2"
   dependencies:
@@ -33116,6 +33776,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"regexp.prototype.flags@npm:^1.5.3":
+  version: 1.5.3
+  resolution: "regexp.prototype.flags@npm:1.5.3"
+  dependencies:
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-errors: "npm:^1.3.0"
+    set-function-name: "npm:^2.0.2"
+  checksum: 10/fe17bc4eebbc72945aaf9dd059eb7784a5ca453a67cc4b5b3e399ab08452c9a05befd92063e2c52e7b24d9238c60031656af32dd57c555d1ba6330dbf8c23b43
+  languageName: node
+  linkType: hard
+
 "regexpu-core@npm:^5.3.1":
   version: 5.3.2
   resolution: "regexpu-core@npm:5.3.2"
@@ -33144,35 +33816,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"registry-auth-token@npm:3.3.2":
-  version: 3.3.2
-  resolution: "registry-auth-token@npm:3.3.2"
-  dependencies:
-    rc: "npm:^1.1.6"
-    safe-buffer: "npm:^5.0.1"
-  checksum: 10/5a76bd9b4290b1b1624646862239ec36f0d856218035a5b716f4f9bb3b28c87068f0ec834a5e4e4ad0feab726b35def919ce2219ceafa9bef02cd4f516805e1b
-  languageName: node
-  linkType: hard
-
-"registry-auth-token@npm:^3.0.1":
-  version: 3.4.0
-  resolution: "registry-auth-token@npm:3.4.0"
-  dependencies:
-    rc: "npm:^1.1.6"
-    safe-buffer: "npm:^5.0.1"
-  checksum: 10/28bcdf822fb09a5d6c95adc4b6b7685a4e9eb16bdccd90ce77cc010917f330cb8f8b20ae9db83304ba56d9498e96f008707e1310bb95edd6f5eaa3248fc22bd5
-  languageName: node
-  linkType: hard
-
-"registry-url@npm:3.1.0, registry-url@npm:^3.0.3":
-  version: 3.1.0
-  resolution: "registry-url@npm:3.1.0"
-  dependencies:
-    rc: "npm:^1.0.1"
-  checksum: 10/6d223da41b04e1824f5faa63905c6f2e43b216589d72794111573f017352b790aef42cd1f826463062f89d804abb2027e3d9665d2a9a0426a11eedd04d470af3
-  languageName: node
-  linkType: hard
-
 "regjsgen@npm:^0.8.0":
   version: 0.8.0
   resolution: "regjsgen@npm:0.8.0"
@@ -33202,33 +33845,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rehype-external-links@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "rehype-external-links@npm:3.0.0"
-  dependencies:
-    "@types/hast": "npm:^3.0.0"
-    "@ungap/structured-clone": "npm:^1.0.0"
-    hast-util-is-element: "npm:^3.0.0"
-    is-absolute-url: "npm:^4.0.0"
-    space-separated-tokens: "npm:^2.0.0"
-    unist-util-visit: "npm:^5.0.0"
-  checksum: 10/b9b2e4e5974a7d1e4030dc42bfad980d4700af35b6b20b36fc7ff0521897a8f20d3fe5e170255c428148fdd5a0653a73683da783124038d17b24f26dd59d20e8
-  languageName: node
-  linkType: hard
-
-"rehype-slug@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "rehype-slug@npm:6.0.0"
-  dependencies:
-    "@types/hast": "npm:^3.0.0"
-    github-slugger: "npm:^2.0.0"
-    hast-util-heading-rank: "npm:^3.0.0"
-    hast-util-to-string: "npm:^3.0.0"
-    unist-util-visit: "npm:^5.0.0"
-  checksum: 10/292074643f8462c70f498bc8bf18a8c959073b96efc249f61e69fa9e36eb81d9b91d62199a90217c604e1c3904e8ff0a75df70d67e41bead56de93afb725c2d0
-  languageName: node
-  linkType: hard
-
 "relateurl@npm:^0.2.7":
   version: 0.2.7
   resolution: "relateurl@npm:0.2.7"
@@ -33254,6 +33870,29 @@ __metadata:
   languageName: node
   linkType: hard
 
+"remark-parse@npm:^6.0.0":
+  version: 6.0.3
+  resolution: "remark-parse@npm:6.0.3"
+  dependencies:
+    collapse-white-space: "npm:^1.0.2"
+    is-alphabetical: "npm:^1.0.0"
+    is-decimal: "npm:^1.0.0"
+    is-whitespace-character: "npm:^1.0.0"
+    is-word-character: "npm:^1.0.0"
+    markdown-escapes: "npm:^1.0.0"
+    parse-entities: "npm:^1.1.0"
+    repeat-string: "npm:^1.5.4"
+    state-toggle: "npm:^1.0.0"
+    trim: "npm:0.0.1"
+    trim-trailing-lines: "npm:^1.0.0"
+    unherit: "npm:^1.0.4"
+    unist-util-remove-position: "npm:^1.0.0"
+    vfile-location: "npm:^2.0.0"
+    xtend: "npm:^4.0.1"
+  checksum: 10/5c47a4dfd03a392c5feba3990e8b917fdc2b13798eabc1cfba49718741907c391881423e4333de43b22f59f3b5eb220e41fcc805e0fd310fcfa1929d83ed6d7b
+  languageName: node
+  linkType: hard
+
 "remark-stringify@npm:9.0.1":
   version: 9.0.1
   resolution: "remark-stringify@npm:9.0.1"
@@ -33263,17 +33902,36 @@ __metadata:
   languageName: node
   linkType: hard
 
-"remove-accents@npm:0.4.2":
-  version: 0.4.2
-  resolution: "remove-accents@npm:0.4.2"
-  checksum: 10/25d5c84f1355be60b42f8ad8a1ba29c2413dead138a9e2a88633e4fc94a1b953afe306dd27479125aef231d267482c54d292e558b04ec100fb9adf063ccbf75a
+"remark-stringify@npm:^6.0.0":
+  version: 6.0.4
+  resolution: "remark-stringify@npm:6.0.4"
+  dependencies:
+    ccount: "npm:^1.0.0"
+    is-alphanumeric: "npm:^1.0.0"
+    is-decimal: "npm:^1.0.0"
+    is-whitespace-character: "npm:^1.0.0"
+    longest-streak: "npm:^2.0.1"
+    markdown-escapes: "npm:^1.0.0"
+    markdown-table: "npm:^1.1.0"
+    mdast-util-compact: "npm:^1.0.0"
+    parse-entities: "npm:^1.0.2"
+    repeat-string: "npm:^1.5.4"
+    state-toggle: "npm:^1.0.0"
+    stringify-entities: "npm:^1.0.1"
+    unherit: "npm:^1.0.4"
+    xtend: "npm:^4.0.1"
+  checksum: 10/7d758ff3deb7d1d54a0b685cdb3660c731b04dacd81b8392b6ab1dfd5afdf441434fe51354b293114c3de28eb5bd6b0467bcf6b8beaf95bd69cbdca00fa917b9
   languageName: node
   linkType: hard
 
-"remove-markdown@npm:^0.2.2":
-  version: 0.2.2
-  resolution: "remove-markdown@npm:0.2.2"
-  checksum: 10/c4502042f8ad5587c304d3945dd723c491dd15795ce6fcc1da64877b64ef2a6528452efbed5c0c63e42bee2dd5aff1933f95df6a8b2293fcf507086dcf842503
+"remark@npm:^10.0.1":
+  version: 10.0.1
+  resolution: "remark@npm:10.0.1"
+  dependencies:
+    remark-parse: "npm:^6.0.0"
+    remark-stringify: "npm:^6.0.0"
+    unified: "npm:^7.0.0"
+  checksum: 10/2509aeaf74a02944158d053e3cbed7dc92ee94b7dccbadc0dc78cd93073c9d3504b164eb537a1bbbad4793992e539cb65aa9c8ec3a6fa1515752955537a405a3
   languageName: node
   linkType: hard
 
@@ -33290,13 +33948,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"repeat-string@npm:^1.0.0, repeat-string@npm:^1.6.1":
+"repeat-element@npm:^1.1.2":
+  version: 1.1.4
+  resolution: "repeat-element@npm:1.1.4"
+  checksum: 10/1edd0301b7edad71808baad226f0890ba709443f03a698224c9ee4f2494c317892dc5211b2ba8cbea7194a9ddbcac01e283bd66de0467ab24ee1fc1a3711d8a9
+  languageName: node
+  linkType: hard
+
+"repeat-string@npm:^1.0.0, repeat-string@npm:^1.5.4, repeat-string@npm:^1.6.1":
   version: 1.6.1
   resolution: "repeat-string@npm:1.6.1"
   checksum: 10/1b809fc6db97decdc68f5b12c4d1a671c8e3f65ec4a40c238bc5200e44e85bcc52a54f78268ab9c29fcf5fe4f1343e805420056d1f30fa9a9ee4c2d93e3cc6c0
   languageName: node
   linkType: hard
 
+"replace-ext@npm:1.0.0":
+  version: 1.0.0
+  resolution: "replace-ext@npm:1.0.0"
+  checksum: 10/123e5c28046e4f0b82e1cdedb0340058d362ddbd8e17d98e5068bbacc3b3b397b4d8e3c69d603f9c4c0f6a6494852064396570c44f9426a4673dba63850fab34
+  languageName: node
+  linkType: hard
+
 "replace-ext@npm:^1.0.0":
   version: 1.0.1
   resolution: "replace-ext@npm:1.0.1"
@@ -33329,7 +34001,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"request@npm:^2.68.0, request@npm:^2.82.0, request@npm:^2.85.0, request@npm:^2.88.0, request@npm:^2.88.2":
+"request@npm:^2.68.0, request@npm:^2.88.2":
   version: 2.88.2
   resolution: "request@npm:2.88.2"
   dependencies:
@@ -33389,7 +34061,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"requireindex@npm:1.2.0, requireindex@npm:^1.1.0, requireindex@npm:^1.2.0":
+"requireindex@npm:1.2.0":
   version: 1.2.0
   resolution: "requireindex@npm:1.2.0"
   checksum: 10/266d1cb31f6cbc4b6cf2e898f5bbc45581f7919bcf61bba5c45d0adb69b722b9ff5a13727be3350cde4520d7cd37f39df45d58a29854baaa4552cd6b05ae4a1a
@@ -33446,6 +34118,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"resolve-url@npm:^0.2.1":
+  version: 0.2.1
+  resolution: "resolve-url@npm:0.2.1"
+  checksum: 10/c8bbf6385730add6657103929ebd7e4aa623a2c2df29bba28a58fec73097c003edcce475efefa51c448a904aa344a4ebabe6ad85c8e75c72c4ce9a0c0b5652d2
+  languageName: node
+  linkType: hard
+
 "resolve.exports@npm:^2.0.0":
   version: 2.0.2
   resolution: "resolve.exports@npm:2.0.2"
@@ -33453,7 +34132,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@npm:^1.1.4, resolve@npm:^1.1.7, resolve@npm:^1.10.0, resolve@npm:^1.11.1, resolve@npm:^1.14.2, resolve@npm:^1.17.0, resolve@npm:^1.20.0, resolve@npm:^1.22.0, resolve@npm:^1.22.1, resolve@npm:^1.22.2, resolve@npm:^1.22.8, resolve@npm:^1.4.0":
+"resolve@npm:^1.1.4, resolve@npm:^1.1.7, resolve@npm:^1.10.0, resolve@npm:^1.11.1, resolve@npm:^1.14.2, resolve@npm:^1.17.0, resolve@npm:^1.20.0, resolve@npm:^1.22.1, resolve@npm:^1.22.2, resolve@npm:^1.22.4, resolve@npm:^1.22.8, resolve@npm:^1.4.0":
   version: 1.22.8
   resolution: "resolve@npm:1.22.8"
   dependencies:
@@ -33466,20 +34145,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@npm:^2.0.0-next.4":
-  version: 2.0.0-next.4
-  resolution: "resolve@npm:2.0.0-next.4"
+"resolve@npm:^2.0.0-next.5":
+  version: 2.0.0-next.5
+  resolution: "resolve@npm:2.0.0-next.5"
   dependencies:
-    is-core-module: "npm:^2.9.0"
+    is-core-module: "npm:^2.13.0"
     path-parse: "npm:^1.0.7"
     supports-preserve-symlinks-flag: "npm:^1.0.0"
   bin:
     resolve: bin/resolve
-  checksum: 10/20d5293f5015aa0b65c488ee365f9dfc30b954b04f9074425a6fb738d78fa63825a82ba8574b7ee200af7ebd5e98c41786831d1d4c1612da3cd063980dfa06a3
+  checksum: 10/2d6fd28699f901744368e6f2032b4268b4c7b9185fd8beb64f68c93ac6b22e52ae13560ceefc96241a665b985edf9ffd393ae26d2946a7d3a07b7007b7d51e79
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@npm%3A^1.1.4#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.1.7#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.10.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.11.1#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.14.2#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.17.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.1#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.2#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.8#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.4.0#optional!builtin<compat/resolve>":
+"resolve@patch:resolve@npm%3A^1.1.4#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.1.7#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.10.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.11.1#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.14.2#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.17.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.1#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.2#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.22.8#optional!builtin<compat/resolve>, resolve@patch:resolve@npm%3A^1.4.0#optional!builtin<compat/resolve>":
   version: 1.22.8
   resolution: "resolve@patch:resolve@npm%3A1.22.8#optional!builtin<compat/resolve>::version=1.22.8&hash=c3c19d"
   dependencies:
@@ -33492,16 +34171,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"resolve@patch:resolve@npm%3A^2.0.0-next.4#optional!builtin<compat/resolve>":
-  version: 2.0.0-next.4
-  resolution: "resolve@patch:resolve@npm%3A2.0.0-next.4#optional!builtin<compat/resolve>::version=2.0.0-next.4&hash=c3c19d"
+"resolve@patch:resolve@npm%3A^2.0.0-next.5#optional!builtin<compat/resolve>":
+  version: 2.0.0-next.5
+  resolution: "resolve@patch:resolve@npm%3A2.0.0-next.5#optional!builtin<compat/resolve>::version=2.0.0-next.5&hash=c3c19d"
   dependencies:
-    is-core-module: "npm:^2.9.0"
+    is-core-module: "npm:^2.13.0"
     path-parse: "npm:^1.0.7"
     supports-preserve-symlinks-flag: "npm:^1.0.0"
   bin:
     resolve: bin/resolve
-  checksum: 10/27bff19d8219385bb1e271066317e553cff18daa2a19db9598d94ae444417ef3f5aec19e86927872d6cb241d02649cfb35a4c0d9d10ef2afa6325bce8bc8d903
+  checksum: 10/05fa778de9d0347c8b889eb7a18f1f06bf0f801b0eb4610b4871a4b2f22e220900cf0ad525e94f990bb8d8921c07754ab2122c0c225ab4cdcea98f36e64fa4c2
   languageName: node
   linkType: hard
 
@@ -33514,16 +34193,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"restore-cursor@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "restore-cursor@npm:2.0.0"
-  dependencies:
-    onetime: "npm:^2.0.0"
-    signal-exit: "npm:^3.0.2"
-  checksum: 10/482e13d02d834b6e5e3aa90304a8b5e840775d6f06916cc92a50038adf9f098dcc72405b567da8a37e137ae40ad3e31896fa3136ae62f7a426c2fbf53d036536
-  languageName: node
-  linkType: hard
-
 "restore-cursor@npm:^3.1.0":
   version: 3.1.0
   resolution: "restore-cursor@npm:3.1.0"
@@ -33548,6 +34217,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ret@npm:~0.1.10":
+  version: 0.1.15
+  resolution: "ret@npm:0.1.15"
+  checksum: 10/07c9e7619b4c86053fa57689bf7606b5a40fc1231fc87682424d0b3e296641cc19c218c3b8a8917305fbcca3bfc43038a5b6a63f54755c1bbca2f91857253b03
+  languageName: node
+  linkType: hard
+
 "retry-request@npm:^5.0.0":
   version: 5.0.2
   resolution: "retry-request@npm:5.0.2"
@@ -33600,6 +34276,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rimraf@npm:2.6.3":
+  version: 2.6.3
+  resolution: "rimraf@npm:2.6.3"
+  dependencies:
+    glob: "npm:^7.1.3"
+  bin:
+    rimraf: ./bin.js
+  checksum: 10/756419f2fa99aa119c46a9fc03e09d84ecf5421a80a72d1944c5088c9e4671e77128527a900a313ed9d3fdbdd37e2ae05486cd7e9116d5812d8c31f2399d7c86
+  languageName: node
+  linkType: hard
+
 "rimraf@npm:^2.5.4, rimraf@npm:^2.6.2, rimraf@npm:^2.6.3":
   version: 2.7.1
   resolution: "rimraf@npm:2.7.1"
@@ -33644,16 +34331,24 @@ __metadata:
   languageName: node
   linkType: hard
 
+"robust-predicates@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "robust-predicates@npm:3.0.2"
+  checksum: 10/88bd7d45a6b89e88da2631d4c111aaaf0443de4d7078e9ab7f732245790a3645cf79bf91882a9740dbc959cf56ba75d5dced5bf2259410f8b6de19fd240cd08c
+  languageName: node
+  linkType: hard
+
 "rocket.chat@workspace:.":
   version: 0.0.0-use.local
   resolution: "rocket.chat@workspace:."
   dependencies:
-    "@changesets/cli": "npm:^2.26.2"
+    "@changesets/cli": "npm:^2.27.9"
     "@types/chart.js": "npm:^2.9.41"
     "@types/js-yaml": "npm:^4.0.9"
-    node-gyp: "npm:^9.4.1"
+    "@types/stream-buffers": "npm:^3.0.7"
+    node-gyp: "npm:^10.2.0"
     ts-node: "npm:^10.9.2"
-    turbo: "npm:^2.1.3"
+    turbo: "npm:^2.2.3"
   languageName: unknown
   linkType: soft
 
@@ -33665,7 +34360,7 @@ __metadata:
     "@rocket.chat/core-services": "workspace:^"
     "@rocket.chat/core-typings": "workspace:^"
     "@rocket.chat/emitter": "npm:~0.31.25"
-    "@rocket.chat/icons": "npm:~0.38.0"
+    "@rocket.chat/icons": "npm:~0.39.0"
     "@rocket.chat/message-parser": "workspace:^"
     "@rocket.chat/model-typings": "workspace:^"
     "@rocket.chat/models": "workspace:^"
@@ -33678,59 +34373,100 @@ __metadata:
     "@types/ejson": "npm:^2.2.2"
     "@types/express": "npm:^4.17.21"
     "@types/fibers": "npm:^3.1.4"
-    "@types/node": "npm:~20.16.12"
-    "@types/ws": "npm:^8.5.12"
-    ajv: "npm:^8.11.0"
-    bcrypt: "npm:^5.0.1"
+    "@types/node": "npm:~20.16.15"
+    "@types/ws": "npm:^8.5.13"
+    ajv: "npm:^8.17.1"
+    bcrypt: "npm:^5.1.1"
     body-parser: "npm:^1.20.3"
     colorette: "npm:^2.0.20"
-    cookie: "npm:^0.5.0"
+    cookie: "npm:^0.7.2"
     cookie-parser: "npm:^1.4.7"
     ejson: "npm:^2.2.3"
-    eventemitter3: "npm:^4.0.7"
-    express: "npm:^4.17.3"
+    eventemitter3: "npm:^5.0.1"
+    express: "npm:^4.21.1"
     jaeger-client: "npm:^3.19.0"
     mem: "npm:^8.1.1"
-    moleculer: "npm:^0.14.34"
+    moleculer: "npm:^0.14.35"
     mongodb: "patch:mongodb@npm%3A4.17.2#~/.yarn/patches/mongodb-npm-4.17.2-40d1286d70.patch"
-    nats: "npm:^2.6.1"
+    nats: "npm:^2.28.2"
     npm-run-all: "npm:^4.1.5"
-    pino: "npm:^8.15.0"
+    pino: "npm:^8.21.0"
     pino-pretty: "npm:^7.6.1"
-    sodium-native: "npm:^3.3.0"
+    sodium-native: "npm:^4.3.1"
     sodium-plus: "npm:^0.9.0"
     ts-node: "npm:^10.9.2"
     typescript: "npm:~5.6.3"
-    uuid: "npm:^8.3.2"
+    uuid: "npm:^11.0.3"
     ws: "npm:^8.18.0"
   languageName: unknown
   linkType: soft
 
-"rollup@npm:^3.2.5":
-  version: 3.28.1
-  resolution: "rollup@npm:3.28.1"
-  dependencies:
+"rollup@npm:^4.20.0":
+  version: 4.24.4
+  resolution: "rollup@npm:4.24.4"
+  dependencies:
+    "@rollup/rollup-android-arm-eabi": "npm:4.24.4"
+    "@rollup/rollup-android-arm64": "npm:4.24.4"
+    "@rollup/rollup-darwin-arm64": "npm:4.24.4"
+    "@rollup/rollup-darwin-x64": "npm:4.24.4"
+    "@rollup/rollup-freebsd-arm64": "npm:4.24.4"
+    "@rollup/rollup-freebsd-x64": "npm:4.24.4"
+    "@rollup/rollup-linux-arm-gnueabihf": "npm:4.24.4"
+    "@rollup/rollup-linux-arm-musleabihf": "npm:4.24.4"
+    "@rollup/rollup-linux-arm64-gnu": "npm:4.24.4"
+    "@rollup/rollup-linux-arm64-musl": "npm:4.24.4"
+    "@rollup/rollup-linux-powerpc64le-gnu": "npm:4.24.4"
+    "@rollup/rollup-linux-riscv64-gnu": "npm:4.24.4"
+    "@rollup/rollup-linux-s390x-gnu": "npm:4.24.4"
+    "@rollup/rollup-linux-x64-gnu": "npm:4.24.4"
+    "@rollup/rollup-linux-x64-musl": "npm:4.24.4"
+    "@rollup/rollup-win32-arm64-msvc": "npm:4.24.4"
+    "@rollup/rollup-win32-ia32-msvc": "npm:4.24.4"
+    "@rollup/rollup-win32-x64-msvc": "npm:4.24.4"
+    "@types/estree": "npm:1.0.6"
     fsevents: "npm:~2.3.2"
   dependenciesMeta:
-    fsevents:
+    "@rollup/rollup-android-arm-eabi":
+      optional: true
+    "@rollup/rollup-android-arm64":
+      optional: true
+    "@rollup/rollup-darwin-arm64":
+      optional: true
+    "@rollup/rollup-darwin-x64":
+      optional: true
+    "@rollup/rollup-freebsd-arm64":
+      optional: true
+    "@rollup/rollup-freebsd-x64":
+      optional: true
+    "@rollup/rollup-linux-arm-gnueabihf":
+      optional: true
+    "@rollup/rollup-linux-arm-musleabihf":
+      optional: true
+    "@rollup/rollup-linux-arm64-gnu":
+      optional: true
+    "@rollup/rollup-linux-arm64-musl":
+      optional: true
+    "@rollup/rollup-linux-powerpc64le-gnu":
+      optional: true
+    "@rollup/rollup-linux-riscv64-gnu":
+      optional: true
+    "@rollup/rollup-linux-s390x-gnu":
+      optional: true
+    "@rollup/rollup-linux-x64-gnu":
+      optional: true
+    "@rollup/rollup-linux-x64-musl":
+      optional: true
+    "@rollup/rollup-win32-arm64-msvc":
+      optional: true
+    "@rollup/rollup-win32-ia32-msvc":
+      optional: true
+    "@rollup/rollup-win32-x64-msvc":
       optional: true
-  bin:
-    rollup: dist/bin/rollup
-  checksum: 10/007423d1750273a8c4bb33dc450a795d03a627bf455d9674b79f05d6c6569090b50ad08dd87cf5f4777c553fc0559e41e5de3b8a87c23e7f32291c2a33d09aa2
-  languageName: node
-  linkType: hard
-
-"rollup@npm:^3.27.1":
-  version: 3.29.5
-  resolution: "rollup@npm:3.29.5"
-  dependencies:
-    fsevents: "npm:~2.3.2"
-  dependenciesMeta:
     fsevents:
       optional: true
   bin:
     rollup: dist/bin/rollup
-  checksum: 10/5ce0e5f1d9288d4954db93993477f894eb3042ec98a7c9c19980e53b1f58296481e3dc6c2b1a2a3680b20eb6c3fe64ed97942d5ff29df658a059647c33b3593c
+  checksum: 10/a8ffde17d7cd5d9eaaf91bb025de83329b034771254d34b977df3f294e0992f6d89a444a0c8e9d73c8721d60cedf5be32fa8bd6f157874700bb8043c61ca660a
   languageName: node
   linkType: hard
 
@@ -33741,6 +34477,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"router@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "router@npm:2.0.0"
+  dependencies:
+    array-flatten: "npm:3.0.0"
+    is-promise: "npm:4.0.0"
+    methods: "npm:~1.1.2"
+    parseurl: "npm:~1.3.3"
+    path-to-regexp: "npm:^8.0.0"
+    setprototypeof: "npm:1.2.0"
+    utils-merge: "npm:1.0.1"
+  checksum: 10/cb0b044f0672eca104239680ac16d2629809df41a886a07a5ec319c683ef3c09c4ac0c88a91de2cea3da7d314ea6054d9c35840851ab55a3c2230e9ba690a885
+  languageName: node
+  linkType: hard
+
 "run-applescript@npm:^7.0.0":
   version: 7.0.0
   resolution: "run-applescript@npm:7.0.0"
@@ -33748,7 +34499,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"run-async@npm:^2.2.0, run-async@npm:^2.4.0":
+"run-async@npm:^2.4.0":
   version: 2.4.1
   resolution: "run-async@npm:2.4.1"
   checksum: 10/c79551224dafa26ecc281cb1efad3510c82c79116aaf681f8a931ce70fdf4ca880d58f97d3b930a38992c7aad7955a08e065b32ec194e1dd49d7790c874ece50
@@ -33764,15 +34515,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rxjs@npm:^6.4.0":
-  version: 6.6.7
-  resolution: "rxjs@npm:6.6.7"
-  dependencies:
-    tslib: "npm:^1.9.0"
-  checksum: 10/c8263ebb20da80dd7a91c452b9e96a178331f402344bbb40bc772b56340fcd48d13d1f545a1e3d8e464893008c5e306cc42a1552afe0d562b1a6d4e1e6262b03
-  languageName: node
-  linkType: hard
-
 "rxjs@npm:^7.5.5":
   version: 7.8.1
   resolution: "rxjs@npm:7.8.1"
@@ -33819,6 +34561,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"safe-regex@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "safe-regex@npm:1.1.0"
+  dependencies:
+    ret: "npm:~0.1.10"
+  checksum: 10/5405b5a3effed649e6133d51d45cecbbbb02a1dd8d5b78a5e7979a69035870c817a5d2682d0ebb62188d3a840f7b24ea00ebbad2e418d5afabed151e8db96d04
+  languageName: node
+  linkType: hard
+
 "safe-stable-stringify@npm:^2.3.1":
   version: 2.3.1
   resolution: "safe-stable-stringify@npm:2.3.1"
@@ -33847,9 +34598,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sass-loader@npm:~16.0.2":
-  version: 16.0.2
-  resolution: "sass-loader@npm:16.0.2"
+"sass-loader@npm:~16.0.3":
+  version: 16.0.3
+  resolution: "sass-loader@npm:16.0.3"
   dependencies:
     neo-async: "npm:^2.6.2"
   peerDependencies:
@@ -33869,21 +34620,24 @@ __metadata:
       optional: true
     webpack:
       optional: true
-  checksum: 10/a24ae7f6b7ef2159274b47c0a7e35cb3bfb56367a192d362ff7674f2b85b2c7bfd021e83e9351d3af36b66524efd85ebf70e242971c0b807af6622ba4ee8e298
+  checksum: 10/cd49635013efae80b3a24b7e655a6f2334078006f270d50ac9e6ed19a44a80d689b402b5584b64ca737c3f948366a47e2896d07cead19015de7b2bd03f778d2b
   languageName: node
   linkType: hard
 
-"sass@npm:~1.79.5":
-  version: 1.79.5
-  resolution: "sass@npm:1.79.5"
+"sass@npm:~1.80.7":
+  version: 1.80.7
+  resolution: "sass@npm:1.80.7"
   dependencies:
     "@parcel/watcher": "npm:^2.4.1"
     chokidar: "npm:^4.0.0"
-    immutable: "npm:^4.0.0"
+    immutable: "npm:^5.0.2"
     source-map-js: "npm:>=0.6.2 <2.0.0"
+  dependenciesMeta:
+    "@parcel/watcher":
+      optional: true
   bin:
     sass: sass.js
-  checksum: 10/86f6ebe9c3c8d86cf8fff2e12f93109697140090604fb6180c8792c0e4fc98377c433dbd4c86a0272c47ba4c307edf24435a06d7e5995956048a23f9e187fedc
+  checksum: 10/617966d361968d6354bc17c0e2a66c6e0d822684b3694590441035e4966418304bbd4912ff4ee55e7a5751f94624057cd99ebc27964b102619e4e755b1f94f0e
   languageName: node
   linkType: hard
 
@@ -33948,7 +34702,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"schema-utils@npm:^2.6.5, schema-utils@npm:^2.7.0, schema-utils@npm:^2.7.1":
+"schema-utils@npm:^2.7.0, schema-utils@npm:^2.7.1":
   version: 2.7.1
   resolution: "schema-utils@npm:2.7.1"
   dependencies:
@@ -34046,22 +34800,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver-compare@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "semver-compare@npm:1.0.0"
-  checksum: 10/75f9c7a7786d1756f64b1429017746721e07bd7691bdad6368f7643885d3a98a27586777e9699456564f4844b407e9f186cc1d588a3f9c0be71310e517e942c3
-  languageName: node
-  linkType: hard
-
-"semver-diff@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "semver-diff@npm:2.1.0"
-  dependencies:
-    semver: "npm:^5.0.3"
-  checksum: 10/14e50363d12ac7e77c2dd89319d97f9ec075ed8ee7ab1bde867b30f8e890fffd637dd90c7c2559e2431278d555b8bc6abc5796bb40b734cea267631c9501827c
-  languageName: node
-  linkType: hard
-
 "semver-regex@npm:^2.0.0":
   version: 2.0.0
   resolution: "semver-regex@npm:2.0.0"
@@ -34069,13 +34807,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver-regex@npm:^3.1.2":
-  version: 3.1.3
-  resolution: "semver-regex@npm:3.1.3"
-  checksum: 10/a40c17716679f413994ba4723cf32cf94160a4a3db36e3f730f840cb36bbdbcfda2a34df051d1adb56ed2c67c2a00badfaa9e1e4b755ae6addc7d23ebf55c32b
-  languageName: node
-  linkType: hard
-
 "semver-truncate@npm:^1.1.2":
   version: 1.1.2
   resolution: "semver-truncate@npm:1.1.2"
@@ -34085,7 +34816,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.0.3, semver@npm:^5.1.0, semver@npm:^5.3.0, semver@npm:^5.5.0, semver@npm:^5.6.0":
+"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.3.0, semver@npm:^5.5.0, semver@npm:^5.6.0":
   version: 5.7.1
   resolution: "semver@npm:5.7.1"
   bin:
@@ -34094,21 +34825,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver@npm:^6.0.0, semver@npm:^6.3.0, semver@npm:^6.3.1":
-  version: 6.3.1
-  resolution: "semver@npm:6.3.1"
+"semver@npm:7.6.3, semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.5.2, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.0, semver@npm:^7.6.2, semver@npm:^7.6.3":
+  version: 7.6.3
+  resolution: "semver@npm:7.6.3"
   bin:
     semver: bin/semver.js
-  checksum: 10/1ef3a85bd02a760c6ef76a45b8c1ce18226de40831e02a00bad78485390b98b6ccaa31046245fc63bba4a47a6a592b6c7eedc65cc47126e60489f9cc1ce3ed7e
+  checksum: 10/36b1fbe1a2b6f873559cd57b238f1094a053dbfd997ceeb8757d79d1d2089c56d1321b9f1069ce263dc64cfa922fa1d2ad566b39426fe1ac6c723c1487589e10
   languageName: node
   linkType: hard
 
-"semver@npm:^7.3.2, semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7, semver@npm:^7.5.2, semver@npm:^7.5.3, semver@npm:^7.5.4, semver@npm:^7.6.2, semver@npm:^7.6.3":
-  version: 7.6.3
-  resolution: "semver@npm:7.6.3"
+"semver@npm:^6.0.0, semver@npm:^6.3.0, semver@npm:^6.3.1":
+  version: 6.3.1
+  resolution: "semver@npm:6.3.1"
   bin:
     semver: bin/semver.js
-  checksum: 10/36b1fbe1a2b6f873559cd57b238f1094a053dbfd997ceeb8757d79d1d2089c56d1321b9f1069ce263dc64cfa922fa1d2ad566b39426fe1ac6c723c1487589e10
+  checksum: 10/1ef3a85bd02a760c6ef76a45b8c1ce18226de40831e02a00bad78485390b98b6ccaa31046245fc63bba4a47a6a592b6c7eedc65cc47126e60489f9cc1ce3ed7e
   languageName: node
   linkType: hard
 
@@ -34121,27 +34852,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"send@npm:0.18.0":
-  version: 0.18.0
-  resolution: "send@npm:0.18.0"
-  dependencies:
-    debug: "npm:2.6.9"
-    depd: "npm:2.0.0"
-    destroy: "npm:1.2.0"
-    encodeurl: "npm:~1.0.2"
-    escape-html: "npm:~1.0.3"
-    etag: "npm:~1.8.1"
-    fresh: "npm:0.5.2"
-    http-errors: "npm:2.0.0"
-    mime: "npm:1.6.0"
-    ms: "npm:2.1.3"
-    on-finished: "npm:2.4.1"
-    range-parser: "npm:~1.2.1"
-    statuses: "npm:2.0.1"
-  checksum: 10/ec66c0ad109680ad8141d507677cfd8b4e40b9559de23191871803ed241718e99026faa46c398dcfb9250676076573bd6bfe5d0ec347f88f4b7b8533d1d391cb
-  languageName: node
-  linkType: hard
-
 "send@npm:0.19.0":
   version: 0.19.0
   resolution: "send@npm:0.19.0"
@@ -34163,6 +34873,26 @@ __metadata:
   languageName: node
   linkType: hard
 
+"send@npm:^1.0.0, send@npm:^1.1.0":
+  version: 1.1.0
+  resolution: "send@npm:1.1.0"
+  dependencies:
+    debug: "npm:^4.3.5"
+    destroy: "npm:^1.2.0"
+    encodeurl: "npm:^2.0.0"
+    escape-html: "npm:^1.0.3"
+    etag: "npm:^1.8.1"
+    fresh: "npm:^0.5.2"
+    http-errors: "npm:^2.0.0"
+    mime-types: "npm:^2.1.35"
+    ms: "npm:^2.1.3"
+    on-finished: "npm:^2.4.1"
+    range-parser: "npm:^1.2.1"
+    statuses: "npm:^2.0.1"
+  checksum: 10/5040d4d1e52a2a4634a3381a0c21be8115543be3ac0345b99c16d2510af2391968e1c4031ac3e1620cca6948f5ff888f39fa6515c4b6005c6c792c56300ea997
+  languageName: node
+  linkType: hard
+
 "sentence-case@npm:^3.0.4":
   version: 3.0.4
   resolution: "sentence-case@npm:3.0.4"
@@ -34201,22 +34931,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"serve-handler@npm:6.1.3":
-  version: 6.1.3
-  resolution: "serve-handler@npm:6.1.3"
-  dependencies:
-    bytes: "npm:3.0.0"
-    content-disposition: "npm:0.5.2"
-    fast-url-parser: "npm:1.1.3"
-    mime-types: "npm:2.1.18"
-    minimatch: "npm:3.0.4"
-    path-is-inside: "npm:1.0.2"
-    path-to-regexp: "npm:2.2.1"
-    range-parser: "npm:1.2.0"
-  checksum: 10/f7f4578c3f75fd5eb4e9b8897ad6da8fafca4dee55c8cfe34da2bd92a90c1bb86c7c2d7aebcedd038fdab7e3ad88dc45d69a15bddb9c9e7943e2abe24a293253
-  languageName: node
-  linkType: hard
-
 "serve-index@npm:^1.9.1":
   version: 1.9.1
   resolution: "serve-index@npm:1.9.1"
@@ -34232,18 +34946,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"serve-static@npm:1.15.0":
-  version: 1.15.0
-  resolution: "serve-static@npm:1.15.0"
-  dependencies:
-    encodeurl: "npm:~1.0.2"
-    escape-html: "npm:~1.0.3"
-    parseurl: "npm:~1.3.3"
-    send: "npm:0.18.0"
-  checksum: 10/699b2d4c29807a51d9b5e0f24955346911437aebb0178b3c4833ad30d3eca93385ff9927254f5c16da345903cad39d9cd4a532198c95a5129cc4ed43911b15a4
-  languageName: node
-  linkType: hard
-
 "serve-static@npm:1.16.2":
   version: 1.16.2
   resolution: "serve-static@npm:1.16.2"
@@ -34256,22 +34958,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"serve@npm:^11.3.2":
-  version: 11.3.2
-  resolution: "serve@npm:11.3.2"
+"serve-static@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "serve-static@npm:2.1.0"
   dependencies:
-    "@zeit/schemas": "npm:2.6.0"
-    ajv: "npm:6.5.3"
-    arg: "npm:2.0.0"
-    boxen: "npm:1.3.0"
-    chalk: "npm:2.4.1"
-    clipboardy: "npm:1.2.3"
-    compression: "npm:1.7.3"
-    serve-handler: "npm:6.1.3"
-    update-check: "npm:1.5.2"
-  bin:
-    serve: bin/serve.js
-  checksum: 10/fea89b20468fca63662886d40e3c80fb3208fa6d37771a5ccbb5427d86bfbc8adee4d372410667b25b9138dbe0894548088cf3a24a8e128e1bf49ba2701905f8
+    encodeurl: "npm:^2.0.0"
+    escape-html: "npm:^1.0.3"
+    parseurl: "npm:^1.3.3"
+    send: "npm:^1.0.0"
+  checksum: 10/ecb5969b66520e6546721454e72ee3fbe827fee16224a563d258d71ab68d9316991c81910b94bd2a7b75112669ef887068ab0ef66a4bf524ed8ed9c919a01de0
   languageName: node
   linkType: hard
 
@@ -34296,7 +34991,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"set-function-name@npm:^2.0.1":
+"set-function-name@npm:^2.0.1, set-function-name@npm:^2.0.2":
   version: 2.0.2
   resolution: "set-function-name@npm:2.0.2"
   dependencies:
@@ -34308,6 +35003,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"set-value@npm:^2.0.0, set-value@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "set-value@npm:2.0.1"
+  dependencies:
+    extend-shallow: "npm:^2.0.1"
+    is-extendable: "npm:^0.1.1"
+    is-plain-object: "npm:^2.0.3"
+    split-string: "npm:^3.0.1"
+  checksum: 10/4f1ccac2e9ad4d1b0851761d41df4bbd3780ed69805f24a80ab237a56d9629760b7b98551cd370931620defe5da329645834e1e9a18574cecad09ce7b2b83296
+  languageName: node
+  linkType: hard
+
 "setimmediate@npm:^1.0.4":
   version: 1.0.5
   resolution: "setimmediate@npm:1.0.5"
@@ -34350,20 +35057,72 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sharp@npm:^0.32.6":
-  version: 0.32.6
-  resolution: "sharp@npm:0.32.6"
-  dependencies:
+"sharp@npm:*, sharp@npm:^0.33.5":
+  version: 0.33.5
+  resolution: "sharp@npm:0.33.5"
+  dependencies:
+    "@img/sharp-darwin-arm64": "npm:0.33.5"
+    "@img/sharp-darwin-x64": "npm:0.33.5"
+    "@img/sharp-libvips-darwin-arm64": "npm:1.0.4"
+    "@img/sharp-libvips-darwin-x64": "npm:1.0.4"
+    "@img/sharp-libvips-linux-arm": "npm:1.0.5"
+    "@img/sharp-libvips-linux-arm64": "npm:1.0.4"
+    "@img/sharp-libvips-linux-s390x": "npm:1.0.4"
+    "@img/sharp-libvips-linux-x64": "npm:1.0.4"
+    "@img/sharp-libvips-linuxmusl-arm64": "npm:1.0.4"
+    "@img/sharp-libvips-linuxmusl-x64": "npm:1.0.4"
+    "@img/sharp-linux-arm": "npm:0.33.5"
+    "@img/sharp-linux-arm64": "npm:0.33.5"
+    "@img/sharp-linux-s390x": "npm:0.33.5"
+    "@img/sharp-linux-x64": "npm:0.33.5"
+    "@img/sharp-linuxmusl-arm64": "npm:0.33.5"
+    "@img/sharp-linuxmusl-x64": "npm:0.33.5"
+    "@img/sharp-wasm32": "npm:0.33.5"
+    "@img/sharp-win32-ia32": "npm:0.33.5"
+    "@img/sharp-win32-x64": "npm:0.33.5"
     color: "npm:^4.2.3"
-    detect-libc: "npm:^2.0.2"
-    node-addon-api: "npm:^6.1.0"
-    node-gyp: "npm:latest"
-    prebuild-install: "npm:^7.1.1"
-    semver: "npm:^7.5.4"
-    simple-get: "npm:^4.0.1"
-    tar-fs: "npm:^3.0.4"
-    tunnel-agent: "npm:^0.6.0"
-  checksum: 10/f0e4a86881e590f86b05ea463229f62cd29afc2dca08b3f597889f872f118c2c456f382bf2c3e90e934b7a1d30f109cf5ed584cf5a23e79d6b6403a8dc0ebe32
+    detect-libc: "npm:^2.0.3"
+    semver: "npm:^7.6.3"
+  dependenciesMeta:
+    "@img/sharp-darwin-arm64":
+      optional: true
+    "@img/sharp-darwin-x64":
+      optional: true
+    "@img/sharp-libvips-darwin-arm64":
+      optional: true
+    "@img/sharp-libvips-darwin-x64":
+      optional: true
+    "@img/sharp-libvips-linux-arm":
+      optional: true
+    "@img/sharp-libvips-linux-arm64":
+      optional: true
+    "@img/sharp-libvips-linux-s390x":
+      optional: true
+    "@img/sharp-libvips-linux-x64":
+      optional: true
+    "@img/sharp-libvips-linuxmusl-arm64":
+      optional: true
+    "@img/sharp-libvips-linuxmusl-x64":
+      optional: true
+    "@img/sharp-linux-arm":
+      optional: true
+    "@img/sharp-linux-arm64":
+      optional: true
+    "@img/sharp-linux-s390x":
+      optional: true
+    "@img/sharp-linux-x64":
+      optional: true
+    "@img/sharp-linuxmusl-arm64":
+      optional: true
+    "@img/sharp-linuxmusl-x64":
+      optional: true
+    "@img/sharp-wasm32":
+      optional: true
+    "@img/sharp-win32-ia32":
+      optional: true
+    "@img/sharp-win32-x64":
+      optional: true
+  checksum: 10/9f153578cb02735359cbcc874f52b56b8074ed997498c35255c7099d4f4f506f6ddf83a437a55242c7ad4f979336660504b6c78e29d6933f4981dedbdae5ce09
   languageName: node
   linkType: hard
 
@@ -34425,15 +35184,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"shelljs@npm:^0.3.0":
-  version: 0.3.0
-  resolution: "shelljs@npm:0.3.0"
-  bin:
-    shjs: ./bin/shjs
-  checksum: 10/ad251c8cec955478d39ff6c066a2951af7dd873c6dec3a89403f40c7faa496b042e51edae72e4e00165e2c5432f269f3ed7d02837373399e1e6808c8f08c0db6
-  languageName: node
-  linkType: hard
-
 "shiki@npm:^0.14.1":
   version: 0.14.7
   resolution: "shiki@npm:0.14.7"
@@ -34486,7 +35236,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"simple-get@npm:^4.0.0, simple-get@npm:^4.0.1":
+"simple-get@npm:^4.0.0":
   version: 4.0.1
   resolution: "simple-get@npm:4.0.1"
   dependencies:
@@ -34520,21 +35270,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sip.js@npm:^0.20.1":
-  version: 0.20.1
-  resolution: "sip.js@npm:0.20.1"
-  checksum: 10/26cfac162682c3e90e8cd768d084b41e34fd1dd5e5501c870e2847e542e6b29cd442035758af1ad87e57c5a07dc09969062d05869807a7395ccd7ee8bf5aa0c6
-  languageName: node
-  linkType: hard
-
-"sirv@npm:^2.0.3":
-  version: 2.0.3
-  resolution: "sirv@npm:2.0.3"
-  dependencies:
-    "@polka/url": "npm:^1.0.0-next.20"
-    mrmime: "npm:^1.0.0"
-    totalist: "npm:^3.0.0"
-  checksum: 10/dbfbff7355c1433df4f18683b5efe3b22eebac745e7ae30e38ba9d2bf468765a8a81993b78198dfd9bc809330fce85c67e74bccd262ca5871ecb92046fcf4560
+"sip.js@npm:^0.21.2":
+  version: 0.21.2
+  resolution: "sip.js@npm:0.21.2"
+  checksum: 10/ccddbf7e297b8f0517a6c59fa3e6e56b1fed84f10c518fdda3e84d99178295f1710448d0e6bd0c964c4f23bbf6288795cfcf3fa1224cfb2d75e9341f34ec077a
   languageName: node
   linkType: hard
 
@@ -34545,6 +35284,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"slash@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "slash@npm:2.0.0"
+  checksum: 10/512d4350735375bd11647233cb0e2f93beca6f53441015eea241fe784d8068281c3987fbaa93e7ef1c38df68d9c60013045c92837423c69115297d6169aa85e6
+  languageName: node
+  linkType: hard
+
 "slash@npm:^3.0.0":
   version: 3.0.0
   resolution: "slash@npm:3.0.0"
@@ -34559,6 +35305,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"slice-ansi@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "slice-ansi@npm:2.1.0"
+  dependencies:
+    ansi-styles: "npm:^3.2.0"
+    astral-regex: "npm:^1.0.0"
+    is-fullwidth-code-point: "npm:^2.0.0"
+  checksum: 10/4e82995aa59cef7eb03ef232d73c2239a15efa0ace87a01f3012ebb942e963fbb05d448ce7391efcd52ab9c32724164aba2086f5143e0445c969221dde3b6b1e
+  languageName: node
+  linkType: hard
+
 "slice-ansi@npm:^4.0.0":
   version: 4.0.0
   resolution: "slice-ansi@npm:4.0.0"
@@ -34584,22 +35341,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"smartwrap@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "smartwrap@npm:2.0.2"
-  dependencies:
-    array.prototype.flat: "npm:^1.2.3"
-    breakword: "npm:^1.0.5"
-    grapheme-splitter: "npm:^1.0.4"
-    strip-ansi: "npm:^6.0.0"
-    wcwidth: "npm:^1.0.1"
-    yargs: "npm:^15.1.0"
-  bin:
-    smartwrap: src/terminal-adapter.js
-  checksum: 10/dcc7b9082b74a0ce0f391fce8a4be72f56d1b6e78fbfed9b4191da89d66d82f62a7b44c727d7e68714f0faf1ed1fce0be498563b0d4ef8aad80e2433983b0603
-  languageName: node
-  linkType: hard
-
 "snake-case@npm:^3.0.4":
   version: 3.0.4
   resolution: "snake-case@npm:3.0.4"
@@ -34610,6 +35351,42 @@ __metadata:
   languageName: node
   linkType: hard
 
+"snapdragon-node@npm:^2.0.1":
+  version: 2.1.1
+  resolution: "snapdragon-node@npm:2.1.1"
+  dependencies:
+    define-property: "npm:^1.0.0"
+    isobject: "npm:^3.0.0"
+    snapdragon-util: "npm:^3.0.1"
+  checksum: 10/093c3584efc51103d8607d28cb7a3079f7e371b2320a60c685a84a57956cf9693f3dec8b2f77250ba48063cf42cb5261f3970e6d3bb7e68fd727299c991e0bff
+  languageName: node
+  linkType: hard
+
+"snapdragon-util@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "snapdragon-util@npm:3.0.1"
+  dependencies:
+    kind-of: "npm:^3.2.0"
+  checksum: 10/b776b15bf683c9ac0243582d7b13f2070f85c9036d73c2ba31da61d1effe22d4a39845b6f43ce7e7ec82c7e686dc47d9c3cffa1a75327bb16505b9afc34f516d
+  languageName: node
+  linkType: hard
+
+"snapdragon@npm:^0.8.1":
+  version: 0.8.2
+  resolution: "snapdragon@npm:0.8.2"
+  dependencies:
+    base: "npm:^0.11.1"
+    debug: "npm:^2.2.0"
+    define-property: "npm:^0.2.5"
+    extend-shallow: "npm:^2.0.1"
+    map-cache: "npm:^0.2.2"
+    source-map: "npm:^0.5.6"
+    source-map-resolve: "npm:^0.5.0"
+    use: "npm:^3.1.0"
+  checksum: 10/cbe35b25dca5504be0ced90d907948d8efeda0b118d9a032bfc499e22b7f78515832f2706d9c9297c87906eaa51c12bfcaa8ea5a4f3e98ecf1116a73428e344a
+  languageName: node
+  linkType: hard
+
 "sockjs@npm:^0.3.24":
   version: 0.3.24
   resolution: "sockjs@npm:0.3.24"
@@ -34632,6 +35409,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"socks-proxy-agent@npm:^8.0.3":
+  version: 8.0.4
+  resolution: "socks-proxy-agent@npm:8.0.4"
+  dependencies:
+    agent-base: "npm:^7.1.1"
+    debug: "npm:^4.3.4"
+    socks: "npm:^2.8.3"
+  checksum: 10/c8e7c2b398338b49a0a0f4d2bae5c0602aeeca6b478b99415927b6c5db349ca258448f2c87c6958ebf83eea17d42cbc5d1af0bfecb276cac10b9658b0f07f7d7
+  languageName: node
+  linkType: hard
+
 "socks@npm:^2.6.1, socks@npm:^2.7.1":
   version: 2.7.1
   resolution: "socks@npm:2.7.1"
@@ -34642,13 +35430,22 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sodium-native@npm:^3.3.0":
-  version: 3.3.0
-  resolution: "sodium-native@npm:3.3.0"
+"socks@npm:^2.8.3":
+  version: 2.8.3
+  resolution: "socks@npm:2.8.3"
   dependencies:
-    node-gyp: "npm:latest"
-    node-gyp-build: "npm:^4.3.0"
-  checksum: 10/74cd052791a54acd97a71e2574c56973a80953da4307872f4034df53a87741af6f0107a0f16a4e5f4337c7504b5e77d836da10e2b53ba12cb22c231d4b09050a
+    ip-address: "npm:^9.0.5"
+    smart-buffer: "npm:^4.2.0"
+  checksum: 10/ffcb622c22481dfcd7589aae71fbfd71ca34334064d181df64bf8b7feaeee19706aba4cffd1de35cc7bbaeeaa0af96be2d7f40fcbc7bc0ab69533a7ae9ffc4fb
+  languageName: node
+  linkType: hard
+
+"sodium-native@npm:^4.3.1":
+  version: 4.3.1
+  resolution: "sodium-native@npm:4.3.1"
+  dependencies:
+    node-gyp-build: "npm:^4.8.0"
+  checksum: 10/d08c7a68b458fa0dfd63a14dca1a114e855f4b857c3999e3e19e975434b3843335929d0539b03ca7f9796007f0560b629b33186e9b1fd6e7781199b32c48d23c
   languageName: node
   linkType: hard
 
@@ -34676,12 +35473,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sonic-boom@npm:^3.1.0":
-  version: 3.2.0
-  resolution: "sonic-boom@npm:3.2.0"
+"sonic-boom@npm:^3.7.0":
+  version: 3.8.1
+  resolution: "sonic-boom@npm:3.8.1"
   dependencies:
     atomic-sleep: "npm:^1.0.0"
-  checksum: 10/fffbb58d32e7db90778bb17b6864ca8701681175cd3d305d5d4dc8c06c833703c83f2ea73a6b615325408c609255ac0a229e3a1bca643d1bb4b53ea944ab0238
+  checksum: 10/e03c9611e43fa81132cd2ce0fe4eb7fbcf19db267e9dec20dc6c586f82465c9c906e91a02f72150c740463ad9335536ea2131850307aaa6686d1fb5d4cc4be3e
   languageName: node
   linkType: hard
 
@@ -34726,7 +35523,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"source-map-js@npm:>=0.6.2 <2.0.0, source-map-js@npm:^1.2.1":
+"source-map-js@npm:>=0.6.2 <2.0.0, source-map-js@npm:^1.0.1, source-map-js@npm:^1.2.1":
   version: 1.2.1
   resolution: "source-map-js@npm:1.2.1"
   checksum: 10/ff9d8c8bf096d534a5b7707e0382ef827b4dd360a577d3f34d2b9f48e12c9d230b5747974ee7c607f0df65113732711bb701fe9ece3c7edbd43cb2294d707df3
@@ -34740,6 +35537,19 @@ __metadata:
   languageName: node
   linkType: hard
 
+"source-map-resolve@npm:^0.5.0":
+  version: 0.5.3
+  resolution: "source-map-resolve@npm:0.5.3"
+  dependencies:
+    atob: "npm:^2.1.2"
+    decode-uri-component: "npm:^0.2.0"
+    resolve-url: "npm:^0.2.1"
+    source-map-url: "npm:^0.4.0"
+    urix: "npm:^0.1.0"
+  checksum: 10/98e281cceb86b80c8bd3453110617b9df93132d6a50c7bf5847b5d74b4b5d6e1d4d261db276035b9b7e5ba7f32c2d6a0d2c13d581e37870a0219a524402efcab
+  languageName: node
+  linkType: hard
+
 "source-map-support@npm:0.5.13":
   version: 0.5.13
   resolution: "source-map-support@npm:0.5.13"
@@ -34760,6 +35570,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"source-map-url@npm:^0.4.0":
+  version: 0.4.1
+  resolution: "source-map-url@npm:0.4.1"
+  checksum: 10/7fec0460ca017330568e1a4d67c80c397871f27d75b034e1117eaa802076db5cda5944659144d26eafd2a95008ada19296c8e0d5ec116302c32c6daa4e430003
+  languageName: node
+  linkType: hard
+
 "source-map@npm:0.6.1, source-map@npm:^0.6.0, source-map@npm:^0.6.1, source-map@npm:~0.6.0, source-map@npm:~0.6.1":
   version: 0.6.1
   resolution: "source-map@npm:0.6.1"
@@ -34767,12 +35584,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"source-map@npm:0.8.0-beta.0":
-  version: 0.8.0-beta.0
-  resolution: "source-map@npm:0.8.0-beta.0"
-  dependencies:
-    whatwg-url: "npm:^7.0.0"
-  checksum: 10/c02e22ab9f8b8e38655ba1e9abae9fe1f8ba216cbbea922718d5e2ea45821606a74f10edec1db9055e7f7cfd1e6a62e5eade67ec30c017a02f4c8e990accbc1c
+"source-map@npm:^0.5.6, source-map@npm:~0.5.3":
+  version: 0.5.7
+  resolution: "source-map@npm:0.5.7"
+  checksum: 10/9b4ac749ec5b5831cad1f8cc4c19c4298ebc7474b24a0acf293e2f040f03f8eeccb3d01f12aa0f90cf46d555c887e03912b83a042c627f419bda5152d89c5269
   languageName: node
   linkType: hard
 
@@ -34783,20 +35598,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"source-map@npm:~0.5.3":
-  version: 0.5.7
-  resolution: "source-map@npm:0.5.7"
-  checksum: 10/9b4ac749ec5b5831cad1f8cc4c19c4298ebc7474b24a0acf293e2f040f03f8eeccb3d01f12aa0f90cf46d555c887e03912b83a042c627f419bda5152d89c5269
-  languageName: node
-  linkType: hard
-
-"space-separated-tokens@npm:^2.0.0":
-  version: 2.0.2
-  resolution: "space-separated-tokens@npm:2.0.2"
-  checksum: 10/202e97d7ca1ba0758a0aa4fe226ff98142073bcceeff2da3aad037968878552c3bbce3b3231970025375bbba5aee00c5b8206eda408da837ab2dc9c0f26be990
-  languageName: node
-  linkType: hard
-
 "sparse-bitfield@npm:^3.0.3":
   version: 3.0.3
   resolution: "sparse-bitfield@npm:3.0.3"
@@ -34921,10 +35722,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"speedometer@npm:~1.0.0":
-  version: 1.0.0
-  resolution: "speedometer@npm:1.0.0"
-  checksum: 10/6b322bbb0607c9994fba2a6ac189cf6caea4ce9f5067c1ccfc2848b55883f65d48292bfed4244ce855573ed7cdf0f69943ae6e507f7ec90eef232b64cdba6237
+"specificity@npm:^0.4.1":
+  version: 0.4.1
+  resolution: "specificity@npm:0.4.1"
+  bin:
+    specificity: ./bin/specificity
+  checksum: 10/01a5850d82b479192a6346ce6dbf9584bb58bb85723c021c8b95ab2632287e398af25980b31f586eb095e82b5946ef3ef4aea7d75a5cbf563842bea2a3df02b1
   languageName: node
   linkType: hard
 
@@ -34942,6 +35745,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"split-string@npm:^3.0.1, split-string@npm:^3.0.2":
+  version: 3.1.0
+  resolution: "split-string@npm:3.1.0"
+  dependencies:
+    extend-shallow: "npm:^3.0.0"
+  checksum: 10/f31f4709d2b14fe4ff46b4fb88b2fb68a1c59b59e573c5417907c182397ddb2cb67903232bdc3a8b9dd3bb660c6f533ff11b5d624aff7b1fe0a213e3e4c75f20
+  languageName: node
+  linkType: hard
+
 "split2@npm:^4.0.0":
   version: 4.1.0
   resolution: "split2@npm:4.1.0"
@@ -34965,6 +35777,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"sprintf-js@npm:^1.1.3":
+  version: 1.1.3
+  resolution: "sprintf-js@npm:1.1.3"
+  checksum: 10/e7587128c423f7e43cc625fe2f87e6affdf5ca51c1cc468e910d8aaca46bb44a7fbcfa552f787b1d3987f7043aeb4527d1b99559e6621e01b42b3f45e5a24cbb
+  languageName: node
+  linkType: hard
+
 "sprintf-js@npm:~1.0.2":
   version: 1.0.3
   resolution: "sprintf-js@npm:1.0.3"
@@ -34993,10 +35812,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ssr-window@npm:^4.0.2":
-  version: 4.0.2
-  resolution: "ssr-window@npm:4.0.2"
-  checksum: 10/075b67794be868103d73299be948cd559be7b40499fe4247c7a28702f9f1588c53ca8de64520ae8e36214caa6ff728b222101d7e75d5df39e7ff12e148d6a517
+"ssri@npm:^10.0.0":
+  version: 10.0.6
+  resolution: "ssri@npm:10.0.6"
+  dependencies:
+    minipass: "npm:^7.0.3"
+  checksum: 10/f92c1b3cc9bfd0a925417412d07d999935917bc87049f43ebec41074661d64cf720315661844106a77da9f8204b6d55ae29f9514e673083cae39464343af2a8b
   languageName: node
   linkType: hard
 
@@ -35057,6 +35878,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"state-toggle@npm:^1.0.0":
+  version: 1.0.3
+  resolution: "state-toggle@npm:1.0.3"
+  checksum: 10/17398af928413e8d8b866cf0c81fd1b1348bb7d65d8983126ff6ff2317a80d6ee023484fba0c54d8169f5aa544f125434a650ae3a71eddc935cae307d4692b4f
+  languageName: node
+  linkType: hard
+
+"static-extend@npm:^0.1.1":
+  version: 0.1.2
+  resolution: "static-extend@npm:0.1.2"
+  dependencies:
+    define-property: "npm:^0.2.5"
+    object-copy: "npm:^0.1.0"
+  checksum: 10/8657485b831f79e388a437260baf22784540417a9b29e11572c87735df24c22b84eda42107403a64b30861b2faf13df9f7fc5525d51f9d1d2303aba5cbf4e12c
+  languageName: node
+  linkType: hard
+
 "statuses@npm:1.5.0, statuses@npm:>= 1.4.0 < 2, statuses@npm:~1.5.0":
   version: 1.5.0
   resolution: "statuses@npm:1.5.0"
@@ -35064,7 +35902,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"statuses@npm:2.0.1":
+"statuses@npm:2.0.1, statuses@npm:^2.0.1":
   version: 2.0.1
   resolution: "statuses@npm:2.0.1"
   checksum: 10/18c7623fdb8f646fb213ca4051be4df7efb3484d4ab662937ca6fbef7ced9b9e12842709872eb3020cc3504b93bde88935c9f6417489627a7786f24f8031cbcb
@@ -35087,15 +35925,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stop-iteration-iterator@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "stop-iteration-iterator@npm:1.0.0"
-  dependencies:
-    internal-slot: "npm:^1.0.4"
-  checksum: 10/2a23a36f4f6bfa63f46ae2d53a3f80fe8276110b95a55345d8ed3d92125413494033bc8697eb774e8f7aeb5725f70e3d69753caa2ecacdac6258c16fa8aa8b0f
-  languageName: node
-  linkType: hard
-
 "storybook-dark-mode@npm:^4.0.2":
   version: 4.0.2
   resolution: "storybook-dark-mode@npm:4.0.2"
@@ -35112,16 +35941,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"storybook@npm:^8.3.5":
-  version: 8.3.5
-  resolution: "storybook@npm:8.3.5"
+"storybook@npm:^8.4.4":
+  version: 8.4.4
+  resolution: "storybook@npm:8.4.4"
   dependencies:
-    "@storybook/core": "npm:8.3.5"
+    "@storybook/core": "npm:8.4.4"
+  peerDependencies:
+    prettier: ^2 || ^3
+  peerDependenciesMeta:
+    prettier:
+      optional: true
   bin:
     getstorybook: ./bin/index.cjs
     sb: ./bin/index.cjs
     storybook: ./bin/index.cjs
-  checksum: 10/66ecb201522598902e363a7e14d6e5f4bf1bba77ea640de6b7431e1a7564dfe8a5f359da9f8b382d376989bf7a50bb0cdb665143ba609cdf16c21687e5183533
+  checksum: 10/e2d27c97a82da9161f5c8f3d2cadbd77701032b5053c714a768930f41fe5aae479c07f8fb5afa98434e45d89ee501fa9866bdea4fdcb16a4723b8238c56d974f
   languageName: node
   linkType: hard
 
@@ -35209,15 +36043,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stream-transform@npm:^2.1.3":
-  version: 2.1.3
-  resolution: "stream-transform@npm:2.1.3"
-  dependencies:
-    mixme: "npm:^0.5.1"
-  checksum: 10/3167bf23a96b3fc7f991d4a8224cd0701c9234be8acd8450f8692c431bed4548d1ef90d1b410fdeff567fa740c3db97b52d5f3c4ad4485fc0e0b8be655800ab7
-  languageName: node
-  linkType: hard
-
 "streamsearch@npm:^1.1.0":
   version: 1.1.0
   resolution: "streamsearch@npm:1.1.0"
@@ -35360,27 +36185,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"string-width@npm:^1.0.1":
-  version: 1.0.2
-  resolution: "string-width@npm:1.0.2"
-  dependencies:
-    code-point-at: "npm:^1.0.0"
-    is-fullwidth-code-point: "npm:^1.0.0"
-    strip-ansi: "npm:^3.0.0"
-  checksum: 10/5c79439e95bc3bd7233a332c5f5926ab2ee90b23816ed4faa380ce3b2576d7800b0a5bb15ae88ed28737acc7ea06a518c2eef39142dd727adad0e45c776cd37e
-  languageName: node
-  linkType: hard
-
-"string-width@npm:^2.0.0, string-width@npm:^2.1.0, string-width@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "string-width@npm:2.1.1"
-  dependencies:
-    is-fullwidth-code-point: "npm:^2.0.0"
-    strip-ansi: "npm:^4.0.0"
-  checksum: 10/d6173abe088c615c8dffaf3861dc5d5906ed3dc2d6fd67ff2bd2e2b5dce7fd683c5240699cf0b1b8aa679a3b3bd6b28b5053c824cb89b813d7f6541d8f89064a
-  languageName: node
-  linkType: hard
-
 "string-width@npm:^3.0.0, string-width@npm:^3.1.0":
   version: 3.1.0
   resolution: "string-width@npm:3.1.0"
@@ -35403,19 +36207,34 @@ __metadata:
   languageName: node
   linkType: hard
 
-"string.prototype.matchall@npm:^4.0.8":
-  version: 4.0.8
-  resolution: "string.prototype.matchall@npm:4.0.8"
+"string.prototype.includes@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "string.prototype.includes@npm:2.0.1"
   dependencies:
-    call-bind: "npm:^1.0.2"
-    define-properties: "npm:^1.1.4"
-    es-abstract: "npm:^1.20.4"
-    get-intrinsic: "npm:^1.1.3"
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.3"
+  checksum: 10/939a5447e4a99a86f29cc97fa24f358e5071f79e34746de4c7eb2cd736ed626ad24870a1e356f33915b3b352bb87f7e4d1cebc15d1e1aaae0923777e21b1b28b
+  languageName: node
+  linkType: hard
+
+"string.prototype.matchall@npm:^4.0.11":
+  version: 4.0.11
+  resolution: "string.prototype.matchall@npm:4.0.11"
+  dependencies:
+    call-bind: "npm:^1.0.7"
+    define-properties: "npm:^1.2.1"
+    es-abstract: "npm:^1.23.2"
+    es-errors: "npm:^1.3.0"
+    es-object-atoms: "npm:^1.0.0"
+    get-intrinsic: "npm:^1.2.4"
+    gopd: "npm:^1.0.1"
     has-symbols: "npm:^1.0.3"
-    internal-slot: "npm:^1.0.3"
-    regexp.prototype.flags: "npm:^1.4.3"
-    side-channel: "npm:^1.0.4"
-  checksum: 10/9de2e9e33344002e08c03c13533d88d0c557d5a3d9214a4f2cc8d63349f7c35af895804dec08e43224cc4c0345651c678e14260c5933967fd97aad4640a7e485
+    internal-slot: "npm:^1.0.7"
+    regexp.prototype.flags: "npm:^1.5.2"
+    set-function-name: "npm:^2.0.2"
+    side-channel: "npm:^1.0.6"
+  checksum: 10/a902ff4500f909f2a08e55cc5ab1ffbbc905f603b36837674370ee3921058edd0392147e15891910db62a2f31ace2adaf065eaa3bc6e9810bdbc8ca48e05a7b5
   languageName: node
   linkType: hard
 
@@ -35430,6 +36249,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"string.prototype.repeat@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "string.prototype.repeat@npm:1.0.0"
+  dependencies:
+    define-properties: "npm:^1.1.3"
+    es-abstract: "npm:^1.17.5"
+  checksum: 10/4b1bd91b75fa8fdf0541625184ebe80e445a465ce4253c19c3bccd633898005dadae0f74b85ae72662a53aafb8035bf48f8f5c0755aec09bc106a7f13959d05e
+  languageName: node
+  linkType: hard
+
 "string.prototype.trim@npm:^1.2.9":
   version: 1.2.9
   resolution: "string.prototype.trim@npm:1.2.9"
@@ -35489,6 +36318,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"stringify-entities@npm:^1.0.1":
+  version: 1.3.2
+  resolution: "stringify-entities@npm:1.3.2"
+  dependencies:
+    character-entities-html4: "npm:^1.0.0"
+    character-entities-legacy: "npm:^1.0.0"
+    is-alphanumerical: "npm:^1.0.0"
+    is-hexadecimal: "npm:^1.0.0"
+  checksum: 10/4e38e774dfd6793c76302c683010abb47d16ed509ec23758408b62b2a5fada2d981c83d6b3b74b35b41b80d1d07b4c9cecf669097edac6774d5a6ff40387b1b9
+  languageName: node
+  linkType: hard
+
 "strip-ansi-cjs@npm:strip-ansi@^6.0.1, strip-ansi@npm:^6.0.0, strip-ansi@npm:^6.0.1":
   version: 6.0.1
   resolution: "strip-ansi@npm:6.0.1"
@@ -35498,7 +36339,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"strip-ansi@npm:^3.0.0, strip-ansi@npm:^3.0.1":
+"strip-ansi@npm:^3.0.0":
   version: 3.0.1
   resolution: "strip-ansi@npm:3.0.1"
   dependencies:
@@ -35507,15 +36348,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"strip-ansi@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "strip-ansi@npm:4.0.0"
-  dependencies:
-    ansi-regex: "npm:^3.0.0"
-  checksum: 10/d9186e6c0cf78f25274f6750ee5e4a5725fb91b70fdd79aa5fe648eab092a0ec5b9621b22d69d4534a56319f75d8944efbd84e3afa8d4ad1b9a9491f12c84eca
-  languageName: node
-  linkType: hard
-
 "strip-ansi@npm:^5.0.0, strip-ansi@npm:^5.1.0, strip-ansi@npm:^5.2.0":
   version: 5.2.0
   resolution: "strip-ansi@npm:5.2.0"
@@ -35571,6 +36403,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"strip-indent@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "strip-indent@npm:2.0.0"
+  checksum: 10/7d9080d02ddace616ebbc17846e41d3880cb147e2a81e51142281322ded6b05b230a4fb12c2e5266f62735cf8f5fb9839e55d74799d11f26bcc8c71ca049a0ba
+  languageName: node
+  linkType: hard
+
 "strip-indent@npm:^3.0.0":
   version: 3.0.0
   resolution: "strip-indent@npm:3.0.0"
@@ -35636,7 +36475,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"style-loader@npm:^1.2.1":
+"style-loader@npm:^1.3.0":
   version: 1.3.0
   resolution: "style-loader@npm:1.3.0"
   dependencies:
@@ -35664,6 +36503,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"style-mod@npm:^4.1.0":
+  version: 4.1.2
+  resolution: "style-mod@npm:4.1.2"
+  checksum: 10/9da37909d6dbc3c043ab6d18da5d997073a4698c91e86058293252493eb18aca4e44e3fb18f32fcee26dcee8785f393c6c95f3c96cc722a0dd6b8de622b5b293
+  languageName: node
+  linkType: hard
+
 "style-search@npm:^0.1.0":
   version: 0.1.0
   resolution: "style-search@npm:0.1.0"
@@ -35682,65 +36528,176 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stylelint-order@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "stylelint-order@npm:5.0.0"
+"stylelint-config-rational-order@npm:^0.1.2":
+  version: 0.1.2
+  resolution: "stylelint-config-rational-order@npm:0.1.2"
   dependencies:
-    postcss: "npm:^8.3.11"
-    postcss-sorting: "npm:^7.0.1"
+    stylelint: "npm:^9.10.1"
+    stylelint-order: "npm:^2.2.1"
+  checksum: 10/ed633999c80d616eadb068ce606a339b8073407b7264415685f35ea8f7e4addc973f84903433add5ed087505dd8b536f8112635bafdad42503c7397f55caec41
+  languageName: node
+  linkType: hard
+
+"stylelint-config-recommended@npm:^14.0.1":
+  version: 14.0.1
+  resolution: "stylelint-config-recommended@npm:14.0.1"
+  peerDependencies:
+    stylelint: ^16.1.0
+  checksum: 10/93c3fe920902abfd3f4130173876bb633230c910a3b293f5b74a0ea9c4427d197d7ade28dd62718246264f22f1e012899d0160a0176da723d14680d73876d701
+  languageName: node
+  linkType: hard
+
+"stylelint-config-standard@npm:^36.0.1":
+  version: 36.0.1
+  resolution: "stylelint-config-standard@npm:36.0.1"
+  dependencies:
+    stylelint-config-recommended: "npm:^14.0.1"
+  peerDependencies:
+    stylelint: ^16.1.0
+  checksum: 10/50b8fb396f1cb8cb3539aa97187eb8c2a4b2858c897374faa726837a809dae7c686cb5dc32528c9698745d4e97af1fe9035a04a5a8cb220bd6b1530795437013
+  languageName: node
+  linkType: hard
+
+"stylelint-order@npm:^2.2.1":
+  version: 2.2.1
+  resolution: "stylelint-order@npm:2.2.1"
+  dependencies:
+    lodash: "npm:^4.17.10"
+    postcss: "npm:^7.0.2"
+    postcss-sorting: "npm:^4.1.0"
+  peerDependencies:
+    stylelint: ^9.10.1 || ^10.0.0
+  checksum: 10/837d3f1dadb0c9188b255c33ae3281b14895e13be8f978bbb72a5bf80d3d5f80a45b4aef5021222e9b80d59336e03a4ed1d7a78ebb309b4e5f36f07258b180d3
+  languageName: node
+  linkType: hard
+
+"stylelint-order@npm:^6.0.4":
+  version: 6.0.4
+  resolution: "stylelint-order@npm:6.0.4"
+  dependencies:
+    postcss: "npm:^8.4.32"
+    postcss-sorting: "npm:^8.0.2"
+  peerDependencies:
+    stylelint: ^14.0.0 || ^15.0.0 || ^16.0.1
+  checksum: 10/a16a017bded454f78fb3ed02643e93525ee1e4a03c0303c364aa8ee908c4500238036e8df15403f9bb968136c70a32335b494a443df15bb6985bb8e1f431edcd
+  languageName: node
+  linkType: hard
+
+"stylelint-selector-bem-pattern@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "stylelint-selector-bem-pattern@npm:4.0.1"
+  dependencies:
+    lodash: "npm:>=4.17.21"
+    postcss: "npm:^8.4.24"
+    postcss-bem-linter: "npm:^4.0.1"
   peerDependencies:
-    stylelint: ^14.0.0
-  checksum: 10/05be5d81948294c3350d193e01118845062ccdcf91e920d7464611d66d52492e4730d86339a4340f61943a8330a63dc1a678a98333bbc6e1ffa4332d08580ceb
+    stylelint: ^16.2.1
+  checksum: 10/620cac975335eab1ed9f0bc18ce2726f8db91a52e21367bc06b2a9285f30ce3b0b4396d4e827cbec89e56556a070cd2f673a9308fadf6af84654991aa848b736
   languageName: node
   linkType: hard
 
-"stylelint@npm:^14.9.1":
-  version: 14.9.1
-  resolution: "stylelint@npm:14.9.1"
+"stylelint@npm:^16.10.0":
+  version: 16.10.0
+  resolution: "stylelint@npm:16.10.0"
   dependencies:
-    "@csstools/selector-specificity": "npm:^2.0.1"
+    "@csstools/css-parser-algorithms": "npm:^3.0.1"
+    "@csstools/css-tokenizer": "npm:^3.0.1"
+    "@csstools/media-query-list-parser": "npm:^3.0.1"
+    "@csstools/selector-specificity": "npm:^4.0.0"
+    "@dual-bundle/import-meta-resolve": "npm:^4.1.0"
     balanced-match: "npm:^2.0.0"
-    colord: "npm:^2.9.2"
-    cosmiconfig: "npm:^7.0.1"
-    css-functions-list: "npm:^3.1.0"
-    debug: "npm:^4.3.4"
-    execall: "npm:^2.0.0"
-    fast-glob: "npm:^3.2.11"
-    fastest-levenshtein: "npm:^1.0.12"
-    file-entry-cache: "npm:^6.0.1"
-    get-stdin: "npm:^8.0.0"
+    colord: "npm:^2.9.3"
+    cosmiconfig: "npm:^9.0.0"
+    css-functions-list: "npm:^3.2.3"
+    css-tree: "npm:^3.0.0"
+    debug: "npm:^4.3.7"
+    fast-glob: "npm:^3.3.2"
+    fastest-levenshtein: "npm:^1.0.16"
+    file-entry-cache: "npm:^9.1.0"
     global-modules: "npm:^2.0.0"
     globby: "npm:^11.1.0"
     globjoin: "npm:^0.1.4"
-    html-tags: "npm:^3.2.0"
-    ignore: "npm:^5.2.0"
-    import-lazy: "npm:^4.0.0"
+    html-tags: "npm:^3.3.1"
+    ignore: "npm:^6.0.2"
     imurmurhash: "npm:^0.1.4"
     is-plain-object: "npm:^5.0.0"
-    known-css-properties: "npm:^0.25.0"
+    known-css-properties: "npm:^0.34.0"
     mathml-tag-names: "npm:^2.1.3"
-    meow: "npm:^9.0.0"
-    micromatch: "npm:^4.0.5"
+    meow: "npm:^13.2.0"
+    micromatch: "npm:^4.0.8"
     normalize-path: "npm:^3.0.0"
-    picocolors: "npm:^1.0.0"
-    postcss: "npm:^8.4.14"
-    postcss-media-query-parser: "npm:^0.2.3"
-    postcss-resolve-nested-selector: "npm:^0.1.1"
-    postcss-safe-parser: "npm:^6.0.0"
-    postcss-selector-parser: "npm:^6.0.10"
+    picocolors: "npm:^1.0.1"
+    postcss: "npm:^8.4.47"
+    postcss-resolve-nested-selector: "npm:^0.1.6"
+    postcss-safe-parser: "npm:^7.0.1"
+    postcss-selector-parser: "npm:^6.1.2"
     postcss-value-parser: "npm:^4.2.0"
     resolve-from: "npm:^5.0.0"
     string-width: "npm:^4.2.3"
-    strip-ansi: "npm:^6.0.1"
+    supports-hyperlinks: "npm:^3.1.0"
+    svg-tags: "npm:^1.0.0"
+    table: "npm:^6.8.2"
+    write-file-atomic: "npm:^5.0.1"
+  bin:
+    stylelint: bin/stylelint.mjs
+  checksum: 10/2bc1627e2681414d9c61a96e8298ca7697ce8bc78bb9ffe1c3e370e064ca81cd4d131493a3f315334195b1f039ff99ea0c900e264ca4516c93ee5c36d2e4490d
+  languageName: node
+  linkType: hard
+
+"stylelint@npm:^9.10.1":
+  version: 9.10.1
+  resolution: "stylelint@npm:9.10.1"
+  dependencies:
+    autoprefixer: "npm:^9.0.0"
+    balanced-match: "npm:^1.0.0"
+    chalk: "npm:^2.4.1"
+    cosmiconfig: "npm:^5.0.0"
+    debug: "npm:^4.0.0"
+    execall: "npm:^1.0.0"
+    file-entry-cache: "npm:^4.0.0"
+    get-stdin: "npm:^6.0.0"
+    global-modules: "npm:^2.0.0"
+    globby: "npm:^9.0.0"
+    globjoin: "npm:^0.1.4"
+    html-tags: "npm:^2.0.0"
+    ignore: "npm:^5.0.4"
+    import-lazy: "npm:^3.1.0"
+    imurmurhash: "npm:^0.1.4"
+    known-css-properties: "npm:^0.11.0"
+    leven: "npm:^2.1.0"
+    lodash: "npm:^4.17.4"
+    log-symbols: "npm:^2.0.0"
+    mathml-tag-names: "npm:^2.0.1"
+    meow: "npm:^5.0.0"
+    micromatch: "npm:^3.1.10"
+    normalize-selector: "npm:^0.2.0"
+    pify: "npm:^4.0.0"
+    postcss: "npm:^7.0.13"
+    postcss-html: "npm:^0.36.0"
+    postcss-jsx: "npm:^0.36.0"
+    postcss-less: "npm:^3.1.0"
+    postcss-markdown: "npm:^0.36.0"
+    postcss-media-query-parser: "npm:^0.2.3"
+    postcss-reporter: "npm:^6.0.0"
+    postcss-resolve-nested-selector: "npm:^0.1.1"
+    postcss-safe-parser: "npm:^4.0.0"
+    postcss-sass: "npm:^0.3.5"
+    postcss-scss: "npm:^2.0.0"
+    postcss-selector-parser: "npm:^3.1.0"
+    postcss-syntax: "npm:^0.36.2"
+    postcss-value-parser: "npm:^3.3.0"
+    resolve-from: "npm:^4.0.0"
+    signal-exit: "npm:^3.0.2"
+    slash: "npm:^2.0.0"
+    specificity: "npm:^0.4.1"
+    string-width: "npm:^3.0.0"
     style-search: "npm:^0.1.0"
-    supports-hyperlinks: "npm:^2.2.0"
+    sugarss: "npm:^2.0.0"
     svg-tags: "npm:^1.0.0"
-    table: "npm:^6.8.0"
-    v8-compile-cache: "npm:^2.3.0"
-    write-file-atomic: "npm:^4.0.1"
+    table: "npm:^5.0.0"
   bin:
     stylelint: bin/stylelint.js
-  checksum: 10/58f4d507bc7ee5d064ffe6bdfbc8a2715a8c809cdd96f2f94d6ce9641c9a284c0325b144446e870658adb56fc2d9f97987fac07b4539817ec894b051730fe3d4
+  checksum: 10/3faf0de4654405c57f3f7e36a80d40694fb7d50d490fb8a07f6e822c534855651acd66499a6cbdd387920f76ec79f8bbe65ca5807bfc2361c9d06a0ba92d8ed8
   languageName: node
   linkType: hard
 
@@ -35760,21 +36717,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sucrase@npm:^3.20.3":
-  version: 3.34.0
-  resolution: "sucrase@npm:3.34.0"
+"sugarss@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "sugarss@npm:2.0.0"
   dependencies:
-    "@jridgewell/gen-mapping": "npm:^0.3.2"
-    commander: "npm:^4.0.0"
-    glob: "npm:7.1.6"
-    lines-and-columns: "npm:^1.1.6"
-    mz: "npm:^2.7.0"
-    pirates: "npm:^4.0.1"
-    ts-interface-checker: "npm:^0.1.9"
-  bin:
-    sucrase: bin/sucrase
-    sucrase-node: bin/sucrase-node
-  checksum: 10/b64d154a7a7eaa4b39668c3124bd08cd505f683d36ac4fb94def6491fb3af155b24b6e41b55011e38582e7d59c440af79ffba8709f3da78aeedf2f07b6d51d84
+    postcss: "npm:^7.0.2"
+  checksum: 10/a8e32811e707229cbf8314b9eb149d6fda2905e72b955223233058f6884c8c7df3873efda669ceb29099f112b3c2ba2d6bfddb8d636834360d1bddc144b5f8e6
   languageName: node
   linkType: hard
 
@@ -35795,15 +36743,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"superjson@npm:^1.10.0":
-  version: 1.12.1
-  resolution: "superjson@npm:1.12.1"
-  dependencies:
-    copy-anything: "npm:^3.0.2"
-  checksum: 10/e593e4de8a77c3ba7cbc5f50aafedd5202aa588f63ad8ea4f7be20dda1253b35d7e0690174afc8e0d6ea5e9f3b8547e872e07c68f99598f3e5bd5c45af57a1fc
-  languageName: node
-  linkType: hard
-
 "supertest@npm:^7.0.0":
   version: 7.0.0
   resolution: "supertest@npm:7.0.0"
@@ -35857,7 +36796,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"supports-hyperlinks@npm:^2.0.0, supports-hyperlinks@npm:^2.2.0":
+"supports-hyperlinks@npm:^2.0.0":
   version: 2.3.0
   resolution: "supports-hyperlinks@npm:2.3.0"
   dependencies:
@@ -35867,6 +36806,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"supports-hyperlinks@npm:^3.1.0":
+  version: 3.1.0
+  resolution: "supports-hyperlinks@npm:3.1.0"
+  dependencies:
+    has-flag: "npm:^4.0.0"
+    supports-color: "npm:^7.0.0"
+  checksum: 10/e893fb035ecd86e42c5225dc1cd24db56eb950ed77b2e8f59c7aaf2836b8b2ef276ffd11f0df88b0b12184832aa2333f875eefcb74d3c47ed2633b6b41d4be43
+  languageName: node
+  linkType: hard
+
 "supports-preserve-symlinks-flag@npm:^1.0.0":
   version: 1.0.0
   resolution: "supports-preserve-symlinks-flag@npm:1.0.0"
@@ -35946,12 +36895,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"swiper@npm:^9.4.1":
-  version: 9.4.1
-  resolution: "swiper@npm:9.4.1"
-  dependencies:
-    ssr-window: "npm:^4.0.2"
-  checksum: 10/900db2e4d9a812ada9c4261cc5cba335bd137e98211b5a072c64b71d0d4df213933ccd9da62e4719a3547d51d3d50d1247afe2aa6fe00bfa525de4e3c1e4c33f
+"swiper@npm:11.1.14":
+  version: 11.1.14
+  resolution: "swiper@npm:11.1.14"
+  checksum: 10/ccbdc7027022c500d4624103fc59dcb7de44122d17c005a04807a8998e6e8fe7032f4cb78e9ff0ac33705f32ec540df7fdf9002774079bcce5fd72cf6ba41457
+  languageName: node
+  linkType: hard
+
+"swiper@patch:swiper@npm%3A11.1.14#~/.yarn/patches/swiper-npm-11.1.14-8126fa478a.patch":
+  version: 11.1.14
+  resolution: "swiper@patch:swiper@npm%3A11.1.14#~/.yarn/patches/swiper-npm-11.1.14-8126fa478a.patch::version=11.1.14&hash=c4398b"
+  checksum: 10/9177de6e116ea07e18f329464d44a2116ec2d87d1403d7072c1f39661a10325fef7e149dbb5a59a36a2e1c9915dc0caf74a5022f64e4ac296f8dfe0d70689b90
   languageName: node
   linkType: hard
 
@@ -35962,6 +36916,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"synckit@npm:^0.9.1":
+  version: 0.9.2
+  resolution: "synckit@npm:0.9.2"
+  dependencies:
+    "@pkgr/core": "npm:^0.1.0"
+    tslib: "npm:^2.6.2"
+  checksum: 10/d45c4288be9c0232343650643892a7edafb79152c0c08d7ae5d33ca2c296b67a0e15f8cb5c9153969612c4ea5cd5686297542384aab977db23cfa6653fe02027
+  languageName: node
+  linkType: hard
+
 "syntax-error@npm:^1.1.1":
   version: 1.4.0
   resolution: "syntax-error@npm:1.4.0"
@@ -35971,16 +36935,28 @@ __metadata:
   languageName: node
   linkType: hard
 
-"table@npm:^6.8.0":
-  version: 6.8.0
-  resolution: "table@npm:6.8.0"
+"table@npm:^5.0.0":
+  version: 5.4.6
+  resolution: "table@npm:5.4.6"
+  dependencies:
+    ajv: "npm:^6.10.2"
+    lodash: "npm:^4.17.14"
+    slice-ansi: "npm:^2.1.0"
+    string-width: "npm:^3.0.0"
+  checksum: 10/a00b96779fdeae58fc8b2b10ca7a1dcb81d4a14d1511b2f0202e1ef4ea890ca4d2730cc9b78f399254b9a641458e4897c639079d57dfb7d6726997dd8735a6c3
+  languageName: node
+  linkType: hard
+
+"table@npm:^6.8.2":
+  version: 6.8.2
+  resolution: "table@npm:6.8.2"
   dependencies:
     ajv: "npm:^8.0.1"
     lodash.truncate: "npm:^4.4.2"
     slice-ansi: "npm:^4.0.0"
     string-width: "npm:^4.2.3"
     strip-ansi: "npm:^6.0.1"
-  checksum: 10/4c2b8ebd75f36db236529680c70f41951c9c7fda3e65cb5b987164244f23f98670ded99983fdc5d62aa02405a212e90f7446efcf87e3435e472dda26d6581645
+  checksum: 10/2946162eb87a91b9bf4283214d26830db96f09cf517eff18e7501d47a4770c529b432bb54c9394337c3dfd6c8dbf66581f76edb37e9838beb6ec394080af4ac2
   languageName: node
   linkType: hard
 
@@ -36034,7 +37010,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tar-fs@npm:^3.0.4, tar-fs@npm:^3.0.5":
+"tar-fs@npm:^3.0.6":
   version: 3.0.6
   resolution: "tar-fs@npm:3.0.6"
   dependencies:
@@ -36066,7 +37042,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tar-stream@npm:^2.1.0, tar-stream@npm:^2.1.4":
+"tar-stream@npm:^2.1.4":
   version: 2.2.0
   resolution: "tar-stream@npm:2.2.0"
   dependencies:
@@ -36079,6 +37055,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tar-stream@npm:^3.0.0":
+  version: 3.1.7
+  resolution: "tar-stream@npm:3.1.7"
+  dependencies:
+    b4a: "npm:^1.6.4"
+    fast-fifo: "npm:^1.2.0"
+    streamx: "npm:^2.15.0"
+  checksum: 10/b21a82705a72792544697c410451a4846af1f744176feb0ff11a7c3dd0896961552e3def5e1c9a6bbee4f0ae298b8252a1f4c9381e9f991553b9e4847976f05c
+  languageName: node
+  linkType: hard
+
 "tar-stream@npm:^3.1.5":
   version: 3.1.6
   resolution: "tar-stream@npm:3.1.6"
@@ -36090,17 +37077,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tar@npm:^6.0.2, tar@npm:^6.1.11, tar@npm:^6.1.2":
-  version: 6.1.11
-  resolution: "tar@npm:6.1.11"
+"tar@npm:^6.0.2, tar@npm:^6.1.11, tar@npm:^6.1.2, tar@npm:^6.2.1":
+  version: 6.2.1
+  resolution: "tar@npm:6.2.1"
   dependencies:
     chownr: "npm:^2.0.0"
     fs-minipass: "npm:^2.0.0"
-    minipass: "npm:^3.0.0"
+    minipass: "npm:^5.0.0"
     minizlib: "npm:^2.1.1"
     mkdirp: "npm:^1.0.3"
     yallist: "npm:^4.0.0"
-  checksum: 10/0e6789e66475922b8e0d1ee648cb26e0ede9a0635284269ca71b2d8acd507bc59ad5557032f0192f8ff22680b50cb66792b56f0240f484fe0d7d8cef81c1b959
+  checksum: 10/bfbfbb2861888077fc1130b84029cdc2721efb93d1d1fb80f22a7ac3a98ec6f8972f29e564103bbebf5e97be67ebc356d37fa48dbc4960600a1eb7230fbd1ea0
   languageName: node
   linkType: hard
 
@@ -36126,15 +37113,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"telejson@npm:^7.2.0":
-  version: 7.2.0
-  resolution: "telejson@npm:7.2.0"
-  dependencies:
-    memoizerific: "npm:^1.11.3"
-  checksum: 10/6e89b3d3c45b5a2aced9132f6a968fcdf758c00be4c3acb115d7d81e95c9e04083a7a4a9b43057fcf48b101156c1607a38f5491615956acb28d4d1f78a4bda20
-  languageName: node
-  linkType: hard
-
 "temp-dir@npm:^1.0.0":
   version: 1.0.0
   resolution: "temp-dir@npm:1.0.0"
@@ -36166,15 +37144,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"term-size@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "term-size@npm:1.2.0"
-  dependencies:
-    execa: "npm:^0.7.0"
-  checksum: 10/5682a6fab3349059ae66d66a303a74db6e88161c4e3d562d0099098a4b4e89b2cbf5fa9dd606b131d9691d51f1042e2b38115c739486a2d31c650ea24f88718a
-  languageName: node
-  linkType: hard
-
 "term-size@npm:^2.1.0":
   version: 2.2.1
   resolution: "term-size@npm:2.2.1"
@@ -36300,24 +37269,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"thenify-all@npm:^1.0.0":
-  version: 1.6.0
-  resolution: "thenify-all@npm:1.6.0"
-  dependencies:
-    thenify: "npm:>= 3.1.0 < 4"
-  checksum: 10/dba7cc8a23a154cdcb6acb7f51d61511c37a6b077ec5ab5da6e8b874272015937788402fd271fdfc5f187f8cb0948e38d0a42dcc89d554d731652ab458f5343e
-  languageName: node
-  linkType: hard
-
-"thenify@npm:>= 3.1.0 < 4":
-  version: 3.3.1
-  resolution: "thenify@npm:3.3.1"
-  dependencies:
-    any-promise: "npm:^1.0.0"
-  checksum: 10/486e1283a867440a904e36741ff1a177faa827cf94d69506f7e3ae4187b9afdf9ec368b3d8da225c192bfe2eb943f3f0080594156bf39f21b57cd1411e2e7f6d
-  languageName: node
-  linkType: hard
-
 "thingies@npm:^1.20.0":
   version: 1.21.0
   resolution: "thingies@npm:1.21.0"
@@ -36327,12 +37278,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"thread-stream@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "thread-stream@npm:2.1.0"
+"thread-stream@npm:^2.6.0":
+  version: 2.7.0
+  resolution: "thread-stream@npm:2.7.0"
   dependencies:
     real-require: "npm:^0.2.0"
-  checksum: 10/1a579efa782fa4f1df7cdbedf4e70d4c463cbe1d9a775521cd278ee595a540935d4420cf604c33a1249cb61d82df70d1159bcffa0ec43f874766203b351fa9bf
+  checksum: 10/03e743a2ccb2af5fa695d2e4369113336ee9b9f09c4453d50a222cbb4ae3af321bff658e0e5bf8bfbce9d7f5a7bf6262d12a2a365e160f4e76380ec624d32e7b
   languageName: node
   linkType: hard
 
@@ -36349,7 +37300,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"through2@npm:^2.0.0, through2@npm:^2.0.1, through2@npm:~2.0.3":
+"through2@npm:^2.0.0, through2@npm:^2.0.1":
   version: 2.0.5
   resolution: "through2@npm:2.0.5"
   dependencies:
@@ -36359,16 +37310,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"through2@npm:~0.6.3":
-  version: 0.6.5
-  resolution: "through2@npm:0.6.5"
-  dependencies:
-    readable-stream: "npm:>=1.0.33-1 <1.1.0-0"
-    xtend: "npm:>=4.0.0 <4.1.0-0"
-  checksum: 10/37571f0bd4fa3d22f421ecf27af4c4b5eee34f350e6ca81d1a748dc09e0ede589a88248497d5bb2855c61a583a8e0dc9cd751e71c130040fceb19f778d43503d
-  languageName: node
-  linkType: hard
-
 "through@npm:2, through@npm:>=2.2.7 <3, through@npm:^2.3.6, through@npm:^2.3.8, through@npm:~2.3, through@npm:~2.3.1":
   version: 2.3.8
   resolution: "through@npm:2.3.8"
@@ -36415,13 +37356,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tiny-events@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "tiny-events@npm:1.0.1"
-  checksum: 10/db6a1548e54ae2c310faad65934acccb19e50fa78ad810cf85f906611a1a6515701c81294c8c02abb59f65a468f0d7de2bb7b4f3b20bb6b1bef50383888fd9f2
-  languageName: node
-  linkType: hard
-
 "tiny-inflate@npm:^1.0.0, tiny-inflate@npm:^1.0.3":
   version: 1.0.3
   resolution: "tiny-inflate@npm:1.0.3"
@@ -36473,21 +37407,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tldts-core@npm:^5.7.112":
-  version: 5.7.112
-  resolution: "tldts-core@npm:5.7.112"
-  checksum: 10/8be0a4bc0233755e8f1839c2ec5476e471d2bbc1c37d1b8c67b85ce4c0ebc11214e46efd508d377e4177516ab08fa08355f8adf4771cb9e23824045717eb08c3
+"tldts-core@npm:^6.1.61":
+  version: 6.1.61
+  resolution: "tldts-core@npm:6.1.61"
+  checksum: 10/44e80c5e587ab868750613336ac43ec1164d112d394958c220e54820595f3bf7b443a30ef6c73cd99234a897e41b70a4102a2fb8a9d7b40854973ed4e73c75d7
   languageName: node
   linkType: hard
 
-"tldts@npm:~5.7.112":
-  version: 5.7.112
-  resolution: "tldts@npm:5.7.112"
+"tldts@npm:~6.1.61":
+  version: 6.1.61
+  resolution: "tldts@npm:6.1.61"
   dependencies:
-    tldts-core: "npm:^5.7.112"
+    tldts-core: "npm:^6.1.61"
   bin:
     tldts: bin/cli.js
-  checksum: 10/feb600abb1ec659f40c5946d83b099a521fd9e64fe7122de6b191852b5416c9445c2410f3629d0a9b307a4381c2e8cc70fe4ea425e773d9eee38c5055c38fad0
+  checksum: 10/dd2e1783fa0be71276e303be7a33f2746777e49eb0783452b42501edfc5a33b4396b54bd49b9268fc7e71a7fec58fb91064bdc4c4a50e1a1ada615e57ffa4bd8
   languageName: node
   linkType: hard
 
@@ -36537,6 +37471,25 @@ __metadata:
   languageName: node
   linkType: hard
 
+"to-object-path@npm:^0.3.0":
+  version: 0.3.0
+  resolution: "to-object-path@npm:0.3.0"
+  dependencies:
+    kind-of: "npm:^3.0.2"
+  checksum: 10/9425effee5b43e61d720940fa2b889623f77473d459c2ce3d4a580a4405df4403eec7be6b857455908070566352f9e2417304641ed158dda6f6a365fe3e66d70
+  languageName: node
+  linkType: hard
+
+"to-regex-range@npm:^2.1.0":
+  version: 2.1.1
+  resolution: "to-regex-range@npm:2.1.1"
+  dependencies:
+    is-number: "npm:^3.0.0"
+    repeat-string: "npm:^1.6.1"
+  checksum: 10/2eed5f897188de8ec8745137f80c0f564810082d506278dd6a80db4ea313b6d363ce8d7dc0e0406beeaba0bb7f90f01b41fa3d08fb72dd02c329b2ec579cd4e8
+  languageName: node
+  linkType: hard
+
 "to-regex-range@npm:^5.0.1":
   version: 5.0.1
   resolution: "to-regex-range@npm:5.0.1"
@@ -36546,6 +37499,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"to-regex@npm:^3.0.1, to-regex@npm:^3.0.2":
+  version: 3.0.2
+  resolution: "to-regex@npm:3.0.2"
+  dependencies:
+    define-property: "npm:^2.0.2"
+    extend-shallow: "npm:^3.0.2"
+    regex-not: "npm:^1.0.2"
+    safe-regex: "npm:^1.1.0"
+  checksum: 10/ab87c22f0719f7def00145b53e2c90d2fdcc75efa0fec1227b383aaf88ed409db2542b2b16bcbfbf95fe0727f879045803bb635b777c0306762241ca3e5562c6
+  languageName: node
+  linkType: hard
+
 "to-space-case@npm:^1.0.0":
   version: 1.0.0
   resolution: "to-space-case@npm:1.0.0"
@@ -36572,13 +37537,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"totalist@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "totalist@npm:3.0.1"
-  checksum: 10/5132d562cf88ff93fd710770a92f31dbe67cc19b5c6ccae2efc0da327f0954d211bbfd9456389655d726c624f284b4a23112f56d1da931ca7cfabbe1f45e778a
-  languageName: node
-  linkType: hard
-
 "tough-cookie@npm:^2.3.3, tough-cookie@npm:~2.5.0":
   version: 2.5.0
   resolution: "tough-cookie@npm:2.5.0"
@@ -36601,15 +37559,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tr46@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "tr46@npm:1.0.1"
-  dependencies:
-    punycode: "npm:^2.1.0"
-  checksum: 10/6e80d75480cb6658f7f283c15f5f41c2d4dfa243ca99a0e1baf3de6cc823fc4c829f89782a7a11e029905781fccfea42d08d8a6674ba7948c7dbc595b6f27dd3
-  languageName: node
-  linkType: hard
-
 "tr46@npm:^2.1.0":
   version: 2.1.0
   resolution: "tr46@npm:2.1.0"
@@ -36644,19 +37593,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tree-kill@npm:^1.2.2":
-  version: 1.2.2
-  resolution: "tree-kill@npm:1.2.2"
-  bin:
-    tree-kill: cli.js
-  checksum: 10/49117f5f410d19c84b0464d29afb9642c863bc5ba40fcb9a245d474c6d5cc64d1b177a6e6713129eb346b40aebb9d4631d967517f9fbe8251c35b21b13cd96c7
-  languageName: node
-  linkType: hard
-
-"trim-newlines@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "trim-newlines@npm:3.0.1"
-  checksum: 10/b530f3fadf78e570cf3c761fb74fef655beff6b0f84b29209bac6c9622db75ad1417f4a7b5d54c96605dcd72734ad44526fef9f396807b90839449eb543c6206
+"trim-newlines@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "trim-newlines@npm:2.0.0"
+  checksum: 10/8a288a860f051f585bdda07ffb97e9e0791ca7c5c1c025b6af4badac185f2eed23ccedeb54da2a79e06ead69824d69b6c9c35c7a69c48e07ee56ac76f91c3096
   languageName: node
   linkType: hard
 
@@ -36676,6 +37616,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"trim-trailing-lines@npm:^1.0.0":
+  version: 1.1.4
+  resolution: "trim-trailing-lines@npm:1.1.4"
+  checksum: 10/5d39d21c0d4b258667012fcd784f73129e148ea1c213b1851d8904f80499fc91df6710c94c7dd49a486a32da2b9cb86020dda79f285a9a2586cfa622f80490c2
+  languageName: node
+  linkType: hard
+
+"trim@npm:0.0.1":
+  version: 0.0.1
+  resolution: "trim@npm:0.0.1"
+  checksum: 10/2b4646dff99a222e8e1526edd4e3a43bbd925af0b8e837c340455d250157e7deefaa4da49bb891ab841e5c27b1afc5e9e32d4b57afb875d2dfcabf4e319b8f7f
+  languageName: node
+  linkType: hard
+
 "triple-beam@npm:^1.3.0":
   version: 1.3.0
   resolution: "triple-beam@npm:1.3.0"
@@ -36699,6 +37653,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ts-api-utils@npm:^1.3.0":
+  version: 1.3.0
+  resolution: "ts-api-utils@npm:1.3.0"
+  peerDependencies:
+    typescript: ">=4.2.0"
+  checksum: 10/3ee44faa24410cd649b5c864e068d438aa437ef64e9e4a66a41646a6d3024d3097a695eeb3fb26ee364705d3cb9653a65756d009e6a53badb6066a5f447bf7ed
+  languageName: node
+  linkType: hard
+
 "ts-dedent@npm:^2.0.0, ts-dedent@npm:^2.2.0":
   version: 2.2.0
   resolution: "ts-dedent@npm:2.2.0"
@@ -36706,25 +37669,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ts-interface-checker@npm:^0.1.9":
-  version: 0.1.13
-  resolution: "ts-interface-checker@npm:0.1.13"
-  checksum: 10/9f7346b9e25bade7a1050c001ec5a4f7023909c0e1644c5a96ae20703a131627f081479e6622a4ecee2177283d0069e651e507bedadd3904fc4010ab28ffce00
-  languageName: node
-  linkType: hard
-
-"ts-jest@npm:~29.1.1, ts-jest@npm:~29.1.5":
-  version: 29.1.5
-  resolution: "ts-jest@npm:29.1.5"
+"ts-jest@npm:~29.2.5":
+  version: 29.2.5
+  resolution: "ts-jest@npm:29.2.5"
   dependencies:
-    bs-logger: "npm:0.x"
-    fast-json-stable-stringify: "npm:2.x"
+    bs-logger: "npm:^0.2.6"
+    ejs: "npm:^3.1.10"
+    fast-json-stable-stringify: "npm:^2.1.0"
     jest-util: "npm:^29.0.0"
     json5: "npm:^2.2.3"
-    lodash.memoize: "npm:4.x"
-    make-error: "npm:1.x"
-    semver: "npm:^7.5.3"
-    yargs-parser: "npm:^21.0.1"
+    lodash.memoize: "npm:^4.1.2"
+    make-error: "npm:^1.3.6"
+    semver: "npm:^7.6.3"
+    yargs-parser: "npm:^21.1.1"
   peerDependencies:
     "@babel/core": ">=7.0.0-beta.0 <8"
     "@jest/transform": ^29.0.0
@@ -36745,22 +37702,23 @@ __metadata:
       optional: true
   bin:
     ts-jest: cli.js
-  checksum: 10/11a29a49130f1c9bef5aebe8007f6be3e630af6c2dea6b00ff5a86d649321854a43966b4990a43960d77a3f98d7a753b9b7e19c20c42a2d38341d6e67a3e48d1
+  checksum: 10/f89e562816861ec4510840a6b439be6145f688b999679328de8080dc8e66481325fc5879519b662163e33b7578f35243071c38beb761af34e5fe58e3e326a958
   languageName: node
   linkType: hard
 
-"ts-loader@npm:~9.4.4":
-  version: 9.4.4
-  resolution: "ts-loader@npm:9.4.4"
+"ts-loader@npm:~9.5.1":
+  version: 9.5.1
+  resolution: "ts-loader@npm:9.5.1"
   dependencies:
     chalk: "npm:^4.1.0"
     enhanced-resolve: "npm:^5.0.0"
     micromatch: "npm:^4.0.0"
     semver: "npm:^7.3.4"
+    source-map: "npm:^0.7.4"
   peerDependencies:
     typescript: "*"
     webpack: ^5.0.0
-  checksum: 10/52302f3540962d779fc346281d8d4f7310f73e129debc4fb55c1fb3f097519009b32f7e2806299904e98961c785784fccb70ceca9076c4bae33f064ad11dd982
+  checksum: 10/a85d43bb6f72858d613290ac02d1d24e81c38ba2dcb98b90465dc97eb6c2036bf9a389542c1a7865548643e7ed39f063fdff2dbb3e5aafbc511de6a3eb275adf
   languageName: node
   linkType: hard
 
@@ -36855,15 +37813,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tsconfig-paths@npm:^3.14.1":
-  version: 3.14.1
-  resolution: "tsconfig-paths@npm:3.14.1"
+"tsconfig-paths@npm:^3.15.0":
+  version: 3.15.0
+  resolution: "tsconfig-paths@npm:3.15.0"
   dependencies:
     "@types/json5": "npm:^0.0.29"
-    json5: "npm:^1.0.1"
+    json5: "npm:^1.0.2"
     minimist: "npm:^1.2.6"
     strip-bom: "npm:^3.0.0"
-  checksum: 10/51be8bd8f90e49d2f8b3f61f544557e631dd5cee35e247dd316be27d723c9e99de9ce59eb39395ca20f1e43aedfc1fef0272ba25acb0a0e0e9a38cffd692256d
+  checksum: 10/2041beaedc6c271fc3bedd12e0da0cc553e65d030d4ff26044b771fac5752d0460944c0b5e680f670c2868c95c664a256cec960ae528888db6ded83524e33a14
   languageName: node
   linkType: hard
 
@@ -36885,7 +37843,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:^1.11.1, tslib@npm:^1.8.1, tslib@npm:^1.9.0":
+"tslib@npm:^1.11.1, tslib@npm:^1.8.1":
   version: 1.14.1
   resolution: "tslib@npm:1.14.1"
   checksum: 10/7dbf34e6f55c6492637adb81b555af5e3b4f9cc6b998fb440dac82d3b42bdc91560a35a5fb75e20e24a076c651438234da6743d139e4feabf0783f3cdfe1dddb
@@ -36906,42 +37864,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tsup@npm:^6.7.0":
-  version: 6.7.0
-  resolution: "tsup@npm:6.7.0"
-  dependencies:
-    bundle-require: "npm:^4.0.0"
-    cac: "npm:^6.7.12"
-    chokidar: "npm:^3.5.1"
-    debug: "npm:^4.3.1"
-    esbuild: "npm:^0.17.6"
-    execa: "npm:^5.0.0"
-    globby: "npm:^11.0.3"
-    joycon: "npm:^3.0.1"
-    postcss-load-config: "npm:^3.0.1"
-    resolve-from: "npm:^5.0.0"
-    rollup: "npm:^3.2.5"
-    source-map: "npm:0.8.0-beta.0"
-    sucrase: "npm:^3.20.3"
-    tree-kill: "npm:^1.2.2"
-  peerDependencies:
-    "@swc/core": ^1
-    postcss: ^8.4.12
-    typescript: ">=4.1.0"
-  peerDependenciesMeta:
-    "@swc/core":
-      optional: true
-    postcss:
-      optional: true
-    typescript:
-      optional: true
-  bin:
-    tsup: dist/cli-default.js
-    tsup-node: dist/cli-node.js
-  checksum: 10/fd666b3b3e81abb3e2a11896395154522cee334ff4952e9ceeee1c7e5cf752a7ea710e155fe49bdcae5e88dd999d75debc12a68c20d0a9bb9b0be3d7d77a193c
-  languageName: node
-  linkType: hard
-
 "tsutils@npm:^3.21.0":
   version: 3.21.0
   resolution: "tsutils@npm:3.21.0"
@@ -36967,23 +37889,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tty-table@npm:^4.1.5":
-  version: 4.2.1
-  resolution: "tty-table@npm:4.2.1"
-  dependencies:
-    chalk: "npm:^4.1.2"
-    csv: "npm:^5.5.3"
-    kleur: "npm:^4.1.5"
-    smartwrap: "npm:^2.0.2"
-    strip-ansi: "npm:^6.0.1"
-    wcwidth: "npm:^1.0.1"
-    yargs: "npm:^17.7.1"
-  bin:
-    tty-table: adapters/terminal-adapter.js
-  checksum: 10/c194abc673d178bef9dbcaf44c19db5560b7e126ad3fe86ef1c2bddee848a6ad6e8df419375feee4c89f7793c96378db7095963fe5c1b8e015b9e4f1b6c80916
-  languageName: node
-  linkType: hard
-
 "tunnel-agent@npm:^0.6.0":
   version: 0.6.0
   resolution: "tunnel-agent@npm:0.6.0"
@@ -37000,58 +37905,58 @@ __metadata:
   languageName: node
   linkType: hard
 
-"turbo-darwin-64@npm:2.1.3":
-  version: 2.1.3
-  resolution: "turbo-darwin-64@npm:2.1.3"
+"turbo-darwin-64@npm:2.2.3":
+  version: 2.2.3
+  resolution: "turbo-darwin-64@npm:2.2.3"
   conditions: os=darwin & cpu=x64
   languageName: node
   linkType: hard
 
-"turbo-darwin-arm64@npm:2.1.3":
-  version: 2.1.3
-  resolution: "turbo-darwin-arm64@npm:2.1.3"
+"turbo-darwin-arm64@npm:2.2.3":
+  version: 2.2.3
+  resolution: "turbo-darwin-arm64@npm:2.2.3"
   conditions: os=darwin & cpu=arm64
   languageName: node
   linkType: hard
 
-"turbo-linux-64@npm:2.1.3":
-  version: 2.1.3
-  resolution: "turbo-linux-64@npm:2.1.3"
+"turbo-linux-64@npm:2.2.3":
+  version: 2.2.3
+  resolution: "turbo-linux-64@npm:2.2.3"
   conditions: os=linux & cpu=x64
   languageName: node
   linkType: hard
 
-"turbo-linux-arm64@npm:2.1.3":
-  version: 2.1.3
-  resolution: "turbo-linux-arm64@npm:2.1.3"
+"turbo-linux-arm64@npm:2.2.3":
+  version: 2.2.3
+  resolution: "turbo-linux-arm64@npm:2.2.3"
   conditions: os=linux & cpu=arm64
   languageName: node
   linkType: hard
 
-"turbo-windows-64@npm:2.1.3":
-  version: 2.1.3
-  resolution: "turbo-windows-64@npm:2.1.3"
+"turbo-windows-64@npm:2.2.3":
+  version: 2.2.3
+  resolution: "turbo-windows-64@npm:2.2.3"
   conditions: os=win32 & cpu=x64
   languageName: node
   linkType: hard
 
-"turbo-windows-arm64@npm:2.1.3":
-  version: 2.1.3
-  resolution: "turbo-windows-arm64@npm:2.1.3"
+"turbo-windows-arm64@npm:2.2.3":
+  version: 2.2.3
+  resolution: "turbo-windows-arm64@npm:2.2.3"
   conditions: os=win32 & cpu=arm64
   languageName: node
   linkType: hard
 
-"turbo@npm:^2.1.3":
-  version: 2.1.3
-  resolution: "turbo@npm:2.1.3"
-  dependencies:
-    turbo-darwin-64: "npm:2.1.3"
-    turbo-darwin-arm64: "npm:2.1.3"
-    turbo-linux-64: "npm:2.1.3"
-    turbo-linux-arm64: "npm:2.1.3"
-    turbo-windows-64: "npm:2.1.3"
-    turbo-windows-arm64: "npm:2.1.3"
+"turbo@npm:^2.2.3":
+  version: 2.2.3
+  resolution: "turbo@npm:2.2.3"
+  dependencies:
+    turbo-darwin-64: "npm:2.2.3"
+    turbo-darwin-arm64: "npm:2.2.3"
+    turbo-linux-64: "npm:2.2.3"
+    turbo-linux-arm64: "npm:2.2.3"
+    turbo-windows-64: "npm:2.2.3"
+    turbo-windows-arm64: "npm:2.2.3"
   dependenciesMeta:
     turbo-darwin-64:
       optional: true
@@ -37067,7 +37972,14 @@ __metadata:
       optional: true
   bin:
     turbo: bin/turbo
-  checksum: 10/b8e90a38f47dc5c07e5f1c0bd708f9dc6b00b744847a45c06e5de5a5379a32bb155e8ad994eb03e60f697afc87f0815dd02fc680e22c0fad83d65c0a1fb6fc96
+  checksum: 10/ce7dc0b45d11ba9d2a435daad3357ad45e51a81583134912d1ff5b4569c6d233f56b5fc2459ad5c4a8d41ddec566574e34e5c8649ef64b7546348014bd371ea5
+  languageName: node
+  linkType: hard
+
+"tweetnacl@npm:1.0.3":
+  version: 1.0.3
+  resolution: "tweetnacl@npm:1.0.3"
+  checksum: 10/ca122c2f86631f3c0f6d28efb44af2a301d4a557a62a3e2460286b08e97567b258c2212e4ad1cfa22bd6a57edcdc54ba76ebe946847450ab0999e6d48ccae332
   languageName: node
   linkType: hard
 
@@ -37078,16 +37990,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tweetnacl@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "tweetnacl@npm:1.0.3"
-  checksum: 10/ca122c2f86631f3c0f6d28efb44af2a301d4a557a62a3e2460286b08e97567b258c2212e4ad1cfa22bd6a57edcdc54ba76ebe946847450ab0999e6d48ccae332
-  languageName: node
-  linkType: hard
-
-"twilio@npm:^3.76.1":
-  version: 3.76.1
-  resolution: "twilio@npm:3.76.1"
+"twilio@npm:^3.84.1":
+  version: 3.84.1
+  resolution: "twilio@npm:3.84.1"
   dependencies:
     axios: "npm:^0.26.1"
     dayjs: "npm:^1.8.29"
@@ -37100,7 +38005,7 @@ __metadata:
     scmp: "npm:^2.1.0"
     url-parse: "npm:^1.5.9"
     xmlbuilder: "npm:^13.0.2"
-  checksum: 10/096f1dac77456bc01377f5b0dfc1b6ea764639db6daa5866c8f7a420a6d7d8f0e294c5460190a626ef5c725ebc5771812be138aca6f0e7a9cc7e85b699af580e
+  checksum: 10/cfea30a976bd3433df81c5067214820791cdedad055e5c57e8e9531a9d330629b81859a7c8c0c1723461975335ac36e10b27157b516789c445cff4bb47ec3838
   languageName: node
   linkType: hard
 
@@ -37145,20 +38050,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"type-fest@npm:^0.13.1":
-  version: 0.13.1
-  resolution: "type-fest@npm:0.13.1"
-  checksum: 10/11e9476dc85bf97a71f6844fb67ba8e64a4c7e445724c0f3bd37eb2ddf4bc97c1dc9337bd880b28bce158de1c0cb275c2d03259815a5bf64986727197126ab56
-  languageName: node
-  linkType: hard
-
-"type-fest@npm:^0.18.0":
-  version: 0.18.1
-  resolution: "type-fest@npm:0.18.1"
-  checksum: 10/08844377058435c2b0e633ba01bab6102dba0ed63d85417d8e18feff265eed6f5c9f8f9a25d405ea9db88a41a569be73a3c4c0d4e29150bf89fb145bb23114a2
-  languageName: node
-  linkType: hard
-
 "type-fest@npm:^0.20.2":
   version: 0.20.2
   resolution: "type-fest@npm:0.20.2"
@@ -37173,14 +38064,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"type-fest@npm:^0.6.0":
-  version: 0.6.0
-  resolution: "type-fest@npm:0.6.0"
-  checksum: 10/9ecbf4ba279402b14c1a0614b6761bbe95626fab11377291fecd7e32b196109551e0350dcec6af74d97ced1b000ba8060a23eca33157091e642b409c2054ba82
-  languageName: node
-  linkType: hard
-
-"type-fest@npm:^0.8.0, type-fest@npm:^0.8.1":
+"type-fest@npm:^0.8.0":
   version: 0.8.1
   resolution: "type-fest@npm:0.8.1"
   checksum: 10/fd4a91bfb706aeeb0d326ebd2e9a8ea5263979e5dec8d16c3e469a5bd3a946e014a062ef76c02e3086d3d1c7209a56a20a4caafd0e9f9a5c2ab975084ea3d388
@@ -37194,7 +38078,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"type-fest@npm:^2.19.0, type-fest@npm:~2.19":
+"type-fest@npm:^2.19.0":
   version: 2.19.0
   resolution: "type-fest@npm:2.19.0"
   checksum: 10/7bf9e8fdf34f92c8bb364c0af14ca875fac7e0183f2985498b77be129dc1b3b1ad0a6b3281580f19e48c6105c037fb966ad9934520c69c6434d17fd0af4eed78
@@ -37211,6 +38095,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"type-is@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "type-is@npm:2.0.0"
+  dependencies:
+    content-type: "npm:^1.0.5"
+    media-typer: "npm:^1.1.0"
+    mime-types: "npm:^3.0.0"
+  checksum: 10/056ae0e94fc7e01209f001d2b4506e39908d95e454aef6eefec7f8f252a00b15c6c0a9707fa3d4d6a83be8ea3ea95fe1d6cfd5bfe7ef90831b61875f5512f441
+  languageName: node
+  linkType: hard
+
 "typed-array-buffer@npm:^1.0.2":
   version: 1.0.2
   resolution: "typed-array-buffer@npm:1.0.2"
@@ -37295,26 +38190,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@npm:~5.1.6":
-  version: 5.1.6
-  resolution: "typescript@npm:5.1.6"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: 10/f347cde665cf43dc4c1c7d9821c7d9bbec3c3914f4bdd82ee490e9fb9f6d99036ed8666463b6a192dd005eeef333c5087d5931bdd51ec853436ff9a670a7417e
-  languageName: node
-  linkType: hard
-
-"typescript@npm:~5.3.3":
-  version: 5.3.3
-  resolution: "typescript@npm:5.3.3"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: 10/6e4e6a14a50c222b3d14d4ea2f729e79f972fa536ac1522b91202a9a65af3605c2928c4a790a4a50aa13694d461c479ba92cedaeb1e7b190aadaa4e4b96b8e18
-  languageName: node
-  linkType: hard
-
 "typescript@npm:~5.6.3":
   version: 5.6.3
   resolution: "typescript@npm:5.6.3"
@@ -37325,26 +38200,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@patch:typescript@npm%3A~5.1.6#optional!builtin<compat/typescript>":
-  version: 5.1.6
-  resolution: "typescript@patch:typescript@npm%3A5.1.6#optional!builtin<compat/typescript>::version=5.1.6&hash=5da071"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: 10/f5481fa3ba0eee8970f46708d13c05650a865ad093b586fc9573f425c64c57ca97e3308e110bb528deb3ccebe83f6fd7b5a8ac90018038da96326a9ccdf8e77c
-  languageName: node
-  linkType: hard
-
-"typescript@patch:typescript@npm%3A~5.3.3#optional!builtin<compat/typescript>":
-  version: 5.3.3
-  resolution: "typescript@patch:typescript@npm%3A5.3.3#optional!builtin<compat/typescript>::version=5.3.3&hash=e012d7"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: 10/c93786fcc9a70718ba1e3819bab56064ead5817004d1b8186f8ca66165f3a2d0100fee91fa64c840dcd45f994ca5d615d8e1f566d39a7470fc1e014dbb4cf15d
-  languageName: node
-  linkType: hard
-
 "typescript@patch:typescript@npm%3A~5.6.3#optional!builtin<compat/typescript>":
   version: 5.6.3
   resolution: "typescript@patch:typescript@npm%3A5.6.3#optional!builtin<compat/typescript>::version=5.6.3&hash=8c6c40"
@@ -37355,37 +38210,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typia@npm:6.9.0":
-  version: 6.9.0
-  resolution: "typia@npm:6.9.0"
-  dependencies:
-    "@samchon/openapi": "npm:^0.4.6"
-    commander: "npm:^10.0.0"
-    comment-json: "npm:^4.2.3"
-    inquirer: "npm:^8.2.5"
-    randexp: "npm:^0.5.3"
-  peerDependencies:
-    typescript: ">=4.8.0 <5.6.0"
-  bin:
-    typia: lib/executable/typia.js
-  checksum: 10/bda96d6ef73115e9bcd753eef6553c2bca881539f380d4f67b58b26683ebc99a8938d96537a0fff07c564530f9aca53bcd332fb76da6adb57b75d274a2cd28e5
-  languageName: node
-  linkType: hard
-
-"typia@patch:typia@npm%3A6.9.0#./.yarn/patches/typia-npm-6.9.0-2fd4d85f25.patch::locator=rocket.chat%40workspace%3A.":
-  version: 6.9.0
-  resolution: "typia@patch:typia@npm%3A6.9.0#./.yarn/patches/typia-npm-6.9.0-2fd4d85f25.patch::version=6.9.0&hash=71fcee&locator=rocket.chat%40workspace%3A."
+"typia@npm:~6.11.4":
+  version: 6.11.4
+  resolution: "typia@npm:6.11.4"
   dependencies:
-    "@samchon/openapi": "npm:^0.4.6"
+    "@samchon/openapi": "npm:^1.1.2"
     commander: "npm:^10.0.0"
     comment-json: "npm:^4.2.3"
     inquirer: "npm:^8.2.5"
+    package-manager-detector: "npm:^0.2.0"
     randexp: "npm:^0.5.3"
   peerDependencies:
-    typescript: ">=4.8.0 <5.6.0"
+    typescript: ">=4.8.0 <5.7.0"
   bin:
     typia: lib/executable/typia.js
-  checksum: 10/4c6db611e1bd939235f7b8da0d2c6ee14796404bef639c34be4b81b32b800f6d7a610599eea3a4c51c9caa3f997cace76d964436e0bc2115bad65bb7edd71fa5
+  checksum: 10/b3fcb77ee7f8ed70fe2c8a433d0a87b2548b51e8b20c2f428b7d9ff930df5fea0ffd31501dc55a932c8b2caafcc02a714ea1ffe242c03304bebf5b2b306b0cb9
   languageName: node
   linkType: hard
 
@@ -37417,13 +38256,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ultron@npm:~1.1.0":
-  version: 1.1.1
-  resolution: "ultron@npm:1.1.1"
-  checksum: 10/7cc6e8e98a2c62c87ab25a79a274f90492f13f5cf7c622dbda1ec85913e207aed392c26e76ed6250c4f05f842571b05dcce1f8ad0f5ecded64a99002b1fdf6e5
-  languageName: node
-  linkType: hard
-
 "umd@npm:^3.0.0":
   version: 3.0.3
   resolution: "umd@npm:3.0.3"
@@ -37484,13 +38316,39 @@ __metadata:
   languageName: node
   linkType: hard
 
-"undici-types@npm:~6.19.2":
+"undici-types@npm:~6.19.2, undici-types@npm:~6.19.8":
   version: 6.19.8
   resolution: "undici-types@npm:6.19.8"
   checksum: 10/cf0b48ed4fc99baf56584afa91aaffa5010c268b8842f62e02f752df209e3dea138b372a60a963b3b2576ed932f32329ce7ddb9cb5f27a6c83040d8cd74b7a70
   languageName: node
   linkType: hard
 
+"undici@npm:^5.25.4":
+  version: 5.28.4
+  resolution: "undici@npm:5.28.4"
+  dependencies:
+    "@fastify/busboy": "npm:^2.0.0"
+  checksum: 10/a666a9f5ac4270c659fafc33d78b6b5039a0adbae3e28f934774c85dcc66ea91da907896f12b414bd6f578508b44d5dc206fa636afa0e49a4e1c9e99831ff065
+  languageName: node
+  linkType: hard
+
+"undici@npm:^6.19.5":
+  version: 6.20.1
+  resolution: "undici@npm:6.20.1"
+  checksum: 10/68604b53754a95ec89d52efc08fe3e70e333997300c9a5b69f2b6496f1f0f568b2e35adec6442985a7b1d2f7a5648ef5062d1736e4d68082d473cb82177674bc
+  languageName: node
+  linkType: hard
+
+"unherit@npm:^1.0.4":
+  version: 1.1.3
+  resolution: "unherit@npm:1.1.3"
+  dependencies:
+    inherits: "npm:^2.0.0"
+    xtend: "npm:^4.0.0"
+  checksum: 10/fd7922f84fc0bfb7c4df6d1f5a50b5b94a0218e3cda98a54dbbd209226ddd4072d742d3df44d0e295ab08d5ccfd304a1e193dfe31a86d2a91b7cb9fdac093194
+  languageName: node
+  linkType: hard
+
 "unicode-canonical-property-names-ecmascript@npm:^2.0.0":
   version: 2.0.0
   resolution: "unicode-canonical-property-names-ecmascript@npm:2.0.0"
@@ -37556,6 +38414,34 @@ __metadata:
   languageName: node
   linkType: hard
 
+"unified@npm:^7.0.0":
+  version: 7.1.0
+  resolution: "unified@npm:7.1.0"
+  dependencies:
+    "@types/unist": "npm:^2.0.0"
+    "@types/vfile": "npm:^3.0.0"
+    bail: "npm:^1.0.0"
+    extend: "npm:^3.0.0"
+    is-plain-obj: "npm:^1.1.0"
+    trough: "npm:^1.0.0"
+    vfile: "npm:^3.0.0"
+    x-is-string: "npm:^0.1.0"
+  checksum: 10/64c9531955ad123f7f6ee7feeec727f1608dafa8e56c4a1031dc285ad57d91c1bbe022c363a3b3d40a64d3fc2b005597b01c8c3895293766f1fcba0950cbe611
+  languageName: node
+  linkType: hard
+
+"union-value@npm:^1.0.0":
+  version: 1.0.1
+  resolution: "union-value@npm:1.0.1"
+  dependencies:
+    arr-union: "npm:^3.1.0"
+    get-value: "npm:^2.0.6"
+    is-extendable: "npm:^0.1.1"
+    set-value: "npm:^2.0.1"
+  checksum: 10/a3464097d3f27f6aa90cf103ed9387541bccfc006517559381a10e0dffa62f465a9d9a09c9b9c3d26d0f4cbe61d4d010e2fbd710fd4bf1267a768ba8a774b0ba
+  languageName: node
+  linkType: hard
+
 "uniq@npm:^1.0.1":
   version: 1.0.1
   resolution: "uniq@npm:1.0.1"
@@ -37579,6 +38465,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"unique-filename@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "unique-filename@npm:3.0.0"
+  dependencies:
+    unique-slug: "npm:^4.0.0"
+  checksum: 10/8e2f59b356cb2e54aab14ff98a51ac6c45781d15ceaab6d4f1c2228b780193dc70fae4463ce9e1df4479cb9d3304d7c2043a3fb905bdeca71cc7e8ce27e063df
+  languageName: node
+  linkType: hard
+
 "unique-slug@npm:^2.0.0":
   version: 2.0.2
   resolution: "unique-slug@npm:2.0.2"
@@ -37588,21 +38483,44 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unique-string@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "unique-string@npm:1.0.0"
+"unique-slug@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "unique-slug@npm:4.0.0"
   dependencies:
-    crypto-random-string: "npm:^1.0.0"
-  checksum: 10/4970f1592785cbb818d970056ee73327779629d19d72bf02443162e553f79bd44ab56d123d43aad887f1db34016c3d7457e3ad78fdc026ea468c3f610b198a0d
+    imurmurhash: "npm:^0.1.4"
+  checksum: 10/40912a8963fc02fb8b600cf50197df4a275c602c60de4cac4f75879d3c48558cfac48de08a25cc10df8112161f7180b3bbb4d662aadb711568602f9eddee54f0
   languageName: node
   linkType: hard
 
-"unist-util-is@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "unist-util-is@npm:6.0.0"
+"unist-util-find-all-after@npm:^1.0.2":
+  version: 1.0.5
+  resolution: "unist-util-find-all-after@npm:1.0.5"
+  dependencies:
+    unist-util-is: "npm:^3.0.0"
+  checksum: 10/72c14b66ba9ec15652cc5db3179f3553999445984775f36c20f83b9719e101a21d702b0132e0df77af7499ed4691d97ff6bd42c1b6dc75817554b31a19a1dc9d
+  languageName: node
+  linkType: hard
+
+"unist-util-is@npm:^3.0.0":
+  version: 3.0.0
+  resolution: "unist-util-is@npm:3.0.0"
+  checksum: 10/4cb6af4ad752155da2e79318f781adcd53fa2df3376f9acdee628de536613337f501ded76bf7e4a153be93ee0ff009889882eb71ac1a72ae5496ae278661c143
+  languageName: node
+  linkType: hard
+
+"unist-util-remove-position@npm:^1.0.0":
+  version: 1.1.4
+  resolution: "unist-util-remove-position@npm:1.1.4"
   dependencies:
-    "@types/unist": "npm:^3.0.0"
-  checksum: 10/edd6a93fb2255addf4b9eeb304c1da63c62179aef793169dd64ab955cf2f6814885fe25f95f8105893e3562dead348af535718d7a84333826e0491c04bf42511
+    unist-util-visit: "npm:^1.1.0"
+  checksum: 10/63bbcaf8b081a14d3631a215e2685347eee9aca46eba3afc2db8dfe0e23bcdf06211e25214ed8e769938dac828f386e06eea59e1190b9ab56331a3f39cf4db33
+  languageName: node
+  linkType: hard
+
+"unist-util-stringify-position@npm:^1.0.0, unist-util-stringify-position@npm:^1.1.1":
+  version: 1.1.2
+  resolution: "unist-util-stringify-position@npm:1.1.2"
+  checksum: 10/d599be2d12f473fae133463849e4083faa7c5f9c975b76f4efe34099532f7361400ef00b70788e8ebc5015fd0fdf44f1c3b7c775d9796b08a35767d4ff4e04ef
   languageName: node
   linkType: hard
 
@@ -37615,24 +38533,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unist-util-visit-parents@npm:^6.0.0":
-  version: 6.0.1
-  resolution: "unist-util-visit-parents@npm:6.0.1"
+"unist-util-visit-parents@npm:^2.0.0":
+  version: 2.1.2
+  resolution: "unist-util-visit-parents@npm:2.1.2"
   dependencies:
-    "@types/unist": "npm:^3.0.0"
-    unist-util-is: "npm:^6.0.0"
-  checksum: 10/645b3cbc5e923bc692b1eb1a9ca17bffc5aabc25e6090ff3f1489bff8effd1890b28f7a09dc853cb6a7fa0da8581bfebc9b670a68b53c4c086cb9610dfd37701
+    unist-util-is: "npm:^3.0.0"
+  checksum: 10/01ef0b7d369e97c7ec15dde3d70e9016993ebacdf4860ac736cdcfad3991411c6695f55dda128ab2faeb1af616f0509f0741cefe4e2c1a32d6be40b0e5a3d986
   languageName: node
   linkType: hard
 
-"unist-util-visit@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "unist-util-visit@npm:5.0.0"
+"unist-util-visit@npm:^1.1.0":
+  version: 1.4.1
+  resolution: "unist-util-visit@npm:1.4.1"
   dependencies:
-    "@types/unist": "npm:^3.0.0"
-    unist-util-is: "npm:^6.0.0"
-    unist-util-visit-parents: "npm:^6.0.0"
-  checksum: 10/f2bbde23641e9ade7640358c06ddeec0f38342322eb8e7819d9ee380b0f859d25d084dde22bf63db0280b3b2f36575f15aa1d6c23acf276c91c2493cf799e3b0
+    unist-util-visit-parents: "npm:^2.0.0"
+  checksum: 10/e9395205b6908c8d0fe71bc44e65d89d4781d1bb2d453a33cb67ed4124bad0b89d6b1d526ebaecb82a7c48e211bdf6f24351449b8cc115327b345f4617c18728
   languageName: node
   linkType: hard
 
@@ -37652,15 +38567,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"universal-websocket-client@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "universal-websocket-client@npm:1.0.2"
-  dependencies:
-    ws: "npm:^3.3.3"
-  checksum: 10/c9091e6d72767a4d7ef3faf88cba1240c708d75cce8faec5f5ed8bbfc72da18babb370b99795d75b818f9edb3910a26d179c49c176d8c401fd474203c6c58aad
-  languageName: node
-  linkType: hard
-
 "universalify@npm:^0.1.0":
   version: 0.1.2
   resolution: "universalify@npm:0.1.2"
@@ -37711,10 +38617,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unzip-response@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "unzip-response@npm:2.0.1"
-  checksum: 10/433aa4869a82c0e2bf2896dce8072b723511023515ba97155759efeea7c0e4db8ecfee2fcc0babf168545c2be613aed205d5237423c249d77d0f5327a842c20d
+"unset-value@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "unset-value@npm:1.0.0"
+  dependencies:
+    has-value: "npm:^0.3.1"
+    isobject: "npm:^3.0.0"
+  checksum: 10/0ca644870613dece963e4abb762b0da4c1cf6be4ac2f0859a463e4e9520c1ec85e512cfbfd73371ee0bb09ef536a0c4abd6f2c357715a08b43448aedc82acee6
   languageName: node
   linkType: hard
 
@@ -37746,34 +38655,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"update-check@npm:1.5.2":
-  version: 1.5.2
-  resolution: "update-check@npm:1.5.2"
-  dependencies:
-    registry-auth-token: "npm:3.3.2"
-    registry-url: "npm:3.1.0"
-  checksum: 10/c614a7e7c7185b46aecd20e53316f5d71fb8cdb5478150da084124a160545da68da445c99992b1113c6b38a394e6a5311d000b7aacd9702138218d67e66d592b
-  languageName: node
-  linkType: hard
-
-"update-notifier@npm:^2.2.0":
-  version: 2.5.0
-  resolution: "update-notifier@npm:2.5.0"
-  dependencies:
-    boxen: "npm:^1.2.1"
-    chalk: "npm:^2.0.1"
-    configstore: "npm:^3.0.0"
-    import-lazy: "npm:^2.1.0"
-    is-ci: "npm:^1.0.10"
-    is-installed-globally: "npm:^0.1.0"
-    is-npm: "npm:^1.0.0"
-    latest-version: "npm:^3.0.0"
-    semver-diff: "npm:^2.0.0"
-    xdg-basedir: "npm:^3.0.0"
-  checksum: 10/878016aa973aa6f4e6b3b9bb56e731dd69074d12b8db6404bb510a6b7cc597bbb9c589d44328df5351600faf29a5fd68180c96a9c77bc14b4a0d8a2dc6ad3aa7
-  languageName: node
-  linkType: hard
-
 "upper-case-first@npm:^2.0.2":
   version: 2.0.2
   resolution: "upper-case-first@npm:2.0.2"
@@ -37801,6 +38682,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"urix@npm:^0.1.0":
+  version: 0.1.0
+  resolution: "urix@npm:0.1.0"
+  checksum: 10/ebf5df5491c1d40ea88f7529ee9d8fd6501f44c47b8017d168fd1558d40f7d613c6f39869643344e58b71ba2da357a7c26f353a2a54d416492fcdca81f05b338
+  languageName: node
+  linkType: hard
+
 "url-join@npm:^4.0.1":
   version: 4.0.1
   resolution: "url-join@npm:4.0.1"
@@ -37903,36 +38791,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"use-subscription@npm:^1.8.2":
-  version: 1.8.2
-  resolution: "use-subscription@npm:1.8.2"
-  dependencies:
-    use-sync-external-store: "npm:^1.2.2"
-  peerDependencies:
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 10/6b17f92a75405a4e6015d7762b459a43435f34d0bb9a72e512e305d6d3a61bd170e6666c3a62c2c3c7af1b7ba0b45c5a597b7eeea54c46e1cabf8ef0f971d44e
-  languageName: node
-  linkType: hard
-
-"use-subscription@npm:~1.6.0":
-  version: 1.6.0
-  resolution: "use-subscription@npm:1.6.0"
-  peerDependencies:
-    react: ^18.0.0
-  checksum: 10/afce4295e439069d6139079c7c3a12ac3e6c4e81cd9b1622e62934e007d8cf2885f6aae5bd8de4f031d3eb5bd3cea2fd83d9be8c3da9542d4ba0a9de170be274
-  languageName: node
-  linkType: hard
-
-"use-sync-external-store@npm:1.2.0":
-  version: 1.2.0
-  resolution: "use-sync-external-store@npm:1.2.0"
-  peerDependencies:
-    react: ^16.8.0 || ^17.0.0 || ^18.0.0
-  checksum: 10/a676216affc203876bd47981103f201f28c2731361bb186367e12d287a7566763213a8816910c6eb88265eccd4c230426eb783d64c373c4a180905be8820ed8e
-  languageName: node
-  linkType: hard
-
-"use-sync-external-store@npm:^1.2.0, use-sync-external-store@npm:^1.2.2, use-sync-external-store@npm:~1.2.0, use-sync-external-store@npm:~1.2.2":
+"use-sync-external-store@npm:1.2.2, use-sync-external-store@npm:^1.2.0, use-sync-external-store@npm:^1.2.2, use-sync-external-store@npm:~1.2.0, use-sync-external-store@npm:~1.2.2":
   version: 1.2.2
   resolution: "use-sync-external-store@npm:1.2.2"
   peerDependencies:
@@ -37941,6 +38800,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"use@npm:^3.1.0":
+  version: 3.1.1
+  resolution: "use@npm:3.1.1"
+  checksum: 10/08a130289f5238fcbf8f59a18951286a6e660d17acccc9d58d9b69dfa0ee19aa038e8f95721b00b432c36d1629a9e32a464bf2e7e0ae6a244c42ddb30bdd8b33
+  languageName: node
+  linkType: hard
+
 "utf7@npm:>=1.0.2":
   version: 1.0.2
   resolution: "utf7@npm:1.0.2"
@@ -37967,13 +38833,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"util-extend@npm:^1.0.1":
-  version: 1.0.3
-  resolution: "util-extend@npm:1.0.3"
-  checksum: 10/da57f399b331f40fe2cea5409b1f4939231433db9b52dac5593e4390a98b7b0d1318a0daefbcc48123fffe5026ef49f418b3e4df7a4cd7649a2583e559c608a5
-  languageName: node
-  linkType: hard
-
 "util.promisify@npm:~1.0.0":
   version: 1.0.1
   resolution: "util.promisify@npm:1.0.1"
@@ -38031,6 +38890,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"uuid@npm:^11.0.3, uuid@npm:~11.0.3":
+  version: 11.0.3
+  resolution: "uuid@npm:11.0.3"
+  bin:
+    uuid: dist/esm/bin/uuid
+  checksum: 10/251385563195709eb0697c74a834764eef28e1656d61174e35edbd129288acb4d95a43f4ce8a77b8c2fc128e2b55924296a0945f964b05b9173469d045625ff2
+  languageName: node
+  linkType: hard
+
 "uuid@npm:^3.0.1, uuid@npm:^3.3.2":
   version: 3.4.0
   resolution: "uuid@npm:3.4.0"
@@ -38040,16 +38908,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"uuid@npm:^7.0.3":
-  version: 7.0.3
-  resolution: "uuid@npm:7.0.3"
-  bin:
-    uuid: dist/bin/uuid
-  checksum: 10/b2a4d30ecd6581015175487426558aafd7f7b4013a2e30802c128cc28cad9abe46ecd36c02f7fbcde7908fd4672334818d56a441c0871963d6bd89d911bef2ea
-  languageName: node
-  linkType: hard
-
-"uuid@npm:^8.0.0, uuid@npm:^8.3.2, uuid@npm:~8.3.2":
+"uuid@npm:^8.0.0, uuid@npm:^8.3.2":
   version: 8.3.2
   resolution: "uuid@npm:8.3.2"
   bin:
@@ -38058,7 +38917,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"uuid@npm:^9.0.0, uuid@npm:^9.0.1, uuid@npm:~9.0.1":
+"uuid@npm:^9.0.0":
   version: 9.0.1
   resolution: "uuid@npm:9.0.1"
   bin:
@@ -38074,13 +38933,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"v8-compile-cache@npm:^2.3.0":
-  version: 2.3.0
-  resolution: "v8-compile-cache@npm:2.3.0"
-  checksum: 10/7de7423db6f48d76cffae93d70d503e160c97fc85e55945036d719111e20b33c4be5c21aa8b123a3da203bbb3bc4c8180f9667d5ccafcff11d749fae204ec7be
-  languageName: node
-  linkType: hard
-
 "v8-to-istanbul@npm:^9.0.1":
   version: 9.0.1
   resolution: "v8-to-istanbul@npm:9.0.1"
@@ -38154,6 +39006,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"vfile-location@npm:^2.0.0":
+  version: 2.0.6
+  resolution: "vfile-location@npm:2.0.6"
+  checksum: 10/e52d7b2cffc959514e9ee68f6548bdac599fc429ca9039e0f7a495481ed3151d89698d2783c5696567739c893c59aeb36adf68b7694e9721f26d4f0c98fb2d91
+  languageName: node
+  linkType: hard
+
+"vfile-message@npm:^1.0.0":
+  version: 1.1.1
+  resolution: "vfile-message@npm:1.1.1"
+  dependencies:
+    unist-util-stringify-position: "npm:^1.1.1"
+  checksum: 10/a81c6ff8ea0207004627bc299057f271e0eb172ce22a20f63d5e9aa75294c34cb4b84cf0cc5e27b992c815d0e7d622204a2154a0e9b062253cdc4c695cce5698
+  languageName: node
+  linkType: hard
+
 "vfile-message@npm:^2.0.0":
   version: 2.0.4
   resolution: "vfile-message@npm:2.0.4"
@@ -38164,6 +39032,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"vfile@npm:^3.0.0":
+  version: 3.0.1
+  resolution: "vfile@npm:3.0.1"
+  dependencies:
+    is-buffer: "npm:^2.0.0"
+    replace-ext: "npm:1.0.0"
+    unist-util-stringify-position: "npm:^1.0.0"
+    vfile-message: "npm:^1.0.0"
+  checksum: 10/a203e7de196ecc1686d1d0dd12fcbb1cea63176e051cd7eb2554769348b68999f8a7b59573c20d83473c97b3e286afcfce7a0996b765d94f46f5d7ebc137ecc4
+  languageName: node
+  linkType: hard
+
 "vfile@npm:^4.0.0":
   version: 4.2.1
   resolution: "vfile@npm:4.2.1"
@@ -38187,19 +39067,20 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite@npm:^4.5.5":
-  version: 4.5.5
-  resolution: "vite@npm:4.5.5"
+"vite@npm:^5.4.11":
+  version: 5.4.11
+  resolution: "vite@npm:5.4.11"
   dependencies:
-    esbuild: "npm:^0.18.10"
-    fsevents: "npm:~2.3.2"
-    postcss: "npm:^8.4.27"
-    rollup: "npm:^3.27.1"
+    esbuild: "npm:^0.21.3"
+    fsevents: "npm:~2.3.3"
+    postcss: "npm:^8.4.43"
+    rollup: "npm:^4.20.0"
   peerDependencies:
-    "@types/node": ">= 14"
+    "@types/node": ^18.0.0 || >=20.0.0
     less: "*"
     lightningcss: ^1.21.0
     sass: "*"
+    sass-embedded: "*"
     stylus: "*"
     sugarss: "*"
     terser: ^5.4.0
@@ -38215,6 +39096,8 @@ __metadata:
       optional: true
     sass:
       optional: true
+    sass-embedded:
+      optional: true
     stylus:
       optional: true
     sugarss:
@@ -38223,7 +39106,7 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-  checksum: 10/2e8b39e004f2b2e72506b816700b3aafaf3f85bdcb9dd9392075bb234ce7333f859a0d2078a85ce5d0039f0f659ca564a7366af587848e5166f14b136cb0ad37
+  checksum: 10/719c4dea896e9547958643354003c8c9ea98e5367196d98f5f46cffb3ec963fead3ea5853f5af941c79bbfb73583dec19bbb0d28d2f644b95d7f59c55e22919d
   languageName: node
   linkType: hard
 
@@ -38343,17 +39226,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"web-resource-inliner@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "web-resource-inliner@npm:5.0.0"
+"web-resource-inliner@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "web-resource-inliner@npm:6.0.1"
   dependencies:
     ansi-colors: "npm:^4.1.1"
     escape-goat: "npm:^3.0.0"
-    htmlparser2: "npm:^4.0.0"
+    htmlparser2: "npm:^5.0.0"
     mime: "npm:^2.4.6"
     node-fetch: "npm:^2.6.0"
     valid-data-url: "npm:^3.0.0"
-  checksum: 10/93428b0c95ff757db825d0d13fd69a2676c16a391693ff81d7eacaefe0f8f08afcf5c6744f5b3e83ad716e998d4a7695522e3b7c8a806840cd0547fe2226d921
+  checksum: 10/179ee600b6d73d889ff4a9944553b6096384b837f97b75cddde3a15bb8847a6116d4bfc4bd54ca171bd34f81cb7c8b669162433207fb748f3e2704e63e3a97f9
   languageName: node
   linkType: hard
 
@@ -38392,13 +39275,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webidl-conversions@npm:^4.0.2":
-  version: 4.0.2
-  resolution: "webidl-conversions@npm:4.0.2"
-  checksum: 10/594187c36f2d7898f89c0ed3b9248a095fa549ecc1befb10a97bc884b5680dc96677f58df5579334d8e0d1018e5ef075689cfa2a6c459f45a61a9deb512cb59e
-  languageName: node
-  linkType: hard
-
 "webidl-conversions@npm:^5.0.0":
   version: 5.0.0
   resolution: "webidl-conversions@npm:5.0.0"
@@ -38420,33 +39296,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webpack-bundle-analyzer@npm:^4.9.1":
-  version: 4.9.1
-  resolution: "webpack-bundle-analyzer@npm:4.9.1"
-  dependencies:
-    "@discoveryjs/json-ext": "npm:0.5.7"
-    acorn: "npm:^8.0.4"
-    acorn-walk: "npm:^8.0.0"
-    commander: "npm:^7.2.0"
-    escape-string-regexp: "npm:^4.0.0"
-    gzip-size: "npm:^6.0.0"
-    is-plain-object: "npm:^5.0.0"
-    lodash.debounce: "npm:^4.0.8"
-    lodash.escape: "npm:^4.0.1"
-    lodash.flatten: "npm:^4.4.0"
-    lodash.invokemap: "npm:^4.6.0"
-    lodash.pullall: "npm:^4.2.0"
-    lodash.uniqby: "npm:^4.7.0"
-    opener: "npm:^1.5.2"
-    picocolors: "npm:^1.0.0"
-    sirv: "npm:^2.0.3"
-    ws: "npm:^7.3.1"
-  bin:
-    webpack-bundle-analyzer: lib/bin/analyzer.js
-  checksum: 10/1126f7ad46d926316f467523c6e512e063b9d82e3252a74b4f997f69f32005735e51a0f58345db6921a37c876256effcdb3b4cc1b2053cd91d1fe583eda18fea
-  languageName: node
-  linkType: hard
-
 "webpack-cli@npm:~5.1.4":
   version: 5.1.4
   resolution: "webpack-cli@npm:5.1.4"
@@ -38716,6 +39565,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"whatwg-encoding@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "whatwg-encoding@npm:3.1.1"
+  dependencies:
+    iconv-lite: "npm:0.6.3"
+  checksum: 10/bbef815eb67f91487c7f2ef96329743f5fd8357d7d62b1119237d25d41c7e452dff8197235b2d3c031365a17f61d3bb73ca49d0ed1582475aa4a670815e79534
+  languageName: node
+  linkType: hard
+
 "whatwg-fetch@npm:^3.6.20":
   version: 3.6.20
   resolution: "whatwg-fetch@npm:3.6.20"
@@ -38737,6 +39595,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"whatwg-mimetype@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "whatwg-mimetype@npm:4.0.0"
+  checksum: 10/894a618e2d90bf444b6f309f3ceb6e58cf21b2beaa00c8b333696958c4076f0c7b30b9d33413c9ffff7c5832a0a0c8569e5bb347ef44beded72aeefd0acd62e8
+  languageName: node
+  linkType: hard
+
 "whatwg-url@npm:^11.0.0":
   version: 11.0.0
   resolution: "whatwg-url@npm:11.0.0"
@@ -38757,17 +39622,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"whatwg-url@npm:^7.0.0":
-  version: 7.1.0
-  resolution: "whatwg-url@npm:7.1.0"
-  dependencies:
-    lodash.sortby: "npm:^4.7.0"
-    tr46: "npm:^1.0.1"
-    webidl-conversions: "npm:^4.0.2"
-  checksum: 10/769fd35838b4e50536ae08d836472e86adbedda1d5493ea34353c55468147e7868b91d2535b59e01a9e7331ab7e4cdfdf5490c279c045da23c327cf33e32f755
-  languageName: node
-  linkType: hard
-
 "whatwg-url@npm:^8.0.0, whatwg-url@npm:^8.5.0":
   version: 8.7.0
   resolution: "whatwg-url@npm:8.7.0"
@@ -38793,11 +39647,11 @@ __metadata:
   linkType: hard
 
 "which-builtin-type@npm:^1.1.3":
-  version: 1.1.3
-  resolution: "which-builtin-type@npm:1.1.3"
+  version: 1.1.4
+  resolution: "which-builtin-type@npm:1.1.4"
   dependencies:
-    function.prototype.name: "npm:^1.1.5"
-    has-tostringtag: "npm:^1.0.0"
+    function.prototype.name: "npm:^1.1.6"
+    has-tostringtag: "npm:^1.0.2"
     is-async-function: "npm:^2.0.0"
     is-date-object: "npm:^1.0.5"
     is-finalizationregistry: "npm:^1.0.2"
@@ -38806,21 +39660,21 @@ __metadata:
     is-weakref: "npm:^1.0.2"
     isarray: "npm:^2.0.5"
     which-boxed-primitive: "npm:^1.0.2"
-    which-collection: "npm:^1.0.1"
-    which-typed-array: "npm:^1.1.9"
-  checksum: 10/d7823c4a6aa4fc8183eb572edd9f9ee2751e5f3ba2ccd5b298cc163f720df0f02ee1a5291d18ca8a41d48144ef40007ff6a64e6f5e7c506527086c7513a5f673
+    which-collection: "npm:^1.0.2"
+    which-typed-array: "npm:^1.1.15"
+  checksum: 10/c0cdb9b004e7a326f4ce54c75b19658a3bec73601a71dd7e2d9538accb3e781b546b589c3f306caf5e7429ac1c8019028d5e662e2860f03603354105b8247c83
   languageName: node
   linkType: hard
 
-"which-collection@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "which-collection@npm:1.0.1"
+"which-collection@npm:^1.0.2":
+  version: 1.0.2
+  resolution: "which-collection@npm:1.0.2"
   dependencies:
-    is-map: "npm:^2.0.1"
-    is-set: "npm:^2.0.1"
-    is-weakmap: "npm:^2.0.1"
-    is-weakset: "npm:^2.0.1"
-  checksum: 10/85c95fcf92df7972ce66bed879e53d9dc752a30ef08e1ca4696df56bcf1c302e3b9965a39b04a20fa280a997fad6c170eb0b4d62435569b7f6c0bc7be910572b
+    is-map: "npm:^2.0.3"
+    is-set: "npm:^2.0.3"
+    is-weakmap: "npm:^2.0.2"
+    is-weakset: "npm:^2.0.3"
+  checksum: 10/674bf659b9bcfe4055f08634b48a8588e879161b9fefed57e9ec4ff5601e4d50a05ccd76cf10f698ef5873784e5df3223336d56c7ce88e13bcf52ebe582fc8d7
   languageName: node
   linkType: hard
 
@@ -38831,24 +39685,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"which-pm-runs@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "which-pm-runs@npm:1.1.0"
-  checksum: 10/39a56ee50886fb33ec710e3b36dc9fe3d0096cac44850d9ca0c6186c4cb824d6c8125f013e0562e7c94744e1e8e4a6ab695592cdb12555777c7a4368143d822c
-  languageName: node
-  linkType: hard
-
-"which-pm@npm:2.0.0":
-  version: 2.0.0
-  resolution: "which-pm@npm:2.0.0"
-  dependencies:
-    load-yaml-file: "npm:^0.2.0"
-    path-exists: "npm:^4.0.0"
-  checksum: 10/8f9dc47ab1302d536458a3d28b891907540d67e18b95d8cf0a41ba768b679c2bc7b64c17d9b80c85443c4b300a3e2d5c29ae1e9c7c6ad2833760070fbdbd3b6f
-  languageName: node
-  linkType: hard
-
-"which-typed-array@npm:^1.1.14, which-typed-array@npm:^1.1.15, which-typed-array@npm:^1.1.2, which-typed-array@npm:^1.1.9":
+"which-typed-array@npm:^1.1.14, which-typed-array@npm:^1.1.15, which-typed-array@npm:^1.1.2":
   version: 1.1.15
   resolution: "which-typed-array@npm:1.1.15"
   dependencies:
@@ -38883,21 +39720,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"wide-align@npm:^1.1.0, wide-align@npm:^1.1.2, wide-align@npm:^1.1.5":
-  version: 1.1.5
-  resolution: "wide-align@npm:1.1.5"
+"which@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "which@npm:4.0.0"
   dependencies:
-    string-width: "npm:^1.0.2 || 2 || 3 || 4"
-  checksum: 10/d5f8027b9a8255a493a94e4ec1b74a27bff6679d5ffe29316a3215e4712945c84ef73ca4045c7e20ae7d0c72f5f57f296e04a4928e773d4276a2f1222e4c2e99
+    isexe: "npm:^3.1.1"
+  bin:
+    node-which: bin/which.js
+  checksum: 10/f17e84c042592c21e23c8195108cff18c64050b9efb8459589116999ea9da6dd1509e6a1bac3aeebefd137be00fabbb61b5c2bc0aa0f8526f32b58ee2f545651
   languageName: node
   linkType: hard
 
-"widest-line@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "widest-line@npm:2.0.1"
+"wide-align@npm:^1.1.2, wide-align@npm:^1.1.5":
+  version: 1.1.5
+  resolution: "wide-align@npm:1.1.5"
   dependencies:
-    string-width: "npm:^2.1.1"
-  checksum: 10/6245b1f2cff418107f937691d1cafd0e416b9e350aa79e3853dc0759ad20849451d7126c2f06d0a13286d37b44b8e79e4220df09630bce1e4722d9808bc7bfd2
+    string-width: "npm:^1.0.2 || 2 || 3 || 4"
+  checksum: 10/d5f8027b9a8255a493a94e4ec1b74a27bff6679d5ffe29316a3215e4712945c84ef73ca4045c7e20ae7d0c72f5f57f296e04a4928e773d4276a2f1222e4c2e99
   languageName: node
   linkType: hard
 
@@ -38963,13 +39802,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"wordwrap@npm:0.0.2":
-  version: 0.0.2
-  resolution: "wordwrap@npm:0.0.2"
-  checksum: 10/649991e38ffc74eeda5798aae55f91b18371a4d04e84773f2425ffd4d687f7bbd0c1b78871ece4f9766466cd2349a9e29ca6b7c74942e577355fb8a8c1de2e4f
-  languageName: node
-  linkType: hard
-
 "workerpool@npm:6.2.0":
   version: 6.2.0
   resolution: "workerpool@npm:6.2.0"
@@ -39028,7 +39860,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"write-file-atomic@npm:^2.0.0, write-file-atomic@npm:^2.4.2":
+"write-file-atomic@npm:^2.4.2":
   version: 2.4.3
   resolution: "write-file-atomic@npm:2.4.3"
   dependencies:
@@ -39051,7 +39883,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"write-file-atomic@npm:^4.0.1, write-file-atomic@npm:^4.0.2":
+"write-file-atomic@npm:^4.0.2":
   version: 4.0.2
   resolution: "write-file-atomic@npm:4.0.2"
   dependencies:
@@ -39061,27 +39893,26 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ws@npm:^3.3.3":
-  version: 3.3.3
-  resolution: "ws@npm:3.3.3"
+"write-file-atomic@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "write-file-atomic@npm:5.0.1"
   dependencies:
-    async-limiter: "npm:~1.0.0"
-    safe-buffer: "npm:~5.1.0"
-    ultron: "npm:~1.1.0"
-  checksum: 10/4b4a7e5d11025e399d82a7471bfb4818d563c892f5d953c2de937d262bd8e8acc8b340220001c01f8392574fccbc2df153d6031e285b8b38441187ea0c2cfd72
+    imurmurhash: "npm:^0.1.4"
+    signal-exit: "npm:^4.0.1"
+  checksum: 10/648efddba54d478d0e4330ab6f239976df3b9752b123db5dc9405d9b5af768fa9d70ce60c52fdbe61d1200d24350bc4fbcbaf09288496c2be050de126bd95b7e
   languageName: node
   linkType: hard
 
-"ws@npm:^5.2.0":
-  version: 5.2.3
-  resolution: "ws@npm:5.2.3"
+"write@npm:1.0.3":
+  version: 1.0.3
+  resolution: "write@npm:1.0.3"
   dependencies:
-    async-limiter: "npm:~1.0.0"
-  checksum: 10/5adfa5f636fdae931ac258c5a6d5d2de2d5b7430010625919a429ace4edf59d8de753266acf2410897966ef0391119900779963f5b9a40dd278337736df0f308
+    mkdirp: "npm:^0.5.1"
+  checksum: 10/abb3a249df922dbd4060d4cab5017b6c07268523d6b3d8c933a7f64afe3078c58507543e4b830065ea02beb8ab25e40dc2f8be8eea5cdfc08d91e89e65e952b5
   languageName: node
   linkType: hard
 
-"ws@npm:^7.3.1, ws@npm:^7.4.6, ws@npm:^7.5.3":
+"ws@npm:^7.4.6":
   version: 7.5.9
   resolution: "ws@npm:7.5.9"
   peerDependencies:
@@ -39096,9 +39927,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ws@npm:^8.11.0, ws@npm:^8.2.3":
-  version: 8.17.0
-  resolution: "ws@npm:8.17.0"
+"ws@npm:^8, ws@npm:^8.18.0":
+  version: 8.18.0
+  resolution: "ws@npm:8.18.0"
   peerDependencies:
     bufferutil: ^4.0.1
     utf-8-validate: ">=5.0.2"
@@ -39107,13 +39938,13 @@ __metadata:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: 10/5e1dcb0ae70c6e2f158f5b446e0a72a2cd335b07aba73ee1872e9bae1285382286a10e53ed479db21bdd690a5dfd05641a768611ebb236253c62fefa43ef58b4
+  checksum: 10/70dfe53f23ff4368d46e4c0b1d4ca734db2c4149c6f68bc62cb16fc21f753c47b35fcc6e582f3bdfba0eaeb1c488cddab3c2255755a5c3eecb251431e42b3ff6
   languageName: node
   linkType: hard
 
-"ws@npm:^8.18.0":
-  version: 8.18.0
-  resolution: "ws@npm:8.18.0"
+"ws@npm:^8.11.0, ws@npm:^8.2.3":
+  version: 8.17.0
+  resolution: "ws@npm:8.17.0"
   peerDependencies:
     bufferutil: ^4.0.1
     utf-8-validate: ">=5.0.2"
@@ -39122,14 +39953,14 @@ __metadata:
       optional: true
     utf-8-validate:
       optional: true
-  checksum: 10/70dfe53f23ff4368d46e4c0b1d4ca734db2c4149c6f68bc62cb16fc21f753c47b35fcc6e582f3bdfba0eaeb1c488cddab3c2255755a5c3eecb251431e42b3ff6
+  checksum: 10/5e1dcb0ae70c6e2f158f5b446e0a72a2cd335b07aba73ee1872e9bae1285382286a10e53ed479db21bdd690a5dfd05641a768611ebb236253c62fefa43ef58b4
   languageName: node
   linkType: hard
 
-"xdg-basedir@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "xdg-basedir@npm:3.0.0"
-  checksum: 10/60d613dcb09b1198c70cb442979825531c605ac7861a8a6131304207d2962020dbb23660ac7e1be324fb9e4111a51a6206d875148d3e98df47a7d1869fa1515f
+"x-is-string@npm:^0.1.0":
+  version: 0.1.0
+  resolution: "x-is-string@npm:0.1.0"
+  checksum: 10/896b23dfac87e86f951a2bcf6be60033d9481995a903f545832706f08093cc609e988abbcb7fe341b2e549f57b2470b6821243ec39ff399d1054eaa8cd9eaf22
   languageName: node
   linkType: hard
 
@@ -39168,17 +39999,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"xml2js@npm:0.5.0":
-  version: 0.5.0
-  resolution: "xml2js@npm:0.5.0"
-  dependencies:
-    sax: "npm:>=0.6.0"
-    xmlbuilder: "npm:~11.0.0"
-  checksum: 10/27c4d759214e99be5ec87ee5cb1290add427fa43df509d3b92d10152b3806fd2f7c9609697a18b158ccf2caa01e96af067cdba93196f69ca10c90e4f79a08896
-  languageName: node
-  linkType: hard
-
-"xml2js@npm:~0.6.2":
+"xml2js@npm:0.6.2, xml2js@npm:~0.6.2":
   version: 0.6.2
   resolution: "xml2js@npm:0.6.2"
   dependencies:
@@ -39237,7 +40058,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"xtend@npm:>=4.0.0 <4.1.0-0, xtend@npm:^4.0.0, xtend@npm:^4.0.1, xtend@npm:^4.0.2, xtend@npm:~4.0.0, xtend@npm:~4.0.1":
+"xtend@npm:^4.0.0, xtend@npm:^4.0.1, xtend@npm:^4.0.2, xtend@npm:~4.0.0, xtend@npm:~4.0.1":
   version: 4.0.2
   resolution: "xtend@npm:4.0.2"
   checksum: 10/ac5dfa738b21f6e7f0dd6e65e1b3155036d68104e67e5d5d1bde74892e327d7e5636a076f625599dc394330a731861e87343ff184b0047fef1360a7ec0a5a36a
@@ -39288,7 +40109,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yaml@npm:^1.10.0, yaml@npm:^1.10.2":
+"yaml@npm:^1.10.0":
   version: 1.10.2
   resolution: "yaml@npm:1.10.2"
   checksum: 10/e088b37b4d4885b70b50c9fa1b7e54bd2e27f5c87205f9deaffd1fb293ab263d9c964feadb9817a7b129a5bf30a06582cb08750f810568ecc14f3cdbabb79cb3
@@ -39316,6 +40137,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"yargs-parser@npm:^10.0.0":
+  version: 10.1.0
+  resolution: "yargs-parser@npm:10.1.0"
+  dependencies:
+    camelcase: "npm:^4.1.0"
+  checksum: 10/7be10b61334ce1b08e1d4cd3587ec9a2f2229b48c95333a0ddeac8e7ea00520513914ae1f4694a4e29ec97048d42c3835de61fd0864767c45d8ac0afd837a02f
+  languageName: node
+  linkType: hard
+
 "yargs-parser@npm:^13.0.0, yargs-parser@npm:^13.1.2":
   version: 13.1.2
   resolution: "yargs-parser@npm:13.1.2"
@@ -39326,7 +40156,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yargs-parser@npm:^18.1.2, yargs-parser@npm:^18.1.3":
+"yargs-parser@npm:^18.1.2":
   version: 18.1.3
   resolution: "yargs-parser@npm:18.1.3"
   dependencies:
@@ -39336,14 +40166,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yargs-parser@npm:^20.2.2, yargs-parser@npm:^20.2.3, yargs-parser@npm:^20.2.9":
+"yargs-parser@npm:^20.2.2, yargs-parser@npm:^20.2.9":
   version: 20.2.9
   resolution: "yargs-parser@npm:20.2.9"
   checksum: 10/0188f430a0f496551d09df6719a9132a3469e47fe2747208b1dd0ab2bb0c512a95d0b081628bbca5400fb20dbf2fabe63d22badb346cecadffdd948b049f3fcc
   languageName: node
   linkType: hard
 
-"yargs-parser@npm:^21.0.1, yargs-parser@npm:^21.1.1":
+"yargs-parser@npm:^21.1.1":
   version: 21.1.1
   resolution: "yargs-parser@npm:21.1.1"
   checksum: 10/9dc2c217ea3bf8d858041252d43e074f7166b53f3d010a8c711275e09cd3d62a002969a39858b92bbda2a6a63a585c7127014534a560b9c69ed2d923d113406e
@@ -39395,7 +40225,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yargs@npm:^15.0.2, yargs@npm:^15.1.0, yargs@npm:^15.4.1":
+"yargs@npm:^15.0.2, yargs@npm:^15.4.1":
   version: 15.4.1
   resolution: "yargs@npm:15.4.1"
   dependencies:
@@ -39414,7 +40244,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yargs@npm:^17.3.1, yargs@npm:^17.7.1, yargs@npm:^17.7.2":
+"yargs@npm:^17.3.1, yargs@npm:^17.7.2":
   version: 17.7.2
   resolution: "yargs@npm:17.7.2"
   dependencies:
@@ -39429,15 +40259,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yargs@npm:^2.1.1":
-  version: 2.3.0
-  resolution: "yargs@npm:2.3.0"
-  dependencies:
-    wordwrap: "npm:0.0.2"
-  checksum: 10/61ee2052bb713d80addcf8c44a5658a0a6554b7c8b14c201310345cce5490d3ef413aaf184d7154bfc960b8cbc565f68d5ec68134743aaeb9b8bb9b809cc7295
-  languageName: node
-  linkType: hard
-
 "yauzl@npm:^2.4.2":
   version: 2.10.0
   resolution: "yauzl@npm:2.10.0"
@@ -39483,31 +40304,34 @@ __metadata:
   languageName: node
   linkType: hard
 
-"zip-stream@npm:^2.1.2":
-  version: 2.1.3
-  resolution: "zip-stream@npm:2.1.3"
+"zip-stream@npm:^6.0.1":
+  version: 6.0.1
+  resolution: "zip-stream@npm:6.0.1"
   dependencies:
-    archiver-utils: "npm:^2.1.0"
-    compress-commons: "npm:^2.1.1"
-    readable-stream: "npm:^3.4.0"
-  checksum: 10/57705f3b6d85735c6c64040800b10ee3738720a36492b3ca299603493574f0a4afd2f18f5fc7b5e910e5452cc8add3b4ff908fab5d4b897e109e9db46150cfbc
+    archiver-utils: "npm:^5.0.0"
+    compress-commons: "npm:^6.0.2"
+    readable-stream: "npm:^4.0.0"
+  checksum: 10/aa5abd6a89590eadeba040afbc375f53337f12637e5e98330012a12d9886cde7a3ccc28bd91aafab50576035bbb1de39a9a316eecf2411c8b9009c9f94f0db27
   languageName: node
   linkType: hard
 
-"zustand@npm:^4.3.1":
-  version: 4.3.8
-  resolution: "zustand@npm:4.3.8"
+"zustand@npm:^4.4.1":
+  version: 4.5.5
+  resolution: "zustand@npm:4.5.5"
   dependencies:
-    use-sync-external-store: "npm:1.2.0"
+    use-sync-external-store: "npm:1.2.2"
   peerDependencies:
-    immer: ">=9.0"
+    "@types/react": ">=16.8"
+    immer: ">=9.0.6"
     react: ">=16.8"
   peerDependenciesMeta:
+    "@types/react":
+      optional: true
     immer:
       optional: true
     react:
       optional: true
-  checksum: 10/95a5335716414c8bef3a48165226ef099ca232931ab6cd1497515ee4241e8d5a8100edf5c3cc7d7131b72a07eb0484501405aa2c3222b4b93ba690cfa2b5593d
+  checksum: 10/481b8210187b69678074a1ca51107654c2379688e90407bfcb7961e0803a259742bfd0d77171c3f07e290896ad55fe9659b3863f30d34cb2572650ead1249f25
   languageName: node
   linkType: hard