Merge branch 'dev' into staging

app-config/package.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "wire-web-config-internal": "https://github.com/wireapp/wire-web-config-default#v0.31.35",
+    "wire-web-config-internal": "https://github.com/wireapp/wire-web-config-default#v0.31.36",
     "wire-web-config-production": "https://github.com/wireapp/wire-web-config-wire#v0.31.36"
   }
 }

electron/src/main.ts

@@ -41,7 +41,7 @@ import minimist from 'minimist';
 import * as path from 'path';
 import {URL, pathToFileURL} from 'url';
 
-import {LogFactory} from '@wireapp/commons';
+import {DateUtil, LogFactory} from '@wireapp/commons';
 import {WebAppEvents} from '@wireapp/webapp-events';
 
 import * as ProxyAuth from './auth/ProxyAuth';
@@ -672,6 +672,7 @@ class ElectronWrapperInit {
             const colorCodeRegex = /%c(.+?)%c/gm;
             const stylingRegex = /(color:#|font-weight:)[^;]+; /gm;
             const accessTokenRegex = /access_token=[^ &]+/gm;
+            const {date, time} = DateUtil.isoFormat(new Date());
 
             contents.on('console-message', async (_event, _level, message) => {
               const webViewId = lifecycle.getWebViewId(contents);
@@ -682,7 +683,11 @@ class ElectronWrapperInit {
               const accountIndex = contents.id - 2;
 
               if (webViewId) {
-                const logFilePath = path.join(LOG_DIR, `${accountIndex}_${webViewId}`, config.logFileName);
+                const logFilePath = path.join(
+                  LOG_DIR,
+                  `${accountIndex}_${date.replaceAll('-', '_')}_${time.replaceAll(':', '_')}_${webViewId}`,
+                  config.logFileName,
+                );
                 try {
                   await LogFactory.writeMessage(
                     message.replace(colorCodeRegex, '$1').replace(stylingRegex, '').replace(accessTokenRegex, ''),

electron/wire.json

@@ -20,6 +20,6 @@
   "privacyUrl": "https://wire.com/privacy/",
   "supportUrl": "https://support.wire.com",
   "updateUrl": "https://wire-app.wire.com/win/prod/",
-  "version": "3.36.0",
+  "version": "3.37.0",
   "websiteUrl": "https://wire.com"
 }

package.json

@@ -4,9 +4,9 @@
     "@electron/remote": "2.1.2",
     "@hapi/joi": "17.1.1",
     "@wireapp/certificate-check": "0.7.18",
-    "@wireapp/commons": "5.2.13",
+    "@wireapp/commons": "5.4.0",
     "@wireapp/protocol-messaging": "1.51.0",
-    "@wireapp/react-ui-kit": "9.26.2",
+    "@wireapp/react-ui-kit": "9.28.0",
     "@wireapp/webapp-events": "0.24.3",
     "auto-launch": "5.0.6",
     "axios": "0.21.2",
@@ -54,8 +54,8 @@
     "@types/jest": "^29.5.14",
     "@types/lodash": "4.17.13",
     "@types/minimist": "1.2.5",
-    "@types/mocha": "10.0.9",
-    "@types/node": "18.19.64",
+    "@types/mocha": "10.0.10",
+    "@types/node": "18.19.66",
     "@types/open-graph": "0.2.5",
     "@types/platform": "1.3.6",
     "@types/prettier": "^2.7.3",
@@ -68,7 +68,7 @@
     "@typescript-eslint/eslint-plugin": "7.17.0",
     "@typescript-eslint/parser": "7.18.0",
     "@wireapp/copy-config": "2.2.10",
-    "@wireapp/eslint-config": "3.0.19",
+    "@wireapp/eslint-config": "3.0.20",
     "@wireapp/prettier-config": "0.6.4",
     "adm-zip": "0.5.16",
     "aws-sdk": "2.1692.0",
@@ -96,15 +96,15 @@
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-jasmine": "4.2.2",
     "eslint-plugin-jest": "28.9.0",
-    "eslint-plugin-jest-dom": "5.4.0",
+    "eslint-plugin-jest-dom": "5.5.0",
     "eslint-plugin-jsdoc": "48.11.0",
     "eslint-plugin-jsx-a11y": "6.10.2",
     "eslint-plugin-no-unsanitized": "4.0.2",
     "eslint-plugin-prettier": "4.2.1",
     "eslint-plugin-react": "7.37.2",
     "eslint-plugin-react-hooks": "4.6.2",
     "eslint-plugin-simple-import-sort": "12.1.1",
-    "eslint-plugin-testing-library": "6.4.0",
+    "eslint-plugin-testing-library": "6.5.0",
     "eslint-plugin-unused-imports": "3.2.0",
     "form-data": "4.0.1",
     "husky": "4.3.8",
@@ -121,7 +121,7 @@
     "sort-json": "2.0.1",
     "style-loader": "4.0.0",
     "ts-node": "10.9.2",
-    "typescript": "5.6.3",
+    "typescript": "5.7.2",
     "webpack": "5.96.1",
     "webpack-cli": "5.1.4"
   },
@@ -203,6 +203,6 @@
     "translate:upload": "ts-node -P tsconfig.bin.json ./bin/translations_upload.ts",
     "translate:download": "ts-node -P tsconfig.bin.json ./bin/translations_download.ts"
   },
-  "version": "3.36.0",
+  "version": "3.37.0",
   "packageManager": "[email protected]"
 }