diff --git a/src/components/common/MessageCommon/MessageItem/MessageItem.tsx b/src/components/common/MessageCommon/MessageItem/MessageItem.tsx
index 6ed95c1a3..89f9b6600 100644
--- a/src/components/common/MessageCommon/MessageItem/MessageItem.tsx
+++ b/src/components/common/MessageCommon/MessageItem/MessageItem.tsx
@@ -40,7 +40,7 @@ const MessageItem = memo(
 
     useEffect(() => {
       if (isHide && !isMouseOver && onRemove) {
-        // onRemove(id || 0)
+        onRemove(id || 0)
       }
     }, [isHide, isMouseOver, onRemove, id])
 
diff --git a/src/components/common/ModalAuthenticate/ModalAuthenticate.tsx b/src/components/common/ModalAuthenticate/ModalAuthenticate.tsx
index b086098cc..08cbc96e6 100644
--- a/src/components/common/ModalAuthenticate/ModalAuthenticate.tsx
+++ b/src/components/common/ModalAuthenticate/ModalAuthenticate.tsx
@@ -32,7 +32,7 @@ const ModalAuthenticate = ({ visible, mode, closeModal }: Props) => {
       closeModal()
       router.push(ROUTE.ACCOUNT)
     }
-  }, [customer, visible])
+  }, [customer, visible, closeModal, router])
 
   const onSwitch = () => {
     setIsLogin(!isLogin)
diff --git a/src/components/common/ModalAuthenticate/components/FormLogin/FormLogin.tsx b/src/components/common/ModalAuthenticate/components/FormLogin/FormLogin.tsx
index 5ec394541..713b78629 100644
--- a/src/components/common/ModalAuthenticate/components/FormLogin/FormLogin.tsx
+++ b/src/components/common/ModalAuthenticate/components/FormLogin/FormLogin.tsx
@@ -1,7 +1,7 @@
 import { Form, Formik } from 'formik'
 import Link from 'next/link'
-import React, { useEffect, useRef, useState } from 'react'
-import { ButtonCommon, Inputcommon, InputFiledInForm, InputPassword, InputPasswordFiledInForm } from 'src/components/common'
+import React, { useEffect, useRef } from 'react'
+import { ButtonCommon, InputFiledInForm, InputPasswordFiledInForm } from 'src/components/common'
 import { useMessage } from 'src/components/contexts'
 import useLogin from 'src/components/hooks/useLogin'
 import { ROUTE } from 'src/utils/constanst.utils'