diff --git a/src/pages/ticket/CreateTicket.tsx b/src/pages/ticket/CreateTicket.tsx
index a8770bd..370f43b 100644
--- a/src/pages/ticket/CreateTicket.tsx
+++ b/src/pages/ticket/CreateTicket.tsx
@@ -1,30 +1,15 @@
 import { type FC, useState } from 'react'
-// import { useTranslation } from 'react-i18next'
 import Input from '../../components/Input'
-import Select from '../../components/Select'
-// import Textarea from '../../components/Textarea'
 import UploadBox from '../../components/UploadBox'
 import Button from '../../components/Button'
 import { TickCircle, TickSquare } from 'iconsax-react'
-// import { useCreateTicket, useGetCategoriesTicket, useMultiUpload } from './hooks/useTicketData'
-// import { useGetProfile } from '../profile/hooks/useProfileData'
-import { staticCategoriesData, staticProfileData, staticServicesData } from './data/staticData'
-// import PageLoading from '../../components/PageLoading'
-// import { useFormik } from 'formik'
-// import { type CreateTicketType } from './types/TicketTypes'
-// import * as Yup from 'yup'
-// import { toast } from '../../components/Toast'
-// import { type ErrorType } from '../../helpers/types'
-// import { useNavigate } from 'react-router-dom'
-// import { Pages } from '../../config/Pages'
-// import { useGetMyServices } from '../service/hooks/useServiceData'
-// import { MyServicesItem } from '../service/types/ServiecTypes'
+import { useCreateOrReplyTicket } from './hooks/useTicketData'
+import { useNavigate } from 'react-router-dom'
 import { fa } from '@/locale/fa'
 import Textarea from '@/components/Textarea'
+import { Paths } from '@/config/Paths'
 
 const CreateTicket: FC = () => {
-
-    // const { t } = useTranslation('global')
     const t = (key: string): string => {
         const keys = key.split('.');
         let value: unknown = fa;
@@ -33,65 +18,26 @@ const CreateTicket: FC = () => {
         }
         return (value as string) || key;
     }
-    // const navigate = useNavigate()
-    const [_files, setFiles] = useState<File[]>([])
-    const [percent] = useState<number>(0)
-    // const getProfile = useGetProfile()
-    // const getCategories = useGetCategoriesTicket()
-    // const multiUpload = useMultiUpload(setPercent)
-    // const createTicket = useCreateTicket()
-    // const getMyservice = useGetMyServices('')
+    const navigate = useNavigate()
+    const [subject, setSubject] = useState('')
+    const [content, setContent] = useState('')
+    const [files, setFiles] = useState<File[]>([])
 
-    // استفاده از داده‌های استاتیک
-    const getProfile = {
-        isPending: false,
-        data: staticProfileData
-    }
-    const getCategories = {
-        isPending: false,
-        data: staticCategoriesData
-    }
-    const multiUpload = {
-        isPending: false,
-        mutateAsync: () => Promise.resolve()
-    }
-    const createTicket = {
-        isPending: false,
-        mutate: () => { }
-    }
-    const getMyservice = {
-        isPending: false,
-        data: staticServicesData
-    }
+    const createTicket = useCreateOrReplyTicket()
 
-    // Mock formik
-    const formik = {
-        values: {
-            subject: '',
-            message: '',
-            categoryId: '',
-            priority: 'LOW',
-            danakServiceId: '',
-            title: '',
-            attachmentUrls: []
-        },
-        handleChange: () => { },
-        handleSubmit: () => { },
-        resetForm: () => { },
-        touched: {
-            subject: false,
-            priority: false,
-            danakServiceId: false,
-            categoryId: false,
-            message: false
-        },
-        errors: {
-            subject: '',
-            priority: '',
-            danakServiceId: '',
-            categoryId: '',
-            message: ''
-        }
+    const handleSubmit = () => {
+        if (!subject.trim() || !content.trim()) return
+        createTicket.mutate(
+            {
+                subject: subject.trim(),
+                content: content.trim(),
+                attachments: files.length ? files.map(() => ({})) : [],
+            },
+            {
+                onSuccess: () => navigate(Paths.tickets.list),
+                onError: (err: unknown) => console.error(err),
+            }
+        )
     }
 
 
@@ -101,169 +47,86 @@ const CreateTicket: FC = () => {
                 {t('ticket.new_ticket')}
             </div>
 
-            {
-                getProfile.isPending || getCategories.isPending ?
-                    <div>Loading...</div>
-                    :
-                    <div className='flex gap-6 xl:mt-8 mt-4'>
-                        <div className='flex-1 bg-white py-8 xl:px-10 px-4 rounded-3xl'>
+            <div className='flex gap-6 xl:mt-8 mt-4'>
+                <div className='flex-1 bg-white py-8 xl:px-10 px-4 rounded-3xl'>
+                    <div>
+                        {t('ticket.submit_your_message')}
+                    </div>
+
+                    <div className='mt-6'>
+                        <Input
+                            label={t('ticket.subject')}
+                            placeholder={t('ticket.enter_your_subject')}
+                            value={subject}
+                            onChange={(e) => setSubject(e.target.value)}
+                        />
+                    </div>
+
+                    <div className='mt-6'>
+                        <Textarea
+                            label={t('ticket.your_description')}
+                            value={content}
+                            onChange={(e) => setContent(e.target.value)}
+                        />
+                    </div>
+
+                    <div className='mt-6'>
+                        <UploadBox
+                            label={t('ticket.attachment')}
+                            isMultiple
+                            onChange={setFiles}
+                        />
+                    </div>
+
+                    <div className='mt-8 flex justify-end'>
+                        <Button
+                            className='xl:max-w-[100px]'
+                            onClick={handleSubmit}
+                            isLoading={createTicket.isPending}
+                        >
+                            <div className='flex gap-2 items-center'>
+                                <TickCircle size={20} color='black' />
+                                <div>
+                                    {t('ticket.send')}
+                                </div>
+                            </div>
+                        </Button>
+                    </div>
+                </div>
+
+                <div className='bg-white w-[300px] xl:block hidden py-10 px-5 h-fit rounded-3xl'>
+                    <div className='text-sm'>
+                        {t('ticket.title_hint')}
+                    </div>
+
+                    <div className='mt-6'>
+                        <div className='flex items-start gap-2 border-b pb-5'>
                             <div>
-                                {t('ticket.submit_your_message')}
+                                <TickSquare size={20} color='black' variant='Bold' />
                             </div>
-
-                            <div className='mt-6 rowTwoInput'>
-                                <Input
-                                    label={t('ticket.name')}
-                                    readOnly
-                                    placeholder={getProfile?.data?.data?.user?.firstName + ' ' + getProfile?.data?.data?.user?.lastName}
-                                />
-                                <Input
-                                    label={t('ticket.email')}
-                                    readOnly
-                                    placeholder={getProfile?.data?.data?.user?.email}
-                                />
-                            </div>
-
-
-                            <div className='mt-6 rowTwoInput'>
-                                <Input
-                                    label={t('ticket.subject')}
-                                    placeholder={t('ticket.enter_your_subject')}
-                                    name='subject'
-                                    value={formik.values.subject}
-                                    onChange={formik.handleChange}
-                                    error_text={formik.touched.subject && formik.errors.subject ? formik.errors.subject : ''}
-                                />
-                                <Select
-                                    label={t('ticket.priority')}
-                                    items={[
-                                        {
-                                            label: t('ticket.low'),
-                                            value: 'LOW'
-                                        },
-                                        {
-                                            label: t('ticket.medium'),
-                                            value: 'MEDIUM'
-                                        },
-                                        {
-                                            label: t('ticket.high'),
-                                            value: 'HIGH'
-                                        }
-                                    ]}
-                                    placeholder={t('select')}
-                                    className='border'
-                                    name='priority'
-                                    value={formik.values.priority}
-                                    onChange={formik.handleChange}
-                                    error_text={formik.touched.priority && formik.errors.priority ? formik.errors.priority : ''}
-                                />
-                            </div>
-
-                            <div className='mt-6 rowTwoInput'>
-                                <Select
-                                    label={t('ticket.select_your_service')}
-                                    placeholder={t('ticket.not_once')}
-                                    className='border'
-                                    name='danakServiceId'
-                                    items={getMyservice.data?.data?.subscriptions?.map((item: Record<string, unknown>) => {
-                                        const plan = item.plan as Record<string, unknown>;
-                                        const service = plan?.service as Record<string, unknown>;
-                                        return {
-                                            label: service?.name as string,
-                                            value: service?.id as string
-                                        };
-                                    })
-                                    }
-                                    onChange={formik.handleChange}
-                                    error_text={formik.touched.danakServiceId && formik.errors.danakServiceId ? formik.errors.danakServiceId : ''}
-                                />
-                                <Select
-                                    label={t('ticket.category')}
-                                    items={getCategories.data?.data?.ticketCategories?.map((item: { id: string, title: string }) => ({
-                                        label: item.title,
-                                        value: item.id
-                                    })
-                                    )}
-                                    placeholder={t('select')}
-                                    className='border'
-                                    name='categoryId'
-                                    value={formik.values.categoryId}
-                                    onChange={formik.handleChange}
-                                    error_text={formik.touched.categoryId && formik.errors.categoryId ? formik.errors.categoryId : ''}
-                                />
-                            </div>
-                            <div className='mt-6'>
-                                <Textarea
-                                    label={t('ticket.your_description')}
-                                    name='message'
-                                    value={formik.values.message}
-                                    onChange={formik.handleChange}
-                                    error_text={formik.touched.message && formik.errors.message ? formik.errors.message : ''}
-                                />
-                            </div>
-
-                            <div className='mt-6'>
-                                <UploadBox
-                                    label={t('ticket.attachment')}
-                                    isMultiple
-                                    onChange={setFiles}
-                                />
-                            </div>
-
-                            <div className='mt-8 flex justify-end'>
-                                <Button
-                                    className='xl:max-w-[100px]'
-                                    onClick={() => formik.handleSubmit()}
-                                    isLoading={createTicket.isPending || multiUpload.isPending}
-                                    percentage={percent}
-                                >
-                                    <div className='flex gap-2 items-center'>
-                                        <TickCircle size={20} color='black' />
-                                        <div>
-                                            {t('ticket.send')}
-                                        </div>
-                                    </div>
-                                </Button>
+                            <div className='text-description text-xs leading-5'>
+                                سوالات - مشکلاتی که به یک موضوع مربوط میشوند را در یک درخواست پشتیبانی پیگیر باشید و چند درخواست برای یک موضوع باز نکنید.
                             </div>
                         </div>
-
-                        <div className='bg-white w-[300px] xl:block hidden py-10 px-5 h-fit rounded-3xl'>
-                            <div className='text-sm'>
-                                {t('ticket.title_hint')}
+                        <div className='flex items-start gap-2 mt-6 border-b pb-5'>
+                            <div>
+                                <TickSquare size={20} color='black' variant='Bold' />
                             </div>
-
-                            <div className='mt-6'>
-                                <div className='flex items-start gap-2 border-b pb-5'>
-                                    <div>
-                                        <TickSquare size={20} color='black' variant='Bold' />
-                                    </div>
-                                    <div className='text-description text-xs leading-5'>
-                                        سوالات - مشکلاتی که به یک موضوع مربوط میشوند را در یک درخواست پشتیبانی پیگیر باشید و چند درخواست برای یک موضوع باز نکنید.
-                                    </div>
-                                </div>
-                                <div className='flex items-start gap-2 mt-6 border-b pb-5'>
-                                    <div>
-                                        <TickSquare size={20} color='black' variant='Bold' />
-                                    </div>
-                                    <div className='text-description text-xs leading-5'>
-                                        لطفاً برای بررسی و رفع مشکلات احتمالی صبور باشید بررسی و رفع مشکلات در برخی موارد زمان گیر است.
-                                    </div>
-                                </div>
-                                <div className='flex items-start gap-2 mt-6'>
-                                    <div>
-                                        <TickSquare size={20} color='black' variant='Bold' />
-                                    </div>
-                                    <div className='text-description text-xs leading-5'>
-                                        پاسخگویی 24 ساعته تلفنی را تنها از داناک می توانید انتظار داشته باشید .بخش پشتیبانی در هر ساعتی حتی در روز های تعطیل آماده پیگیری سریع مشکلات کاربران است.
-                                    </div>
-                                </div>
+                            <div className='text-description text-xs leading-5'>
+                                لطفاً برای بررسی و رفع مشکلات احتمالی صبور باشید بررسی و رفع مشکلات در برخی موارد زمان گیر است.
+                            </div>
+                        </div>
+                        <div className='flex items-start gap-2 mt-6'>
+                            <div>
+                                <TickSquare size={20} color='black' variant='Bold' />
+                            </div>
+                            <div className='text-description text-xs leading-5'>
+                                پاسخگویی 24 ساعته تلفنی را تنها از داناک می توانید انتظار داشته باشید .بخش پشتیبانی در هر ساعتی حتی در روز های تعطیل آماده پیگیری سریع مشکلات کاربران است.
                             </div>
                         </div>
                     </div>
-            }
-
-
-
+                </div>
+            </div>
         </div>
     )
 }
diff --git a/src/pages/ticket/Detail.tsx b/src/pages/ticket/Detail.tsx
index 253e970..ed21799 100644
--- a/src/pages/ticket/Detail.tsx
+++ b/src/pages/ticket/Detail.tsx
@@ -1,28 +1,18 @@
 import { type FC, Fragment, useState } from 'react'
-// import { useTranslation } from 'react-i18next'
 import Input from '../../components/Input'
 import Textarea from '@/components/Textarea'
 import UploadBox from '../../components/UploadBox'
 import Button from '../../components/Button'
 import { CloseCircle, InfoCircle, Paperclip2, Send2 } from 'iconsax-react'
-import { useNavigate } from 'react-router-dom'
+import { useNavigate, useParams } from 'react-router-dom'
 import { type MessageType, type AttachmentType } from './types/TicketTypes'
-// import { useAddMessageTicket, useCloseTicket, useGetMessages, useMultiUpload } from './hooks/useTicketData'
-import { staticTicketDetailData } from './data/staticData'
-// import PageLoading from '../../components/PageLoading'
+import { useGetTicketById, useCreateOrReplyTicket } from './hooks/useTicketData'
 import moment from 'moment-jalaali'
-// import { useFormik } from 'formik'
-// import { type AddMessageTicketType } from './types/TicketTypes'
-// import * as Yup from 'yup'
-// import { toast } from '../../components/Toast'
-// import { type ErrorType } from '../../helpers/types'
 import { clx } from '../../helpers/utils'
 import { fa } from '@/locale/fa'
-// import { Pages } from '../../config/Pages'
+import { Paths } from '@/config/Paths'
 
 const TicketDetail: FC = () => {
-
-    // const { t } = useTranslation('global')
     const t = (key: string) => {
         const keys = key.split('.');
         let value: unknown = fa;
@@ -32,57 +22,45 @@ const TicketDetail: FC = () => {
         return (value as string) || key;
     }
     const navigate = useNavigate()
-    // const { id: _id } = useParams()
-    const [, setFiles] = useState<File[]>([])
-    const [percent] = useState<number>(0)
-    // const getMessages = useGetMessages(id ? id : '')
-    // const addMessage = useAddMessageTicket(id ? id : '')
-    // const multiUpload = useMultiUpload(setPercent)
-    // const closeTicket = useCloseTicket()
+    const { id } = useParams<{ id: string }>()
+    const [content, setContent] = useState('')
+    const [files, setFiles] = useState<File[]>([])
 
-    // استفاده از داده‌های استاتیک
-    const getMessages = {
-        isPending: false,
-        data: staticTicketDetailData
-    }
-    const addMessage = {
-        isPending: false,
-        mutate: () => { },
-        mutateAsync: () => Promise.resolve()
-    }
-    const multiUpload = {
-        isPending: false,
-        mutateAsync: () => Promise.resolve()
-    }
-    const closeTicket = {
-        isPending: false,
-        mutate: () => { }
-    }
-    const [isResetFiles] = useState<boolean>(false)
+    const getTicket = useGetTicketById(id ?? '')
+    const addMessage = useCreateOrReplyTicket()
 
-    // Mock formik
-    const formik = {
-        values: {
-            content: '',
-            attachmentUrls: [],
-        },
-        handleChange: () => { },
-        handleSubmit: () => { },
-        resetForm: () => { },
-        touched: { content: false },
-        errors: { content: '' }
+    const raw = getTicket.data?.data
+    const ticket = raw?.ticket ?? raw
+    const messages: MessageType[] = raw?.messages ?? raw?.ticket?.messages ?? []
+
+    const handleSendReply = () => {
+        if (!id || !content.trim()) return
+        addMessage.mutate(
+            {
+                parentId: id,
+                subject: (ticket as { subject?: string })?.subject ?? '',
+                content: content.trim(),
+                attachments: files.length ? files.map(() => ({})) : [],
+            },
+            {
+                onSuccess: () => {
+                    setContent('')
+                    setFiles([])
+                    getTicket.refetch()
+                },
+            }
+        )
     }
 
     const hadleCloseTicket = () => {
-        closeTicket.mutate()
-        navigate('/tickets')
+        navigate(Paths.tickets.list)
     }
 
     const handleSendAnswer = () => {
-        const messageEndRef = document.getElementById('content');
+        const messageEndRef = document.getElementById('content')
         if (messageEndRef) {
-            messageEndRef.scrollIntoView({ behavior: 'smooth' });
-            messageEndRef.focus();
+            messageEndRef.scrollIntoView({ behavior: 'smooth' })
+            messageEndRef.focus()
         }
     }
 
@@ -92,31 +70,31 @@ const TicketDetail: FC = () => {
                 <div>{t('ticket.ticket_number')}</div>
             </div>
             {
-                getMessages.isPending ?
+                getTicket.isPending ?
                     <div>Loading...</div>
                     :
                     <div className='flex xl:flex-row flex-col-reverse gap-6 xl:mt-8 mt-6'>
                         <div className='flex-1 bg-white py-8 xl:px-10 px-4 rounded-3xl'>
                             <Input
                                 label={t('ticket.subject')}
-                                value={getMessages.data?.data?.ticket?.subject}
+                                value={(ticket as { subject?: string })?.subject}
                                 readOnly
                             />
                             <div className='gap-6 rowTwoInput mt-5'>
                                 <Input
                                     label={t('ticket.select_your_service')}
-                                    value={getMessages.data?.data?.ticket?.danakService?.name}
+                                    value={(ticket as { danakService?: { name?: string } })?.danakService?.name}
                                     readOnly
                                 />
                                 <Input
                                     label={t('ticket.user_name')}
-                                    value={getMessages.data?.data?.ticket?.user?.firstName + ' ' + getMessages.data?.data?.ticket?.user?.lastName}
+                                    value={[(ticket as { user?: { firstName?: string; lastName?: string } })?.user?.firstName, (ticket as { user?: { lastName?: string } })?.user?.lastName].filter(Boolean).join(' ')}
                                     readOnly
                                 />
                             </div>
 
                             {
-                                getMessages.data?.data?.messages.map((item: MessageType) => {
+                                messages.map((item: MessageType) => {
                                     if (item?.author?.roles[0]?.name === 'user') {
                                         return (
                                             <div key={item.id} className='mt-6 xl:text-sm text-xs bg-[#F6F7FA] p-6 rounded-3xl rounded-tr-none xl:max-w-[70%] max-w-[90%]'>
@@ -184,16 +162,14 @@ const TicketDetail: FC = () => {
 
 
                             {
-                                getMessages.data?.data?.ticket?.status !== 'CLOSED' &&
+                                (ticket as { status?: string })?.status !== 'CLOSED' &&
                                 <Fragment>
                                     <div className='mt-9'>
                                         <Textarea
                                             id='content'
                                             placeholder={t('ticket.your_description')}
-                                            name='content'
-                                            value={formik.values.content}
-                                            onChange={formik.handleChange}
-                                            error_text={formik.touched.content && formik.errors.content ? formik.errors.content : ''}
+                                            value={content}
+                                            onChange={(e) => setContent(e.target.value)}
                                         />
                                     </div>
 
@@ -202,16 +178,14 @@ const TicketDetail: FC = () => {
                                             label={t('ticket.attachment')}
                                             onChange={setFiles}
                                             isMultiple
-                                            isReset={isResetFiles}
                                         />
                                     </div>
 
                                     <div className='flex justify-end mt-6'>
                                         <Button
                                             className='xl:max-w-[100px]'
-                                            onClick={() => formik.handleSubmit()}
-                                            percentage={percent}
-                                            isLoading={addMessage.isPending || multiUpload.isPending}
+                                            onClick={handleSendReply}
+                                            isLoading={addMessage.isPending}
                                         >
                                             <div className='flex gap-2 items-center'>
                                                 <Send2 size={20} color='black' />
@@ -227,7 +201,7 @@ const TicketDetail: FC = () => {
                         </div>
                         <div className={`h-fit lg:sticky left-0 lg:top-0 xl:w-[300px] w-full`}>
                             {
-                                getMessages.data?.data?.ticket?.status !== 'CLOSED' &&
+                                (ticket as { status?: string })?.status !== 'CLOSED' &&
                                 <div className='bg-white xl:p-6 p-4 rounded-3xl flex gap-4'>
                                     <Button
                                         label={t('ticket.send_answer')}
@@ -237,7 +211,6 @@ const TicketDetail: FC = () => {
                                     <Button
                                         className='bg-[#D52903] xl:h-10 h-8'
                                         onClick={hadleCloseTicket}
-                                        isLoading={closeTicket.isPending}
                                     >
                                         <div className='flex gap-2 text-xs items-center'>
                                             <CloseCircle
@@ -253,7 +226,7 @@ const TicketDetail: FC = () => {
                             }
                             <div className={clx(
                                 'bg-white p-6 rounded-3xl mt-8',
-                                getMessages.data?.data?.ticket?.status === 'CLOSED' && 'mt-0'
+                                (ticket as { status?: string })?.status === 'CLOSED' && 'mt-0'
                             )}>
                                 <div className='flex justify-between'>
                                     <div className='text-sm'>
@@ -261,10 +234,10 @@ const TicketDetail: FC = () => {
                                     </div>
                                     <div className={clx(
                                         'h-7 px-3 rounded-xl flex items-center text-xs bg-green-100 text-green-400',
-                                        getMessages.data?.data?.ticket?.status === 'PENDING' && 'bg-orange-100 text-orange-700',
-                                        getMessages.data?.data?.ticket?.status === 'CLOSED' && 'bg-red-100 text-red-400'
+                                        (ticket as { status?: string })?.status === 'PENDING' && 'bg-orange-100 text-orange-700',
+                                        (ticket as { status?: string })?.status === 'CLOSED' && 'bg-red-100 text-red-400'
                                     )}>
-                                        {t(`ticket.${getMessages.data?.data?.ticket?.status}`)}
+                                        {t(`ticket.${(ticket as { status?: string })?.status}`)}
                                     </div>
                                 </div>
 
@@ -272,31 +245,33 @@ const TicketDetail: FC = () => {
                                     <div className='flex justify-between text-description'>
                                         <div>{t('ticket.ticket_number')}</div>
                                         <div>
-                                            {getMessages.data?.data?.ticket?.numericId}
+                                            {(ticket as { numericId?: string })?.numericId}
                                         </div>
                                     </div>
                                     <div className='flex mt-6 justify-between text-description'>
                                         <div>{t('ticket.asignto')}</div>
                                         <div>
-                                            {getMessages.data?.data?.ticket?.assignedTo ? getMessages.data?.data?.ticket?.assignedTo?.firstName + ' ' + getMessages.data?.data?.ticket?.assignedTo?.lastName : ''}
+                                            {(ticket as { assignedTo?: { firstName?: string; lastName?: string } })?.assignedTo
+                                                ? [(ticket as { assignedTo?: { firstName?: string } })?.assignedTo?.firstName, (ticket as { assignedTo?: { lastName?: string } })?.assignedTo?.lastName].filter(Boolean).join(' ')
+                                                : ''}
                                         </div>
                                     </div>
                                     <div className='flex mt-6 justify-between text-description'>
                                         <div>{t('date')}</div>
                                         <div className='dltr'>
-                                            {moment(getMessages.data?.data?.ticket?.createdAt).format('jYYYY/jMM/jDD HH:mm')}
+                                            {moment((ticket as { createdAt?: string })?.createdAt).format('jYYYY/jMM/jDD HH:mm')}
                                         </div>
                                     </div>
                                     <div className='flex mt-6 justify-between text-description'>
                                         <div>{t('ticket.category')}</div>
                                         <div>
-                                            {getMessages.data?.data?.ticket?.category?.title}
+                                            {(ticket as { category?: { title?: string } })?.category?.title}
                                         </div>
                                     </div>
                                     <div className='flex mt-6 justify-between text-description'>
                                         <div>{t('ticket.priority')}</div>
                                         <div>
-                                            {getMessages.data?.data?.ticket?.priority === 'low' ? t('ticket.low') : getMessages.data?.data?.ticket?.priority === 'medium' ? t('ticket.medium') : t('ticket.high')}
+                                            {(ticket as { priority?: string })?.priority === 'low' ? t('ticket.low') : (ticket as { priority?: string })?.priority === 'medium' ? t('ticket.medium') : t('ticket.high')}
                                         </div>
                                     </div>
 
diff --git a/src/pages/ticket/TicketList.tsx b/src/pages/ticket/TicketList.tsx
index e6449ad..b981a8c 100644
--- a/src/pages/ticket/TicketList.tsx
+++ b/src/pages/ticket/TicketList.tsx
@@ -4,75 +4,36 @@ import { Add, Eye } from 'iconsax-react'
 import Tabs from '../../components/Tabs'
 import Table from '../../components/Table'
 import { Link } from 'react-router-dom'
-import { staticTicketsData } from './data/staticData'
 import { t } from '@/locale'
 import moment from 'moment-jalaali'
 import type { ColumnType } from '@/components/types/TableTypes'
 import { Paths } from '@/config/Paths'
-
-// تعریف type برای تیکت
-interface TicketItem {
-    id: string;
-    numericId: string;
-    subject: string;
-    status: string;
-    priority: string;
-    createdAt: string;
-    updatedAt: string;
-    category: {
-        id: string;
-        title: string;
-    };
-    danakService: {
-        id: string;
-        name: string;
-    };
-    user: {
-        id: string;
-        firstName: string;
-        lastName: string;
-    };
-    [key: string]: unknown;
-}
+import { useGetTickets } from './hooks/useTicketData'
+import type { TicketListItemType } from './types/TicketTypes'
 
 const TicketList: FC = () => {
-
     const [activeTab, setActiveTab] = useState<'ANSWERED' | 'PENDING' | 'CLOSED' | ''>('')
+    const getTickets = useGetTickets(activeTab || undefined)
 
-    // استفاده از داده‌های استاتیک
-    const getTickets = {
-        isPending: false,
-        data: staticTicketsData
-    }
+    const tickets: TicketListItemType[] = getTickets.data?.data ?? []
 
-    // تعریف ستون‌های جدول
-    const columns: ColumnType<TicketItem>[] = [
+    const columns: ColumnType<TicketListItemType>[] = [
         {
             title: t('ticket.number'),
-            key: 'numericId',
-            render: (item) => item.numericId
+            key: 'id',
+            render: (item) => item.id.slice(-8).toUpperCase()
         },
         {
             title: t('ticket.title'),
             key: 'subject',
             render: (item) => item.subject
         },
-        {
-            title: t('ticket.category'),
-            key: 'category',
-            render: (item) => item.category?.title
-        },
-        {
-            title: t('ticket.service'),
-            key: 'danakService',
-            render: (item) => item.danakService?.name
-        },
         {
             title: t('ticket.date'),
-            key: 'updatedAt',
+            key: 'createdAt',
             render: (item) => (
                 <div className='dltr text-right'>
-                    {moment(item.updatedAt).format('jYYYY-jMM-jDD HH:mm')}
+                    {moment(item.createdAt).format('jYYYY-jMM-jDD HH:mm')}
                 </div>
             )
         },
@@ -82,9 +43,13 @@ const TicketList: FC = () => {
             render: (item) => t(`ticket.${item.status}`)
         },
         {
-            title: t('ticket.priority'),
-            key: 'priority',
-            render: (item) => t(`ticket.${item.priority}`)
+            title: t('ticket.user_name'),
+            key: 'user',
+            render: (item) => {
+                const u = item.user
+                const name = [u.firstName, u.lastName].filter(Boolean).join(' ') || u.phone || '-'
+                return name
+            }
         },
         {
             title: t('ticket.detail'),
@@ -104,7 +69,7 @@ const TicketList: FC = () => {
                     {t('ticket.tickets')}
                 </div>
 
-                <Link to="/tickets/create">
+                <Link to={Paths.tickets.create}>
                     <Button
                         className='w-[172px]'
                     >
@@ -145,7 +110,7 @@ const TicketList: FC = () => {
 
             <Table
                 columns={columns}
-                data={getTickets.data?.data?.tickets || []}
+                data={tickets}
                 isLoading={getTickets.isPending}
                 noDataMessage="هیچ تیکتی یافت نشد"
             />
diff --git a/src/pages/ticket/hooks/useTicketData.ts b/src/pages/ticket/hooks/useTicketData.ts
index 70ce71d..d9f36e5 100644
--- a/src/pages/ticket/hooks/useTicketData.ts
+++ b/src/pages/ticket/hooks/useTicketData.ts
@@ -1,14 +1,37 @@
 import * as api from "../service/TicketService";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
-import { type AddMessageTicketType, type CreateTicketType } from "../types/TicketTypes";
+import { type AddMessageTicketType, type CreateTicketPayload, type CreateTicketType } from "../types/TicketTypes";
 
-export const useGetTickets = (status: string) => {
+export const useGetTickets = (status?: string) => {
   return useQuery({
-    queryKey: ["tickets", status],
+    queryKey: ["public-tickets", status ?? ""],
     queryFn: () => api.getTickets(status),
   });
 };
 
+/** جزئیات یک تیکت از GET /public/tickets/{id} */
+export const useGetTicketById = (id: string) => {
+  return useQuery({
+    queryKey: ["public-ticket", id],
+    queryFn: () => api.getTicketById(id),
+    enabled: !!id,
+  });
+};
+
+/** ایجاد تیکت جدید (بدون parentId) یا ارسال پیام (با parentId) */
+export const useCreateOrReplyTicket = () => {
+  const queryClient = useQueryClient();
+  return useMutation({
+    mutationFn: (variables: CreateTicketPayload) => api.createOrReplyTicket(variables),
+    onSuccess: (_, variables) => {
+      queryClient.invalidateQueries({ queryKey: ["public-tickets"] });
+      if (variables.parentId) {
+        queryClient.invalidateQueries({ queryKey: ["public-ticket", variables.parentId] });
+      }
+    },
+  });
+};
+
 export const useCreateTicket = () => {
   return useMutation({
     mutationFn: (variables: CreateTicketType) => api.createTicket(variables),
diff --git a/src/pages/ticket/service/TicketService.ts b/src/pages/ticket/service/TicketService.ts
index a67618a..24d659b 100644
--- a/src/pages/ticket/service/TicketService.ts
+++ b/src/pages/ticket/service/TicketService.ts
@@ -1,15 +1,32 @@
-import axios from "../../../config/axios";
-import { type AddMessageTicketType, type CreateTicketType } from "../types/TicketTypes";
+import type { AxiosProgressEvent } from "axios";
+import axios from "@/config/axios";
+import {
+  type AddMessageTicketType,
+  type CreateTicketPayload,
+  type CreateTicketType,
+  type GetTicketsResponseType,
+} from "../types/TicketTypes";
 
-export const getTickets = async (status: string) => {
-  let query = ``;
-  if (status) {
-    query = `?status=${status}`;
-  }
-  const { data } = await axios.get(`/tickets${query}`);
+/** لیست تیکت‌ها - GET /public/tickets */
+export const getTickets = async (status?: string): Promise<GetTicketsResponseType> => {
+  const query = status ? `?status=${status}` : "";
+  const { data } = await axios.get<GetTicketsResponseType>(`/public/tickets${query}`);
   return data;
 };
 
+/** جزئیات یک تیکت - GET /public/tickets/{id} */
+export const getTicketById = async (id: string) => {
+  const { data } = await axios.get(`/public/tickets/${id}`);
+  return data;
+};
+
+/** ایجاد تیکت جدید (بدون parentId) یا ارسال پیام (با parentId) - POST /public/tickets */
+export const createOrReplyTicket = async (params: CreateTicketPayload) => {
+  const { data } = await axios.post('/public/tickets', params);
+  return data;
+};
+
+/** @deprecated استفاده از createOrReplyTicket با/بدون parentId */
 export const createTicket = async (params: CreateTicketType) => {
   const { data } = await axios.post(`/tickets`, params);
   return data;
@@ -25,8 +42,8 @@ export const uploadSingle = async (
   callback?: (value: number) => void
 ) => {
   const { data } = await axios.post(`/uploader/single-file`, params, {
-    onUploadProgress: (progressEvent: any) => {
-      if (progressEvent.bytes) {
+    onUploadProgress: (progressEvent: AxiosProgressEvent) => {
+      if (progressEvent.bytes && progressEvent.total) {
         if (callback) {
           callback(
             Math.round((progressEvent.loaded / progressEvent.total) * 100)
@@ -46,8 +63,8 @@ export const uploadMultiple = async (
   callback?: (value: number) => void
 ) => {
   const { data } = await axios.post(`/uploader/multi-file`, params, {
-    onUploadProgress: (progressEvent: any) => {
-      if (progressEvent.bytes) {
+    onUploadProgress: (progressEvent: AxiosProgressEvent) => {
+      if (progressEvent.bytes && progressEvent.total) {
         if (callback) {
           callback(
             Math.round((progressEvent.loaded / progressEvent.total) * 100)
diff --git a/src/pages/ticket/types/TicketTypes.ts b/src/pages/ticket/types/TicketTypes.ts
index 6120aab..29f0847 100644
--- a/src/pages/ticket/types/TicketTypes.ts
+++ b/src/pages/ticket/types/TicketTypes.ts
@@ -1,3 +1,44 @@
+import type { BaseResponse } from "@/shared/types/Types";
+
+/** کاربر در لیست تیکت (پاسخ GET /public/tickets) */
+export type TicketUserType = {
+  id: string;
+  createdAt: string;
+  deletedAt: string | null;
+  firstName: string | null;
+  lastName: string | null;
+  isActive: boolean;
+  gender: boolean;
+  maxCredit: number;
+  addresse: string | null;
+  phone: string;
+};
+
+/** آیتم تیکت در لیست (پاسخ GET /public/tickets) */
+export type TicketListItemType = {
+  id: string;
+  createdAt: string;
+  deletedAt: string | null;
+  parent: unknown | null;
+  subject: string;
+  content: string;
+  status: string;
+  attachments: unknown[];
+  admin: unknown | null;
+  user: TicketUserType;
+  children: unknown[];
+};
+
+export type GetTicketsResponseType = BaseResponse<TicketListItemType[]>;
+
+/** برای ایجاد تیکت جدید (بدون parentId) یا ارسال پیام (با parentId) */
+export type CreateTicketPayload = {
+  parentId?: string;
+  subject: string;
+  content: string;
+  attachments?: Record<string, unknown>[];
+};
+
 export type CreateTicketType = {
   title: string;
   subject: string;