diff --git a/src/Components/Layout/Navbar/Tooltip.tsx b/src/Components/Layout/Navbar/Tooltip.tsx
index e4566df..a1a43d9 100644
--- a/src/Components/Layout/Navbar/Tooltip.tsx
+++ b/src/Components/Layout/Navbar/Tooltip.tsx
@@ -30,7 +30,6 @@ const TooltipComp = ({
placement="top"
title={
{t(`header.${note}`)}
}
color={color}
-
>
{icon}
diff --git a/src/Components/Layout/SideBar/MenuItem.tsx b/src/Components/Layout/SideBar/MenuItem.tsx
index 637c394..d7b3581 100644
--- a/src/Components/Layout/SideBar/MenuItem.tsx
+++ b/src/Components/Layout/SideBar/MenuItem.tsx
@@ -3,6 +3,7 @@ import { useTranslation } from "react-i18next";
import { MdExpandLess, MdExpandMore } from "react-icons/md";
import { Link, useNavigate } from "react-router-dom";
import { useFilterStateState } from "../../../zustand/Filter";
+import { Tooltip } from "antd";
export const MenuItem = ({ item, location, index, isOpen }: any) => {
const isActive = location.pathname.split("/")[1] === item.path?.slice(1);
@@ -25,7 +26,13 @@ export const MenuItem = ({ item, location, index, isOpen }: any) => {
className={`link ${isActive ? "active" : ""} ${item?.children && "DropDownLink"}`}
onClick={() => handleNavigate()}
>
- {item.icon}
+
+ {item.icon}
+
{/* Conditionally render the text based on sidebar width */}
{t(item.text)}
diff --git a/src/Pages/Admin/QuestionBank/Model/FilterForm.tsx b/src/Pages/Admin/QuestionBank/Model/FilterForm.tsx
index 5a805af..195bb5e 100644
--- a/src/Pages/Admin/QuestionBank/Model/FilterForm.tsx
+++ b/src/Pages/Admin/QuestionBank/Model/FilterForm.tsx
@@ -67,6 +67,9 @@ const FilterForm = () => {
name: TagName,
page: TagCurrentPage
});
+
+ console.log(Tag);
+
const TagOption = Tag?.data ?? []
const canChangeTagPage = !!Tag?.links?.next;
const TagPage = Tag?.meta?.current_page;
@@ -116,7 +119,7 @@ const FilterForm = () => {
TagsIds
*/}
- {
lessonsIds
*/}
- {
const [t] = useTranslation();
- const {data} = useGetAllArea();
+ const {data:city} = useGetAllCity();
+ const [CityId, setCityId] = useState()
+
+ const {data} = useGetAllArea({
+ city_id:CityId
+ });
return (
@@ -16,12 +22,22 @@ const TitleDetailsForm = () => {
{t("header.address")}
+ setCityId(e)}
+ />
{/* */}