diff --git a/.gitignore b/.gitignore
index 43b28bba..00aba771 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,3 +61,6 @@ node_modules/
 /playwright-report/
 /blob-report/
 /playwright/.cache/
+
+# Snaplet
+/.snaplet/
\ No newline at end of file
diff --git a/src/app/casos-activos/layout.js b/src/app/casos-activos/layout.js
deleted file mode 100644
index b23c4515..00000000
--- a/src/app/casos-activos/layout.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import { supabase } from '@/lib/supabase/client';
-import TabNavigation from '@/components/TabNavigation';
-const getCount = async () => {
-  const {
-    data: solicitaData,
-    count: solicitaCount,
-    error: solicitaError,
-  } = await supabase.from('help_requests').select('id', { count: 'exact' }).eq('type', 'necesita');
-
-  const {
-    data: ofreceData,
-    count: ofreceCount,
-    error: ofreceError,
-  } = await supabase.from('help_requests').select('id', { count: 'exact' }).eq('type', 'ofrece');
-
-  if (solicitaError) {
-    throw new Error('Error fetching solicita:', solicitaError);
-  }
-  if (ofreceError) {
-    throw new Error('Error fetching ofrece:', ofreceError);
-  }
-
-  return {
-    solicitudes: solicitaCount || 0,
-    ofertas: ofreceCount || 0,
-  };
-};
-
-export default async function CasosActivosLayout({ children }) {
-  const count = await getCount();
-  return (
-    <>
-      <div className="space-y-6 mx-auto max-w-7xl px-4 sm:px-6">
-        <TabNavigation count={count} />
-        {children}
-      </div>
-    </>
-  );
-}
diff --git a/src/app/casos-activos/layout.tsx b/src/app/casos-activos/layout.tsx
new file mode 100644
index 00000000..85086a99
--- /dev/null
+++ b/src/app/casos-activos/layout.tsx
@@ -0,0 +1,41 @@
+import { createClient } from '@/lib/supabase/server';
+import TabNavigation from '@/components/TabNavigation';
+import { PropsWithChildren } from 'react';
+import { SupabaseClient } from '@supabase/supabase-js';
+import { Database } from '@/types/database';
+const getCount = async (supabase: SupabaseClient<Database>) => {
+  const { count: solicitaCount, error: solicitaError } = await supabase
+    .from('help_requests')
+    .select('id', { count: 'exact' })
+    .eq('type', 'necesita');
+
+  const { count: ofreceCount, error: ofreceError } = await supabase
+    .from('help_requests')
+    .select('id', { count: 'exact' })
+    .eq('type', 'ofrece');
+
+  if (solicitaError) {
+    throw new Error('Error fetching solicita:', solicitaError);
+  }
+  if (ofreceError) {
+    throw new Error('Error fetching ofrece:', ofreceError);
+  }
+
+  return {
+    solicitudes: solicitaCount || 0,
+    ofertas: ofreceCount || 0,
+  };
+};
+
+export default async function CasosActivosLayout({ children }: PropsWithChildren) {
+  const supabase = await createClient();
+  const count = await getCount(supabase);
+  return (
+    <>
+      <div className="space-y-6 mx-auto max-w-7xl px-4 sm:px-6">
+        <TabNavigation count={count} />
+        {children}
+      </div>
+    </>
+  );
+}
diff --git a/src/app/casos-activos/mapa/page.tsx b/src/app/casos-activos/mapa/page.tsx
index 64333c9e..23822f74 100644
--- a/src/app/casos-activos/mapa/page.tsx
+++ b/src/app/casos-activos/mapa/page.tsx
@@ -8,6 +8,8 @@ import { tiposAyudaOptions } from '@/helpers/constants';
 import Map, { PinMapa } from '@/components/map/map';
 import PickupPoint from '@/components/PickupPoint';
 
+export const dynamic = 'force-dynamic';
+
 export default function MapaPage() {
   return (
     <Suspense>
diff --git a/src/app/casos-activos/ofertas/page.js b/src/app/casos-activos/ofertas/page.tsx
similarity index 77%
rename from src/app/casos-activos/ofertas/page.js
rename to src/app/casos-activos/ofertas/page.tsx
index 3d7a58e7..d1b8f5de 100644
--- a/src/app/casos-activos/ofertas/page.js
+++ b/src/app/casos-activos/ofertas/page.tsx
@@ -1,13 +1,14 @@
 'use client';
 
 import { Suspense, useEffect, useState } from 'react';
-import { HeartHandshake } from 'lucide-react';
 import { supabase } from '@/lib/supabase/client';
 import Pagination from '@/components/Pagination';
 import { tiposAyudaOptions } from '@/helpers/constants';
 import { useRouter, useSearchParams } from 'next/navigation';
-import { useTowns } from '@/context/TownProvider';
 import OfferCard from '@/components/OfferCard';
+import { HelpRequestData } from '@/types/Requests';
+
+export const dynamic = 'force-dynamic';
 
 export default function OfertasPage() {
   return (
@@ -18,26 +19,25 @@ export default function OfertasPage() {
 }
 
 function Ofertas() {
-  const { towns } = useTowns();
   const searchParams = useSearchParams();
   const router = useRouter();
   const {} = router;
 
-  const [loading, setLoading] = useState(true);
-  const [error, setError] = useState(null);
+  const [loading, setLoading] = useState<boolean>(true);
+  const [error, setError] = useState<string | null>(null);
 
-  const [data, setData] = useState([]);
-  const [currentPage, setCurrentPage] = useState(Number(searchParams.get('page')) || 1);
-  const [currentCount, setCurrentCount] = useState(0);
+  const [data, setData] = useState<HelpRequestData[]>([]);
+  const [currentPage, setCurrentPage] = useState<number>(Number(searchParams.get('page')) || 1);
+  const [currentCount, setCurrentCount] = useState<number>(0);
 
   const itemsPerPage = 10;
-  const numPages = (count) => {
+  const numPages = (count: number) => {
     return Math.ceil(count / itemsPerPage) || 0;
   };
 
-  const updateFilter = (filter, value) => {
+  const updateFilter = (filter: 'ayuda' | 'page', value: string | number) => {
     const params = new URLSearchParams(searchParams.toString());
-    params.set(filter, value);
+    params.set(filter, value.toString());
     router.push(`?${params.toString()}`);
   };
 
@@ -45,7 +45,7 @@ function Ofertas() {
     ayuda: searchParams.get('acepta') || 'todas',
   });
 
-  const changeDataFilter = (type, newFilter) => {
+  const changeDataFilter = (type: 'ayuda', newFilter: string) => {
     setFiltroData((prev) => ({
       ...prev,
       [type]: newFilter,
@@ -53,7 +53,7 @@ function Ofertas() {
     updateFilter(type, newFilter);
   };
 
-  function changePage(newPage) {
+  function changePage(newPage: number) {
     setCurrentPage(newPage);
     updateFilter('page', newPage);
   }
@@ -83,7 +83,7 @@ function Ofertas() {
           setData([]);
         } else {
           setData(data || []);
-          setCurrentCount(count);
+          setCurrentCount(count ?? 0);
         }
       } catch (err) {
         console.log('Error general:', err);
@@ -136,21 +136,11 @@ function Ofertas() {
         {data.length === 0 ? (
           <div className="bg-white rounded-lg shadow-lg border border-gray-300 text-center flex justify-center items-center p-10 flex-col gap-5">
             <p className="text-gray-700 text-lg font-medium">
-              No se encontraron solicitudes que coincidan con los filtros.
+              No se encontraron ofertas que coincidan con los filtros.
             </p>
-
-            <button
-              onClick={() => {
-                setShowModal(true);
-              }}
-              className="bg-green-500 text-white px-4 py-2 rounded hover:bg-green-600 flex items-center gap-2 whitespace-nowrap"
-            >
-              <HeartHandshake className="w-5 h-5" />
-              Ofrecer ayuda
-            </button>
           </div>
         ) : (
-          data.map((caso) => <OfferCard caso={caso} towns={towns} showLink={true} key={caso.id} />)
+          data.map((caso) => <OfferCard caso={caso} showLink={true} key={caso.id} />)
         )}
       </div>
       <div className="flex items-center justify-center">
diff --git a/src/app/casos-activos/page.js b/src/app/casos-activos/page.js
deleted file mode 100644
index bf9d287e..00000000
--- a/src/app/casos-activos/page.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import CasosActivosLayout from './layout';
-import Solicitudes from './solicitudes/page';
-
-export default function CasosActivos() {
-  return <Solicitudes />;
-}
diff --git a/src/app/casos-activos/solicitudes/page.js b/src/app/casos-activos/solicitudes/page.tsx
similarity index 78%
rename from src/app/casos-activos/solicitudes/page.js
rename to src/app/casos-activos/solicitudes/page.tsx
index e1b8acf0..725493eb 100644
--- a/src/app/casos-activos/solicitudes/page.js
+++ b/src/app/casos-activos/solicitudes/page.tsx
@@ -1,18 +1,15 @@
 'use client';
 
 import { Suspense, useEffect, useState } from 'react';
-import { HeartHandshake } from 'lucide-react';
 import { supabase } from '@/lib/supabase/client';
 import SolicitudCard from '@/components/SolicitudCard';
 import Pagination from '@/components/Pagination';
-import OfferHelp from '@/components/OfferHelp';
 import { useRouter, useSearchParams } from 'next/navigation';
 import { tiposAyudaOptions } from '@/helpers/constants';
-import Modal from '@/components/Modal';
-import { useModal } from '@/context/ModalProvider';
 import { useTowns } from '@/context/TownProvider';
+import { HelpRequestData } from '@/types/Requests';
 
-const MODAL_NAME = 'solicitudes';
+export const dynamic = 'force-dynamic';
 
 export default function SolicitudesPage() {
   return (
@@ -23,29 +20,25 @@ export default function SolicitudesPage() {
 }
 
 function Solicitudes() {
-  const { getTownById, towns } = useTowns();
+  const { towns } = useTowns();
   const searchParams = useSearchParams();
   const router = useRouter();
 
-  const [loading, setLoading] = useState(true);
-  const [error, setError] = useState(null);
+  const [loading, setLoading] = useState<boolean>(true);
+  const [error, setError] = useState<string | null>(null);
 
-  const [data, setData] = useState([]);
-  const [currentPage, setCurrentPage] = useState(Number(searchParams.get('page')) || 1);
-  const [currentCount, setCurrentCount] = useState(0);
-  const { toggleModal } = useModal();
+  const [data, setData] = useState<HelpRequestData[]>([]);
+  const [currentPage, setCurrentPage] = useState<number>(Number(searchParams.get('page')) || 1);
+  const [currentCount, setCurrentCount] = useState<number>(0);
 
-  const closeModal = () => {
-    toggleModal(MODAL_NAME, false);
-  };
   const itemsPerPage = 10;
-  const numPages = (count) => {
+  const numPages = (count: number) => {
     return Math.ceil(count / itemsPerPage) || 0;
   };
 
-  const updateFilter = (filter, value) => {
+  const updateFilter = (filter: 'urgencia' | 'tipoAyuda' | 'pueblo' | 'page', value: string | number) => {
     const params = new URLSearchParams(searchParams.toString());
-    params.set(filter, value);
+    params.set(filter, value.toString());
     router.push(`?${params.toString()}`);
   };
 
@@ -55,7 +48,7 @@ function Solicitudes() {
     pueblo: searchParams.get('pueblo') || 'todos',
   });
 
-  const changeDataFilter = (type, newFilter) => {
+  const changeDataFilter = (type: 'urgencia' | 'tipoAyuda' | 'pueblo', newFilter: string) => {
     setFiltroData((prev) => ({
       ...prev,
       [type]: newFilter,
@@ -63,7 +56,7 @@ function Solicitudes() {
     updateFilter(type, newFilter);
   };
 
-  function changePage(newPage) {
+  function changePage(newPage: number) {
     setCurrentPage(newPage);
     updateFilter('page', newPage);
   }
@@ -102,7 +95,7 @@ function Solicitudes() {
           setData([]);
         } else {
           setData(data || []);
-          setCurrentCount(count);
+          setCurrentCount(count ?? 0);
         }
       } catch (err) {
         console.log('Error general:', err);
@@ -131,8 +124,6 @@ function Solicitudes() {
     );
   }
 
-  const puebloSeleccionado = getTownById(Number(filtroData.pueblo));
-
   return (
     <>
       {/* FILTROS  */}
@@ -181,16 +172,6 @@ function Solicitudes() {
             <p className="text-gray-700 text-lg font-medium">
               No se encontraron solicitudes que coincidan con los filtros.
             </p>
-
-            <button
-              onClick={() => {
-                toggleModal(MODAL_NAME, true);
-              }}
-              className="bg-green-500 text-white px-4 py-2 rounded hover:bg-green-600 flex items-center gap-2 whitespace-nowrap"
-            >
-              <HeartHandshake className="w-5 h-5" />
-              Ofrecer ayuda {filtroData.pueblo === 'todos' ? '' : ' a ' + getTownById(Number(filtroData.pueblo))?.name}
-            </button>
           </div>
         ) : (
           data.map((caso) => <SolicitudCard showLink={true} showEdit={true} key={caso.id} caso={caso} />)
@@ -199,10 +180,6 @@ function Solicitudes() {
       <div className="flex items-center justify-center">
         <Pagination currentPage={currentPage} totalPages={numPages(currentCount)} onPageChange={changePage} />
       </div>
-
-      <Modal id={MODAL_NAME}>
-        <OfferHelp town={puebloSeleccionado?.name} onClose={closeModal} isModal={true} />
-      </Modal>
     </>
   );
 }
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 17213357..a2516ed5 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -5,7 +5,7 @@ import PhoneNumberDialog from '@/components/auth/PhoneNumberDialog';
 import Image from 'next/image';
 import { CallCenterLink } from '@/components/CallCenterLink';
 
-export default function Home() {
+export default async function Home() {
   const emergencyNumbers = [
     { name: 'Emergencias', number: '112', description: 'Para situaciones de peligro inmediato' },
     { name: 'Policía Local', number: '092', description: 'Asistencia y seguridad local' },
@@ -132,7 +132,7 @@ export default function Home() {
       title: 'Casos activos',
       description: 'Observa los casos activos',
       icon: AlertCircle,
-      path: '/casos-activos',
+      path: '/casos-activos/solicitudes',
       color: 'orange',
     },
     {
diff --git a/src/app/punto-recogida/page.js b/src/app/punto-recogida/page.tsx
similarity index 90%
rename from src/app/punto-recogida/page.js
rename to src/app/punto-recogida/page.tsx
index e61daec3..c0122674 100644
--- a/src/app/punto-recogida/page.js
+++ b/src/app/punto-recogida/page.tsx
@@ -1,11 +1,14 @@
 'use client';
 
-import { useState, useCallback, useEffect } from 'react';
+import { useState, useCallback, useEffect, FormEvent } from 'react';
 import { supabase } from '@/lib/supabase/client';
 import { MapPin, Phone, Package, House, Contact, Megaphone } from 'lucide-react';
 import AddressAutocomplete from '@/components/AddressAutocomplete';
 import { isValidPhone } from '@/helpers/utils';
 import { PhoneInput } from '@/components/PhoneInput';
+import { CollectionPointData, CollectionPointInsert } from '@/types/DataPoints';
+
+export const dynamic = 'force-dynamic';
 
 export default function PuntosRecogida() {
   const initialFormData = {
@@ -20,16 +23,16 @@ export default function PuntosRecogida() {
     status: 'active',
   };
 
-  const [formData, setFormData] = useState(initialFormData);
+  const [formData, setFormData] = useState<CollectionPointInsert>(initialFormData);
   const [showForm, setShowForm] = useState(false);
   const [loading, setLoading] = useState(false);
-  const [collectionPoints, setCollectionPoints] = useState([]);
-  const [error, setError] = useState(null);
+  const [collectionPoints, setCollectionPoints] = useState<CollectionPointData[]>([]);
+  const [error, setError] = useState<string | null>(null);
   const [success, setSuccess] = useState(false);
 
   const tiposAyuda = ['Alimentos', 'Agua', 'Ropa', 'Mantas', 'Medicamentos', 'Productos de higiene'];
 
-  const handlePhoneChange = useCallback((phoneNumber) => {
+  const handlePhoneChange = useCallback((phoneNumber: string) => {
     setFormData((formData) => ({ ...formData, contact_phone: phoneNumber }));
   }, []);
 
@@ -52,20 +55,20 @@ export default function PuntosRecogida() {
     }
   }
 
-  async function handleSubmit(e) {
+  async function handleSubmit(e: FormEvent) {
     e.preventDefault();
     setLoading(true);
     setError(null);
 
     try {
-      const requiredFields = ['name', 'location', 'contact_phone'];
+      const requiredFields = ['name', 'location', 'contact_phone'] as const;
       const missingFields = requiredFields.filter((field) => !formData[field]);
 
       if (missingFields.length > 0) {
         throw new Error('Por favor completa todos los campos obligatorios');
       }
 
-      if (!isValidPhone(formData.contact_phone)) {
+      if (!isValidPhone(formData.contact_phone ?? '')) {
         alert('El teléfono de contacto no es válido.');
         return;
       }
@@ -92,7 +95,7 @@ export default function PuntosRecogida() {
       setFormData(initialFormData);
 
       setTimeout(() => setSuccess(false), 3000);
-    } catch (error) {
+    } catch (error: any) {
       console.error('Error al registrar punto de recogida:', error);
       setError(error.message || 'Error al registrar el punto de recogida');
     } finally {
@@ -208,7 +211,7 @@ export default function PuntosRecogida() {
                 <label className="block text-sm font-medium text-gray-700 mb-1">Nombre del centro *</label>
                 <input
                   type="text"
-                  value={formData.name}
+                  value={formData.name ?? ''}
                   onChange={(e) => setFormData({ ...formData, name: e.target.value })}
                   className="w-full p-2 border rounded"
                   required
@@ -217,7 +220,7 @@ export default function PuntosRecogida() {
               <div>
                 <label className="block text-sm font-medium text-gray-700 mb-1">Dirección completa *</label>
                 <AddressAutocomplete
-                  onSelect={(address) => {
+                  onSelect={(address: any) => {
                     setFormData((prev) => ({
                       ...prev,
                       location: address.fullAddress,
@@ -240,18 +243,18 @@ export default function PuntosRecogida() {
                     <label
                       key={tipo}
                       className={`flex items-center p-3 rounded cursor-pointer ${
-                        formData.accepted_items.includes(tipo)
+                        formData.accepted_items?.includes(tipo)
                           ? 'bg-blue-100 text-blue-800'
                           : 'bg-gray-50 hover:bg-gray-100'
                       }`}
                     >
                       <input
                         type="checkbox"
-                        checked={formData.accepted_items.includes(tipo)}
+                        checked={formData.accepted_items?.includes(tipo)}
                         onChange={(e) => {
                           const newItems = e.target.checked
-                            ? [...formData.accepted_items, tipo]
-                            : formData.accepted_items.filter((item) => item !== tipo);
+                            ? [...(formData.accepted_items ?? []), tipo]
+                            : formData.accepted_items?.filter((item) => item !== tipo);
                           setFormData({ ...formData, accepted_items: newItems });
                         }}
                         className="sr-only"
@@ -266,21 +269,21 @@ export default function PuntosRecogida() {
                   <label className="block text-sm font-medium text-gray-700 mb-1">Persona responsable</label>
                   <input
                     type="text"
-                    value={formData.contact_name}
+                    value={formData.contact_name ?? ''}
                     onChange={(e) => setFormData({ ...formData, contact_name: e.target.value })}
                     className="w-full p-2 border rounded"
                   />
                 </div>
-                <PhoneInput phoneNumber={formData.contact_phone} onChange={handlePhoneChange} required />
+                <PhoneInput phoneNumber={formData.contact_phone ?? ''} onChange={handlePhoneChange} required />
               </div>
 
               <div>
                 <label className="block text-sm font-medium text-gray-700 mb-1">Necesidades urgentes</label>
                 <textarea
-                  value={formData.urgent_needs}
+                  value={formData.urgent_needs ?? ''}
                   onChange={(e) => setFormData({ ...formData, urgent_needs: e.target.value })}
                   className="w-full p-2 border rounded"
-                  rows="3"
+                  rows={3}
                   placeholder="¿Qué se necesita con más urgencia?"
                 />
               </div>
diff --git a/src/app/puntos-entrega/page.js b/src/app/puntos-entrega/page.tsx
similarity index 92%
rename from src/app/puntos-entrega/page.js
rename to src/app/puntos-entrega/page.tsx
index 10927da3..5ea18b2b 100644
--- a/src/app/puntos-entrega/page.js
+++ b/src/app/puntos-entrega/page.tsx
@@ -1,9 +1,10 @@
 'use client';
 
-import { useState, useEffect } from 'react';
+import { useState, useEffect, FormEvent } from 'react';
 import { supabase } from '@/lib/supabase/client';
 import { Truck, MapPin, Phone, Mail, Calendar, Package } from 'lucide-react';
 import AddressAutocomplete from '@/components/AddressAutocomplete';
+import { DeliveryPointData, DeliveryPointInsert, isCoordinates } from '@/types/DataPoints';
 
 export default function PuntosEntrega() {
   const initialFormData = {
@@ -21,12 +22,12 @@ export default function PuntosEntrega() {
     status: 'active',
   };
 
-  const [formData, setFormData] = useState(initialFormData);
+  const [formData, setFormData] = useState<DeliveryPointInsert>(initialFormData);
   const [showForm, setShowForm] = useState(false);
   const [loading, setLoading] = useState(false);
-  const [points, setPoints] = useState([]);
-  const [error, setError] = useState(null);
-  const [success, setSuccess] = useState(false);
+  const [points, setPoints] = useState<DeliveryPointData[]>([]);
+  const [error, setError] = useState<string | null>(null);
+  const [success, setSuccess] = useState<boolean>(false);
 
   const vehicleTypes = ['Camión grande (>3500kg)', 'Camión mediano', 'Furgoneta grande', 'Furgoneta mediana', 'Otro'];
 
@@ -51,13 +52,13 @@ export default function PuntosEntrega() {
     }
   }
 
-  async function handleSubmit(e) {
+  async function handleSubmit(e: FormEvent) {
     e.preventDefault();
     setLoading(true);
     setError(null);
 
     try {
-      const requiredFields = ['name', 'location', 'contact_phone'];
+      const requiredFields = ['name', 'location', 'contact_phone'] as const;
       const missingFields = requiredFields.filter((field) => !formData[field]);
 
       if (missingFields.length > 0) {
@@ -67,7 +68,7 @@ export default function PuntosEntrega() {
       const pointData = {
         name: formData.name,
         location: formData.location,
-        city: formData.city || null,
+        city: formData.city,
         contact_name: formData.contact_name || null,
         contact_phone: formData.contact_phone,
         contact_email: formData.contact_email || null,
@@ -75,8 +76,8 @@ export default function PuntosEntrega() {
         cargo_type: formData.cargo_type || null,
         schedule: formData.schedule || null,
         additional_info: formData.additional_info || null,
-        latitude: formData.coordinates?.lat ? parseFloat(formData.coordinates.lat) : null,
-        longitude: formData.coordinates?.lon ? parseFloat(formData.coordinates.lon) : null,
+        latitude: isCoordinates(formData.coordinates) ? formData.coordinates.lat : null,
+        longitude: isCoordinates(formData.coordinates) ? formData.coordinates.lon : null,
         status: 'active',
       };
 
@@ -90,7 +91,7 @@ export default function PuntosEntrega() {
       setFormData(initialFormData);
 
       setTimeout(() => setSuccess(false), 3000);
-    } catch (error) {
+    } catch (error: any) {
       console.error('Error al registrar punto de entrega:', error);
       setError(error.message || 'Error al registrar el punto de entrega');
     } finally {
@@ -225,7 +226,7 @@ export default function PuntosEntrega() {
               <div>
                 <label className="block text-sm font-medium text-gray-700 mb-1">Dirección exacta *</label>
                 <AddressAutocomplete
-                  onSelect={(address) => {
+                  onSelect={(address: any) => {
                     setFormData((prev) => ({
                       ...prev,
                       location: address.fullAddress,
@@ -246,7 +247,7 @@ export default function PuntosEntrega() {
                 <div>
                   <label className="block text-sm font-medium text-gray-700 mb-1">Tipo de vehículos</label>
                   <select
-                    value={formData.vehicle_type}
+                    value={formData.vehicle_type ?? ''}
                     onChange={(e) => setFormData({ ...formData, vehicle_type: e.target.value })}
                     className="w-full p-2 border rounded"
                   >
@@ -261,7 +262,7 @@ export default function PuntosEntrega() {
                 <div>
                   <label className="block text-sm font-medium text-gray-700 mb-1">Tipo de carga</label>
                   <select
-                    value={formData.cargo_type}
+                    value={formData.cargo_type ?? ''}
                     onChange={(e) => setFormData({ ...formData, cargo_type: e.target.value })}
                     className="w-full p-2 border rounded"
                   >
@@ -279,7 +280,7 @@ export default function PuntosEntrega() {
                 <label className="block text-sm font-medium text-gray-700 mb-1">Horario de recepción</label>
                 <input
                   type="text"
-                  value={formData.schedule}
+                  value={formData.schedule ?? ''}
                   onChange={(e) => setFormData({ ...formData, schedule: e.target.value })}
                   className="w-full p-2 border rounded"
                   placeholder="Ej: Lunes a Viernes 9:00-18:00"
@@ -291,7 +292,7 @@ export default function PuntosEntrega() {
                   <label className="block text-sm font-medium text-gray-700 mb-1">Persona de contacto</label>
                   <input
                     type="text"
-                    value={formData.contact_name}
+                    value={formData.contact_name ?? ''}
                     onChange={(e) => setFormData({ ...formData, contact_name: e.target.value })}
                     className="w-full p-2 border rounded"
                   />
@@ -300,7 +301,7 @@ export default function PuntosEntrega() {
                   <label className="block text-sm font-medium text-gray-700 mb-1">Teléfono *</label>
                   <input
                     type="tel"
-                    value={formData.contact_phone}
+                    value={formData.contact_phone ?? ''}
                     onChange={(e) => setFormData({ ...formData, contact_phone: e.target.value })}
                     className="w-full p-2 border rounded"
                     required
@@ -310,7 +311,7 @@ export default function PuntosEntrega() {
                   <label className="block text-sm font-medium text-gray-700 mb-1">Email</label>
                   <input
                     type="email"
-                    value={formData.contact_email}
+                    value={formData.contact_email ?? ''}
                     onChange={(e) => setFormData({ ...formData, contact_email: e.target.value })}
                     className="w-full p-2 border rounded"
                   />
@@ -320,10 +321,10 @@ export default function PuntosEntrega() {
               <div>
                 <label className="block text-sm font-medium text-gray-700 mb-1">Información adicional</label>
                 <textarea
-                  value={formData.additional_info}
+                  value={formData.additional_info ?? ''}
                   onChange={(e) => setFormData({ ...formData, additional_info: e.target.value })}
                   className="w-full p-2 border rounded"
-                  rows="3"
+                  rows={3}
                   placeholder="Instrucciones especiales, requisitos, etc."
                 />
               </div>
diff --git a/src/app/solicitudes/page.tsx b/src/app/solicitudes/page.tsx
index 72eb04e4..77f8db06 100644
--- a/src/app/solicitudes/page.tsx
+++ b/src/app/solicitudes/page.tsx
@@ -8,6 +8,8 @@ import { useQuery } from '@tanstack/react-query';
 import { HelpRequestData } from '@/types/Requests';
 import { helpRequestService } from '@/lib/service';
 
+export const dynamic = 'force-dynamic';
+
 export default function ListaSolicitudes() {
   const session = useSession();
   const userId = session.user?.id;
diff --git a/src/app/voluntometro/page.js b/src/app/voluntometro/page.tsx
similarity index 55%
rename from src/app/voluntometro/page.js
rename to src/app/voluntometro/page.tsx
index b9b228fd..91687af0 100644
--- a/src/app/voluntometro/page.js
+++ b/src/app/voluntometro/page.tsx
@@ -1,89 +1,12 @@
-import { supabase } from '@/lib/supabase/client';
 import { HeartHandshake, Search, Thermometer } from 'lucide-react';
 import TownCardInfo from '@/components/TownCardInfo';
+import { helpRequestService } from '@/lib/service';
 
-const getCount = async () => {
-  const today = new Date().toISOString().split('T')[0];
-  const {
-    data: solicitaData,
-    count: solicitaCount,
-    error: solicitaError,
-  } = await supabase
-    .from('help_requests')
-    .select('id', { count: 'exact' })
-    .eq('type', 'necesita')
-    .gte('created_at', today)
-    .lte('created_at', `${today}T23:59:59.999Z`);
-
-  const {
-    data: ofreceData,
-    count: ofreceCount,
-    error: ofreceError,
-  } = await supabase
-    .from('help_requests')
-    .select('id', { count: 'exact' })
-    .eq('type', 'ofrece')
-    .gte('created_at', today)
-    .lte('created_at', `${today}T23:59:59.999Z`);
-
-  if (solicitaError) {
-    throw new Error('Error fetching solicita:', solicitaError);
-  }
-  if (ofreceError) {
-    throw new Error('Error fetching ofrece:', ofreceError);
-  }
-  return {
-    solicitudes: solicitaCount || 0,
-    ofertas: ofreceCount || 0,
-  };
-};
-const getVolunteers = async () => {
-  const today = new Date().toISOString().split('T')[0];
-
-  const { data: towns, error: townError } = await supabase.from('towns').select('id, name');
-
-  if (townError) {
-    console.log('Error fetching towns:', townError);
-    return;
-  }
-
-  const { data, error } = await supabase
-    .from('help_requests')
-    .select('*')
-    .in('type', ['ofrece', 'necesita'])
-    .gte('created_at', today)
-    .lte('created_at', `${today}T23:59:59.999Z`);
-
-  if (error) {
-    console.log('Error fetching help requests:', error);
-    return;
-  }
-
-  const volunteersCount = new Map();
-  const needHelpCount = new Map();
-
-  data.forEach((person) => {
-    const townId = person.town_id;
-    if (person.type === 'ofrece') {
-      volunteersCount.set(townId, (volunteersCount.get(townId) || 0) + 1);
-    } else if (person.type === 'necesita') {
-      needHelpCount.set(townId, (needHelpCount.get(townId) || 0) + 1);
-    }
-  });
-
-  const updatedPueblos = towns.map((town) => ({
-    id: town.id,
-    name: town.name,
-    count: volunteersCount.get(town.id) || 0,
-    needHelp: needHelpCount.get(town.id) || 0,
-  }));
-
-  return updatedPueblos;
-};
+export const dynamic = 'force-dynamic';
 
 export default async function Voluntometro() {
-  const pueblos = await getVolunteers();
-  const count = await getCount();
+  const pueblos = await helpRequestService.getTodaysCountByTown();
+  const count = await helpRequestService.getTodaysCount();
 
   const getFechaHoy = () => {
     const fecha = new Date();
diff --git a/src/components/SolicitudCard.tsx b/src/components/SolicitudCard.tsx
index b8253637..046d72ad 100644
--- a/src/components/SolicitudCard.tsx
+++ b/src/components/SolicitudCard.tsx
@@ -28,7 +28,6 @@ export default function SolicitudCard({ caso, showLink = true, showEdit = false
   const [deleted, setDeleted] = useState(false);
   const isMyRequest = session.user?.id && session.user.id === caso.user_id;
   const [updateUrgency, setUpdateUrgency] = useState(caso.urgency);
-
   return (
     !deleted && (
       <div key={caso.id} className="rounded-2xl bg-white shadow-lg ring-1 ring-gray-900/5">
diff --git a/src/components/Tab.tsx b/src/components/Tab.tsx
index 1e89b338..dfb6337a 100644
--- a/src/components/Tab.tsx
+++ b/src/components/Tab.tsx
@@ -2,19 +2,21 @@
 
 import Link from 'next/link';
 import { PropsWithChildren } from 'react';
+import { usePathname } from 'next/navigation';
 
 type Props = {
   color: 'red' | 'green' | 'orange';
-  isPath: boolean;
   href: string;
 };
 
 export default function Tab({ children, ...props }: PropsWithChildren<Props>) {
+  const pathname = usePathname();
+  const isSelected = pathname === props.href;
   return (
     <Link
       href={props.href}
       className={`flex flex-col items-center justify-center py-3 px-2 rounded-lg transition-colors ${
-        props.isPath
+        isSelected
           ? `bg-${props.color}-500 text-white`
           : 'bg-gray-50 hover:bg-gray-100 text-gray-600 hover:text-gray-900'
       }`}
diff --git a/src/components/TabNavigation.tsx b/src/components/TabNavigation.tsx
index a84f0c18..bc1e35e1 100644
--- a/src/components/TabNavigation.tsx
+++ b/src/components/TabNavigation.tsx
@@ -1,26 +1,20 @@
 'use client';
 import { HeartHandshake, Search, MapPin } from 'lucide-react';
-import { usePathname } from 'next/navigation';
 import Tab from './Tab';
 
 export default function TabNavigation({ count = { solicitudes: 0, ofertas: 0 } }) {
-  const pathname = usePathname();
   return (
     <>
       <div className="grid grid-cols-3 gap-2 bg-white p-2 rounded-lg shadow">
-        <Tab
-          isPath={pathname === '/casos-activos/solicitudes' || pathname === '/casos-activos'}
-          href="/casos-activos/solicitudes"
-          color="red"
-        >
+        <Tab href="/casos-activos/solicitudes" color="red">
           <Search className="h-6 w-6 mb-1" />
           <span className="text-xs sm:text-sm font-medium">Solicitudes ({count.solicitudes || 0})</span>
         </Tab>
-        <Tab isPath={pathname === '/casos-activos/ofertas'} href="/casos-activos/ofertas" color="green">
+        <Tab href="/casos-activos/ofertas" color="green">
           <HeartHandshake className="h-6 w-6 mb-1" />
           <span className="text-xs sm:text-sm font-medium">Ofertas ({count.ofertas || 0})</span>
         </Tab>
-        <Tab isPath={pathname === '/casos-activos/mapa'} href="/casos-activos/mapa" color="orange">
+        <Tab href="/casos-activos/mapa" color="orange">
           <MapPin className="h-6 w-6 mb-1" />
           <span className="text-xs sm:text-sm font-medium">Mapa</span>
         </Tab>
diff --git a/src/components/auth/PhoneNumberDialog.tsx b/src/components/auth/PhoneNumberDialog.tsx
index 89b58059..1ae156ec 100644
--- a/src/components/auth/PhoneNumberDialog.tsx
+++ b/src/components/auth/PhoneNumberDialog.tsx
@@ -125,28 +125,31 @@ const PhoneNumberDialog = () => {
     };
 
     fetchNumber();
-  }, []);
+  }, [toggleModal]);
 
-  const handleSubmit = useCallback(async (phoneNumber: string, privacyPolicy: string) => {
-    const { data: session, error: errorGettingUser } = await authService.getSessionUser();
+  const handleSubmit = useCallback(
+    async (phoneNumber: string, privacyPolicy: string) => {
+      const { data: session, error: errorGettingUser } = await authService.getSessionUser();
 
-    if (!session.user || errorGettingUser) {
-      throw new Error('Error a la hora de obtener el usuario');
-    }
+      if (!session.user || errorGettingUser) {
+        throw new Error('Error a la hora de obtener el usuario');
+      }
 
-    const metadata = session.user.user_metadata;
-    const metadataWithPhone = { ...metadata, telefono: phoneNumber, privacyPolicy };
+      const metadata = session.user.user_metadata;
+      const metadataWithPhone = { ...metadata, telefono: phoneNumber, privacyPolicy };
 
-    const { error: updateUserError } = await authService.updateUser({
-      data: metadataWithPhone,
-    });
+      const { error: updateUserError } = await authService.updateUser({
+        data: metadataWithPhone,
+      });
 
-    if (updateUserError) {
-      throw new Error('Error a la hora de actualizar el usuario con un numero de telefono');
-    }
+      if (updateUserError) {
+        throw new Error('Error a la hora de actualizar el usuario con un numero de telefono');
+      }
 
-    toggleModal(MODAL_NAME);
-  }, []);
+      toggleModal(MODAL_NAME);
+    },
+    [toggleModal],
+  );
 
   return (
     <Modal id={MODAL_NAME} maxWidth={'max-w-md'} allowClose={false}>
diff --git a/src/components/layout/Sidebar.tsx b/src/components/layout/Sidebar.tsx
index 1b58e11c..946f6603 100644
--- a/src/components/layout/Sidebar.tsx
+++ b/src/components/layout/Sidebar.tsx
@@ -61,7 +61,7 @@ export default function Sidebar({ isOpen, toggleAction }: SidebarProps) {
       icon: AlertCircle,
       title: 'Casos Activos',
       description: 'Ver todos los casos activos',
-      path: '/casos-activos',
+      path: '/casos-activos/solicitudes',
       color: 'text-orange-600',
       highlight: true,
     },
@@ -148,14 +148,6 @@ export default function Sidebar({ isOpen, toggleAction }: SidebarProps) {
       color: 'text-teal-600',
       isHref: true,
     },
-    {
-      icon: CarTaxiFront,
-      title: 'Compartir Coche',
-      description: 'Viaja u ofrece viajes con otros',
-      path: 'https://anem.guruwalk.com/',
-      color: 'text-amber-600',
-      isHref: true,
-    },
     {
       icon: Car,
       title: 'Encontrar tu Coche',
diff --git a/src/context/ModalProvider.tsx b/src/context/ModalProvider.tsx
index 21614782..fbdbaa02 100644
--- a/src/context/ModalProvider.tsx
+++ b/src/context/ModalProvider.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import React, { createContext, FC, ReactNode, useContext, useState } from 'react';
+import React, { createContext, FC, ReactNode, useCallback, useContext, useState } from 'react';
 
 type EmergencyContextType = {
   isModalOpen: { [key: string]: boolean };
@@ -19,12 +19,12 @@ type ModalProviderProps = {
 export const ModalProvider: FC<ModalProviderProps> = ({ children }) => {
   const [isModalOpen, setIsModalOpen] = useState<{ [key: string]: boolean }>({});
 
-  const toggleModal = (id: string, force?: boolean) => {
+  const toggleModal = useCallback((id: string, force?: boolean) => {
     setIsModalOpen((prev) => ({
       ...prev,
       [id]: force !== undefined ? force : !prev[id],
     }));
-  };
+  }, []);
 
   return <EmergencyContext.Provider value={{ isModalOpen, toggleModal }}>{children}</EmergencyContext.Provider>;
 };
diff --git a/src/context/RoleProvider.jsx b/src/context/RoleProvider.tsx
similarity index 73%
rename from src/context/RoleProvider.jsx
rename to src/context/RoleProvider.tsx
index 6da7efe3..efbdd628 100644
--- a/src/context/RoleProvider.jsx
+++ b/src/context/RoleProvider.tsx
@@ -1,13 +1,13 @@
 'use client';
-import React, { createContext, ReactNode, useContext, useEffect, useState } from 'react';
+import React, { createContext, PropsWithChildren, useContext, useEffect, useState } from 'react';
 import { supabase } from '@/lib/supabase/client';
 import { useSession } from './SessionProvider';
 
-const RoleContext = createContext();
+const RoleContext = createContext<string>('user');
 
-export const RoleProvider = ({ children }) => {
+export const RoleProvider = ({ children }: PropsWithChildren) => {
   const session = useSession();
-  const [role, setRole] = useState('user');
+  const [role, setRole] = useState<string | null>('user');
 
   useEffect(() => {
     const fetchRole = async () => {
@@ -39,7 +39,7 @@ export const RoleProvider = ({ children }) => {
     fetchRole();
   }, [session]);
 
-  return <RoleContext.Provider value={role}>{children}</RoleContext.Provider>;
+  return <RoleContext.Provider value={role ?? 'anon'}>{children}</RoleContext.Provider>;
 };
 
 export const useRole = () => useContext(RoleContext);
diff --git a/src/helpers/format.js b/src/helpers/format.js
deleted file mode 100644
index d156714d..00000000
--- a/src/helpers/format.js
+++ /dev/null
@@ -1,92 +0,0 @@
-import SolicitudCard from '@/components/SolicitudCard';
-import ReactDOMServer from 'react-dom/server';
-
-export const getMarkerBySolicitud = (solicitud) => {
-  // TODO think if possible getLatLng from a given location
-  if (!solicitud.latitude || !solicitud.longitude) {
-    return null;
-  }
-
-  return {
-    id: solicitud.id,
-    coordinates: [solicitud.longitude, solicitud.latitude],
-    descriptionHTML: getMarkerDescriptionBySolicitudAndTowns(solicitud),
-    color: getMarkerColorBySolicitud(solicitud),
-    width: '400px',
-  };
-};
-
-export const getMarkerColorBySolicitud = (solicitud) => {
-  switch (solicitud.urgency) {
-    case 'baja':
-      return '#00FF00';
-    case 'media':
-      return '#FFA500';
-    case 'alta':
-      return '#FF0000';
-    default:
-      return '#000000';
-  }
-};
-export const getMarkerDescriptionBySolicitudAndTowns = (solicitud) => {
-  return ReactDOMServer.renderToString(
-    <SolicitudCard key={solicitud.id} caso={solicitud} showEdit={false} showLink={true} />,
-  );
-};
-
-export const getMarkerByPuntoDeRecogida = (ptoDeRecogida) => {
-  // TODO think if possible getLatLng from a given location
-  if (!ptoDeRecogida.latitude || !ptoDeRecogida.longitude) {
-    return null;
-  }
-
-  if (!ptoDeRecogida.active) return null;
-
-  return {
-    id: ptoDeRecogida.id,
-    coordinates: [ptoDeRecogida.longitude, ptoDeRecogida.latitude],
-    descriptionHTML: getMarkerDescriptionByPuntoDeRecogida(ptoDeRecogida),
-    color: '#0000FF',
-  };
-};
-
-export const getMarkerDescriptionByPuntoDeRecogida = (ptoDeRecogida) => {
-  return `
-        <div class="p-4 bg-white rounded-lg max-w-xs overflow-y-scroll">
-            <h2 class="text-sm font-bold text-gray-800 mb-2">${ptoDeRecogida.contact_name}</h2>
-            <div class="space-y-2">
-                <p><span class="font-semibold text-gray-600">Dirección:</span> ${ptoDeRecogida.location}</p>
-                <p><span class="font-semibold text-gray-600">Descripción:</span> ${ptoDeRecogida.description}</p>
-                <p><span class="font-semibold text-gray-600">Contacto:</span> ${ptoDeRecogida.contact_phone}</p>
-            </div>
-        </div>
-    `;
-};
-
-export const getMarkerByOferta = (oferta) => {
-  // TODO think if possible getLatLng from a given location
-  if (!oferta.latitude || !oferta.longitude) {
-    return null;
-  }
-
-  return {
-    id: oferta.id,
-    coordinates: [oferta.longitude, oferta.latitude],
-    descriptionHTML: getMarkerDescriptionByOferta(oferta),
-    color: '#FF00FF',
-  };
-};
-
-export const getMarkerDescriptionByOferta = (oferta) => {
-  return `
-        <div class="p-4 bg-white rounded-lg max-w-xs overflow-y-scroll">
-            <h2 class="text-sm font-bold text-gray-800 mb-2">${oferta.name}</h2>
-            <div class="space-y-2">
-                <p><span class="font-semibold text-gray-600">Tipo de ayuda:</span> ${tiposAyudaOptions[oferta.help_type]}</p>
-                <p><span class="font-semibold text-gray-600">Dirección:</span> ${oferta.location}</p>
-                <p><span class="font-semibold text-gray-600">Descripción:</span> ${oferta.description}</p>
-                <p><span class="font-semibold text-gray-600">Contacto:</span> ${oferta.contact_info}</p>
-            </div>
-        </div>
-    `;
-};
diff --git a/src/helpers/format.tsx b/src/helpers/format.tsx
new file mode 100644
index 00000000..736a2465
--- /dev/null
+++ b/src/helpers/format.tsx
@@ -0,0 +1,38 @@
+import ReactDOMServer from 'react-dom/server';
+import { HelpRequestData } from '@/types/Requests';
+import { CollectionPointData } from '@/types/DataPoints';
+import SolicitudCard from '@/components/SolicitudCard';
+import { tiposAyudaOptions } from '@/helpers/constants';
+
+export const getMarkerBySolicitud = (solicitud: HelpRequestData) => {
+  // TODO think if possible getLatLng from a given location
+  if (!solicitud.latitude || !solicitud.longitude) {
+    return null;
+  }
+
+  return {
+    id: solicitud.id,
+    coordinates: [solicitud.longitude, solicitud.latitude],
+    descriptionHTML: getMarkerDescriptionBySolicitudAndTowns(solicitud),
+    color: getMarkerColorBySolicitud(solicitud),
+    width: '400px',
+  };
+};
+
+export const getMarkerColorBySolicitud = (solicitud: HelpRequestData) => {
+  switch (solicitud.urgency) {
+    case 'baja':
+      return '#00FF00';
+    case 'media':
+      return '#FFA500';
+    case 'alta':
+      return '#FF0000';
+    default:
+      return '#000000';
+  }
+};
+export const getMarkerDescriptionBySolicitudAndTowns = (solicitud: HelpRequestData) => {
+  return ReactDOMServer.renderToString(
+    <SolicitudCard key={solicitud.id} caso={solicitud} showEdit={false} showLink={true} />,
+  );
+};
diff --git a/src/lib/service.ts b/src/lib/service.ts
index fa45eb17..a0b2bb42 100644
--- a/src/lib/service.ts
+++ b/src/lib/service.ts
@@ -2,6 +2,7 @@ import { supabase } from './supabase/client';
 import { Database } from '@/types/database';
 import { HelpRequestAssignmentInsert, HelpRequestUpdate } from '@/types/Requests';
 import { createClient } from '@/lib/supabase/server';
+import { SupabaseClient } from '@supabase/supabase-js';
 
 export const helpRequestService = {
   async createRequest(requestData: Database['public']['Tables']['help_requests']['Insert']) {
@@ -85,6 +86,76 @@ export const helpRequestService = {
     if (error) throw error;
     return data;
   },
+  async getTodaysCount() {
+    const today = new Date().toISOString().split('T')[0];
+    const supabase = await getSupabaseClient();
+    const { count: solicitaCount, error: solicitaError } = await supabase
+      .from('help_requests')
+      .select('id', { count: 'exact' })
+      .eq('type', 'necesita')
+      .gte('created_at', today)
+      .lte('created_at', `${today}T23:59:59.999Z`);
+
+    const { count: ofreceCount, error: ofreceError } = await supabase
+      .from('help_requests')
+      .select('id', { count: 'exact' })
+      .eq('type', 'ofrece')
+      .gte('created_at', today)
+      .lte('created_at', `${today}T23:59:59.999Z`);
+
+    if (solicitaError) {
+      throw new Error('Error fetching solicita:', solicitaError);
+    }
+    if (ofreceError) {
+      throw new Error('Error fetching ofrece:', ofreceError);
+    }
+    return {
+      solicitudes: solicitaCount || 0,
+      ofertas: ofreceCount || 0,
+    };
+  },
+  async getTodaysCountByTown() {
+    const supabase = await getSupabaseClient();
+    const today = new Date().toISOString().split('T')[0];
+
+    const { data: towns, error: townError } = await supabase.from('towns').select('id, name');
+
+    if (townError) {
+      console.log('Error fetching towns:', townError);
+      throw townError;
+    }
+
+    const { data, error } = await supabase
+      .from('help_requests')
+      .select('*')
+      .in('type', ['ofrece', 'necesita'])
+      .gte('created_at', today)
+      .lte('created_at', `${today}T23:59:59.999Z`);
+
+    if (error) {
+      console.log('Error fetching help requests:', error);
+      throw error;
+    }
+
+    const volunteersCount = new Map();
+    const needHelpCount = new Map();
+
+    data.forEach((person) => {
+      const townId = person.town_id;
+      if (person.type === 'ofrece') {
+        volunteersCount.set(townId, (volunteersCount.get(townId) || 0) + 1);
+      } else if (person.type === 'necesita') {
+        needHelpCount.set(townId, (needHelpCount.get(townId) || 0) + 1);
+      }
+    });
+
+    return towns.map((town) => ({
+      id: town.id,
+      name: town.name ?? 'N/A',
+      count: volunteersCount.get(town.id) || 0,
+      needHelp: needHelpCount.get(town.id) || 0,
+    }));
+  },
 };
 
 export const townService = {
diff --git a/src/types/DataPoints.ts b/src/types/DataPoints.ts
index b2cee66a..1aa39719 100644
--- a/src/types/DataPoints.ts
+++ b/src/types/DataPoints.ts
@@ -1,39 +1,11 @@
-interface DataPoint {
-  type: string;
-  name: string | null;
-  contact_info: string;
-  location: string | null;
-}
+import { Database } from '@/types/database';
 
-export interface CollectionPointData extends DataPoint {
-  contact_name: string;
-  contact_phone: string;
-  city: string;
-}
+export type CollectionPointData = Database['public']['Tables']['collection_points']['Row'];
+export type CollectionPointInsert = Database['public']['Tables']['collection_points']['Insert'];
 
-export interface HelpOfferData extends DataPoint {
-  help_type: string[] | null;
-  description: string | null;
-  resources:
-    | {
-        vehicle: string;
-        availability: string[];
-        radius: number;
-      }
-    | string;
-  status: string;
-  additional_info?: {
-    email: string;
-    experience: string;
-  };
-  latitude?: number | null;
-  longitude?: number | null;
-  town_id?: string;
-}
+export type DeliveryPointData = Database['public']['Tables']['delivery_points']['Row'];
+export type DeliveryPointInsert = Database['public']['Tables']['delivery_points']['Insert'];
 
-export interface MissingPersonData extends DataPoint {
-  help_type: string[] | null;
-  description: string | null;
-  resources: string;
-  status: string;
+export function isCoordinates(coords: unknown): coords is { lat: number; lon: number } {
+  return typeof coords === 'object' && coords !== null && 'lat' in coords && 'lon' in coords;
 }
diff --git a/src/types/Markers.ts b/src/types/Markers.ts
deleted file mode 100644
index 508198bf..00000000
--- a/src/types/Markers.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export type MarkersType = {
-  id: string;
-  coordinates: [number, number];
-  color: string;
-  descriptionHTML: string;
-  width: string;
-};
diff --git a/src/types/Requests.ts b/src/types/Requests.ts
index c875a3af..184276ea 100644
--- a/src/types/Requests.ts
+++ b/src/types/Requests.ts
@@ -12,7 +12,3 @@ export type HelpRequestAdditionalInfo = {
   special_situations?: string;
   email?: string;
 };
-
-export type CollectionPointType = 'permanente' | 'temporal';
-export type CollectionPointStatus = 'active' | 'inactive';
-export type CollectionPointData = Database['public']['Tables']['collection_points']['Row'];
diff --git a/src/types/common.ts b/src/types/common.ts
index 95ab26f1..316c04f3 100644
--- a/src/types/common.ts
+++ b/src/types/common.ts
@@ -1,8 +1,3 @@
 import { Database } from './database';
 
-export type TownType = {
-  id: string;
-  name: string;
-};
-
 export type Enums = Database['public']['Enums'];
diff --git a/src/types/database.ts b/src/types/database.ts
index 2a181cf2..e08e97bc 100644
--- a/src/types/database.ts
+++ b/src/types/database.ts
@@ -182,6 +182,7 @@ export type Database = {
           longitude: number | null;
           name: string | null;
           number_of_people: number | null;
+          other_help: string | null;
           people_needed: number | null;
           resources: Json | null;
           status: string | null;
@@ -203,6 +204,7 @@ export type Database = {
           longitude?: number | null;
           name?: string | null;
           number_of_people?: number | null;
+          other_help?: string | null;
           people_needed?: number | null;
           resources?: Json | null;
           status?: string | null;
@@ -224,6 +226,7 @@ export type Database = {
           longitude?: number | null;
           name?: string | null;
           number_of_people?: number | null;
+          other_help?: string | null;
           people_needed?: number | null;
           resources?: Json | null;
           status?: string | null;
@@ -329,9 +332,35 @@ export type Database = {
         };
         Relationships: [];
       };
+      user_roles: {
+        Row: {
+          created_at: string;
+          id: number;
+          role: Database['public']['Enums']['roles'] | null;
+          user_id: string | null;
+        };
+        Insert: {
+          created_at?: string;
+          id?: number;
+          role?: Database['public']['Enums']['roles'] | null;
+          user_id?: string | null;
+        };
+        Update: {
+          created_at?: string;
+          id?: number;
+          role?: Database['public']['Enums']['roles'] | null;
+          user_id?: string | null;
+        };
+        Relationships: [];
+      };
     };
     Views: {
-      [_ in never]: never;
+      distinct_collection_cities: {
+        Row: {
+          city: string | null;
+        };
+        Relationships: [];
+      };
     };
     Functions: {
       [_ in never]: never;
@@ -346,7 +375,10 @@ export type Database = {
         | 'medica'
         | 'psicologico'
         | 'logistico'
-        | 'otros';
+        | 'otros'
+        | 'reparto'
+        | 'donaciones';
+      roles: 'user' | 'moderator' | 'admin';
     };
     CompositeTypes: {
       [_ in never]: never;