fix: Login form GUI crash after closing 2FA modal (#31625)

Co-authored-by: Henrique Guimarães Ribeiro <[email protected]>
RocketChat · Feb 6, 2024 · f612d74 · f612d74
1 parent a21ae01
commit f612d74
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/.changeset/tall-bears-compete.md b/.changeset/tall-bears-compete.md
@@ -0,0 +1,5 @@
+---
+"@rocket.chat/web-ui-registration": patch
+---
+
+Fixed a bug that caused the Login page to crash when closing the Two-Factor Authentication modal using the Cancel button or the X button.
diff --git a/packages/web-ui-registration/src/LoginForm.tsx b/packages/web-ui-registration/src/LoginForm.tsx
@@ -56,7 +56,7 @@ const LOGIN_SUBMIT_ERRORS = {
 	},
 } as const;
 
-export type LoginErrors = keyof typeof LOGIN_SUBMIT_ERRORS;
+export type LoginErrors = keyof typeof LOGIN_SUBMIT_ERRORS | 'totp-canceled';
 
 export const LoginForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRouter }): ReactElement => {
 	const {
@@ -111,7 +111,12 @@ export const LoginForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRoute
 	}, [errorOnSubmit]);
 
 	const renderErrorOnSubmit = (error: LoginErrors) => {
+		if (error === 'totp-canceled') {
+			return null;
+		}
+
 		const { type, i18n } = LOGIN_SUBMIT_ERRORS[error];
+
 		return (
 			<Callout id={`${usernameId}-error`} aria-live='assertive' type={type}>
 				{t(i18n)}