Merge branch 'develop' of github.com:renatoka/Checkmate into fix/1894-register-token-stringify

package-lock.json

@@ -18,7 +18,7 @@
 				"@mui/x-charts": "^7.5.1",
 				"@mui/x-data-grid": "7.27.3",
 				"@mui/x-date-pickers": "7.27.3",
-				"@reduxjs/toolkit": "2.6.0",
+				"@reduxjs/toolkit": "2.6.1",
 				"@solana/wallet-adapter-base": "0.9.23",
 				"@solana/wallet-adapter-material-ui": "0.16.34",
 				"@solana/wallet-adapter-react": "0.15.35",
@@ -4692,9 +4692,9 @@
 			}
 		},
 		"node_modules/@reduxjs/toolkit": {
-			"version": "2.6.0",
-			"resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.6.0.tgz",
-			"integrity": "sha512-mWJCYpewLRyTuuzRSEC/IwIBBkYg2dKtQas8mty5MaV2iXzcmicS3gW554FDeOvLnY3x13NIk8MB1e8wHO7rqQ==",
+			"version": "2.6.1",
+			"resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.6.1.tgz",
+			"integrity": "sha512-SSlIqZNYhqm/oMkXbtofwZSt9lrncblzo6YcZ9zoX+zLngRBrCOjK4lNLdkNucJF58RHOWrD9txT3bT3piH7Zw==",
 			"license": "MIT",
 			"dependencies": {
 				"immer": "^10.0.3",

package.json

@@ -21,7 +21,7 @@
 		"@mui/icons-material": "6.4.7",
 		"@mui/lab": "6.0.0-beta.30",
 		"@mui/material": "6.4.7",
-		"@reduxjs/toolkit": "2.6.0",
+		"@reduxjs/toolkit": "2.6.1",
 		"@solana/wallet-adapter-base": "0.9.23",
 		"@solana/wallet-adapter-material-ui": "0.16.34",
 		"@solana/wallet-adapter-react": "0.15.35",

src/Components/Label/index.jsx

@@ -114,7 +114,7 @@ ColoredLabel.propTypes = {
 /**
  * @component
  * @param {Object} props
- * @param { 'up' | 'down' | 'cannot resolve'} props.status - The status for the label
+ * @param {'up' | 'down' | 'paused' | 'pending' | 'cannot resolve' | 'published' | 'unpublished'} props.status - The status for the label
  * @param {string} props.text - The text of the label
  * @returns {JSX.Element}
  * @example
@@ -128,6 +128,8 @@ const statusToTheme = {
 	paused: "warning",
 	pending: "warning",
 	"cannot resolve": "error",
+	published: "success",
+	unpublished: "error",
 };
 
 const StatusLabel = ({ status, text, customStyles }) => {
@@ -156,7 +158,7 @@ const StatusLabel = ({ status, text, customStyles }) => {
 };
 
 StatusLabel.propTypes = {
-	status: PropTypes.oneOf(["up", "down", "paused", "pending", "cannot resolve"]),
+	status: PropTypes.oneOf(["up", "down", "paused", "pending", "cannot resolve", "published", "unpublished"]),
 	text: PropTypes.string,
 	customStyles: PropTypes.object,
 };

src/Pages/StatusPage/StatusPages/Components/StatusPagesTable/index.jsx

@@ -1,7 +1,7 @@
 import DataTable from "../../../../../Components/Table";
 import { useTheme } from "@emotion/react";
 import { useNavigate } from "react-router-dom";
-import { ColoredLabel } from "../../../../../Components/Label";
+import { StatusLabel } from "../../../../../Components/Label";
 import ArrowOutwardIcon from "@mui/icons-material/ArrowOutward";
 import { Stack, Typography } from "@mui/material";
 const StatusPagesTable = ({ data }) => {
@@ -66,12 +66,11 @@ const StatusPagesTable = ({ data }) => {
 			id: "status",
 			content: "Status",
 			render: (row) => {
+				const status = row.isPublished ? "published" : "unpublished";
 				return (
-					<ColoredLabel
-						label={row.isPublished ? "Published" : "Unpublished"}
-						color={
-							row.isPublished ? theme.palette.success.main : theme.palette.warning.main
-						}
+					<StatusLabel
+						status={status}
+						text={row.isPublished ? "Published" : "Unpublished"}
 					/>
 				);
 			},