Merge branch 'dev' into feat/WPB-3072-group-messages-in-the-chat-by-u…

…ser-and-timestamp

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.13",
+    "@wireapp/avs": "9.6.9",
     "@wireapp/commons": "5.2.4",
-    "@wireapp/core": "43.5.1",
-    "@wireapp/react-ui-kit": "9.12.5",
+    "@wireapp/core": "43.5.4",
+    "@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",
     "core-js": "3.35.0",
     "countly-sdk-web": "23.12.4",
-    "date-fns": "3.1.0",
+    "date-fns": "3.2.0",
     "dexie-batch": "0.4.3",
     "dexie-encrypted": "2.0.0",
-    "emoji-picker-react": "4.6.5",
+    "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,7 +82,7 @@
     "@types/linkify-it": "3.0.5",
     "@types/loadable__component": "^5",
     "@types/markdown-it": "13.0.7",
-    "@types/node": "^20.10.7",
+    "@types/node": "^20.11.0",
     "@types/open-graph": "0.2.5",
     "@types/platform": "1.3.6",
     "@types/react": "18.2.46",
@@ -91,26 +91,26 @@
     "@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.13",
-    "@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",
+    "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",
@@ -141,7 +141,7 @@
     "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",

server/yarn.lock

@@ -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
 

src/i18n/ar-SA.json

@@ -68,7 +68,7 @@
   "E2EI.not_downloaded": "Not downloaded",
   "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)",
@@ -426,7 +426,7 @@
   "conversationDetailsParticipantsUsersMany": "أشخاص",
   "conversationDetailsParticipantsUsersOne": "شخص",
   "conversationDetailsPeople": "أشخاص",
-  "conversationDetailsProtocolDetails": "Protocol details (Beta)",
+  "conversationDetailsProtocolDetails": "Protocol details",
   "conversationDetailsServices": "الخدمات",
   "conversationDeviceNewDeviceMany": " أجهزة جديدة",
   "conversationDeviceNewDeviceOne": " جهازًا جديدًا",
@@ -1014,7 +1014,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

@@ -68,7 +68,7 @@
   "E2EI.not_downloaded": "Not downloaded",
   "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)",
@@ -426,7 +426,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 +1014,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/ca-ES.json

@@ -68,7 +68,7 @@
   "E2EI.not_downloaded": "Not downloaded",
   "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)",
@@ -426,7 +426,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 +1014,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/cs-CZ.json

@@ -68,7 +68,7 @@
   "E2EI.not_downloaded": "Not downloaded",
   "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)",
@@ -426,7 +426,7 @@
   "conversationDetailsParticipantsUsersMany": "Kontakty",
   "conversationDetailsParticipantsUsersOne": "Person",
   "conversationDetailsPeople": "Kontakty",
-  "conversationDetailsProtocolDetails": "Protocol details (Beta)",
+  "conversationDetailsProtocolDetails": "Protocol details",
   "conversationDetailsServices": "Služby",
   "conversationDeviceNewDeviceMany": " nové zařízení",
   "conversationDeviceNewDeviceOne": " nové zařízení",
@@ -1014,7 +1014,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/da-DK.json

@@ -68,7 +68,7 @@
   "E2EI.not_downloaded": "Not downloaded",
   "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)",
@@ -426,7 +426,7 @@
   "conversationDetailsParticipantsUsersMany": "Personer",
   "conversationDetailsParticipantsUsersOne": "Person",
   "conversationDetailsPeople": "Personer",
-  "conversationDetailsProtocolDetails": "Protocol details (Beta)",
+  "conversationDetailsProtocolDetails": "Protocol details",
   "conversationDetailsServices": "Tjenester",
   "conversationDeviceNewDeviceMany": " nye enheder",
   "conversationDeviceNewDeviceOne": " en ny enhed",
@@ -1014,7 +1014,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/de-DE.json

@@ -426,7 +426,7 @@
   "conversationDetailsParticipantsUsersMany": "Personen",
   "conversationDetailsParticipantsUsersOne": "Person",
   "conversationDetailsPeople": "Personen",
-  "conversationDetailsProtocolDetails": "Details zum Protokoll (Beta)",
+  "conversationDetailsProtocolDetails": "Protocol details",
   "conversationDetailsServices": "Dienste",
   "conversationDeviceNewDeviceMany": " neue Geräte zu nutzen",
   "conversationDeviceNewDeviceOne": " ein neues Gerät zu nutzen",
@@ -1014,7 +1014,7 @@
   "modalCreateFolderMessage": "Unterhaltung in einen neuen Ordner verschieben.",
   "modalCreateFolderPlaceholder": "Ordnername",
   "modalCreateGroupProtocolHeading": "Protokoll",
-  "modalCreateGroupProtocolInfo": "Wählen Sie MLS, um eine Gruppenunterhaltung unter Verwendung des Messaging-Layer-Security-Protokolls zu erstellen. Bitte beachten Sie, dass dies eine Beta-Version ist.",
+  "modalCreateGroupProtocolInfo": "Select MLS to create a group conversation using the Messaging Layer Security protocol.",
   "modalCreateGroupProtocolSelect.default": " (Standard)",
   "modalCreateGroupProtocolSelect.mls": "MLS",
   "modalCreateGroupProtocolSelect.proteus": "Proteus",

src/i18n/el-GR.json

@@ -68,7 +68,7 @@
   "E2EI.not_downloaded": "Not downloaded",
   "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)",
@@ -426,7 +426,7 @@
   "conversationDetailsParticipantsUsersMany": "Άτομα",
   "conversationDetailsParticipantsUsersOne": "Άτομο",
   "conversationDetailsPeople": "Άτομα",
-  "conversationDetailsProtocolDetails": "Protocol details (Beta)",
+  "conversationDetailsProtocolDetails": "Protocol details",
   "conversationDetailsServices": "Υπηρεσίες",
   "conversationDeviceNewDeviceMany": " νέες συσκευές",
   "conversationDeviceNewDeviceOne": "μία νέα συσκευή",
@@ -1014,7 +1014,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/en-US.json

@@ -68,7 +68,7 @@
   "E2EI.not_downloaded": "Not downloaded",
   "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)",
@@ -426,7 +426,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 +1014,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/es-ES.json

@@ -68,7 +68,7 @@
   "E2EI.not_downloaded": "Not downloaded",
   "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)",
@@ -426,7 +426,7 @@
   "conversationDetailsParticipantsUsersMany": "Personas",
   "conversationDetailsParticipantsUsersOne": "Persona",
   "conversationDetailsPeople": "Personas",
-  "conversationDetailsProtocolDetails": "Protocol details (Beta)",
+  "conversationDetailsProtocolDetails": "Protocol details",
   "conversationDetailsServices": "Servicios",
   "conversationDeviceNewDeviceMany": " nuevos dispositivos",
   "conversationDeviceNewDeviceOne": " un nuevo dispositivo",
@@ -1014,7 +1014,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/et-EE.json

@@ -68,7 +68,7 @@
   "E2EI.not_downloaded": "Not downloaded",
   "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)",
@@ -426,7 +426,7 @@
   "conversationDetailsParticipantsUsersMany": "Inimesed",
   "conversationDetailsParticipantsUsersOne": "Inimene",
   "conversationDetailsPeople": "Inimesed",
-  "conversationDetailsProtocolDetails": "Protocol details (Beta)",
+  "conversationDetailsProtocolDetails": "Protocol details",
   "conversationDetailsServices": "Teenused",
   "conversationDeviceNewDeviceMany": " uut seadet",
   "conversationDeviceNewDeviceOne": " uus seade",
@@ -1014,7 +1014,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",