Merge branch 'develop' into fix/missing-strings

client/src/Pages/Notifications/components/ActionMenu.jsx

@@ -26,7 +26,8 @@ const ActionMenu = ({ notification, onDelete }) => {
 		setAnchorEl(null);
 	};
 
-	const handleRemove = () => {
+	const handleRemove = (e) => {
+		e.stopPropagation();
 		onDelete(notification._id);
 		handleClose();
 	};

client/src/Pages/PageSpeed/Details/Components/Charts/PieChart.jsx

@@ -221,7 +221,15 @@ const PieChart = ({ audits }) => {
 	const colorMap = getColors(performance);
 
 	return (
-		<Box onMouseLeave={() => setExpand(false)}>
+		<Box
+			onMouseLeave={() => setExpand(false)}
+			sx={{
+				display: "flex",
+				justifyContent: "center",
+				alignItems: "center",
+				width: "100%",
+			}}
+		>
 			{expand ? (
 				<MuiPieChart
 					series={[

client/src/Pages/PageSpeed/Details/Components/PerformanceReport/index.jsx

@@ -26,6 +26,9 @@ const PerformanceReport = ({ shouldRender, audits }) => {
 			<Typography
 				variant="body1"
 				mt="auto"
+				sx={{
+					textAlign: "center",
+				}}
 			>
 				{t("pageSpeedDetailsPerformanceReport")}{" "}
 				<Typography

client/src/Pages/StatusPage/Create/Components/Tabs/Settings.jsx

@@ -117,7 +117,7 @@ const TabSettings = ({
 							component="h2"
 							variant="h2"
 						>
-							{t("settingsAppearance")}
+							{t("statusPageCreateAppearanceTitle")}
 						</Typography>
 						<Typography component="p">
 							{t("statusPageCreateAppearanceDescription")}

client/src/Pages/StatusPage/Create/index.jsx

@@ -60,6 +60,7 @@ const CreateStatusPage = () => {
 	const [statusPage, statusPageMonitors, statusPageIsLoading, statusPageNetworkError] =
 		useStatusPageFetch(isCreate, url);
 
+	console.log(JSON.stringify(form, null, 2));
 	// Handlers
 	const handleFormChange = (e) => {
 		let { type, name, value, checked } = e.target;
@@ -177,7 +178,7 @@ const CreateStatusPage = () => {
 		}
 
 		let newLogo = undefined;
-		if (statusPage.logo) {
+		if (statusPage.logo && Object.keys(statusPage.logo).length > 0) {
 			newLogo = {
 				src: `data:${statusPage.logo.contentType};base64,${statusPage.logo.data}`,
 				name: "logo",

client/src/locales/en.json

@@ -495,6 +495,7 @@
 		"failureAddDemoMonitors": "Failed to add demo monitors",
 		"successAddDemoMonitors": "Successfully added demo monitors"
 	},
+
 	"monitorState": {
 		"active": "Active",
 		"paused": "Paused",
@@ -536,7 +537,7 @@
 			"label": "Discord",
 			"webhookLabel": "Discord Webhook URL",
 			"webhookPlaceholder": "https://discord.com/api/webhooks/...",
-			"webhookRequired": "Discord webhook URL is f"
+			"webhookRequired": "Discord webhook URL is required"
 		},
 		"edit": {
 			"failed": "Failed to update notification",
@@ -785,6 +786,7 @@
 		"buttonSave": "Save"
 	},
 	"statusPageCreateAppearanceDescription": "Define the default look and feel of your public status page.",
+	"statusPageCreateAppearanceTitle": "Appearance",
 	"statusPageCreateBasicInfoDescription": "Define company name and the subdomain that your status page points to.",
 	"statusPageCreateBasicInfoStatusPageAddress": "Your status page address",
 	"statusPageCreateSelectTimeZoneDescription": "Select the timezone that your status page will be displayed in.",