Merge branch 'dev' into feat/mls-1to1-conversations

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:20-alpine
+FROM node:21-alpine
 
 # For some extra dependencies...
 RUN apk add --no-cache dumb-init git bash

package.json

@@ -6,23 +6,23 @@
     "@lexical/history": "0.12.2",
     "@lexical/react": "0.12.2",
     "@peculiar/x509": "1.9.5",
-    "@wireapp/avs": "9.4.18",
+    "@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.10",
+    "@wireapp/react-ui-kit": "9.9.11",
     "@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.0",
-    "countly-sdk-web": "23.6.1",
+    "core-js": "3.33.1",
+    "countly-sdk-web": "23.6.2",
     "date-fns": "2.30.0",
     "dexie-batch": "0.4.3",
-    "emoji-picker-react": "4.5.2",
+    "emoji-picker-react": "4.5.3",
     "highlight.js": "11.9.0",
     "http-status-codes": "2.3.0",
     "jimp": "0.22.10",
@@ -42,10 +42,10 @@
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-error-boundary": "4.0.11",
-    "react-intl": "6.4.7",
+    "react-intl": "6.5.1",
     "react-redux": "8.1.3",
-    "react-router": "6.16.0",
-    "react-router-dom": "6.16.0",
+    "react-router": "6.17.0",
+    "react-router-dom": "6.17.0",
     "react-transition-group": "4.4.5",
     "redux": "4.2.1",
     "redux-logdown": "1.0.4",
@@ -56,7 +56,7 @@
     "underscore": "1.13.6",
     "uuidjs": "4.2.13",
     "webrtc-adapter": "8.2.3",
-    "zustand": "4.4.3"
+    "zustand": "4.4.4"
   },
   "devDependencies": {
     "@babel/core": "7.23.2",
@@ -67,36 +67,36 @@
     "@babel/preset-typescript": "7.23.2",
     "@emotion/eslint-plugin": "^11.11.0",
     "@faker-js/faker": "8.1.0",
-    "@formatjs/cli": "6.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.5",
+    "@types/dexie-batch": "0.4.6",
     "@types/eslint": "^8",
-    "@types/fs-extra": "11.0.2",
-    "@types/generate-changelog": "1.8.1",
-    "@types/jest": "29.5.5",
+    "@types/fs-extra": "11.0.3",
+    "@types/generate-changelog": "1.8.2",
+    "@types/jest": "29.5.6",
     "@types/jquery": "^3",
-    "@types/js-cookie": "3.0.4",
-    "@types/jsdom": "21.1.3",
-    "@types/keyboardjs": "2.5.1",
+    "@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.3",
+    "@types/linkify-it": "3.0.4",
     "@types/loadable__component": "^5",
-    "@types/markdown-it": "13.0.2",
-    "@types/node": "^20.8.6",
-    "@types/open-graph": "0.2.3",
-    "@types/platform": "1.3.4",
+    "@types/markdown-it": "13.0.4",
+    "@types/node": "^20.8.7",
+    "@types/open-graph": "0.2.4",
+    "@types/platform": "1.3.5",
     "@types/react": "18.2.28",
-    "@types/react-dom": "18.2.13",
-    "@types/react-redux": "7.1.27",
-    "@types/react-transition-group": "4.4.7",
-    "@types/redux-mock-store": "1.0.4",
+    "@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/speakingurl": "13.0.4",
-    "@types/underscore": "1.11.11",
-    "@types/webpack-env": "1.18.2",
+    "@types/speakingurl": "13.0.5",
+    "@types/underscore": "1.11.12",
+    "@types/webpack-env": "1.18.3",
     "@wireapp/copy-config": "2.1.9",
     "@wireapp/eslint-config": "3.0.4",
     "@wireapp/prettier-config": "0.6.3",
@@ -113,7 +113,7 @@
     "dexie": "3.2.4",
     "dotenv": "16.3.1",
     "dpdm": "3.14.0",
-    "eslint": "^8.51.0",
+    "eslint": "^8.52.0",
     "eslint-plugin-prettier": "^5.0.1",
     "fake-indexeddb": "4.0.2",
     "generate-changelog": "1.8.0",

server/package.json

@@ -23,12 +23,12 @@
   },
   "devDependencies": {
     "@types/express": "4.17.19",
-    "@types/express-sitemap-xml": "3.0.2",
-    "@types/express-useragent": "1.0.3",
-    "@types/fs-extra": "11.0.2",
+    "@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.2",
-    "@types/jest": "^29.5.5",
+    "@types/hbs": "4.0.3",
+    "@types/jest": "^29.5.6",
     "@types/node": "18.11.18",
     "jest": "29.7.0",
     "rimraf": "4.4.1",

server/yarn.lock

@@ -938,21 +938,21 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/express-sitemap-xml@npm:3.0.2":
-  version: 3.0.2
-  resolution: "@types/express-sitemap-xml@npm:3.0.2"
+"@types/express-sitemap-xml@npm:3.0.3":
+  version: 3.0.3
+  resolution: "@types/express-sitemap-xml@npm:3.0.3"
   dependencies:
     "@types/express": "*"
-  checksum: 92118dae76ca4030672be1a85cc5abfc015a54db2b8e8f02e4d3e3ef1ffe47fe9cdaac673fda2d6f21955c2d0da93aa09c019ea1aa3f3ac49df08405ec99d7b2
+  checksum: d6d20da77364589fe7d43160227becb89c8920ce411bf06505f9c97473a022e39d504ff67ab896eb8fe449d5f703129938e61593fe1accb554edf4667114b454
   languageName: node
   linkType: hard
 
-"@types/express-useragent@npm:1.0.3":
-  version: 1.0.3
-  resolution: "@types/express-useragent@npm:1.0.3"
+"@types/express-useragent@npm:1.0.4":
+  version: 1.0.4
+  resolution: "@types/express-useragent@npm:1.0.4"
   dependencies:
     "@types/express": "*"
-  checksum: 9c980165ed6d3e208ab5653e3a39c679c174c81cf5ceecca233182848796d7f0234c938ac28163e1f1e645302a7a4050cdd3e5a8acc94dd869e78fd3c0572e8a
+  checksum: 20019a130237d3a1063b9265bd997d45722e282ca63c8c362fe55f53a77f9670698be8db1335300574cc9a78c80b4e9212aaec2aebdb0981a8c338b2dbcb0b7c
   languageName: node
   linkType: hard
 
@@ -968,13 +968,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/fs-extra@npm:11.0.2":
-  version: 11.0.2
-  resolution: "@types/fs-extra@npm:11.0.2"
+"@types/fs-extra@npm:11.0.3":
+  version: 11.0.3
+  resolution: "@types/fs-extra@npm:11.0.3"
   dependencies:
     "@types/jsonfile": "*"
     "@types/node": "*"
-  checksum: 5b3e30343ee62d2e393e1029355f13f64bab6f3416226e22492483f99da840e2e53ca22cbfa4ac3749f2f83f7086d19c009005c8fa175da01df0fae59c2d73e1
+  checksum: f196bc216906e7016a6c9c549dbe204fe7e1e87515c7e961f741309e25f8e2f8c268dba3dbf0ca7f3ddab5911d39888472f8624ac0c11a461f1b2d05377e38fa
   languageName: node
   linkType: hard
 
@@ -994,12 +994,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/hbs@npm:4.0.2":
-  version: 4.0.2
-  resolution: "@types/hbs@npm:4.0.2"
+"@types/hbs@npm:4.0.3":
+  version: 4.0.3
+  resolution: "@types/hbs@npm:4.0.3"
   dependencies:
     handlebars: ^4.1.0
-  checksum: 58f24eeab51b13d02e6457cce0069d26d7827b69b21370a62b7acb133eea06456798ca08af7bcd32494bce4777175d7bac2295cfd9d8b004b00cbaa7a50520f1
+  checksum: a3e6e70894154d289da2d7af0b893ab677882a52b4322433d14c8af914eb845b75f16bae820c080e4143a68702e123a13877453f11fc08a63f079bce67ecdc1c
   languageName: node
   linkType: hard
 
@@ -1035,13 +1035,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/jest@npm:^29.5.5":
-  version: 29.5.5
-  resolution: "@types/jest@npm:29.5.5"
+"@types/jest@npm:^29.5.6":
+  version: 29.5.6
+  resolution: "@types/jest@npm:29.5.6"
   dependencies:
     expect: ^29.0.0
     pretty-format: ^29.0.0
-  checksum: 56e55cde9949bcc0ee2fa34ce5b7c32c2bfb20e53424aa4ff3a210859eeaaa3fdf6f42f81a3f655238039cdaaaf108b054b7a8602f394e6c52b903659338d8c6
+  checksum: fa13a27bd1c8efd0381a419478769d0d6d3a8e93e1952d7ac3a16274e8440af6f73ed6f96ac1ff00761198badf2ee226b5ab5583a5d87a78d609ea78da5c5a24
   languageName: node
   linkType: hard
 
@@ -5545,12 +5545,12 @@ __metadata:
   resolution: "wire-web-server@workspace:."
   dependencies:
     "@types/express": 4.17.19
-    "@types/express-sitemap-xml": 3.0.2
-    "@types/express-useragent": 1.0.3
-    "@types/fs-extra": 11.0.2
+    "@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.2
-    "@types/jest": ^29.5.5
+    "@types/hbs": 4.0.3
+    "@types/jest": ^29.5.6
     "@types/node": 18.11.18
     "@wireapp/commons": 5.2.1
     dotenv: 16.3.1

src/i18n/ar-SA.json

@@ -136,6 +136,25 @@
   "accountForm.submitButton": "التالي",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "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.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": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window '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/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "إضافة",
   "addParticipantsHeader": "أضف أشخاصًا",
   "addParticipantsHeaderWithCounter": "أضف أشخاصًا ({{number}})",
@@ -413,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] removed {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]You[/bold] removed {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "وصلت",
   "conversationMissedMessages": "لم تستخدم هذا الجهاز منذ مدة. ربما لن تظهر بعض الرسائل هنا.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",

src/i18n/bn-BD.json

@@ -136,6 +136,25 @@
   "accountForm.submitButton": "Next",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "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.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": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window '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/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Add",
   "addParticipantsHeader": "Add participants",
   "addParticipantsHeaderWithCounter": "Add participants ({{number}})",
@@ -413,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] removed {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]You[/bold] removed {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Delivered",
   "conversationMissedMessages": "You haven’t used this device for a while. Some messages may not appear here.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",

src/i18n/ca-ES.json

@@ -136,6 +136,25 @@
   "accountForm.submitButton": "Next",
   "accountForm.terms": "I accept the <terms>terms and conditions</terms>",
   "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.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": "Certiticate could not no downloaded <br/> <br/> You can retry to get the certificate now. Or the system will try it automatically in the background during the next 24 hours.",
+  "acme.inProgress.button.close": "Close window '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/> <br/> In case the website does not open. you can also navigate there manually by following this URL: <br/> <br/> <a href=\"{{url}}\" target=\"_blank\">{{url}}</a>",
+  "acme.settingsChanged.button.close": "Close window 'End-to-end identify certificate'",
+  "acme.settingsChanged.button.primary": "Get Certificate",
+  "acme.settingsChanged.button.secondary": "Remind Me Later",
+  "acme.settingsChanged.headline.alt": "End-to-end identify certificate",
+  "acme.settingsChanged.headline.main": "Team settings changed",
+  "acme.settingsChanged.paragraph": "End-to-end identity is enabled for you to make Wire's usage more secure. The device verification takes as of now place automatically using a certificate. <br/> <br/> Enter your Wire credentials on the external webpage we will redirect you to. With this login, you automatically get the verification certificate for this device. You will keep your conversation history. <br/> <br/> <a href=\"{{url}}\" target=\"_blank\"> Learn more about end-to-end identity </a>",
   "addParticipantsConfirmLabel": "Add",
   "addParticipantsHeader": "Add participants",
   "addParticipantsHeaderWithCounter": "Add participants ({{number}})",
@@ -413,6 +432,7 @@
   "conversationMemberRemoved": "[bold]{{name}}[/bold] removed {{users}}",
   "conversationMemberRemovedMissingLegalHoldConsent": "{{user}} was removed from this conversation because legal hold has been activated. [link]Learn more[/link]",
   "conversationMemberRemovedYou": "[bold]You[/bold] removed {{users}}",
+  "conversationMemberWereRemoved": "{{users}} were removed from the conversation",
   "conversationMessageDelivered": "Delivered",
   "conversationMissedMessages": "You haven’t used this device for a while. Some messages may not appear here.",
   "conversationModalRestrictedFileSharingDescription": "This file could not be shared due to your file sharing restrictions.",