bug: fix conflict

This commit is contained in:
Quangnhankie
2021-10-15 17:18:55 +07:00
94 changed files with 1915 additions and 594 deletions

View File

@@ -69,6 +69,8 @@ const AccountPage = ({ defaultActiveContent="orders" } : AccountPageProps) => {
const [activeTab, setActiveTab] = useState(defaultActiveContent==="info" ? 0 : defaultActiveContent==="orders" ? 1 : 2)
const [modalVisible, setModalVisible] = useState(false);
// const { itemWishlist } = useActiveCustomer();
// console.log(itemWishlist)
useEffect(() => {
const query = router.query[QUERY_KEY.TAB] as string