Merge pull request 'develop' (#2) from develop into main

Reviewed-on: #2

src/components/SettingForms/System/Upload.ts

@@ -14,9 +14,6 @@ export async function sendBlobFileUpload({ file, opts }: BlobFileUpload): Promis
   if (!file) throw new Error("No file supplied");
   if (!opts?.uploadUrl) throw new Error("No URL supplied");
 
-  if (file?.type !== "text/csv") {
-    throw new Error("This file is not supported, please upload a CSV file.");
-  }
   const timeoutMs = opts?.timeoutMs ?? 30000;
   const fieldName = opts?.fieldName ?? "upload";
   const fileName = opts?.overrideFileName ?? file?.name;

src/components/SettingForms/WiFi&Modem/WiFiSettingsForm.tsx

@@ -5,6 +5,7 @@ import { useWifiAndModem } from "../../../hooks/useCameraWifiandModem";
 import { useState } from "react";
 import { faEyeSlash, faEye } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { toast, Toaster } from "sonner";
 
 const WiFiSettingsForm = () => {
   const [showPwd, setShowPwd] = useState(false);
@@ -19,6 +20,13 @@ const WiFiSettingsForm = () => {
     encryption: "WPA2",
   };
 
+  const validatePassword = (password: string) => {
+    if (password.length < 8) {
+      toast.error("Password must be at least 8 characters long", { id: "password" });
+      return "Password must be at least 8 characters long";
+    }
+  };
+
   const handleSubmit = async (values: WifiSettingValues) => {
     const wifiConfig = {
       id: "ModemAndWifiManager-wifi",
@@ -37,6 +45,7 @@ const WiFiSettingsForm = () => {
     await wifiMutation.mutateAsync(wifiConfig);
   };
   return (
+    <>
       <Formik initialValues={initialValues} onSubmit={handleSubmit} enableReinitialize>
         {({ isSubmitting }) => (
           <Form className="flex flex-col space-y-5 px-2">
@@ -63,7 +72,9 @@ const WiFiSettingsForm = () => {
                   type={showPwd ? "text" : "password"}
                   className="p-2 border border-gray-400 rounded-lg w-full"
                   placeholder="Enter Password"
+                  validate={validatePassword}
                 />
+
                 <FontAwesomeIcon
                   type="button"
                   className="absolute right-5 end-0"
@@ -97,6 +108,8 @@ const WiFiSettingsForm = () => {
           </Form>
         )}
       </Formik>
+      <Toaster />
+    </>
   );
 };