diff --git a/packages/login/src/components/ActivateUserForm/index.tsx b/packages/login/src/components/ActivateUserForm/index.tsx index 62887287f7..e3365604e0 100644 --- a/packages/login/src/components/ActivateUserForm/index.tsx +++ b/packages/login/src/components/ActivateUserForm/index.tsx @@ -36,7 +36,7 @@ import { TextInput, } from "@docspace/shared/components/text-input"; import { toastr } from "@docspace/shared/components/toast"; -import { EmployeeActivationStatus } from "@docspace/shared/enums"; +import { ButtonKeys, EmployeeActivationStatus } from "@docspace/shared/enums"; import { TPasswordHash, TPasswordSettings, @@ -46,17 +46,17 @@ import { PasswordInput } from "@docspace/shared/components/password-input"; import { ALLOWED_PASSWORD_CHARACTERS } from "@docspace/shared/constants"; import { Button, ButtonSize } from "@docspace/shared/components/button"; import { login } from "@docspace/shared/utils/loginUtils"; +import { + changePassword, + updateActivationStatus, + updateUser, +} from "@docspace/shared/api/people"; import { TActivateConfirmUser, TError } from "@/types"; import { RegisterContainer } from "../CreateUserForm/CreateUserForm.styled"; import { GreetingUserContainer } from "../CreateUserForm/sub-components/GreetingUserContainer"; import { ConfirmRouteContext } from "../ConfirmRoute"; -import { - changePassword, - updateActivationStatus, - updateUser, -} from "@docspace/shared/api/people"; type ActivateUserFormPorps = { passwordHash: TPasswordHash; @@ -184,7 +184,7 @@ const ActivateUserForm = ({ }; const onKeyPress = (event: KeyboardEvent) => { - if (event.key === "Enter") { + if (event.key === ButtonKeys.enter) { onSubmit(); } }; diff --git a/packages/login/src/components/CreateUserForm/index.tsx b/packages/login/src/components/CreateUserForm/index.tsx index 870b4f0f8f..624247cc6b 100644 --- a/packages/login/src/components/CreateUserForm/index.tsx +++ b/packages/login/src/components/CreateUserForm/index.tsx @@ -57,7 +57,7 @@ import { getOAuthToken, } from "@docspace/shared/utils/common"; import { setCookie } from "@docspace/shared/utils/cookie"; -import { DeviceType } from "@docspace/shared/enums"; +import { ButtonKeys, DeviceType } from "@docspace/shared/enums"; import { TValidate } from "@docspace/shared/components/email-input"; import { TCreateUserData, TError } from "@/types"; import { SocialButtonsGroup } from "@docspace/shared/components/social-buttons-group"; @@ -367,7 +367,7 @@ const CreateUserForm = (props: CreateUserFormProps) => { }; const onKeyPress = (e: KeyboardEvent) => { - if (e.key === "Enter") { + if (e.key === ButtonKeys.enter) { registrationForm ? onSubmit() : onContinue(); } }; diff --git a/packages/login/src/components/LoginForm/index.tsx b/packages/login/src/components/LoginForm/index.tsx index d963200f31..0d5bdff42a 100644 --- a/packages/login/src/components/LoginForm/index.tsx +++ b/packages/login/src/components/LoginForm/index.tsx @@ -53,7 +53,7 @@ import { toastr } from "@docspace/shared/components/toast"; import { thirdPartyLogin, checkConfirmLink } from "@docspace/shared/api/user"; import { setWithCredentialsStatus } from "@docspace/shared/api/client"; import { TValidate } from "@docspace/shared/components/email-input/EmailInput.types"; -import { RecaptchaType } from "@docspace/shared/enums"; +import { ButtonKeys, RecaptchaType } from "@docspace/shared/enums"; import { getAvailablePortals } from "@docspace/shared/api/management"; import { getCookie } from "@docspace/shared/utils"; import { deleteCookie } from "@docspace/shared/utils/cookie"; @@ -416,7 +416,7 @@ const LoginForm = ({ useEffect(() => { const onKeyDown = (e: KeyboardEvent) => { - if (e.key === "Enter") { + if (e.key === ButtonKeys.enter) { if (isModalOpen) return; onSubmit(); diff --git a/packages/login/src/components/LoginForm/sub-components/ForgotPasswordModalDialog.tsx b/packages/login/src/components/LoginForm/sub-components/ForgotPasswordModalDialog.tsx index 0f0ef01906..95ea3e46b9 100644 --- a/packages/login/src/components/LoginForm/sub-components/ForgotPasswordModalDialog.tsx +++ b/packages/login/src/components/LoginForm/sub-components/ForgotPasswordModalDialog.tsx @@ -39,6 +39,7 @@ import { toastr } from "@docspace/shared/components/toast"; import { sendInstructionsToChangePassword } from "@docspace/shared/api/people"; import { TValidate } from "@docspace/shared/components/email-input/EmailInput.types"; import { InputSize, InputType } from "@docspace/shared/components/text-input"; +import { ButtonKeys } from "@docspace/shared/enums"; import { ForgotPasswordModalDialogProps } from "@/types"; @@ -84,7 +85,7 @@ const ForgotPasswordModalDialog = ({ const onKeyDown = React.useCallback( (e: KeyboardEvent) => { - if (e.key === "Enter") { + if (e.key === ButtonKeys.enter) { onSendPasswordInstructions(); e.preventDefault(); } diff --git a/packages/login/src/components/PasswordChangeForm/index.tsx b/packages/login/src/components/PasswordChangeForm/index.tsx index 1b42acf4c7..660ce1dba5 100644 --- a/packages/login/src/components/PasswordChangeForm/index.tsx +++ b/packages/login/src/components/PasswordChangeForm/index.tsx @@ -43,6 +43,7 @@ import { } from "@docspace/shared/api/settings/types"; import { ALLOWED_PASSWORD_CHARACTERS } from "@docspace/shared/constants"; import { changePassword } from "@docspace/shared/api/people"; +import { ButtonKeys } from "@docspace/shared/enums"; import { TError } from "@/types"; import { ConfirmRouteContext } from "../ConfirmRoute"; @@ -136,7 +137,7 @@ const PasswordChangeForm = ({ }; const onKeyPress = (e: KeyboardEvent) => { - if (e.key === "Enter") { + if (e.key === ButtonKeys.enter) { onSubmit(); } }; diff --git a/packages/login/src/components/TfaActivationForm/index.tsx b/packages/login/src/components/TfaActivationForm/index.tsx index 9373a398ab..595c973b26 100644 --- a/packages/login/src/components/TfaActivationForm/index.tsx +++ b/packages/login/src/components/TfaActivationForm/index.tsx @@ -49,6 +49,7 @@ import { TPasswordHash } from "@docspace/shared/api/settings/types"; import { loginWithTfaCode } from "@docspace/shared/api/user"; import { validateTfaCode } from "@docspace/shared/api/settings"; import { OPEN_BACKUP_CODES_DIALOG } from "@docspace/shared/constants"; +import { ButtonKeys } from "@docspace/shared/enums"; import { TFA_ANDROID_APP_URL, @@ -124,7 +125,11 @@ const TfaActivationForm = ({ }; const onKeyPress = (event: React.KeyboardEvent) => { - if (event.code === "Enter" || event.code === "NumpadEnter") onSubmit(); + if ( + event.code === ButtonKeys.enter || + event.code === ButtonKeys.numpadEnter + ) + onSubmit(); }; return ( diff --git a/packages/login/src/components/TfaAuthForm/index.tsx b/packages/login/src/components/TfaAuthForm/index.tsx index d248bea5b0..63913eeb6e 100644 --- a/packages/login/src/components/TfaAuthForm/index.tsx +++ b/packages/login/src/components/TfaAuthForm/index.tsx @@ -43,6 +43,7 @@ import { } from "@docspace/shared/components/text-input"; import { Button, ButtonSize } from "@docspace/shared/components/button"; import { TPasswordHash } from "@docspace/shared/api/settings/types"; +import { ButtonKeys } from "@docspace/shared/enums"; import { TError } from "@/types"; @@ -112,7 +113,11 @@ const TfaAuthForm = ({ }; const onKeyPress = (event: React.KeyboardEvent) => { - if (event.code === "Enter" || event.code === "NumpadEnter") onSubmit(); + if ( + event.code === ButtonKeys.enter || + event.code === ButtonKeys.numpadEnter + ) + onSubmit(); }; return (