From 5882ab7faafbafc2a15ba5557752c89132496490 Mon Sep 17 00:00:00 2001
From: markgol777 <66869816+markgol777@users.noreply.github.com>
Date: Fri, 22 Nov 2024 16:20:21 +0100
Subject: [PATCH] converted ResetPassword component from jsx to tsx (#2688)

* converted ResetPassword component from jsx to tsx

* added async for clarity of the code
---
 .../{ResetPassword.jsx => ResetPassword.tsx}  | 26 +++++++++++--------
 src/services/auth-service.ts                  |  2 +-
 .../user/user-interfaces/user.interfaces.ts   |  9 +++++++
 3 files changed, 25 insertions(+), 12 deletions(-)
 rename src/containers/guest-home-page/reset-password/{ResetPassword.jsx => ResetPassword.tsx} (88%)

diff --git a/src/containers/guest-home-page/reset-password/ResetPassword.jsx b/src/containers/guest-home-page/reset-password/ResetPassword.tsx
similarity index 88%
rename from src/containers/guest-home-page/reset-password/ResetPassword.jsx
rename to src/containers/guest-home-page/reset-password/ResetPassword.tsx
index 3268f712d..135b8c468 100644
--- a/src/containers/guest-home-page/reset-password/ResetPassword.jsx
+++ b/src/containers/guest-home-page/reset-password/ResetPassword.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useMemo } from 'react'
+import { FC, useEffect, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 
 import useForm from '~/hooks/use-form'
@@ -19,14 +19,20 @@ import TitleWithDescription from '~/components/title-with-description/TitleWithD
 import LoginDialog from '~/containers/guest-home-page/login-dialog/LoginDialog'
 import { styles } from '~/containers/guest-home-page/reset-password/ResetPassword.styles'
 
-import { ButtonVariantEnum, SizeEnum } from '~/types'
+import { ButtonVariantEnum, SizeEnum, NewPassword } from '~/types'
 import { confirmPassword, password } from '~/utils/validations/login'
 import { snackbarVariants } from '~/constants'
 import imgSuccess from '~/assets/img/email-confirmation-modals/success-icon.svg'
 import { openAlert } from '~/redux/features/snackbarSlice'
 import { getErrorKey } from '~/utils/get-error-key'
+import { Component } from '~/context/modal-context'
 
-const ResetPassword = ({ resetToken, openModal }) => {
+interface ResetPasswordProps {
+  resetToken: string
+  openModal: (component: Component, delayToClose?: number) => void
+}
+
+const ResetPassword: FC<ResetPasswordProps> = ({ resetToken, openModal }) => {
   const { t } = useTranslation()
   const dispatch = useAppDispatch()
 
@@ -57,7 +63,7 @@ const ResetPassword = ({ resetToken, openModal }) => {
     loading,
     fetchData: sendResetPassword
   } = useAxios({
-    service: (newPassword) =>
+    service: (newPassword: NewPassword) =>
       AuthService.resetPassword(resetToken, newPassword),
     fetchOnMount: false,
     defaultResponse: null
@@ -76,13 +82,13 @@ const ResetPassword = ({ resetToken, openModal }) => {
     }
   }, [error, openModal, response, dispatch, successNotification])
 
-  const { handleSubmit, handleInputChange, handleBlur, errors, data } = useForm(
-    {
-      onSubmit: () => sendResetPassword({ password: data.password }),
+  const { handleSubmit, handleInputChange, handleBlur, errors, data } =
+    useForm<NewPassword>({
+      onSubmit: async (): Promise<void> =>
+        sendResetPassword({ password: data.password }),
       initialValues: { password: '', confirmPassword: '' },
       validations: { password, confirmPassword }
-    }
-  )
+    })
 
   const { inputVisibility: passwordVisibility, showInputText: showPassword } =
     useInputVisibility(errors.password)
@@ -107,7 +113,6 @@ const ResetPassword = ({ resetToken, openModal }) => {
           onBlur={handleBlur('password')}
           onChange={handleInputChange('password')}
           required
-          size='large'
           sx={{ mb: '5px' }}
           type={showPassword ? 'text' : 'password'}
           value={data.password}
@@ -120,7 +125,6 @@ const ResetPassword = ({ resetToken, openModal }) => {
           onBlur={handleBlur('confirmPassword')}
           onChange={handleInputChange('confirmPassword')}
           required
-          size='large'
           type={showConfirmPassword ? 'text' : 'password'}
           value={data.confirmPassword}
         />
diff --git a/src/services/auth-service.ts b/src/services/auth-service.ts
index ee50a04d5..76c2f1a15 100644
--- a/src/services/auth-service.ts
+++ b/src/services/auth-service.ts
@@ -30,7 +30,7 @@ export const AuthService = {
   },
   resetPassword: (
     resetToken: string,
-    newPassword: string
+    newPassword: { password: string }
   ): Promise<AxiosResponse> => {
     const confirmUrl = createUrlPath(URLs.auth.resetPassword, resetToken)
     return axiosClient.patch(confirmUrl, newPassword)
diff --git a/src/types/user/user-interfaces/user.interfaces.ts b/src/types/user/user-interfaces/user.interfaces.ts
index 791b56e21..3619e4456 100644
--- a/src/types/user/user-interfaces/user.interfaces.ts
+++ b/src/types/user/user-interfaces/user.interfaces.ts
@@ -110,6 +110,15 @@ export interface ChangePasswordParams {
   confirmPassword: string
 }
 
+export interface NewPassword {
+  confirmPassword?: string
+  password: string
+}
+
+export interface SendResetPasswordPayload {
+  password: string
+}
+
 export interface SignupResponse {
   userId: string
   userEmail: string