diff --git a/package-lock.json b/package-lock.json
index 30d7b4e6..63a5e8d5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,6 +13,7 @@
         "@supabase/ssr": "^0.5.1",
         "@supabase/supabase-js": "^2.46.1",
         "@tanstack/react-query": "^5.59.19",
+        "babel-plugin-react-compiler": "19.0.0-beta-63b359f-20241101",
         "deck.gl": "^9.0.34",
         "leaflet": "^1.9.4",
         "lucide-react": "^0.454.0",
@@ -3497,6 +3498,15 @@
         "npm": ">=6"
       }
     },
+    "node_modules/babel-plugin-react-compiler": {
+      "version": "19.0.0-beta-63b359f-20241101",
+      "resolved": "https://registry.npmjs.org/babel-plugin-react-compiler/-/babel-plugin-react-compiler-19.0.0-beta-63b359f-20241101.tgz",
+      "integrity": "sha512-qrmTHJP3O2kGbtL7kuySX3Lmk+5/4ZR1rHr8QhKa0GzKbmpAUGrTeWOg0NCI5t+QUfKKizxIO1+t0HsZW9x4vQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.19.0"
+      }
+    },
     "node_modules/balanced-match": {
       "version": "1.0.2",
       "dev": true,
diff --git a/src/app/casos-activos/ofertas/page.tsx b/src/app/casos-activos/ofertas/page.tsx
index d1b8f5de..6064a573 100644
--- a/src/app/casos-activos/ofertas/page.tsx
+++ b/src/app/casos-activos/ofertas/page.tsx
@@ -82,7 +82,7 @@ function Ofertas() {
           console.log('Error fetching solicitudes:', error);
           setData([]);
         } else {
-          setData(data || []);
+          setData((data as HelpRequestData[]) || []);
           setCurrentCount(count ?? 0);
         }
       } catch (err) {
@@ -140,7 +140,7 @@ function Ofertas() {
             </p>
           </div>
         ) : (
-          data.map((caso) => <OfferCard caso={caso} showLink={true} key={caso.id} />)
+          data.map((caso) => <OfferCard caso={caso} showLink={true} showEdit={true} key={caso.id} />)
         )}
       </div>
       <div className="flex items-center justify-center">
diff --git a/src/app/casos-activos/solicitudes/page.tsx b/src/app/casos-activos/solicitudes/page.tsx
index 26b1f368..80d8ae0e 100644
--- a/src/app/casos-activos/solicitudes/page.tsx
+++ b/src/app/casos-activos/solicitudes/page.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { Suspense, useEffect, useState, useCallback, useMemo, ChangeEventHandler } from 'react';
+import { Suspense, useEffect, useState, useCallback, ChangeEventHandler } from 'react';
 import { supabase } from '@/lib/supabase/client';
 import SolicitudCard from '@/components/SolicitudCard';
 import Pagination from '@/components/Pagination';
@@ -74,7 +74,7 @@ function Solicitudes() {
 
   const handleToggleChange: ChangeEventHandler<HTMLInputElement> = useCallback(
     (e) => changeDataFilter('soloSinAsignar', `${e.target.checked}`),
-    [],
+    [changeDataFilter],
   );
 
   useEffect(() => {
@@ -116,7 +116,7 @@ function Solicitudes() {
           console.log('Error fetching solicitudes:', error);
           setData([]);
         } else {
-          setData(data || []);
+          setData((data as HelpRequestData[]) || []);
           setCurrentCount(count ?? 0);
         }
       } catch (err) {
@@ -190,15 +190,13 @@ function Solicitudes() {
               ))}
             </select>
           </div>
-          {/*
-          <div className="flex flex-row flex-1 justify-end">
-            <Toggle
-              handleChange={handleToggleChange}
-              checked={isStringTrue(filtroData.soloSinAsignar)}
-              label="Sólo ofertas sin voluntarios"
-            />
-          </div>
-          */}
+{/*<div className="flex flex-row flex-1 justify-end">
+  <Toggle
+    handleChange={handleToggleChange}
+    checked={isStringTrue(filtroData.soloSinAsignar)}
+    label="Sólo ofertas sin voluntarios"
+  />
+</div>*/}
         </div>
       </div>
       <div className="grid gap-4">
diff --git a/src/app/ofertas/[id]/page.tsx b/src/app/ofertas/[id]/page.tsx
index a3bbd571..e732cf54 100644
--- a/src/app/ofertas/[id]/page.tsx
+++ b/src/app/ofertas/[id]/page.tsx
@@ -54,7 +54,7 @@ export default function CasoDetalle() {
           Volver
         </button>
       </div>
-      <OfferCard caso={request} showLink={false} />
+      <OfferCard caso={request} showLink={false} showEdit={true} />
     </div>
   );
 }
diff --git a/src/app/ofertas/editar/[id]/page.tsx b/src/app/ofertas/editar/[id]/page.tsx
index 57c438af..92b783a8 100644
--- a/src/app/ofertas/editar/[id]/page.tsx
+++ b/src/app/ofertas/editar/[id]/page.tsx
@@ -1,7 +1,7 @@
-import OfferHelp from '@/components/OfferHelp';
 import Unauthorized from '@/components/Unauthorized';
 import { createClient } from '@/lib/supabase/server';
 import { helpRequestService } from '@/lib/service';
+import EditHelpOffer from '@/components/HelpOffers/EditHelpOffer';
 
 export default async function EditarSolicitud({ params }: { params: Promise<{ id: string }> }) {
   const { id } = await params;
@@ -12,14 +12,5 @@ export default async function EditarSolicitud({ params }: { params: Promise<{ id
   }
   const numberId = Number(id);
   const request = await helpRequestService.getOne(numberId);
-  return (
-    <OfferHelp
-      title="Editar solicitud de ayuda"
-      submitType="edit"
-      data={request}
-      id={numberId}
-      button={['Editar oferta', 'Editando oferta...']}
-      redirect="/ofertas"
-    />
-  );
+  return <EditHelpOffer request={request} />;
 }
diff --git a/src/app/ofertas/page.tsx b/src/app/ofertas/page.tsx
index 03405fb8..3c837de1 100644
--- a/src/app/ofertas/page.tsx
+++ b/src/app/ofertas/page.tsx
@@ -1,16 +1,13 @@
 'use client';
 
-import { useState, useEffect, Suspense } from 'react';
+import { Suspense } from 'react';
 import { HeartHandshake } from 'lucide-react';
-import { supabase } from '@/lib/supabase/client';
-import Pagination from '@/components/Pagination';
-import { useRouter, useSearchParams } from 'next/navigation';
-import { tiposAyudaOptions } from '@/helpers/constants';
-import { useTowns } from '@/context/TownProvider';
 import { useSession } from '@/context/SessionProvider';
 import OfferCard from '@/components/OfferCard';
 import Link from 'next/link';
 import { HelpRequestData } from '@/types/Requests';
+import { useQuery } from '@tanstack/react-query';
+import { helpRequestService } from '@/lib/service';
 
 export default function ListaSolicitudesPage() {
   return (
@@ -22,92 +19,14 @@ export default function ListaSolicitudesPage() {
 
 function ListaSolicitudes() {
   const session = useSession();
+  const userId = session.user?.id;
 
-  const searchParams = useSearchParams();
-  const router = useRouter();
-
-  const [loading, setLoading] = useState<boolean>(true);
-  const [error, setError] = useState<string | null>(null);
-
-  const [data, setData] = useState<HelpRequestData[]>([]);
-  const [currentPage, setCurrentPage] = useState<number>(Number(searchParams.get('page')) || 1);
-  const [currentCount, setCurrentCount] = useState<number>(0);
-  const { towns } = useTowns();
-
-  const itemsPerPage = 10;
-  const numPages = (count: number) => {
-    return Math.ceil(count / itemsPerPage) || 0;
-  };
-
-  const updateFilter = (filter: 'urgencia' | 'tipoAyuda' | 'pueblo' | 'page', value: string) => {
-    const params = new URLSearchParams(searchParams.toString());
-    params.set(filter, value);
-    router.push(`?${params.toString()}`);
-  };
-  const [filtroData, setFiltroData] = useState({
-    urgencia: searchParams.get('urgencia') || 'todas',
-    tipoAyuda: searchParams.get('tipoAyuda') || 'todas',
-    pueblo: searchParams.get('pueblo') || 'todos',
+  const { data, isLoading, error } = useQuery<HelpRequestData[]>({
+    queryKey: ['help_requests', { user_id: userId, type: 'ofrece' }],
+    queryFn: () => helpRequestService.getOffersByUser(userId),
   });
 
-  const changeDataFilter = (type: 'urgencia' | 'tipoAyuda' | 'pueblo', newFilter: string) => {
-    setFiltroData((prev) => ({
-      ...prev,
-      [type]: newFilter,
-    }));
-    updateFilter(type, newFilter);
-  };
-
-  function changePage(newPage: number) {
-    setCurrentPage(newPage);
-    updateFilter('page', newPage.toString());
-  }
-  useEffect(() => {
-    async function fetchData() {
-      try {
-        setLoading(true);
-        setError(null);
-
-        // Comenzamos la consulta
-        const query = supabase
-          .from('help_requests')
-          .select('*', { count: 'exact' })
-          .eq('type', 'ofrece')
-          .contains('additional_info', { email: session.user?.email });
-        // Solo agregar filtro si no es "todos"
-        if (filtroData.pueblo !== 'todos') {
-          query.eq('town_id', filtroData.pueblo);
-        }
-
-        // Solo agregar filtro si no es "todas"
-        if (filtroData.urgencia !== 'todas') {
-          query.eq('urgency', filtroData.urgencia);
-        }
-
-        // Ejecutar la consulta con paginación
-        const { data, count, error } = await query
-          .range((currentPage - 1) * itemsPerPage, currentPage * itemsPerPage - 1)
-          .order('created_at', { ascending: false });
-
-        if (error || count === null) {
-          console.log('Error fetching solicitudes:', error);
-          setData([]);
-        } else {
-          setData(data || []);
-          setCurrentCount(count);
-        }
-      } catch (err) {
-        console.log('Error general:', err);
-        setError('Error de conexión.');
-      } finally {
-        setLoading(false);
-      }
-    }
-
-    fetchData();
-  }, [filtroData, currentPage]);
-
-  if (loading) {
+  if (isLoading) {
     return (
       <div className="flex justify-center items-center min-h-screen">
         <div className="animate-spin rounded-full h-12 w-12 border-b-2 border-blue-500"></div>
@@ -115,10 +34,10 @@ function ListaSolicitudes() {
     );
   }
 
-  if (error) {
+  if (error || !data) {
     return (
       <div className="bg-red-100 border-l-4 border-red-500 p-4 rounded">
-        <p className="text-red-700">{error}</p>
+        <p className="text-red-700">{error?.message}</p>
       </div>
     );
   }
@@ -126,53 +45,11 @@ function ListaSolicitudes() {
   return (
     <>
       <div className="space-y-6 mx-auto max-w-7xl px-4 sm:px-6 mt-10">
-        {/* FILTROS  */}
-        <div className="flex flex-col sm:flex-row gap-2 items-center justify-between">
-          <p className="font-bold text-md">Filtros</p>
-          <div className="flex flex-col sm:flex-row gap-2 w-full justify-end">
-            <select
-              value={filtroData.tipoAyuda}
-              onChange={(e) => changeDataFilter('tipoAyuda', e.target.value)}
-              className="px-4 py-2 rounded-lg w-full border border-gray-300 focus:ring-2 focus:ring-blue-500 focus:border-blue-500 bg-white text-gray-900 shadow-sm"
-            >
-              <option value="todas">Todas las necesidades</option>
-              {Object.entries(tiposAyudaOptions).map(([key, label]) => (
-                <option key={key} value={key}>
-                  {label}
-                </option>
-              ))}
-            </select>
-            <select
-              value={filtroData.urgencia}
-              onChange={(e) => changeDataFilter('urgencia', e.target.value)}
-              className="px-4 py-2 rounded-lg w-full border border-gray-300 focus:ring-2 focus:ring-blue-500 focus:border-blue-500 bg-white text-gray-900 shadow-sm"
-            >
-              <option value="todas">Todas las prioridades</option>
-              <option value="alta">Alta prioridad</option>
-              <option value="media">Media prioridad</option>
-              <option value="baja">Baja prioridad</option>
-            </select>
-            <select
-              value={filtroData.pueblo}
-              onChange={(e) => changeDataFilter('pueblo', e.target.value)}
-              className="px-4 py-2 rounded-lg w-full border border-gray-300 focus:ring-2 focus:ring-blue-500 focus:border-blue-500 bg-white text-gray-900 shadow-sm"
-            >
-              <option value="todos">Todos los pueblos</option>
-              {towns.map((item) => (
-                <option key={item.id} value={item.id}>
-                  {item.name}
-                </option>
-              ))}
-            </select>
-          </div>
-        </div>
         <div className="grid gap-4">
           {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">
-                {filtroData.urgencia === 'todas' && filtroData.tipoAyuda === 'todas' && filtroData.pueblo === 'todos'
-                  ? 'No se encontraron solicitudes de ayuda correspondientes a tu cuenta.'
-                  : 'No se encontraron solicitudes que coincidan con los filtros.'}
+                No se encontraron solicitudes de ayuda correspondientes a tu cuenta.
               </p>
               <Link
                 href="/ofrecer-ayuda"
@@ -183,12 +60,9 @@ function ListaSolicitudes() {
               </Link>
             </div>
           ) : (
-            data.map((caso) => <OfferCard showLink={true} key={caso.id} caso={caso} />)
+            data.map((caso) => <OfferCard showLink={true} showEdit={true} key={caso.id} caso={caso} />)
           )}
         </div>
-        <div className="flex items-center justify-center">
-          <Pagination currentPage={currentPage} totalPages={numPages(currentCount)} onPageChange={changePage} />
-        </div>
       </div>
     </>
   );
diff --git a/src/app/ofrecer-ayuda/page.tsx b/src/app/ofrecer-ayuda/page.tsx
index c2f4a3a6..4ef3528e 100644
--- a/src/app/ofrecer-ayuda/page.tsx
+++ b/src/app/ofrecer-ayuda/page.tsx
@@ -1,22 +1,5 @@
-'use client';
-import OfferHelp from '@/components/OfferHelp';
-import { supabase } from '@/lib/supabase/client';
-import { useEffect, useState } from 'react';
+import CreateHelpOffer from '@/components/HelpOffers/CreateHelpOffer';
 
 export default function OfrecerAyuda() {
-  const [session, setSession] = useState(null);
-
-  useEffect(() => {
-    supabase.auth.getSession().then(({ data: { session } }: any) => {
-      setSession(session);
-    });
-  }, []);
-
-  return session ? (
-    <OfferHelp sessionProp={session} />
-  ) : (
-    <div className="flex justify-center items-center min-h-screen">
-      <div className="animate-spin rounded-full h-12 w-12 border-b-2 border-blue-500"></div>
-    </div>
-  );
+  return <CreateHelpOffer />;
 }
diff --git a/src/app/punto-recogida/page.tsx b/src/app/punto-recogida/page.tsx
index 00b9bcf2..71eaa620 100644
--- a/src/app/punto-recogida/page.tsx
+++ b/src/app/punto-recogida/page.tsx
@@ -3,7 +3,7 @@
 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 AddressAutocomplete, { AddressDetails } from '@/components/AddressAutocomplete';
 import { isValidPhone } from '@/helpers/utils';
 import { PhoneInput } from '@/components/input/PhoneInput';
 import { CollectionPointData, CollectionPointInsert } from '@/types/DataPoints';
@@ -220,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: any) => {
+                  onSelect={(address: AddressDetails) => {
                     setFormData((prev) => ({
                       ...prev,
                       location: address.fullAddress,
diff --git a/src/app/puntos-entrega/page.tsx b/src/app/puntos-entrega/page.tsx
index 5ea18b2b..822e7b68 100644
--- a/src/app/puntos-entrega/page.tsx
+++ b/src/app/puntos-entrega/page.tsx
@@ -3,7 +3,7 @@
 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 AddressAutocomplete, { AddressDetails } from '@/components/AddressAutocomplete';
 import { DeliveryPointData, DeliveryPointInsert, isCoordinates } from '@/types/DataPoints';
 
 export default function PuntosEntrega() {
@@ -226,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: any) => {
+                  onSelect={(address: AddressDetails) => {
                     setFormData((prev) => ({
                       ...prev,
                       location: address.fullAddress,
diff --git a/src/app/solicitar-ayuda/_components/Form/FormContainer.tsx b/src/app/solicitar-ayuda/_components/Form/FormContainer.tsx
deleted file mode 100644
index 88861c64..00000000
--- a/src/app/solicitar-ayuda/_components/Form/FormContainer.tsx
+++ /dev/null
@@ -1,218 +0,0 @@
-'use client';
-
-import React, { FormEvent, useCallback, useMemo, useState } from 'react';
-
-import { FormRenderer } from './FormRenderer';
-import { FormData, Status } from '../types';
-import { helpRequestService, townService } from '@/lib/service';
-import { formatPhoneNumber, isValidPhone, removeUrls } from '@/helpers/utils';
-import { Database } from '@/types/database';
-import { Enums } from '@/types/common';
-import { useRouter } from 'next/navigation';
-
-import { TIPOS_DE_AYUDA, TIPOS_DE_AYUDA_MAP } from '../constants';
-import { useSession } from '@/context/SessionProvider';
-import { AddressDescriptor } from '../../../../components/AddressMap';
-
-const mapHelpToEnum = (helpTypeMap: FormData['tiposDeAyuda']): Enums['help_type_enum'][] =>
-  Array.from(helpTypeMap).reduce(
-    (acc, [id, isSelected]) => {
-      if (isSelected) {
-        const value = TIPOS_DE_AYUDA_MAP.get(id);
-        if (!value) {
-          return acc;
-        }
-        return acc.concat(value.enum);
-      }
-      return acc;
-    },
-    [] as Enums['help_type_enum'][],
-  );
-
-export function FormContainer({ session }: any) {
-  const router = useRouter();
-
-  const userId = session.user?.id;
-
-  const [formData, setFormData] = useState<FormData>({
-    nombre: session?.user?.user_metadata?.full_name || session?.user?.user_metadata?.nombre || ''.split(' ')[0],
-    coordinates: null,
-    tiposDeAyuda: new Map(TIPOS_DE_AYUDA.map(({ id }) => [id, false])),
-    numeroDePersonas: undefined,
-    descripcion: '',
-    urgencia: 'alta',
-    situacionEspecial: '',
-    contacto: session?.user?.user_metadata?.telefono || '',
-    consentimiento: false,
-    email: session?.user?.user_metadata?.email || '',
-    ubicacion: '',
-    town: '',
-  });
-
-  const [status, setStatus] = useState<Status>({
-    isSubmitting: false,
-    error: null,
-    success: false,
-  });
-
-  const handleSubmit = useCallback(
-    async (e: FormEvent) => {
-      e.preventDefault();
-
-      /* Form validation */
-      if (!formData.coordinates) {
-        alert('Elige una ubicacion valida');
-        return;
-      }
-
-      if (!formData.consentimiento) {
-        alert('Debe aceptar el consentimiento para enviar la solicitud');
-        return;
-      }
-
-      if (!isValidPhone(formData.contacto)) {
-        alert('El teléfono de contacto no es válido.');
-        return;
-      }
-
-      if (!isValidPhone(formData.contacto)) {
-        alert('El teléfono de contacto no es válido.');
-        return;
-      }
-
-      setStatus({ isSubmitting: true, error: null, success: false });
-
-      try {
-        const latitude = String(formData.coordinates.lat);
-        const longitude = String(formData.coordinates.lng);
-
-        const { data: townResponse, error: townError } = await townService.createIfNotExists(formData.town);
-        if (townError) throw townError;
-
-        const helpRequestData: Database['public']['Tables']['help_requests']['Insert'] = {
-          type: 'necesita',
-          name: formData.nombre.split(' ')[0],
-          location: formData.ubicacion,
-          latitude: formData.coordinates ? parseFloat(latitude) : null,
-          longitude: formData.coordinates ? parseFloat(longitude) : null,
-          help_type: mapHelpToEnum(formData.tiposDeAyuda),
-          description: removeUrls(formData.descripcion),
-          urgency: formData.urgencia,
-          number_of_people: formData.numeroDePersonas || 1,
-          contact_info: formatPhoneNumber(formData.contacto),
-          additional_info: {
-            special_situations: formData.situacionEspecial || null,
-            consent: true,
-            email: formData.email,
-          },
-          town_id: townResponse[0].id,
-          status: 'active',
-          user_id: userId,
-        };
-
-        await helpRequestService.createRequest(helpRequestData);
-
-        // Limpiar formulario
-        setFormData({
-          nombre: '',
-          coordinates: null,
-          tiposDeAyuda: new Map(),
-          numeroDePersonas: undefined,
-          descripcion: '',
-          urgencia: 'alta',
-          situacionEspecial: '',
-          contacto: '',
-          consentimiento: false,
-          email: '',
-          ubicacion: '',
-          town: '',
-        });
-
-        setStatus({ isSubmitting: false, error: null, success: true });
-        setStatus((prev) => ({ ...prev, success: false }));
-        router.push('/casos-activos/solicitudes');
-      } catch (error: any) {
-        console.error('Error al enviar solicitud:', error.message);
-        setStatus({
-          isSubmitting: false,
-          error: `Error al enviar la solicitud: ${error.message}`,
-          success: false,
-        });
-      }
-    },
-    [userId, formData, router],
-  );
-
-  const handleInputElementChange: React.ChangeEventHandler<HTMLInputElement> = useCallback((e) => {
-    const { name, value, type, checked } = e.target;
-    setFormData((prev) => ({
-      ...prev,
-      [name]: type === 'checkbox' ? checked : value,
-    }));
-  }, []);
-
-  const handleTextAreaElementChange: React.ChangeEventHandler<HTMLTextAreaElement> = useCallback((e) => {
-    const { name, value } = e.target;
-    setFormData((formData) => ({
-      ...formData,
-      [name]: value,
-    }));
-  }, []);
-
-  const handleSelectElementChange: React.ChangeEventHandler<HTMLSelectElement> = useCallback((e) => {
-    const { name, value } = e.target;
-    setFormData((prev) => ({
-      ...prev,
-      [name]: value,
-    }));
-  }, []);
-
-  const handleNewAddressDescriptor = useCallback((addressDescriptor: AddressDescriptor) => {
-    setFormData((prev) => ({
-      ...prev,
-      town: addressDescriptor.town,
-      ubicacion: addressDescriptor.address,
-      coordinates: addressDescriptor.coordinates,
-    }));
-  }, []);
-
-  const handlePhoneChange = useCallback((phoneNumber: string) => {
-    setFormData((formData) => ({
-      ...formData,
-      contacto: phoneNumber,
-    }));
-  }, []);
-
-  const handleHelpTypeChange: React.ChangeEventHandler<HTMLInputElement> = useCallback((event) => {
-    const { id, checked } = event.target;
-
-    setFormData((formData) => {
-      const prevHelp = formData.tiposDeAyuda;
-      const newHelp = new Map([...prevHelp]);
-      newHelp.set(parseInt(id), checked);
-      return { ...formData, tiposDeAyuda: newHelp };
-    });
-  }, []);
-
-  const selectedHelp = useMemo(() => formData.tiposDeAyuda, [formData]);
-
-  return (
-    <FormRenderer
-      formData={formData}
-      isUserLoggedIn={Boolean(session?.user)}
-      handleConsentChange={handleInputElementChange}
-      handleEmailChange={handleInputElementChange}
-      handleNewAddressDescriptor={handleNewAddressDescriptor}
-      handleDescriptionChange={handleTextAreaElementChange}
-      handleNameChange={handleInputElementChange}
-      handleNumberPeopleChange={handleInputElementChange}
-      handlePhoneChange={handlePhoneChange}
-      handleSituacionEspecialChange={handleTextAreaElementChange}
-      handleTipoAyudaChange={handleHelpTypeChange}
-      handleUrgencyChange={handleSelectElementChange}
-      handleSubmit={handleSubmit}
-      status={status}
-      selectedHelp={selectedHelp}
-    />
-  );
-}
diff --git a/src/app/solicitar-ayuda/_components/Form/FormRenderer.tsx b/src/app/solicitar-ayuda/_components/Form/FormRenderer.tsx
deleted file mode 100644
index e4e3154d..00000000
--- a/src/app/solicitar-ayuda/_components/Form/FormRenderer.tsx
+++ /dev/null
@@ -1,209 +0,0 @@
-'use client';
-import React from 'react';
-import { Check } from 'lucide-react';
-import AddressMap, { AddressDescriptor } from '../../../../components/AddressMap';
-import { PhoneInput } from '@/components/input/PhoneInput';
-import AddressAutocomplete from '@/components/AddressAutocomplete.js';
-import { TIPOS_DE_AYUDA } from '../constants';
-import { TipoDeAyudaInputRenderer } from '../TipoDeAyudaInputRenderer';
-import { FormData, HelpCategory, Status } from '../types';
-import { LimitedTextarea } from '@/components/input/LimitedTextarea';
-
-type FormRendererProps = {
-  status: Status;
-  formData: FormData;
-  isUserLoggedIn: boolean;
-  selectedHelp: Map<HelpCategory['id'], boolean>;
-  handleSubmit: React.FormEventHandler<HTMLFormElement>;
-  handlePhoneChange: (phoneNumber: string) => void;
-  handleNewAddressDescriptor: (addressDescriptor: AddressDescriptor) => void;
-  handleSituacionEspecialChange: React.ChangeEventHandler<HTMLTextAreaElement>;
-  handleUrgencyChange: React.ChangeEventHandler<HTMLSelectElement>;
-  handleDescriptionChange: React.ChangeEventHandler<HTMLTextAreaElement>;
-  handleTipoAyudaChange: React.ChangeEventHandler<HTMLInputElement>;
-  handleNameChange: React.ChangeEventHandler<HTMLInputElement>;
-  handleEmailChange: React.ChangeEventHandler<HTMLInputElement>;
-  handleNumberPeopleChange: React.ChangeEventHandler<HTMLInputElement>;
-  handleConsentChange: React.ChangeEventHandler<HTMLInputElement>;
-};
-
-export function FormRenderer({
-  handleSubmit,
-  status,
-  formData,
-  isUserLoggedIn,
-  handlePhoneChange,
-  handleNewAddressDescriptor,
-  handleSituacionEspecialChange,
-  handleUrgencyChange,
-  handleDescriptionChange,
-  handleTipoAyudaChange,
-  handleNameChange,
-  handleEmailChange,
-  handleNumberPeopleChange,
-  handleConsentChange,
-  selectedHelp,
-}: FormRendererProps) {
-  return (
-    <>
-      {status.error && (
-        <div className="bg-red-100 border-l-4 border-red-500 p-4 rounded">
-          <p className="text-red-700">{status.error}</p>
-        </div>
-      )}
-
-      {/* Formulario principal */}
-      <div className="bg-white rounded-lg shadow-lg p-6">
-        <h1 className="text-2xl font-bold mb-6">Solicitar Ayuda</h1>
-
-        <form onSubmit={handleSubmit} className="space-y-6">
-          <div className="grid md:grid-cols-2 gap-4">
-            <div>
-              <label className="block text-sm font-medium text-gray-700 mb-1">Nombre</label>
-              <input
-                type="text"
-                name="nombre"
-                value={formData.nombre}
-                onChange={handleNameChange}
-                className="w-full p-2 border rounded focus:ring-2 focus:ring-green-500 focus:border-green-500"
-              />
-            </div>
-            <PhoneInput phoneNumber={formData.contacto} onChange={handlePhoneChange} required />
-          </div>
-          {/*
-          MANTENIDO EN CASO DE RE UTILIZAR EN EL FUTURO
-          ACTUALMENTE NO APARECERA DE NINGUNA FORMA
-          */}
-          {!isUserLoggedIn && (
-            <div>
-              <label className="block text-sm font-medium text-gray-700 mb-1">
-                Correo electrónico <span className="text-red-500">*</span>
-              </label>
-              <input
-                type="email"
-                name="email"
-                value={formData.email}
-                onChange={handleEmailChange}
-                className="w-full p-2 border rounded focus:ring-2 focus:ring-green-500 focus:border-green-500"
-              />
-              <p className="mt-1 text-sm text-gray-500">
-                {isUserLoggedIn
-                  ? 'Se utilizará para que puedas eliminar o editar la información de tu solicitud'
-                  : 'Se utilizará para que puedas actualizar tu solicitud y marcarla como completada. Para realizar cambios, deberás registrarte con el mismo email'}
-              </p>
-            </div>
-          )}
-
-          <div>
-            <label className="block text-sm font-medium text-gray-700 mb-2">Tipo de ayuda necesaria</label>
-            <div className="grid md:grid-cols-2 gap-2">
-              {TIPOS_DE_AYUDA.map(({ id, label }) => (
-                <TipoDeAyudaInputRenderer
-                  key={id}
-                  id={id}
-                  handleTipoAyudaChange={handleTipoAyudaChange}
-                  label={label}
-                  isSelected={selectedHelp.get(id) || false}
-                />
-              ))}
-            </div>
-          </div>
-
-          <div>
-            <label className="block text-sm font-medium text-gray-700 mb-1">Número de personas afectadas</label>
-            <input
-              type="number"
-              name="numeroPersonas"
-              value={formData.numeroDePersonas}
-              onChange={handleNumberPeopleChange}
-              className="w-full p-2 border rounded focus:ring-2 focus:ring-red-500"
-              min="1"
-            />
-          </div>
-
-          <div>
-            <label className="block text-sm font-medium text-gray-700 mb-1">Descripción de la situación</label>
-            <LimitedTextarea
-              name="descripcion"
-              value={formData.descripcion}
-              onChange={handleDescriptionChange}
-              className="w-full p-2 border rounded focus:ring-2 focus:ring-red-500"
-              rows={3}
-              placeholder="Describa su situación actual y el tipo de ayuda que necesita"
-              maxLength={350}
-            />
-          </div>
-
-          <div>
-            <label className="block text-sm font-medium text-gray-700 mb-1">Nivel de urgencia</label>
-            <select
-              name="urgencia"
-              value={formData.urgencia}
-              onChange={handleUrgencyChange}
-              className="w-full p-2 border rounded focus:ring-2 focus:ring-red-500"
-            >
-              <option value="alta">Alta - Necesito ayuda inmediata</option>
-              <option value="media">Media - Puedo esperar unas horas</option>
-              <option value="baja">Baja - No es urgente</option>
-            </select>
-          </div>
-
-          <div>
-            <label className="block text-sm font-medium text-gray-700 mb-1">Situaciones especiales</label>
-            <textarea
-              name="situacionEspecial"
-              value={formData.situacionEspecial}
-              onChange={handleSituacionEspecialChange}
-              className="w-full p-2 border rounded focus:ring-2 focus:ring-red-500"
-              rows={2}
-              placeholder="Personas mayores, niños pequeños, personas con movilidad reducida, necesidades médicas, mascotas..."
-            />
-          </div>
-
-          <div>
-            <AddressMap onNewAddressDescriptor={handleNewAddressDescriptor} titulo="Ubicación exacta" />
-          </div>
-
-          {/* Consentimiento */}
-          <div className="flex items-start">
-            <label className="ml-2 block text-sm text-gray-700 cursor-pointer">
-              <input
-                type="checkbox"
-                name="consentimiento"
-                checked={formData.consentimiento}
-                onChange={handleConsentChange}
-                className="mt-1 h-4 w-4 text-red-600 focus:ring-red-500 border-gray-300 rounded mr-2"
-              />
-              Doy mi consentimiento para el tratamiento de los datos proporcionados y confirmo que la información
-              proporcionada es verídica.
-            </label>
-          </div>
-
-          <button
-            type="submit"
-            disabled={status.isSubmitting}
-            className={`w-full ${
-              status.isSubmitting ? 'bg-gray-400 cursor-not-allowed' : 'bg-red-500 hover:bg-red-600'
-            } text-white py-3 px-4 rounded-lg font-semibold`}
-          >
-            {status.isSubmitting ? 'Enviando solicitud...' : 'Enviar Solicitud de Ayuda'}
-          </button>
-        </form>
-      </div>
-
-      {status.success && (
-        <div className="fixed bottom-4 right-4 bg-green-100 border-l-4 border-green-500 p-4 rounded shadow-lg z-50">
-          <div className="flex items-center">
-            <Check className="h-5 w-5 text-green-500 mr-2" />
-            <div>
-              <p className="text-green-700 font-medium">Su solicitud de ayuda ha sido registrada correctamente.</p>
-              <p className="text-green-600 text-sm mt-1">
-                Se está coordinando la ayuda. En caso de empeorar la situación, contacte al 112.
-              </p>
-            </div>
-          </div>
-        </div>
-      )}
-    </>
-  );
-}
diff --git a/src/app/solicitar-ayuda/_components/Form/index.ts b/src/app/solicitar-ayuda/_components/Form/index.ts
deleted file mode 100644
index fd3c2d5a..00000000
--- a/src/app/solicitar-ayuda/_components/Form/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { FormContainer as Form } from './FormContainer';
-
-export { Form };
diff --git a/src/app/solicitar-ayuda/_components/TipoDeAyudaInputRenderer.tsx b/src/app/solicitar-ayuda/_components/TipoDeAyudaInputRenderer.tsx
deleted file mode 100644
index af0f659f..00000000
--- a/src/app/solicitar-ayuda/_components/TipoDeAyudaInputRenderer.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import React from 'react';
-
-import { TipoDeAyudaInputRendererProps } from './types';
-
-export function TipoDeAyudaInputRenderer({
-  isSelected,
-  label,
-  handleTipoAyudaChange,
-  id,
-}: TipoDeAyudaInputRendererProps) {
-  return (
-    <label
-      className={`flex items-center p-3 rounded cursor-pointer ${
-        isSelected ? 'bg-red-50 text-red-800' : 'bg-gray-50 hover:bg-gray-100'
-      }`}
-    >
-      <input
-        type="checkbox"
-        checked={isSelected}
-        onChange={handleTipoAyudaChange}
-        className="h-4 w-4 text-red-600 focus:ring-red-500 border-gray-300 rounded"
-        id={id.toString()}
-      />
-      <span className="ml-2">{label}</span>
-    </label>
-  );
-}
diff --git a/src/app/solicitar-ayuda/_components/TownSelector/TownSelectorDataWrapper.tsx b/src/app/solicitar-ayuda/_components/TownSelector/TownSelectorDataWrapper.tsx
deleted file mode 100644
index 31205134..00000000
--- a/src/app/solicitar-ayuda/_components/TownSelector/TownSelectorDataWrapper.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-'use client';
-
-import React, { useEffect, useState } from 'react';
-import { supabase } from '@/lib/supabase/client';
-
-import { TownSelectorRenderer } from './TownSelectorRenderer';
-import { Town } from '../types';
-
-type TownSelectorRendererProps = Pick<
-  React.ComponentProps<typeof TownSelectorRenderer>,
-  'handleChange' | 'selectedTown'
->;
-
-export function TownSelectorDataWrapper({ handleChange, selectedTown }: TownSelectorRendererProps) {
-  const [towns, setTowns] = useState<Town[]>([]);
-
-  useEffect(() => {
-    async function fetchTowns() {
-      const { data, error } = await supabase.from('towns').select('id, name');
-
-      if (error) {
-        console.log('Error fetching towns:', error);
-        return;
-      }
-
-      setTowns(data);
-    }
-
-    fetchTowns();
-  }, []);
-
-  return <TownSelectorRenderer handleChange={handleChange} listOfTowns={towns} selectedTown={selectedTown} />;
-}
diff --git a/src/app/solicitar-ayuda/_components/TownSelector/TownSelectorRenderer.tsx b/src/app/solicitar-ayuda/_components/TownSelector/TownSelectorRenderer.tsx
deleted file mode 100644
index dba49ce2..00000000
--- a/src/app/solicitar-ayuda/_components/TownSelector/TownSelectorRenderer.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import React from 'react';
-
-import { Town } from '../types';
-
-type TownSelectorRendererProps = {
-  selectedTown: Town['name'];
-  handleChange: React.ChangeEventHandler<HTMLSelectElement>;
-  listOfTowns: Town[];
-};
-
-export function TownSelectorRenderer({ handleChange, listOfTowns, selectedTown }: TownSelectorRendererProps) {
-  return (
-    <div>
-      <div className="flex flex-row justify-between mb-2 items-end">
-        <label className="block text-sm font-medium text-gray-700 mb-1">
-          Pueblo <span className="text-red-500">*</span>
-        </label>
-      </div>
-      <select
-        name="pueblo"
-        value={selectedTown || ''}
-        onChange={handleChange}
-        className="w-full p-2 border rounded focus:ring-2 focus:ring-red-500"
-        required
-      >
-        <option value="">Selecciona un pueblo</option>
-        {listOfTowns.map((item) => (
-          <option key={item.id} value={item.id}>
-            {item.name}
-          </option>
-        ))}
-      </select>
-    </div>
-  );
-}
diff --git a/src/app/solicitar-ayuda/_components/TownSelector/index.ts b/src/app/solicitar-ayuda/_components/TownSelector/index.ts
deleted file mode 100644
index 219a4497..00000000
--- a/src/app/solicitar-ayuda/_components/TownSelector/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { TownSelectorDataWrapper as TownSelector } from './TownSelectorDataWrapper';
-
-export { TownSelector };
diff --git a/src/app/solicitar-ayuda/_components/constants.ts b/src/app/solicitar-ayuda/_components/constants.ts
deleted file mode 100644
index e2a1868e..00000000
--- a/src/app/solicitar-ayuda/_components/constants.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { HelpCategory, HelpTypesMap } from './types';
-
-export const TIPOS_DE_AYUDA: HelpCategory[] = [
-  {
-    id: 1,
-    label: 'Labores de Limpieza',
-    enumLabel: 'limpieza',
-  },
-  {
-    id: 2,
-    label: 'Petición de desplazamiento',
-    enumLabel: 'evacuacion',
-  },
-  {
-    id: 3,
-    label: 'Alojamiento temporal',
-    enumLabel: 'alojamiento',
-  },
-  {
-    id: 4,
-    label: 'Necesidad de suministros y material',
-    enumLabel: 'distribucion',
-  },
-  {
-    id: 5,
-    label: 'Equipo de rescate (evacuación)',
-    enumLabel: 'rescate',
-  },
-  {
-    id: 6,
-    label: 'Asistencia médica',
-    enumLabel: 'medica',
-  },
-  {
-    id: 7,
-    label: 'Apoyo psicológico',
-    enumLabel: 'psicologico',
-  },
-  {
-    id: 8,
-    label: 'Apoyo logístico',
-    enumLabel: 'logistico',
-  },
-  /*
-  { id: 9, label: 'Maquinaria para movilidad reducida', enumLabel: 'otros' },
-  { id: 10, label: 'Maquinaria pesada (grúas, palas, ...)', enumLabel: 'otros' },
-  {
-    id: 11,
-    label: 'Contenedores de escombros',
-    enumLabel: 'otros',
-  },
-  { id: 12, label: 'Equipamiento (botas, palas, guantes, ...)', enumLabel: 'otros' },
-   */
-];
-
-export const TIPOS_DE_AYUDA_MAP: HelpTypesMap = new Map(
-  TIPOS_DE_AYUDA.map((item) => [item.id, { label: item.label, enum: item.enumLabel }]),
-);
diff --git a/src/app/solicitar-ayuda/_components/types.ts b/src/app/solicitar-ayuda/_components/types.ts
deleted file mode 100644
index adbc0bb2..00000000
--- a/src/app/solicitar-ayuda/_components/types.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { Town as SupabaseTown } from '@/types/Town';
-import { Enums } from '@/types/common';
-import { LngLat } from '@/components/map/GeolocationMap';
-
-export type FormData = {
-  nombre: string;
-  contacto: string;
-  email: string;
-  numeroDePersonas: number | undefined;
-  descripcion: string;
-  urgencia: string;
-  situacionEspecial: string;
-  consentimiento: boolean;
-  coordinates: LngLat | null;
-  tiposDeAyuda: Map<HelpCategory['id'], boolean>;
-  ubicacion: string;
-  town: string;
-};
-
-export type HelpCategory = {
-  id: number;
-  label: string;
-  enumLabel: Enums['help_type_enum'];
-};
-
-export type TipoDeAyudaInputRendererProps = Pick<HelpCategory, 'id' | 'label'> & {
-  isSelected: boolean;
-  handleTipoAyudaChange: React.ChangeEventHandler<HTMLInputElement>;
-};
-
-export type Address = {
-  road: string;
-  house_number: string;
-  postcode: string;
-  city: string;
-  state: string;
-};
-
-export type Status = {
-  error: string | null;
-  isSubmitting: boolean;
-  success: boolean;
-};
-
-export type Town = Pick<SupabaseTown, 'id' | 'name'>;
-
-export type HelpTypesMap = Map<HelpCategory['id'], { label: HelpCategory['label']; enum: Enums['help_type_enum'] }>;
diff --git a/src/app/solicitar-ayuda/page.tsx b/src/app/solicitar-ayuda/page.tsx
index 62e345ea..d19972ac 100644
--- a/src/app/solicitar-ayuda/page.tsx
+++ b/src/app/solicitar-ayuda/page.tsx
@@ -1,33 +1,12 @@
-'use client';
-import { useEffect, useState } from 'react';
+import { AlertTriangle } from 'lucide-react';
 import Image from 'next/image';
 import { CallCenterLink } from '@/components/CallCenterLink';
-import { AlertTriangle } from 'lucide-react';
-import { supabase } from '@/lib/supabase/client';
-import { Form } from './_components/Form';
+import CreateHelpRequest from '@/components/HelpRequests/CreateHelpRequest';
 
 export default function SolicitarAyuda() {
-  const [session, setSession] = useState(null);
-
-  useEffect(() => {
-    supabase.auth.getSession().then(({ data: { session } }: any) => {
-      setSession(session);
-    });
-  }, []);
   return (
     <div className="space-y-6">
       {/* Banner de emergencia */}
-      <div className="bg-red-100 border-l-4 border-red-500 p-4 rounded">
-        <div className="flex items-start">
-          <AlertTriangle className="h-5 w-5 text-red-500 mt-0.5 mr-2" />
-          <div>
-            <h2 className="text-red-800 font-bold">EMERGENCIA ACTIVA - Inundaciones CV</h2>
-            <p className="text-red-700 text-sm mt-1">
-              Para emergencias médicas inmediatas, llame al 112. Este formulario es para coordinar ayuda y asistencia.
-            </p>
-          </div>
-        </div>
-      </div>
       <div className="bg-red-100 border-l-4 border-red-500 p-4 rounded">
         <div className="flex items-start">
           <AlertTriangle className="h-5 w-5 text-red-500 mt-0.5 mr-2" />
@@ -65,13 +44,7 @@ export default function SolicitarAyuda() {
           </div>
         </div>
       </div>
-      {session ? (
-        <Form session={session} />
-      ) : (
-        <div className="flex justify-center items-center min-h-screen">
-          <div className="animate-spin rounded-full h-12 w-12 border-b-2 border-blue-500"></div>
-        </div>
-      )}
+      <CreateHelpRequest />
     </div>
   );
 }
diff --git a/src/app/solicitudes/editar/[id]/page.tsx b/src/app/solicitudes/editar/[id]/page.tsx
index 5600012e..a865ef66 100644
--- a/src/app/solicitudes/editar/[id]/page.tsx
+++ b/src/app/solicitudes/editar/[id]/page.tsx
@@ -1,17 +1,16 @@
-import RequestHelp from '@/components/RequestHelp';
+import Unauthorized from '@/components/Unauthorized';
 import { helpRequestService } from '@/lib/service';
+import { createClient } from '@/lib/supabase/server';
+import EditHelpRequest from '@/components/HelpRequests/EditHelpRequest';
+
 export default async function EditarSolicitud({ params }: { params: Promise<{ id: string }> }) {
   const { id } = await params;
+  const supabase = await createClient();
+  const { data: session } = await supabase.auth.getUser();
+  if (session.user === null) {
+    return <Unauthorized />;
+  }
   const request = await helpRequestService.getOne(Number(id));
 
-  return (
-    <RequestHelp
-      title="Editar solicitud de ayuda"
-      submitType="edit"
-      data={request}
-      id={id}
-      button={['Editar solicitud', 'Editando solicitud...']}
-      redirect="/solicitudes"
-    />
-  );
+  return <EditHelpRequest request={request} />;
 }
diff --git a/src/app/solicitudes/page.tsx b/src/app/solicitudes/page.tsx
index 77f8db06..d0aaffdd 100644
--- a/src/app/solicitudes/page.tsx
+++ b/src/app/solicitudes/page.tsx
@@ -31,7 +31,7 @@ export default function ListaSolicitudes() {
     );
   }
 
-  if (error || requests === undefined) {
+  if (error || !requests) {
     return (
       <div className="bg-red-100 border-l-4 border-red-500 p-4 rounded">
         <p className="text-red-700">{error?.message}</p>
diff --git a/src/components/AddressAutocomplete.js b/src/components/AddressAutocomplete.tsx
similarity index 74%
rename from src/components/AddressAutocomplete.js
rename to src/components/AddressAutocomplete.tsx
index 2cabb82c..4bd52871 100644
--- a/src/components/AddressAutocomplete.js
+++ b/src/components/AddressAutocomplete.tsx
@@ -1,24 +1,60 @@
 'use client';
 
-import { useState, useEffect, useRef, useCallback } from 'react';
+import React, { useState, useEffect, useRef, useCallback } from 'react';
 import { MapPin } from 'lucide-react';
 
+type Address = {
+  road: string;
+  house_number: string;
+  postcode: string;
+  city: string;
+  state: string;
+};
+
+type Suggestion = {
+  display_name: string;
+  full_address: string;
+  formatted_address: string;
+  formatted_locality: string;
+  lat: number;
+  lon: number;
+  address: Address;
+};
+
+type Coordinates = {
+  lat: number;
+  lon: number;
+};
+
+export type AddressDetails = {
+  fullAddress: string;
+  coordinates: Coordinates | null;
+  details: Address;
+};
+
+type AddressAutocompleteProps = {
+  onSelect: (details: AddressDetails) => void;
+  placeholder?: string;
+  initialValue?: string;
+  required?: boolean;
+};
+
 export default function AddressAutocomplete({
   onSelect,
   placeholder = 'Buscar dirección...',
   initialValue = '',
   required = false,
-}) {
-  const [query, setQuery] = useState(initialValue);
-  const [suggestions, setSuggestions] = useState([]);
-  const [isLoading, setIsLoading] = useState(false);
-  const [showSuggestions, setShowSuggestions] = useState(false);
-  const wrapperRef = useRef(null);
-  const debounceRef = useRef(null);
+}: AddressAutocompleteProps) {
+  const [query, setQuery] = useState<string>(initialValue);
+  const [suggestions, setSuggestions] = useState<Suggestion[]>([]);
+  const [isLoading, setIsLoading] = useState<boolean>(false);
+  const [showSuggestions, setShowSuggestions] = useState<boolean>(false);
+  const wrapperRef = useRef<HTMLDivElement>(null);
+  const debounceRef = useRef<ReturnType<typeof setTimeout> | null>(null);
 
   useEffect(() => {
-    function handleClickOutside(event) {
-      if (wrapperRef.current && !wrapperRef.current.contains(event.target)) {
+    function handleClickOutside(event: MouseEvent) {
+      if (wrapperRef.current && !wrapperRef.current.contains(event.target as Node)) {
         setShowSuggestions(false);
       }
     }
@@ -26,7 +62,7 @@ export default function AddressAutocomplete({
     return () => document.removeEventListener('mousedown', handleClickOutside);
   }, []);
 
-  const searchAddress = useCallback(async (searchQuery) => {
+  const searchAddress = useCallback(async (searchQuery: string) => {
     if (!searchQuery || searchQuery.length < 3) {
       setSuggestions([]);
       return;
@@ -39,12 +75,12 @@ export default function AddressAutocomplete({
       );
       const data = await response.json();
 
-      const formattedSuggestions = data.map((item) => {
-        const addressParts = [];
+      const formattedSuggestions: Suggestion[] = data.map((item: any) => {
+        const addressParts: string[] = [];
         if (item.address?.road) addressParts.push(item.address.road);
         if (item.address?.house_number) addressParts.push(item.address.house_number);
 
-        const localityParts = [];
+        const localityParts: string[] = [];
         if (item.address?.postcode) localityParts.push(item.address.postcode);
         if (item.address?.city || item.address?.town || item.address?.village) {
           localityParts.push(item.address?.city || item.address?.town || item.address?.village);
@@ -80,7 +116,7 @@ export default function AddressAutocomplete({
     }
   }, []);
 
-  const handleInputChange = (e) => {
+  const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
     const value = e.target.value;
     setQuery(value);
 
@@ -119,7 +155,7 @@ export default function AddressAutocomplete({
     };
   }, []);
 
-  const handleSelect = (suggestion) => {
+  const handleSelect = (suggestion: Suggestion) => {
     setQuery(suggestion.full_address);
     setShowSuggestions(false);
     onSelect({
@@ -140,6 +176,7 @@ export default function AddressAutocomplete({
           value={query || ''}
           onChange={handleInputChange}
           placeholder={placeholder}
+          required={required}
           className="w-full p-2 pr-10 border rounded focus:ring-2 focus:ring-blue-500 focus:border-blue-500"
         />
         <div className="absolute right-3 top-1/2 transform -translate-y-1/2">
@@ -155,7 +192,6 @@ export default function AddressAutocomplete({
         <div className="absolute z-10 w-full mt-1 bg-white rounded-md shadow-lg max-h-60 overflow-auto">
           {suggestions.map((suggestion, index) => (
             <button
-              required={required}
               key={index}
               onClick={() => handleSelect(suggestion)}
               className="w-full text-left px-4 py-2 hover:bg-gray-100 focus:bg-gray-100 focus:outline-none"
diff --git a/src/components/AddressMap.tsx b/src/components/AddressMap.tsx
index 0c89fbab..c29696eb 100644
--- a/src/components/AddressMap.tsx
+++ b/src/components/AddressMap.tsx
@@ -2,10 +2,9 @@
 
 import GeoLocationMap, { LngLat } from '@/components/map/GeolocationMap';
 import { useRef, useState } from 'react';
-import { locationService } from '../lib/service';
+import { locationService } from '@/lib/service';
+import { useDebouncedFunction, useThrottledFunction } from '@/helpers/hooks';
 import GooglePlacesAutocomplete from 'react-google-places-autocomplete';
-
-import { useDebouncedFunction, useThrottledFunction } from '../helpers/hooks';
 import { OnChangeValue } from 'react-select';
 
 export type AddressMapProps = {
@@ -31,7 +30,7 @@ const THROTTLE_MS = 2000;
 const DEBOUNCE_MS = 400;
 
 export default function AddressMap({ onNewAddressDescriptor, initialAddressDescriptor, titulo }: AddressMapProps) {
-  const isEdit = useRef(Boolean(initialAddressDescriptor));
+  const isEdit = useRef(initialAddressDescriptor?.address !== '');
   const [status, setStatus] = useState<PermissionState | 'unknown'>('unknown');
   const [lngLat, setLngLat] = useState<LngLat | undefined>(initialAddressDescriptor?.coordinates ?? undefined);
   const [addressDescriptor, setAddressDescriptor] = useState<AddressDescriptor>({
diff --git a/src/components/HelpOffers/CreateHelpOffer.tsx b/src/components/HelpOffers/CreateHelpOffer.tsx
new file mode 100644
index 00000000..637bed34
--- /dev/null
+++ b/src/components/HelpOffers/CreateHelpOffer.tsx
@@ -0,0 +1,75 @@
+'use client';
+
+import HelpOfferForm, { HelpOfferFormData } from './HelpOfferForm';
+import { helpRequestService } from '@/lib/service';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { toast } from 'sonner';
+import { useRouter } from 'next/navigation';
+import { HelpRequestInsert } from '@/types/Requests';
+import { useSession } from '@/context/SessionProvider';
+import { User } from '@supabase/auth-js';
+import { HeartHandshake } from 'lucide-react';
+
+function formToDatabaseMap(user: User, formData: HelpOfferFormData): HelpRequestInsert {
+  return {
+    description: formData.comentarios,
+    resources: {
+      radius: formData.radio,
+      vehicle: formData.vehiculo,
+      availability: formData.disponibilidad,
+    },
+    town_id: formData.pueblo,
+    user_id: user.id,
+    type: 'ofrece',
+    other_help: formData.otraAyuda,
+    help_type: formData.tiposAyuda,
+    status: formData.status,
+    location: formData.ubicacion,
+    name: formData.nombre,
+    contact_info: formData.telefono,
+    additional_info: {
+      email: user.email || user.user_metadata?.email,
+      experience: formData.experiencia,
+    },
+  };
+}
+
+export default function CreateHelpOffer() {
+  const queryClient = useQueryClient();
+  const router = useRouter();
+  const { user } = useSession();
+
+  const mutation = useMutation({
+    mutationFn: (data: HelpOfferFormData) => {
+      if (!user) throw 'Sesión no iniciada';
+      return helpRequestService.createRequest(formToDatabaseMap(user, data));
+    },
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['help_requests'] });
+      router.push('/casos-activos/ofertas');
+    },
+    onError: (e) => {
+      console.error('Error al crear la oferta de ayuda', e);
+      toast.error('Error al crear la oferta :(');
+    },
+  });
+
+  return (
+    <div className="space-y-6 bg-white rounded-lg shadow-lg p-6">
+      <h1 className="text-2xl font-bold mb-6">Ofrecer ayuda</h1>
+      <div className="bg-green-50 border-green-500 p-4 rounded">
+        <div className="flex items-start">
+          <HeartHandshake className="h-5 w-5 text-green-500 mt-0.5 mr-2" />
+          <div>
+            <h2 className="text-green-800 font-semibold">Me apunto como voluntario</h2>
+            <p className="text-green-700 text-sm mt-1">
+              Al registrarte como voluntario, te comprometes a seguir las indicaciones de las autoridades y los
+              protocolos establecidos.
+            </p>
+          </div>
+        </div>
+      </div>
+      <HelpOfferForm submitMutation={mutation.mutateAsync} buttonText={['Ofrecer ayuda', 'Enviando...']} />
+    </div>
+  );
+}
diff --git a/src/components/HelpOffers/EditHelpOffer.tsx b/src/components/HelpOffers/EditHelpOffer.tsx
new file mode 100644
index 00000000..03e9f62e
--- /dev/null
+++ b/src/components/HelpOffers/EditHelpOffer.tsx
@@ -0,0 +1,66 @@
+'use client';
+
+import HelpOfferForm, { HelpOfferFormData } from './HelpOfferForm';
+import { helpRequestService } from '@/lib/service';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { toast } from 'sonner';
+import { useRouter } from 'next/navigation';
+import { HelpRequestData, HelpRequestUpdate } from '@/types/Requests';
+
+type EditHelpOfferProps = {
+  request: HelpRequestData;
+};
+
+function formToDatabaseMap(request: HelpRequestData, formData: HelpOfferFormData): HelpRequestUpdate {
+  return {
+    description: formData.comentarios,
+    resources: {
+      radius: formData.radio,
+      vehicle: formData.vehiculo,
+      availability: formData.disponibilidad,
+    },
+    town_id: formData.pueblo,
+    id: request.id,
+    user_id: request.user_id,
+    type: request.type,
+    other_help: formData.otraAyuda,
+    help_type: formData.tiposAyuda,
+    status: formData.status,
+    location: formData.ubicacion,
+    created_at: request.created_at,
+    name: formData.nombre,
+    contact_info: formData.telefono,
+    additional_info: {
+      email: request.additional_info.email,
+      experience: formData.experiencia,
+    },
+  };
+}
+
+export default function EditHelpOffer({ request }: EditHelpOfferProps) {
+  const queryClient = useQueryClient();
+  const router = useRouter();
+
+  const mutation = useMutation({
+    mutationFn: (data: HelpOfferFormData) =>
+      helpRequestService.editRequest(formToDatabaseMap(request, data), request.id),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['help_requests'] });
+      router.push(`/ofertas/${request.id}`);
+    },
+    onError: (e) => {
+      console.error('Error al editar la oferta de ayuda', e);
+      toast.error('Error al editar la oferta :(');
+    },
+  });
+  return (
+    <div className="space-y-6 bg-white rounded-lg shadow-lg p-6">
+      <h1 className="text-2xl font-bold mb-6">Editar oferta de ayuda</h1>
+      <HelpOfferForm
+        data={request}
+        submitMutation={mutation.mutateAsync}
+        buttonText={['Guardar cambios', 'Guardando...']}
+      />
+    </div>
+  );
+}
diff --git a/src/components/HelpOffers/HelpOfferForm.tsx b/src/components/HelpOffers/HelpOfferForm.tsx
new file mode 100644
index 00000000..79957a4a
--- /dev/null
+++ b/src/components/HelpOffers/HelpOfferForm.tsx
@@ -0,0 +1,275 @@
+import React, { useState, useCallback, useEffect } from 'react';
+import { PhoneInput } from '@/components/input/PhoneInput';
+import { isValidPhone } from '@/helpers/utils';
+import { HelpRequestData, HelpRequestHelpType } from '@/types/Requests';
+import { useSession } from '@/context/SessionProvider';
+import { tiposAyudaArray } from '@/helpers/constants';
+import { Town } from '@/types/Town';
+import Unauthorized from '@/components/Unauthorized';
+import { useTowns } from '@/context/TownProvider';
+import { toast } from 'sonner';
+
+export type HelpOfferFormData = {
+  aceptaProtocolo: boolean;
+  nombre: string;
+  telefono: string;
+  ubicacion: string;
+  tiposAyuda: HelpRequestHelpType[];
+  otraAyuda: string;
+  vehiculo: string;
+  disponibilidad: string[];
+  radio: number;
+  experiencia: string;
+  comentarios: string;
+  pueblo: number;
+  status: string;
+};
+
+export interface HelpOfferProps {
+  town?: Town;
+  data?: HelpRequestData;
+  buttonText: [string, string];
+  submitMutation: (data: HelpOfferFormData) => Promise<any>;
+}
+
+export default function HelpOfferForm({ data, buttonText, submitMutation }: HelpOfferProps) {
+  const { user } = useSession();
+  const { towns } = useTowns();
+
+  const [formData, setFormData] = useState<HelpOfferFormData>({
+    nombre: data?.name || user?.user_metadata?.full_name || user?.user_metadata?.nombre || '',
+    telefono: data?.contact_info || user?.user_metadata?.telefono || '',
+    ubicacion: data?.location || '',
+    tiposAyuda: data?.help_type || [],
+    otraAyuda: data?.other_help || '',
+    vehiculo: data?.resources?.vehicle || '',
+    disponibilidad: data?.resources?.availability || [],
+    radio: data?.resources?.radius || 1,
+    experiencia: data?.additional_info?.experience || '',
+    comentarios: data?.description || '',
+    aceptaProtocolo: !!data,
+    pueblo: data?.town_id || 0,
+    status: data?.status || '',
+  });
+
+  useEffect(() => {
+    setFormData({
+      nombre: data?.name || user?.user_metadata?.full_name || user?.user_metadata?.nombre || '',
+      telefono: data?.contact_info || user?.user_metadata?.telefono || '',
+      ubicacion: data?.location || '',
+      tiposAyuda: data?.help_type || [],
+      otraAyuda: data?.other_help || '',
+      vehiculo: data?.resources?.vehicle || '',
+      disponibilidad: data?.resources?.availability || [],
+      radio: data?.resources?.radius || 1,
+      experiencia: data?.additional_info?.experience || '',
+      comentarios: data?.description || '',
+      aceptaProtocolo: !!data,
+      pueblo: data?.town_id || 0,
+      status: data?.status || '',
+    });
+  }, [user, data]);
+
+  const handleTipoAyudaChange = (tipo: HelpRequestHelpType) => {
+    setFormData((prev) => ({
+      ...prev,
+      tiposAyuda: prev.tiposAyuda.includes(tipo)
+        ? prev.tiposAyuda.filter((t) => t !== tipo)
+        : [...prev.tiposAyuda, tipo],
+    }));
+  };
+
+  const handlePhoneChange = useCallback((phoneNumber: string) => {
+    setFormData((prev) => ({ ...prev, telefono: phoneNumber }));
+  }, []);
+
+  const handleSubmit = async (e: React.FormEvent) => {
+    e.preventDefault();
+    if (!formData.ubicacion) {
+      toast.warning('La ubicación es obligatoria');
+      return;
+    }
+    if (!formData.aceptaProtocolo) {
+      toast.warning('Debes aceptar el protocolo de actuación');
+      return;
+    }
+    if (!isValidPhone(formData.telefono)) {
+      toast.warning('El teléfono de contacto no es válido.');
+      return;
+    }
+    await submitMutation(formData);
+  };
+
+  if (!user) return <Unauthorized />;
+
+  return (
+    <form onSubmit={handleSubmit} className="bg-white rounded-lg p-6 w-full">
+      {/* Datos personales */}
+      <div className="space-y-6 overflow-y-auto p-2">
+        <div className="grid md:grid-cols-2 gap-4">
+          <div>
+            <label className="block text-sm font-medium text-gray-700 mb-1">Nombre completo</label>
+            <input
+              type="text"
+              value={formData.nombre}
+              onChange={(e) => setFormData({ ...formData, nombre: e.target.value })}
+              className="w-full p-2 border rounded focus:ring-2 focus:ring-green-500 focus:border-green-500"
+            />
+          </div>
+          <PhoneInput phoneNumber={formData.telefono} onChange={handlePhoneChange} required />
+        </div>
+
+        {/* Ubicación exacta */}
+        <div>
+          <label className="block text-sm font-medium text-gray-700 mb-1">
+            ¿De dónde eres? <span className="text-red-500">*</span>
+          </label>
+          <input
+            type="text"
+            value={formData.ubicacion}
+            onChange={(e) => setFormData({ ...formData, ubicacion: e.target.value })}
+            placeholder="Ciudad o pueblo"
+            className="w-full p-2 border rounded focus:ring-2 focus:ring-green-500 focus:border-green-500"
+            required
+          />
+        </div>
+
+        {/* Tipo de ayuda */}
+        <div>
+          <label className="block text-sm font-medium text-gray-700 mb-2">Tipo de ayuda que puedes ofrecer</label>
+          <div className="grid md:grid-cols-2 gap-2">
+            {tiposAyudaArray.map((tipo) => (
+              <label
+                key={tipo.id}
+                className="flex items-center p-3 bg-gray-50 rounded hover:bg-gray-100 cursor-pointer"
+              >
+                <input
+                  type="checkbox"
+                  checked={formData.tiposAyuda.includes(tipo.id)}
+                  onChange={() => handleTipoAyudaChange(tipo.id)}
+                  className="h-4 w-4 text-green-600 focus:ring-green-500 border-gray-300 rounded"
+                />
+                <span className="ml-2">{tipo.label}</span>
+              </label>
+            ))}
+          </div>
+        </div>
+
+        {/* Otra ayuda específica */}
+        {formData.tiposAyuda.includes('otros') && (
+          <div>
+            <label className="block text-sm font-medium text-gray-700 mb-1">¿Qué tipo de ayuda?</label>
+            <textarea
+              value={formData.otraAyuda}
+              onChange={(e) => setFormData({ ...formData, otraAyuda: e.target.value })}
+              className="w-full p-2 border rounded focus:ring-2 focus:ring-red-500"
+              rows={3}
+              placeholder="Especifica qué tipo de ayuda..."
+            />
+          </div>
+        )}
+
+        {/* Vehículo disponible */}
+        <div>
+          <label className="block text-sm font-medium text-gray-700 mb-1">Vehículo disponible</label>
+          <select
+            value={formData.vehiculo}
+            onChange={(e) => setFormData({ ...formData, vehiculo: e.target.value })}
+            className="w-full p-2 border rounded focus:ring-2 focus:ring-green-500 focus:border-green-500"
+          >
+            <option value="">No dispongo de vehículo</option>
+            <option value="coche">Coche</option>
+            <option value="todoterreno">Todoterreno/4x4</option>
+            <option value="furgoneta">Furgoneta</option>
+            <option value="barca">Barca</option>
+          </select>
+        </div>
+
+        {/* Radio de acción */}
+        <div>
+          <label className="block text-sm font-medium text-gray-700 mb-1">Radio de acción (km)</label>
+          <input
+            type="number"
+            value={formData.radio}
+            onChange={(e) =>
+              setFormData({
+                ...formData,
+                radio: Number(e.target.value),
+              })
+            }
+            className="w-full p-2 border rounded focus:ring-2 focus:ring-green-500 focus:border-green-500"
+            min={1}
+            placeholder="¿Cuántos kilómetros puedes desplazarte?"
+          />
+        </div>
+
+        {/* Experiencia relevante */}
+        <div>
+          <label className="block text-sm font-medium text-gray-700 mb-1">Experiencia relevante</label>
+          <textarea
+            value={formData.experiencia}
+            onChange={(e) => setFormData({ ...formData, experiencia: e.target.value })}
+            className="w-full p-2 border rounded focus:ring-2 focus:ring-green-500 focus:border-green-500"
+            rows={3}
+            placeholder="Describe tu experiencia en situaciones similares, formación, etc."
+          />
+        </div>
+
+        {/* Comentarios adicionales */}
+        <div>
+          <label className="block text-sm font-medium text-gray-700 mb-1">Comentarios adicionales</label>
+          <textarea
+            value={formData.comentarios}
+            onChange={(e) => setFormData({ ...formData, comentarios: e.target.value })}
+            className="w-full p-2 border rounded focus:ring-2 focus:ring-green-500 focus:border-green-500"
+            rows={3}
+            placeholder="Información adicional que quieras compartir"
+          />
+        </div>
+
+        {/* Pueblo */}
+        <div>
+          <label className="block text-sm font-medium text-gray-700 mb-1">
+            Pueblo al que vas a ayudar <span className="text-red-500">*</span>
+          </label>
+          <select
+            value={formData.pueblo?.toString()}
+            onChange={(e) => setFormData({ ...formData, pueblo: Number(e.target.value) })}
+            className="w-full p-2 border rounded focus:ring-2 focus:ring-red-500"
+            required
+          >
+            <option value="">Selecciona un pueblo</option>
+            {towns.map((item) => (
+              <option key={item.id} value={item.id}>
+                {item.name}
+              </option>
+            ))}
+          </select>
+        </div>
+
+        {/* Aceptación del protocolo */}
+        <div className="flex items-start">
+          <label className="ml-2 text-sm text-gray-700 flex items-start gap-2 cursor-pointer">
+            <input
+              type="checkbox"
+              checked={formData.aceptaProtocolo}
+              onChange={(e) => setFormData({ ...formData, aceptaProtocolo: e.target.checked })}
+              className="mt-1 h-4 w-4 text-green-600 focus:ring-green-500 border-gray-300 rounded"
+            />
+            Acepto seguir el protocolo de actuación y las indicaciones de las autoridades competentes.
+          </label>
+        </div>
+      </div>
+
+      {/* Botones de acción */}
+      <div className="flex flex-col sm:flex-row gap-4 mt-6">
+        <button
+          type="submit"
+          className="w-full bg-green-500 hover:bg-green-600 text-white py-3 px-4 rounded-lg font-semibold"
+        >
+          {buttonText[0]}
+        </button>
+      </div>
+    </form>
+  );
+}
diff --git a/src/components/HelpRequests/CreateHelpRequest.tsx b/src/components/HelpRequests/CreateHelpRequest.tsx
new file mode 100644
index 00000000..7f406bbb
--- /dev/null
+++ b/src/components/HelpRequests/CreateHelpRequest.tsx
@@ -0,0 +1,73 @@
+'use client';
+
+import HelpRequestForm, { HelpRequestFormData } from './HelpRequestForm';
+import { helpRequestService, townService } from '@/lib/service';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { toast } from 'sonner';
+import { useRouter } from 'next/navigation';
+import { HelpRequestInsert } from '@/types/Requests';
+import { useSession } from '@/context/SessionProvider';
+import { User } from '@supabase/auth-js';
+
+function formToDatabaseMap(user: User, formData: HelpRequestFormData): HelpRequestInsert {
+  return {
+    description: formData.descripcion,
+    resources: null,
+    urgency: formData.urgencia,
+    number_of_people: formData.numeroPersonas,
+    town_id: formData.town_id,
+    user_id: user.id,
+    type: 'necesita',
+    help_type: formData.tiposAyuda,
+    latitude: formData.coordinates?.lat,
+    longitude: formData.coordinates?.lng,
+    status: formData.status,
+    location: formData.ubicacion,
+    name: formData.nombre,
+    contact_info: formData.telefono,
+    additional_info: {
+      email: user.email || user.user_metadata?.email,
+      consent: formData.consentimiento,
+      special_situations: formData.situacionEspecial,
+    },
+  };
+}
+
+export default function CreateHelpRequest() {
+  const queryClient = useQueryClient();
+  const router = useRouter();
+  const { user } = useSession();
+
+  const mutation = useMutation({
+    mutationFn: async (data: HelpRequestFormData) => {
+      if (!user) throw 'Sesión no iniciada';
+      let town_id = data.town_id;
+      if (data.pueblo !== '') {
+        const { data: townResponse, error: townError } = await townService.createIfNotExists(data.pueblo);
+        if (townError) throw townError;
+        town_id = townResponse[0].id;
+      }
+
+      return helpRequestService.createRequest(formToDatabaseMap(user, { ...data, town_id: town_id }));
+    },
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['help_requests'] });
+      router.push('/casos-activos/solicitudes');
+    },
+    onError: (e) => {
+      console.error('Error al crear la solicitud de ayuda', e);
+      toast.error('Error al crear la solicitud :(');
+    },
+  });
+
+  return (
+    <div className="space-y-6 bg-white rounded-lg shadow-lg p-6">
+      <h1 className="text-2xl font-bold mb-6">Solicitar ayuda</h1>
+      <HelpRequestForm
+        submitMutation={mutation.mutateAsync}
+        isSubmitting={mutation.isPending}
+        buttonText={['Enviar solicitud', 'Enviando solicitud...']}
+      />
+    </div>
+  );
+}
diff --git a/src/components/HelpRequests/EditHelpRequest.tsx b/src/components/HelpRequests/EditHelpRequest.tsx
new file mode 100644
index 00000000..1ae75dc8
--- /dev/null
+++ b/src/components/HelpRequests/EditHelpRequest.tsx
@@ -0,0 +1,79 @@
+'use client';
+
+import HelpRequestForm, { HelpRequestFormData } from './HelpRequestForm';
+import { helpRequestService, townService } from '@/lib/service';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { toast } from 'sonner';
+import { useRouter } from 'next/navigation';
+import { HelpRequestData, HelpRequestUpdate } from '@/types/Requests';
+import { formatPhoneNumber } from '@/helpers/utils';
+
+type EditHelpRequestProps = {
+  request: HelpRequestData;
+};
+
+function formToDatabaseMap(request: HelpRequestData, formData: HelpRequestFormData): HelpRequestUpdate {
+  return {
+    description: formData.descripcion,
+    resources: null,
+    urgency: formData.urgencia,
+    number_of_people: formData.numeroPersonas,
+    town_id: formData.town_id,
+    id: request.id,
+    user_id: request.user_id,
+    type: request.type,
+    created_at: request.created_at,
+    help_type: formData.tiposAyuda,
+    latitude: formData.coordinates?.lat,
+    longitude: formData.coordinates?.lng,
+    status: formData.status,
+    location: formData.ubicacion,
+    name: formData.nombre,
+    contact_info: formatPhoneNumber(formData.telefono),
+    additional_info: {
+      email: request.additional_info.email,
+      consent: request.additional_info.consent,
+      special_situations: formData.situacionEspecial,
+    },
+  };
+}
+
+export default function EditHelpRequest({ request }: EditHelpRequestProps) {
+  const queryClient = useQueryClient();
+  const router = useRouter();
+
+  const mutation = useMutation({
+    mutationFn: async (data: HelpRequestFormData) => {
+      let town_id = data.town_id;
+      if (data.pueblo !== '') {
+        const { data: townResponse, error: townError } = await townService.createIfNotExists(data.pueblo);
+        if (townError) throw townError;
+        town_id = townResponse[0].id;
+      }
+      return helpRequestService.editRequest(formToDatabaseMap(request, { ...data, town_id: town_id }), request.id);
+    },
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ['help_requests'] });
+      router.push(`/solicitudes/${request.id}`);
+    },
+    onError: (e) => {
+      console.error('Error al editar la solicitud de ayuda', e);
+      toast.error('Error al editar la solicitud :(');
+    },
+  });
+
+  return (
+    <div className="space-y-6 bg-white rounded-lg shadow-lg p-6">
+      <h1 className="text-2xl font-bold mb-6">Editar solicitud de ayuda</h1>
+      <HelpRequestForm
+        request={{
+          ...request,
+          coordinates: { lat: (request.latitude ?? 0)?.toString(), lng: (request.longitude ?? 0)?.toString() },
+        }}
+        submitMutation={mutation.mutateAsync}
+        isSubmitting={mutation.isPending}
+        buttonText={['Guardar cambios', 'Guardando...']}
+      />
+    </div>
+  );
+}
diff --git a/src/components/HelpRequests/HelpRequestForm.tsx b/src/components/HelpRequests/HelpRequestForm.tsx
new file mode 100644
index 00000000..aedb6dab
--- /dev/null
+++ b/src/components/HelpRequests/HelpRequestForm.tsx
@@ -0,0 +1,279 @@
+'use client';
+
+import { ChangeEvent, FormEvent, useCallback, useEffect, useState } from 'react';
+import { isValidPhone } from '@/helpers/utils';
+import { tiposAyudaArray } from '@/helpers/constants';
+import { PhoneInput } from '@/components/input/PhoneInput';
+import { HelpRequestData, HelpRequestHelpType, HelpRequestUrgencyType } from '@/types/Requests';
+import { toast } from 'sonner';
+import { LimitedTextarea } from '@/components/input/LimitedTextarea';
+import AddressMap, { AddressDescriptor } from '@/components/AddressMap';
+import { LngLat } from '@/components/map/GeolocationMap';
+import { useSession } from '@/context/SessionProvider';
+import Unauthorized from '@/components/Unauthorized';
+
+export type HelpRequestFormData = {
+  nombre: string;
+  telefono: string;
+  ubicacion: string;
+  tiposAyuda: HelpRequestHelpType[];
+  pueblo: string;
+  status: string;
+  coordinates: LngLat | null;
+  numeroPersonas: number;
+  descripcion: string;
+  urgencia: HelpRequestUrgencyType;
+  situacionEspecial: string;
+  consentimiento: boolean;
+  town_id: number;
+};
+
+export interface HelpRequestProps {
+  request?: HelpRequestData;
+  buttonText: [string, string];
+  isSubmitting: boolean;
+  submitMutation: (data: HelpRequestFormData) => Promise<any>;
+}
+
+export default function HelpRequestForm({
+  request,
+  buttonText = ['Enviar solicitud de ayuda', 'Enviando solicitud...'],
+  isSubmitting,
+  submitMutation,
+}: HelpRequestProps) {
+  const { user } = useSession();
+
+  const [formData, setFormData] = useState<HelpRequestFormData>({
+    nombre: request?.name || user?.user_metadata?.full_name || user?.user_metadata?.nombre || '',
+    telefono: request?.contact_info || user?.user_metadata?.telefono || '',
+    ubicacion: request?.location || '',
+    coordinates: { lat: 0, lng: 0 },
+    tiposAyuda: request?.help_type || [],
+    numeroPersonas: request?.number_of_people || 1,
+    descripcion: request?.description || '',
+    urgencia: request?.urgency === 'alta' ? 'alta' : request?.urgency === 'media' ? 'media' : 'baja',
+    situacionEspecial: request?.additional_info?.special_situations || '',
+    consentimiento: request?.additional_info?.consent || false,
+    pueblo: '',
+    status: request?.status || 'active',
+    town_id: request?.town_id || 0,
+  });
+
+  useEffect(() => {
+    setFormData({
+      nombre: request?.name || user?.user_metadata?.full_name || user?.user_metadata?.nombre || '',
+      telefono: request?.contact_info || user?.user_metadata?.telefono || '',
+      ubicacion: request?.location || '',
+      coordinates: { lat: 0, lng: 0 },
+      tiposAyuda: request?.help_type || [],
+      numeroPersonas: request?.number_of_people || 1,
+      descripcion: request?.description || '',
+      urgencia: request?.urgency === 'alta' ? 'alta' : request?.urgency === 'media' ? 'media' : 'baja',
+      situacionEspecial: request?.additional_info?.special_situations || '',
+      consentimiento: request?.additional_info?.consent || false,
+      pueblo: '',
+      status: request?.status || 'active',
+      town_id: request?.town_id || 0,
+    });
+  }, [user, request]);
+
+  const handleTipoAyudaChange = (tipo: HelpRequestHelpType) => {
+    setFormData((prev) => ({
+      ...prev,
+      tiposAyuda: prev.tiposAyuda.includes(tipo)
+        ? prev.tiposAyuda.filter((t) => t !== tipo)
+        : [...prev.tiposAyuda, tipo],
+    }));
+  };
+
+  const handleSubmit = async (e: FormEvent) => {
+    e.preventDefault();
+
+    /* Form validation */
+    if (!formData.coordinates) {
+      alert('Elige una ubicacion valida');
+      return;
+    }
+
+    if (!formData.consentimiento) {
+      toast.error('Debe aceptar el consentimiento para enviar la solicitud');
+      return;
+    }
+
+    if (!isValidPhone(formData.telefono)) {
+      toast.error('El teléfono de contacto no es válido. Si has usado espacios, elimínalos.');
+      return;
+    }
+
+    await submitMutation(formData);
+  };
+
+  const handleOnNewAddressDescriptor = (addressDescriptor: AddressDescriptor) => {
+    setFormData((prev) => ({
+      ...prev,
+      coordinates: addressDescriptor.coordinates,
+      pueblo: addressDescriptor.town,
+      ubicacion: addressDescriptor.address,
+    }));
+  };
+
+  const handleChange = (e: ChangeEvent<HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement>) => {
+    const { name, value, type } = e.target;
+    const checked = 'checked' in e.target ? e.target.checked : false;
+    setFormData((prev) => ({
+      ...prev,
+      [name]: type === 'checkbox' ? checked : value || '',
+    }));
+  };
+
+  const handlePhoneChange = useCallback((newPhone: string) => {
+    setFormData((formData) => ({ ...formData, contacto: newPhone }));
+  }, []);
+
+  if (!user) return <Unauthorized />;
+
+  return (
+    <form onSubmit={handleSubmit} className="space-y-6">
+      <div className="grid md:grid-cols-2 gap-4">
+        <div>
+          <label className="block text-sm font-medium text-gray-700 mb-1">Nombre completo</label>
+          <input
+            type="text"
+            name="nombre"
+            value={formData.nombre}
+            onChange={handleChange}
+            className="w-full p-2 border rounded focus:ring-2 focus:ring-green-500 focus:border-green-500"
+          />
+        </div>
+        <PhoneInput phoneNumber={formData.telefono} onChange={handlePhoneChange} required />
+      </div>
+      {!!request && (
+        <div>
+          <label htmlFor="status" className="block text-sm font-medium text-gray-700 mb-1">
+            Progreso de tu solicitud
+          </label>
+          <select
+            name="status"
+            id="status"
+            value={formData.status}
+            onChange={handleChange}
+            className="w-full p-2 border rounded focus:ring-2 focus:ring-red-500"
+          >
+            <option value="active">Activa - Aún no recibo ayuda</option>
+            <option value="progress">En progreso - Están viniendo a ayudarme</option>
+            <option value="finished">Terminada - Ya me han ayudado</option>
+          </select>
+        </div>
+      )}
+
+      <div>
+        <label className="block text-sm font-medium text-gray-700 mb-2">Tipo de ayuda necesaria</label>
+        <div className="grid md:grid-cols-2 gap-2">
+          {tiposAyudaArray.map((tipo) => (
+            <label
+              key={tipo.id}
+              className={`flex items-center p-3 rounded cursor-pointer ${
+                formData.tiposAyuda.includes(tipo.id) ? 'bg-red-50 text-red-800' : 'bg-gray-50 hover:bg-gray-100'
+              }`}
+            >
+              <input
+                type="checkbox"
+                checked={formData.tiposAyuda.includes(tipo.id)}
+                onChange={() => handleTipoAyudaChange(tipo.id)}
+                className="h-4 w-4 text-red-600 focus:ring-red-500 border-gray-300 rounded"
+              />
+              <span className="ml-2">{tipo.label}</span>
+            </label>
+          ))}
+        </div>
+      </div>
+
+      <div>
+        <label className="block text-sm font-medium text-gray-700 mb-1">Número de personas afectadas</label>
+        <input
+          type="number"
+          name="numeroPersonas"
+          value={formData.numeroPersonas}
+          onChange={handleChange}
+          className="w-full p-2 border rounded focus:ring-2 focus:ring-red-500"
+          min="1"
+        />
+      </div>
+
+      <div>
+        <label className="block text-sm font-medium text-gray-700 mb-1">Descripción de la situación</label>
+        <LimitedTextarea
+          name="descripcion"
+          value={formData.descripcion}
+          onChange={handleChange}
+          className="w-full p-2 border rounded focus:ring-2 focus:ring-red-500"
+          rows={3}
+          placeholder="Describa su situación actual y el tipo de ayuda que necesita"
+          maxLength={350}
+        />
+      </div>
+
+      <div>
+        <label className="block text-sm font-medium text-gray-700 mb-1">Nivel de urgencia</label>
+        <select
+          name="urgencia"
+          value={formData.urgencia}
+          onChange={handleChange}
+          className="w-full p-2 border rounded focus:ring-2 focus:ring-red-500"
+        >
+          <option value="alta">Alta - Necesito ayuda inmediata</option>
+          <option value="media">Media - Puedo esperar unas horas</option>
+          <option value="baja">Baja - No es urgente</option>
+        </select>
+      </div>
+
+      <div>
+        <label className="block text-sm font-medium text-gray-700 mb-1">Situaciones especiales</label>
+        <textarea
+          name="situacionEspecial"
+          value={formData.situacionEspecial}
+          onChange={handleChange}
+          className="w-full p-2 border rounded focus:ring-2 focus:ring-red-500"
+          rows={2}
+          placeholder="Personas mayores, niños pequeños, personas con movilidad reducida, necesidades médicas, mascotas..."
+        />
+      </div>
+      {/* Mapa */}
+      <div>
+        <AddressMap
+          titulo="Ubicación exacta"
+          onNewAddressDescriptor={handleOnNewAddressDescriptor}
+          initialAddressDescriptor={{
+            address: formData.ubicacion,
+            coordinates: formData.coordinates,
+            town: formData.pueblo,
+          }}
+        />
+      </div>
+      {/* Consentimiento */}
+      <div className="flex items-start">
+        <label className="ml-2 block text-sm text-gray-700 cursor-pointer">
+          <input
+            type="checkbox"
+            name="consentimiento"
+            checked={formData.consentimiento}
+            onChange={handleChange}
+            className="mt-1 h-4 w-4 text-red-600 focus:ring-red-500 border-gray-300 rounded mr-2"
+          />
+          Doy mi consentimiento para el tratamiento de los datos proporcionados y confirmo que la información
+          proporcionada es verídica.
+        </label>
+      </div>
+
+      <button
+        type="submit"
+        disabled={isSubmitting}
+        className={`w-full ${
+          isSubmitting ? 'bg-gray-400 cursor-not-allowed' : 'bg-red-500 hover:bg-red-600'
+        } text-white py-3 px-4 rounded-lg font-semibold`}
+      >
+        {isSubmitting ? buttonText[1] : buttonText[0]}
+      </button>
+    </form>
+  );
+}
diff --git a/src/components/OfferCard.tsx b/src/components/OfferCard.tsx
index 4f4ab612..6f687c89 100644
--- a/src/components/OfferCard.tsx
+++ b/src/components/OfferCard.tsx
@@ -3,13 +3,17 @@ import { tiposAyudaOptions } from '@/helpers/constants';
 import Link from 'next/link';
 import { HelpRequestData } from '@/types/Requests';
 import { useTowns } from '@/context/TownProvider';
+import { useSession } from '@/context/SessionProvider';
 
 type OfferCardProps = {
   caso: HelpRequestData;
   showLink?: boolean;
+  showEdit?: boolean;
 };
-export default function OfferCard({ caso, showLink = true }: OfferCardProps) {
+export default function OfferCard({ caso, showLink = true, showEdit = false }: OfferCardProps) {
   const { towns } = useTowns();
+  const session = useSession();
+  const isMyOffer = session.user?.id && session.user.id === caso.user_id;
   return (
     <div key={caso.id + 'a'} className="rounded-2xl bg-white shadow-lg ring-1 ring-gray-900/5">
       <div className="flex flex-col sm:flex-row items-start gap-4 sm:items-center justify-between border-b border-gray-900/10 px-6 py-4">
@@ -126,6 +130,14 @@ export default function OfferCard({ caso, showLink = true }: OfferCardProps) {
           </div>
         </div>
         <div className="flex flex-col pt-4 sm:pt-0 sm:flex-row w-full sm:w-auto justify-end gap-2">
+          {isMyOffer && showEdit && (
+            <Link
+              href={'/ofertas/editar/' + caso.id}
+              className={`w-full rounded-xl text-center px-4 py-2 font-semibold text-white sm:w-auto bg-red-500`}
+            >
+              Editar
+            </Link>
+          )}
           {showLink && (
             <Link
               href={'/ofertas/' + caso.id}
diff --git a/src/components/OfferHelp.js b/src/components/OfferHelp.js
deleted file mode 100644
index f86491b7..00000000
--- a/src/components/OfferHelp.js
+++ /dev/null
@@ -1,468 +0,0 @@
-'use client';
-
-import { useState, useCallback } from 'react';
-import { HeartHandshake, Check } from 'lucide-react';
-import { helpRequestService } from '@/lib/service';
-import AddressAutocomplete from '@/components/AddressAutocomplete';
-import { mapToIdAndLabel, tiposAyudaOptions as _tiposAyudaOptions } from '@/helpers/constants';
-import { isValidPhone } from '@/helpers/utils';
-
-import { PhoneInput } from '@/components/input/PhoneInput';
-import { formatPhoneNumber } from '@/helpers/utils';
-import { useTowns } from '@/context/TownProvider';
-import { useRouter } from 'next/navigation';
-import { useSession } from '@/context/SessionProvider';
-
-export default function OfferHelp({
-  town = undefined,
-  onClose = undefined,
-  isModal = false,
-  data = {},
-  title = '',
-  button = ['Registrar oferta de ayuda', 'Enviando oferta...'],
-  id = 0,
-  redirect = '/casos-activos/ofertas',
-  submitType = 'create',
-  sessionProp = undefined,
-}) {
-  const { towns } = useTowns();
-  const sessionProvider = useSession();
-  const session = sessionProp || sessionProvider;
-
-  const router = useRouter();
-
-  const userId = session.user?.id;
-
-  const isLoggedIn = Boolean(session?.user);
-
-  const [formData, setFormData] = useState({
-    nombre: data.name || session?.user?.user_metadata?.full_name || session?.user?.user_metadata?.nombre || '',
-    telefono: data.contact_info || session?.user?.user_metadata?.telefono || '',
-    email: data.additional_info?.email || session?.user?.user_metadata?.email || '',
-    ubicacion: data.location || '',
-    tiposAyuda: data.help_type || [],
-    otraAyuda: data.other_help || '',
-    vehiculo: data.resources?.vehicle || '',
-    disponibilidad: data.resources?.availability || [],
-    radio: data.resources?.radius || 1,
-    experiencia: data.additional_info?.experience || '',
-    comentarios: data.description || '',
-    aceptaProtocolo: !!submitType,
-    pueblo: submitType === 'edit' ? data?.town_id : town ? town.id : '',
-    status: data?.status || '',
-  });
-
-  const [status, setStatus] = useState({
-    isSubmitting: false,
-    error: null,
-    success: false,
-  });
-
-  const tiposAyudaOptions = mapToIdAndLabel(_tiposAyudaOptions);
-
-  const diasSemana = ['Lunes', 'Martes', 'Miércoles', 'Jueves', 'Viernes', 'Sábado', 'Domingo'];
-
-  const handleTipoAyudaChange = (tipo) => {
-    setFormData((prev) => ({
-      ...prev,
-      tiposAyuda: prev.tiposAyuda.includes(tipo)
-        ? prev.tiposAyuda.filter((t) => t !== tipo)
-        : [...prev.tiposAyuda, tipo],
-    }));
-  };
-
-  const handleDisponibilidadChange = (dia) => {
-    setFormData((prev) => ({
-      ...prev,
-      disponibilidad: prev.disponibilidad.includes(dia)
-        ? prev.disponibilidad.filter((d) => d !== dia)
-        : [...prev.disponibilidad, dia],
-    }));
-  };
-
-  const handlePhoneChange = useCallback((phoneNumber) => {
-    setFormData((formData) => ({ ...formData, telefono: phoneNumber }));
-  }, []);
-
-  const handleSubmit = async (e) => {
-    e.preventDefault();
-
-    // Form validation
-    if (!formData.ubicacion) {
-      alert('La ubicación es obligatoria');
-      return;
-    }
-
-    if (!formData.aceptaProtocolo) {
-      alert('Debes aceptar el protocolo de actuación');
-      return;
-    }
-
-    if (!isValidPhone(formData.telefono)) {
-      alert('El teléfono de contacto no es válido.');
-      return;
-    }
-
-    setStatus({ isSubmitting: true, error: null, success: false });
-
-    try {
-      const helpOfferData = {
-        type: 'ofrece',
-        name: formData.nombre,
-        location: formData.ubicacion,
-        description: formData.comentarios,
-        contact_info: formatPhoneNumber(formData.telefono),
-        additional_info: {
-          email: formData.email,
-          experience: formData.experiencia,
-        },
-        resources: {
-          vehicle: formData.vehiculo,
-          availability: formData.disponibilidad,
-          radius: formData.radio,
-        },
-        latitude: formData.coordinates ? parseFloat(formData.coordinates.lat) : null,
-        longitude: formData.coordinates ? parseFloat(formData.coordinates.lng) : null,
-        help_type: formData.tiposAyuda,
-        other_help: formData.otraAyuda,
-        town_id: formData.pueblo,
-        status: formData.status || 'active',
-        user_id: userId,
-      };
-
-      if (submitType === 'create') {
-        const { error } = await helpRequestService.createRequest(helpOfferData);
-        if (error) {
-          throw new Error(error.message);
-        }
-      }
-      if (submitType === 'edit') {
-        console.log('EDITAR');
-        const { error } = await helpRequestService.editRequest(helpOfferData, id);
-        if (error) {
-          throw new Error(error.message);
-        }
-      }
-
-      setFormData({
-        nombre: '',
-        telefono: '',
-        email: '',
-        ubicacion: '',
-        tiposAyuda: [],
-        otraAyuda: '',
-        vehiculo: '',
-        disponibilidad: [],
-        radio: 1,
-        experiencia: '',
-        comentarios: '',
-        aceptaProtocolo: false,
-        pueblo: '',
-        status: 'active',
-      });
-      setStatus({ isSubmitting: false, error: null, success: true });
-      setStatus((prev) => ({ ...prev, success: false }));
-      router.push(redirect);
-    } catch (error) {
-      console.error('Error al registrar oferta de ayuda:', error);
-      setStatus({
-        isSubmitting: false,
-        error: `Error al registrar tu oferta de ayuda: ${error.message || 'Error desconocido'}`,
-        success: false,
-      });
-    }
-  };
-
-  return (
-    <form
-      onSubmit={handleSubmit}
-      className={`bg-white rounded-lg p-6 w-full relative flex flex-col gap-6 ${town ? 'max-w-2xl' : ''}`}
-    >
-      {/* Banner informativo */}
-      {submitType === 'create' ? (
-        <div className="bg-green-50 border-green-500 p-4 rounded">
-          <div className="flex items-start">
-            <HeartHandshake className="h-5 w-5 text-green-500 mt-0.5 mr-2" />
-            <div>
-              <h2 className="text-green-800 font-semibold">
-                Me apunto como voluntario {town ? 'en ' + town.name : ''}
-              </h2>
-              <p className="text-green-700 text-sm mt-1">
-                Al registrarte como voluntario, te comprometes a seguir las indicaciones de las autoridades y los
-                protocolos establecidos.
-              </p>
-            </div>
-          </div>
-        </div>
-      ) : (
-        <h1 className="text-2xl font-bold">{title}</h1>
-      )}
-      {status.error && (
-        <div className="bg-red-100 border-l-4 border-red-500 p-4 rounded">
-          <p className="text-red-700">{status.error}</p>
-        </div>
-      )}
-
-      {/* Formulario */}
-
-      <div className="space-y-6 overflow-y-auto p-2">
-        {/* Datos personales */}
-        <div className="grid md:grid-cols-2 gap-4">
-          <div>
-            <label className="block text-sm font-medium text-gray-700 mb-1" htmlFor="fullName">
-              Nombre completo
-            </label>
-            <input
-              id="fullName"
-              type="text"
-              value={formData.nombre}
-              onChange={(e) => setFormData({ ...formData, nombre: e.target.value })}
-              className="w-full p-2 border rounded focus:ring-2 focus:ring-green-500 focus:border-green-500"
-            />
-          </div>
-          <PhoneInput phoneNumber={formData.telefono} onChange={handlePhoneChange} required />
-        </div>
-        {/*
-          MANTENIDO EN CASO DE RE UTILIZAR EN EL FUTURO
-          ACTUALMENTE NO APARECERA DE NINGUNA FORMA
-        */}
-        {submitType === 'create' ||
-          (isLoggedIn && (
-            <div>
-              <label className="block text-sm font-medium text-gray-700 mb-1" htmlFor="userEmail">
-                Correo electrónico
-              </label>
-              <input
-                id="userEmail"
-                type="email"
-                value={formData.email}
-                onChange={(e) => setFormData({ ...formData, email: e.target.value })}
-                className="w-full p-2 border rounded focus:ring-2 focus:ring-green-500 focus:border-green-500"
-              />
-            </div>
-          ))}
-        {submitType === 'edit' && (
-          <div>
-            <label htmlFor="status" className="block text-sm font-medium text-gray-700 mb-1">
-              Progreso de tu solicitud
-            </label>
-            <select
-              name="status"
-              id="status"
-              value={formData.status}
-              onChange={(e) => setFormData({ ...formData, status: e.target.value })}
-              className="w-full p-2 border rounded focus:ring-2 focus:ring-red-500"
-            >
-              <option value="active">Activa - Aún no ayudo</option>
-              <option value="progress">En progreso - Estoy en ello</option>
-              <option value="finished">Terminada - Ya he ayudado</option>
-            </select>
-          </div>
-        )}
-        <div>
-          <label className="block text-sm font-medium text-gray-700 mb-1" htmlFor="address">
-            Ubicación exacta <span className="text-red-500">*</span>
-          </label>
-          <AddressAutocomplete
-            initialValue={data?.location}
-            onSelect={(address) => {
-              setFormData({
-                ...formData,
-                ubicacion: address.fullAddress,
-                coordinates: address.coordinates
-                  ? {
-                      lat: address.coordinates.lat,
-                      lng: address.coordinates.lon,
-                    }
-                  : null,
-              });
-            }}
-            placeholder="Calle, número, piso, ciudad..."
-            required
-          />
-          <p className="mt-1 text-sm text-gray-500">
-            Incluya todos los detalles posibles para poder localizarle (campo obligatorio)
-          </p>
-        </div>
-
-        {/* Tipos de ayuda */}
-        <div>
-          <label className="block text-sm font-medium text-gray-700 mb-2">Tipo de ayuda que puedes ofrecer</label>
-          <div className="grid md:grid-cols-2 gap-2">
-            {tiposAyudaOptions.map((tipo) => (
-              <label
-                key={tipo.id}
-                className="flex items-center p-3 bg-gray-50 rounded hover:bg-gray-100 cursor-pointer"
-              >
-                <input
-                  type="checkbox"
-                  checked={formData.tiposAyuda.includes(tipo.id)}
-                  onChange={() => handleTipoAyudaChange(tipo.id)}
-                  className="h-4 w-4 text-green-600 focus:ring-green-500 border-gray-300 rounded"
-                />
-                <span className="ml-2">{tipo.label}</span>
-              </label>
-            ))}
-          </div>
-        </div>
-
-        {formData.tiposAyuda.includes('otros') && (
-          <div>
-            <label className="block text-sm font-medium text-gray-700 mb-1">¿Qué tipo de ayuda?</label>
-            <textarea
-              name="otraAyuda"
-              value={formData.otraAyuda}
-              onChange={(e) => setFormData({ ...formData, otraAyuda: e.target.value })}
-              className="w-full p-2 border rounded focus:ring-2 focus:ring-red-500"
-              rows="3"
-              placeholder="Especifica qué tipo de ayuda..."
-            />
-          </div>
-        )}
-
-        {/* Vehículo */}
-        <div>
-          <label className="block text-sm font-medium text-gray-700 mb-1">Vehículo disponible</label>
-          <select
-            value={formData.vehiculo}
-            onChange={(e) => setFormData({ ...formData, vehiculo: e.target.value })}
-            className="w-full p-2 border rounded focus:ring-2 focus:ring-green-500 focus:border-green-500"
-          >
-            <option value="">No dispongo de vehículo</option>
-            <option value="coche">Coche</option>
-            <option value="todoterreno">Todoterreno/4x4</option>
-            <option value="furgoneta">Furgoneta</option>
-            <option value="barca">Barca</option>
-          </select>
-        </div>
-
-        {/* Disponibilidad */}
-        <div>
-          <label className="block text-sm font-medium text-gray-700 mb-2">Disponibilidad</label>
-          <div className="flex flex-wrap gap-2">
-            {diasSemana.map((dia) => (
-              <label
-                key={dia}
-                className={`flex items-center p-2 rounded cursor-pointer ${
-                  formData.disponibilidad.includes(dia) ? 'bg-green-100 text-green-800' : 'bg-gray-50 hover:bg-gray-100'
-                }`}
-              >
-                <input
-                  type="checkbox"
-                  checked={formData.disponibilidad.includes(dia)}
-                  onChange={() => handleDisponibilidadChange(dia)}
-                  className="sr-only"
-                />
-                <span>{dia}</span>
-              </label>
-            ))}
-          </div>
-        </div>
-
-        <div>
-          <label className="block text-sm font-medium text-gray-700 mb-1">Radio de acción (km)</label>
-          <input
-            type="number"
-            value={formData.radio}
-            onChange={(e) => setFormData({ ...formData, radio: Number(e.target.value) })}
-            className="w-full p-2 border rounded focus:ring-2 focus:ring-green-500 focus:border-green-500"
-            min="1"
-            placeholder="¿Cuántos kilómetros puedes desplazarte?"
-          />
-        </div>
-
-        <div>
-          <label className="block text-sm font-medium text-gray-700 mb-1">Experiencia relevante</label>
-          <textarea
-            value={formData.experiencia}
-            onChange={(e) => setFormData({ ...formData, experiencia: e.target.value })}
-            className="w-full p-2 border rounded focus:ring-2 focus:ring-green-500 focus:border-green-500"
-            rows="3"
-            placeholder="Describe tu experiencia en situaciones similares, formación, etc."
-          />
-        </div>
-
-        <div>
-          <label className="block text-sm font-medium text-gray-700 mb-1">Comentarios adicionales</label>
-          <textarea
-            value={formData.comentarios}
-            onChange={(e) => setFormData({ ...formData, comentarios: e.target.value })}
-            className="w-full p-2 border rounded focus:ring-2 focus:ring-green-500 focus:border-green-500"
-            rows="3"
-            placeholder="Información adicional que quieras compartir"
-          />
-        </div>
-
-        {/* Pueblos */}
-        <div>
-          <label className="block text-sm font-medium text-gray-700 mb-1" htmlFor="townName">
-            Pueblo <span className="text-red-500">*</span>
-          </label>
-          <select
-            id="townName"
-            name="pueblo"
-            value={formData.pueblo}
-            onChange={(e) => setFormData({ ...formData, pueblo: e.target.value })}
-            className="w-full p-2 border rounded focus:ring-2 focus:ring-red-500"
-            required
-          >
-            <option value="">Selecciona un pueblo</option>
-            {towns.map((item) => (
-              <option key={item.id} value={item.id}>
-                {item.name}
-              </option>
-            ))}
-          </select>
-        </div>
-        {/* Aceptación de protocolo */}
-        <div className="flex items-start">
-          <label className="ml-2 text-sm text-gray-700 flex items-start gap-2 cursor-pointer">
-            <input
-              type="checkbox"
-              checked={formData.aceptaProtocolo}
-              onChange={(e) => setFormData({ ...formData, aceptaProtocolo: e.target.checked })}
-              className="mt-1 h-4 w-4 text-green-600 focus:ring-green-500 border-gray-300 rounded"
-            />
-            Acepto seguir el protocolo de actuación y las indicaciones de las autoridades competentes. Entiendo que mi
-            seguridad y la de los demás es prioritaria.
-          </label>
-        </div>
-      </div>
-      <div className="flex flex-col sm:flex-row gap-4">
-        {isModal && (
-          <button
-            type="submit"
-            className={`w-full bg-red-500 hover:bg-red-600 text-white py-3 px-4 rounded-lg font-semibold 
-              focus:outline-none focus:ring-2 focus:ring-red-500 focus:ring-offset-2`}
-            onClick={onClose}
-          >
-            Cancelar
-          </button>
-        )}
-        <button
-          type="submit"
-          disabled={status.isSubmitting}
-          className={`w-full ${
-            status.isSubmitting ? 'bg-gray-400 cursor-not-allowed' : 'bg-green-500 hover:bg-green-600'
-          } text-white py-3 px-4 rounded-lg font-semibold 
-              focus:outline-none focus:ring-2 focus:ring-green-500 focus:ring-offset-2`}
-        >
-          {status.isSubmitting ? button[1] : button[0]}
-        </button>
-      </div>
-      {status.success && (
-        <div className="fixed bottom-4 right-4 bg-green-100 border-l-4 border-green-500 p-4 rounded shadow-lg z-50">
-          <div className="flex items-center">
-            <Check className="h-5 w-5 text-green-500 mr-2" />
-            <div>
-              <p className="text-green-700 font-medium">Tu oferta de ayuda ha sido registrada correctamente.</p>
-              <p className="text-green-600 text-sm mt-1">
-                Gracias por tu disposición para ayudar. Te contactaremos si necesitamos tu apoyo.
-              </p>
-            </div>
-          </div>
-        </div>
-      )}
-    </form>
-  );
-}
diff --git a/src/components/RequestHelp.js b/src/components/RequestHelp.js
deleted file mode 100644
index b96f1112..00000000
--- a/src/components/RequestHelp.js
+++ /dev/null
@@ -1,364 +0,0 @@
-'use client';
-
-import { useCallback, useState } from 'react';
-import { Check, Mail } from 'lucide-react';
-import AddressAutocomplete from '@/components/AddressAutocomplete';
-import { mapToIdAndLabel, tiposAyudaOptions } from '@/helpers/constants';
-import { formatPhoneNumber, isValidPhone } from '@/helpers/utils';
-import { helpRequestService, locationService, townService } from '@/lib/service';
-
-import { PhoneInput } from '@/components/input/PhoneInput';
-import { useRouter } from 'next/navigation';
-import { CallCenterLink } from '@/components/CallCenterLink';
-import AddressMap from './AddressMap';
-import { useTowns } from '@/context/TownProvider';
-import { useSession } from '@/context/SessionProvider';
-
-export default function RequestHelp({
-  data = {},
-  title = 'Solicitar Ayuda',
-  button = ['Enviar solicitud de ayuda', 'Enviando solicitud...'],
-  submitType = 'create',
-  id,
-  redirect = '/casos-activos/solicitudes',
-}) {
-  const { towns } = useTowns();
-  const router = useRouter();
-  const session = useSession();
-  const userId = session.user?.id;
-  const [formData, setFormData] = useState({
-    nombre: data.name || '',
-    ubicacion: data.location || '',
-    coordinates: { lat: data.latitude || 3, lng: data.longitude || 3 },
-    tiposAyuda: data.help_type || [],
-    numeroPersonas: data.number_of_people || '',
-    descripcion: data.description || '',
-    urgencia: data.urgency || 'alta',
-    situacionEspecial: data.additional_info?.special_situations || '',
-    contacto: data.contact_info || '',
-    consentimiento: data.additional_info?.consent || false,
-    pueblo: '',
-    town_id: data.town_id || '',
-    email: data.additional_info?.email || '',
-    status: data.status || 'active',
-  });
-
-  const [status, setStatus] = useState({
-    isSubmitting: false,
-    error: null,
-    success: false,
-  });
-
-  const handleTipoAyudaChange = (tipo) => {
-    setFormData((prev) => ({
-      ...prev,
-      tiposAyuda: prev.tiposAyuda.includes(tipo)
-        ? prev.tiposAyuda.filter((t) => t !== tipo)
-        : [...prev.tiposAyuda, tipo],
-    }));
-  };
-
-  const handleSubmit = async (e) => {
-    e.preventDefault();
-
-    /* Form validation */
-    if (!formData.coordinates) {
-      alert('Elige una ubicacion valida');
-      return;
-    }
-
-    if (!formData.consentimiento) {
-      alert('Debe aceptar el consentimiento para enviar la solicitud');
-      return;
-    }
-
-    if (!isValidPhone(formData.contacto)) {
-      alert('El teléfono de contacto no es válido. Si has usado espacios, elimínalos.');
-      return;
-    }
-
-    setStatus({ isSubmitting: true, error: null, success: false });
-
-    try {
-      const latitude = String(formData.coordinates.lat);
-      const longitude = String(formData.coordinates.lng);
-      let town_id = formData.town_id;
-
-      if (formData.pueblo !== '') {
-        const { data: townResponse, error: townError } = await townService.createIfNotExists(formData.pueblo);
-        if (townError) throw townError;
-        town_id = townResponse[0].id;
-      }
-
-      const helpRequestData = {
-        type: 'necesita',
-        name: formData.nombre,
-        location: formData.ubicacion,
-        latitude,
-        longitude,
-        help_type: formData.tiposAyuda,
-        description: formData.descripcion,
-        urgency: formData.urgencia,
-        number_of_people: parseInt(formData.numeroPersonas) || 1,
-        contact_info: formatPhoneNumber(formData.contacto),
-        additional_info: {
-          special_situations: formData.situacionEspecial || null,
-          consent: true,
-          email: formData.email,
-        },
-        town_id,
-        status: formData.status,
-        user_id: userId,
-      };
-      if (submitType === 'create') {
-        const { error } = await helpRequestService.createRequest(helpRequestData);
-        if (error) {
-          throw new Error(error.message);
-        }
-      }
-      if (submitType === 'edit') {
-        const { error } = await helpRequestService.editRequest(helpRequestData, id);
-        if (error) {
-          throw new Error(error.message);
-        }
-      }
-
-      setFormData({
-        nombre: '',
-        ubicacion: '',
-        coordinates: { lat: null, lng: null },
-        tiposAyuda: [],
-        numeroPersonas: '',
-        descripcion: '',
-        urgencia: 'alta',
-        situacionEspecial: '',
-        contacto: '',
-        pueblo: '',
-        email: '',
-        consentimiento: false,
-        status: 'active',
-      });
-
-      setStatus({ isSubmitting: false, error: null, success: true });
-      setStatus((prev) => ({ ...prev, success: false }));
-      router.push(redirect);
-    } catch (error) {
-      console.error('Error al enviar solicitud:', error.message);
-      setStatus({
-        isSubmitting: false,
-        error: `Error al enviar la solicitud: ${error.message}`,
-        success: false,
-      });
-    }
-  };
-
-  const handleOnNewAddressDescriptor = (addressDescriptor) => {
-    setFormData((prev) => ({
-      ...prev,
-      coordinates: addressDescriptor.coordinates,
-      pueblo: addressDescriptor.town,
-      ubicacion: addressDescriptor.address,
-    }));
-  };
-
-  const handleChange = (e) => {
-    const { name, value, type, checked } = e.target;
-    setFormData((prev) => ({
-      ...prev,
-      [name]: type === 'checkbox' ? checked : value || '',
-    }));
-  };
-
-  const handlePhoneChange = useCallback((e) => {
-    setFormData((formData) => ({ ...formData, contacto: e.target.value }));
-  }, []);
-
-  return (
-    <div className="space-y-6">
-      {status.error && (
-        <div className="bg-red-100 border-l-4 border-red-500 p-4 rounded">
-          <p className="text-red-700">{status.error}</p>
-        </div>
-      )}
-
-      {/* Formulario principal */}
-      <div className="bg-white rounded-lg shadow-lg p-6">
-        <h1 className="text-2xl font-bold mb-6">{title}</h1>
-
-        <form onSubmit={handleSubmit} className="space-y-6">
-          <div className="grid md:grid-cols-2 gap-4">
-            <div>
-              <label className="block text-sm font-medium text-gray-700 mb-1">Nombre completo</label>
-              <input
-                type="text"
-                name="nombre"
-                value={formData.nombre}
-                onChange={handleChange}
-                className="w-full p-2 border rounded focus:ring-2 focus:ring-green-500 focus:border-green-500"
-              />
-            </div>
-            <PhoneInput phoneNumber={formData.contacto} onChange={handlePhoneChange} required />
-          </div>
-          {submitType === 'create' && (
-            <div>
-              <label className="block text-sm font-medium text-gray-700 mb-1">
-                Correo electrónico <span className="text-red-500">*</span>
-              </label>
-              <input
-                type="email"
-                name="email"
-                value={formData.email}
-                onChange={handleChange}
-                className="w-full p-2 border rounded focus:ring-2 focus:ring-green-500 focus:border-green-500"
-              />
-              <p className="mt-1 text-sm text-gray-500">
-                Se utilizara para que puedas eliminar o editar la información de tu solicitud
-              </p>
-            </div>
-          )}
-          {submitType === 'edit' && (
-            <div>
-              <label htmlFor="status" className="block text-sm font-medium text-gray-700 mb-1">
-                Progreso de tu solicitud
-              </label>
-              <select
-                name="status"
-                id="status"
-                value={formData.status}
-                onChange={handleChange}
-                className="w-full p-2 border rounded focus:ring-2 focus:ring-red-500"
-              >
-                <option value="active">Activa - Aún no recibo ayuda</option>
-                <option value="progress">En progreso - Están viniendo a ayudarme</option>
-                <option value="finished">Terminada - Ya me han ayudado</option>
-              </select>
-            </div>
-          )}
-
-          <div>
-            <label className="block text-sm font-medium text-gray-700 mb-2">Tipo de ayuda necesaria</label>
-            <div className="grid md:grid-cols-2 gap-2">
-              {mapToIdAndLabel(tiposAyudaOptions).map((tipo) => (
-                <label
-                  key={tipo.id}
-                  className={`flex items-center p-3 rounded cursor-pointer ${
-                    formData.tiposAyuda.includes(tipo.id) ? 'bg-red-50 text-red-800' : 'bg-gray-50 hover:bg-gray-100'
-                  }`}
-                >
-                  <input
-                    type="checkbox"
-                    checked={formData.tiposAyuda.includes(tipo.id)}
-                    onChange={() => handleTipoAyudaChange(tipo.id)}
-                    className="h-4 w-4 text-red-600 focus:ring-red-500 border-gray-300 rounded"
-                  />
-                  <span className="ml-2">{tipo.label}</span>
-                </label>
-              ))}
-            </div>
-          </div>
-
-          <div>
-            <label className="block text-sm font-medium text-gray-700 mb-1">Número de personas afectadas</label>
-            <input
-              type="number"
-              name="numeroPersonas"
-              value={formData.numeroPersonas}
-              onChange={handleChange}
-              className="w-full p-2 border rounded focus:ring-2 focus:ring-red-500"
-              min="1"
-            />
-          </div>
-
-          <div>
-            <label className="block text-sm font-medium text-gray-700 mb-1">Descripción de la situación</label>
-            <textarea
-              name="descripcion"
-              value={formData.descripcion}
-              onChange={handleChange}
-              className="w-full p-2 border rounded focus:ring-2 focus:ring-red-500"
-              rows="3"
-              placeholder="Describa su situación actual y el tipo de ayuda que necesita"
-            />
-          </div>
-
-          <div>
-            <label className="block text-sm font-medium text-gray-700 mb-1">Nivel de urgencia</label>
-            <select
-              name="urgencia"
-              value={formData.urgencia}
-              onChange={handleChange}
-              className="w-full p-2 border rounded focus:ring-2 focus:ring-red-500"
-            >
-              <option value="alta">Alta - Necesito ayuda inmediata</option>
-              <option value="media">Media - Puedo esperar unas horas</option>
-              <option value="baja">Baja - No es urgente</option>
-            </select>
-          </div>
-
-          <div>
-            <label className="block text-sm font-medium text-gray-700 mb-1">Situaciones especiales</label>
-            <textarea
-              name="situacionEspecial"
-              value={formData.situacionEspecial}
-              onChange={handleChange}
-              className="w-full p-2 border rounded focus:ring-2 focus:ring-red-500"
-              rows="2"
-              placeholder="Personas mayores, niños pequeños, personas con movilidad reducida, necesidades médicas, mascotas..."
-            />
-          </div>
-          {/* Mapa */}
-          <div>
-            <AddressMap
-              titulo="Ubicación exacta"
-              onNewAddressDescriptor={handleOnNewAddressDescriptor}
-              initialAddressDescriptor={{
-                address: formData.ubicacion,
-                coordinates: formData.coordinates,
-                town: formData.pueblo,
-              }}
-            />
-          </div>
-
-          {/* Consentimiento */}
-          <div className="flex items-start">
-            <label className="ml-2 block text-sm text-gray-700 cursor-pointer">
-              <input
-                type="checkbox"
-                name="consentimiento"
-                checked={formData.consentimiento}
-                onChange={handleChange}
-                className="mt-1 h-4 w-4 text-red-600 focus:ring-red-500 border-gray-300 rounded mr-2"
-              />
-              Doy mi consentimiento para el tratamiento de los datos proporcionados y confirmo que la información
-              proporcionada es verídica.
-            </label>
-          </div>
-
-          <button
-            type="submit"
-            disabled={status.isSubmitting}
-            className={`w-full ${
-              status.isSubmitting ? 'bg-gray-400 cursor-not-allowed' : 'bg-red-500 hover:bg-red-600'
-            } text-white py-3 px-4 rounded-lg font-semibold`}
-          >
-            {status.isSubmitting ? button[1] : button[0]}
-          </button>
-        </form>
-      </div>
-
-      {status.success && (
-        <div className="fixed bottom-4 right-4 bg-green-100 border-l-4 border-green-500 p-4 rounded shadow-lg z-50">
-          <div className="flex items-center">
-            <Check className="h-5 w-5 text-green-500 mr-2" />
-            <div>
-              <p className="text-green-700 font-medium">Su solicitud de ayuda ha sido registrada correctamente.</p>
-              <p className="text-green-600 text-sm mt-1">
-                Se está coordinando la ayuda. En caso de empeorar la situación, contacte al 112.
-              </p>
-            </div>
-          </div>
-        </div>
-      )}
-    </div>
-  );
-}
diff --git a/src/components/auth/SocialButton.tsx b/src/components/auth/SocialButton.tsx
index 5b43792b..1f79a4e2 100644
--- a/src/components/auth/SocialButton.tsx
+++ b/src/components/auth/SocialButton.tsx
@@ -11,7 +11,6 @@ type SocialButtonProps = {
 export default function SocialButton({ provider, redirectUrl, children }: SocialButtonProps) {
   const baseUrl =
     process.env.NEXT_PUBLIC_ENV === 'production' ? process.env.NEXT_PUBLIC_BASE_URL! : 'http://127.0.0.1:3000';
-  console.log(baseUrl + redirectUrl);
   const handleLogin = async (provider: Provider) => {
     const { data, error } = await supabase.auth.signInWithOAuth({
       provider,
diff --git a/src/components/input/PhoneInput/PhoneInputContainer.tsx b/src/components/input/PhoneInput/PhoneInputContainer.tsx
index 92904220..46e49bc9 100644
--- a/src/components/input/PhoneInput/PhoneInputContainer.tsx
+++ b/src/components/input/PhoneInput/PhoneInputContainer.tsx
@@ -6,7 +6,7 @@ import { PhoneInputRenderer } from './PhoneInputRenderer';
 import { PhoneInputProps } from './types';
 import { isValidPhone } from '@/helpers/utils';
 
-export function PhoneInputContainer({ onChange, phoneNumber, required = false }: PhoneInputProps) {
+export function PhoneInput({ onChange, phoneNumber, required = false }: PhoneInputProps) {
   const [isInvalid, setIsInvalid] = useState(false);
 
   const handleChange: PhoneInputProps['onChange'] = useCallback(
diff --git a/src/components/input/PhoneInput/index.ts b/src/components/input/PhoneInput/index.ts
index a2f76067..7499bd42 100644
--- a/src/components/input/PhoneInput/index.ts
+++ b/src/components/input/PhoneInput/index.ts
@@ -1,3 +1,3 @@
-import { PhoneInputContainer as PhoneInput } from './PhoneInputContainer';
+import { PhoneInput } from './PhoneInputContainer';
 
 export { PhoneInput };
diff --git a/src/components/layout/Sidebar.tsx b/src/components/layout/Sidebar.tsx
index 212bcb3a..e161d0b9 100644
--- a/src/components/layout/Sidebar.tsx
+++ b/src/components/layout/Sidebar.tsx
@@ -15,11 +15,9 @@ import {
   Thermometer,
   Truck,
   Inbox,
-  Car,
   Landmark,
   Scale,
   MessageCircleQuestion,
-  CarTaxiFront,
 } from 'lucide-react';
 import UserInfo from '../UserInfo';
 import { useSession } from '@/context/SessionProvider';
@@ -251,8 +249,7 @@ export default function Sidebar({ isOpen, toggleAction }: SidebarProps) {
         {/* Toggle button for desktop */}
         <button
           onClick={toggleAction}
-          className="hidden md:flex absolute -right-12 top-4 bg-white p-2 rounded-r-lg shadow-md
-            hover:bg-gray-50 focus:outline-none group"
+          className="hidden md:flex absolute -right-12 top-4 bg-white p-2 rounded-r-lg shadow-md hover:bg-gray-50 focus:outline-none group"
           aria-label={isOpen ? 'Contraer menú' : 'Expandir menú'}
         >
           <Menu className={`transform transition-transform duration-300 ${isOpen ? 'rotate-180' : ''}`} />
diff --git a/src/components/map/map.tsx b/src/components/map/map.tsx
index dd115b84..55789cb5 100644
--- a/src/components/map/map.tsx
+++ b/src/components/map/map.tsx
@@ -37,7 +37,6 @@ const Map: FC<MapProps> = ({ markers = [] }) => {
 
   const { toggleModal } = useModal();
 
-  console.log(selectedMarker);
   return (
     <ReactMap
       initialViewState={{
diff --git a/src/helpers/constants.ts b/src/helpers/constants.ts
index f89eded4..37a254e1 100644
--- a/src/helpers/constants.ts
+++ b/src/helpers/constants.ts
@@ -10,13 +10,17 @@ export const tiposAyudaOptions = {
   reparto: 'Labores de reparto de alimentos a domicilio',
   donaciones: 'Labores de organización de donaciones',
   otros: 'Ayuda general',
-};
+} as const;
 
-export const tiposAyudaAcepta = ['Alimentos', 'Ropa', 'Mantas', 'Agua', 'Productos de higiene', 'Medicamentos'];
+type TipoAyudaId = keyof typeof tiposAyudaOptions;
+type TipoAyudaLabel = (typeof tiposAyudaOptions)[TipoAyudaId];
 
-export const mapToIdAndLabel = (data: any) => {
-  return Object.keys(data).map((key) => ({
-    id: key,
-    label: data[key],
-  }));
-};
+interface TipoAyudaOption {
+  id: TipoAyudaId;
+  label: TipoAyudaLabel;
+}
+
+export const tiposAyudaArray: TipoAyudaOption[] = Object.entries(tiposAyudaOptions).map(([id, label]) => ({
+  id: id as TipoAyudaId,
+  label,
+}));
diff --git a/src/lib/service.ts b/src/lib/service.ts
index 4064a24c..6ae341cd 100644
--- a/src/lib/service.ts
+++ b/src/lib/service.ts
@@ -1,19 +1,18 @@
 import { supabase } from './supabase/client';
-import { Database } from '@/types/database';
-import { HelpRequestAssignmentInsert, HelpRequestUpdate } from '@/types/Requests';
+import { HelpRequestAssignmentInsert, HelpRequestData, HelpRequestInsert, HelpRequestUpdate } from '@/types/Requests';
 import { createClient } from '@/lib/supabase/server';
 
 export const helpRequestService = {
-  async createRequest(requestData: Database['public']['Tables']['help_requests']['Insert']) {
+  async createRequest(requestData: HelpRequestInsert) {
     const { data, error } = await supabase.from('help_requests').insert([requestData]).select();
 
     if (error) throw error;
-    return data[0];
+    return data[0] as HelpRequestData;
   },
   async editRequest(requestData: HelpRequestUpdate, id: number) {
     const { data, error } = await supabase.from('help_requests').update(requestData).eq('id', id).select();
     if (error) throw error;
-    return data;
+    return data[0] as HelpRequestData;
   },
   async getAll() {
     const { data, error } = await supabase.from('help_requests').select('*').order('created_at', { ascending: false });
@@ -25,7 +24,7 @@ export const helpRequestService = {
     const supabase = await getSupabaseClient();
     const { data, error } = await supabase.from('help_requests').select('*').eq('id', id).single();
     if (error) throw error;
-    return data;
+    return data as HelpRequestData;
   },
 
   async getRequestsByUser(user_id: string | undefined) {
@@ -42,7 +41,7 @@ export const helpRequestService = {
       .eq('type', 'necesita')
       .or(`user_id.eq.${user_id},id.in.(${helpRequestIds.join(',')})`);
     if (requestsError) throw requestsError;
-    return requests;
+    return requests as HelpRequestData[];
   },
 
   async getOffersByUser(user_id: string | undefined) {
@@ -53,7 +52,7 @@ export const helpRequestService = {
       .eq('type', 'ofrece')
       .eq('user_id', user_id);
     if (requestsError) throw requestsError;
-    return requests;
+    return requests as HelpRequestData[];
   },
 
   async getAssignments(id: number) {
diff --git a/src/types/Requests.ts b/src/types/Requests.ts
index 184276ea..1b535722 100644
--- a/src/types/Requests.ts
+++ b/src/types/Requests.ts
@@ -3,12 +3,26 @@ import { Database } from './database';
 export type HelpRequestType = 'necesita' | 'ofrece';
 export type HelpRequestUrgencyType = 'alta' | 'media' | 'baja';
 export type HelpRequestStatusType = 'pending' | 'in_progress' | 'active';
-export type HelpRequestData = Database['public']['Tables']['help_requests']['Row'];
-export type HelpRequestUpdate = Database['public']['Tables']['help_requests']['Update'];
+type HelpRequestJsonFields = {
+  additional_info: HelpRequestAdditionalInfo;
+  resources: HelpRequestResources | null;
+};
+export type HelpRequestHelpType = Database['public']['Enums']['help_type_enum'];
+export type HelpRequestData = Database['public']['Tables']['help_requests']['Row'] & HelpRequestJsonFields;
+export type HelpRequestInsert = Database['public']['Tables']['help_requests']['Insert'] & HelpRequestJsonFields;
+export type HelpRequestUpdate = Database['public']['Tables']['help_requests']['Update'] & HelpRequestJsonFields;
 export type HelpRequestAssignmentData = Database['public']['Tables']['help_request_assignments']['Row'];
 export type HelpRequestAssignmentInsert = Database['public']['Tables']['help_request_assignments']['Insert'];
 
 export type HelpRequestAdditionalInfo = {
   special_situations?: string;
   email?: string;
+  experience?: string;
+  consent?: boolean;
+};
+
+export type HelpRequestResources = {
+  radius?: number;
+  vehicle?: string;
+  availability?: string[];
 };