chore: merge

jest.config.js

@@ -25,6 +25,9 @@ module.exports = {
     },
   },
   moduleDirectories: ['node_modules', 'src'],
+  moduleNameMapper: {
+    '^axios$': require.resolve('axios'),
+  },
   preset: 'ts-jest',
   setupFilesAfterEnv: ['<rootDir>/setupTests.js'],
   testEnvironment: 'jsdom',

package.json

@@ -1,9 +1,10 @@
 {
   "dependencies": {
-    "@emotion/react": "11.11.1",
-    "@wireapp/api-client": "17.0.0",
+    "@babel/plugin-proposal-class-properties": "^7.18.6",
+    "@wireapp/api-client": "26.11.0",
     "@wireapp/commons": "5.2.7",
     "@wireapp/react-ui-kit": "9.16.0",
+    "babel-eslint": "^10.1.0",
     "core-js": "3.36.0",
     "dotenv": "16.4.5",
     "dotenv-extended": "2.9.0",
@@ -20,7 +21,6 @@
   },
   "devDependencies": {
     "@babel/core": "7.23.7",
-    "@babel/plugin-proposal-class-properties": "7.18.6",
     "@babel/plugin-syntax-dynamic-import": "7.8.3",
     "@babel/preset-env": "7.22.5",
     "@babel/preset-react": "7.22.5",
@@ -32,7 +32,8 @@
     "@types/color": "3.0.3",
     "@types/enzyme": "3.10.12",
     "@types/jest": "27.5.0",
-    "@types/node": "20.11.5",
+    "@types/node": "20.11.24",
+    "@types/platform": "^1.3.6",
     "@types/react": "17.0.43",
     "@types/react-dom": "17.0.14",
     "@types/react-router-dom": "5.3.3",
@@ -42,7 +43,6 @@
     "@wireapp/copy-config": "2.1.7",
     "@wireapp/eslint-config": "1.4.0",
     "adm-zip": "0.5.10",
-    "babel-eslint": "10.1.0",
     "babel-loader": "8.2.5",
     "babel-plugin-remove-jsx-attributes": "0.0.2",
     "cross-env": "7.0.3",

src/script/Root.tsx

@@ -18,7 +18,7 @@
  */
 
 import {FlexBox, Loading, StyledApp, THEME_ID} from '@wireapp/react-ui-kit';
-import createBrowserHistory from 'history/createBrowserHistory';
+import {createBrowserHistory} from 'history';
 import React, {lazy, Suspense, useEffect} from 'react';
 import {Redirect, Route, Router, Switch} from 'react-router-dom';
 import {ROUTE} from 'script/route';