Merge branch 'main' into bump-to-rc.4

Author: jescalada

package-lock.json

@@ -113,7 +113,6 @@
     "passport-activedirectory": "^1.4.0",
     "passport-local": "^1.0.0",
     "perfect-scrollbar": "^1.5.6",
-    "prop-types": "15.8.1",
     "react": "^16.14.0",
     "react-dom": "^16.14.0",
     "react-html-parser": "^2.0.2",

package.json

@@ -1,17 +1,17 @@
 import React from 'react';
-import PropTypes from 'prop-types';
 import clsx from 'clsx';
 import { makeStyles } from '@material-ui/core/styles';
 import styles from '../../assets/jss/material-dashboard-react/components/typographyStyle';
 
 const useStyles = makeStyles(styles);
 
-export default function Danger(props) {
-  const classes = useStyles();
-  const { children } = props;
-  return <div className={clsx(classes.primaryText, classes.dangerText)}>{children}</div>;
+interface DangerProps {
+  children?: React.ReactNode;
 }
 
-Danger.propTypes = {
-  children: PropTypes.node,
+const Danger: React.FC<DangerProps> = ({ children }) => {
+  const classes = useStyles();
+  return <div className={clsx(classes.primaryText, classes.dangerText)}>{children}</div>;
 };
+
+export default Danger;