fixed error on updating user, and form errors on manual singup (#1061)

TIHLDE · Aug 15, 2024 · 12fd0c7 · 12fd0c7
1 parent 0952bb3
commit 12fd0c7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/pages/Profile/components/ProfileSettings/UserSettings.tsx b/src/pages/Profile/components/ProfileSettings/UserSettings.tsx
@@ -41,7 +41,7 @@ export const UserSettings = ({ isAdmin, user }: UserSettingsProps) => {
 
   const form = useForm<z.infer<typeof formSchema>>({
     resolver: zodResolver(formSchema),
-    defaultValues: { ...user, gender: user.gender.toString() },
+    defaultValues: { ...user, image: user.image || '', gender: user.gender.toString() },
   });
 
   const onSubmit = (values: z.infer<typeof formSchema>) => {

diff --git a/src/pages/SignUp/index.tsx b/src/pages/SignUp/index.tsx
@@ -84,7 +84,14 @@ const SignUp = () => {
         navigate(redirectURL || URLS.login);
       },
       onError: (e) => {
-        toast.error(e.detail);
+        Object.keys(e.detail).forEach((key: string) => {
+          if (key in userData) {
+            const errorKey = key as keyof UserCreate;
+            const errorMessage = (e.detail as unknown as Record<string, any>)[key];
+            form.setError(errorKey, { message: errorMessage });
+          }
+        });
+        toast.error('Det er en eller flere feil i skjemaet');
       },
     });
   };