From 0082ea4a9c5638ae264967dcd6ea4e0747d7ec4f Mon Sep 17 00:00:00 2001
From: Leander Furumo <leander@furumo.eu>
Date: Thu, 1 Aug 2024 17:52:55 +0200
Subject: [PATCH] fix typescript errors

---
 src/modules/events/EventList.tsx         |  1 +
 src/modules/events/useEventList.tsx      |  2 +-
 src/modules/login/Login.tsx              |  2 +-
 src/modules/register/UserRegister.tsx    |  2 +-
 src/modules/register/useUserRegister.tsx | 13 +++++++++++--
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/modules/events/EventList.tsx b/src/modules/events/EventList.tsx
index e48d8a4..d8afc12 100644
--- a/src/modules/events/EventList.tsx
+++ b/src/modules/events/EventList.tsx
@@ -57,6 +57,7 @@ const EventList = () => {
     );
 
   // TODO: temporary. Remove this once the new website is up
+  // @ts-ignore
   if (error && error.message === 'I am a teapot') {
     return (
       <View style={theme.card}>
diff --git a/src/modules/events/useEventList.tsx b/src/modules/events/useEventList.tsx
index b7711d1..ed3be27 100644
--- a/src/modules/events/useEventList.tsx
+++ b/src/modules/events/useEventList.tsx
@@ -25,7 +25,7 @@ const useEventList = () => {
   const [eventsSectioned, setEventsSectioned] = useState<SectionedEvents[]>([]);
   const [page, setPage] = useState(1);
   const [totalPages, setTotalPages] = useState(0);
-  const [error, setError] = useState<unknown>(null);
+  const [error, setError] = useState<Error | unknown | null>(null);
   const [refreshing, setRefreshing] = useState(false);
 
   const toSectionFormat = (freshEvents: EventType[]) => {
diff --git a/src/modules/login/Login.tsx b/src/modules/login/Login.tsx
index 8975b3b..725f971 100644
--- a/src/modules/login/Login.tsx
+++ b/src/modules/login/Login.tsx
@@ -14,7 +14,7 @@ const Login = () => {
   return (
     <ScrollView>
       <View style={theme.card}>
-        <FormErrors errors={errors} />
+        {errors && <FormErrors errors={errors} />}
         <FormInput
           name="email"
           label="E-post / Brukernavn"
diff --git a/src/modules/register/UserRegister.tsx b/src/modules/register/UserRegister.tsx
index f34a4bb..7a37f06 100644
--- a/src/modules/register/UserRegister.tsx
+++ b/src/modules/register/UserRegister.tsx
@@ -80,7 +80,7 @@ const UserRegister = () => {
             onSubmitEditing={onSubmit}
           />
           <View style={styles.errorBox}>{registerError && isSubmitted && <FormErrors errors={registerError} />}</View>
-          <Button fullWidth disabled={isDisabled} onPress={onSubmit} style={styles.registerButton} type="submit">
+          <Button fullWidth disabled={isDisabled} onPress={onSubmit} style={styles.registerButton}>
             <Text>Registrer meg</Text>
           </Button>
           {isRegisteringUser && <ActivityIndicator color={theme.colors.neufOrange} />}
diff --git a/src/modules/register/useUserRegister.tsx b/src/modules/register/useUserRegister.tsx
index 474c0ae..edf03fc 100644
--- a/src/modules/register/useUserRegister.tsx
+++ b/src/modules/register/useUserRegister.tsx
@@ -47,8 +47,13 @@ const useUserRegister = () => {
     dispatch(requestRegisterUser(values));
 
     // Display error messages from API on form fields
+    if (!registerError) return;
     Object.keys(registerError).forEach((key) => {
-      setError(key as keyof UserRegisterFormValues, { type: 'server', message: registerError[key].join('\n') });
+      const errorMessages = registerError[key];
+      if (!errorMessages || !Array.isArray(errorMessages)) {
+        return;
+      }
+      setError(key as keyof UserRegisterFormValues, { type: 'server', message: errorMessages.join('\n') });
     });
   });
 
@@ -62,7 +67,11 @@ const useUserRegister = () => {
     clearErrors();
     if (!isSubmitted || !registerError) return;
     Object.keys(registerError).forEach((key) => {
-      setError(key as keyof UserRegisterFormValues, { type: 'server', message: registerError[key].join('\n') });
+      const errorMessages = registerError[key];
+      if (!errorMessages || !Array.isArray(errorMessages)) {
+        return;
+      }
+      setError(key as keyof UserRegisterFormValues, { type: 'server', message: errorMessages.join('\n') });
     });
   }, [registerError, isSubmitted, clearErrors, setError]);