part 2

src/components/DefaulModal.tsx

@@ -33,7 +33,7 @@ const DefaulModal: FC<Props> = (props: Props) => {
 
                                     {
                                         props.isHeader && props.title_header &&
-                                        <div className='pb-6 border-b border-white border-opacity-20'>
+                                        <div onClick={props.close} className='pb-6 border-b border-white border-opacity-20'>
                                             <div className='h-[5px] w-[200px] mx-auto bg-[#D1D3D7] rounded-full mb-4 xl:hidden'></div>
                                             <HeaderModal close={props.close} label={props.title_header} />
                                         </div>

src/langs/fa.json

@@ -78,9 +78,9 @@
     "myservice": "سرویس های من",
     "active_service": "سرویس های فعال",
     "ticket": "تیکت ها",
-    "unread_messages": "پیام خوانده نشده دارید ",
+    "unread_messages": "پیام خوانده نشده ",
     "announcement": "اطلاعیه ها",
-    "unread_announcement": "اطلاعیه خوانده نشده دارید",
+    "unread_announcement": "اطلاعیه خوانده نشده",
     "learnings": "آموزش ها",
     "learning": "آموزش",
     "access": "دسترسی سریع",
@@ -88,7 +88,7 @@
     "danak_learning": "آموزش داناک",
     "see_all": "دیدن همه",
     "create_new_access": "ایجاد دسترسی سریع",
-    "receip": "صورتحساب پرداخت نشده دارید",
+    "receip": "صورتحساب پرداخت نشده ",
     "balance": "موجودی",
     "cannot_find_service": "سرویسی پیدا نشد",
     "not_active_service": "شما هنوز سرویس فعالی ندارید"
@@ -176,7 +176,8 @@
     "PENDING": "در انتظار",
     "ANSWERED": "پاسخ داده شده",
     "CLOSED": "بسته شده",
-    "service": "سرویس"
+    "service": "سرویس",
+    "all": "همه"
   },
   "date": "تاریخ",
   "receip": {
@@ -336,14 +337,15 @@
     "enter_sheba_deposit": "مبلغ شبا شده شده را وارد کنید",
     "all_cards": "تمام کارت های عضو شتاب",
     "error_select_price": "لطفا مبلغ مورد نظر خود را انتخاب کنید",
-    "error_min_price": "حداقل مبلغ ۱۰۰ هزار تومان می باشد",
+    "error_min_price": "حداقل مبلغ ۵۰۰ هزار تومان می باشد",
     "transfer_to_getway": "در حال انتقال به درگاه پرداخت",
     "select_bank_account": "انتخاب کارت",
     "successful_transfer": "درخواست انتقال وجه با موفقیت انجام شد",
     "balance": "اعتبار فعلی شما "
   },
   "notif": {
-    "natification": "اعلان ها"
+    "natification": "اعلان ها",
+    "all_read": "پاک کردن همه"
   },
   "profile": {
     "account_user": "حساب کاربری",

src/pages/auth/components/LoginStep2.tsx

@@ -82,6 +82,15 @@ const LoginStep2: FC = () => {
         })
     }
 
+    useEffect(() => {
+
+        if (formik.values.code.length === 5) {
+            formik.handleSubmit()
+        }
+
+    }, [formik.values.code])
+
+
     return (
         <div>
             <div className='mt-5'>

src/pages/financial/components/Legal.tsx

@@ -194,24 +194,24 @@ const Legal: FC = () => {
                                     <div>{t('financial.notice_cannot_edit_legal')}</div>
                                 </div>
 
-                                {
+
-                                    !isReadOnly &&
+                                <div className='mt-8 flex justify-end'>
-                                    <div className='mt-8 flex justify-end'>
+                                    <Button
-                                        <Button
+                                        disabled={isReadOnly}
-                                            className='w-fit px-7'
+                                        className='w-fit px-7'
-                                            onClick={() => formik.handleSubmit()}
+                                        onClick={() => formik.handleSubmit()}
-                                            isLoading={createLegalUser.isPending}
+                                        isLoading={createLegalUser.isPending}
-                                        >
+                                    >
-                                            <div className='flex gap-2 items-center'>
+                                        <div className='flex gap-2 items-center'>
-                                                <TickCircle
+                                            <TickCircle
-                                                    size={24}
+                                                size={24}
-                                                    color='white'
+                                                color='white'
-                                                />
+                                            />
-                                                <div>{t('save')}</div>
+                                            <div>{t('save')}</div>
-                                            </div>
+                                        </div>
-                                        </Button>
+                                    </Button>
-                                    </div>
+                                </div>
-                                }
+
 
                             </div>
                         </div>

src/pages/financial/components/Personal.tsx

@@ -113,12 +113,14 @@ const Personal: FC = () => {
                             ]}
                             {...formik.getFieldProps('gender')}
                             error_text={formik.touched.gender && formik.errors.gender ? formik.errors.gender : ''}
+                            readOnly={isReadOnly}
                         />
 
                         <Input
                             label={t('financial.father_name')}
                             {...formik.getFieldProps('fatherName')}
                             error_text={formik.touched.fatherName && formik.errors.fatherName ? formik.errors.fatherName : ''}
+                            readOnly={isReadOnly}
                         />
                     </div>
 
@@ -148,6 +150,7 @@ const Personal: FC = () => {
                             label={t('financial.nationality')}
                             {...formik.getFieldProps('nationality')}
                             error_text={formik.touched.nationality && formik.errors.nationality ? formik.errors.nationality : ''}
+                            readOnly={isReadOnly}
                         />
                     </div>
 
@@ -204,6 +207,7 @@ const Personal: FC = () => {
                             label={t('financial.company_postal_code')}
                             {...formik.getFieldProps('postalCode')}
                             error_text={formik.touched.postalCode && formik.errors.postalCode ? formik.errors.postalCode : ''}
+                            readOnly={isReadOnly}
                         />
                     </div>
 
@@ -212,6 +216,7 @@ const Personal: FC = () => {
                             {...formik.getFieldProps('address')}
                             error_text={formik.touched.address && formik.errors.address ? formik.errors.address : ''}
                             label={t('financial.address')}
+                            readOnly={isReadOnly}
                         />
                     </div>
 
@@ -228,6 +233,7 @@ const Personal: FC = () => {
                             className='w-fit px-7'
                             onClick={() => formik.handleSubmit()}
                             isLoading={createRealUser.isPending}
+                            disabled={isReadOnly}
                         >
                             <div className='flex gap-2 items-center'>
                                 <TickCircle

src/pages/home/Home.tsx

@@ -9,6 +9,7 @@ import DanakLearning from './components/DanakLearning'
 import { Carousel } from "@material-tailwind/react";
 import { useGetAds } from '../ads/hooks/useAdsData'
 import { AdsDisplayLocation, AdsItemType } from '../ads/types/AdsTypes'
+import { Pages } from '../../config/Pages'
 
 
 const Home: FC = () => {
@@ -63,6 +64,7 @@ const Home: FC = () => {
                         color='#00D16C'
                         count={4}
                         description={t('home.active_service')}
+                        link={Pages.services.mine}
                     />
 
                     <ItemDashboard
@@ -71,6 +73,7 @@ const Home: FC = () => {
                         color='#FF7B00'
                         count={4}
                         description={t('home.unread_messages')}
+                        link={Pages.ticket.list}
                     />
 
                     <ItemDashboard
@@ -79,6 +82,7 @@ const Home: FC = () => {
                         color='#0047FF'
                         count={4}
                         description={t('home.receip')}
+                        link={Pages.receipts.index}
                     />
 
                     <ItemDashboard
@@ -87,6 +91,7 @@ const Home: FC = () => {
                         color='#FF0000'
                         count={4}
                         description={t('home.unread_announcement')}
+                        link={Pages.announcement.list}
                     />
 
                 </div>

src/pages/home/components/ItemDashboard.tsx

@@ -1,17 +1,19 @@
 import { FC, ReactNode } from 'react'
+import { Link } from 'react-router-dom'
 
 type Props = {
     title: string
     icon: ReactNode,
     color: string,
     count: number,
-    description: string
+    description: string,
+    link: string
 }
 
 const ItemDashboard: FC<Props> = (props: Props) => {
 
     return (
-        <div className='p-6 min-w-[40%] xl:min-w-[20%] flex flex-col items-center xl:items-start flex-1 h-[178px] bg-white rounded-3xl'>
+        <Link to={props.link} className='p-6 min-w-[40%] xl:min-w-[20%] flex flex-col items-center xl:items-start flex-1 h-[178px] bg-white rounded-3xl'>
             <div className='size-10 rounded-full bg-[#EEF0F7] flex justify-center items-center'>
                 {props.icon}
             </div>
@@ -28,7 +30,7 @@ const ItemDashboard: FC<Props> = (props: Props) => {
                     </div>
                 </div>
             </div>
-        </div>
+        </Link>
     )
 }
 

src/pages/notification/Notification.tsx

@@ -5,25 +5,31 @@ import { useTranslation } from 'react-i18next';
 import { clx } from '../../helpers/utils';
 import StatusCircle from '../../components/StatusCircle';
 import { useOutsideClick } from '../../hooks/useOutSideClick';
-import { useGetNotification } from './hooks/useNotificationData';
+import { useGetNotification, useReadAll } from './hooks/useNotificationData';
 import { NotificationItemType } from './types/NotificationTypes';
 import { timeAgo } from '../../config/func';
 import InfiniteScroll from 'react-infinite-scroll-component';
 import MoonLoader from "react-spinners/MoonLoader"
+import Button from '../../components/Button';
+import { toast } from 'react-toastify';
 
 const Notifications: FC = () => {
     const { t } = useTranslation('global');
     const ref = useOutsideClick(() => setShowModal(false));
     const [activeTab, setActiveTab] = useState<'all' | 'read' | 'unread'>('all');
     const [showModal, setShowModal] = useState<boolean>(false);
-    const { data, fetchNextPage, hasNextPage, isFetching, isLoading } = useGetNotification();
+    const { data, fetchNextPage, hasNextPage, refetch } = useGetNotification();
-
+    const readAll = useReadAll()
     const posts = data?.pages.flatMap((page) => page.data?.notifications) || [];
 
-    console.log('posts:', posts);
+    const handleAllRead = () => {
-    console.log('hasNextPage:', hasNextPage);
+        readAll.mutate(undefined, {
-    console.log('isFetching:', isFetching);
+            onSuccess: () => {
-    console.log('isLoading:', isLoading);
+                refetch()
+                toast.success(t('success'))
+            }
+        })
+    }
 
     return (
         <div ref={ref}>
@@ -38,6 +44,8 @@ const Notifications: FC = () => {
                         </div>
                     </div>
 
+
+
                     <div className="mt-6 flex h-8 border border-white border-opacity-35 text-xs rounded-lg overflow-hidden">
                         <div
                             onClick={() => setActiveTab('all')}
@@ -68,6 +76,18 @@ const Notifications: FC = () => {
                         </div>
                     </div>
 
+                    <div className='flex mt-4 justify-end'>
+                        <Button
+                            isLoading={readAll.isPending}
+                            onClick={handleAllRead}
+                            className={clx(
+                                'flex-1 border bg-transparent text-xs h-7 rounded-md cursor-pointer text-white border-white border-opacity-70 flex justify-center items-center',
+                            )}
+                        >
+                            {t('notif.all_read')}
+                        </Button>
+                    </div>
+
                     <div className="mt-6 flex flex-col gap-4 text-xs overflow-auto">
                         <InfiniteScroll
                             dataLength={posts.length}

src/pages/notification/hooks/useNotificationData.ts

@@ -1,5 +1,5 @@
 import * as api from "../service/NotificationService";
-import { useInfiniteQuery } from "@tanstack/react-query";
+import { useInfiniteQuery, useMutation } from "@tanstack/react-query";
 
 export const useGetNotification = () => {
   return useInfiniteQuery({
@@ -15,3 +15,9 @@ export const useGetNotification = () => {
     },
   });
 };
+
+export const useReadAll = () => {
+  return useMutation({
+    mutationFn: (_) => api.readAll(),
+  });
+};

src/pages/notification/service/NotificationService.ts

@@ -4,3 +4,8 @@ export const getNotifications = async (page: number) => {
   const { data } = await axios.get(`/notifications?page=${page}`);
   return data;
 };
+
+export const readAll = async () => {
+  const { data } = await axios.patch(`/notifications/read-all`);
+  return data;
+};

src/pages/ticket/TicketList.tsx

@@ -1,7 +1,7 @@
 import { FC, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import Button from '../../components/Button'
-import { Add, Eye, MessageRemove, MessageTick, MessageTime } from 'iconsax-react'
+import { Add, Eye, MessageRemove, Messages1, MessageTick, MessageTime } from 'iconsax-react'
 import Tabs from '../../components/Tabs'
 import Td from '../../components/Td'
 import { Link } from 'react-router-dom'
@@ -12,7 +12,7 @@ import moment from 'moment-jalaali'
 const TicketList: FC = () => {
 
     const { t } = useTranslation('global')
-    const [activeTab, setActiveTab] = useState<'ANSWERED' | 'PENDING' | 'CLOSED'>('PENDING')
+    const [activeTab, setActiveTab] = useState<'ANSWERED' | 'PENDING' | 'CLOSED' | ''>('')
     const getTickets = useGetTickets(activeTab)
 
     return (
@@ -40,6 +40,11 @@ const TicketList: FC = () => {
                 <Tabs
                     active={activeTab}
                     items={[
+                        {
+                            icon: <Messages1 color={activeTab === '' ? 'black' : '#8C90A3'} size={22} />,
+                            label: t('ticket.all'),
+                            value: ''
+                        },
                         {
                             icon: <MessageTime color={activeTab === 'PENDING' ? 'black' : '#8C90A3'} size={22} />,
                             label: t('ticket.checking'),
@@ -50,11 +55,6 @@ const TicketList: FC = () => {
                             label: t('ticket.answered'),
                             value: 'ANSWERED'
                         },
-                        // {
-                        //     icon: <Message2 color={activeTab === 'wating' ? 'black' : '#8C90A3'} size={22} />,
-                        //     label: t('ticket.wait_answered'),
-                        //     value: 'wating'
-                        // },
                         {
                             icon: <MessageRemove color={activeTab === 'CLOSED' ? 'black' : '#8C90A3'} size={22} />,
                             label: t('ticket.closed'),

src/pages/ticket/service/TicketService.ts

@@ -2,7 +2,11 @@ import axios from "../../../config/axios";
 import { AddMessageTicketType, CreateTicketType } from "../types/TicketTypes";
 
 export const getTickets = async (status: string) => {
-  const { data } = await axios.get(`/tickets?status=${status}`);
+  let query = ``;
+  if (status) {
+    query = `?status=${status}`;
+  }
+  const { data } = await axios.get(`/tickets${query}`);
   return data;
 };
 

src/pages/wallet/components/CardtoCard.tsx

@@ -12,6 +12,7 @@ import * as Yup from 'yup'
 import { useSingleUpload } from '../../ticket/hooks/useTicketData'
 import { toast } from 'react-toastify'
 import { ErrorType } from '../../../helpers/types'
+import { TickCircle } from 'iconsax-react'
 
 const CardtoCard: FC = () => {
 
@@ -98,11 +99,18 @@ const CardtoCard: FC = () => {
 
                         <div className='mt-10 flex justify-end'>
                             <Button
-                                label={t('wallet.submit_slip')}
                                 className='w-[180px]'
                                 onClick={() => formik.handleSubmit()}
                                 isLoading={depositTransfer.isPending || upload.isPending}
-                            />
+                            >
+                                <div className='flex gap-2 items-center'>
+                                    <TickCircle
+                                        size={24}
+                                        color='white'
+                                    />
+                                    <div>{t('wallet.submit_slip')}</div>
+                                </div>
+                            </Button>
                         </div>
 
                     </Fragment>

src/pages/wallet/components/Online.tsx

@@ -7,8 +7,9 @@ import { useGetGetWays, usePayment } from '../hooks/useWalletData'
 import { toast } from 'react-toastify'
 import { ErrorType } from '../../../helpers/types'
 import { GatewayItemType } from '../types/WalletTypes'
+import { TickCircle } from 'iconsax-react'
 
-const defaultAmounts = [100000, 200000, 500000, 1000000, 2000000, 5000000, 10000000]
+const defaultAmounts = [500000, 1000000, 3000000, 5000000, 8000000, 10000000];
 
 const Online: FC = () => {
 
@@ -24,7 +25,7 @@ const Online: FC = () => {
             toast.error(t('wallet.error_select_price'))
         } else {
             const amout = desiredAmount === 0 ? amountSelected : desiredAmount
-            if (amout < 100000) {
+            if (amout < 500000) {
                 toast.error(t('wallet.error_min_price'))
                 return
             } else {
@@ -103,11 +104,20 @@ const Online: FC = () => {
 
                 <div className='mt-10 flex justify-end'>
                     <Button
-                        label={t('wallet.pay')}
                         className='w-[180px]'
                         onClick={handlePay}
                         isLoading={payment.isPending}
-                    />
+                    >
+                        <div className='flex gap-2 items-center'>
+                            <TickCircle
+                                size={24}
+                                color='white'
+                            />
+                            <div>{t('wallet.pay')}</div>
+                        </div>
+                    </Button>
+
+
                 </div>
             </div>
         </div>

src/pages/wallet/components/Sheba.tsx

@@ -12,6 +12,7 @@ import * as Yup from 'yup'
 import { useSingleUpload } from '../../ticket/hooks/useTicketData'
 import { toast } from 'react-toastify'
 import { ErrorType } from '../../../helpers/types'
+import { TickCircle } from 'iconsax-react'
 
 const CardtoCard: FC = () => {
 
@@ -99,11 +100,18 @@ const CardtoCard: FC = () => {
 
                         <div className='mt-10 flex justify-end'>
                             <Button
-                                label={t('wallet.submit_slip')}
                                 className='w-[180px]'
                                 onClick={() => formik.handleSubmit()}
                                 isLoading={depositTransfer.isPending || upload.isPending}
-                            />
+                            >
+                                <div className='flex gap-2 items-center'>
+                                    <TickCircle
+                                        size={24}
+                                        color='white'
+                                    />
+                                    <div>{t('wallet.submit_slip')}</div>
+                                </div>
+                            </Button>
                         </div>
 
                     </Fragment>

src/shared/Header.tsx

@@ -101,7 +101,7 @@ const Header: FC = () => {
                                             isActive
                                             isWithoutLine
                                         />
-                                        <div className='flex items-center mt-4 h-8 pl-2 rounded-full bg-[#EEF0F7]'>
+                                        <div className='flex xl:hidden items-center mt-4 h-8 pl-2 rounded-full bg-[#EEF0F7]'>
                                             <div className='ps-3'>{t('home.balance')}</div>
                                             <div className='px-3 text-xs'>
                                                 {NumberFormat(getWalletBalance.data?.data?.balance) + ' ' + t('toman')}