Merge branch 'main' into mpower

# Conflicts:
#	src/ui-component/Logo.js

src/ui-component/Logo.js

@@ -1,8 +1,16 @@
 // material-ui
 import { useTheme } from '@mui/material/styles';
 
-import Llogo from '../assets/images/logo/lightLogo.png';
+/**
-import Dlogo from '../assets/images/logo/darkLogo.png';
+ * if you want to use image instead of <svg> uncomment following.
+ *
+ * import logoDark from 'assets/images/logo-dark.svg';
+ * import logo from 'assets/images/logo.svg';
+ *
+ */
+
+import Llogo from '../assets/images/logo/lightLogoNew.png';
+import Dlogo from '../assets/images/logo/darkLogoNew.png';
 // ==============================|| LOGO SVG ||============================== //
 
 const Logo = () => {