From 571bfe44ac1837b6c07951d9d711508d380a5ef2 Mon Sep 17 00:00:00 2001
From: Quangnhankie <nhantran@kie.io>
Date: Tue, 14 Sep 2021 15:23:56 +0700
Subject: [PATCH] bug: fix bug conflict

---
 .../Header/components/HeaderMenu/HeaderMenu.tsx     | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/components/common/Header/components/HeaderMenu/HeaderMenu.tsx b/src/components/common/Header/components/HeaderMenu/HeaderMenu.tsx
index c21a70b7c..47d4beb74 100644
--- a/src/components/common/Header/components/HeaderMenu/HeaderMenu.tsx
+++ b/src/components/common/Header/components/HeaderMenu/HeaderMenu.tsx
@@ -1,20 +1,17 @@
 import classNames from 'classnames'
 import Link from 'next/link'
-import { memo, useEffect, useMemo, useState } from 'react'
+import { useRouter } from 'next/router'
+import { memo, useMemo } from 'react'
 import InputSearch from 'src/components/common/InputSearch/InputSearch'
 import MenuDropdown from 'src/components/common/MenuDropdown/MenuDropdown'
 import { IconBuy, IconFilter, IconHeart, IconHistory, IconUser } from 'src/components/icons'
 import { ACCOUNT_TAB, QUERY_KEY, ROUTE } from 'src/utils/constanst.utils'
 import Logo from '../../../Logo/Logo'
 import s from './HeaderMenu.module.scss'
-import { useRouter } from 'next/router'
 interface Props {
     children?: any,
-<<<<<<< HEAD
     isFull: boolean,
     visibleFilter?:boolean,
-=======
->>>>>>> 2cd36b2d66249e898f8234d210f77f5e2a4c5a2e
     openModalAuthen: () => void,
     openModalInfo: () => void,
     toggleFilter: () => void,
@@ -23,11 +20,7 @@ interface Props {
 
 const FILTER_PAGE = [ROUTE.HOME, ROUTE.PRODUCTS]
 
-<<<<<<< HEAD
-const HeaderMenu = memo(({ visibleFilter,isFull, openModalAuthen, openModalInfo, toggleFilter, toggleCart }: Props) => {
-=======
-const HeaderMenu = memo(({ openModalAuthen, openModalInfo, toggleFilter, toggleCart }: Props) => {
->>>>>>> 2cd36b2d66249e898f8234d210f77f5e2a4c5a2e
+const HeaderMenu = memo(({ visibleFilter,openModalAuthen, openModalInfo, toggleFilter, toggleCart}: Props) => {
     const router = useRouter()