diff --git a/app/components/BottomNav.js b/app/components/BottomNav.js
index 5d39f76..fbb16aa 100644
--- a/app/components/BottomNav.js
+++ b/app/components/BottomNav.js
@@ -24,12 +24,12 @@ export default function BottomNav({ isOwner, isOwnerOrAgent }) {
     ...(isOwnerOrAgent
       ? [
           { href: "/owner/properties", label: t("myProperties"), icon: Building },
-          { href: "/owner/bookings", label: "عقاراتي المحجوزة", icon: CalendarCheck },
-          { href: "/reservations", label: "حجوزاتي", icon: CalendarDays },
+          { href: "/owner/bookings", label: t("Myseizedproperties"), icon: CalendarCheck },
+          { href: "/reservations", label: t("Mybookings"), icon: CalendarDays },
         ]
-      : [{ href: "/booked-properties", label: "حجوزاتي", icon: CalendarDays }]),
+      : [{ href: "/booked-properties", label: t("Mybookings"), icon: CalendarDays }]),
 
-    { href: bookingsHref, label: "طلبات الحجز", icon: ClipboardList },
+    { href: bookingsHref, label: t("Orders"), icon: ClipboardList },
     { href: "/payments", label: t("payments"), icon: CreditCard },
 
     ...(isOwnerOrAgent ? [{ href: "/owner/account-book", label: t("accountBook"), icon: BookOpenCheck }] : []),
@@ -61,20 +61,16 @@ export default function BottomNav({ isOwner, isOwnerOrAgent }) {
               <Link
                 key={it.href}
                 href={it.href}
-                style={{ padding: "3px", width: "100px" }}
+                style={{ padding: "3px", width: "115px" }}
                 className={`
-           
               flex
               flex-col
               items-center
               justify-center
               rounded-xl
-             
               transition-all
               duration-200
               ease-out
-             
-
               ${active ? "bg-white shadow-sm text-amber-600" : "text-gray-700 hover:bg-white/80 hover:text-amber-600 hover:shadow-md"}
             `}
               >
@@ -99,7 +95,7 @@ export default function BottomNav({ isOwner, isOwnerOrAgent }) {
                   )}
                 </div>
 
-                <div className="mt-0.5 text-[10px] sm:mt-1 sm:text-xs">{it.label}</div>
+                <div className="mt-0.5 text-[10px] sm:mt-1 text-center sm:text-xs">{it.label}</div>
               </Link>
             );
           })}
diff --git a/app/i18n/config.js b/app/i18n/config.js
index be9a31b..240ebb0 100644
--- a/app/i18n/config.js
+++ b/app/i18n/config.js
@@ -314,7 +314,9 @@ const resources = {
 
       /* ─── Bottom nav ─── */
       payments: "Payments",
-
+      Myseizedproperties:"Seized Properties",
+       Mybookings:"My bookings",
+      Orders:"Orders",
       /* ─── Footer ─── */
       footerDescription: "Your trusted platform for finding and listing premium properties across Syria.",
       quickLinks: "Quick Links",
@@ -1658,10 +1660,14 @@ const resources = {
       "calendar.mockTenant1": "Ahmed Mohammed",
       "calendar.mockTenant2": "Sara Ahmed",
       "calendar.mockTenant3": "Mohammed Ali",
+      "loading":"Loading",
+      "neaebymosque":"Distance to nearest mosque (km)"
     },
   },
   ar: {
     translation: {
+      "loading":"جار التحميل",
+       "neaebymosque":"المسافة الى اقرب جامع",
       /* Block*/
       "blocked.fillAllFields": "يرجى تعبئة جميع الحقول المطلوبة",
       "blocked.reportSent": "تم إرسال الرسالة بنجاح",
@@ -1776,6 +1782,7 @@ const resources = {
       "chooseRole.createAgentAccount": "إنشاء حساب وكيل",
       "chooseRole.alreadyHaveAccount": "لديك حساب بالفعل؟",
 
+      Myseizedproperties:"عقاراتي المحجوزة",
       /* ─── Role badges ─── */
       visitor: "زائر",
       owner: "مالك",
@@ -2032,6 +2039,8 @@ const resources = {
 
       /* ─── Bottom nav ─── */
       payments: "المدفوعات",
+      Orders:"الطلبات",
+      Mybookings:"حجوزاتي",
 
       /* ─── Footer ─── */
       footerDescription: "منصتك الموثوقة لإيجاد وإدراج العقارات الفاخرة في جميع أنحاء سوريا.",
diff --git a/app/loading.js b/app/loading.js
index 0f62f9d..4a0348a 100644
--- a/app/loading.js
+++ b/app/loading.js
@@ -1,8 +1,10 @@
 "use client";
 
 import { motion } from "framer-motion";
+import { useTranslation } from "react-i18next";
 
 export default function Loading() {
+  const { t } = useTranslation();
   return (
     <div className="min-h-screen flex items-center justify-center p-4" style={{ backgroundColor: "#08172f" }}>
       <motion.div initial={{ opacity: 0, scale: 0.9 }} animate={{ opacity: 1, scale: 1.3 }} transition={{ duration: 0.4 }} className="text-center flex flex-col items-center justify-center gap-4">
@@ -27,7 +29,9 @@ export default function Loading() {
           </div>
         </motion.div>
 
-        <p className="text-amber-400 text-sm font-bold tracking-wide animate-pulse">... جاري التحميل</p>
+        <p className="text-amber-400 text-sm font-bold tracking-wide animate-pulse" suppressHydrationWarning>
+          ... {t("loading")}
+        </p>
       </motion.div>
     </div>
   );
diff --git a/app/owner/properties/add/loading.js b/app/owner/properties/add/loading.js
deleted file mode 100644
index 0c01106..0000000
--- a/app/owner/properties/add/loading.js
+++ /dev/null
@@ -1,14 +0,0 @@
-'use client';
-
-import { motion } from 'framer-motion';
-
-export default function Loading() {
-  return (
-    <div className="min-h-screen bg-gradient-to-br from-gray-950 via-gray-900 to-gray-950 flex items-center justify-center">
-      <motion.div initial={{ opacity: 0 }} animate={{ opacity: 1 }} className="text-center">
-        <div className="w-14 h-14 border-4 border-amber-500 border-t-transparent rounded-full animate-spin mx-auto mb-4" />
-        <p className="text-gray-400 text-lg">جاري التحميل...</p>
-      </motion.div>
-    </div>
-  );
-}
diff --git a/app/owner/properties/add/page.js b/app/owner/properties/add/page.js
index cf8e0f4..93852ec 100644
--- a/app/owner/properties/add/page.js
+++ b/app/owner/properties/add/page.js
@@ -141,6 +141,7 @@ export default function AddPropertyPage() {
     nearbyUniversity: "",
     nearbyPark: "",
     nearbyMall: "",
+    neaebymosque: "",
 
     roomAreaType: "Private room",
     roomPeopleAllowed: "",
@@ -693,6 +694,7 @@ export default function AddPropertyPage() {
         university: formData.nearbyUniversity || "",
         park: formData.nearbyPark || "",
         mall: formData.nearbyMall || "",
+        mosque: formData.neaebymosque || "",
       },
     };
 
@@ -747,11 +749,9 @@ export default function AddPropertyPage() {
     try {
       if (purpose === "sale") {
         const payload = {
-         
-            propInfo,
-            price: parseFloat(formData.salePrice),
-            deposit: parseFloat(formData.deposit) || 0,
-      
+          propInfo,
+          price: parseFloat(formData.salePrice),
+          deposit: parseFloat(formData.deposit) || 0,
         };
         console.log("ff", payload);
         const res = await addSaleProperty(payload);
@@ -862,7 +862,7 @@ export default function AddPropertyPage() {
                         type="button"
                         onClick={() => setFormData({ ...formData, propertyType: type.id })}
                         className={`p-4 border rounded-xl flex flex-col items-center gap-2 transition-all ${
-                          formData.propertyType === type.id ? "border-amber-500 bg-amber-50 text-amber-700" : "border-gray-200 hover:border-amber-200 hover:bg-amber-50/50"
+                          formData.propertyType === type.id ? "border-amber-500 bg-[#1E293B] text-amber-700" : "border-gray-200 hover:border-amber-200 hover:bg-amber-50/50"
                         }`}
                       >
                         <Icon className="w-6 h-6" />
@@ -895,7 +895,7 @@ export default function AddPropertyPage() {
                 <select
                   value={formData.documentType}
                   onChange={(e) => setFormData({ ...formData, documentType: e.target.value })}
-                  className="w-full px-4 py-3 border border-gray-300 rounded-xl focus:outline-none focus:ring-2 focus:ring-amber-500"
+                  className="w-full px-4 bg-[#1E293B] py-3 border border-gray-300 rounded-xl focus:outline-none focus:ring-2 focus:ring-amber-500"
                 >
                   {DocumentTypeList.map((type) => (
                     <option key={type} value={type}>
@@ -1037,19 +1037,19 @@ export default function AddPropertyPage() {
                     const Icon = service.icon;
                     const isSelected = formData.services[service.id];
                     return (
-                      <div key={service.id} className={`border rounded-xl transition-all ${isSelected ? "border-amber-500 bg-amber-50" : "border-gray-200"}`}>
+                      <div key={service.id} className={`border rounded-xl transition-all ${isSelected ? "border-amber-500 bg-[#1E293B]" : "border-gray-200"}`}>
                         <label className="flex items-center gap-3 p-3 cursor-pointer">
-                          <input type="checkbox" checked={isSelected} onChange={() => toggleService(service.id)} className="w-4 h-4 text-amber-500 rounded" />
+                          <input type="checkbox" checked={isSelected} onChange={() => toggleService(service.id)} className="w-4 h-4 bg-[#1E293B] text-amber-500 rounded" />
                           <Icon className={`w-5 h-5 ${isSelected ? "text-amber-600" : "text-gray-400"}`} />
                           <span className={`text-sm font-medium ${isSelected ? "text-amber-700" : "text-gray-600"}`}>{service.label}</span>
                         </label>
                         {isSelected && (
-                          <div className="px-3 pb-3">
+                          <div className="px-3 pb-3 bg-[#1E293B]">
                             <input
                               type="text"
                               value={formData.serviceDetails[service.id] || ""}
                               onChange={(e) => updateServiceDetail(service.id, e.target.value)}
-                              className="w-full px-3 py-2 border border-gray-200 rounded-lg text-sm focus:outline-none focus:ring-2 focus:ring-amber-500"
+                              className="w-full px-3 py-2 border bg-[#1E293B] border-gray-200 rounded-lg text-sm focus:outline-none focus:ring-2 focus:ring-amber-500"
                               placeholder={t("addProperty.serviceDetailPlaceholder")}
                             />
                           </div>
@@ -1060,7 +1060,7 @@ export default function AddPropertyPage() {
                 </div>
               </div>
 
-              <div className="bg-white rounded-xl p-6 border border-gray-200 mt-6">
+              <div className="bg-[#1E293B] rounded-xl p-6 border border-gray-200 mt-6">
                 <h3 className="text-lg font-bold text-gray-800 mb-4 flex items-center gap-2">
                   <MapPin className="w-5 h-5 text-amber-600" />
                   {t("addProperty.nearbyServicesTitle")}
@@ -1090,6 +1090,19 @@ export default function AddPropertyPage() {
                       placeholder={t("addProperty.nearbyPlaceholder")}
                     />
                   </div>
+                  <div>
+                    <label className="block text-sm font-medium text-gray-700 mb-2">{t("neaebymosque")}</label>
+                    <input
+                      type="number"
+                      min="0"
+                      step="0.1"
+                      required
+                      value={formData.neaebymosque}
+                      onChange={(e) => setFormData({ ...formData, neaebymosque: e.target.value })}
+                      className="w-full px-4 py-3 border border-gray-300 rounded-xl focus:outline-none focus:ring-2 focus:ring-amber-500"
+                      placeholder={t("addProperty.nearbyPlaceholder")}
+                    />
+                  </div>
                   <div>
                     <label className="block text-sm font-medium text-gray-700 mb-2">{t("addProperty.nearbyRestaurantLabel")}</label>
                     <input
@@ -1151,7 +1164,7 @@ export default function AddPropertyPage() {
                         <label
                           key={term.id}
                           className={`flex items-center gap-2 p-3 border rounded-xl cursor-pointer transition-all ${
-                            formData.terms[term.id] ? "border-amber-500 bg-amber-50" : "border-gray-200 hover:border-amber-200 hover:bg-amber-50/50"
+                            formData.terms[term.id] ? "border-amber-500 bg-[#1E293B]" : "border-gray-200 hover:border-amber-200 hover:bg-amber-50/50"
                           }`}
                         >
                           <input type="checkbox" checked={formData.terms[term.id]} onChange={() => toggleTerm(term.id)} className="hidden" />
@@ -1208,7 +1221,7 @@ export default function AddPropertyPage() {
           {step === 3 && purpose === "sale" && (
             <motion.div variants={fadeInUp} className="space-y-8">
               <div className="text-center mb-6">
-                <div className="w-20 h-20 bg-amber-100 rounded-2xl flex items-center justify-center mx-auto mb-4">
+                <div className="w-20 h-20 bg-amber-500 rounded-2xl flex items-center justify-center mx-auto mb-4">
                   <DollarSign className="w-10 h-10 text-amber-600" />
                 </div>
                 <h2 className="text-2xl font-bold text-gray-900 mb-2">{t("addProperty.salePriceTitle")}</h2>
@@ -1234,7 +1247,7 @@ export default function AddPropertyPage() {
                     onKeyDown={(e) => {
                       if (["-", "e", "E", "+"].includes(e.key)) e.preventDefault();
                     }}
-                    className={`w-full pr-12 pl-4 py-3 border rounded-xl focus:outline-none focus:ring-2 focus:ring-amber-500 ${errors.salePrice ? "border-red-500" : "border-gray-300"}`}
+                    className={`w-full pr-12 pl-4  py-3 border rounded-xl focus:outline-none focus:ring-2 focus:ring-amber-500 ${errors.salePrice ? "border-red-500" : "border-gray-300"}`}
                     placeholder={t("addProperty.salePricePlaceholder")}
                   />
                 </div>
@@ -1248,7 +1261,7 @@ export default function AddPropertyPage() {
                 <select
                   value={selectedCurrencyId}
                   onChange={(e) => setSelectedCurrencyId(parseInt(e.target.value))}
-                  className="w-full px-4 py-3 border border-gray-300 rounded-xl focus:outline-none focus:ring-2 focus:ring-amber-500"
+                  className="w-full px-4 py-3 border border-gray-300 bg-[#1E293B] rounded-xl focus:outline-none focus:ring-2 focus:ring-amber-500"
                 >
                   <option value={Currency.USD}>{t("addProperty.usdOption")}</option>
                   <option value={Currency.SYP}>{t("addProperty.sypOption")}</option>
@@ -1280,7 +1293,7 @@ export default function AddPropertyPage() {
                         type="button"
                         onClick={() => setFormData({ ...formData, offerType: type.id })}
                         className={`p-4 border rounded-xl flex flex-col items-center gap-2 transition-all ${
-                          formData.offerType === type.id ? "border-amber-500 bg-amber-50 text-amber-700" : "border-gray-200 hover:border-amber-200 hover:bg-amber-50/50"
+                          formData.offerType === type.id ? "border-amber-500 bg-[#1E293B] text-amber-700" : "border-gray-200 hover:border-amber-200 hover:bg-amber-50/50"
                         }`}
                       >
                         <Icon className="w-6 h-6" />
@@ -1290,7 +1303,7 @@ export default function AddPropertyPage() {
                   })}
                 </div>
               </div>
-
+              {/* كمسيون */}
               <div>
                 <label className="block text-sm font-medium text-gray-700 mb-2">
                   {t("addProperty.currencyLabel")} <span className="text-red-500">*</span>
@@ -1298,7 +1311,7 @@ export default function AddPropertyPage() {
                 <select
                   value={selectedCurrencyId}
                   onChange={(e) => setSelectedCurrencyId(parseInt(e.target.value))}
-                  className="w-full px-4 py-3 border border-gray-300 rounded-xl focus:outline-none focus:ring-2 focus:ring-amber-500"
+                  className="w-full px-4 py-3 border bg-[#1E293B] border-gray-300 rounded-xl focus:outline-none focus:ring-2 focus:ring-amber-500"
                 >
                   <option value={Currency.USD}>{t("addProperty.usdOption")}</option>
                   <option value={Currency.SYP}>{t("addProperty.sypOption")}</option>
@@ -1506,8 +1519,8 @@ export default function AddPropertyPage() {
           )}
 
           {step === 4 && (
-            <motion.div variants={fadeInUp} className="space-y-8">
-              <div className="text-center mb-6">
+            <motion.div variants={fadeInUp} className="space-y-8 ">
+              <div className="text-center mb-6  ">
                 <div className="w-20 h-20 bg-amber-100 rounded-2xl flex items-center justify-center mx-auto mb-4">
                   <MapPin className="w-10 h-10 text-amber-600" />
                 </div>
@@ -1515,7 +1528,7 @@ export default function AddPropertyPage() {
                 <p className="text-gray-600">{t("addProperty.locationAndImagesSubtitle")}</p>
               </div>
 
-              <div className="rounded-3xl border border-amber-100 bg-linear-to-br from-amber-50 via-white to-orange-50 p-4 sm:p-5 md:p-6 shadow-sm">
+              <div className="rounded-3xl border border-amber-100  p-4 sm:p-5 md:p-6 shadow-sm">
                 <div className="flex flex-col gap-3 md:flex-row md:items-start md:justify-between mb-5">
                   <div>
                     <div className="flex items-center gap-2 text-amber-700 font-semibold mb-1">
@@ -1568,7 +1581,7 @@ export default function AddPropertyPage() {
                         {t("addProperty.searchButton")}
                       </button>
                     </div>
-                    <div className="mt-3 flex items-start gap-2 text-sm text-amber-700">
+                    <div className="mt-3 flex items-start gap-2  text-sm text-amber-700">
                       <Info className="w-4 h-4 mt-0.5 shrink-0" />
                       <span>{t("addProperty.clickMapHint")}</span>
                     </div>
@@ -1589,7 +1602,7 @@ export default function AddPropertyPage() {
                       {t("addProperty.confirmLocation")}
                     </button>
                   ) : (
-                    <div className="rounded-2xl border border-amber-100 bg-amber-50 px-4 py-3 text-sm text-amber-800 flex items-start gap-2">
+                    <div className="rounded-2xl border border-amber-100 bg-[#1E293B] px-4 py-3 text-sm text-amber-800 flex items-start gap-2">
                       <Info className="w-4 h-4 mt-0.5 shrink-0" />
                       <span>{t("addProperty.clickMapHint")}</span>
                     </div>
diff --git a/app/owner/properties/loading.js b/app/owner/properties/loading.js
deleted file mode 100644
index 0c01106..0000000
--- a/app/owner/properties/loading.js
+++ /dev/null
@@ -1,14 +0,0 @@
-'use client';
-
-import { motion } from 'framer-motion';
-
-export default function Loading() {
-  return (
-    <div className="min-h-screen bg-gradient-to-br from-gray-950 via-gray-900 to-gray-950 flex items-center justify-center">
-      <motion.div initial={{ opacity: 0 }} animate={{ opacity: 1 }} className="text-center">
-        <div className="w-14 h-14 border-4 border-amber-500 border-t-transparent rounded-full animate-spin mx-auto mb-4" />
-        <p className="text-gray-400 text-lg">جاري التحميل...</p>
-      </motion.div>
-    </div>
-  );
-}
diff --git a/app/owner/properties/page.js b/app/owner/properties/page.js
index 3776376..b687d1b 100644
--- a/app/owner/properties/page.js
+++ b/app/owner/properties/page.js
@@ -55,18 +55,10 @@ import {
 } from "lucide-react";
 import toast, { Toaster } from "react-hot-toast";
 import AuthService from "../../services/AuthService";
-import {
-  buildRentPropertyPayload,
-  getMyRentListings,
-  getMySaleListings,
-  editRentProperty,
-  editSaleProperty,
-  updateRentPropertyStatus,
-  updateSalePropertyStatus,
-  uploadPicture,
-} from "../../utils/api";
+import { buildRentPropertyPayload, getMyRentListings, getMySaleListings, editRentProperty, editSaleProperty, updateRentPropertyStatus, updateSalePropertyStatus, uploadPicture } from "../../utils/api";
 import { PropertyService } from "../../enums/PropertyService";
 import { PropertyTerm } from "../../enums/PropertyTerm";
+import Loading from "@/app/loading";
 
 const serviceI18nKeys = {
   [PropertyService.ELECTRICITY]: "propertyService.electricity",
@@ -105,12 +97,7 @@ const proximityI18nKeys = {
   BusStation: "proximity.busStation",
 };
 
-const DeleteConfirmationModal = ({
-  isOpen,
-  onClose,
-  onConfirm,
-  propertyTitle,
-}) => {
+const DeleteConfirmationModal = ({ isOpen, onClose, onConfirm, propertyTitle }) => {
   const { t } = useTranslation();
   if (!isOpen) return null;
 
@@ -133,27 +120,17 @@ const DeleteConfirmationModal = ({
           <div className="w-16 h-16 bg-red-100 rounded-full flex items-center justify-center mx-auto mb-3">
             <AlertCircle className="w-8 h-8 text-red-600" />
           </div>
-          <h3 className="text-xl font-bold text-gray-900">{t('deleteConfirmTitle')}</h3>
-          <p className="text-sm text-gray-500 mt-2">
-            {t('deleteConfirmMessage', { title: propertyTitle })}
-          </p>
-          <p className="text-xs text-red-500 mt-1">
-            {t('deleteIrreversible')}
-          </p>
+          <h3 className="text-xl font-bold text-gray-900">{t("deleteConfirmTitle")}</h3>
+          <p className="text-sm text-gray-500 mt-2">{t("deleteConfirmMessage", { title: propertyTitle })}</p>
+          <p className="text-xs text-red-500 mt-1">{t("deleteIrreversible")}</p>
         </div>
 
         <div className="flex gap-3 pt-3">
-          <button
-            onClick={onClose}
-            className="flex-1 bg-gray-100 text-gray-700 py-3 rounded-xl font-medium hover:bg-gray-200 transition-colors"
-          >
-            {t('cancel')}
+          <button onClick={onClose} className="flex-1 bg-gray-100 text-gray-700 py-3 rounded-xl font-medium hover:bg-gray-200 transition-colors">
+            {t("cancel")}
           </button>
-          <button
-            onClick={onConfirm}
-            className="flex-1 bg-red-600 text-white py-3 rounded-xl font-medium hover:bg-red-700 transition-colors"
-          >
-            {t('confirmDelete')}
+          <button onClick={onConfirm} className="flex-1 bg-red-600 text-white py-3 rounded-xl font-medium hover:bg-red-700 transition-colors">
+            {t("confirmDelete")}
           </button>
         </div>
       </motion.div>
@@ -161,13 +138,7 @@ const DeleteConfirmationModal = ({
   );
 };
 
-const DeactivateConfirmationModal = ({
-  isOpen,
-  onClose,
-  onConfirm,
-  propertyTitle,
-  isActivating,
-}) => {
+const DeactivateConfirmationModal = ({ isOpen, onClose, onConfirm, propertyTitle, isActivating }) => {
   const { t } = useTranslation();
   if (!isOpen) return null;
 
@@ -190,49 +161,32 @@ const DeactivateConfirmationModal = ({
           <div className="w-16 h-16 bg-amber-100 rounded-full flex items-center justify-center mx-auto mb-3">
             <AlertCircle className="w-8 h-8 text-amber-600" />
           </div>
-          <h3 className="text-xl font-bold text-gray-900">
-            {isActivating ? t('activateTitle') : t('deactivateTitle')}
-          </h3>
+          <h3 className="text-xl font-bold text-gray-900">{isActivating ? t("activateTitle") : t("deactivateTitle")}</h3>
           <p className="text-sm text-gray-500 mt-2">
             <span className="font-bold text-gray-700">"{propertyTitle}"</span>
           </p>
           {!isActivating ? (
             <div className="mt-4 p-4 bg-red-50 border border-red-200 rounded-xl">
-              <p className="text-sm text-red-700 font-medium">
-                ⚠️ {t('warning')}
-              </p>
-              <p className="text-sm text-red-600 mt-1">
-                {t('deactivateWarning')}
-              </p>
+              <p className="text-sm text-red-700 font-medium">⚠️ {t("warning")}</p>
+              <p className="text-sm text-red-600 mt-1">{t("deactivateWarning")}</p>
             </div>
           ) : (
             <div className="mt-4 p-4 bg-green-50 border border-green-200 rounded-xl">
-              <p className="text-sm text-green-700 font-medium">
-                ✅ {t('activateInfoTitle')}
-              </p>
-              <p className="text-sm text-green-600 mt-1">
-                {t('activateInfo')}
-              </p>
+              <p className="text-sm text-green-700 font-medium">✅ {t("activateInfoTitle")}</p>
+              <p className="text-sm text-green-600 mt-1">{t("activateInfo")}</p>
             </div>
           )}
         </div>
 
         <div className="flex gap-3 pt-3">
-          <button
-            onClick={onClose}
-            className="flex-1 bg-gray-100 text-gray-700 py-3 rounded-xl font-medium hover:bg-gray-200 transition-colors"
-          >
-            {t('cancel')}
+          <button onClick={onClose} className="flex-1 bg-gray-100 text-gray-700 py-3 rounded-xl font-medium hover:bg-gray-200 transition-colors">
+            {t("cancel")}
           </button>
           <button
             onClick={onConfirm}
-            className={`flex-1 py-3 rounded-xl font-medium transition-colors ${
-              isActivating
-                ? "bg-green-600 text-white hover:bg-green-700"
-                : "bg-red-600 text-white hover:bg-red-700"
-            }`}
+            className={`flex-1 py-3 rounded-xl font-medium transition-colors ${isActivating ? "bg-green-600 text-white hover:bg-green-700" : "bg-red-600 text-white hover:bg-red-700"}`}
           >
-            {isActivating ? t('confirmActivate') : t('confirmDeactivate')}
+            {isActivating ? t("confirmActivate") : t("confirmDeactivate")}
           </button>
         </div>
       </motion.div>
@@ -263,14 +217,11 @@ const PropertyViewModal = ({ isOpen, onClose, property }) => {
           <div>
             <h2 className="text-2xl font-bold">{property.title}</h2>
             <p className="text-amber-100 text-sm mt-1">
-              {t('addedOn')}
+              {t("addedOn")}
               {new Date(property.createdAt).toLocaleDateString("ar-SA")}
             </p>
           </div>
-          <button
-            onClick={onClose}
-            className="p-2 hover:bg-white/20 rounded-full transition-colors"
-          >
+          <button onClick={onClose} className="p-2 hover:bg-white/20 rounded-full transition-colors">
             <XCircle className="w-6 h-6" />
           </button>
         </div>
@@ -278,20 +229,11 @@ const PropertyViewModal = ({ isOpen, onClose, property }) => {
         <div className="p-6">
           {property.images && property.images.length > 0 && (
             <div className="mb-6">
-              <h3 className="text-lg font-bold text-gray-900 mb-3">
-                {t('propertyImages')}
-              </h3>
+              <h3 className="text-lg font-bold text-gray-900 mb-3">{t("propertyImages")}</h3>
               <div className="grid grid-cols-2 md:grid-cols-4 gap-4">
                 {property.images.map((image, index) => (
-                  <div
-                    key={index}
-                    className="relative aspect-square rounded-lg overflow-hidden border border-gray-200"
-                  >
-                    <img
-                      src={image}
-                      alt={t('imageAlt', { title: property.title, index: index + 1 })}
-                      className="w-full h-full object-cover"
-                    />
+                  <div key={index} className="relative aspect-square rounded-lg overflow-hidden border border-gray-200">
+                    <img src={image} alt={t("imageAlt", { title: property.title, index: index + 1 })} className="w-full h-full object-cover" />
                   </div>
                 ))}
               </div>
@@ -300,117 +242,101 @@ const PropertyViewModal = ({ isOpen, onClose, property }) => {
 
           <div className="grid grid-cols-1 md:grid-cols-2 gap-6 mb-6">
             <div className="bg-gray-50 p-4 rounded-xl">
-              <h4 className="font-bold text-gray-700 mb-3">{t('basicInfo')}</h4>
+              <h4 className="font-bold text-gray-700 mb-3">{t("basicInfo")}</h4>
               <div className="space-y-2">
                 <p className="text-sm">
-                  <span className="text-gray-500">{t('propertyTypeLabel')}</span>
-                  <span className="font-medium text-gray-900 mr-2">
-                    {property.propertyTypeLabel || t('offer')}
-                  </span>
+                  <span className="text-gray-500">{t("propertyTypeLabel")}</span>
+                  <span className="font-medium text-gray-900 mr-2">{property.propertyTypeLabel || t("offer")}</span>
                 </p>
                 <p className="text-sm">
-                  <span className="text-gray-500">{t('displayTypeLabel')}</span>
+                  <span className="text-gray-500">{t("displayTypeLabel")}</span>
                   <span className="font-medium text-gray-900 mr-2">
                     {property.displayType === "Daily rent"
-                      ? t('dailyRent')
+                      ? t("dailyRent")
                       : property.displayType === "Monthly rent"
-                        ? t('monthlyRent')
+                        ? t("monthlyRent")
                         : property.displayType === "Both"
-                          ? t('dailyAndMonthly')
+                          ? t("dailyAndMonthly")
                           : property.displayType === "For sale"
-                            ? t('forSale')
+                            ? t("forSale")
                             : property.rentType === "daily"
-                              ? t('dailyRent')
+                              ? t("dailyRent")
                               : property.rentType === "monthly"
-                                ? t('monthlyRent')
-                                : (property.dailyPrice > 0 && property.monthlyPrice > 0)
-                                  ? t('dailyAndMonthly')
+                                ? t("monthlyRent")
+                                : property.dailyPrice > 0 && property.monthlyPrice > 0
+                                  ? t("dailyAndMonthly")
                                   : property.monthlyPrice > 0
-                                    ? t('monthlyRent')
+                                    ? t("monthlyRent")
                                     : property.dailyPrice > 0
-                                      ? t('dailyRent')
-                                      : property.purpose === "sale" ? t('forSale') : t('offer')}
+                                      ? t("dailyRent")
+                                      : property.purpose === "sale"
+                                        ? t("forSale")
+                                        : t("offer")}
                   </span>
                 </p>
                 {property.purpose === "rent" && (
                   <p className="text-sm">
-                    <span className="text-gray-500">{t('furnishedStatusLabel')}</span>
-                    <span
-                      className={`font-medium mr-2 ${property.furnished ? "text-green-600" : "text-gray-600"}`}
-                    >
-                      {property.furnished ? t('furnished') : t('unfurnished')}
-                    </span>
+                    <span className="text-gray-500">{t("furnishedStatusLabel")}</span>
+                    <span className={`font-medium mr-2 ${property.furnished ? "text-green-600" : "text-gray-600"}`}>{property.furnished ? t("furnished") : t("unfurnished")}</span>
                   </p>
                 )}
                 <p className="text-sm">
-                  <span className="text-gray-500">{t('propertyStatusLabel')}</span>
-                  <span
-                    className={`font-medium mr-2 ${property.status === "available" ? "text-green-600" : "text-yellow-600"}`}
-                  >
-                    {property.status === "available" ? t('available') : t('rented')}
-                  </span>
+                  <span className="text-gray-500">{t("propertyStatusLabel")}</span>
+                  <span className={`font-medium mr-2 ${property.status === "available" ? "text-green-600" : "text-yellow-600"}`}>{property.status === "available" ? t("available") : t("rented")}</span>
                 </p>
                 {property.description && (
                   <p className="text-sm mt-2">
-                    <span className="text-gray-500">{t('descriptionLabel')}</span>
-                    <span className="text-gray-700 mr-2">
-                      {property.description}
-                    </span>
+                    <span className="text-gray-500">{t("descriptionLabel")}</span>
+                    <span className="text-gray-700 mr-2">{property.description}</span>
                   </p>
                 )}
               </div>
             </div>
 
             <div className="bg-gray-50 p-4 rounded-xl">
-              <h4 className="font-bold text-gray-700 mb-3">{t('basicInfo')}</h4>
+              <h4 className="font-bold text-gray-700 mb-3">{t("basicInfo")}</h4>
               <div className="grid grid-cols-4 gap-2">
                 <div className="text-center">
                   <Bed className="w-5 h-5 text-amber-500 mx-auto mb-1" />
                   <span className="text-sm font-bold">{property.bedrooms}</span>
-                  <span className="text-xs text-gray-500 block">{t('rooms')}</span>
+                  <span className="text-xs text-gray-500 block">{t("rooms")}</span>
                 </div>
                 <div className="text-center">
                   <Bath className="w-5 h-5 text-amber-500 mx-auto mb-1" />
-                  <span className="text-sm font-bold">
-                    {property.bathrooms}
-                  </span>
-                  <span className="text-xs text-gray-500 block">{t('bathrooms')}</span>
+                  <span className="text-sm font-bold">{property.bathrooms}</span>
+                  <span className="text-xs text-gray-500 block">{t("bathrooms")}</span>
                 </div>
                 <div className="text-center">
                   <Square className="w-5 h-5 text-amber-500 mx-auto mb-1" />
                   <span className="text-sm font-bold">{property.area}</span>
-                  <span className="text-xs text-gray-500 block">{t('sqm')}</span>
+                  <span className="text-xs text-gray-500 block">{t("sqm")}</span>
                 </div>
                 {property.floor > 0 && (
                   <div className="text-center">
                     <Layers className="w-5 h-5 text-amber-500 mx-auto mb-1" />
                     <span className="text-sm font-bold">{property.floor}</span>
-                    <span className="text-xs text-gray-500 block">{t('floor')}</span>
+                    <span className="text-xs text-gray-500 block">{t("floor")}</span>
                   </div>
                 )}
                 {property.salons > 0 && (
                   <div className="text-center">
                     <Sofa className="w-5 h-5 text-amber-500 mx-auto mb-1" />
                     <span className="text-sm font-bold">{property.salons}</span>
-                    <span className="text-xs text-gray-500 block">{t('salons')}</span>
+                    <span className="text-xs text-gray-500 block">{t("salons")}</span>
                   </div>
                 )}
                 {property.balconies > 0 && (
                   <div className="text-center">
                     <DoorOpen className="w-5 h-5 text-amber-500 mx-auto mb-1" />
-                    <span className="text-sm font-bold">
-                      {property.balconies}
-                    </span>
-                    <span className="text-xs text-gray-500 block">{t('balconies')}</span>
+                    <span className="text-sm font-bold">{property.balconies}</span>
+                    <span className="text-xs text-gray-500 block">{t("balconies")}</span>
                   </div>
                 )}
                 {property.bookedCount > 0 && (
                   <div className="text-center">
                     <Calendar className="w-5 h-5 text-amber-500 mx-auto mb-1" />
-                    <span className="text-sm font-bold">
-                      {property.bookedCount}
-                    </span>
-                    <span className="text-xs text-gray-500 block">{t('bookings')}</span>
+                    <span className="text-sm font-bold">{property.bookedCount}</span>
+                    <span className="text-xs text-gray-500 block">{t("bookings")}</span>
                   </div>
                 )}
               </div>
@@ -420,79 +346,60 @@ const PropertyViewModal = ({ isOpen, onClose, property }) => {
           <div className="bg-gray-50 p-4 rounded-xl mb-6">
             <h4 className="font-bold text-gray-700 mb-3 flex items-center gap-2">
               <MapPin className="w-5 h-5 text-amber-500" />
-              {t('location')}
+              {t("location")}
             </h4>
             <p className="text-gray-700">
-              {property.address || t('addressNotSpecified')}
+              {property.address || t("addressNotSpecified")}
               {property.city && `، ${property.city}`}
               {property.district && `، ${property.district}`}
             </p>
           </div>
 
-          {property.services &&
-            (Array.isArray(property.services)
-              ? property.services.length > 0
-              : Object.keys(property.services).length > 0) && (
-              <div className="bg-gray-50 p-4 rounded-xl mb-6">
-                <h4 className="font-bold text-gray-700 mb-3">
-                  {t('availableServices')}
-                </h4>
-                <div className="flex flex-wrap gap-2">
-                  {Array.isArray(property.services)
-                    ? property.services.map((svc, i) => (
-                        <span
-                          key={i}
-                          className="inline-flex items-center gap-1 px-3 py-1 bg-green-100 text-green-800 rounded-full text-sm"
-                        >
-                          {t(serviceI18nKeys[svc]) || svc}
+          {property.services && (Array.isArray(property.services) ? property.services.length > 0 : Object.keys(property.services).length > 0) && (
+            <div className="bg-gray-50 p-4 rounded-xl mb-6">
+              <h4 className="font-bold text-gray-700 mb-3">{t("availableServices")}</h4>
+              <div className="flex flex-wrap gap-2">
+                {Array.isArray(property.services)
+                  ? property.services.map((svc, i) => (
+                      <span key={i} className="inline-flex items-center gap-1 px-3 py-1 bg-green-100 text-green-800 rounded-full text-sm">
+                        {t(serviceI18nKeys[svc]) || svc}
+                      </span>
+                    ))
+                  : Object.entries(property.services).map(([key, value]) => {
+                      if (!value) return null;
+                      const detail = typeof value === "object" && value.detail ? value.detail : typeof value === "string" ? value : null;
+                      return (
+                        <span key={key} className="inline-flex items-center gap-1 px-3 py-1 bg-green-100 text-green-800 rounded-full text-sm">
+                          {t(serviceI18nKeys[key]) || key}
+                          {detail && <span className="text-green-400">· {detail}</span>}
                         </span>
-                      ))
-                    : Object.entries(property.services).map(([key, value]) => {
-                        if (!value) return null;
-                        const detail =
-                          typeof value === "object" && value.detail
-                            ? value.detail
-                            : typeof value === "string"
-                              ? value
-                              : null;
-                        return (
-                          <span
-                            key={key}
-                            className="inline-flex items-center gap-1 px-3 py-1 bg-green-100 text-green-800 rounded-full text-sm"
-                          >
-                            {t(serviceI18nKeys[key]) || key}
-                            {detail && (
-                              <span className="text-green-400">· {detail}</span>
-                            )}
-                          </span>
-                        );
-                      })}
-                </div>
+                      );
+                    })}
               </div>
-            )}
+            </div>
+          )}
 
           {property.proximity && Object.keys(property.proximity).length > 0 && (
             <div className="bg-gray-50 p-4 rounded-xl mb-6">
-              <h4 className="font-bold text-gray-700 mb-3">{t('proximityToServices')}</h4>
+              <h4 className="font-bold text-gray-700 mb-3">{t("proximityToServices")}</h4>
               <div className="grid grid-cols-2 md:grid-cols-3 gap-2">
                 {Object.entries(property.proximity).map(([key, val]) => {
                   if (!val) return null;
                   const dist = typeof val === "object" ? val.distance : val;
                   return (
-                    <div
-                      key={key}
-                      className="flex items-center gap-2 p-2 bg-white rounded-lg"
-                    >
+                    <div key={key} className="flex items-center gap-2 p-2 bg-white rounded-lg">
                       {key === "School" && <School className="w-4 h-4 text-amber-500" />}
                       {key === "Hospital" && <Hospital className="w-4 h-4 text-amber-500" />}
                       {key === "Restaurant" && <Store className="w-4 h-4 text-amber-500" />}
                       {key === "University" && <GraduationCap className="w-4 h-4 text-amber-500" />}
                       {key === "Park" && <TreePine className="w-4 h-4 text-amber-500" />}
                       {key === "Mall" && <Building className="w-4 h-4 text-amber-500" />}
-                      {!["School","Hospital","Restaurant","University","Park","Mall"].includes(key) && <MapPin className="w-4 h-4 text-amber-500" />}
+                      {!["School", "Hospital", "Restaurant", "University", "Park", "Mall"].includes(key) && <MapPin className="w-4 h-4 text-amber-500" />}
                       <div>
                         <span className="text-sm text-gray-700">{t(proximityI18nKeys[key]) || key}</span>
-                        <span className="text-xs text-gray-500 mr-1">{dist} {typeof dist === "number" ? t('km') : ""}</span>
+                        <span className="text-xs text-gray-500 mr-1">
+                          {dist} {typeof dist === "number" ? t("km") : ""}
+                        </span>
                       </div>
                     </div>
                   );
@@ -503,23 +410,14 @@ const PropertyViewModal = ({ isOpen, onClose, property }) => {
 
           {property.terms && Object.keys(property.terms).length > 0 && (
             <div className="bg-gray-50 p-4 rounded-xl mb-6">
-              <h4 className="font-bold text-gray-700 mb-3">{t('termsOfUse')}</h4>
+              <h4 className="font-bold text-gray-700 mb-3">{t("termsOfUse")}</h4>
               <div className="grid grid-cols-1 md:grid-cols-2 gap-2">
                 {Object.entries(property.terms).map(([key, value]) => {
                   if (!value) return null;
                   return (
-                    <div
-                      key={key}
-                      className="flex items-center gap-2 p-2 bg-white rounded-lg"
-                    >
-                      {key.startsWith("No") || key.startsWith("Only") ? (
-                        <Ban className="w-4 h-4 text-red-500 flex-shrink-0" />
-                      ) : (
-                        <Check className="w-4 h-4 text-green-500 flex-shrink-0" />
-                      )}
-                      <span className="text-sm text-gray-700">
-                        {t(termI18nKeys[key]) || key}
-                      </span>
+                    <div key={key} className="flex items-center gap-2 p-2 bg-white rounded-lg">
+                      {key.startsWith("No") || key.startsWith("Only") ? <Ban className="w-4 h-4 text-red-500 flex-shrink-0" /> : <Check className="w-4 h-4 text-green-500 flex-shrink-0" />}
+                      <span className="text-sm text-gray-700">{t(termI18nKeys[key]) || key}</span>
                     </div>
                   );
                 })}
@@ -528,56 +426,50 @@ const PropertyViewModal = ({ isOpen, onClose, property }) => {
           )}
 
           <div className="bg-amber-50 p-4 rounded-xl">
-            <h4 className="font-bold text-amber-700 mb-3">{t('priceInfo')}</h4>
+            <h4 className="font-bold text-amber-700 mb-3">{t("priceInfo")}</h4>
             {property.purpose === "rent" ? (
               <div className="space-y-2">
                 {property.dailyPrice > 0 && (
                   <p className="flex justify-between">
-                    <span className="text-gray-600">{t('dailyPriceLabel')}</span>
+                    <span className="text-gray-600">{t("dailyPriceLabel")}</span>
                     <span className="font-bold text-amber-600">
-                      {Number(property.dailyPrice).toLocaleString()} {t('syp')}
+                      {Number(property.dailyPrice).toLocaleString()} {t("syp")}
                     </span>
                   </p>
                 )}
                 {property.monthlyPrice > 0 && (
                   <p className="flex justify-between">
-                    <span className="text-gray-600">{t('monthlyPriceLabel')}</span>
+                    <span className="text-gray-600">{t("monthlyPriceLabel")}</span>
                     <span className="font-bold text-amber-600">
-                      {Number(property.monthlyPrice).toLocaleString()} {t('syp')}
+                      {Number(property.monthlyPrice).toLocaleString()} {t("syp")}
                     </span>
                   </p>
                 )}
                 {property.deposit > 0 && (
                   <p className="flex justify-between">
-                    <span className="text-gray-600">{t('depositLabel')}</span>
+                    <span className="text-gray-600">{t("depositLabel")}</span>
                     <span className="font-bold text-gray-700">
-                      {Number(property.deposit).toLocaleString()} {t('syp')}
+                      {Number(property.deposit).toLocaleString()} {t("syp")}
                     </span>
                   </p>
                 )}
                 <p className="text-sm text-gray-500 mt-1">
-                  {t('rentTypeLabel')}{" "}
-                  {property.rentType === "daily"
-                    ? t('daily')
-                    : property.rentType === "monthly"
-                      ? t('monthly')
-                      : t('dailyAndMonthly')}
+                  {t("rentTypeLabel")} {property.rentType === "daily" ? t("daily") : property.rentType === "monthly" ? t("monthly") : t("dailyAndMonthly")}
                 </p>
                 {property.rating > 0 && (
                   <p className="flex justify-between mt-2 pt-2 border-t border-amber-200">
-                    <span className="text-gray-600">{t('ratingLabel')}</span>
+                    <span className="text-gray-600">{t("ratingLabel")}</span>
                     <span className="font-bold text-amber-600 flex items-center gap-1">
-                      {Number(property.rating).toFixed(1)}{" "}
-                      <Star className="w-4 h-4 fill-amber-500" />
+                      {Number(property.rating).toFixed(1)} <Star className="w-4 h-4 fill-amber-500" />
                     </span>
                   </p>
                 )}
               </div>
             ) : (
               <p className="flex justify-between">
-                <span className="text-gray-600">{t('salePriceLabel')}</span>
+                <span className="text-gray-600">{t("salePriceLabel")}</span>
                 <span className="font-bold text-blue-600">
-                  {Number(property.salePrice).toLocaleString()} {t('syp')}
+                  {Number(property.salePrice).toLocaleString()} {t("syp")}
                 </span>
               </p>
             )}
@@ -591,9 +483,9 @@ const PropertyViewModal = ({ isOpen, onClose, property }) => {
 const PropertyEditModal = ({ isOpen, onClose, property, onSave }) => {
   const { t } = useTranslation();
   const [formData, setFormData] = useState({
-    propertyType: 'apartment',
+    propertyType: "apartment",
     furnished: false,
-    description: '',
+    description: "",
     bedrooms: 0,
     bathrooms: 0,
     floor: 0,
@@ -605,31 +497,30 @@ const PropertyEditModal = ({ isOpen, onClose, property, onSave }) => {
     serviceDetails: {},
     terms: {},
     customTerms: [],
-    nearbySchool: '',
-    nearbyHospital: '',
-    nearbyRestaurant: '',
-    nearbyUniversity: '',
-    nearbyPark: '',
-    nearbyMall: '',
-    purpose: 'rent',
+    nearbySchool: "",
+    nearbyHospital: "",
+    nearbyRestaurant: "",
+    nearbyUniversity: "",
+    nearbyPark: "",
+    nearbyMall: "",
+    purpose: "rent",
     currencyId: 1,
     dailyPrice: 0,
     monthlyPrice: 0,
     deposit: 0,
-    rentType: 'monthly',
-    allowedPaymentPeriod: '',
+    rentType: "monthly",
+    allowedPaymentPeriod: "",
     salePrice: 0,
   });
-  const [newCustomTerm, setNewCustomTerm] = useState('');
+  const [newCustomTerm, setNewCustomTerm] = useState("");
   const [isSaving, setIsSaving] = useState(false);
   const [existingImages, setExistingImages] = useState([]);
   const [newImages, setNewImages] = useState([]);
-  const editApiBase =
-    process.env.NEXT_PUBLIC_API_URL || 'https://45.93.137.91.nip.io/api';
+  const editApiBase = process.env.NEXT_PUBLIC_API_URL || "https://45.93.137.91.nip.io/api";
 
   const editImgUrl = (path) => {
     if (!path) return null;
-    if (path.startsWith('http://') || path.startsWith('https://')) return path;
+    if (path.startsWith("http://") || path.startsWith("https://")) return path;
     return `${editApiBase}${path}`;
   };
 
@@ -639,10 +530,7 @@ const PropertyEditModal = ({ isOpen, onClose, property, onSave }) => {
     const info = raw.propertyInformation || {};
     let details = {};
     try {
-      details =
-        typeof info.detailsJSON === 'object' && info.detailsJSON
-          ? info.detailsJSON
-          : JSON.parse(info.detailsJSON || '{}');
+      details = typeof info.detailsJSON === "object" && info.detailsJSON ? info.detailsJSON : JSON.parse(info.detailsJSON || "{}");
     } catch {
       details = {};
     }
@@ -653,15 +541,15 @@ const PropertyEditModal = ({ isOpen, onClose, property, onSave }) => {
 
     Object.keys(serviceI18nKeys).forEach((key) => {
       const val = propServices[key];
-      if (val && typeof val === 'string') {
+      if (val && typeof val === "string") {
         services[key] = true;
         serviceDetails[key] = val;
-      } else if (val && typeof val === 'object' && val.detail) {
+      } else if (val && typeof val === "object" && val.detail) {
         services[key] = true;
         serviceDetails[key] = val.detail;
       } else {
         services[key] = !!val;
-        serviceDetails[key] = details.serviceDetails?.[key] || '';
+        serviceDetails[key] = details.serviceDetails?.[key] || "";
       }
     });
 
@@ -669,7 +557,7 @@ const PropertyEditModal = ({ isOpen, onClose, property, onSave }) => {
     rawSvcArray.forEach((key) => {
       if (!(key in services)) {
         services[key] = true;
-        serviceDetails[key] = details.serviceDetails?.[key] || '';
+        serviceDetails[key] = details.serviceDetails?.[key] || "";
       }
     });
 
@@ -678,7 +566,7 @@ const PropertyEditModal = ({ isOpen, onClose, property, onSave }) => {
     Object.keys(termI18nKeys).forEach((key) => {
       terms[key] = !!propTerms[key];
     });
-    if (details.terms && typeof details.terms === 'object') {
+    if (details.terms && typeof details.terms === "object") {
       Object.entries(details.terms).forEach(([key, val]) => {
         if (val && !(key in terms)) {
           terms[key] = true;
@@ -689,52 +577,41 @@ const PropertyEditModal = ({ isOpen, onClose, property, onSave }) => {
     const prox = property.proximity || details.nearbyDistances || {};
 
     setFormData({
-      propertyType: property.propertyType || 'apartment',
+      propertyType: property.propertyType || "apartment",
       furnished: property.furnished ?? false,
-      description: property.description || details.description || '',
+      description: property.description || details.description || "",
       bedrooms: property.bedrooms || 0,
       bathrooms: property.bathrooms || 0,
       floor: property.floor ?? details.floorNumber ?? details.floor ?? 0,
       salons: property.salons ?? details.numberOfSalons ?? details.salons ?? 0,
-      balconies:
-        property.balconies ??
-        details.numberOfBalconies ??
-        details.balconies ??
-        0,
+      balconies: property.balconies ?? details.numberOfBalconies ?? details.balconies ?? 0,
       livingRooms: property.livingRooms ?? details.numberOfLivingRooms ?? details.livingRooms ?? 0,
       area: property.area || 0,
       services,
       serviceDetails,
       terms,
       customTerms: details.customTerms || [],
-      nearbySchool: prox.School ?? prox.school ?? prox.nearbySchool ?? '',
-      nearbyHospital: prox.Hospital ?? prox.hospital ?? prox.nearbyHospital ?? '',
-      nearbyRestaurant: prox.Restaurant ?? prox.restaurant ?? prox.nearbyRestaurant ?? '',
-      nearbyUniversity: prox.University ?? prox.university ?? prox.nearbyUniversity ?? '',
-      nearbyPark: prox.Park ?? prox.park ?? prox.nearbyPark ?? '',
-      nearbyMall: prox.Mall ?? prox.mall ?? prox.nearbyMall ?? '',
-      purpose: property.purpose || 'rent',
+      nearbySchool: prox.School ?? prox.school ?? prox.nearbySchool ?? "",
+      nearbyHospital: prox.Hospital ?? prox.hospital ?? prox.nearbyHospital ?? "",
+      nearbyRestaurant: prox.Restaurant ?? prox.restaurant ?? prox.nearbyRestaurant ?? "",
+      nearbyUniversity: prox.University ?? prox.university ?? prox.nearbyUniversity ?? "",
+      nearbyPark: prox.Park ?? prox.park ?? prox.nearbyPark ?? "",
+      nearbyMall: prox.Mall ?? prox.mall ?? prox.nearbyMall ?? "",
+      purpose: property.purpose || "rent",
       currencyId: property.currencyId || 1,
-      ...(property.purpose === 'rent'
+      ...(property.purpose === "rent"
         ? {
             dailyPrice: property.dailyPrice || 0,
             monthlyPrice: property.monthlyPrice || 0,
             deposit: property.deposit || 0,
-            rentType: property.rentType || 'monthly',
-            allowedPaymentPeriod:
-              property.allowedPaymentPeriod ||
-              details.allowedPaymentPeriod ||
-              '',
+            rentType: property.rentType || "monthly",
+            allowedPaymentPeriod: property.allowedPaymentPeriod || details.allowedPaymentPeriod || "",
           }
         : { salePrice: property.salePrice || 0 }),
     });
-    setNewCustomTerm('');
+    setNewCustomTerm("");
     setNewImages([]);
-    const rawImages = Array.isArray(property.images)
-      ? property.images
-      : Array.isArray(info.images)
-        ? info.images
-        : [];
+    const rawImages = Array.isArray(property.images) ? property.images : Array.isArray(info.images) ? info.images : [];
     setExistingImages(rawImages.filter((p) => p && p.trim()));
   }, [property, isOpen]);
 
@@ -770,7 +647,7 @@ const PropertyEditModal = ({ isOpen, onClose, property, onSave }) => {
       ...prev,
       customTerms: [...(prev.customTerms || []), term],
     }));
-    setNewCustomTerm('');
+    setNewCustomTerm("");
   };
 
   const removeCustomTerm = (index) => {
@@ -796,9 +673,9 @@ const PropertyEditModal = ({ isOpen, onClose, property, onSave }) => {
 
   const handleAddImages = async (files) => {
     const validFiles = Array.from(files).filter((f) => {
-      if (!f.type.startsWith('image/')) return false;
+      if (!f.type.startsWith("image/")) return false;
       if (f.size > 5 * 1024 * 1024) {
-        toast.error(t('fileTooLarge') || 'الصورة كبيرة جداً');
+        toast.error(t("fileTooLarge") || "الصورة كبيرة جداً");
         return false;
       }
       return true;
@@ -808,7 +685,7 @@ const PropertyEditModal = ({ isOpen, onClose, property, onSave }) => {
     const currentCount = existingImages.length + newImages.length;
     const slots = maxTotal - currentCount;
     if (slots <= 0) {
-      toast.error(t('maxImagesReached') || 'الحد الأقصى 10 صور');
+      toast.error(t("maxImagesReached") || "الحد الأقصى 10 صور");
       return;
     }
     const toAdd = validFiles.slice(0, slots);
@@ -826,7 +703,7 @@ const PropertyEditModal = ({ isOpen, onClose, property, onSave }) => {
         const path = result?.value || result?.path || result?.url || result;
         entry.path = path;
       } catch {
-        toast.error(t('uploadFailed') || 'فشل رفع الصورة');
+        toast.error(t("uploadFailed") || "فشل رفع الصورة");
       } finally {
         entry.uploading = false;
         setNewImages((prev) => [...prev]);
@@ -852,16 +729,16 @@ const PropertyEditModal = ({ isOpen, onClose, property, onSave }) => {
 
   const handleSave = async () => {
     const errors = [];
-    if (!formData.description?.trim()) errors.push(t('descriptionRequired') || 'الوصف مطلوب');
-    if (formData.bedrooms < 1) errors.push(t('bedroomsRequired') || 'يجب أن يكون عدد الغرف على الأقل 1');
-    if (formData.bathrooms < 1) errors.push(t('bathroomsRequired') || 'يجب أن يكون عدد الحمامات على الأقل 1');
-    if (!formData.area || formData.area <= 0) errors.push(t('areaRequired') || 'المساحة مطلوبة');
-    if (formData.purpose === 'rent') {
+    if (!formData.description?.trim()) errors.push(t("descriptionRequired") || "الوصف مطلوب");
+    if (formData.bedrooms < 1) errors.push(t("bedroomsRequired") || "يجب أن يكون عدد الغرف على الأقل 1");
+    if (formData.bathrooms < 1) errors.push(t("bathroomsRequired") || "يجب أن يكون عدد الحمامات على الأقل 1");
+    if (!formData.area || formData.area <= 0) errors.push(t("areaRequired") || "المساحة مطلوبة");
+    if (formData.purpose === "rent") {
       if ((!formData.dailyPrice || formData.dailyPrice <= 0) && (!formData.monthlyPrice || formData.monthlyPrice <= 0)) {
-        errors.push(t('priceRequired') || 'يجب إدخال سعر الأجر الشهري أو اليومي');
+        errors.push(t("priceRequired") || "يجب إدخال سعر الأجر الشهري أو اليومي");
       }
-    } else if (formData.purpose === 'sale') {
-      if (!formData.salePrice || formData.salePrice <= 0) errors.push(t('priceRequired') || 'السعر مطلوب');
+    } else if (formData.purpose === "sale") {
+      if (!formData.salePrice || formData.salePrice <= 0) errors.push(t("priceRequired") || "السعر مطلوب");
     }
     if (errors.length > 0) {
       toast.error(errors[0]);
@@ -869,9 +746,7 @@ const PropertyEditModal = ({ isOpen, onClose, property, onSave }) => {
     }
     setIsSaving(true);
     try {
-      const uploadedPaths = newImages
-        .filter((e) => e.path && !e.uploading)
-        .map((e) => e.path);
+      const uploadedPaths = newImages.filter((e) => e.path && !e.uploading).map((e) => e.path);
       const allImages = [...existingImages, ...uploadedPaths];
       await onSave({ ...formData, _images: allImages });
     } catch {
@@ -898,15 +773,10 @@ const PropertyEditModal = ({ isOpen, onClose, property, onSave }) => {
       >
         <div className="sticky top-0 z-10 bg-gradient-to-r from-amber-500 to-amber-600 p-6 text-white flex justify-between items-center">
           <div>
-            <h2 className="text-2xl font-bold">{t('editProperty')}</h2>
-            <p className="text-amber-100 text-sm mt-1">
-              {t('editSubtitle')}
-            </p>
+            <h2 className="text-2xl font-bold">{t("editProperty")}</h2>
+            <p className="text-amber-100 text-sm mt-1">{t("editSubtitle")}</p>
           </div>
-          <button
-            onClick={onClose}
-            className="p-2 hover:bg-white/20 rounded-full transition-colors"
-          >
+          <button onClick={onClose} className="p-2 hover:bg-white/20 rounded-full transition-colors">
             <XCircle className="w-6 h-6" />
           </button>
         </div>
@@ -914,66 +784,45 @@ const PropertyEditModal = ({ isOpen, onClose, property, onSave }) => {
         <div className="p-6 space-y-6 overflow-y-auto flex-1">
           {/* Basic Info */}
           <div className="bg-gray-50 p-4 rounded-xl">
-            <h3 className="text-lg font-bold text-gray-900 mb-4">
-              {t('basicInfo')}
-            </h3>
+            <h3 className="text-lg font-bold text-gray-900 mb-4">{t("basicInfo")}</h3>
             <div className="space-y-4">
               <div>
-                <label className="block text-sm font-medium text-gray-700 mb-1">
-                  {t('propertyTypeLabel')}
-                </label>
+                <label className="block text-sm font-medium text-gray-700 mb-1">{t("propertyTypeLabel")}</label>
                 <select
                   value={formData.propertyType}
-                  onChange={(e) =>
-                    handleChange('propertyType', e.target.value)
-                  }
+                  onChange={(e) => handleChange("propertyType", e.target.value)}
                   className="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-amber-500"
                 >
-                  <option value="apartment">{t('buildingType.apartment')}</option>
-                  <option value="villa">{t('buildingType.villa')}</option>
-                  <option value="sweet">{t('buildingType.sweet')}</option>
-                  <option value="room">{t('buildingType.room')}</option>
-                  <option value="studio">{t('buildingType.studio')}</option>
-                  <option value="office">{t('buildingType.office')}</option>
-                  <option value="farms">{t('buildingType.farms')}</option>
-                  <option value="shop">{t('buildingType.shop')}</option>
-                  <option value="warehouse">{t('buildingType.warehouse')}</option>
+                  <option value="apartment">{t("buildingType.apartment")}</option>
+                  <option value="villa">{t("buildingType.villa")}</option>
+                  <option value="sweet">{t("buildingType.sweet")}</option>
+                  <option value="room">{t("buildingType.room")}</option>
+                  <option value="studio">{t("buildingType.studio")}</option>
+                  <option value="office">{t("buildingType.office")}</option>
+                  <option value="farms">{t("buildingType.farms")}</option>
+                  <option value="shop">{t("buildingType.shop")}</option>
+                  <option value="warehouse">{t("buildingType.warehouse")}</option>
                 </select>
               </div>
               <div>
-                <label className="block text-sm font-medium text-gray-700 mb-2">
-                  {t('furnishedStatusLabel')}
-                </label>
+                <label className="block text-sm font-medium text-gray-700 mb-2">{t("furnishedStatusLabel")}</label>
                 <div className="flex gap-4">
                   {[
-                    { value: true, label: t('furnished') },
-                    { value: false, label: t('unfurnished') },
+                    { value: true, label: t("furnished") },
+                    { value: false, label: t("unfurnished") },
                   ].map((opt) => (
-                    <label
-                      key={String(opt.value)}
-                      className="flex items-center gap-2 cursor-pointer"
-                    >
-                      <input
-                        type="radio"
-                        name="furnished"
-                        checked={formData.furnished === opt.value}
-                        onChange={() => handleChange('furnished', opt.value)}
-                        className="w-4 h-4 text-amber-500"
-                      />
+                    <label key={String(opt.value)} className="flex items-center gap-2 cursor-pointer">
+                      <input type="radio" name="furnished" checked={formData.furnished === opt.value} onChange={() => handleChange("furnished", opt.value)} className="w-4 h-4 text-amber-500" />
                       <span className="text-sm">{opt.label}</span>
                     </label>
                   ))}
                 </div>
               </div>
               <div>
-                <label className="block text-sm font-medium text-gray-700 mb-1">
-                  {t('descriptionLabel')}
-                </label>
+                <label className="block text-sm font-medium text-gray-700 mb-1">{t("descriptionLabel")}</label>
                 <textarea
                   value={formData.description}
-                  onChange={(e) =>
-                    handleChange('description', e.target.value)
-                  }
+                  onChange={(e) => handleChange("description", e.target.value)}
                   className="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-amber-500"
                   rows={3}
                 />
@@ -983,28 +832,24 @@ const PropertyEditModal = ({ isOpen, onClose, property, onSave }) => {
 
           {/* Details */}
           <div className="bg-gray-50 p-4 rounded-xl">
-            <h3 className="text-lg font-bold text-gray-900 mb-4">{t('basicInfo')}</h3>
+            <h3 className="text-lg font-bold text-gray-900 mb-4">{t("basicInfo")}</h3>
             <div className="grid grid-cols-2 md:grid-cols-3 gap-4">
               {[
-                { id: 'bedrooms', label: t('bedroomsCount') },
-                { id: 'bathrooms', label: t('bathroomsCount') },
-                { id: 'livingRooms', label: t('livingRoomsCount') },
-                { id: 'floor', label: t('floorLabel') },
-                { id: 'salons', label: t('salonsCount') },
-                { id: 'balconies', label: t('balconiesCount') },
-                { id: 'area', label: t('areaSqm') },
+                { id: "bedrooms", label: t("bedroomsCount") },
+                { id: "bathrooms", label: t("bathroomsCount") },
+                { id: "livingRooms", label: t("livingRoomsCount") },
+                { id: "floor", label: t("floorLabel") },
+                { id: "salons", label: t("salonsCount") },
+                { id: "balconies", label: t("balconiesCount") },
+                { id: "area", label: t("areaSqm") },
               ].map((field) => (
                 <div key={field.id}>
-                  <label className="block text-sm font-medium text-gray-700 mb-1">
-                    {field.label}
-                  </label>
+                  <label className="block text-sm font-medium text-gray-700 mb-1">{field.label}</label>
                   <input
                     type="number"
                     min="0"
                     value={formData[field.id]}
-                    onChange={(e) =>
-                      handleChange(field.id, Number(e.target.value))
-                    }
+                    onChange={(e) => handleChange(field.id, Number(e.target.value))}
                     className="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-amber-500"
                   />
                 </div>
@@ -1014,22 +859,34 @@ const PropertyEditModal = ({ isOpen, onClose, property, onSave }) => {
 
           {/* Images */}
           <div className="bg-gray-50 p-4 rounded-xl">
-            <h3 className="text-lg font-bold text-gray-900 mb-4">{t('images')}</h3>
+            <h3 className="text-lg font-bold text-gray-900 mb-4">{t("images")}</h3>
             <div className="grid grid-cols-2 sm:grid-cols-3 md:grid-cols-4 gap-3">
               {existingImages.map((path, i) => (
                 <div key={`e-${i}`} className="relative group aspect-square rounded-xl overflow-hidden bg-white border border-gray-200">
                   <img src={editImgUrl(path)} alt="" className="w-full h-full object-cover" />
                   <div className="absolute inset-0 bg-black/40 opacity-0 group-hover:opacity-100 transition-opacity flex items-center justify-center gap-2">
-                    <button type="button" onClick={() => handleRemoveExistingImage(i)} className="w-8 h-8 bg-red-500 text-white rounded-full flex items-center justify-center hover:bg-red-600 shadow-md">
+                    <button
+                      type="button"
+                      onClick={() => handleRemoveExistingImage(i)}
+                      className="w-8 h-8 bg-red-500 text-white rounded-full flex items-center justify-center hover:bg-red-600 shadow-md"
+                    >
                       <Trash2 className="w-4 h-4" />
                     </button>
                     {i > 0 && (
-                      <button type="button" onClick={() => handleMoveExistingImage(i, -1)} className="w-8 h-8 bg-white text-gray-700 rounded-full flex items-center justify-center hover:bg-gray-100 shadow-md">
+                      <button
+                        type="button"
+                        onClick={() => handleMoveExistingImage(i, -1)}
+                        className="w-8 h-8 bg-white text-gray-700 rounded-full flex items-center justify-center hover:bg-gray-100 shadow-md"
+                      >
                         <ChevronLeft className="w-4 h-4" />
                       </button>
                     )}
                     {i < existingImages.length - 1 && (
-                      <button type="button" onClick={() => handleMoveExistingImage(i, 1)} className="w-8 h-8 bg-white text-gray-700 rounded-full flex items-center justify-center hover:bg-gray-100 shadow-md">
+                      <button
+                        type="button"
+                        onClick={() => handleMoveExistingImage(i, 1)}
+                        className="w-8 h-8 bg-white text-gray-700 rounded-full flex items-center justify-center hover:bg-gray-100 shadow-md"
+                      >
                         <ChevronRight className="w-4 h-4" />
                       </button>
                     )}
@@ -1050,12 +907,20 @@ const PropertyEditModal = ({ isOpen, onClose, property, onSave }) => {
                       <Trash2 className="w-4 h-4" />
                     </button>
                     {i > 0 && (
-                      <button type="button" onClick={() => handleMoveNewImage(i, -1)} className="w-8 h-8 bg-white text-gray-700 rounded-full flex items-center justify-center hover:bg-gray-100 shadow-md">
+                      <button
+                        type="button"
+                        onClick={() => handleMoveNewImage(i, -1)}
+                        className="w-8 h-8 bg-white text-gray-700 rounded-full flex items-center justify-center hover:bg-gray-100 shadow-md"
+                      >
                         <ChevronLeft className="w-4 h-4" />
                       </button>
                     )}
                     {i < newImages.length - 1 && (
-                      <button type="button" onClick={() => handleMoveNewImage(i, 1)} className="w-8 h-8 bg-white text-gray-700 rounded-full flex items-center justify-center hover:bg-gray-100 shadow-md">
+                      <button
+                        type="button"
+                        onClick={() => handleMoveNewImage(i, 1)}
+                        className="w-8 h-8 bg-white text-gray-700 rounded-full flex items-center justify-center hover:bg-gray-100 shadow-md"
+                      >
                         <ChevronRight className="w-4 h-4" />
                       </button>
                     )}
@@ -1065,7 +930,7 @@ const PropertyEditModal = ({ isOpen, onClose, property, onSave }) => {
               {existingImages.length + newImages.length < 10 && (
                 <label className="aspect-square rounded-xl border-2 border-dashed border-gray-300 bg-white flex flex-col items-center justify-center gap-1 cursor-pointer hover:border-amber-300 hover:bg-amber-50 transition-all">
                   <ImageIcon className="w-8 h-8 text-gray-400" />
-                  <span className="text-xs text-gray-500">{t('addImage')}</span>
+                  <span className="text-xs text-gray-500">{t("addImage")}</span>
                   <input
                     type="file"
                     accept="image/*"
@@ -1073,7 +938,7 @@ const PropertyEditModal = ({ isOpen, onClose, property, onSave }) => {
                     className="hidden"
                     onChange={(e) => {
                       handleAddImages(e.target.files);
-                      e.target.value = '';
+                      e.target.value = "";
                     }}
                   />
                 </label>
@@ -1084,31 +949,19 @@ const PropertyEditModal = ({ isOpen, onClose, property, onSave }) => {
 
           {/* Services */}
           <div className="bg-gray-50 p-4 rounded-xl">
-            <h3 className="text-lg font-bold text-gray-900 mb-4">{t('services')}</h3>
+            <h3 className="text-lg font-bold text-gray-900 mb-4">{t("services")}</h3>
             <div className="grid grid-cols-1 md:grid-cols-2 gap-3">
               {Object.entries(serviceI18nKeys).map(([key, i18nKey]) => (
-                <div
-                  key={key}
-                  className="flex items-start gap-2 p-2 border rounded-lg bg-white"
-                >
-                  <input
-                    type="checkbox"
-                    checked={formData.services?.[key] || false}
-                    onChange={(e) =>
-                      handleServiceToggle(key, e.target.checked)
-                    }
-                    className="w-4 h-4 text-amber-500 mt-1"
-                  />
+                <div key={key} className="flex items-start gap-2 p-2 border rounded-lg bg-white">
+                  <input type="checkbox" checked={formData.services?.[key] || false} onChange={(e) => handleServiceToggle(key, e.target.checked)} className="w-4 h-4 text-amber-500 mt-1" />
                   <div className="flex-1">
                     <span className="text-sm font-medium">{t(i18nKey)}</span>
                     {formData.services?.[key] && (
                       <input
                         type="text"
-                        value={formData.serviceDetails?.[key] || ''}
-                        onChange={(e) =>
-                          handleServiceDetail(key, e.target.value)
-                        }
-                        placeholder={t('serviceDetailPlaceholder')}
+                        value={formData.serviceDetails?.[key] || ""}
+                        onChange={(e) => handleServiceDetail(key, e.target.value)}
+                        placeholder={t("serviceDetailPlaceholder")}
                         className="w-full mt-1 px-2 py-1 text-xs border border-gray-200 rounded focus:outline-none focus:ring-1 focus:ring-amber-500"
                       />
                     )}
@@ -1119,61 +972,38 @@ const PropertyEditModal = ({ isOpen, onClose, property, onSave }) => {
           </div>
 
           {/* Terms - rent only */}
-          {formData.purpose === 'rent' && (
+          {formData.purpose === "rent" && (
             <div className="bg-gray-50 p-4 rounded-xl">
-              <h3 className="text-lg font-bold text-gray-900 mb-4">
-                {t('termsOfUse')}
-              </h3>
+              <h3 className="text-lg font-bold text-gray-900 mb-4">{t("termsOfUse")}</h3>
               <div className="grid grid-cols-1 md:grid-cols-2 gap-3">
                 {Object.entries(termI18nKeys).map(([key, i18nKey]) => (
-                  <label
-                    key={key}
-                    className="flex items-center gap-2 p-2 border rounded-lg cursor-pointer bg-white hover:bg-amber-50"
-                  >
-                    <input
-                      type="checkbox"
-                      checked={formData.terms?.[key] || false}
-                      onChange={(e) =>
-                        handleTermToggle(key, e.target.checked)
-                      }
-                      className="w-4 h-4 text-amber-500"
-                    />
+                  <label key={key} className="flex items-center gap-2 p-2 border rounded-lg cursor-pointer bg-white hover:bg-amber-50">
+                    <input type="checkbox" checked={formData.terms?.[key] || false} onChange={(e) => handleTermToggle(key, e.target.checked)} className="w-4 h-4 text-amber-500" />
                     <span className="text-sm">{t(i18nKey)}</span>
                   </label>
                 ))}
               </div>
               <div className="mt-4">
-                <label className="block text-sm font-medium text-gray-700 mb-2">
-                  {t('customTerms')}
-                </label>
+                <label className="block text-sm font-medium text-gray-700 mb-2">{t("customTerms")}</label>
                 <div className="flex gap-2 mb-2">
                   <input
                     type="text"
                     value={newCustomTerm}
                     onChange={(e) => setNewCustomTerm(e.target.value)}
-                    onKeyDown={(e) => e.key === 'Enter' && addCustomTerm()}
-                    placeholder={t('addCustomTermPlaceholder')}
+                    onKeyDown={(e) => e.key === "Enter" && addCustomTerm()}
+                    placeholder={t("addCustomTermPlaceholder")}
                     className="flex-1 px-3 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-amber-500 text-sm"
                   />
-                  <button
-                    onClick={addCustomTerm}
-                    className="px-3 py-2 bg-amber-500 text-white rounded-lg text-sm hover:bg-amber-600"
-                  >
-                    {t('add')}
+                  <button onClick={addCustomTerm} className="px-3 py-2 bg-amber-500 text-white rounded-lg text-sm hover:bg-amber-600">
+                    {t("add")}
                   </button>
                 </div>
                 {formData.customTerms?.length > 0 && (
                   <div className="flex flex-wrap gap-2">
                     {formData.customTerms.map((term, i) => (
-                      <span
-                        key={i}
-                        className="inline-flex items-center gap-1 px-3 py-1 bg-amber-100 text-amber-800 rounded-full text-sm"
-                      >
+                      <span key={i} className="inline-flex items-center gap-1 px-3 py-1 bg-amber-100 text-amber-800 rounded-full text-sm">
                         {term}
-                        <button
-                          onClick={() => removeCustomTerm(i)}
-                          className="hover:text-red-600"
-                        >
+                        <button onClick={() => removeCustomTerm(i)} className="hover:text-red-600">
                           <X className="w-3 h-3" />
                         </button>
                       </span>
@@ -1186,27 +1016,23 @@ const PropertyEditModal = ({ isOpen, onClose, property, onSave }) => {
 
           {/* Nearby Distances */}
           <div className="bg-gray-50 p-4 rounded-xl">
-            <h3 className="text-lg font-bold text-gray-900 mb-4">
-              {t('proximityToServices')}
-            </h3>
+            <h3 className="text-lg font-bold text-gray-900 mb-4">{t("proximityToServices")}</h3>
             <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
               {[
-                { id: 'nearbySchool', label: t('school') },
-                { id: 'nearbyHospital', label: t('hospital') },
-                { id: 'nearbyRestaurant', label: t('restaurant') },
-                { id: 'nearbyUniversity', label: t('university') },
-                { id: 'nearbyPark', label: t('park') },
-                { id: 'nearbyMall', label: t('mall') },
+                { id: "nearbySchool", label: t("school") },
+                { id: "nearbyHospital", label: t("hospital") },
+                { id: "nearbyRestaurant", label: t("restaurant") },
+                { id: "nearbyUniversity", label: t("university") },
+                { id: "nearbyPark", label: t("park") },
+                { id: "nearbyMall", label: t("mall") },
               ].map((field) => (
                 <div key={field.id}>
-                  <label className="block text-sm font-medium text-gray-700 mb-1">
-                    {field.label}
-                  </label>
+                  <label className="block text-sm font-medium text-gray-700 mb-1">{field.label}</label>
                   <input
                     type="text"
-                    value={formData[field.id] || ''}
+                    value={formData[field.id] || ""}
                     onChange={(e) => handleChange(field.id, e.target.value)}
-                    placeholder={t('distancePlaceholder')}
+                    placeholder={t("distancePlaceholder")}
                     className="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-amber-500"
                   />
                 </div>
@@ -1216,105 +1042,77 @@ const PropertyEditModal = ({ isOpen, onClose, property, onSave }) => {
 
           {/* Pricing */}
           <div className="bg-gray-50 p-4 rounded-xl">
-            <h3 className="text-lg font-bold text-gray-900 mb-4">
-              {formData.purpose === 'rent'
-                ? t('priceInfoRent')
-                : t('salePriceSimple')}
-            </h3>
-            {formData.purpose === 'rent' ? (
+            <h3 className="text-lg font-bold text-gray-900 mb-4">{formData.purpose === "rent" ? t("priceInfoRent") : t("salePriceSimple")}</h3>
+            {formData.purpose === "rent" ? (
               <div className="space-y-4">
                 <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
                   <div>
-                    <label className="block text-sm font-medium text-gray-700 mb-1">
-                      {t('dailyPrice')}
-                    </label>
+                    <label className="block text-sm font-medium text-gray-700 mb-1">{t("dailyPrice")}</label>
                     <input
                       type="number"
                       min="0"
                       value={formData.dailyPrice}
-                      onChange={(e) =>
-                        handleChange('dailyPrice', Number(e.target.value))
-                      }
+                      onChange={(e) => handleChange("dailyPrice", Number(e.target.value))}
                       className="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-amber-500"
                     />
                   </div>
                   <div>
-                    <label className="block text-sm font-medium text-gray-700 mb-1">
-                      {t('monthlyPrice')}
-                    </label>
+                    <label className="block text-sm font-medium text-gray-700 mb-1">{t("monthlyPrice")}</label>
                     <input
                       type="number"
                       min="0"
                       value={formData.monthlyPrice}
-                      onChange={(e) =>
-                        handleChange('monthlyPrice', Number(e.target.value))
-                      }
+                      onChange={(e) => handleChange("monthlyPrice", Number(e.target.value))}
                       className="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-amber-500"
                     />
                   </div>
                 </div>
                 <div>
-                  <label className="block text-sm font-medium text-gray-700 mb-1">
-                    {t('deposit')}
-                  </label>
+                  <label className="block text-sm font-medium text-gray-700 mb-1">{t("deposit")}</label>
                   <input
                     type="number"
                     min="0"
                     value={formData.deposit}
-                    onChange={(e) =>
-                      handleChange('deposit', Number(e.target.value))
-                    }
+                    onChange={(e) => handleChange("deposit", Number(e.target.value))}
                     className="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-amber-500"
                   />
                 </div>
                 <div>
-                  <label className="block text-sm font-medium text-gray-700 mb-1">
-                    {t('rentType')}
-                  </label>
+                  <label className="block text-sm font-medium text-gray-700 mb-1">{t("rentType")}</label>
                   <select
                     value={formData.rentType}
-                    onChange={(e) =>
-                      handleChange('rentType', e.target.value)
-                    }
+                    onChange={(e) => handleChange("rentType", e.target.value)}
                     className="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-amber-500"
                   >
-                    <option value="daily">{t('daily')}</option>
-                    <option value="monthly">{t('monthly')}</option>
-                    <option value="both">{t('dailyAndMonthly')}</option>
+                    <option value="daily">{t("daily")}</option>
+                    <option value="monthly">{t("monthly")}</option>
+                    <option value="both">{t("dailyAndMonthly")}</option>
                   </select>
                 </div>
                 <div>
-                  <label className="block text-sm font-medium text-gray-700 mb-1">
-                    {t('allowedPaymentPeriod')}
-                  </label>
+                  <label className="block text-sm font-medium text-gray-700 mb-1">{t("allowedPaymentPeriod")}</label>
                   <select
                     value={formData.allowedPaymentPeriod}
-                    onChange={(e) =>
-                      handleChange('allowedPaymentPeriod', e.target.value)
-                    }
+                    onChange={(e) => handleChange("allowedPaymentPeriod", e.target.value)}
                     className="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-amber-500"
                   >
-                    <option value="">{t('selectPeriod')}</option>
-                    <option value="1.00:00:00">{t('daily')}</option>
-                    <option value="7.00:00:00">{t('weekly')}</option>
-                    <option value="30.00:00:00">{t('monthly')}</option>
-                    <option value="90.00:00:00">{t('quarterly')}</option>
-                    <option value="365.00:00:00">{t('yearly')}</option>
+                    <option value="">{t("selectPeriod")}</option>
+                    <option value="1.00:00:00">{t("daily")}</option>
+                    <option value="7.00:00:00">{t("weekly")}</option>
+                    <option value="30.00:00:00">{t("monthly")}</option>
+                    <option value="90.00:00:00">{t("quarterly")}</option>
+                    <option value="365.00:00:00">{t("yearly")}</option>
                   </select>
                 </div>
               </div>
             ) : (
               <div>
-                <label className="block text-sm font-medium text-gray-700 mb-1">
-                  {t('salePriceSimple')}
-                </label>
+                <label className="block text-sm font-medium text-gray-700 mb-1">{t("salePriceSimple")}</label>
                 <input
                   type="number"
                   min="0"
                   value={formData.salePrice}
-                  onChange={(e) =>
-                    handleChange('salePrice', Number(e.target.value))
-                  }
+                  onChange={(e) => handleChange("salePrice", Number(e.target.value))}
                   className="w-full px-3 py-2 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-amber-500"
                 />
               </div>
@@ -1323,11 +1121,8 @@ const PropertyEditModal = ({ isOpen, onClose, property, onSave }) => {
         </div>
 
         <div className="p-6 border-t flex gap-3">
-          <button
-            onClick={onClose}
-            className="flex-1 py-3 bg-gray-100 text-gray-700 rounded-xl hover:bg-gray-200 transition-colors"
-          >
-            {t('cancel')}
+          <button onClick={onClose} className="flex-1 py-3 bg-gray-100 text-gray-700 rounded-xl hover:bg-gray-200 transition-colors">
+            {t("cancel")}
           </button>
           <button
             onClick={handleSave}
@@ -1337,12 +1132,12 @@ const PropertyEditModal = ({ isOpen, onClose, property, onSave }) => {
             {isSaving ? (
               <>
                 <Loader2 className="w-5 h-5 animate-spin" />
-                {t('saving')}
+                {t("saving")}
               </>
             ) : (
               <>
                 <Save className="w-5 h-5" />
-                {t('saveChanges')}
+                {t("saveChanges")}
               </>
             )}
           </button>
@@ -1402,33 +1197,14 @@ export default function OwnerPropertiesPage() {
     }
 
     try {
-      const [rentData, saleData] = await Promise.allSettled([
-        getMyRentListings(),
-        getMySaleListings(),
-      ]);
+      const [rentData, saleData] = await Promise.allSettled([getMyRentListings(), getMySaleListings()]);
 
-      const rentList =
-        rentData.status === "fulfilled"
-          ? Array.isArray(rentData.value)
-            ? rentData.value.filter(Boolean)
-            : rentData.value
-              ? [rentData.value]
-              : []
-          : [];
-      const saleList =
-        saleData.status === "fulfilled"
-          ? Array.isArray(saleData.value)
-            ? saleData.value.filter(Boolean)
-            : saleData.value
-              ? [saleData.value]
-              : []
-          : [];
+      const rentList = rentData.status === "fulfilled" ? (Array.isArray(rentData.value) ? rentData.value.filter(Boolean) : rentData.value ? [rentData.value] : []) : [];
+      const saleList = saleData.status === "fulfilled" ? (Array.isArray(saleData.value) ? saleData.value.filter(Boolean) : saleData.value ? [saleData.value] : []) : [];
 
       const normalizeServices = (details) => {
         const rawServices = details.services || {};
-        const serviceList = Array.isArray(rawServices)
-          ? rawServices
-          : Object.keys(rawServices).filter((k) => rawServices[k]);
+        const serviceList = Array.isArray(rawServices) ? rawServices : Object.keys(rawServices).filter((k) => rawServices[k]);
         const serviceDetails = details.serviceDetails || {};
         const services = {};
         serviceList.forEach((s) => {
@@ -1439,9 +1215,7 @@ export default function OwnerPropertiesPage() {
 
       const normalizeTerms = (terms) => {
         if (!terms) return {};
-        return Array.isArray(terms)
-          ? terms.reduce((acc, t) => ({ ...acc, [t]: true }), {})
-          : terms;
+        return Array.isArray(terms) ? terms.reduce((acc, t) => ({ ...acc, [t]: true }), {}) : terms;
       };
 
       const normalizeProximity = (prox) => {
@@ -1456,18 +1230,17 @@ export default function OwnerPropertiesPage() {
 
       const mappedRent = rentList.map((item) => {
         const info = item.propertyInformation || {};
-        const details = typeof info.detailsJSON === 'object' && info.detailsJSON ? info.detailsJSON : (() => {
-          try {
-            return JSON.parse(info.detailsJSON || "{}");
-          } catch {
-            return {};
-          }
-        })();
-        const apiBase =
-          typeof window !== "undefined"
-            ? process.env.NEXT_PUBLIC_API_URL ||
-              "https://45.93.137.91.nip.io/api"
-            : "";
+        const details =
+          typeof info.detailsJSON === "object" && info.detailsJSON
+            ? info.detailsJSON
+            : (() => {
+                try {
+                  return JSON.parse(info.detailsJSON || "{}");
+                } catch {
+                  return {};
+                }
+              })();
+        const apiBase = typeof window !== "undefined" ? process.env.NEXT_PUBLIC_API_URL || "https://45.93.137.91.nip.io/api" : "";
         const raw = Array.isArray(info.images) ? info.images : [];
         return {
           id: item.id,
@@ -1497,12 +1270,7 @@ export default function OwnerPropertiesPage() {
               8: "مستودع",
             }[info.buildingType] || "عقار",
           purpose: "rent",
-          rentType:
-            item.rentType === 0
-              ? "monthly"
-              : item.rentType === 1
-                ? "daily"
-                : "daily",
+          rentType: item.rentType === 0 ? "monthly" : item.rentType === 1 ? "daily" : "daily",
           dailyPrice: item.dailyRent || 0,
           monthlyPrice: item.monthlyRent || 0,
           salePrice: item.price || 0,
@@ -1513,31 +1281,14 @@ export default function OwnerPropertiesPage() {
           area: info.space || 0,
           livingRooms: details.livingRooms || 0,
           floor: details.floorNumber ?? details.floor ?? 0,
-          salons:
-            details.numberOfSalons ??
-            details.salonsCount ??
-            details.salons ??
-            0,
-          balconies:
-            details.numberOfBalconies ??
-            details.balconiesCount ??
-            details.balconies ??
-            0,
+          salons: details.numberOfSalons ?? details.salonsCount ?? details.salons ?? 0,
+          balconies: details.numberOfBalconies ?? details.balconiesCount ?? details.balconies ?? 0,
           bookedCount: details.bookedCount || 0,
-          status:
-            { 0: "available", 1: "booked", 2: "maintenance" }[info.status] ||
-            "available",
-          images:
-            raw.length > 0
-              ? raw.map((img) =>
-                  img.startsWith("http")
-                    ? img
-                    : `${apiBase}${img.startsWith("/") ? "" : "/Pictures/"}${img}`,
-                )
-              : ["/property-placeholder.jpg"],
+          status: { 0: "available", 1: "booked", 2: "maintenance" }[info.status] || "available",
+          images: raw.length > 0 ? raw.map((img) => (img.startsWith("http") ? img : `${apiBase}${img.startsWith("/") ? "" : "/Pictures/"}${img}`)) : ["/property-placeholder.jpg"],
           createdAt: item.createdAt || new Date().toISOString(),
           furnished: details.furnished || false,
-          displayType: details.displayType || (item.dailyRent && item.monthlyRent ? 'Both' : item.monthlyRent ? 'Monthly rent' : item.dailyRent ? 'Daily rent' : 'Both'),
+          displayType: details.displayType || (item.dailyRent && item.monthlyRent ? "Both" : item.monthlyRent ? "Monthly rent" : item.dailyRent ? "Daily rent" : "Both"),
           description: info.description || "",
           address: info.address || "",
           city: "",
@@ -1553,18 +1304,17 @@ export default function OwnerPropertiesPage() {
 
       const mappedSale = saleList.map((item) => {
         const info = item.propertyInformation || {};
-        const details = typeof info.detailsJSON === 'object' && info.detailsJSON ? info.detailsJSON : (() => {
-          try {
-            return JSON.parse(info.detailsJSON || "{}");
-          } catch {
-            return {};
-          }
-        })();
-        const apiBase =
-          typeof window !== "undefined"
-            ? process.env.NEXT_PUBLIC_API_URL ||
-              "https://45.93.137.91.nip.io/api"
-            : "";
+        const details =
+          typeof info.detailsJSON === "object" && info.detailsJSON
+            ? info.detailsJSON
+            : (() => {
+                try {
+                  return JSON.parse(info.detailsJSON || "{}");
+                } catch {
+                  return {};
+                }
+              })();
+        const apiBase = typeof window !== "undefined" ? process.env.NEXT_PUBLIC_API_URL || "https://45.93.137.91.nip.io/api" : "";
         const raw = Array.isArray(info.images) ? info.images : [];
         return {
           id: item.id,
@@ -1604,29 +1354,14 @@ export default function OwnerPropertiesPage() {
           area: info.space || 0,
           livingRooms: details.livingRooms || 0,
           floor: details.floorNumber ?? details.floor ?? 0,
-          salons:
-            details.numberOfSalons ??
-            details.salonsCount ??
-            details.salons ??
-            0,
-          balconies:
-            details.numberOfBalconies ??
-            details.balconiesCount ??
-            details.balconies ??
-            0,
+          salons: details.numberOfSalons ?? details.salonsCount ?? details.salons ?? 0,
+          balconies: details.numberOfBalconies ?? details.balconiesCount ?? details.balconies ?? 0,
           bookedCount: details.bookedCount || 0,
           status: "available",
-          images:
-            raw.length > 0
-              ? raw.map((img) =>
-                  img.startsWith("http")
-                    ? img
-                    : `${apiBase}${img.startsWith("/") ? "" : "/Pictures/"}${img}`,
-                )
-              : ["/property-placeholder.jpg"],
+          images: raw.length > 0 ? raw.map((img) => (img.startsWith("http") ? img : `${apiBase}${img.startsWith("/") ? "" : "/Pictures/"}${img}`)) : ["/property-placeholder.jpg"],
           createdAt: item.createdAt || new Date().toISOString(),
           furnished: details.furnished || false,
-          displayType: details.displayType || 'For sale',
+          displayType: details.displayType || "For sale",
           description: info.description || "",
           address: info.address || "",
           city: "",
@@ -1643,7 +1378,7 @@ export default function OwnerPropertiesPage() {
       setProperties([...mappedRent, ...mappedSale]);
     } catch (err) {
       console.error("[OwnerProperties] Failed to load properties:", err);
-      toast.error(t('loadFailed'));
+      toast.error(t("loadFailed"));
     } finally {
       setIsLoading(false);
     }
@@ -1656,12 +1391,10 @@ export default function OwnerPropertiesPage() {
 
   const handleDelete = () => {
     if (deleteModal.property) {
-      const newProperties = properties.filter(
-        (p) => p.id !== deleteModal.property.id,
-      );
+      const newProperties = properties.filter((p) => p.id !== deleteModal.property.id);
       updatePropertiesInStorage(newProperties);
       setDeleteModal({ isOpen: false, property: null });
-      toast.success(t('deleteSuccess'));
+      toast.success(t("deleteSuccess"));
     }
   };
 
@@ -1698,50 +1431,31 @@ export default function OwnerPropertiesPage() {
       }
 
       const details = {
-        description: formData.description || '',
+        description: formData.description || "",
         services: activeServices,
-        serviceDetails: Object.fromEntries(
-          Object.entries(formData.serviceDetails || {}).filter(
-            ([k, v]) => activeServices.includes(k) && v,
-          ),
-        ),
-        ...(formData.purpose === 'rent' ? { terms: activeTerms } : {}),
-        displayType:
-          formData.purpose === 'rent'
-            ? formData.rentType === 'both'
-              ? 'Both'
-              : formData.rentType === 'daily'
-                ? 'Daily rent'
-                : 'Monthly rent'
-            : 'For sale',
-        propertyCondition: formData.furnished
-          ? 'WithFurniture'
-          : 'WithoutFurniture',
+        serviceDetails: Object.fromEntries(Object.entries(formData.serviceDetails || {}).filter(([k, v]) => activeServices.includes(k) && v)),
+        ...(formData.purpose === "rent" ? { terms: activeTerms } : {}),
+        displayType: formData.purpose === "rent" ? (formData.rentType === "both" ? "Both" : formData.rentType === "daily" ? "Daily rent" : "Monthly rent") : "For sale",
+        propertyCondition: formData.furnished ? "WithFurniture" : "WithoutFurniture",
         floorNumber: parseInt(formData.floor) || 0,
         numberOfSalons: parseInt(formData.salons) || 0,
         numberOfBalconies: parseInt(formData.balconies) || 0,
         numberOfLivingRooms: parseInt(formData.livingRooms) || 0,
         nearbyDistances: {
-          school: formData.nearbySchool || '',
-          hospital: formData.nearbyHospital || '',
-          restaurant: formData.nearbyRestaurant || '',
-          university: formData.nearbyUniversity || '',
-          park: formData.nearbyPark || '',
-          mall: formData.nearbyMall || '',
+          school: formData.nearbySchool || "",
+          hospital: formData.nearbyHospital || "",
+          restaurant: formData.nearbyRestaurant || "",
+          university: formData.nearbyUniversity || "",
+          park: formData.nearbyPark || "",
+          mall: formData.nearbyMall || "",
         },
       };
 
-      if (
-        formData.purpose === 'rent' &&
-        formData.propertyType === 'room'
-      ) {
+      if (formData.purpose === "rent" && formData.propertyType === "room") {
         const roomDetails = rawInfo.detailsJSON || {};
         let parsedDetails = {};
         try {
-          parsedDetails =
-            typeof roomDetails === 'object'
-              ? roomDetails
-              : JSON.parse(roomDetails);
+          parsedDetails = typeof roomDetails === "object" ? roomDetails : JSON.parse(roomDetails);
         } catch {
           parsedDetails = {};
         }
@@ -1751,12 +1465,11 @@ export default function OwnerPropertiesPage() {
       const detailsJSON = JSON.stringify(details);
 
       const propInfo = {
-        cordsX: rawInfo.cordsX || '',
-        cordsY: rawInfo.cordsY || '',
+        cordsX: rawInfo.cordsX || "",
+        cordsY: rawInfo.cordsY || "",
         images: formData._images || rawInfo.images || [],
-        address: property.address || rawInfo.address || '',
-        description:
-          formData.description || rawInfo.description || '',
+        address: property.address || rawInfo.address || "",
+        description: formData.description || rawInfo.description || "",
         numberOfBathRooms: parseInt(formData.bathrooms) || 0,
         numberOfRooms: parseInt(formData.bedrooms) || 0,
         numberOfBedRooms: parseInt(formData.bedrooms) || 0,
@@ -1767,7 +1480,7 @@ export default function OwnerPropertiesPage() {
         propertyType: formData.furnished ? 0 : 1,
       };
 
-      if (formData.purpose === 'rent') {
+      if (formData.purpose === "rent") {
         const rentTypeMap = { daily: 1, monthly: 0, both: 0 };
         const payload = buildRentPropertyPayload({
           propertyInformation: propInfo,
@@ -1778,33 +1491,29 @@ export default function OwnerPropertiesPage() {
           monthlyRent: parseFloat(formData.monthlyPrice) || 0,
           dailyRent: parseFloat(formData.dailyPrice) || 0,
           rating: 1,
-          currencyId:
-            formData.currencyId || property.currencyId || 1,
+          currencyId: formData.currencyId || property.currencyId || 1,
           rentType: rentTypeMap[formData.rentType] ?? 0,
           type: formData.furnished ? 0 : 1,
-          allowedPaymentPeriod: formData.allowedPaymentPeriod || '1.00:00:00',
+          allowedPaymentPeriod: formData.allowedPaymentPeriod || "1.00:00:00",
         });
         await editRentProperty(property.id, payload);
       } else {
         const payload = {
           propInfo,
           price: parseFloat(formData.salePrice) || 0,
-          currencyId:
-            formData.currencyId || property.currencyId || 1,
+          currencyId: formData.currencyId || property.currencyId || 1,
         };
         await editSaleProperty(property.id, payload);
       }
 
       const updatedProperty = { ...property, ...formData };
-      const newProperties = properties.map((p) =>
-        p.id === property.id ? updatedProperty : p,
-      );
+      const newProperties = properties.map((p) => (p.id === property.id ? updatedProperty : p));
       updatePropertiesInStorage(newProperties);
       setEditModal({ isOpen: false, property: null });
-      toast.success(t('updateSuccess'));
+      toast.success(t("updateSuccess"));
     } catch (err) {
-      console.error('[OwnerProperties] Edit failed:', err);
-      toast.error(t('updateFailed'));
+      console.error("[OwnerProperties] Edit failed:", err);
+      toast.error(t("updateFailed"));
       throw err;
     }
   };
@@ -1826,19 +1535,13 @@ export default function OwnerPropertiesPage() {
         await updateSalePropertyStatus(prop.id, statusCode);
       }
 
-      const newProperties = properties.map((p) =>
-        p.id === prop.id ? { ...p, status: newStatus } : p,
-      );
+      const newProperties = properties.map((p) => (p.id === prop.id ? { ...p, status: newStatus } : p));
       setProperties(newProperties);
       localStorage.setItem("ownerProperties", JSON.stringify(newProperties));
-      toast.success(
-        willActivate
-          ? t('activateSuccess')
-          : t('deactivateSuccess'),
-      );
+      toast.success(willActivate ? t("activateSuccess") : t("deactivateSuccess"));
     } catch (err) {
       console.error("[OwnerProperties] Toggle status failed:", err);
-      toast.error(t('statusUpdateFailed'));
+      toast.error(t("statusUpdateFailed"));
     }
   };
 
@@ -1850,12 +1553,7 @@ export default function OwnerPropertiesPage() {
 
   if (isLoading) {
     return (
-      <div className="min-h-screen bg-gray-50 flex items-center justify-center">
-        <div className="text-center">
-          <Loader2 className="w-12 h-12 text-amber-500 animate-spin mx-auto mb-4" />
-          <p className="text-gray-600">{t('loadingProperties')}</p>
-        </div>
-      </div>
+     <Loading/>
     );
   }
 
@@ -1863,47 +1561,25 @@ export default function OwnerPropertiesPage() {
     <div className="min-h-screen bg-gray-50 py-8 relative">
       <Toaster position="top-center" reverseOrder={false} />
 
-      <DeleteConfirmationModal
-        isOpen={deleteModal.isOpen}
-        onClose={() => setDeleteModal({ isOpen: false, property: null })}
-        onConfirm={handleDelete}
-        propertyTitle={deleteModal.property?.title}
-      />
+      <DeleteConfirmationModal isOpen={deleteModal.isOpen} onClose={() => setDeleteModal({ isOpen: false, property: null })} onConfirm={handleDelete} propertyTitle={deleteModal.property?.title} />
 
-      <PropertyViewModal
-        isOpen={viewModal.isOpen}
-        onClose={() => setViewModal({ isOpen: false, property: null })}
-        property={viewModal.property}
-      />
+      <PropertyViewModal isOpen={viewModal.isOpen} onClose={() => setViewModal({ isOpen: false, property: null })} property={viewModal.property} />
 
-      <PropertyEditModal
-        isOpen={editModal.isOpen}
-        onClose={() => setEditModal({ isOpen: false, property: null })}
-        property={editModal.property}
-        onSave={handleSaveEdit}
-      />
+      <PropertyEditModal isOpen={editModal.isOpen} onClose={() => setEditModal({ isOpen: false, property: null })} property={editModal.property} onSave={handleSaveEdit} />
 
       <DeactivateConfirmationModal
         isOpen={deactivateModal.isOpen}
-        onClose={() =>
-          setDeactivateModal({ isOpen: false, property: null, isActivating: false })
-        }
+        onClose={() => setDeactivateModal({ isOpen: false, property: null, isActivating: false })}
         onConfirm={handleToggleActivation}
         propertyTitle={deactivateModal.property?.title}
         isActivating={deactivateModal.isActivating}
       />
 
       <div className="container mx-auto px-4">
-        <motion.div
-          initial={{ opacity: 0, y: -20 }}
-          animate={{ opacity: 1, y: 0 }}
-          className="flex justify-between items-center mb-8"
-        >
+        <motion.div initial={{ opacity: 0, y: -20 }} animate={{ opacity: 1, y: 0 }} className="flex justify-between items-center mb-8">
           <div>
-            <h1 className="text-3xl font-bold text-gray-900 mb-2">{t('myProperties')}</h1>
-            <p className="text-gray-600">
-              {t('welcomeUser', { name: user?.name, count: properties.length })}
-            </p>
+            <h1 className="text-3xl font-bold text-gray-900 mb-2">{t("myProperties")}</h1>
+            <p className="text-gray-600">{t("welcomeUser", { name: user?.name, count: properties.length })}</p>
           </div>
 
           <div className="relative">
@@ -1914,7 +1590,7 @@ export default function OwnerPropertiesPage() {
               whileTap={{ scale: 0.95 }}
             >
               <PlusCircle className="w-5 h-5" />
-              {t('addNewProperty')}
+              {t("addNewProperty")}
             </motion.button>
 
             <AnimatePresence>
@@ -1928,33 +1604,29 @@ export default function OwnerPropertiesPage() {
                   <div className="p-2">
                     <Link
                       href="/owner/properties/add?purpose=rent"
-                      className="flex items-center gap-3 px-4 py-3 text-gray-700 hover:bg-amber-50 rounded-lg transition-colors"
+                      className="flex items-center gap-3 px-4 py-3 text-gray-700 hover:bg-[#0f172a] rounded-lg transition-colors"
                       onClick={() => setShowAddMenu(false)}
                     >
                       <div className="w-8 h-8 bg-green-100 rounded-lg flex items-center justify-center">
                         <Home className="w-4 h-4 text-green-600" />
                       </div>
                       <div>
-                        <p className="font-medium">{t('rentProperty')}</p>
-                        <p className="text-xs text-gray-500">
-                          {t('rentPropertyDesc')}
-                        </p>
+                        <p className="font-medium">{t("rentProperty")}</p>
+                        <p className="text-xs text-gray-500">{t("rentPropertyDesc")}</p>
                       </div>
                     </Link>
 
                     <Link
                       href="/owner/properties/add?purpose=sale"
-                      className="flex items-center gap-3 px-4 py-3 text-gray-700 hover:bg-amber-50 rounded-lg transition-colors"
+                      className="flex items-center gap-3 px-4 py-3 text-gray-700 hover:bg-[#0f172a] rounded-lg transition-colors"
                       onClick={() => setShowAddMenu(false)}
                     >
                       <div className="w-8 h-8 bg-blue-100 rounded-lg flex items-center justify-center">
                         <DollarSign className="w-4 h-4 text-blue-600" />
                       </div>
                       <div>
-                        <p className="font-medium">{t('saleProperty')}</p>
-                        <p className="text-xs text-gray-500">
-                          {t('salePropertyDesc')}
-                        </p>
+                        <p className="font-medium">{t("saleProperty")}</p>
+                        <p className="text-xs text-gray-500">{t("salePropertyDesc")}</p>
                       </div>
                     </Link>
                   </div>
@@ -1972,12 +1644,8 @@ export default function OwnerPropertiesPage() {
           >
             <span className="flex items-center gap-2">
               <Home className="w-4 h-4" />
-              {t('forRent')}
-              {rentCount > 0 && (
-                <span className="bg-amber-100 text-amber-800 text-xs px-2 py-0.5 rounded-full">
-                  {rentCount}
-                </span>
-              )}
+              {t("forRent")}
+              {rentCount > 0 && <span className="bg-amber-100 text-amber-800 text-xs px-2 py-0.5 rounded-full">{rentCount}</span>}
             </span>
           </button>
           <button
@@ -1986,39 +1654,25 @@ export default function OwnerPropertiesPage() {
           >
             <span className="flex items-center gap-2">
               <DollarSign className="w-4 h-4" />
-              {t('forSaleTab')}
-              {saleCount > 0 && (
-                <span className="bg-blue-100 text-blue-800 text-xs px-2 py-0.5 rounded-full">
-                  {saleCount}
-                </span>
-              )}
+              {t("forSaleTab")}
+              {saleCount > 0 && <span className="bg-blue-100 text-blue-800 text-xs px-2 py-0.5 rounded-full">{saleCount}</span>}
             </span>
           </button>
         </div>
 
         {filteredProperties.length === 0 ? (
-          <motion.div
-            initial={{ opacity: 0, y: 20 }}
-            animate={{ opacity: 1, y: 0 }}
-            className="bg-white rounded-2xl p-12 text-center border-2 border-dashed border-gray-300"
-          >
+          <motion.div initial={{ opacity: 0, y: 20 }} animate={{ opacity: 1, y: 0 }} className="bg-white rounded-2xl p-12 text-center border-2 border-dashed border-gray-300">
             <div className="w-24 h-24 bg-amber-100 rounded-full flex items-center justify-center mx-auto mb-4">
               <Building className="w-12 h-12 text-amber-600" />
             </div>
-            <h3 className="text-xl font-bold text-gray-900 mb-2">
-              {activeTab === "rent"
-                ? t('noRentProperties')
-                : t('noSaleProperties')}
-            </h3>
-            <p className="text-gray-600 mb-6">
-              {t('startAdding', { type: activeTab === "rent" ? t('forRent') : t('forSaleTab') })}
-            </p>
+            <h3 className="text-xl font-bold text-gray-900 mb-2">{activeTab === "rent" ? t("noRentProperties") : t("noSaleProperties")}</h3>
+            <p className="text-gray-600 mb-6">{t("startAdding", { type: activeTab === "rent" ? t("forRent") : t("forSaleTab") })}</p>
             <Link
               href={`/owner/properties/add?purpose=${activeTab}`}
               className="inline-flex items-center gap-2 bg-amber-500 text-white px-6 py-3 rounded-xl font-medium hover:bg-amber-600 transition-colors"
             >
               <PlusCircle className="w-5 h-5" />
-              {t('addNewProperty')}
+              {t("addNewProperty")}
             </Link>
           </motion.div>
         ) : (
@@ -2034,99 +1688,70 @@ export default function OwnerPropertiesPage() {
               >
                 <div className="relative aspect-[16/10] bg-gray-100 overflow-hidden">
                   {property.images && property.images.length > 0 ? (
-                    <img
-                      src={property.images[0]}
-                      alt={property.title}
-                      className="w-full h-full object-cover"
-                    />
+                    <img src={property.images[0]} alt={property.title} className="w-full h-full object-cover" />
                   ) : (
                     <div className="w-full h-full flex items-center justify-center">
                       <ImageIcon className="w-12 h-12 text-gray-400" />
                     </div>
                   )}
-                    <div className="absolute top-2 right-2 flex gap-1">
-                      <span
-                        className={`px-2 py-0.5 rounded-md text-xs font-medium shadow-sm backdrop-blur-sm ${
-                          property.status === "available"
-                            ? "bg-white/90 text-green-700"
-                            : property.status === "notAvailable"
-                              ? "bg-red-50/90 text-red-700"
-                              : "bg-white/90 text-yellow-700"
-                        }`}
-                      >
-                        {property.status === "notAvailable"
-                          ? t('notAvailable')
-                          : property.status === "available"
-                            ? t('available')
-                            : t('postponed')}
+                  <div className="absolute top-2 right-2 flex gap-1">
+                    <span
+                      className={`px-2 py-0.5 rounded-md text-xs font-medium shadow-sm backdrop-blur-sm ${
+                        property.status === "available" ? "bg-white/90 text-green-700" : property.status === "notAvailable" ? "bg-red-50/90 text-red-700" : "bg-white/90 text-yellow-700"
+                      }`}
+                    >
+                      {property.status === "notAvailable" ? t("notAvailable") : property.status === "available" ? t("available") : t("postponed")}
+                    </span>
+                    {property.purpose === "rent" && property.furnished !== undefined && (
+                      <span className={`px-2 py-0.5 rounded-md text-xs font-medium shadow-sm backdrop-blur-sm ${property.furnished ? "bg-white/90 text-amber-700" : "bg-white/90 text-gray-600"}`}>
+                        {property.furnished ? t("furnished") : t("unfurnished")}
                       </span>
-                    {property.purpose === "rent" &&
-                      property.furnished !== undefined && (
-                        <span
-                          className={`px-2 py-0.5 rounded-md text-xs font-medium shadow-sm backdrop-blur-sm ${
-                            property.furnished
-                              ? "bg-white/90 text-amber-700"
-                              : "bg-white/90 text-gray-600"
-                          }`}
-                        >
-                          {property.furnished ? t('furnished') : t('unfurnished')}
-                        </span>
-                      )}
+                    )}
                   </div>
 
                   <div className="absolute top-2 left-2">
                     <span className="px-2 py-0.5 rounded-md text-xs font-medium bg-white/90 text-amber-700 shadow-sm backdrop-blur-sm">
                       {property.propertyTypeLabel ||
                         (property.propertyType === "apartment"
-                          ? t('buildingType.apartment')
+                          ? t("buildingType.apartment")
                           : property.propertyType === "villa"
-                            ? t('buildingType.villa')
+                            ? t("buildingType.villa")
                             : property.propertyType === "sweet"
-                              ? t('buildingType.sweet')
+                              ? t("buildingType.sweet")
                               : property.propertyType === "room"
-                                ? t('buildingType.room')
+                                ? t("buildingType.room")
                                 : property.propertyType === "studio"
-                                  ? t('buildingType.studio')
+                                  ? t("buildingType.studio")
                                   : property.propertyType === "office"
-                                    ? t('buildingType.office')
+                                    ? t("buildingType.office")
                                     : property.propertyType === "farms"
-                                      ? t('buildingType.farms')
+                                      ? t("buildingType.farms")
                                       : property.propertyType === "shop"
-                                        ? t('buildingType.shop')
+                                        ? t("buildingType.shop")
                                         : property.propertyType === "warehouse"
-                                          ? t('buildingType.warehouse')
-                                          : t('offer'))}
+                                          ? t("buildingType.warehouse")
+                                          : t("offer"))}
                     </span>
                   </div>
                 </div>
 
                 <div className="p-3">
                   <div className="flex items-start justify-between mb-1">
-                    <h3 className="font-bold text-gray-900 truncate flex-1 ml-2">
-                      {property.title}
-                    </h3>
+                    <h3 className="font-bold text-gray-900 truncate flex-1 ml-2">{property.title}</h3>
                     {property.rating > 0 && (
                       <div className="flex items-center gap-0.5 text-amber-600 shrink-0">
                         <Star className="w-3 h-3 fill-amber-500" />
-                        <span className="text-xs font-medium">
-                          {Number(property.rating).toFixed(1)}
-                        </span>
+                        <span className="text-xs font-medium">{Number(property.rating).toFixed(1)}</span>
                       </div>
                     )}
                   </div>
 
                   <div className="flex items-center gap-1 text-gray-500 text-xs mb-2">
                     <MapPin className="w-3 h-3" />
-                    <span className="truncate">
-                      {property.address || property.location || t('locationUnknown')}
-                    </span>
+                    <span className="truncate">{property.address || property.location || t("locationUnknown")}</span>
                   </div>
 
-                  {property.description && (
-                    <p className="text-xs text-gray-600 leading-relaxed mb-2 line-clamp-2">
-                      {property.description}
-                    </p>
-                  )}
+                  {property.description && <p className="text-xs text-gray-600 leading-relaxed mb-2 line-clamp-2">{property.description}</p>}
 
                   <div className="flex flex-wrap items-center gap-2 text-xs text-gray-600 mb-2">
                     {property.bedrooms > 0 && (
@@ -2144,13 +1769,18 @@ export default function OwnerPropertiesPage() {
                     {property.area > 0 && (
                       <div className="flex items-center gap-0.5 bg-gray-50 px-2 py-0.5 rounded-md">
                         <Square className="w-3 h-3" />
-                        <span>{property.area}{t('sqm')}</span>
+                        <span>
+                          {property.area}
+                          {t("sqm")}
+                        </span>
                       </div>
                     )}
                     {property.floor > 0 && (
                       <div className="flex items-center gap-0.5 bg-gray-50 px-2 py-0.5 rounded-md">
                         <Layers className="w-3 h-3" />
-                        <span>{t('floor')} {property.floor}</span>
+                        <span>
+                          {t("floor")} {property.floor}
+                        </span>
                       </div>
                     )}
                     {property.salons > 0 && (
@@ -2174,29 +1804,20 @@ export default function OwnerPropertiesPage() {
                           {property.monthlyPrice > 0 && (
                             <span className="text-base font-bold text-amber-600">
                               {Number(property.monthlyPrice).toLocaleString()}
-                              <span className="text-xs text-gray-500 font-normal mr-1">
-                                {t('perMonth')}
-                              </span>
+                              <span className="text-xs text-gray-500 font-normal mr-1">{t("perMonth")}</span>
                             </span>
                           )}
-                          {property.dailyPrice > 0 &&
-                            !property.monthlyPrice && (
-                              <span className="text-base font-bold text-amber-600">
-                                {Number(property.dailyPrice).toLocaleString()}
-                                <span className="text-xs text-gray-500 font-normal mr-1">
-                                  {t('perDay')}
-                                </span>
-                              </span>
-                            )}
-                          {property.deposit > 0 && (
-                            <div className="text-[10px] text-gray-400">
-                              {t('depositAmount', { amount: Number(property.deposit).toLocaleString() })}
-                            </div>
+                          {property.dailyPrice > 0 && !property.monthlyPrice && (
+                            <span className="text-base font-bold text-amber-600">
+                              {Number(property.dailyPrice).toLocaleString()}
+                              <span className="text-xs text-gray-500 font-normal mr-1">{t("perDay")}</span>
+                            </span>
                           )}
+                          {property.deposit > 0 && <div className="text-[10px] text-gray-400">{t("depositAmount", { amount: Number(property.deposit).toLocaleString() })}</div>}
                         </div>
                       ) : (
                         <span className="text-base font-bold text-blue-600">
-                          {Number(property.salePrice).toLocaleString()} {t('syp')}
+                          {Number(property.salePrice).toLocaleString()} {t("syp")}
                         </span>
                       )}
                     </div>
@@ -2212,7 +1833,7 @@ export default function OwnerPropertiesPage() {
                             })
                           }
                           className="p-1.5 hover:bg-green-50 rounded-lg transition-colors group"
-                          title={t('activateProperty')}
+                          title={t("activateProperty")}
                         >
                           <CheckCircle className="w-3.5 h-3.5 text-gray-400 group-hover:text-green-600" />
                         </button>
@@ -2226,7 +1847,7 @@ export default function OwnerPropertiesPage() {
                             })
                           }
                           className="p-1.5 hover:bg-red-50 rounded-lg transition-colors group"
-                          title={t('deactivateProperty')}
+                          title={t("deactivateProperty")}
                         >
                           <XCircle className="w-3.5 h-3.5 text-gray-400 group-hover:text-red-600" />
                         </button>
@@ -2234,27 +1855,15 @@ export default function OwnerPropertiesPage() {
                       <button
                         onClick={() => setViewModal({ isOpen: true, property })}
                         className="px-3 py-1.5 bg-gray-50 hover:bg-blue-50 border border-gray-200 hover:border-blue-200 rounded-lg transition-all group flex items-center gap-1.5"
-                        title={t('viewDetails')}
+                        title={t("viewDetails")}
                       >
                         <Eye className="w-3.5 h-3.5 text-gray-400 group-hover:text-blue-600" />
-                        <span className="text-xs text-gray-500 group-hover:text-blue-600 font-medium">
-                          {t('view')}
-                        </span>
+                        <span className="text-xs text-gray-500 group-hover:text-blue-600 font-medium">{t("view")}</span>
                       </button>
-                      <button
-                        onClick={() => setEditModal({ isOpen: true, property })}
-                        className="p-1.5 hover:bg-amber-50 rounded-lg transition-colors group"
-                        title={t('editProperty')}
-                      >
+                      <button onClick={() => setEditModal({ isOpen: true, property })} className="p-1.5 hover:bg-amber-50 rounded-lg transition-colors group" title={t("editProperty")}>
                         <Edit className="w-3.5 h-3.5 text-gray-400 group-hover:text-amber-600" />
                       </button>
-                      <button
-                        onClick={() =>
-                          setDeleteModal({ isOpen: true, property })
-                        }
-                        className="p-1.5 hover:bg-red-50 rounded-lg transition-colors group"
-                        title={t('deleteProperty')}
-                      >
+                      <button onClick={() => setDeleteModal({ isOpen: true, property })} className="p-1.5 hover:bg-red-50 rounded-lg transition-colors group" title={t("deleteProperty")}>
                         <Trash2 className="w-3.5 h-3.5 text-gray-400 group-hover:text-red-600" />
                       </button>
                     </div>
diff --git a/app/property/[id]/PropertyDetail.js b/app/property/[id]/PropertyDetail.js
index d60c2cf..badc68e 100644
--- a/app/property/[id]/PropertyDetail.js
+++ b/app/property/[id]/PropertyDetail.js
@@ -54,6 +54,7 @@ import {
   Dog,
   CassetteTape,
   Info,
+  Theater,
 } from "lucide-react";
 import { getRentProperty, getSaleProperty, getSalePropertyById, bookReservation, getAvailableDateRanges, getOwnerContactInformation, getMyRentListings, getMySaleListings } from "../../utils/api";
 import AuthService from "../../services/AuthService";
@@ -584,7 +585,7 @@ export default function PropertyDetailsPage() {
               </div>
 
               {/* Price */}
-              <div className="bg-amber-50 rounded-xl p-3 mb-4">
+              <div className="bg-[#1E293B] rounded-xl p-3 mb-4">
                 {property.isRent ? (
                   <div className="flex flex-wrap gap-6 items-end">
                     {property.priceDisplay.monthly > 0 && (
@@ -856,12 +857,13 @@ export default function PropertyDetailsPage() {
                       return (
                         <div key={key} className="bg-gray-50 rounded-lg p-2 flex items-center gap-1.5">
                           {key === "School" && <School className="w-3.5 h-3.5 text-amber-500 flex-shrink-0" />}
+                          {key === "Mosque" && <Theater className="w-3.5 h-3.5 text-amber-500 flex-shrink-0" />}
                           {key === "Hospital" && <Hospital className="w-3.5 h-3.5 text-amber-500 flex-shrink-0" />}
                           {key === "Restaurant" && <Store className="w-3.5 h-3.5 text-amber-500 flex-shrink-0" />}
                           {key === "University" && <GraduationCap className="w-3.5 h-3.5 text-amber-500 flex-shrink-0" />}
                           {key === "Park" && <TreePine className="w-3.5 h-3.5 text-amber-500 flex-shrink-0" />}
                           {key === "Mall" && <Building className="w-3.5 h-3.5 text-amber-500 flex-shrink-0" />}
-                          {!["School", "Hospital", "Restaurant", "University", "Park", "Mall"].includes(key) && <MapPin className="w-3.5 h-3.5 text-amber-500 flex-shrink-0" />}
+                          {!["School", "Hospital", "Restaurant", "University", "Park", "Mall","Mosque"].includes(key) && <MapPin className="w-3.5 h-3.5 text-amber-500 flex-shrink-0" />}
                           <div>
                             <div className="text-xs font-medium text-gray-900">{t(proxKey(key))}</div>
                             <div className="text-[10px] text-gray-500">
@@ -952,7 +954,7 @@ export default function PropertyDetailsPage() {
                       <div className="grid grid-cols-2 gap-2 mb-3">
                         <button
                           onClick={() => setPricingMode("daily")}
-                          className={`p-2.5 rounded-xl text-center border-2 transition-all ${effectivePricingMode === "daily" ? "border-amber-500 bg-amber-50" : "border-gray-200 hover:border-gray-300"}`}
+                          className={`p-2.5 rounded-xl text-center border-2 transition-all ${effectivePricingMode === "daily" ? "border-amber-500 bg-[#1E293B]" : "border-gray-200 hover:border-gray-300"}`}
                         >
                           <div className="text-xs font-bold text-gray-900">{t("dailyRentLabel")}</div>
                           <div className="text-sm font-bold text-amber-600">
@@ -961,7 +963,7 @@ export default function PropertyDetailsPage() {
                         </button>
                         <button
                           onClick={() => setPricingMode("monthly")}
-                          className={`p-2.5 rounded-xl text-center border-2 transition-all ${effectivePricingMode === "monthly" ? "border-amber-500 bg-amber-50" : "border-gray-200 hover:border-gray-300"}`}
+                          className={`p-2.5 rounded-xl text-center border-2 transition-all ${effectivePricingMode === "monthly" ? "border-amber-500 bg-[#1E293B]" : "border-gray-200 hover:border-gray-300"}`}
                         >
                           <div className="text-xs font-bold text-gray-900">{t("monthlyRentLabel")}</div>
                           <div className="text-sm font-bold text-amber-600">
@@ -997,7 +999,7 @@ export default function PropertyDetailsPage() {
                               <span className="text-gray-500">{t("endDateLabel")}</span>
                               <span className="font-medium text-gray-900">{selectedEnd}</span>
                             </div>
-                            <div className="border-t border-gray-200 my-1" />
+                            <div className="border-t border-gray-200 my-1 " />
                             <div className="flex justify-between text-xs">
                               <span className="text-gray-500">{effectivePricingMode === "daily" ? t("numberOfDays") : t("numberOfMonths")}</span>
                               <span className="font-medium text-gray-900">
@@ -1053,7 +1055,7 @@ export default function PropertyDetailsPage() {
       {/* Login Dialog */}
       {showLoginDialog && (
         <div className="fixed inset-0 bg-black/50 flex items-center justify-center z-50" onClick={() => setShowLoginDialog(false)}>
-          <div className="bg-white rounded-2xl p-6 max-w-sm text-center mx-4" onClick={(e) => e.stopPropagation()}>
+          <div className="bg-[#1E293B] rounded-2xl p-6 max-w-sm text-center mx-4" onClick={(e) => e.stopPropagation()}>
             <div className="w-16 h-16 bg-amber-100 rounded-full flex items-center justify-center mx-auto mb-4">
               <LogIn className="w-8 h-8 text-amber-600" />
             </div>
diff --git a/app/register/tenant/page.js b/app/register/tenant/page.js
index 9b9ae68..57fe530 100644
--- a/app/register/tenant/page.js
+++ b/app/register/tenant/page.js
@@ -61,7 +61,7 @@ export default function TenantRegisterPage() {
       email: formData.email,
       phoneNumber: formData.phone,
       whatsAppNumber: formData.whatsapp,
-      phone: formData.phone2,
+      phone: formData.phone2 || "" ,
       nationalNumber: formData.nationalNumber,
       password: formData.password,
       customerType: formData.customerType,
diff --git a/app/validations/OwnerValidatoin.js b/app/validations/OwnerValidatoin.js
index 4010043..0b11659 100644
--- a/app/validations/OwnerValidatoin.js
+++ b/app/validations/OwnerValidatoin.js
@@ -17,12 +17,7 @@ export const validateStep1 = (formData, setErrors, t) => {
     newErrors.email = t("register.emailInvalid");
   }
 
-  if (!formData.phone?.trim()) {
-    newErrors.phone = t("register.phoneRequired");
-  } else if (!validatePhone(formData.phone)) {
-    newErrors.phone = `${t("register.phoneInvalid")} (${t("register.phoneMustStartWith")} 09/05)`;
-  }
-
+  
   if (!formData.whatsapp?.trim()) {
     newErrors.whatsapp = t("register.whatsappRequired");
   } else if (!validatePhone(formData.whatsapp)) {