Merge branch dev of github.com:wireapp/wire-webapp into chore/wpb-4538

.github/workflows/cherry-pick-release-to-dev.yml

@@ -0,0 +1,20 @@
+# This job will automatically create a cherry pick PR from any release/* branch to the dev branch
+# It allows the dev branch to stay up-to-date with fixes made to specific release branches
+name: Cherry pick to dev
+on:
+  push:
+    branches:
+      - release/*
+jobs:
+  cherry_pick:
+    runs-on: ubuntu-latest
+    steps:
+      - name: checkout
+        uses: actions/checkout@v4
+
+      - name: Create PR to branch
+        uses: gorillio/github-action-cherry-pick@master
+        with:
+          pr_branch: 'dev'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ci.yml

@@ -20,8 +20,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - name: Setup Node.js
         uses: actions/setup-node@v4

.github/workflows/create_docker_image.yml

@@ -25,8 +25,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - name: Setup Node.js
         uses: actions/setup-node@v4

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

@@ -32,8 +32,6 @@ jobs:
 
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
 
       - name: Setup Node.js
         uses: actions/setup-node@v4

.github/workflows/sync_translations.yml

@@ -37,7 +37,7 @@ jobs:
         run: yarn translate:merge
 
       - name: Download translations
-        uses: crowdin/github-action@v1.15.2
+        uses: crowdin/github-action@v1.16.0
         env:
           GITHUB_TOKEN: ${{secrets.OTTO_THE_BOT_GH_TOKEN}}
           CROWDIN_PROJECT_ID: 342359

.nvmrc

@@ -1 +1 @@
-16
+18

charts/webapp/templates/deployment.yaml

@@ -25,7 +25,7 @@ spec:
     spec:
       containers:
       - name: webapp
-        image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.appVersion }}"
+        image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
         {{- if eq (include "includeSecurityContext" .) "true" }}
         securityContext:
           {{- toYaml .Values.podSecurityContext | nindent 10 }}

package.json

@@ -1,27 +1,27 @@
 {
   "dependencies": {
-    "@datadog/browser-logs": "^5.6.0",
-    "@datadog/browser-rum": "^5.6.0",
+    "@datadog/browser-logs": "^5.7.0",
+    "@datadog/browser-rum": "^5.7.0",
     "@emotion/react": "11.11.3",
     "@lexical/history": "0.12.5",
     "@lexical/react": "0.12.5",
     "@peculiar/x509": "1.9.6",
-    "@wireapp/avs": "9.5.2",
-    "@wireapp/commons": "5.2.3",
-    "@wireapp/core": "43.5.5",
-    "@wireapp/react-ui-kit": "9.12.3",
+    "@wireapp/avs": "9.6.9",
+    "@wireapp/commons": "5.2.4",
+    "@wireapp/core": "43.5.6",
+    "@wireapp/react-ui-kit": "9.12.6",
     "@wireapp/store-engine-dexie": "2.1.7",
-    "@wireapp/webapp-events": "0.18.3",
+    "@wireapp/webapp-events": "0.20.1",
     "amplify": "https://github.com/wireapp/amplify#head=master",
     "beautiful-react-hooks": "^5.0.1",
     "classnames": "2.5.1",
-    "copy-webpack-plugin": "11.0.0",
+    "copy-webpack-plugin": "12.0.1",
     "core-js": "3.35.0",
-    "countly-sdk-web": "23.12.3",
-    "date-fns": "3.0.6",
+    "countly-sdk-web": "23.12.4",
+    "date-fns": "3.2.0",
     "dexie-batch": "0.4.3",
     "dexie-encrypted": "2.0.0",
-    "emoji-picker-react": "4.6.0",
+    "emoji-picker-react": "4.6.10",
     "highlight.js": "11.9.0",
     "http-status-codes": "2.3.0",
     "jimp": "0.22.10",
@@ -43,8 +43,8 @@
     "react-error-boundary": "4.0.12",
     "react-intl": "6.5.5",
     "react-redux": "8.1.3",
-    "react-router": "6.21.1",
-    "react-router-dom": "6.21.1",
+    "react-router": "6.21.2",
+    "react-router-dom": "6.21.2",
     "react-transition-group": "4.4.5",
     "redux": "4.2.1",
     "redux-logdown": "1.0.4",
@@ -61,7 +61,7 @@
     "@babel/core": "7.23.7",
     "@babel/eslint-parser": "7.23.3",
     "@babel/plugin-proposal-decorators": "7.23.7",
-    "@babel/preset-env": "7.23.7",
+    "@babel/preset-env": "7.23.8",
     "@babel/preset-react": "7.23.3",
     "@babel/preset-typescript": "7.23.3",
     "@emotion/eslint-plugin": "^11.11.0",
@@ -82,35 +82,35 @@
     "@types/linkify-it": "3.0.5",
     "@types/loadable__component": "^5",
     "@types/markdown-it": "13.0.7",
-    "@types/node": "^20.10.6",
+    "@types/node": "^20.11.0",
     "@types/open-graph": "0.2.5",
     "@types/platform": "1.3.6",
-    "@types/react": "18.2.46",
+    "@types/react": "18.2.47",
     "@types/react-dom": "18.2.18",
     "@types/react-redux": "7.1.31",
     "@types/react-transition-group": "4.4.10",
     "@types/redux-mock-store": "1.0.6",
     "@types/seedrandom": "^3",
-    "@types/sinon": "17.0.2",
+    "@types/sinon": "17.0.3",
     "@types/speakingurl": "13.0.6",
     "@types/underscore": "1.11.15",
     "@types/webpack-env": "1.18.4",
-    "@wireapp/copy-config": "2.1.12",
-    "@wireapp/eslint-config": "3.0.4",
+    "@wireapp/copy-config": "2.1.14",
+    "@wireapp/eslint-config": "3.0.5",
     "@wireapp/prettier-config": "0.6.3",
     "@wireapp/store-engine": "^5.1.4",
     "archiver": "^6.0.1",
     "autoprefixer": "^10.4.16",
     "babel-loader": "9.1.3",
     "babel-plugin-transform-import-meta": "^2.2.1",
     "cross-env": "7.0.3",
-    "css-loader": "^6.8.1",
-    "cssnano": "6.0.2",
+    "css-loader": "^6.9.0",
+    "cssnano": "6.0.3",
     "dexie": "3.2.4",
     "dotenv": "16.3.1",
     "dpdm": "3.14.0",
     "eslint": "^8.56.0",
-    "eslint-plugin-prettier": "^5.1.2",
+    "eslint-plugin-prettier": "^5.1.3",
     "fake-indexeddb": "5.0.2",
     "generate-changelog": "1.8.0",
     "html-webpack-plugin": "^5.6.0",
@@ -128,20 +128,20 @@
     "node-fetch": "2.7.0",
     "os-browserify": "0.3.0",
     "path-browserify": "1.0.1",
-    "postcss": "8.4.32",
-    "postcss-import": "^15.1.0",
+    "postcss": "8.4.33",
+    "postcss-import": "^16.0.0",
     "postcss-less": "6.0.0",
     "postcss-loader": "^7.3.4",
     "postcss-preset-env": "^9.3.0",
     "postcss-scss": "4.0.9",
-    "prettier": "^3.1.1",
+    "prettier": "^3.2.2",
     "raf": "3.4.1",
     "redux-devtools-extension": "2.13.9",
     "redux-mock-store": "1.5.4",
     "seedrandom": "^3.0.5",
     "simple-git": "3.22.0",
     "sinon": "17.0.1",
-    "style-loader": "^3.3.3",
+    "style-loader": "^3.3.4",
     "stylelint": "^16",
     "stylelint-config-idiomatic-order": "10.0.0",
     "svg-inline-loader": "0.8.2",
@@ -152,7 +152,7 @@
     "typescript": "5.3.3",
     "webpack": "5.89.0",
     "webpack-cli": "5.1.4",
-    "webpack-dev-middleware": "6.1.1",
+    "webpack-dev-middleware": "7.0.0",
     "webpack-hot-middleware": "2.26.0",
     "workbox-webpack-plugin": "7.0.0"
   },

server/package.json

@@ -4,7 +4,7 @@
   "main": "dist/index.js",
   "license": "GPL-3.0",
   "dependencies": {
-    "@wireapp/commons": "5.2.3",
+    "@wireapp/commons": "5.2.4",
     "dotenv": "16.3.1",
     "dotenv-extended": "2.9.0",
     "express": "4.18.2",

server/yarn.lock

@@ -1163,15 +1163,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@wireapp/commons@npm:5.2.3":
-  version: 5.2.3
-  resolution: "@wireapp/commons@npm:5.2.3"
+"@wireapp/commons@npm:5.2.4":
+  version: 5.2.4
+  resolution: "@wireapp/commons@npm:5.2.4"
   dependencies:
     ansi-regex: 5.0.1
     fs-extra: 11.1.0
     logdown: 3.3.1
     platform: 1.3.6
-  checksum: 3cc801e52318db7cb474dcc22809652a91d39916124ed88de7cd413006d62893b84ecb5700ac3f74953a26aea311a3895ebb53b20ab4508f503ca1151c82be9f
+  checksum: 0fdff8e6283e5f9d6108f438b356661632aeeb0bbe63e0651aeab98c514f614ee69eeb51bd6ce19ddcd5366898ffe65dc2aa334cd09e01277998022fa868c580
   languageName: node
   linkType: hard
 
@@ -2456,12 +2456,12 @@ __metadata:
   linkType: hard
 
 "follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.14.0":
-  version: 1.15.3
-  resolution: "follow-redirects@npm:1.15.3"
+  version: 1.15.4
+  resolution: "follow-redirects@npm:1.15.4"
   peerDependenciesMeta:
     debug:
       optional: true
-  checksum: 584da22ec5420c837bd096559ebfb8fe69d82512d5585004e36a3b4a6ef6d5905780e0c74508c7b72f907d1fa2b7bd339e613859e9c304d0dc96af2027fd0231
+  checksum: e178d1deff8b23d5d24ec3f7a94cde6e47d74d0dc649c35fc9857041267c12ec5d44650a0c5597ef83056ada9ea6ca0c30e7c4f97dbf07d035086be9e6a5b7b6
   languageName: node
   linkType: hard
 
@@ -5623,7 +5623,7 @@ __metadata:
     "@types/hbs": 4.0.4
     "@types/jest": ^29.5.11
     "@types/node": 18.11.18
-    "@wireapp/commons": 5.2.3
+    "@wireapp/commons": 5.2.4
     dotenv: 16.3.1
     dotenv-extended: 2.9.0
     express: 4.18.2

src/i18n/ar-SA.json

@@ -66,9 +66,10 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
-  "E2EI.status": "Status: ",
+  "E2EI.status": "Status:",
   "E2EI.updateCertificate": "Update Certificate",
   "E2EI.valid": "Valid",
   "E2EI.verified": "Verified (End-to-end Identity)",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
@@ -426,7 +433,7 @@
   "conversationDetailsParticipantsUsersMany": "أشخاص",
   "conversationDetailsParticipantsUsersOne": "شخص",
   "conversationDetailsPeople": "أشخاص",
-  "conversationDetailsProtocolDetails": "Protocol details (Beta)",
+  "conversationDetailsProtocolDetails": "Protocol details",
   "conversationDetailsServices": "الخدمات",
   "conversationDeviceNewDeviceMany": " أجهزة جديدة",
   "conversationDeviceNewDeviceOne": " جهازًا جديدًا",
@@ -1014,7 +1021,7 @@
   "modalCreateFolderMessage": "Move your conversation to a new folder.",
   "modalCreateFolderPlaceholder": "Folder name",
   "modalCreateGroupProtocolHeading": "Protocol",
-  "modalCreateGroupProtocolInfo": "Select MLS to create a group conversation using the Messaging Layer Security protocol. Please be aware that this is a beta version.",
+  "modalCreateGroupProtocolInfo": "Select MLS to create a group conversation using the Messaging Layer Security protocol.",
   "modalCreateGroupProtocolSelect.default": " (default)",
   "modalCreateGroupProtocolSelect.mls": "MLS",
   "modalCreateGroupProtocolSelect.proteus": "Proteus",

src/i18n/bn-BD.json

@@ -66,9 +66,10 @@
   "E2EI.notAvailable": "Not available",
   "E2EI.not_activated": "Not activated",
   "E2EI.not_downloaded": "Not downloaded",
+  "E2EI.revoked": "Revoked",
   "E2EI.serialNumber": "Serial number: ",
   "E2EI.showCertificateDetails": "Show Certificate Details",
-  "E2EI.status": "Status: ",
+  "E2EI.status": "Status:",
   "E2EI.updateCertificate": "Update Certificate",
   "E2EI.valid": "Valid",
   "E2EI.verified": "Verified (End-to-end Identity)",
@@ -160,22 +161,28 @@
   "accountForm.termsAndPrivacyPolicy": "I accept the <privacypolicy>privacy policy</privacypolicy> and <terms>terms and conditions</terms>",
   "acme.done.button": "Ok",
   "acme.done.button.close": "Close window 'Certificate Downloaded'",
-  "acme.done.headline": "Certificate Downloaded",
-  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your Wire Settings under Devices.",
+  "acme.done.button.secondary": "Certificate details",
+  "acme.done.headline": "Certificate issued",
+  "acme.done.paragraph": "The certificate is active now and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.error.button.close": "Close window 'Something went wrong'",
   "acme.error.button.primary": "Retry",
   "acme.error.button.secondary": "Cancel",
   "acme.error.headline": "Something went wrong",
   "acme.error.paragraph": "The certificate couldn’t be issued. [br] You can retry to get the certificate now, or you will get a reminder later.",
   "acme.inProgress.button.close": "Close window 'Getting Certificate'",
-  "acme.inProgress.headline": "Getting Certificate",
+  "acme.inProgress.headline": "Getting Certificate...",
   "acme.inProgress.paragraph.alt": "Downloading...",
   "acme.inProgress.paragraph.main": "Please navigate to your web browser and log in to the certiticate service. [br] In case the website does not open. you can also navigate there manually by following this URL: [br] [link] {{url}} [/link]",
+  "acme.remindLater.button.primary": "Ok",
+  "acme.remindLater.paragraph": "You can get the certificate in your [bold]Wire settings[/bold] during the next {{delayTime}}. Open [bold]Devices[/bold] and select [bold]Get Certificate[/bold] for your current device. <br/> <br/> To continue using Wire without interruption, retrieve it in time – it doesn’t take long. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "acme.renewCertificate.button.close": "Close window 'Update End-to-end identify certificate'",
   "acme.renewCertificate.button.primary": "Update Certificate",
   "acme.renewCertificate.button.secondary": "Remind Me Later",
   "acme.renewCertificate.headline.alt": "Update end-to-end identity certificate",
   "acme.renewCertificate.paragraph": "The end-to-end identity certificate for this device expires soon. To keep your communication at the highest security level, update your certificate now. <br/> <br/> Enter your identity provider’s credentials in the next step to update the certificate automatically. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.done.headline": "Certificate updated",
+  "acme.renewal.done.paragraph": "The certificate is updated and your device is verified. You can find more details about this certificate in your [bold]Wire Preferences[/bold] under [bold]Devices.[/bold] <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
+  "acme.renewal.inProgress.headline": "Updating Certificate...",
   "acme.settingsChanged.button.close": "Close window 'End-to-end identity certificate'",
   "acme.settingsChanged.button.primary": "Get Certificate",
   "acme.settingsChanged.button.secondary": "Remind Me Later",
@@ -426,7 +433,7 @@
   "conversationDetailsParticipantsUsersMany": "People",
   "conversationDetailsParticipantsUsersOne": "Person",
   "conversationDetailsPeople": "People",
-  "conversationDetailsProtocolDetails": "Protocol details (Beta)",
+  "conversationDetailsProtocolDetails": "Protocol details",
   "conversationDetailsServices": "Services",
   "conversationDeviceNewDeviceMany": " new devices",
   "conversationDeviceNewDeviceOne": " a new device",
@@ -1014,7 +1021,7 @@
   "modalCreateFolderMessage": "Move your conversation to a new folder.",
   "modalCreateFolderPlaceholder": "Folder name",
   "modalCreateGroupProtocolHeading": "Protocol",
-  "modalCreateGroupProtocolInfo": "Select MLS to create a group conversation using the Messaging Layer Security protocol. Please be aware that this is a beta version.",
+  "modalCreateGroupProtocolInfo": "Select MLS to create a group conversation using the Messaging Layer Security protocol.",
   "modalCreateGroupProtocolSelect.default": " (default)",
   "modalCreateGroupProtocolSelect.mls": "MLS",
   "modalCreateGroupProtocolSelect.proteus": "Proteus",