diff --git a/next.config.js b/next.config.js
index 0cfa5f5..97c2679 100644
--- a/next.config.js
+++ b/next.config.js
@@ -1,5 +1,6 @@
 // @ts-check
-const withNextIntl = require('next-intl/plugin')();
+const createNextIntlPlugin = require('next-intl/plugin');
+const withNextIntl = createNextIntlPlugin();
 const path = require('path');
 const json = require('./package.json');
 
diff --git a/package-lock.json b/package-lock.json
index f6bff3c..4471cb7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -141,9 +141,9 @@
       }
     },
     "node_modules/@ant-design/icons": {
-      "version": "5.6.1",
-      "resolved": "https://registry.npmjs.org/@ant-design/icons/-/icons-5.6.1.tgz",
-      "integrity": "sha512-0/xS39c91WjPAZOWsvi1//zjx6kAp4kxWwctR6kuU6p133w8RU0D2dSCvZC19uQyharg/sAvYxGYWl01BbZZfg==",
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/@ant-design/icons/-/icons-5.6.0.tgz",
+      "integrity": "sha512-Mb6QkQmPLZsmIHJ6oBsoyKrrT8/kAUdQ6+8q38e2bQSclROi69SiDlI4zZroaIPseae1w110RJH0zGrphAvlSQ==",
       "license": "MIT",
       "dependencies": {
         "@ant-design/colors": "^7.0.0",
@@ -210,13 +210,13 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.26.8",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.8.tgz",
-      "integrity": "sha512-ef383X5++iZHWAXX0SXQR6ZyQhw/0KtTkrTz61WXRhFM6dhpHulO/RJz79L8S6ugZHJkOOkUrUdxgdF2YiPFnA==",
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.5.tgz",
+      "integrity": "sha512-2caSP6fN9I7HOe6nqhtft7V4g7/V/gfDsC3Ag4W7kEzzvRGKqiv0pu0HogPiZ3KaVSoNDhUws6IJjDjpfmYIXw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.26.8",
-        "@babel/types": "^7.26.8",
+        "@babel/parser": "^7.26.5",
+        "@babel/types": "^7.26.5",
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25",
         "jsesc": "^3.0.2"
@@ -257,12 +257,12 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.26.8",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.8.tgz",
-      "integrity": "sha512-TZIQ25pkSoaKEYYaHbbxkfL36GNsQ6iFiBbeuzAkLnXayKR1yP1zFe+NxuZWWsUyvt8icPU9CCq0sgWGXR1GEw==",
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.5.tgz",
+      "integrity": "sha512-SRJ4jYmXRqV1/Xc+TIVG84WjHBXKlxO9sHQnA2Pf12QQEAp1LOh6kDzNHXcUnbH1QI0FDoPPVOt+vyUDucxpaw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.26.8"
+        "@babel/types": "^7.26.5"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -272,9 +272,9 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.26.7",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.7.tgz",
-      "integrity": "sha512-AOPI3D+a8dXnja+iwsUqGRjr1BbZIe771sXdapOtYI531gSqpi92vXivKcq2asu/DFpdl1ceFAKZyRzK2PCVcQ==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.0.tgz",
+      "integrity": "sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==",
       "license": "MIT",
       "dependencies": {
         "regenerator-runtime": "^0.14.0"
@@ -284,30 +284,30 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.26.8",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.26.8.tgz",
-      "integrity": "sha512-iNKaX3ZebKIsCvJ+0jd6embf+Aulaa3vNBqZ41kM7iTWjx5qzWKXGHiJUW3+nTpQ18SG11hdF8OAzKrpXkb96Q==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz",
+      "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.26.2",
-        "@babel/parser": "^7.26.8",
-        "@babel/types": "^7.26.8"
+        "@babel/code-frame": "^7.25.9",
+        "@babel/parser": "^7.25.9",
+        "@babel/types": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.26.8",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.8.tgz",
-      "integrity": "sha512-nic9tRkjYH0oB2dzr/JoGIm+4Q6SuYeLEiIiZDwBscRMYFJ+tMAz98fuel9ZnbXViA2I0HVSSRRK8DW5fjXStA==",
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.5.tgz",
+      "integrity": "sha512-rkOSPOw+AXbgtwUga3U4u8RpoK9FEFWBNAlTpcnkLFjL5CT+oyHNuUUC/xx6XefEJ16r38r8Bc/lfp6rYuHeJQ==",
       "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.26.2",
-        "@babel/generator": "^7.26.8",
-        "@babel/parser": "^7.26.8",
-        "@babel/template": "^7.26.8",
-        "@babel/types": "^7.26.8",
+        "@babel/generator": "^7.26.5",
+        "@babel/parser": "^7.26.5",
+        "@babel/template": "^7.25.9",
+        "@babel/types": "^7.26.5",
         "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
@@ -316,9 +316,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.26.8",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.8.tgz",
-      "integrity": "sha512-eUuWapzEGWFEpHFxgEaBG8e3n6S8L3MSu0oda755rOfabWPnh0Our1AozNFVUxGFIhbKgd1ksprsoDGMinTOTA==",
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.5.tgz",
+      "integrity": "sha512-L6mZmwFDK6Cjh1nRCLXpa6no13ZIioJDz7mdkzHv399pThrTa/k0nUlNaenOeh2kWu/iaOQYElEpKPUswUa9Vg==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-string-parser": "^7.25.9",
@@ -628,26 +628,17 @@
       }
     },
     "node_modules/@formatjs/ecma402-abstract": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.3.3.tgz",
-      "integrity": "sha512-pJT1OkhplSmvvr6i3CWTPvC/FGC06MbN5TNBfRO6Ox62AEz90eMq+dVvtX9Bl3jxCEkS0tATzDarRZuOLw7oFg==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/@formatjs/ecma402-abstract/-/ecma402-abstract-2.3.2.tgz",
+      "integrity": "sha512-6sE5nyvDloULiyOMbOTJEEgWL32w+VHkZQs8S02Lnn8Y/O5aQhjOEXwWzvR7SsBE/exxlSpY2EsWZgqHbtLatg==",
       "license": "MIT",
       "dependencies": {
         "@formatjs/fast-memoize": "2.2.6",
-        "@formatjs/intl-localematcher": "0.6.0",
+        "@formatjs/intl-localematcher": "0.5.10",
         "decimal.js": "10",
         "tslib": "2"
       }
     },
-    "node_modules/@formatjs/ecma402-abstract/node_modules/@formatjs/intl-localematcher": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl-localematcher/-/intl-localematcher-0.6.0.tgz",
-      "integrity": "sha512-4rB4g+3hESy1bHSBG3tDFaMY2CH67iT7yne1e+0CLTsGLDcmoEWWpJjjpWVaYgYfYuohIRuo0E+N536gd2ZHZA==",
-      "license": "MIT",
-      "dependencies": {
-        "tslib": "2"
-      }
-    },
     "node_modules/@formatjs/fast-memoize": {
       "version": "2.2.6",
       "resolved": "https://registry.npmjs.org/@formatjs/fast-memoize/-/fast-memoize-2.2.6.tgz",
@@ -658,23 +649,23 @@
       }
     },
     "node_modules/@formatjs/icu-messageformat-parser": {
-      "version": "2.11.1",
-      "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.11.1.tgz",
-      "integrity": "sha512-o0AhSNaOfKoic0Sn1GkFCK4MxdRsw7mPJ5/rBpIqdvcC7MIuyUSW8WChUEvrK78HhNpYOgqCQbINxCTumJLzZA==",
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.11.0.tgz",
+      "integrity": "sha512-Hp81uTjjdTk3FLh/dggU5NK7EIsVWc5/ZDWrIldmf2rBuPejuZ13CZ/wpVE2SToyi4EiroPTQ1XJcJuZFIxTtw==",
       "license": "MIT",
       "dependencies": {
-        "@formatjs/ecma402-abstract": "2.3.3",
-        "@formatjs/icu-skeleton-parser": "1.8.13",
+        "@formatjs/ecma402-abstract": "2.3.2",
+        "@formatjs/icu-skeleton-parser": "1.8.12",
         "tslib": "2"
       }
     },
     "node_modules/@formatjs/icu-skeleton-parser": {
-      "version": "1.8.13",
-      "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.8.13.tgz",
-      "integrity": "sha512-N/LIdTvVc1TpJmMt2jVg0Fr1F7Q1qJPdZSCs19unMskCmVQ/sa0H9L8PWt13vq+gLdLg1+pPsvBLydL1Apahjg==",
+      "version": "1.8.12",
+      "resolved": "https://registry.npmjs.org/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.8.12.tgz",
+      "integrity": "sha512-QRAY2jC1BomFQHYDMcZtClqHR55EEnB96V7Xbk/UiBodsuFc5kujybzt87+qj1KqmJozFhk6n4KiT1HKwAkcfg==",
       "license": "MIT",
       "dependencies": {
-        "@formatjs/ecma402-abstract": "2.3.3",
+        "@formatjs/ecma402-abstract": "2.3.2",
         "tslib": "2"
       }
     },
@@ -834,9 +825,9 @@
       }
     },
     "node_modules/@next/env": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.23.tgz",
-      "integrity": "sha512-CysUC9IO+2Bh0omJ3qrb47S8DtsTKbFidGm6ow4gXIG6reZybqxbkH2nhdEm1tC8SmgzDdpq3BIML0PWsmyUYA==",
+      "version": "14.2.24",
+      "resolved": "https://registry.npmjs.org/@next/env/-/env-14.2.24.tgz",
+      "integrity": "sha512-LAm0Is2KHTNT6IT16lxT+suD0u+VVfYNQqM+EJTKuFRRuY2z+zj01kueWXPCxbMBDt0B5vONYzabHGUNbZYAhA==",
       "license": "MIT"
     },
     "node_modules/@next/eslint-plugin-next": {
@@ -850,9 +841,9 @@
       }
     },
     "node_modules/@next/swc-darwin-arm64": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.23.tgz",
-      "integrity": "sha512-WhtEntt6NcbABA8ypEoFd3uzq5iAnrl9AnZt9dXdO+PZLACE32z3a3qA5OoV20JrbJfSJ6Sd6EqGZTrlRnGxQQ==",
+      "version": "14.2.24",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.2.24.tgz",
+      "integrity": "sha512-7Tdi13aojnAZGpapVU6meVSpNzgrFwZ8joDcNS8cJVNuP3zqqrLqeory9Xec5TJZR/stsGJdfwo8KeyloT3+rQ==",
       "cpu": [
         "arm64"
       ],
@@ -866,9 +857,9 @@
       }
     },
     "node_modules/@next/swc-darwin-x64": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.23.tgz",
-      "integrity": "sha512-vwLw0HN2gVclT/ikO6EcE+LcIN+0mddJ53yG4eZd0rXkuEr/RnOaMH8wg/sYl5iz5AYYRo/l6XX7FIo6kwbw1Q==",
+      "version": "14.2.24",
+      "resolved": "https://registry.npmjs.org/@next/swc-darwin-x64/-/swc-darwin-x64-14.2.24.tgz",
+      "integrity": "sha512-lXR2WQqUtu69l5JMdTwSvQUkdqAhEWOqJEYUQ21QczQsAlNOW2kWZCucA6b3EXmPbcvmHB1kSZDua/713d52xg==",
       "cpu": [
         "x64"
       ],
@@ -882,9 +873,9 @@
       }
     },
     "node_modules/@next/swc-linux-arm64-gnu": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.23.tgz",
-      "integrity": "sha512-uuAYwD3At2fu5CH1wD7FpP87mnjAv4+DNvLaR9kiIi8DLStWSW304kF09p1EQfhcbUI1Py2vZlBO2VaVqMRtpg==",
+      "version": "14.2.24",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-gnu/-/swc-linux-arm64-gnu-14.2.24.tgz",
+      "integrity": "sha512-nxvJgWOpSNmzidYvvGDfXwxkijb6hL9+cjZx1PVG6urr2h2jUqBALkKjT7kpfurRWicK6hFOvarmaWsINT1hnA==",
       "cpu": [
         "arm64"
       ],
@@ -898,9 +889,9 @@
       }
     },
     "node_modules/@next/swc-linux-arm64-musl": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.23.tgz",
-      "integrity": "sha512-Mm5KHd7nGgeJ4EETvVgFuqKOyDh+UMXHXxye6wRRFDr4FdVRI6YTxajoV2aHE8jqC14xeAMVZvLqYqS7isHL+g==",
+      "version": "14.2.24",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-arm64-musl/-/swc-linux-arm64-musl-14.2.24.tgz",
+      "integrity": "sha512-PaBgOPhqa4Abxa3y/P92F3kklNPsiFjcjldQGT7kFmiY5nuFn8ClBEoX8GIpqU1ODP2y8P6hio6vTomx2Vy0UQ==",
       "cpu": [
         "arm64"
       ],
@@ -914,9 +905,9 @@
       }
     },
     "node_modules/@next/swc-linux-x64-gnu": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.23.tgz",
-      "integrity": "sha512-Ybfqlyzm4sMSEQO6lDksggAIxnvWSG2cDWnG2jgd+MLbHYn2pvFA8DQ4pT2Vjk3Cwrv+HIg7vXJ8lCiLz79qoQ==",
+      "version": "14.2.24",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-gnu/-/swc-linux-x64-gnu-14.2.24.tgz",
+      "integrity": "sha512-vEbyadiRI7GOr94hd2AB15LFVgcJZQWu7Cdi9cWjCMeCiUsHWA0U5BkGPuoYRnTxTn0HacuMb9NeAmStfBCLoQ==",
       "cpu": [
         "x64"
       ],
@@ -930,9 +921,9 @@
       }
     },
     "node_modules/@next/swc-linux-x64-musl": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.23.tgz",
-      "integrity": "sha512-OSQX94sxd1gOUz3jhhdocnKsy4/peG8zV1HVaW6DLEbEmRRtUCUQZcKxUD9atLYa3RZA+YJx+WZdOnTkDuNDNA==",
+      "version": "14.2.24",
+      "resolved": "https://registry.npmjs.org/@next/swc-linux-x64-musl/-/swc-linux-x64-musl-14.2.24.tgz",
+      "integrity": "sha512-df0FC9ptaYsd8nQCINCzFtDWtko8PNRTAU0/+d7hy47E0oC17tI54U/0NdGk7l/76jz1J377dvRjmt6IUdkpzQ==",
       "cpu": [
         "x64"
       ],
@@ -946,9 +937,9 @@
       }
     },
     "node_modules/@next/swc-win32-arm64-msvc": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.23.tgz",
-      "integrity": "sha512-ezmbgZy++XpIMTcTNd0L4k7+cNI4ET5vMv/oqNfTuSXkZtSA9BURElPFyarjjGtRgZ9/zuKDHoMdZwDZIY3ehQ==",
+      "version": "14.2.24",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-arm64-msvc/-/swc-win32-arm64-msvc-14.2.24.tgz",
+      "integrity": "sha512-ZEntbLjeYAJ286eAqbxpZHhDFYpYjArotQ+/TW9j7UROh0DUmX7wYDGtsTPpfCV8V+UoqHBPU7q9D4nDNH014Q==",
       "cpu": [
         "arm64"
       ],
@@ -962,9 +953,9 @@
       }
     },
     "node_modules/@next/swc-win32-ia32-msvc": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.23.tgz",
-      "integrity": "sha512-zfHZOGguFCqAJ7zldTKg4tJHPJyJCOFhpoJcVxKL9BSUHScVDnMdDuOU1zPPGdOzr/GWxbhYTjyiEgLEpAoFPA==",
+      "version": "14.2.24",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-ia32-msvc/-/swc-win32-ia32-msvc-14.2.24.tgz",
+      "integrity": "sha512-9KuS+XUXM3T6v7leeWU0erpJ6NsFIwiTFD5nzNg8J5uo/DMIPvCp3L1Ao5HjbHX0gkWPB1VrKoo/Il4F0cGK2Q==",
       "cpu": [
         "ia32"
       ],
@@ -978,9 +969,9 @@
       }
     },
     "node_modules/@next/swc-win32-x64-msvc": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.23.tgz",
-      "integrity": "sha512-xCtq5BD553SzOgSZ7UH5LH+OATQihydObTrCTvVzOro8QiWYKdBVwcB2Mn2MLMo6DGW9yH1LSPw7jS7HhgJgjw==",
+      "version": "14.2.24",
+      "resolved": "https://registry.npmjs.org/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-14.2.24.tgz",
+      "integrity": "sha512-cXcJ2+x0fXQ2CntaE00d7uUH+u1Bfp/E0HsNQH79YiLaZE5Rbm7dZzyAYccn3uICM7mw+DxoMqEfGXZtF4Fgaw==",
       "cpu": [
         "x64"
       ],
@@ -1042,9 +1033,9 @@
       }
     },
     "node_modules/@parcel/watcher": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.1.tgz",
-      "integrity": "sha512-dfUnCxiN9H4ap84DvD2ubjw+3vUNpstxa0TneY/Paat8a3R4uQZDLSvWjmznAY/DoahqTHl9V46HF/Zs3F29pg==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.0.tgz",
+      "integrity": "sha512-i0GV1yJnm2n3Yq1qw6QrUrd/LI9bE8WEBOTtOkpCXHHdyN3TAGgqAK/DAT05z4fq2x04cARXt2pDmjWjL92iTQ==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -1063,25 +1054,25 @@
         "url": "https://opencollective.com/parcel"
       },
       "optionalDependencies": {
-        "@parcel/watcher-android-arm64": "2.5.1",
-        "@parcel/watcher-darwin-arm64": "2.5.1",
-        "@parcel/watcher-darwin-x64": "2.5.1",
-        "@parcel/watcher-freebsd-x64": "2.5.1",
-        "@parcel/watcher-linux-arm-glibc": "2.5.1",
-        "@parcel/watcher-linux-arm-musl": "2.5.1",
-        "@parcel/watcher-linux-arm64-glibc": "2.5.1",
-        "@parcel/watcher-linux-arm64-musl": "2.5.1",
-        "@parcel/watcher-linux-x64-glibc": "2.5.1",
-        "@parcel/watcher-linux-x64-musl": "2.5.1",
-        "@parcel/watcher-win32-arm64": "2.5.1",
-        "@parcel/watcher-win32-ia32": "2.5.1",
-        "@parcel/watcher-win32-x64": "2.5.1"
+        "@parcel/watcher-android-arm64": "2.5.0",
+        "@parcel/watcher-darwin-arm64": "2.5.0",
+        "@parcel/watcher-darwin-x64": "2.5.0",
+        "@parcel/watcher-freebsd-x64": "2.5.0",
+        "@parcel/watcher-linux-arm-glibc": "2.5.0",
+        "@parcel/watcher-linux-arm-musl": "2.5.0",
+        "@parcel/watcher-linux-arm64-glibc": "2.5.0",
+        "@parcel/watcher-linux-arm64-musl": "2.5.0",
+        "@parcel/watcher-linux-x64-glibc": "2.5.0",
+        "@parcel/watcher-linux-x64-musl": "2.5.0",
+        "@parcel/watcher-win32-arm64": "2.5.0",
+        "@parcel/watcher-win32-ia32": "2.5.0",
+        "@parcel/watcher-win32-x64": "2.5.0"
       }
     },
     "node_modules/@parcel/watcher-android-arm64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.1.tgz",
-      "integrity": "sha512-KF8+j9nNbUN8vzOFDpRMsaKBHZ/mcjEjMToVMJOhTozkDonQFFrRcfdLWn6yWKCmJKmdVxSgHiYvTCef4/qcBA==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.5.0.tgz",
+      "integrity": "sha512-qlX4eS28bUcQCdribHkg/herLe+0A9RyYC+mm2PXpncit8z5b3nSqGVzMNR3CmtAOgRutiZ02eIJJgP/b1iEFQ==",
       "cpu": [
         "arm64"
       ],
@@ -1100,9 +1091,9 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-arm64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.1.tgz",
-      "integrity": "sha512-eAzPv5osDmZyBhou8PoF4i6RQXAfeKL9tjb3QzYuccXFMQU0ruIc/POh30ePnaOyD1UXdlKguHBmsTs53tVoPw==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.0.tgz",
+      "integrity": "sha512-hyZ3TANnzGfLpRA2s/4U1kbw2ZI4qGxaRJbBH2DCSREFfubMswheh8TeiC1sGZ3z2jUf3s37P0BBlrD3sjVTUw==",
       "cpu": [
         "arm64"
       ],
@@ -1121,9 +1112,9 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-x64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.1.tgz",
-      "integrity": "sha512-1ZXDthrnNmwv10A0/3AJNZ9JGlzrF82i3gNQcWOzd7nJ8aj+ILyW1MTxVk35Db0u91oD5Nlk9MBiujMlwmeXZg==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.5.0.tgz",
+      "integrity": "sha512-9rhlwd78saKf18fT869/poydQK8YqlU26TMiNg7AIu7eBp9adqbJZqmdFOsbZ5cnLp5XvRo9wcFmNHgHdWaGYA==",
       "cpu": [
         "x64"
       ],
@@ -1142,9 +1133,9 @@
       }
     },
     "node_modules/@parcel/watcher-freebsd-x64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.1.tgz",
-      "integrity": "sha512-SI4eljM7Flp9yPuKi8W0ird8TI/JK6CSxju3NojVI6BjHsTyK7zxA9urjVjEKJ5MBYC+bLmMcbAWlZ+rFkLpJQ==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.5.0.tgz",
+      "integrity": "sha512-syvfhZzyM8kErg3VF0xpV8dixJ+RzbUaaGaeb7uDuz0D3FK97/mZ5AJQ3XNnDsXX7KkFNtyQyFrXZzQIcN49Tw==",
       "cpu": [
         "x64"
       ],
@@ -1163,9 +1154,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm-glibc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.1.tgz",
-      "integrity": "sha512-RCdZlEyTs8geyBkkcnPWvtXLY44BCeZKmGYRtSgtwwnHR4dxfHRG3gR99XdMEdQ7KeiDdasJwwvNSF5jKtDwdA==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.5.0.tgz",
+      "integrity": "sha512-0VQY1K35DQET3dVYWpOaPFecqOT9dbuCfzjxoQyif1Wc574t3kOSkKevULddcR9znz1TcklCE7Ht6NIxjvTqLA==",
       "cpu": [
         "arm"
       ],
@@ -1184,9 +1175,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm-musl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.1.tgz",
-      "integrity": "sha512-6E+m/Mm1t1yhB8X412stiKFG3XykmgdIOqhjWj+VL8oHkKABfu/gjFj8DvLrYVHSBNC+/u5PeNrujiSQ1zwd1Q==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-musl/-/watcher-linux-arm-musl-2.5.0.tgz",
+      "integrity": "sha512-6uHywSIzz8+vi2lAzFeltnYbdHsDm3iIB57d4g5oaB9vKwjb6N6dRIgZMujw4nm5r6v9/BQH0noq6DzHrqr2pA==",
       "cpu": [
         "arm"
       ],
@@ -1205,9 +1196,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-glibc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.1.tgz",
-      "integrity": "sha512-LrGp+f02yU3BN9A+DGuY3v3bmnFUggAITBGriZHUREfNEzZh/GO06FF5u2kx8x+GBEUYfyTGamol4j3m9ANe8w==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.5.0.tgz",
+      "integrity": "sha512-BfNjXwZKxBy4WibDb/LDCriWSKLz+jJRL3cM/DllnHH5QUyoiUNEp3GmL80ZqxeumoADfCCP19+qiYiC8gUBjA==",
       "cpu": [
         "arm64"
       ],
@@ -1226,9 +1217,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-musl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.1.tgz",
-      "integrity": "sha512-cFOjABi92pMYRXS7AcQv9/M1YuKRw8SZniCDw0ssQb/noPkRzA+HBDkwmyOJYp5wXcsTrhxO0zq1U11cK9jsFg==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.5.0.tgz",
+      "integrity": "sha512-S1qARKOphxfiBEkwLUbHjCY9BWPdWnW9j7f7Hb2jPplu8UZ3nes7zpPOW9bkLbHRvWM0WDTsjdOTUgW0xLBN1Q==",
       "cpu": [
         "arm64"
       ],
@@ -1247,9 +1238,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-glibc": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.1.tgz",
-      "integrity": "sha512-GcESn8NZySmfwlTsIur+49yDqSny2IhPeZfXunQi48DMugKeZ7uy1FX83pO0X22sHntJ4Ub+9k34XQCX+oHt2A==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.5.0.tgz",
+      "integrity": "sha512-d9AOkusyXARkFD66S6zlGXyzx5RvY+chTP9Jp0ypSTC9d4lzyRs9ovGf/80VCxjKddcUvnsGwCHWuF2EoPgWjw==",
       "cpu": [
         "x64"
       ],
@@ -1268,9 +1259,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-musl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.1.tgz",
-      "integrity": "sha512-n0E2EQbatQ3bXhcH2D1XIAANAcTZkQICBPVaxMeaCVBtOpBZpWJuf7LwyWPSBDITb7In8mqQgJ7gH8CILCURXg==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.5.0.tgz",
+      "integrity": "sha512-iqOC+GoTDoFyk/VYSFHwjHhYrk8bljW6zOhPuhi5t9ulqiYq1togGJB5e3PwYVFFfeVgc6pbz3JdQyDoBszVaA==",
       "cpu": [
         "x64"
       ],
@@ -1289,9 +1280,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-arm64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.1.tgz",
-      "integrity": "sha512-RFzklRvmc3PkjKjry3hLF9wD7ppR4AKcWNzH7kXR7GUe0Igb3Nz8fyPwtZCSquGrhU5HhUNDr/mKBqj7tqA2Vw==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.5.0.tgz",
+      "integrity": "sha512-twtft1d+JRNkM5YbmexfcH/N4znDtjgysFaV9zvZmmJezQsKpkfLYJ+JFV3uygugK6AtIM2oADPkB2AdhBrNig==",
       "cpu": [
         "arm64"
       ],
@@ -1310,9 +1301,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-ia32": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.1.tgz",
-      "integrity": "sha512-c2KkcVN+NJmuA7CGlaGD1qJh1cLfDnQsHjE89E60vUEMlqduHGCdCLJCID5geFVM0dOtA3ZiIO8BoEQmzQVfpQ==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.5.0.tgz",
+      "integrity": "sha512-+rgpsNRKwo8A53elqbbHXdOMtY/tAtTzManTWShB5Kk54N8Q9mzNWV7tV+IbGueCbcj826MfWGU3mprWtuf1TA==",
       "cpu": [
         "ia32"
       ],
@@ -1331,9 +1322,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-x64": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.1.tgz",
-      "integrity": "sha512-9lHBdJITeNR++EvSQVUcaZoWupyHfXe1jZvGZ06O/5MflPcuPLtEphScIBL+AiCWBO46tDSHzWyD0uDmmZqsgA==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.5.0.tgz",
+      "integrity": "sha512-lPrxve92zEHdgeff3aiu4gDOIt4u7sJYha6wbdEZDCDUhtjTsOMiaJzG5lMY4GkWH8p0fMmO2Ppq5G5XXG+DQw==",
       "cpu": [
         "x64"
       ],
@@ -1589,16 +1580,16 @@
       "license": "MIT"
     },
     "node_modules/@types/lodash": {
-      "version": "4.17.15",
-      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.15.tgz",
-      "integrity": "sha512-w/P33JFeySuhN6JLkysYUK2gEmy9kHHFN7E8ro0tkfmlDOgxBDzWEZ/J8cWA+fHqFevpswDTFZnDx+R9lbL6xw==",
+      "version": "4.17.14",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.14.tgz",
+      "integrity": "sha512-jsxagdikDiDBeIRaPYtArcT8my4tN1og7MtMRquFT3XNA6axxyHDRUemqDz/taRDdOUn0GnGHRCuff4q48sW9A==",
       "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "20.17.17",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.17.tgz",
-      "integrity": "sha512-/WndGO4kIfMicEQLTi/mDANUu/iVUhT7KboZPdEqqHQ4aTS+3qT3U5gIqWDFV+XouorjfgGqvKILJeHhuQgFYg==",
+      "version": "20.17.16",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.17.16.tgz",
+      "integrity": "sha512-vOTpLduLkZXePLxHiHsBLp98mHGnl8RptV4YAO3HfKO5UHjDvySGbxKtpYfy8Sx5+WKcgc45qNreJJRVM3L6mw==",
       "license": "MIT",
       "dependencies": {
         "undici-types": "~6.19.2"
@@ -1655,21 +1646,21 @@
       "license": "MIT"
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.23.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.23.0.tgz",
-      "integrity": "sha512-vBz65tJgRrA1Q5gWlRfvoH+w943dq9K1p1yDBY2pc+a1nbBLZp7fB9+Hk8DaALUbzjqlMfgaqlVPT1REJdkt/w==",
+      "version": "8.21.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.21.0.tgz",
+      "integrity": "sha512-eTH+UOR4I7WbdQnG4Z48ebIA6Bgi7WO8HvFEneeYBxG8qCOYgTOFPSg6ek9ITIDvGjDQzWHcoWHCDO2biByNzA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.23.0",
-        "@typescript-eslint/type-utils": "8.23.0",
-        "@typescript-eslint/utils": "8.23.0",
-        "@typescript-eslint/visitor-keys": "8.23.0",
+        "@typescript-eslint/scope-manager": "8.21.0",
+        "@typescript-eslint/type-utils": "8.21.0",
+        "@typescript-eslint/utils": "8.21.0",
+        "@typescript-eslint/visitor-keys": "8.21.0",
         "graphemer": "^1.4.0",
         "ignore": "^5.3.1",
         "natural-compare": "^1.4.0",
-        "ts-api-utils": "^2.0.1"
+        "ts-api-utils": "^2.0.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1685,16 +1676,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.23.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.23.0.tgz",
-      "integrity": "sha512-h2lUByouOXFAlMec2mILeELUbME5SZRN/7R9Cw2RD2lRQQY08MWMM+PmVVKKJNK1aIwqTo9t/0CvOxwPbRIE2Q==",
+      "version": "8.21.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.21.0.tgz",
+      "integrity": "sha512-Wy+/sdEH9kI3w9civgACwabHbKl+qIOu0uFZ9IMKzX3Jpv9og0ZBJrZExGrPpFAY7rWsXuxs5e7CPPP17A4eYA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.23.0",
-        "@typescript-eslint/types": "8.23.0",
-        "@typescript-eslint/typescript-estree": "8.23.0",
-        "@typescript-eslint/visitor-keys": "8.23.0",
+        "@typescript-eslint/scope-manager": "8.21.0",
+        "@typescript-eslint/types": "8.21.0",
+        "@typescript-eslint/typescript-estree": "8.21.0",
+        "@typescript-eslint/visitor-keys": "8.21.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -1710,14 +1701,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.23.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.23.0.tgz",
-      "integrity": "sha512-OGqo7+dXHqI7Hfm+WqkZjKjsiRtFUQHPdGMXzk5mYXhJUedO7e/Y7i8AK3MyLMgZR93TX4bIzYrfyVjLC+0VSw==",
+      "version": "8.21.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.21.0.tgz",
+      "integrity": "sha512-G3IBKz0/0IPfdeGRMbp+4rbjfSSdnGkXsM/pFZA8zM9t9klXDnB/YnKOBQ0GoPmoROa4bCq2NeHgJa5ydsQ4mA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.23.0",
-        "@typescript-eslint/visitor-keys": "8.23.0"
+        "@typescript-eslint/types": "8.21.0",
+        "@typescript-eslint/visitor-keys": "8.21.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1728,16 +1719,16 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.23.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.23.0.tgz",
-      "integrity": "sha512-iIuLdYpQWZKbiH+RkCGc6iu+VwscP5rCtQ1lyQ7TYuKLrcZoeJVpcLiG8DliXVkUxirW/PWlmS+d6yD51L9jvA==",
+      "version": "8.21.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.21.0.tgz",
+      "integrity": "sha512-95OsL6J2BtzoBxHicoXHxgk3z+9P3BEcQTpBKriqiYzLKnM2DeSqs+sndMKdamU8FosiadQFT3D+BSL9EKnAJQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.23.0",
-        "@typescript-eslint/utils": "8.23.0",
+        "@typescript-eslint/typescript-estree": "8.21.0",
+        "@typescript-eslint/utils": "8.21.0",
         "debug": "^4.3.4",
-        "ts-api-utils": "^2.0.1"
+        "ts-api-utils": "^2.0.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1752,9 +1743,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.23.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.23.0.tgz",
-      "integrity": "sha512-1sK4ILJbCmZOTt9k4vkoulT6/y5CHJ1qUYxqpF1K/DBAd8+ZUL4LlSCxOssuH5m4rUaaN0uS0HlVPvd45zjduQ==",
+      "version": "8.21.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.21.0.tgz",
+      "integrity": "sha512-PAL6LUuQwotLW2a8VsySDBwYMm129vFm4tMVlylzdoTybTHaAi0oBp7Ac6LhSrHHOdLM3efH+nAR6hAWoMF89A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1766,20 +1757,20 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.23.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.23.0.tgz",
-      "integrity": "sha512-LcqzfipsB8RTvH8FX24W4UUFk1bl+0yTOf9ZA08XngFwMg4Kj8A+9hwz8Cr/ZS4KwHrmo9PJiLZkOt49vPnuvQ==",
+      "version": "8.21.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.21.0.tgz",
+      "integrity": "sha512-x+aeKh/AjAArSauz0GiQZsjT8ciadNMHdkUSwBB9Z6PrKc/4knM4g3UfHml6oDJmKC88a6//cdxnO/+P2LkMcg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.23.0",
-        "@typescript-eslint/visitor-keys": "8.23.0",
+        "@typescript-eslint/types": "8.21.0",
+        "@typescript-eslint/visitor-keys": "8.21.0",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
         "minimatch": "^9.0.4",
         "semver": "^7.6.0",
-        "ts-api-utils": "^2.0.1"
+        "ts-api-utils": "^2.0.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1819,16 +1810,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.23.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.23.0.tgz",
-      "integrity": "sha512-uB/+PSo6Exu02b5ZEiVtmY6RVYO7YU5xqgzTIVZwTHvvK3HsL8tZZHFaTLFtRG3CsV4A5mhOv+NZx5BlhXPyIA==",
+      "version": "8.21.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.21.0.tgz",
+      "integrity": "sha512-xcXBfcq0Kaxgj7dwejMbFyq7IOHgpNMtVuDveK7w3ZGwG9owKzhALVwKpTF2yrZmEwl9SWdetf3fxNzJQaVuxw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "8.23.0",
-        "@typescript-eslint/types": "8.23.0",
-        "@typescript-eslint/typescript-estree": "8.23.0"
+        "@typescript-eslint/scope-manager": "8.21.0",
+        "@typescript-eslint/types": "8.21.0",
+        "@typescript-eslint/typescript-estree": "8.21.0"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -1843,13 +1834,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.23.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.23.0.tgz",
-      "integrity": "sha512-oWWhcWDLwDfu++BGTZcmXWqpwtkwb5o7fxUIGksMQQDSdPW9prsSnfIOZMlsj4vBOSrcnjIUZMiIjODgGosFhQ==",
+      "version": "8.21.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.21.0.tgz",
+      "integrity": "sha512-BkLMNpdV6prozk8LlyK/SOoWLmUFi+ZD+pcqti9ILCbVvHGk1ui1g4jJOc2WDLaeExz2qWwojxlPce5PljcT3w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.23.0",
+        "@typescript-eslint/types": "8.21.0",
         "eslint-visitor-keys": "^4.2.0"
       },
       "engines": {
@@ -1874,9 +1865,9 @@
       }
     },
     "node_modules/@ungap/structured-clone": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz",
-      "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.1.tgz",
+      "integrity": "sha512-fEzPV3hSkSMltkw152tJKNARhOupqbH96MZWyRjNaYZOMIzbrTeQDG+MTc6Mr2pgzFQzFxAfmhGDNP5QK++2ZA==",
       "dev": true,
       "license": "ISC"
     },
@@ -2000,16 +1991,16 @@
       }
     },
     "node_modules/antd": {
-      "version": "5.23.4",
-      "resolved": "https://registry.npmjs.org/antd/-/antd-5.23.4.tgz",
-      "integrity": "sha512-8H3icWQRi4lu7pkOpc2IhCh+UgmtTZHaTusgfieihv5nm8lNsCxCrxMqEgMxrZTumxsBKHThACkNdejSE3IeuA==",
+      "version": "5.23.2",
+      "resolved": "https://registry.npmjs.org/antd/-/antd-5.23.2.tgz",
+      "integrity": "sha512-h39z/uSeNvF3FtSMytle58s68zQFXJ+XuLm31l6mPBBq99tUSxO9b1Wfnw7b8Q5Mfl4hsXjoz85+/jIRGfYJ5Q==",
       "license": "MIT",
       "dependencies": {
         "@ant-design/colors": "^7.2.0",
-        "@ant-design/cssinjs": "^1.23.0",
+        "@ant-design/cssinjs": "^1.22.0",
         "@ant-design/cssinjs-utils": "^1.1.3",
         "@ant-design/fast-color": "^2.0.6",
-        "@ant-design/icons": "^5.6.0",
+        "@ant-design/icons": "^5.5.2",
         "@ant-design/react-slick": "~1.1.2",
         "@babel/runtime": "^7.26.0",
         "@rc-component/color-picker": "~2.0.1",
@@ -2034,7 +2025,7 @@
         "rc-menu": "~9.16.0",
         "rc-motion": "^2.9.5",
         "rc-notification": "~5.6.2",
-        "rc-pagination": "~5.1.0",
+        "rc-pagination": "~5.0.0",
         "rc-picker": "~4.9.2",
         "rc-progress": "~4.0.0",
         "rc-rate": "~2.13.0",
@@ -2538,9 +2529,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001699",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001699.tgz",
-      "integrity": "sha512-b+uH5BakXZ9Do9iK+CkDmctUSEqZl+SP056vc5usa0PL+ev5OHw003rZXcnjNDv3L8P5j6rwT6C0BPKSikW08w==",
+      "version": "1.0.30001695",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001695.tgz",
+      "integrity": "sha512-vHyLade6wTgI2u1ec3WQBxv+2BrTERV28UXQu9LO6lZ9pYeMk34vjXFLOxo1A4UBA8XTL4njRQZdno/yYaSmWw==",
       "funding": [
         {
           "type": "opencollective",
@@ -2850,9 +2841,9 @@
       }
     },
     "node_modules/decimal.js": {
-      "version": "10.5.0",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.5.0.tgz",
-      "integrity": "sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw==",
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
+      "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==",
       "license": "MIT"
     },
     "node_modules/deep-is": {
@@ -2956,9 +2947,9 @@
       "license": "MIT"
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.96",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.96.tgz",
-      "integrity": "sha512-8AJUW6dh75Fm/ny8+kZKJzI1pgoE8bKLZlzDU2W1ENd+DXKJrx7I7l9hb8UWR4ojlnb5OlixMt00QWiYJoVw1w==",
+      "version": "1.5.86",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.86.tgz",
+      "integrity": "sha512-/D7GAAaCRBQFBBcop6SfAAGH37djtpWkOuYhyAajw0l5vsfeSsUQYxaFPwr1c/mC/flARCDdKFo5gpFqNI+18w==",
       "dev": true,
       "license": "ISC"
     },
@@ -3034,9 +3025,9 @@
       }
     },
     "node_modules/enhanced-resolve": {
-      "version": "5.18.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz",
-      "integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==",
+      "version": "5.18.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.0.tgz",
+      "integrity": "sha512-0/r0MySGYG8YqlayBZ6MuCfECmHFdJ5qyPh8s8wa5Hnm6SaFLSK1VYCbj+NKp090Nm1caZhD+QTnmxO7esYGyQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3806,9 +3797,9 @@
       "license": "MIT"
     },
     "node_modules/fastq": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.0.tgz",
-      "integrity": "sha512-7SFSRCNjBQIZH/xZR3iy5iQYR8aGBE0h3VG6/cwlbrpdciNYBMotQav8c1XI3HjHH+NikUpP53nPdlZSdWmFzA==",
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.18.0.tgz",
+      "integrity": "sha512-QKHXPW0hD8g4UET03SdOdunzSouc9N4AuHdsX8XNcTsuz+yYFILVNIX4l9yHABMhiEI9Db0JTTIpu0wB+Y1QQw==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -3940,19 +3931,13 @@
       }
     },
     "node_modules/for-each": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.4.tgz",
-      "integrity": "sha512-kKaIINnFpzW6ffJNDjjyjrk21BkDx38c0xa/klsT8VzLCaMEefv4ZTacrcVR4DmgTeBra++jMDAfS/tS799YDw==",
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "is-callable": "^1.2.7"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "is-callable": "^1.1.3"
       }
     },
     "node_modules/foreach": {
@@ -4371,9 +4356,9 @@
       "license": "MIT"
     },
     "node_modules/import-fresh": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
-      "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
       "license": "MIT",
       "dependencies": {
         "parent-module": "^1.0.0",
@@ -4431,14 +4416,14 @@
       }
     },
     "node_modules/intl-messageformat": {
-      "version": "10.7.15",
-      "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-10.7.15.tgz",
-      "integrity": "sha512-LRyExsEsefQSBjU2p47oAheoKz+EOJxSLDdjOaEjdriajfHsMXOmV/EhMvYSg9bAgCUHasuAC+mcUBe/95PfIg==",
+      "version": "10.7.14",
+      "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-10.7.14.tgz",
+      "integrity": "sha512-mMGnE4E1otdEutV5vLUdCxRJygHB5ozUBxsPB5qhitewssrS/qGruq9bmvIRkkGsNeK5ZWLfYRld18UHGTIifQ==",
       "license": "BSD-3-Clause",
       "dependencies": {
-        "@formatjs/ecma402-abstract": "2.3.3",
+        "@formatjs/ecma402-abstract": "2.3.2",
         "@formatjs/fast-memoize": "2.2.6",
-        "@formatjs/icu-messageformat-parser": "2.11.1",
+        "@formatjs/icu-messageformat-parser": "2.11.0",
         "tslib": "2"
       }
     },
@@ -4503,13 +4488,13 @@
       }
     },
     "node_modules/is-boolean-object": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.2.tgz",
-      "integrity": "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.1.tgz",
+      "integrity": "sha512-l9qO6eFlUETHtuihLcYOaLKByJ1f+N4kthcU9YjHy3N+B3hWv0y/2Nd0mu/7lTFnRQHTrSdXF50HQ3bl5fEnng==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bound": "^1.0.3",
+        "call-bound": "^1.0.2",
         "has-tostringtag": "^1.0.2"
       },
       "engines": {
@@ -4823,13 +4808,13 @@
       }
     },
     "node_modules/is-weakref": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.1.tgz",
-      "integrity": "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.0.tgz",
+      "integrity": "sha512-SXM8Nwyys6nT5WP6pltOwKytLV7FqQ4UiibxVmW+EIosHcmCqkkjViTb5SNssDlkCiEYRP1/pdWUKVvZBmsR2Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bound": "^1.0.3"
+        "call-bound": "^1.0.2"
       },
       "engines": {
         "node": ">= 0.4"
@@ -5274,12 +5259,12 @@
       }
     },
     "node_modules/next": {
-      "version": "14.2.23",
-      "resolved": "https://registry.npmjs.org/next/-/next-14.2.23.tgz",
-      "integrity": "sha512-mjN3fE6u/tynneLiEg56XnthzuYw+kD7mCujgVqioxyPqbmiotUCGJpIZGS/VaPg3ZDT1tvWxiVyRzeqJFm/kw==",
+      "version": "14.2.24",
+      "resolved": "https://registry.npmjs.org/next/-/next-14.2.24.tgz",
+      "integrity": "sha512-En8VEexSJ0Py2FfVnRRh8gtERwDRaJGNvsvad47ShkC2Yi8AXQPXEA2vKoDJlGFSj5WE5SyF21zNi4M5gyi+SQ==",
       "license": "MIT",
       "dependencies": {
-        "@next/env": "14.2.23",
+        "@next/env": "14.2.24",
         "@swc/helpers": "0.5.5",
         "busboy": "1.6.0",
         "caniuse-lite": "^1.0.30001579",
@@ -5294,15 +5279,15 @@
         "node": ">=18.17.0"
       },
       "optionalDependencies": {
-        "@next/swc-darwin-arm64": "14.2.23",
-        "@next/swc-darwin-x64": "14.2.23",
-        "@next/swc-linux-arm64-gnu": "14.2.23",
-        "@next/swc-linux-arm64-musl": "14.2.23",
-        "@next/swc-linux-x64-gnu": "14.2.23",
-        "@next/swc-linux-x64-musl": "14.2.23",
-        "@next/swc-win32-arm64-msvc": "14.2.23",
-        "@next/swc-win32-ia32-msvc": "14.2.23",
-        "@next/swc-win32-x64-msvc": "14.2.23"
+        "@next/swc-darwin-arm64": "14.2.24",
+        "@next/swc-darwin-x64": "14.2.24",
+        "@next/swc-linux-arm64-gnu": "14.2.24",
+        "@next/swc-linux-arm64-musl": "14.2.24",
+        "@next/swc-linux-x64-gnu": "14.2.24",
+        "@next/swc-linux-x64-musl": "14.2.24",
+        "@next/swc-win32-arm64-msvc": "14.2.24",
+        "@next/swc-win32-ia32-msvc": "14.2.24",
+        "@next/swc-win32-x64-msvc": "14.2.24"
       },
       "peerDependencies": {
         "@opentelemetry/api": "^1.1.0",
@@ -5452,9 +5437,9 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.13.4",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
-      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
+      "version": "1.13.3",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.3.tgz",
+      "integrity": "sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==",
       "license": "MIT",
       "engines": {
         "node": ">= 0.4"
@@ -5770,9 +5755,9 @@
       }
     },
     "node_modules/possible-typed-array-names": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",
-      "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
+      "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -6123,9 +6108,9 @@
       }
     },
     "node_modules/rc-notification": {
-      "version": "5.6.3",
-      "resolved": "https://registry.npmjs.org/rc-notification/-/rc-notification-5.6.3.tgz",
-      "integrity": "sha512-42szwnn8VYQoT6GnjO00i1iwqV9D1TTMvxObWsuLwgl0TsOokzhkYiufdtQBsJMFjJravS1hfDKVMHLKLcPE4g==",
+      "version": "5.6.2",
+      "resolved": "https://registry.npmjs.org/rc-notification/-/rc-notification-5.6.2.tgz",
+      "integrity": "sha512-Id4IYMoii3zzrG0lB0gD6dPgJx4Iu95Xu0BQrhHIbp7ZnAZbLqdqQ73aIWH0d0UFcElxwaKjnzNovTjo7kXz7g==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.10.1",
@@ -6158,9 +6143,9 @@
       }
     },
     "node_modules/rc-pagination": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/rc-pagination/-/rc-pagination-5.1.0.tgz",
-      "integrity": "sha512-8416Yip/+eclTFdHXLKTxZvn70duYVGTvUUWbckCCZoIl3jagqke3GLsFrMs0bsQBikiYpZLD9206Ej4SOdOXQ==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/rc-pagination/-/rc-pagination-5.0.0.tgz",
+      "integrity": "sha512-QjrPvbAQwps93iluvFM62AEYglGYhWW2q/nliQqmvkTi4PXP4HHoh00iC1Sa5LLVmtWQHmG73fBi2x6H6vFHRg==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.10.1",
@@ -6227,9 +6212,9 @@
       }
     },
     "node_modules/rc-rate": {
-      "version": "2.13.1",
-      "resolved": "https://registry.npmjs.org/rc-rate/-/rc-rate-2.13.1.tgz",
-      "integrity": "sha512-QUhQ9ivQ8Gy7mtMZPAjLbxBt5y9GRp65VcUyGUMF3N3fhiftivPHdpuDIaWIMOTEprAjZPC08bls1dQB+I1F2Q==",
+      "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/rc-rate/-/rc-rate-2.13.0.tgz",
+      "integrity": "sha512-oxvx1Q5k5wD30sjN5tqAyWTvJfLNNJn7Oq3IeS4HxWfAiC4BOXMITNAsw7u/fzdtO4MS8Ki8uRLOzcnEuoQiAw==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.10.1",
@@ -6371,9 +6356,9 @@
       }
     },
     "node_modules/rc-tabs": {
-      "version": "15.5.1",
-      "resolved": "https://registry.npmjs.org/rc-tabs/-/rc-tabs-15.5.1.tgz",
-      "integrity": "sha512-yiWivLAjEo5d1v2xlseB2dQocsOhkoVSfo1krS8v8r+02K+TBUjSjXIf7dgyVSxp6wRIPv5pMi5hanNUlQMgUA==",
+      "version": "15.5.0",
+      "resolved": "https://registry.npmjs.org/rc-tabs/-/rc-tabs-15.5.0.tgz",
+      "integrity": "sha512-NrDcTaUJLh9UuDdMBkjKTn97U9iXG44s9D03V5NHkhEDWO5/nC6PwC3RhkCWFMKB9hh+ryqgZ+TIr1b9Jd/hnQ==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.11.2",
@@ -6477,9 +6462,9 @@
       }
     },
     "node_modules/rc-util": {
-      "version": "5.44.4",
-      "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.44.4.tgz",
-      "integrity": "sha512-resueRJzmHG9Q6rI/DfK6Kdv9/Lfls05vzMs1Sk3M2P+3cJa+MakaZyWY8IPfehVuhPJFKrIY1IK4GqbiaiY5w==",
+      "version": "5.44.3",
+      "resolved": "https://registry.npmjs.org/rc-util/-/rc-util-5.44.3.tgz",
+      "integrity": "sha512-q6KCcOFk3rv/zD3MckhJteZxb0VjAIFuf622B7ElK4vfrZdAzs16XR5p3VTdy3+U5jfJU5ACz4QnhLSuAGe5dA==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.18.3",
@@ -6915,9 +6900,9 @@
       }
     },
     "node_modules/sass": {
-      "version": "1.84.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.84.0.tgz",
-      "integrity": "sha512-XDAbhEPJRxi7H0SxrnOpiXFQoUJHwkR2u3Zc4el+fK/Tt5Hpzw5kkQ59qVDfvdaUq6gCrEZIbySFBM2T9DNKHg==",
+      "version": "1.83.4",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.83.4.tgz",
+      "integrity": "sha512-B1bozCeNQiOgDcLd33e2Cs2U60wZwjUUXzh900ZyQF5qUasvMdDZYbQ566LJu7cqR+sAHlAfO6RMkaID5s6qpA==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
@@ -6960,9 +6945,9 @@
       "license": "MIT"
     },
     "node_modules/semver": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -7502,9 +7487,9 @@
       }
     },
     "node_modules/styled-components": {
-      "version": "6.1.15",
-      "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.1.15.tgz",
-      "integrity": "sha512-PpOTEztW87Ua2xbmLa7yssjNyUF9vE7wdldRfn1I2E6RTkqknkBYpj771OxM/xrvRGinLy2oysa7GOd7NcZZIA==",
+      "version": "6.1.14",
+      "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.1.14.tgz",
+      "integrity": "sha512-KtfwhU5jw7UoxdM0g6XU9VZQFV4do+KrM8idiVCH5h4v49W+3p3yMe0icYwJgZQZepa5DbH04Qv8P0/RdcLcgg==",
       "license": "MIT",
       "dependencies": {
         "@emotion/is-prop-valid": "1.2.2",
@@ -7512,7 +7497,7 @@
         "@types/stylis": "4.2.5",
         "css-to-react-native": "3.2.0",
         "csstype": "3.1.3",
-        "postcss": "8.4.49",
+        "postcss": "8.4.38",
         "shallowequal": "1.1.0",
         "stylis": "4.3.2",
         "tslib": "2.6.2"
@@ -7536,9 +7521,9 @@
       "license": "MIT"
     },
     "node_modules/styled-components/node_modules/postcss": {
-      "version": "8.4.49",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
-      "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
+      "version": "8.4.38",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",
+      "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
       "funding": [
         {
           "type": "opencollective",
@@ -7556,8 +7541,8 @@
       "license": "MIT",
       "dependencies": {
         "nanoid": "^3.3.7",
-        "picocolors": "^1.1.1",
-        "source-map-js": "^1.2.1"
+        "picocolors": "^1.0.0",
+        "source-map-js": "^1.2.0"
       },
       "engines": {
         "node": "^10 || ^12 || >=14"
@@ -7599,9 +7584,9 @@
       }
     },
     "node_modules/stylis": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.3.6.tgz",
-      "integrity": "sha512-yQ3rwFWRfwNUY7H5vpU0wfdkNSnvnJinhF9830Swlaxl03zsOjCfmX0ugac+3LtK0lYSgwL/KXc8oYL3mG4YFQ==",
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.3.5.tgz",
+      "integrity": "sha512-K7npNOKGRYuhAFFzkzMGfxFDpN6gDwf8hcMiE+uveTVbBgm93HrNP3ZDUpKqzZ4pG7TP6fmb+EMAQPjq9FqqvA==",
       "license": "MIT"
     },
     "node_modules/supports-color": {
@@ -7696,9 +7681,9 @@
       "license": "MIT"
     },
     "node_modules/ts-api-utils": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.0.1.tgz",
-      "integrity": "sha512-dnlgjFSVetynI8nzgJ+qF62efpglpWRk8isUEWZGWlJYySCTD6aKvbUDu+zbPeDakk3bg5H4XpitHukgfL1m9w==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.0.0.tgz",
+      "integrity": "sha512-xCt/TOAc+EOHS1XPnijD3/yzpH6qg2xppZO1YDqGoVsNXfQfzHpOdNuXwrwOU8u4ITXJyDCTyt8w5g1sZv9ynQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -7741,9 +7726,9 @@
       }
     },
     "node_modules/type-fest": {
-      "version": "4.34.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.34.1.tgz",
-      "integrity": "sha512-6kSc32kT0rbwxD6QL1CYe8IqdzN/J/ILMrNK+HMQCKH3insCDRY/3ITb0vcBss0a3t72fzh2YSzj8ko1HgwT3g==",
+      "version": "4.33.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.33.0.tgz",
+      "integrity": "sha512-s6zVrxuyKbbAsSAD5ZPTB77q4YIdRctkTbJ2/Dqlinwz+8ooH2gd+YA7VA6Pa93KML9GockVvoxjZ2vHP+mu8g==",
       "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=16"
diff --git a/src/actions/hooks/useSessionTracking.ts b/src/actions/hooks/useSessionTracking.ts
index 4f8018c..48e9918 100644
--- a/src/actions/hooks/useSessionTracking.ts
+++ b/src/actions/hooks/useSessionTracking.ts
@@ -23,20 +23,20 @@ export const useSessionTracking = (locale: string, sessionId: number) => {
 
     useEffect(() => {
         return () => {
-            window.clearInterval(timer.current);
+            window?.clearInterval(timer.current);
         }
     }, []);
 
     const start = () => {
-        window.clearInterval(timer.current);
+        window?.clearInterval(timer.current);
 
-        timer.current = window.setInterval(() => {
+        timer.current = window?.setInterval(() => {
             fetchData();
         }, DURATION);
     };
 
     const stop = () => {
-        window.clearInterval(timer.current);
+        window?.clearInterval(timer.current);
     };
 
     return {
diff --git a/src/app/[locale]/(main)/@directions/page.tsx b/src/app/[locale]/(main)/@directions/page.tsx
index 64d241c..eba3d08 100644
--- a/src/app/[locale]/(main)/@directions/page.tsx
+++ b/src/app/[locale]/(main)/@directions/page.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
-import { unstable_setRequestLocale } from 'next-intl/server';
+// import { unstable_setRequestLocale } from 'next-intl/server';
 
-export default function Directions({ params: { locale } }: { params: { locale: string } }) {
-    unstable_setRequestLocale(locale);
+export default function Directions() {
+    // unstable_setRequestLocale(locale);
 
     return (
         <div className="main-popular">
diff --git a/src/app/[locale]/(main)/@experts/page.tsx b/src/app/[locale]/(main)/@experts/page.tsx
index 824f6f3..8da315d 100644
--- a/src/app/[locale]/(main)/@experts/page.tsx
+++ b/src/app/[locale]/(main)/@experts/page.tsx
@@ -1,10 +1,10 @@
 import React from 'react';
-import { unstable_setRequestLocale } from 'next-intl/server';
+// import { unstable_setRequestLocale } from 'next-intl/server';
 import { useTranslations } from 'next-intl';
 import { Experts } from '../../../../components/Experts/Experts';
 
 export default function ExpertsPage({ params: { locale } }: { params: { locale: string } }) {
-    unstable_setRequestLocale(locale);
+    // unstable_setRequestLocale(locale);
     const t = useTranslations('Experts');
 
     return (
diff --git a/src/app/[locale]/(main)/@news/page.tsx b/src/app/[locale]/(main)/@news/page.tsx
index 014a183..aa92b37 100644
--- a/src/app/[locale]/(main)/@news/page.tsx
+++ b/src/app/[locale]/(main)/@news/page.tsx
@@ -1,12 +1,12 @@
 import React from 'react';
 // import { useTranslations } from 'next-intl';
 import Link from 'next/link';
-import { getTranslations, unstable_setRequestLocale } from 'next-intl/server';
+import { getTranslations } from 'next-intl/server';
 import { i18nText } from '../../../../i18nKeys';
 import { fetchBlogPosts } from '../../../../lib/contentful/blogPosts';
 
 export default async function News({params: {locale}}: { params: { locale: string } }) {
-    unstable_setRequestLocale(locale);
+    // unstable_setRequestLocale(locale);
     const t = await getTranslations('Main');
     const { data, total } = await fetchBlogPosts({preview: false, sticky: true})
 
diff --git a/src/app/[locale]/account/(account)/expert-profile/add-offer/page.tsx b/src/app/[locale]/account/(account)/expert-profile/add-offer/page.tsx
index 7ed015c..1eeda8f 100644
--- a/src/app/[locale]/account/(account)/expert-profile/add-offer/page.tsx
+++ b/src/app/[locale]/account/(account)/expert-profile/add-offer/page.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Link } from '../../../../../../navigation';
+import { Link } from '../../../../../../i18n/routing';
 import { CustomSelect } from '../../../../../../components/view/CustomSelect';
 
 export default function AddOffer() {
diff --git a/src/app/[locale]/account/(account)/expert-profile/new-topic/page.tsx b/src/app/[locale]/account/(account)/expert-profile/new-topic/page.tsx
index f8b6774..624f34c 100644
--- a/src/app/[locale]/account/(account)/expert-profile/new-topic/page.tsx
+++ b/src/app/[locale]/account/(account)/expert-profile/new-topic/page.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Link } from '../../../../../../navigation';
+import { Link } from '../../../../../../i18n/routing';
 import { CustomSelect } from '../../../../../../components/view/CustomSelect';
 
 export default function NewTopic() {
diff --git a/src/app/[locale]/account/(account)/information/page.tsx b/src/app/[locale]/account/(account)/information/page.tsx
index 3475709..b47bd54 100644
--- a/src/app/[locale]/account/(account)/information/page.tsx
+++ b/src/app/[locale]/account/(account)/information/page.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import type { Metadata } from 'next';
-import { unstable_setRequestLocale } from 'next-intl/server';
+// import { unstable_setRequestLocale } from 'next-intl/server';
 import { useTranslations } from 'next-intl';
 import { i18nText } from '../../../../../i18nKeys';
 
@@ -10,7 +10,7 @@ export const metadata: Metadata = {
 };
 
 export default function Information({ params: { locale } }: { params: { locale: string } }) {
-    unstable_setRequestLocale(locale);
+    // unstable_setRequestLocale(locale);
     const t = useTranslations('Account.LegalInformation');
 
     return (
diff --git a/src/app/[locale]/account/(account)/messages/[textId]/page.tsx b/src/app/[locale]/account/(account)/messages/[textId]/page.tsx
index 095e3b8..c69a307 100644
--- a/src/app/[locale]/account/(account)/messages/[textId]/page.tsx
+++ b/src/app/[locale]/account/(account)/messages/[textId]/page.tsx
@@ -1,6 +1,6 @@
 'use client'
 import React from 'react';
-import { Link } from '../../../../../../navigation';
+import { Link } from '../../../../../../i18n/routing';
 import { i18nText } from '../../../../../../i18nKeys';
 import {ChatMessages} from "../../../../../../components/Chat/ChatMessages";
 /*
diff --git a/src/app/[locale]/account/(account)/messages/page.tsx b/src/app/[locale]/account/(account)/messages/page.tsx
index b320670..1d97f26 100644
--- a/src/app/[locale]/account/(account)/messages/page.tsx
+++ b/src/app/[locale]/account/(account)/messages/page.tsx
@@ -13,7 +13,7 @@ export default function  Messages({ params: { locale } }: { params: { locale: st
             <Suspense>
                 <CustomInput placeholder={i18nText('name', locale)} />
             </Suspense>
-            <ChatList  locale={locale}/>
+            <ChatList locale={locale}/>
         </>
     );
 };
diff --git a/src/app/[locale]/account/(account)/notifications/page.tsx b/src/app/[locale]/account/(account)/notifications/page.tsx
index 9c9a1ef..3a45628 100644
--- a/src/app/[locale]/account/(account)/notifications/page.tsx
+++ b/src/app/[locale]/account/(account)/notifications/page.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import type { Metadata } from 'next';
-import { unstable_setRequestLocale } from 'next-intl/server';
+// import { unstable_setRequestLocale } from 'next-intl/server';
 import dayjs from 'dayjs';
 import 'dayjs/locale/ru';
 import 'dayjs/locale/en';
@@ -16,7 +16,7 @@ export const metadata: Metadata = {
 };
 
 export default function Notifications({ params: { locale } }: { params: { locale: string } }) {
-    unstable_setRequestLocale(locale);
+    // unstable_setRequestLocale(locale);
     const date = dayjs('2022-05-22').locale(locale);
 
     return (
diff --git a/src/app/[locale]/account/(account)/settings/change-password/page.tsx b/src/app/[locale]/account/(account)/settings/change-password/page.tsx
index fd52e7f..7eb4969 100644
--- a/src/app/[locale]/account/(account)/settings/change-password/page.tsx
+++ b/src/app/[locale]/account/(account)/settings/change-password/page.tsx
@@ -1,10 +1,10 @@
 import React from 'react';
-import { unstable_setRequestLocale } from 'next-intl/server';
-import { Link } from '../../../../../../navigation';
+// import { unstable_setRequestLocale } from 'next-intl/server';
+import { Link } from '../../../../../../i18n/routing';
 import { i18nText } from '../../../../../../i18nKeys/';
 
 export default function ChangePassword({ params: { locale } }: { params: { locale: string } }) {
-    unstable_setRequestLocale(locale);
+    // unstable_setRequestLocale(locale);
 
     return (
         <>
diff --git a/src/app/[locale]/account/(account)/settings/page.tsx b/src/app/[locale]/account/(account)/settings/page.tsx
index 984d596..13ed835 100644
--- a/src/app/[locale]/account/(account)/settings/page.tsx
+++ b/src/app/[locale]/account/(account)/settings/page.tsx
@@ -1,10 +1,10 @@
 import React, { Suspense } from 'react';
-import { unstable_setRequestLocale } from 'next-intl/server';
+// import { unstable_setRequestLocale } from 'next-intl/server';
 import { ProfileSettings } from '../../../../../components/Account';
 import { i18nText } from '../../../../../i18nKeys';
 
 export default function Settings({ params: { locale } }: { params: { locale: string } }) {
-    unstable_setRequestLocale(locale);
+    // unstable_setRequestLocale(locale);
 
     return (
         <>
diff --git a/src/app/[locale]/account/(account)/support/page.tsx b/src/app/[locale]/account/(account)/support/page.tsx
index 30c71db..6e554c8 100644
--- a/src/app/[locale]/account/(account)/support/page.tsx
+++ b/src/app/[locale]/account/(account)/support/page.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { unstable_setRequestLocale } from 'next-intl/server';
+// import { unstable_setRequestLocale } from 'next-intl/server';
 import type { Metadata } from 'next';
 import { i18nText } from '../../../../../i18nKeys';
 
@@ -9,7 +9,7 @@ export const metadata: Metadata = {
 };
 
 export default function Support({ params: { locale } }: { params: { locale: string } }) {
-    unstable_setRequestLocale(locale);
+    // unstable_setRequestLocale(locale);
 
     return (
         <>
diff --git a/src/app/[locale]/account/(simple)/rooms/[...slug]/page.tsx b/src/app/[locale]/account/(simple)/rooms/[...slug]/page.tsx
index b6f024c..b278340 100644
--- a/src/app/[locale]/account/(simple)/rooms/[...slug]/page.tsx
+++ b/src/app/[locale]/account/(simple)/rooms/[...slug]/page.tsx
@@ -1,5 +1,5 @@
 import React, { Suspense } from 'react';
-import { unstable_setRequestLocale } from 'next-intl/server';
+// import { unstable_setRequestLocale } from 'next-intl/server';
 import { notFound } from 'next/navigation';
 import { AccountMenu, RoomDetails, RoomsTabs } from '../../../../../../components/Account';
 import { RoomsType } from '../../../../../../types/rooms';
@@ -13,7 +13,7 @@ export async function generateStaticParams({
 }
 
 export default function RoomsDetailItem({ params: { locale, slug } }: { params: { locale: string, slug?: string[] } }) {
-    unstable_setRequestLocale(locale);
+    // unstable_setRequestLocale(locale);
     const roomType: string = slug?.length > 0 && slug[0] || '';
     const roomId: number | null = slug?.length > 1 && Number(slug[1]) || null;
 
diff --git a/src/app/[locale]/account/(simple)/sessions/[...slug]/page.tsx b/src/app/[locale]/account/(simple)/sessions/[...slug]/page.tsx
index 59339bf..0e84fca 100644
--- a/src/app/[locale]/account/(simple)/sessions/[...slug]/page.tsx
+++ b/src/app/[locale]/account/(simple)/sessions/[...slug]/page.tsx
@@ -1,5 +1,5 @@
 import React, { Suspense } from 'react';
-import { unstable_setRequestLocale } from 'next-intl/server';
+// import { unstable_setRequestLocale } from 'next-intl/server';
 import { notFound } from 'next/navigation';
 import { AccountMenu, SessionDetails, SessionsTabs } from '../../../../../../components/Account';
 import { SessionType } from '../../../../../../types/sessions';
@@ -13,7 +13,7 @@ export async function generateStaticParams({
 }
 
 export default function SessionDetailItem({ params: { locale, slug } }: { params: { locale: string, slug?: string[] } }) {
-    unstable_setRequestLocale(locale);
+    // unstable_setRequestLocale(locale);
     const sessionType: string = slug?.length > 0 && slug[0] || '';
     const sessionId: number | null = slug?.length > 1 && Number(slug[1]) || null;
 
diff --git a/src/app/[locale]/bb-client/page.tsx b/src/app/[locale]/bb-client/page.tsx
index 1afeea7..94ef005 100644
--- a/src/app/[locale]/bb-client/page.tsx
+++ b/src/app/[locale]/bb-client/page.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import type { Metadata } from 'next';
-import { unstable_setRequestLocale } from 'next-intl/server';
+// import { unstable_setRequestLocale } from 'next-intl/server';
 import { useTranslations } from 'next-intl';
 import { GeneralTopSection } from '../../../components/Page';
 
@@ -9,8 +9,8 @@ export const metadata: Metadata = {
     description: 'Bbuddy desc Take the lead with BB'
 };
 
-export default function BbClientPage({ params: { locale } }: { params: { locale: string } }) {
-    unstable_setRequestLocale(locale);
+export default function BbClientPage() {
+    // unstable_setRequestLocale(locale);
     const t = useTranslations('BbClient');
 
     return (
diff --git a/src/app/[locale]/bb-expert/page.tsx b/src/app/[locale]/bb-expert/page.tsx
index 3cdf5af..0114b1f 100644
--- a/src/app/[locale]/bb-expert/page.tsx
+++ b/src/app/[locale]/bb-expert/page.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import type { Metadata } from 'next';
-import { unstable_setRequestLocale } from 'next-intl/server';
+// import { unstable_setRequestLocale } from 'next-intl/server';
 import { useTranslations } from 'next-intl';
 import { GeneralTopSection } from '../../../components/Page';
 import { ScreenCarousel } from '../../../components/Page/ScreenCarousel';
@@ -10,8 +10,8 @@ export const metadata: Metadata = {
     description: 'Bbuddy desc Become a BB expert'
 };
 
-export default function BbExpertPage({ params: { locale } }: { params: { locale: string } }) {
-    unstable_setRequestLocale(locale);
+export default function BbExpertPage() {
+    // unstable_setRequestLocale(locale);
     const t = useTranslations('BbExpert');
 
     return (
diff --git a/src/app/[locale]/blog/category/[slug]/page.tsx b/src/app/[locale]/blog/category/[slug]/page.tsx
index 2c897ed..54b7b3f 100644
--- a/src/app/[locale]/blog/category/[slug]/page.tsx
+++ b/src/app/[locale]/blog/category/[slug]/page.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import type { Metadata } from 'next';
 import { draftMode } from 'next/headers'
-import {unstable_setRequestLocale} from "next-intl/server";
+// import {unstable_setRequestLocale} from "next-intl/server";
 import Link from "next/link";
 import {fetchBlogPosts} from "../../../../../lib/contentful/blogPosts";
 import {fetchBlogPostCategories} from "../../../../../lib/contentful/blogPostsCategories";
@@ -20,9 +20,9 @@ interface BlogPostPageProps {
     params: BlogPostPageParams
 }
 
-export default async function Blog({params, searchParams}: { params: BlogPostPageParams, searhParams?: {page: number}  }) {
-    unstable_setRequestLocale(params.locale);
-    const page = searchParams.page || undefined
+export default async function Blog({params, searchParams}: { params: BlogPostPageParams, searchParams?: {page: number}  }) {
+    // unstable_setRequestLocale(params.locale);
+    const page = searchParams?.page || undefined
     return (
         <BlogPosts basePath={'/'+params.locale+'/blog/'} locale={params.locale} currentCat={params.slug} page={page}/>
     );
diff --git a/src/app/[locale]/blog/page.tsx b/src/app/[locale]/blog/page.tsx
index 7569741..ef3de53 100644
--- a/src/app/[locale]/blog/page.tsx
+++ b/src/app/[locale]/blog/page.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import type { Metadata } from 'next';
 import * as Util from "node:util";
 import {fetchBlogPosts} from "../../../lib/contentful/blogPosts";
-import {unstable_setRequestLocale} from "next-intl/server";
+// import {unstable_setRequestLocale} from "next-intl/server";
 import Link from "next/link";
 import {fetchBlogPostCategories} from "../../../lib/contentful/blogPostsCategories";
 import {CustomPagination} from "../../../components/view/CustomPagination";
@@ -24,10 +24,10 @@ export async function generateStaticParams(): Promise<BlogPostPageParams[]> {
 }
 
 
-export default async function Blog({ params: { locale }, searchParams }: { params: { locale: string }, searhParams?: {page: number} }) {
-    unstable_setRequestLocale(locale);
+export default async function Blog({ params: { locale }, searchParams }: { params: { locale: string }, searchParams?: {page: number} }) {
+    // unstable_setRequestLocale(locale);
     const pageSize = DEFAULT_PAGE_SIZE
-    const page = searchParams.page || undefined
+    const page = searchParams?.page || undefined
     // BlogPosts('/'+locale+'/blog/', locale, pageSize)
     return (
 
@@ -36,7 +36,6 @@ export default async function Blog({ params: { locale }, searchParams }: { param
             locale={locale}
             pageSize={pageSize}
             page={page}
-        >
-        </BlogPosts>
+        />
     );
 }
diff --git a/src/app/[locale]/experts/[expertId]/page.tsx b/src/app/[locale]/experts/[expertId]/page.tsx
index 40058c8..00a4069 100644
--- a/src/app/[locale]/experts/[expertId]/page.tsx
+++ b/src/app/[locale]/experts/[expertId]/page.tsx
@@ -1,6 +1,6 @@
 import React, { Suspense } from 'react';
 import type { Metadata } from 'next';
-import { unstable_setRequestLocale } from 'next-intl/server';
+// import { unstable_setRequestLocale } from 'next-intl/server';
 import { notFound } from 'next/navigation';
 import { getExpertById, getExpertsList } from '../../../../actions/experts';
 import {
@@ -20,7 +20,7 @@ export const metadata: Metadata = {
 export async function generateStaticParams({
     params: { locale },
 }: { params: { locale: string } }) {
-    unstable_setRequestLocale(locale);
+    // unstable_setRequestLocale(locale);
     const result: { locale: string, expertId: string }[] = [];
     const experts = await getExpertsList(locale, { themesTagIds: [] });
 
diff --git a/src/app/[locale]/experts/page.tsx b/src/app/[locale]/experts/page.tsx
index 5adf33c..9b9edc9 100644
--- a/src/app/[locale]/experts/page.tsx
+++ b/src/app/[locale]/experts/page.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import type { Metadata } from 'next';
-import { unstable_setRequestLocale } from 'next-intl/server';
+// import { unstable_setRequestLocale } from 'next-intl/server';
 import { useTranslations } from 'next-intl';
 import { Experts } from '../../../components/Experts/Experts';
 
@@ -10,7 +10,7 @@ export const metadata: Metadata = {
 };
 
 export default function ExpertsPage({ params: { locale } }: { params: { locale: string } }) {
-    unstable_setRequestLocale(locale);
+    // unstable_setRequestLocale(locale);
     const t = useTranslations('Experts');
 
     return (
diff --git a/src/app/[locale]/layout.tsx b/src/app/[locale]/layout.tsx
index c2949a6..d7fa8d8 100644
--- a/src/app/[locale]/layout.tsx
+++ b/src/app/[locale]/layout.tsx
@@ -1,6 +1,7 @@
 import React, { ReactNode, Suspense } from 'react';
 import { Metadata } from 'next';
-import { unstable_setRequestLocale } from 'next-intl/server';
+import { NextIntlClientProvider } from 'next-intl';
+import { getMessages } from 'next-intl/server';
 import { notFound } from 'next/navigation';
 import { ConfigProvider } from 'antd';
 import { AntdRegistry } from '@ant-design/nextjs-registry';
@@ -8,6 +9,7 @@ import { GoogleOAuthProvider } from '@react-oauth/google';
 import theme from '../../constants/theme';
 import { ALLOWED_LOCALES } from '../../constants/locale';
 import { Header, Footer, AppConfig } from '../../components/Page';
+import { routing } from '../../i18n/routing';
 
 type LayoutProps = {
     children: ReactNode;
@@ -22,27 +24,31 @@ export const metadata: Metadata = {
     title: 'Bbuddy'
 };
 
-export default function LocaleLayout({ children, params: { locale } }: LayoutProps) {
-    if (!ALLOWED_LOCALES.includes(locale as any)) notFound();
+export default async function LocaleLayout({ children, params: { locale } }: LayoutProps) {
+    if (!routing.locales.includes(locale as any)) {
+        notFound();
+    }
 
-    unstable_setRequestLocale(locale);
+    const messages = await getMessages();
 
     return (
-        <AntdRegistry>
-            <GoogleOAuthProvider clientId={process.env.NEXT_PUBLIC_GOOGLE_CLIENT_ID || ''}>
-                <ConfigProvider theme={theme}>
-                <div className="b-wrapper">
-                    <Suspense fallback={null}>
-                        <AppConfig />
-                    </Suspense>
-                    <div className="b-content">
-                        <Header locale={locale} />
-                        {children}
-                    </div>
-                    <Footer locale={locale} />
-                </div>
-                </ConfigProvider>
-            </GoogleOAuthProvider>    
-        </AntdRegistry>
+        <NextIntlClientProvider messages={messages}>
+            <AntdRegistry>
+                <GoogleOAuthProvider clientId={process.env.NEXT_PUBLIC_GOOGLE_CLIENT_ID || ''}>
+                    <ConfigProvider theme={theme}>
+                        <div className="b-wrapper">
+                            <Suspense fallback={null}>
+                                <AppConfig />
+                            </Suspense>
+                            <div className="b-content">
+                                <Header locale={locale} />
+                                {children}
+                            </div>
+                            <Footer locale={locale} />
+                        </div>
+                    </ConfigProvider>
+                </GoogleOAuthProvider>
+            </AntdRegistry>
+        </NextIntlClientProvider>
     );
 }
diff --git a/src/app/[locale]/temp/login/page.tsx b/src/app/[locale]/temp/login/page.tsx
index 33a30d0..a3575bb 100644
--- a/src/app/[locale]/temp/login/page.tsx
+++ b/src/app/[locale]/temp/login/page.tsx
@@ -8,7 +8,7 @@ import { getLoginByApple } from '../../../../actions/auth';
 import { getUserData } from '../../../../actions/profile';
 import { AUTH_TOKEN_KEY, AUTH_USER } from '../../../../constants/common';
 import { useLocalStorage } from '../../../../hooks/useLocalStorage';
-import { useRouter } from '../../../../navigation';
+import { useRouter } from '../../../../i18n/routing';
 
 export default function AppleLoginPage({ params: { locale } }: { params: { locale: string } })  {
     const params = useSearchParams();
diff --git a/src/app/[locale]/temp/register/page.tsx b/src/app/[locale]/temp/register/page.tsx
index c4df2c9..6c27aa9 100644
--- a/src/app/[locale]/temp/register/page.tsx
+++ b/src/app/[locale]/temp/register/page.tsx
@@ -8,7 +8,7 @@ import { getRegisterByApple } from '../../../../actions/auth';
 import { getUserData } from '../../../../actions/profile';
 import { AUTH_TOKEN_KEY, AUTH_USER } from '../../../../constants/common';
 import { useLocalStorage } from "../../../../hooks/useLocalStorage";
-import { useRouter } from '../../../../navigation';
+import { useRouter } from '../../../../i18n/routing';
 
 export default function AppleRegisterPage({ params: { locale } }: { params: { locale: string } })  {
     const params = useSearchParams();
diff --git a/src/components/Account/AccountMenu.tsx b/src/components/Account/AccountMenu.tsx
index a084c45..7c3048b 100644
--- a/src/components/Account/AccountMenu.tsx
+++ b/src/components/Account/AccountMenu.tsx
@@ -1,14 +1,14 @@
 'use client';
 
+import { useEffect, useState } from 'react';
 import { Button } from 'antd';
 import { useSelectedLayoutSegment, usePathname } from 'next/navigation';
-import { Link } from '../../navigation';
+import { Link } from '../../i18n/routing';
 import { AUTH_TOKEN_KEY, AUTH_USER } from '../../constants/common';
 import {deleteStorageKey, useLocalStorage} from '../../hooks/useLocalStorage';
 import { i18nText } from '../../i18nKeys';
 import { getMenuConfig } from '../../utils/account';
-import {useEffect, useState} from "react";
-import {getChatList} from "../../actions/chat/groups";
+import { getChatList } from '../../actions/chat/groups';
 
 export const AccountMenu = ({ locale }: { locale: string }) => {
     const selectedLayoutSegment = useSelectedLayoutSegment();
diff --git a/src/components/Account/ProfileSettings.tsx b/src/components/Account/ProfileSettings.tsx
index 2194da7..68b4704 100644
--- a/src/components/Account/ProfileSettings.tsx
+++ b/src/components/Account/ProfileSettings.tsx
@@ -5,7 +5,7 @@ import { Form, message, Upload } from 'antd';
 import type { UploadFile } from 'antd';
 import ImgCrop from 'antd-img-crop';
 import { CameraOutlined, DeleteOutlined } from '@ant-design/icons';
-import { useRouter } from '../../navigation';
+import { useRouter } from '../../i18n/routing';
 import { i18nText } from '../../i18nKeys';
 import { ProfileRequest } from '../../types/profile';
 import { validateImage } from '../../utils/account';
diff --git a/src/components/Account/rooms/CreateRoom.tsx b/src/components/Account/rooms/CreateRoom.tsx
index 971305e..f30ccf4 100644
--- a/src/components/Account/rooms/CreateRoom.tsx
+++ b/src/components/Account/rooms/CreateRoom.tsx
@@ -5,7 +5,7 @@ import { EditRoomForm } from './EditRoomForm';
 import debounce from 'lodash/debounce';
 import { createRoom } from '../../../actions/rooms';
 import { Loader } from '../../view/Loader';
-import { useRouter } from '../../../navigation';
+import { useRouter } from '../../../i18n/routing';
 import { RoomsType } from '../../../types/rooms';
 
 
diff --git a/src/components/Account/rooms/RoomDetailsContent.tsx b/src/components/Account/rooms/RoomDetailsContent.tsx
index ade0e89..9fe70ca 100644
--- a/src/components/Account/rooms/RoomDetailsContent.tsx
+++ b/src/components/Account/rooms/RoomDetailsContent.tsx
@@ -5,7 +5,7 @@ import { Button, notification, Tag } from 'antd';
 import { DeleteOutlined, LeftOutlined } from '@ant-design/icons';
 import dayjs from 'dayjs';
 import Image from 'next/image';
-import { useRouter } from '../../../navigation';
+import { useRouter } from '../../../i18n/routing';
 import { Report, Room, RoomsType } from '../../../types/rooms';
 import { i18nText } from '../../../i18nKeys';
 import { LinkButton } from '../../view/LinkButton';
diff --git a/src/components/Account/rooms/RoomsTabs.tsx b/src/components/Account/rooms/RoomsTabs.tsx
index 8f4dd7d..0cfced7 100644
--- a/src/components/Account/rooms/RoomsTabs.tsx
+++ b/src/components/Account/rooms/RoomsTabs.tsx
@@ -14,7 +14,7 @@ import { getRecentRooms, getUpcomingRooms } from '../../../actions/rooms';
 import { Loader } from '../../view/Loader';
 import { useLocalStorage } from '../../../hooks/useLocalStorage';
 import { AUTH_TOKEN_KEY } from '../../../constants/common';
-import { usePathname, useRouter } from '../../../navigation';
+import { usePathname, useRouter } from '../../../i18n/routing';
 import { i18nText } from '../../../i18nKeys';
 import { CreateRoom } from './CreateRoom';
 
diff --git a/src/components/Account/sessions/SessionDetailsContent.tsx b/src/components/Account/sessions/SessionDetailsContent.tsx
index 212b15c..9163a67 100644
--- a/src/components/Account/sessions/SessionDetailsContent.tsx
+++ b/src/components/Account/sessions/SessionDetailsContent.tsx
@@ -5,7 +5,7 @@ import { Button, Empty, notification, Tag } from 'antd';
 import { LeftOutlined, PlusOutlined, RightOutlined } from '@ant-design/icons';
 import Image from 'next/image';
 import dayjs from 'dayjs';
-import { Link, useRouter } from '../../../navigation';
+import { Link, useRouter } from '../../../i18n/routing';
 import { i18nText } from '../../../i18nKeys';
 import { getDuration, getPrice } from '../../../utils/expert';
 import { PublicUser, Session, SessionState, SessionType } from '../../../types/sessions';
diff --git a/src/components/Account/sessions/SessionsTabs.tsx b/src/components/Account/sessions/SessionsTabs.tsx
index 73fbd84..305a1a7 100644
--- a/src/components/Account/sessions/SessionsTabs.tsx
+++ b/src/components/Account/sessions/SessionsTabs.tsx
@@ -14,7 +14,7 @@ import { useLocalStorage } from '../../../hooks/useLocalStorage';
 import { AUTH_TOKEN_KEY, AUTH_USER } from '../../../constants/common';
 import { getRecentSessions, getRequestedSessions, getUpcomingSessions } from '../../../actions/sessions';
 import { Session, Sessions, SessionType } from '../../../types/sessions';
-import { useRouter, usePathname } from '../../../navigation';
+import { useRouter, usePathname } from '../../../i18n/routing';
 import { i18nText } from '../../../i18nKeys';
 
 type SessionsTabsProps = {
diff --git a/src/components/BlogPosts/BlogPosts.tsx b/src/components/BlogPosts/BlogPosts.tsx
index 0ec761c..297169e 100644
--- a/src/components/BlogPosts/BlogPosts.tsx
+++ b/src/components/BlogPosts/BlogPosts.tsx
@@ -10,7 +10,7 @@ type PostsProps = {
     basePath: string;
     locale: string;
     pageSize?: number;
-    currentCat: string;
+    currentCat?: string;
     page?: number
 };
 
diff --git a/src/components/Chat/ChatList.tsx b/src/components/Chat/ChatList.tsx
index 782edb5..b24320a 100644
--- a/src/components/Chat/ChatList.tsx
+++ b/src/components/Chat/ChatList.tsx
@@ -3,7 +3,7 @@ import React, {useEffect, useState} from 'react';
 import {AUTH_TOKEN_KEY} from '../../constants/common';
 import {getChatList, getChatMessages} from "../../actions/chat/groups";
 import {useLocalStorage} from "../../hooks/useLocalStorage";
-import {Link} from "../../navigation";
+import { Link } from "../../i18n/routing";
 import dayjs from "dayjs";
 import relativeTime from "dayjs/plugin/relativeTime";
 import {message} from "antd";
diff --git a/src/components/Chat/ChatMessages.tsx b/src/components/Chat/ChatMessages.tsx
index 2333512..0e860ce 100644
--- a/src/components/Chat/ChatMessages.tsx
+++ b/src/components/Chat/ChatMessages.tsx
@@ -20,7 +20,7 @@ type CompProps = {
 
 export const ChatMessages = ({  locale, groupId }: CompProps) => {
     const [jwt] = useLocalStorage(AUTH_TOKEN_KEY, '');
-    const { newMessage, joinChat, readMessages, addListener } = SignalrConnection({ jwt });
+    const { newMessage, joinChat, readMessages, addListener } = SignalrConnection({ jwt }) || {};
     //const messages = await getChatMessages(locale, jwt, groupId)
     const [loading, setLoading] = useState<boolean>(false);
     const [text, setText] = useState('');
@@ -60,7 +60,7 @@ export const ChatMessages = ({  locale, groupId }: CompProps) => {
 
 
     const onConnected = (flag: boolean) =>{
-        if (flag) {
+        if (flag && joinChat) {
             joinChat(groupId)
             readUreaded()
         }
@@ -73,7 +73,7 @@ export const ChatMessages = ({  locale, groupId }: CompProps) => {
                 msgs.push(message.id)
             }
         })
-        readMessages(msgs)
+        readMessages && readMessages(msgs);
     }
 
     const onReceiveMessage = (payload: any) => {
@@ -103,7 +103,7 @@ export const ChatMessages = ({  locale, groupId }: CompProps) => {
         } else {
             setMessages([msg, ..._messages]);
         }
-        readMessages([msg.id])
+        readMessages && readMessages([msg.id]);
 
     }
 
@@ -120,16 +120,18 @@ export const ChatMessages = ({  locale, groupId }: CompProps) => {
     }
 
     useEffect(() => {
-        addListener('onConnected', onConnected)
-        addListener('ReceiveMessage', onReceiveMessage)
-        addListener('MessageWasRead', onOpponentRead)
+        if (addListener) {
+            addListener('onConnected', onConnected);
+            addListener('ReceiveMessage', onReceiveMessage);
+            addListener('MessageWasRead', onOpponentRead);
+        }
     }, [messages, me, setMessages]);
 
 
 
 
     const handleSendMessages = () => {
-        newMessage({
+        newMessage && newMessage({
             GroupId: groupId.toString(),
             CreatorId: me.id,
             Content: text
diff --git a/src/components/Experts/AdditionalFilter.tsx b/src/components/Experts/AdditionalFilter.tsx
index 383c12d..7a5f696 100644
--- a/src/components/Experts/AdditionalFilter.tsx
+++ b/src/components/Experts/AdditionalFilter.tsx
@@ -3,7 +3,7 @@
 import React, { useCallback, useEffect, useState } from 'react';
 import { useSearchParams } from 'next/navigation';
 import debounce from 'lodash/debounce';
-import { useRouter } from '../../navigation';
+import { useRouter } from '../../i18n/routing';
 import { AdditionalFilter } from '../../types/experts';
 import { getObjectByFilter, getObjectByAdditionalFilter, getSearchParamsString } from '../../utils/filter';
 import { CustomInput } from '../view/CustomInput';
diff --git a/src/components/Experts/ExpertDetails.tsx b/src/components/Experts/ExpertDetails.tsx
index f1dade3..0f107ab 100644
--- a/src/components/Experts/ExpertDetails.tsx
+++ b/src/components/Experts/ExpertDetails.tsx
@@ -16,7 +16,7 @@ import { AUTH_TOKEN_KEY, SESSION_DATA } from '../../constants/common';
 import { ScheduleModal } from '../Modals/ScheduleModal';
 import { ScheduleModalResult } from '../Modals/ScheduleModalResult';
 import SignalrConnection from '../../lib/signalr-connection';
-import { useRouter } from '../../navigation';
+import { useRouter } from '../../i18n/routing';
 import { useLocalStorage } from '../../hooks/useLocalStorage';
 
 type ExpertDetailsProps = {
@@ -38,7 +38,7 @@ export const ExpertCard: FC<ExpertDetailsProps> = ({ expert, locale, expertId })
     const isRus = locale === Locale.ru;
     const { publicCoachDetails: { tags = [], sessionCost = 0, sessionDuration = 0, coachLanguages = [] , id, botUserId} } = expert || {};
     const [jwt] = useLocalStorage(AUTH_TOKEN_KEY, '');
-    const { joinChatPerson, closeConnection } = SignalrConnection({ jwt });
+    const { joinChatPerson, closeConnection } = SignalrConnection({ jwt }) || {};
     const router = useRouter();
 
 
@@ -46,13 +46,13 @@ export const ExpertCard: FC<ExpertDetailsProps> = ({ expert, locale, expertId })
         document?.addEventListener('show_pay_form', handleShowPayForm);
 
         return () => {
-            closeConnection();
+            if (closeConnection) closeConnection();
             document?.removeEventListener('show_pay_form', handleShowPayForm);
         }
     }, []);
 
     const handleJoinChat = (id?: number) => {
-        if (id) {
+        if (id && joinChatPerson) {
             joinChatPerson(id).then((res: any) => {
                 router.push(`/account/messages/${res.id}` as string);
             })
diff --git a/src/components/Experts/ExpertsList.tsx b/src/components/Experts/ExpertsList.tsx
index 28db1e5..3c2bde3 100644
--- a/src/components/Experts/ExpertsList.tsx
+++ b/src/components/Experts/ExpertsList.tsx
@@ -6,7 +6,7 @@ import { List, Tag } from 'antd';
 import { RightOutlined } from '@ant-design/icons';
 import isEqual from 'lodash/isEqual';
 import Image from 'next/image';
-import { Link, useRouter } from '../../navigation';
+import { Link, useRouter } from '../../i18n/routing';
 import { ExpertsData, Filter, GeneralFilter } from '../../types/experts';
 import { getObjectByFilter, getObjectByAdditionalFilter, getSearchParamsString } from '../../utils/filter';
 import { getDuration, getPrice } from '../../utils/expert';
diff --git a/src/components/Experts/Filter.tsx b/src/components/Experts/Filter.tsx
index debb1d1..68a931b 100644
--- a/src/components/Experts/Filter.tsx
+++ b/src/components/Experts/Filter.tsx
@@ -4,7 +4,7 @@ import React, { useCallback, useEffect, useState } from 'react';
 import { Button, Collapse, List } from 'antd';
 import type { CollapseProps } from 'antd';
 import { useSearchParams } from 'next/navigation';
-import { useRouter } from '../../navigation';
+import { useRouter } from '../../i18n/routing';
 import { Filter } from '../../types/experts';
 import { Languages, SearchData, Tag } from '../../types/tags';
 import { getObjectByFilter, getObjectByAdditionalFilter, getSearchParamsString } from '../../utils/filter';
diff --git a/src/components/Modals/AuthModal.tsx b/src/components/Modals/AuthModal.tsx
index a9c24da..1cac979 100644
--- a/src/components/Modals/AuthModal.tsx
+++ b/src/components/Modals/AuthModal.tsx
@@ -7,7 +7,7 @@ import { Modal, Form, notification } from 'antd';
 import { CloseOutlined } from '@ant-design/icons';
 import { RegisterContent, ResetContent, FinishContent, EnterContent } from './authModalContent';
 import { i18nText } from '../../i18nKeys';
-import { useRouter } from '../../navigation';
+import { useRouter } from '../../i18n/routing';
 import { AUTH_USER} from '../../constants/common';
 import { getRegisterByApple, getLoginByApple } from '../../actions/auth';
 import { getUserData } from '../../actions/profile';
diff --git a/src/components/Modals/ScheduleModalResult.tsx b/src/components/Modals/ScheduleModalResult.tsx
index 58d97c0..e2da115 100644
--- a/src/components/Modals/ScheduleModalResult.tsx
+++ b/src/components/Modals/ScheduleModalResult.tsx
@@ -3,7 +3,8 @@
 import React, { useEffect, useState } from 'react';
 import { Modal, Result } from 'antd';
 import { CloseOutlined } from '@ant-design/icons';
-import { useSearchParams, useRouter } from 'next/navigation';
+import { useSearchParams } from 'next/navigation';
+import { useRouter } from '../../i18n/routing';
 import { Stripe } from 'stripe';
 import { getStripePaymentStatus } from '../../actions/stripe';
 import { sessionPaymentConfirm } from '../../actions/sessions';
diff --git a/src/components/Page/Footer/index.tsx b/src/components/Page/Footer/index.tsx
index cd1c99a..b118363 100644
--- a/src/components/Page/Footer/index.tsx
+++ b/src/components/Page/Footer/index.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import Link from 'next/link';
 import { useTranslations } from 'next-intl';
-import { Link as IntlLink } from '../../../navigation';
+import { Link as IntlLink } from '../../../i18n/routing';
 import { i18nText } from '../../../i18nKeys';
 
 export const Footer = ({ locale }: { locale: string }) => {
diff --git a/src/components/Page/Header/HeaderAuthLinks.tsx b/src/components/Page/Header/HeaderAuthLinks.tsx
index ffa7bf0..f93a99d 100644
--- a/src/components/Page/Header/HeaderAuthLinks.tsx
+++ b/src/components/Page/Header/HeaderAuthLinks.tsx
@@ -3,7 +3,7 @@
 import React, { useState, useEffect } from 'react';
 import { Button } from 'antd';
 import { useSelectedLayoutSegment } from 'next/navigation';
-import { Link } from '../../../navigation';
+import { Link } from '../../../i18n/routing';
 import { AUTH_TOKEN_KEY } from '../../../constants/common';
 import { useLocalStorage } from '../../../hooks/useLocalStorage';
 import { AuthModal } from '../../Modals/AuthModal';
diff --git a/src/components/Page/Header/HeaderMenu.tsx b/src/components/Page/Header/HeaderMenu.tsx
index a33af1d..aeb63c2 100644
--- a/src/components/Page/Header/HeaderMenu.tsx
+++ b/src/components/Page/Header/HeaderMenu.tsx
@@ -3,7 +3,7 @@
 import React from 'react';
 import { useSelectedLayoutSegment } from 'next/navigation';
 import dynamic from 'next/dynamic';
-import { Link } from '../../../navigation';
+import { Link } from '../../../i18n/routing';
 
 type HeaderMenuProps = {
     locale: string;
diff --git a/src/components/Page/Header/HeaderMobileMenu.tsx b/src/components/Page/Header/HeaderMobileMenu.tsx
index 461ea62..ac882c5 100644
--- a/src/components/Page/Header/HeaderMobileMenu.tsx
+++ b/src/components/Page/Header/HeaderMobileMenu.tsx
@@ -3,7 +3,7 @@
 import React, { FC, useState } from 'react';
 import dynamic from 'next/dynamic';
 import { useSelectedLayoutSegment } from 'next/navigation';
-import { Link } from '../../../navigation';
+import { Link } from '../../../i18n/routing';
 
 type HeaderMenuMobileProps = {
     locale: string;
diff --git a/src/components/Page/Header/LanguageSwitcher.tsx b/src/components/Page/Header/LanguageSwitcher.tsx
index b640e74..ad6303d 100644
--- a/src/components/Page/Header/LanguageSwitcher.tsx
+++ b/src/components/Page/Header/LanguageSwitcher.tsx
@@ -4,7 +4,7 @@ import React, { useTransition, useState } from 'react';
 import { Dropdown } from 'antd';
 import type { MenuProps } from 'antd';
 import { CaretDownOutlined, CaretUpOutlined } from '@ant-design/icons';
-import { useRouter, usePathname } from '../../../navigation';
+import { useRouter, usePathname } from '../../../i18n/routing';
 import { LOCALES } from '../../../constants/locale';
 import { Locale } from '../../../types/locale';
 
diff --git a/src/components/Page/Header/index.tsx b/src/components/Page/Header/index.tsx
index 25cbf09..d7f8530 100644
--- a/src/components/Page/Header/index.tsx
+++ b/src/components/Page/Header/index.tsx
@@ -3,7 +3,7 @@ import { HeaderMenu } from './HeaderMenu';
 import { LanguageSwitcher } from './LanguageSwitcher';
 import { HeaderMobileMenu } from './HeaderMobileMenu';
 import { HEAD_ROUTES } from '../../../constants/routes';
-import { Link } from '../../../navigation';
+import { Link } from '../../../i18n/routing';
 import { i18nText } from '../../../i18nKeys';
 
 type HeaderProps = {
diff --git a/src/components/stripe/StripeElementsForm.tsx b/src/components/stripe/StripeElementsForm.tsx
index 004653c..23cabdb 100644
--- a/src/components/stripe/StripeElementsForm.tsx
+++ b/src/components/stripe/StripeElementsForm.tsx
@@ -81,7 +81,7 @@ export const CheckoutForm: FC<PaymentFormProps> = ({ amount, sessionId, locale }
                 elements,
                 clientSecret,
                 confirmParams: {
-                    return_url: window.location.href,
+                    return_url: window?.location?.href || '',
                     payment_method_data: {
                         allow_redisplay: 'limited',
                         // billing_details: {
diff --git a/src/constants/locale.ts b/src/constants/locale.ts
index b78b657..895309b 100644
--- a/src/constants/locale.ts
+++ b/src/constants/locale.ts
@@ -2,7 +2,6 @@ import { Locale } from '../types/locale';
 
 export const DEFAULT_LOCALE = Locale.en;
 export const ALLOWED_LOCALES = [Locale.en, Locale.ru, Locale.de, Locale.it, Locale.es, Locale.fr] as const;
-export const LOCALE_PREFIX = undefined;
 
 export const LOCALES = {
     [Locale.en]: 'En',
diff --git a/src/hooks/useLocalStorage.ts b/src/hooks/useLocalStorage.ts
index d746b67..32b023a 100644
--- a/src/hooks/useLocalStorage.ts
+++ b/src/hooks/useLocalStorage.ts
@@ -2,14 +2,14 @@ import { useState, useEffect } from 'react';
 
 export function getStorageValue (key: string, defaultValue: any) {
     if (typeof window !== 'undefined') {
-        const saved = localStorage.getItem(key);
+        const saved = localStorage?.getItem(key);
         return saved || defaultValue;
     }
 };
 
 export function deleteStorageKey (key: string) {
     if (typeof window !== 'undefined') {
-        localStorage.removeItem(key);
+        localStorage?.removeItem(key);
     }
 };
 
@@ -19,7 +19,7 @@ export const useLocalStorage = (key: string, defaultValue: any) => {
     });
 
     useEffect(() => {
-        localStorage.setItem(key, value);
+        localStorage?.setItem(key, value);
     }, [key, value]);
 
     return [value, setValue];
diff --git a/src/hooks/useOauthWindow.ts b/src/hooks/useOauthWindow.ts
index dd3e2e7..a337e91 100644
--- a/src/hooks/useOauthWindow.ts
+++ b/src/hooks/useOauthWindow.ts
@@ -14,21 +14,21 @@ export const useOauthWindow = () => {
 
             if (data.messageType === 'oAuth') {
                 messageHandler(event);
-                window.removeEventListener('message', handler);
+                window?.removeEventListener('message', handler);
             }
         }
 
-        window.removeEventListener('message', handler);
+        window?.removeEventListener('message', handler);
 
         if (!oauthWindow || oauthWindow.closed) {
             // окно ещё не существует, либо было закрыто
-            oauthWindow = window.open(url, name, params)!;
+            oauthWindow = window?.open(url, name, params)!;
         } else {
             // окно уже существует
             oauthWindow!.focus();
         }
 
-        window.addEventListener('message', handler);
+        window?.addEventListener('message', handler);
     }
 
     return {
diff --git a/src/i18n/request.ts b/src/i18n/request.ts
new file mode 100644
index 0000000..afe2d10
--- /dev/null
+++ b/src/i18n/request.ts
@@ -0,0 +1,15 @@
+import { getRequestConfig } from 'next-intl/server';
+import { routing } from './routing';
+
+export default getRequestConfig(async ({ requestLocale }) => {
+    let locale = await requestLocale;
+
+    if (!locale || !routing.locales.includes(locale as any)) {
+        locale = routing.defaultLocale;
+    }
+
+    return {
+        locale,
+        messages: (await import(`../../messages/${locale}.json`)).default
+    };
+});
\ No newline at end of file
diff --git a/src/i18n/routing.ts b/src/i18n/routing.ts
new file mode 100644
index 0000000..cd2410e
--- /dev/null
+++ b/src/i18n/routing.ts
@@ -0,0 +1,10 @@
+import { defineRouting } from 'next-intl/routing';
+import { createNavigation } from 'next-intl/navigation';
+import { ALLOWED_LOCALES, DEFAULT_LOCALE } from '../constants/locale';
+
+export const routing = defineRouting({
+    locales: ALLOWED_LOCALES,
+    defaultLocale: DEFAULT_LOCALE
+});
+
+export const { Link, redirect, usePathname, useRouter, getPathname } = createNavigation(routing);
\ No newline at end of file
diff --git a/src/lib/signalr-connection.ts b/src/lib/signalr-connection.ts
index b1af614..3d730cd 100644
--- a/src/lib/signalr-connection.ts
+++ b/src/lib/signalr-connection.ts
@@ -25,7 +25,7 @@ const chatsReceiveMessageMethodName = 'ChatsMessageCreated';
 class SignalConnector {
     private connection: HubConnection;
     private events = {} as any;
-    static instance: SignalConnector;
+    static instance?: SignalConnector;
     constructor({ jwt }: { jwt?: string}) {
         const options = {
             accessTokenFactory: () => jwt
@@ -69,10 +69,17 @@ class SignalConnector {
         this.connection.invoke(sendChatMessagesSeenMethodName, messagesId).then(x => console.log(sendChatMessagesSeenMethodName, x))
     }
 
-    public static getInstance({ jwt }: { jwt?: string }): SignalConnector {
-        if (!SignalConnector.instance)
-            SignalConnector.instance = new SignalConnector({ jwt });
-        return SignalConnector.instance;
+    public static getInstance({ jwt }: { jwt?: string }): SignalConnector | undefined {
+        if (!SignalConnector.instance) {
+            if (jwt) {
+                SignalConnector.instance = new SignalConnector({ jwt });
+                return SignalConnector.instance;
+            } else {
+                return undefined;
+            }
+        } else {
+            return SignalConnector.instance;
+        }
     }
 }
 
diff --git a/src/middleware.ts b/src/middleware.ts
index 24342a4..8d9c8da 100644
--- a/src/middleware.ts
+++ b/src/middleware.ts
@@ -1,11 +1,7 @@
 import createMiddleware from 'next-intl/middleware';
-import { ALLOWED_LOCALES, DEFAULT_LOCALE, LOCALE_PREFIX } from './constants/locale';
+import { routing } from './i18n/routing';
 
-export default createMiddleware({
-    locales: ALLOWED_LOCALES,
-    localePrefix: LOCALE_PREFIX,
-    defaultLocale: DEFAULT_LOCALE
-});
+export default createMiddleware(routing);
 
 export const config = {
     matcher: ['/', '/(en|ru|de|it|es|fr)/:path*']
diff --git a/src/styles/_bb-experts.scss b/src/styles/_bb-experts.scss
index c29a91b..188e726 100644
--- a/src/styles/_bb-experts.scss
+++ b/src/styles/_bb-experts.scss
@@ -1,5 +1,5 @@
 .b-slider {
-  margin-top: -105px;
+  //margin-top: -105px;
 
   h2 {
     margin: 40px 0 20px;