Merge pull request #5432 from alkem-io/develop

Release: My Dashboard Fixes, Whiteboard, ChatWidget, Fixes
alkem-io · Jan 23, 2024 · 47b86cc · 47b86cc
2 parents 4d8767b + 73ab7c8
commit 47b86cc
Show file tree

Hide file tree

Showing 147 changed files with 2,845 additions and 2,333 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -58,10 +58,12 @@ module.exports = {
     '@typescript-eslint/no-explicit-any': 'error',
     'padding-line-between-statements': [
       'error',
-      { blankLine: 'always', prev: 'block', next: 'export' },
-      { blankLine: 'always', prev: 'block-like', next: 'export' },
-      { blankLine: 'always', prev: 'class', next: 'export' },
-      { blankLine: 'always', prev: 'function', next: 'export' },
+      { blankLine: 'always', prev: ['block-like', 'class', 'function'], next: 'export' },
+    ],
+    '@typescript-eslint/padding-line-between-statements': [
+      'error',
+      { blankLine: 'always', prev: ['interface'], next: '*' },
+      { blankLine: 'always', next: ['interface'], prev: '*' },
     ],
   },
 };
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alkemio/client-web",
-  "version": "0.53.0",
+  "version": "0.53.1",
   "description": "Alkemio client, enabling users to interact with Challenges hosted on the Alkemio platform.",
   "author": "Alkemio Foundation",
   "repository": {
@@ -36,7 +36,7 @@
     "@mui/base": "^5.0.0-beta.23",
     "@mui/icons-material": "^5.11.16",
     "@mui/lab": "^5.0.0-alpha.56",
-    "@mui/material": "^5.2.0",
+    "@mui/material": "5.13.x",
     "@mui/styles": "^5.2.0",
     "@mui/x-data-grid": "^5.0.1",
     "@mui/x-date-pickers": "^5.0.16",
@@ -77,7 +77,6 @@
     "i18next-browser-languagedetector": "^6.1.3",
     "idb-keyval": "^6.2.1",
     "immer": "^9.0.12",
-    "jotai": "^2.4.0",
     "jquery": "^3.5.1",
     "lodash": "^4.17.21",
     "logform": "^2.2.0",