Skip to content

Commit cbbe5b6

Browse files
committed
Reset error messages between login screens; ref pterodactyl#2455
1 parent 527ba1a commit cbbe5b6

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

resources/scripts/components/auth/ForgotPasswordContainer.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as React from 'react';
2-
import { useRef, useState } from 'react';
2+
import { useEffect, useRef, useState } from 'react';
33
import { Link } from 'react-router-dom';
44
import requestPasswordResetEmail from '@/api/auth/requestPasswordResetEmail';
55
import { httpErrorToHuman } from '@/api/http';
@@ -24,6 +24,10 @@ export default () => {
2424
const { clearFlashes, addFlash } = useFlash();
2525
const { enabled: recaptchaEnabled, siteKey } = useStoreState(state => state.settings.data!.recaptcha);
2626

27+
useEffect(() => {
28+
clearFlashes();
29+
}, []);
30+
2731
const handleSubmission = ({ email }: Values, { setSubmitting, resetForm }: FormikHelpers<Values>) => {
2832
clearFlashes();
2933

resources/scripts/components/auth/LoginContainer.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import React, { useRef, useState } from 'react';
1+
import React, { useEffect, useRef, useState } from 'react';
22
import { Link, RouteComponentProps } from 'react-router-dom';
33
import login from '@/api/auth/login';
44
import LoginFormContainer from '@/components/auth/LoginFormContainer';
@@ -23,6 +23,10 @@ const LoginContainer = ({ history }: RouteComponentProps) => {
2323
const { clearFlashes, clearAndAddHttpError } = useFlash();
2424
const { enabled: recaptchaEnabled, siteKey } = useStoreState(state => state.settings.data!.recaptcha);
2525

26+
useEffect(() => {
27+
clearFlashes();
28+
}, []);
29+
2630
const onSubmit = (values: Values, { setSubmitting }: FormikHelpers<Values>) => {
2731
clearFlashes();
2832

0 commit comments

Comments
 (0)