diff --git a/src/features/AuthServiceApp/components/RecoveryPopup/hooks.tsx b/src/features/AuthServiceApp/components/RecoveryPopup/hooks.tsx
index baf7e127..6cb3c619 100644
--- a/src/features/AuthServiceApp/components/RecoveryPopup/hooks.tsx
+++ b/src/features/AuthServiceApp/components/RecoveryPopup/hooks.tsx
@@ -1,6 +1,6 @@
import {
+ MouseEvent,
ChangeEvent,
- useEffect,
useState,
} from 'react'
@@ -16,7 +16,6 @@ export const useRecovery = (setIsModalOpen: (value: boolean) => void) => {
const [email, setEmail] = useState('')
const [isFetching, setIsFetching] = useState(false)
const [isSendMessage, setIsSendMessage] = useState(false)
- const [isSuccess, setIsSuccess] = useState(false)
const onEmailChange = ({
target: { value },
@@ -32,7 +31,6 @@ export const useRecovery = (setIsModalOpen: (value: boolean) => void) => {
const closePopup = () => {
setIsSendMessage(false)
- setIsSuccess(false)
setIsFetching(false)
setError('')
setEmail('')
@@ -45,8 +43,12 @@ export const useRecovery = (setIsModalOpen: (value: boolean) => void) => {
setIsFetching(false)
}
- const handleSubmit = () => {
+ const handleSubmit = (event: MouseEvent) => {
+ event?.preventDefault()
+ event?.stopPropagation()
+
setIsFetching(true)
+ setIsSendBtnDisabled(true)
loginCheckChangePass(
client_id,
email,
@@ -59,14 +61,6 @@ export const useRecovery = (setIsModalOpen: (value: boolean) => void) => {
.catch(handleError)
}
- useEffect(() => {
- if (!isFetching && isSendMessage) {
- setIsSuccess(true)
- } else {
- setIsSuccess(false)
- }
- }, [isFetching, isSendMessage])
-
return {
closePopup,
email,
@@ -74,7 +68,7 @@ export const useRecovery = (setIsModalOpen: (value: boolean) => void) => {
handleSubmit,
isFetching,
isSendBtnDisabled,
- isSuccess,
+ isSendMessage,
onEmailChange,
}
}
diff --git a/src/features/AuthServiceApp/components/RecoveryPopup/index.tsx b/src/features/AuthServiceApp/components/RecoveryPopup/index.tsx
index f327aa09..2cb66413 100644
--- a/src/features/AuthServiceApp/components/RecoveryPopup/index.tsx
+++ b/src/features/AuthServiceApp/components/RecoveryPopup/index.tsx
@@ -33,7 +33,7 @@ export const RecoveryPopup = (props: Props) => {
handleSubmit,
isFetching,
isSendBtnDisabled,
- isSuccess,
+ isSendMessage,
onEmailChange,
} = useRecovery(setIsModalOpen)
@@ -50,7 +50,7 @@ export const RecoveryPopup = (props: Props) => {
- {isSuccess ? (
+ {isSendMessage ? (
@@ -72,7 +72,7 @@ export const RecoveryPopup = (props: Props) => {
)}