fix typescript errors
This commit is contained in:
5 files changed
+15
-5
No files matched your search
@@ -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}>
|
||||
|
||||
@@ -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[]) => {
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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} />}
|
||||
|
||||
@@ -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]);
|
||||
|
||||
|
||||
Reference in new issue
Block a user