diff --git a/package-lock.json b/package-lock.json
index aecaa54208..5d1e58e8a1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,13 +15,14 @@
         "@dicebear/core": "^8.0.2",
         "@emotion/react": "^11.13.3",
         "@emotion/styled": "^11.13.0",
+        "@mui/base": "^5.0.0-beta.58",
         "@mui/icons-material": "^5.16.7",
         "@mui/material": "^5.16.7",
         "@mui/private-theming": "^5.15.12",
         "@mui/system": "^5.14.12",
         "@mui/x-charts": "^7.17.0",
         "@mui/x-data-grid": "^7.16.0",
-        "@mui/x-date-pickers": "^7.11.1",
+        "@mui/x-date-pickers": "^7.18.0",
         "@pdfme/generator": "^4.5.2",
         "@reduxjs/toolkit": "^2.2.7",
         "@vitejs/plugin-react": "^4.3.2",
@@ -3765,20 +3766,21 @@
       }
     },
     "node_modules/@mui/base": {
-      "version": "5.0.0-beta.40",
-      "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-beta.40.tgz",
-      "integrity": "sha512-I/lGHztkCzvwlXpjD2+SNmvNQvB4227xBXhISPjEaJUXGImOQ9f3D2Yj/T3KasSI/h0MLWy74X0J6clhPmsRbQ==",
+      "version": "5.0.0-beta.58",
+      "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-beta.58.tgz",
+      "integrity": "sha512-P0E7ZrxOuyYqBvVv9w8k7wm+Xzx/KRu+BGgFcR2htTsGCpJNQJCSUXNUZ50MUmSU9hzqhwbQWNXhV1MBTl6F7A==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.23.9",
-        "@floating-ui/react-dom": "^2.0.8",
-        "@mui/types": "^7.2.14",
-        "@mui/utils": "^5.15.14",
+        "@babel/runtime": "^7.25.0",
+        "@floating-ui/react-dom": "^2.1.1",
+        "@mui/types": "^7.2.15",
+        "@mui/utils": "6.0.0-rc.0",
         "@popperjs/core": "^2.11.8",
-        "clsx": "^2.1.0",
+        "clsx": "^2.1.1",
         "prop-types": "^15.8.1"
       },
       "engines": {
-        "node": ">=12.0.0"
+        "node": ">=14.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -3795,6 +3797,36 @@
         }
       }
     },
+    "node_modules/@mui/base/node_modules/@mui/utils": {
+      "version": "6.0.0-rc.0",
+      "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-6.0.0-rc.0.tgz",
+      "integrity": "sha512-tBp0ILEXDL0bbDDT8PnZOjCqSm5Dfk2N0Z45uzRw+wVl6fVvloC9zw8avl+OdX1Bg3ubs/ttKn8nRNv17bpM5A==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.25.0",
+        "@mui/types": "^7.2.15",
+        "@types/prop-types": "^15.7.12",
+        "clsx": "^2.1.1",
+        "prop-types": "^15.8.1",
+        "react-is": "^18.3.1"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/mui-org"
+      },
+      "peerDependencies": {
+        "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0",
+        "react": "^17.0.0 || ^18.0.0 || ^19.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@mui/core-downloads-tracker": {
       "version": "5.16.7",
       "resolved": "https://registry.npmjs.org/@mui/core-downloads-tracker/-/core-downloads-tracker-5.16.7.tgz",
@@ -4123,15 +4155,15 @@
       }
     },
     "node_modules/@mui/x-date-pickers": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-7.12.1.tgz",
-      "integrity": "sha512-Zj8kt3SCQbJp1qhMi+A3I4KqB8i5OY2Q11mdOEathFhqN/SQm1sUjIa1G09cGP1dPDgK1a6KM6qJGNtcw/nuWA==",
-      "dependencies": {
-        "@babel/runtime": "^7.24.6",
-        "@mui/base": "^5.0.0-beta.40",
-        "@mui/system": "^5.15.15",
-        "@mui/utils": "^5.15.14",
-        "@types/react-transition-group": "^4.4.10",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-7.18.0.tgz",
+      "integrity": "sha512-12tXIoMj9vpS8fS/bS3kWPCoVrH38vNGCxgplI0vOnUrN9rJuYJz3agLPJe1S0xciTw+9W8ZSe3soaW+owoz1Q==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.25.6",
+        "@mui/utils": "^5.16.6",
+        "@mui/x-internals": "7.18.0",
+        "@types/react-transition-group": "^4.4.11",
         "clsx": "^2.1.1",
         "prop-types": "^15.8.1",
         "react-transition-group": "^4.4.5"
@@ -4146,8 +4178,9 @@
       "peerDependencies": {
         "@emotion/react": "^11.9.0",
         "@emotion/styled": "^11.8.1",
-        "@mui/material": "^5.15.14",
-        "date-fns": "^2.25.0 || ^3.2.0",
+        "@mui/material": "^5.15.14 || ^6.0.0",
+        "@mui/system": "^5.15.14 || ^6.0.0",
+        "date-fns": "^2.25.0 || ^3.2.0 || ^4.0.0",
         "date-fns-jalali": "^2.13.0-0 || ^3.2.0-0",
         "dayjs": "^1.10.7",
         "luxon": "^3.0.2",
@@ -4187,6 +4220,26 @@
         }
       }
     },
+    "node_modules/@mui/x-date-pickers/node_modules/@mui/x-internals": {
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@mui/x-internals/-/x-internals-7.18.0.tgz",
+      "integrity": "sha512-lzCHOWIR0cAIY1bGrWSprYerahbnH5C31ql/2OWCEjcngL2NAV1M6oKI2Vp4HheqzJ822c60UyWyapvyjSzY/A==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/runtime": "^7.25.6",
+        "@mui/utils": "^5.16.6"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/mui-org"
+      },
+      "peerDependencies": {
+        "react": "^17.0.0 || ^18.0.0"
+      }
+    },
     "node_modules/@mui/x-internals": {
       "version": "7.16.0",
       "resolved": "https://registry.npmjs.org/@mui/x-internals/-/x-internals-7.16.0.tgz",
@@ -5518,9 +5571,10 @@
       }
     },
     "node_modules/@types/react-transition-group": {
-      "version": "4.4.10",
-      "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.10.tgz",
-      "integrity": "sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q==",
+      "version": "4.4.11",
+      "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.11.tgz",
+      "integrity": "sha512-RM05tAniPZ5DZPzzNFP+DmrcOdD0efDUxMy3145oljWSl3x9ZV5vhme98gTxFrj2lhXvmGNnUiuDyJgY9IKkNA==",
+      "license": "MIT",
       "dependencies": {
         "@types/react": "*"
       }
@@ -21240,17 +21294,32 @@
       }
     },
     "@mui/base": {
-      "version": "5.0.0-beta.40",
-      "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-beta.40.tgz",
-      "integrity": "sha512-I/lGHztkCzvwlXpjD2+SNmvNQvB4227xBXhISPjEaJUXGImOQ9f3D2Yj/T3KasSI/h0MLWy74X0J6clhPmsRbQ==",
+      "version": "5.0.0-beta.58",
+      "resolved": "https://registry.npmjs.org/@mui/base/-/base-5.0.0-beta.58.tgz",
+      "integrity": "sha512-P0E7ZrxOuyYqBvVv9w8k7wm+Xzx/KRu+BGgFcR2htTsGCpJNQJCSUXNUZ50MUmSU9hzqhwbQWNXhV1MBTl6F7A==",
       "requires": {
-        "@babel/runtime": "^7.23.9",
-        "@floating-ui/react-dom": "^2.0.8",
-        "@mui/types": "^7.2.14",
-        "@mui/utils": "^5.15.14",
+        "@babel/runtime": "^7.25.0",
+        "@floating-ui/react-dom": "^2.1.1",
+        "@mui/types": "^7.2.15",
+        "@mui/utils": "6.0.0-rc.0",
         "@popperjs/core": "^2.11.8",
-        "clsx": "^2.1.0",
+        "clsx": "^2.1.1",
         "prop-types": "^15.8.1"
+      },
+      "dependencies": {
+        "@mui/utils": {
+          "version": "6.0.0-rc.0",
+          "resolved": "https://registry.npmjs.org/@mui/utils/-/utils-6.0.0-rc.0.tgz",
+          "integrity": "sha512-tBp0ILEXDL0bbDDT8PnZOjCqSm5Dfk2N0Z45uzRw+wVl6fVvloC9zw8avl+OdX1Bg3ubs/ttKn8nRNv17bpM5A==",
+          "requires": {
+            "@babel/runtime": "^7.25.0",
+            "@mui/types": "^7.2.15",
+            "@types/prop-types": "^15.7.12",
+            "clsx": "^2.1.1",
+            "prop-types": "^15.8.1",
+            "react-is": "^18.3.1"
+          }
+        }
       }
     },
     "@mui/core-downloads-tracker": {
@@ -21402,18 +21471,28 @@
       }
     },
     "@mui/x-date-pickers": {
-      "version": "7.12.1",
-      "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-7.12.1.tgz",
-      "integrity": "sha512-Zj8kt3SCQbJp1qhMi+A3I4KqB8i5OY2Q11mdOEathFhqN/SQm1sUjIa1G09cGP1dPDgK1a6KM6qJGNtcw/nuWA==",
-      "requires": {
-        "@babel/runtime": "^7.24.6",
-        "@mui/base": "^5.0.0-beta.40",
-        "@mui/system": "^5.15.15",
-        "@mui/utils": "^5.15.14",
-        "@types/react-transition-group": "^4.4.10",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-7.18.0.tgz",
+      "integrity": "sha512-12tXIoMj9vpS8fS/bS3kWPCoVrH38vNGCxgplI0vOnUrN9rJuYJz3agLPJe1S0xciTw+9W8ZSe3soaW+owoz1Q==",
+      "requires": {
+        "@babel/runtime": "^7.25.6",
+        "@mui/utils": "^5.16.6",
+        "@mui/x-internals": "7.18.0",
+        "@types/react-transition-group": "^4.4.11",
         "clsx": "^2.1.1",
         "prop-types": "^15.8.1",
         "react-transition-group": "^4.4.5"
+      },
+      "dependencies": {
+        "@mui/x-internals": {
+          "version": "7.18.0",
+          "resolved": "https://registry.npmjs.org/@mui/x-internals/-/x-internals-7.18.0.tgz",
+          "integrity": "sha512-lzCHOWIR0cAIY1bGrWSprYerahbnH5C31ql/2OWCEjcngL2NAV1M6oKI2Vp4HheqzJ822c60UyWyapvyjSzY/A==",
+          "requires": {
+            "@babel/runtime": "^7.25.6",
+            "@mui/utils": "^5.16.6"
+          }
+        }
       }
     },
     "@mui/x-internals": {
@@ -22403,9 +22482,9 @@
       }
     },
     "@types/react-transition-group": {
-      "version": "4.4.10",
-      "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.10.tgz",
-      "integrity": "sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q==",
+      "version": "4.4.11",
+      "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.11.tgz",
+      "integrity": "sha512-RM05tAniPZ5DZPzzNFP+DmrcOdD0efDUxMy3145oljWSl3x9ZV5vhme98gTxFrj2lhXvmGNnUiuDyJgY9IKkNA==",
       "requires": {
         "@types/react": "*"
       }
diff --git a/package.json b/package.json
index 417144ef1d..92d19cf64d 100644
--- a/package.json
+++ b/package.json
@@ -12,13 +12,14 @@
     "@dicebear/core": "^8.0.2",
     "@emotion/react": "^11.13.3",
     "@emotion/styled": "^11.13.0",
+    "@mui/base": "^5.0.0-beta.58",
     "@mui/icons-material": "^5.16.7",
     "@mui/material": "^5.16.7",
     "@mui/private-theming": "^5.15.12",
     "@mui/system": "^5.14.12",
     "@mui/x-charts": "^7.17.0",
     "@mui/x-data-grid": "^7.16.0",
-    "@mui/x-date-pickers": "^7.11.1",
+    "@mui/x-date-pickers": "^7.18.0",
     "@pdfme/generator": "^4.5.2",
     "@reduxjs/toolkit": "^2.2.7",
     "@vitejs/plugin-react": "^4.3.2",