diff --git a/app/component/date/dateTime/SendAppo.js b/app/component/date/dateTime/SendAppo.js
index 0252413..734caf9 100644
--- a/app/component/date/dateTime/SendAppo.js
+++ b/app/component/date/dateTime/SendAppo.js
@@ -1,14 +1,8 @@
 import ArrowLeftB from "@/components/icons/ArrowLeftB";
 import { Button } from "@mui/material";
 import Cookies from "js-cookie";
-import { useParams } from "next/navigation";
-import { useState } from "react";
 
 function SendAppo({ hour, setStep, setSelectedSlot, date, setSelectedDate }) {
-  const params = useParams();
-  const doctorId = params.doctorId;
-  const [loading, setLoading] = useState(false);
-
   const sendReq = () => {
     const isLogged = Cookies.get("access_token");
 
@@ -25,19 +19,6 @@ function SendAppo({ hour, setStep, setSelectedSlot, date, setSelectedDate }) {
       // اگر لاگین نکرده، به مرحله 1 (Login) می‌رود
       setStep(1);
     }
-
-    // setLoading(true);
-    // request
-    //   .postAppointment({
-    //     doctor_id: doctorId,
-    //     slot: hour,
-    //   })
-    //   .then(() => {
-    //     setLoading(false);
-    //   })
-    //   .catch(() => {
-    //     //
-    //   });
   };
 
   return (
@@ -45,7 +26,6 @@ function SendAppo({ hour, setStep, setSelectedSlot, date, setSelectedDate }) {
       <Button
         className="!gap-[4px] !text-[16px] !font-medium !shadow-none !px-[12px] !py-[8px] md:!py-[9px] !w-full md:!w-fit !min-w-[157px]"
         variant="contained"
-        disabled={loading}
         onClick={sendReq}
         disabled={!hour}
       >
diff --git a/app/component/date/dateTime/index.js b/app/component/date/dateTime/index.js
index 83a45d3..a7ee7e7 100644
--- a/app/component/date/dateTime/index.js
+++ b/app/component/date/dateTime/index.js
@@ -1,6 +1,7 @@
 "use client";
 
 import { useEffect, useState } from "react";
+import moment from "moment-jalaali";
 import Hours from "./hours";
 import Tabs from "../../Tabs";
 import { request } from "@/services/response";
@@ -28,8 +29,9 @@ function DateTime({ date, doctor, setStep, setSelectedSlot, setSelectedDate }) {
     if (date && doctor?.uuid) {
       setAppo("loading");
       setHour();
+      const dateStr = moment.unix(date).format("YYYY-MM-DD");
       request
-        .getAppointmentSlots(doctor.uuid, date)
+        .getAppointmentSlots(doctor.uuid, dateStr)
         .then((res) => {
           const slots = adaptSlots(res);
           setAppo(slots);
diff --git a/components/appointment/information/Detail.js b/components/appointment/information/Detail.js
index 10b237b..cd2a4a2 100644
--- a/components/appointment/information/Detail.js
+++ b/components/appointment/information/Detail.js
@@ -7,30 +7,12 @@ import LocationA from "@/components/icons/LocationA";
 import TickCircleOrange from "@/components/icons/TickCircleOrange";
 import { Button } from "@mui/material";
 import moment from "moment-jalaali";
-import { useEffect, useState } from "react";
-import { request } from "@/services/response";
 
 function Detail({ doctor, step, setStep, selectedSlot, selectedDate }) {
-  const [address, setAddress] = useState("آدرس موجود نیست");
-
-  // دریافت آدرس بر اساس location_id از اسلات انتخاب شده
-  useEffect(() => {
-    if (selectedSlot?.location_id) {
-      request
-        .getDoctorAddress(selectedSlot.location_id)
-        .then((res) => {
-          if (res?.address) {
-            setAddress(res.address);
-          }
-        })
-        .catch((err) => {
-          console.error("Error fetching address:", err);
-        });
-    } else if (doctor?.address?.[0]?.address) {
-      // اگر اسلات location_id نداشت، از آدرس دکتر استفاده کن
-      setAddress(doctor.address[0].address);
-    }
-  }, [selectedSlot, doctor]);
+  const matchedAddress = selectedSlot?.location_id
+    ? doctor?.address?.find((a) => String(a.id) === String(selectedSlot.location_id))?.address
+    : doctor?.address?.[0]?.address;
+  const address = matchedAddress || "آدرس موجود نیست";
 
   // فرمت کردن تاریخ به شمسی
   const formattedDate = selectedDate
@@ -38,7 +20,7 @@ function Detail({ doctor, step, setStep, selectedSlot, selectedDate }) {
     : "تاریخ انتخاب نشده";
 
   // فرمت کردن زمان
-  const formattedTime = selectedSlot?.time || "زمان انتخاب نشده";
+  const formattedTime = selectedSlot?.start_time || "زمان انتخاب نشده";
 
   return (
     <div className="">