From a4fea257ef6ca4351e0c1ca424604c7a711bca12 Mon Sep 17 00:00:00 2001
From: Martin Benedikt Busch <bene.busch1992@gmail.com>
Date: Thu, 8 Feb 2024 11:49:57 +0100
Subject: [PATCH 1/2] fix validation

---
 packages/berlin/src/pages/Account.tsx | 38 +++++++++++++--------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/packages/berlin/src/pages/Account.tsx b/packages/berlin/src/pages/Account.tsx
index 7a898fc5..f026505d 100644
--- a/packages/berlin/src/pages/Account.tsx
+++ b/packages/berlin/src/pages/Account.tsx
@@ -202,24 +202,26 @@ function AccountForm({
   });
 
   const onSubmit = (value: typeof initialUser) => {
-    if (user && user.id) {
-      mutateUserData({
-        userId: user.id,
-        username: value.username,
-        email: value.email,
-        groupIds: [value.group],
-        userAttributes: {
-          ...value.userAttributes,
-          credentialsGroup: JSON.stringify(value.userAttributes?.credentialsGroup),
-          publications: JSON.stringify(value.userAttributes?.publications),
-          contributions: JSON.stringify(value.userAttributes?.contributions),
-        },
-      });
+    if (isValid) {
+      if (user && user.id) {
+        mutateUserData({
+          userId: user.id,
+          username: value.username,
+          email: value.email,
+          groupIds: [value.group],
+          userAttributes: {
+            ...value.userAttributes,
+            credentialsGroup: JSON.stringify(value.userAttributes?.credentialsGroup),
+            publications: JSON.stringify(value.userAttributes?.publications),
+            contributions: JSON.stringify(value.userAttributes?.contributions),
+          },
+        });
 
-      toast.success('User data updated!');
+        toast.success('User data updated!');
 
-      if (events?.length ?? 0 > 1) {
-        navigate(`/events/${events?.[0].id}/register`);
+        if (events?.length ?? 0 > 1) {
+          navigate(`/events/${events?.[0].id}/register`);
+        }
       }
     }
   };
@@ -381,9 +383,7 @@ function AccountForm({
               icon={{ src: `/icons/add-${theme}.svg`, alt: 'Add icon' }}
             />
           </FlexColumn>
-          <Button type="submit" disabled={!isValid}>
-            Submit
-          </Button>
+          <Button type="submit">Submit</Button>
         </FlexColumn>
       </form>
     </FlexColumn>

From a005889ae8c84b71a633c637d8b21bac9d95484f Mon Sep 17 00:00:00 2001
From: Martin Benedikt Busch <bene.busch1992@gmail.com>
Date: Fri, 9 Feb 2024 15:32:39 +0100
Subject: [PATCH 2/2] simpliefied code

---
 packages/berlin/src/pages/Account.tsx | 34 +++++++++++++--------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/packages/berlin/src/pages/Account.tsx b/packages/berlin/src/pages/Account.tsx
index f026505d..bc181f97 100644
--- a/packages/berlin/src/pages/Account.tsx
+++ b/packages/berlin/src/pages/Account.tsx
@@ -202,26 +202,24 @@ function AccountForm({
   });
 
   const onSubmit = (value: typeof initialUser) => {
-    if (isValid) {
-      if (user && user.id) {
-        mutateUserData({
-          userId: user.id,
-          username: value.username,
-          email: value.email,
-          groupIds: [value.group],
-          userAttributes: {
-            ...value.userAttributes,
-            credentialsGroup: JSON.stringify(value.userAttributes?.credentialsGroup),
-            publications: JSON.stringify(value.userAttributes?.publications),
-            contributions: JSON.stringify(value.userAttributes?.contributions),
-          },
-        });
+    if (isValid && user && user.id) {
+      mutateUserData({
+        userId: user.id,
+        username: value.username,
+        email: value.email,
+        groupIds: [value.group],
+        userAttributes: {
+          ...value.userAttributes,
+          credentialsGroup: JSON.stringify(value.userAttributes?.credentialsGroup),
+          publications: JSON.stringify(value.userAttributes?.publications),
+          contributions: JSON.stringify(value.userAttributes?.contributions),
+        },
+      });
 
-        toast.success('User data updated!');
+      toast.success('User data updated!');
 
-        if (events?.length ?? 0 > 1) {
-          navigate(`/events/${events?.[0].id}/register`);
-        }
+      if (events?.length ?? 0 > 1) {
+        navigate(`/events/${events?.[0].id}/register`);
       }
     }
   };