chore: merge dev

.github/dependabot.yml

@@ -26,6 +26,9 @@ updates:
       eslint:
         patterns:
           - '*eslint*'
+      datadog:
+        patterns:
+          - '*@datadog*'
 
     ignore:
       - dependency-name: '@wireapp/avs'

.github/workflows/create_docker_image.yml

@@ -29,7 +29,7 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 16.x
           cache: 'yarn'

.github/workflows/deploy-to-test-env.yml

@@ -36,7 +36,7 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 16.x
           cache: 'yarn'

.github/workflows/lint.yml

@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 16.x
           cache: 'yarn'

.github/workflows/semantic-commit-lint.yml

@@ -14,7 +14,7 @@ jobs:
       # Please look up the latest version from
       # https://github.com/amannn/action-semantic-pull-request/releases
       - name: Run Semantic Commint Linter
-        uses: amannn/action-semantic-pull-request@v5.3.0
+        uses: amannn/action-semantic-pull-request@v5.4.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:

.github/workflows/sync_translations.yml

@@ -20,7 +20,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 16.x
           cache: 'yarn'
@@ -37,7 +37,7 @@ jobs:
         run: yarn translate:merge
 
       - name: Download translations
-        uses: crowdin/github-action@v1.13.1
+        uses: crowdin/github-action@v1.14.1
         env:
           GITHUB_TOKEN: ${{secrets.OTTO_THE_BOT_GH_TOKEN}}
           CROWDIN_PROJECT_ID: 342359

.github/workflows/test_build_deploy.yml

@@ -33,7 +33,7 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Node.js
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: 16.x
           cache: 'yarn'

package.json

@@ -1,28 +1,27 @@
 {
   "dependencies": {
-    "@datadog/browser-logs": "^4.50.1",
-    "@datadog/browser-rum": "^4.50.1",
+    "@datadog/browser-logs": "^5.1.0",
+    "@datadog/browser-rum": "^5.1.0",
     "@emotion/react": "11.11.1",
     "@lexical/history": "0.12.2",
     "@lexical/react": "0.12.2",
     "@peculiar/x509": "1.9.5",
     "@wireapp/avs": "9.5.2",
-    "@wireapp/commons": "5.2.1",
-    "@wireapp/core": "42.17.0",
-    "@wireapp/lru-cache": "3.8.1",
-    "@wireapp/react-ui-kit": "9.9.11",
+    "@wireapp/commons": "5.2.2",
+    "@wireapp/core": "42.19.2",
+    "@wireapp/react-ui-kit": "9.9.12",
     "@wireapp/store-engine-dexie": "2.1.6",
     "@wireapp/store-engine-sqleet": "1.8.9",
     "@wireapp/webapp-events": "0.18.3",
     "amplify": "https://github.com/wireapp/amplify#head=master",
     "beautiful-react-hooks": "^5.0.0",
     "classnames": "2.3.2",
     "copy-webpack-plugin": "11.0.0",
-    "core-js": "3.33.1",
+    "core-js": "3.33.2",
     "countly-sdk-web": "23.6.2",
     "date-fns": "2.30.0",
     "dexie-batch": "0.4.3",
-    "emoji-picker-react": "4.5.3",
+    "emoji-picker-react": "4.5.14",
     "highlight.js": "11.9.0",
     "http-status-codes": "2.3.0",
     "jimp": "0.22.10",
@@ -37,15 +36,15 @@
     "long": "5.2.3",
     "markdown-it": "13.0.2",
     "murmurhash": "2.0.1",
-    "oidc-client-ts": "^2.2.5",
+    "oidc-client-ts": "^2.4.0",
     "platform": "1.3.6",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-error-boundary": "4.0.11",
     "react-intl": "6.5.1",
     "react-redux": "8.1.3",
-    "react-router": "6.17.0",
-    "react-router-dom": "6.17.0",
+    "react-router": "6.18.0",
+    "react-router-dom": "6.18.0",
     "react-transition-group": "4.4.5",
     "redux": "4.2.1",
     "redux-logdown": "1.0.4",
@@ -56,7 +55,7 @@
     "underscore": "1.13.6",
     "uuidjs": "4.2.13",
     "webrtc-adapter": "8.2.3",
-    "zustand": "4.4.4"
+    "zustand": "4.4.6"
   },
   "devDependencies": {
     "@babel/core": "7.23.2",
@@ -66,42 +65,40 @@
     "@babel/preset-react": "7.22.15",
     "@babel/preset-typescript": "7.23.2",
     "@emotion/eslint-plugin": "^11.11.0",
-    "@faker-js/faker": "8.1.0",
+    "@faker-js/faker": "8.2.0",
     "@formatjs/cli": "6.2.1",
     "@koush/wrtc": "0.5.3",
     "@testing-library/react": "14.0.0",
-    "@types/adm-zip": "0.5.2",
     "@types/dexie-batch": "0.4.6",
     "@types/eslint": "^8",
     "@types/fs-extra": "11.0.3",
     "@types/generate-changelog": "1.8.2",
-    "@types/jest": "29.5.6",
+    "@types/jest": "29.5.7",
     "@types/jquery": "^3",
     "@types/js-cookie": "3.0.5",
     "@types/jsdom": "21.1.4",
     "@types/keyboardjs": "2.5.2",
     "@types/libsodium-wrappers": "^0",
     "@types/linkify-it": "3.0.4",
     "@types/loadable__component": "^5",
-    "@types/markdown-it": "13.0.4",
-    "@types/node": "^20.8.7",
+    "@types/markdown-it": "13.0.5",
+    "@types/node": "^20.8.10",
     "@types/open-graph": "0.2.4",
     "@types/platform": "1.3.5",
-    "@types/react": "18.2.28",
+    "@types/react": "18.2.33",
     "@types/react-dom": "18.2.14",
     "@types/react-redux": "7.1.28",
     "@types/react-transition-group": "4.4.8",
     "@types/redux-mock-store": "1.0.5",
     "@types/seedrandom": "^3",
-    "@types/sinon": "10.0.19",
+    "@types/sinon": "17.0.0",
     "@types/speakingurl": "13.0.5",
     "@types/underscore": "1.11.12",
     "@types/webpack-env": "1.18.3",
-    "@wireapp/copy-config": "2.1.9",
+    "@wireapp/copy-config": "2.1.10",
     "@wireapp/eslint-config": "3.0.4",
     "@wireapp/prettier-config": "0.6.3",
     "@wireapp/store-engine": "^5.1.4",
-    "adm-zip": "0.5.10",
     "archiver": "^6.0.1",
     "autoprefixer": "^10.4.16",
     "babel-loader": "9.1.3",
@@ -113,7 +110,7 @@
     "dexie": "3.2.4",
     "dotenv": "16.3.1",
     "dpdm": "3.14.0",
-    "eslint": "^8.52.0",
+    "eslint": "^8.53.0",
     "eslint-plugin-prettier": "^5.0.1",
     "fake-indexeddb": "4.0.2",
     "generate-changelog": "1.8.0",
@@ -128,24 +125,23 @@
     "jsdom-worker": "0.3.0",
     "less": "4.2.0",
     "less-loader": "^11.1.3",
-    "lint-staged": "15.0.1",
+    "lint-staged": "15.0.2",
     "node-fetch": "2.7.0",
     "os-browserify": "0.3.0",
     "path-browserify": "1.0.1",
     "postcss": "8.4.31",
     "postcss-import": "^15.1.0",
     "postcss-less": "6.0.0",
     "postcss-loader": "^7.3.3",
-    "postcss-preset-env": "^9.2.0",
+    "postcss-preset-env": "^9.3.0",
     "postcss-scss": "4.0.9",
     "prettier": "^3.0.3",
     "raf": "3.4.1",
     "redux-devtools-extension": "2.13.9",
     "redux-mock-store": "1.5.4",
     "seedrandom": "^3.0.5",
     "simple-git": "3.20.0",
-    "sinon": "16.1.0",
-    "snabbdom": "3.5.1",
+    "sinon": "17.0.1",
     "style-loader": "^3.3.3",
     "stylelint": "^15",
     "stylelint-config-idiomatic-order": "9.0.0",

server/package.json

@@ -4,7 +4,7 @@
   "main": "dist/index.js",
   "license": "GPL-3.0",
   "dependencies": {
-    "@wireapp/commons": "5.2.1",
+    "@wireapp/commons": "5.2.2",
     "dotenv": "16.3.1",
     "dotenv-extended": "2.9.0",
     "express": "4.18.2",
@@ -22,13 +22,13 @@
     "pm2": "5.3.0"
   },
   "devDependencies": {
-    "@types/express": "4.17.19",
+    "@types/express": "4.17.20",
     "@types/express-sitemap-xml": "3.0.3",
     "@types/express-useragent": "1.0.4",
     "@types/fs-extra": "11.0.3",
     "@types/geolite2": "2.0.0",
     "@types/hbs": "4.0.3",
-    "@types/jest": "^29.5.6",
+    "@types/jest": "^29.5.7",
     "@types/node": "18.11.18",
     "jest": "29.7.0",
     "rimraf": "4.4.1",

server/yarn.lock

@@ -956,7 +956,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/express@npm:*, @types/express@npm:4.17.19":
+"@types/express@npm:*":
   version: 4.17.19
   resolution: "@types/express@npm:4.17.19"
   dependencies:
@@ -968,6 +968,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/express@npm:4.17.20":
+  version: 4.17.20
+  resolution: "@types/express@npm:4.17.20"
+  dependencies:
+    "@types/body-parser": "*"
+    "@types/express-serve-static-core": ^4.17.33
+    "@types/qs": "*"
+    "@types/serve-static": "*"
+  checksum: bf8a97d283128e5129f9ccabbeef728ff3f0484465e0ae74a304bd0588fa6cb715ae68845650caba9a641944b7791ba125d02ddbd47a7e62aaefdd036570c6c5
+  languageName: node
+  linkType: hard
+
 "@types/fs-extra@npm:11.0.3":
   version: 11.0.3
   resolution: "@types/fs-extra@npm:11.0.3"
@@ -1035,13 +1047,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/jest@npm:^29.5.6":
-  version: 29.5.6
-  resolution: "@types/jest@npm:29.5.6"
+"@types/jest@npm:^29.5.7":
+  version: 29.5.7
+  resolution: "@types/jest@npm:29.5.7"
   dependencies:
     expect: ^29.0.0
     pretty-format: ^29.0.0
-  checksum: fa13a27bd1c8efd0381a419478769d0d6d3a8e93e1952d7ac3a16274e8440af6f73ed6f96ac1ff00761198badf2ee226b5ab5583a5d87a78d609ea78da5c5a24
+  checksum: e28624ccb0ef1255a03fbbb4b5bc3e5cbcdc450d39e0739985ff679b124198f808c38c8c3e67859c6efc0e848196deeb8cfed028e12a821c511dfc1112a2d6e9
   languageName: node
   linkType: hard
 
@@ -1142,15 +1154,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@wireapp/commons@npm:5.2.1":
-  version: 5.2.1
-  resolution: "@wireapp/commons@npm:5.2.1"
+"@wireapp/commons@npm:5.2.2":
+  version: 5.2.2
+  resolution: "@wireapp/commons@npm:5.2.2"
   dependencies:
     ansi-regex: 5.0.1
     fs-extra: 11.1.0
     logdown: 3.3.1
     platform: 1.3.6
-  checksum: 1510b705a40d45ceaf07b12b5a199d94fe977d3b2faaafc298ff167a65b820471f5863f9f93f27d2003f9f44ee3401423d6e12bb38ecd7808f8b2fc72821d411
+  checksum: ae78630f8299eaae9ee136136981dabdcb4c100c43ec1430882fc154ae21e9fdb17999c1b892140ca5547625e7f502ba83e85ecf62312c8525098865032b6928
   languageName: node
   linkType: hard
 
@@ -5544,15 +5556,15 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "wire-web-server@workspace:."
   dependencies:
-    "@types/express": 4.17.19
+    "@types/express": 4.17.20
     "@types/express-sitemap-xml": 3.0.3
     "@types/express-useragent": 1.0.4
     "@types/fs-extra": 11.0.3
     "@types/geolite2": 2.0.0
     "@types/hbs": 4.0.3
-    "@types/jest": ^29.5.6
+    "@types/jest": ^29.5.7
     "@types/node": 18.11.18
-    "@wireapp/commons": 5.2.1
+    "@wireapp/commons": 5.2.2
     dotenv: 16.3.1
     dotenv-extended: 2.9.0
     express: 4.18.2

src/__mocks__/@wireapp/core.ts

@@ -37,14 +37,12 @@ export class Account extends EventEmitter {
     mls: {
       schedulePeriodicKeyMaterialRenewals: jest.fn(),
       registerConversation: jest.fn(),
-      joinConferenceSubconversation: jest.fn(),
       getGroupIdFromConversationId: jest.fn(),
       renewKeyMaterial: jest.fn(),
       getClientIds: jest.fn(),
       getEpoch: jest.fn(),
       conversationExists: jest.fn(),
       exportSecretKey: jest.fn(),
-      leaveConferenceSubconversation: jest.fn(),
       on: this.on,
       emit: this.emit,
       off: this.off,
@@ -64,6 +62,11 @@ export class Account extends EventEmitter {
       removeUsersFromMLSConversation: jest.fn(),
       removeUserFromConversation: jest.fn(),
     },
+    subconversation: {
+      joinConferenceSubconversation: jest.fn(),
+      leaveConferenceSubconversation: jest.fn(),
+      subscribeToEpochUpdates: jest.fn(),
+    },
     client: {
       deleteClient: jest.fn(),
     },

src/i18n/ar-SA.json

@@ -1121,7 +1121,7 @@
   "preferencesAccountUsername": "Username",
   "preferencesAccountUsernameAvailable": "متاح",
   "preferencesAccountUsernameErrorTaken": "Already taken",
-  "preferencesAccountUsernameHint": "حرفان على الأقل. مسموح بالحروف a—z والأرقام 0—9 والشَرطة السفلية (_) فقط.",
+  "preferencesAccountUsernameHint": "At least 2 characters. a—z, 0—9 and '.', '-', '_' only.",
   "preferencesAccountUsernamePlaceholder": "اسمك الكامل",
   "preferencesDevice": "Device",
   "preferencesDeviceDetails": "تفاصيل الجهاز",

src/i18n/bn-BD.json

@@ -1121,7 +1121,7 @@
   "preferencesAccountUsername": "Username",
   "preferencesAccountUsernameAvailable": "Available",
   "preferencesAccountUsernameErrorTaken": "Already taken",
-  "preferencesAccountUsernameHint": "At least 2 characters. a—z, 0—9 and _ only.",
+  "preferencesAccountUsernameHint": "At least 2 characters. a—z, 0—9 and '.', '-', '_' only.",
   "preferencesAccountUsernamePlaceholder": "Your full name",
   "preferencesDevice": "Device",
   "preferencesDeviceDetails": "Device Details",

src/i18n/ca-ES.json

@@ -1121,7 +1121,7 @@
   "preferencesAccountUsername": "Username",
   "preferencesAccountUsernameAvailable": "Available",
   "preferencesAccountUsernameErrorTaken": "Already taken",
-  "preferencesAccountUsernameHint": "At least 2 characters. a—z, 0—9 and _ only.",
+  "preferencesAccountUsernameHint": "At least 2 characters. a—z, 0—9 and '.', '-', '_' only.",
   "preferencesAccountUsernamePlaceholder": "Your full name",
   "preferencesDevice": "Device",
   "preferencesDeviceDetails": "Device Details",

src/i18n/cs-CZ.json

@@ -1121,7 +1121,7 @@
   "preferencesAccountUsername": "Username",
   "preferencesAccountUsernameAvailable": "Dostupný",
   "preferencesAccountUsernameErrorTaken": "Již uděleno",
-  "preferencesAccountUsernameHint": "Alespoň 2 znaky. Pouze a—z, 0—9 a _",
+  "preferencesAccountUsernameHint": "At least 2 characters. a—z, 0—9 and '.', '-', '_' only.",
   "preferencesAccountUsernamePlaceholder": "Celé jméno",
   "preferencesDevice": "Device",
   "preferencesDeviceDetails": "Podrobnosti o přístroji",