diff --git a/app/apis/common/get-ads.ts b/app/apis/common/get-ads.ts index ddb7026..f99f9b1 100644 --- a/app/apis/common/get-ads.ts +++ b/app/apis/common/get-ads.ts @@ -11,7 +11,7 @@ const adResponseSchema = z.object({ clicked: z.number(), }) const adsResponseSchema = z.object({ - data: z.array(adResponseSchema), + data: z.array(adResponseSchema).nullable(), }) export type TAdResponse = z.infer diff --git a/app/pages/dashboard-advertisements/index.tsx b/app/pages/dashboard-advertisements/index.tsx index 0f7beae..a1690dd 100644 --- a/app/pages/dashboard-advertisements/index.tsx +++ b/app/pages/dashboard-advertisements/index.tsx @@ -111,7 +111,7 @@ export const AdvertisementsPage = () => { { const { data: adsData } = await getAds() const { id } = params - const adData = adsData.find((ads) => ads.id === id) + const adData = adsData?.find((ads) => ads.id === id) return { adData } } diff --git a/app/routes/_news.tsx b/app/routes/_news.tsx index 1b8f307..b8ab27c 100644 --- a/app/routes/_news.tsx +++ b/app/routes/_news.tsx @@ -28,11 +28,13 @@ export const loader = async ({ request }: Route.LoaderArgs) => { const { data: subscribePlanData } = await getSubscribePlan() const { data: categoriesData } = await getCategories() let { data: adsData } = await getAds() - adsData = adsData.filter( - (ad) => - new Date(ad.start_date) <= new Date() && - new Date(ad.end_date) >= new Date(), - ) + if (adsData) { + adsData = adsData?.filter( + (ad) => + new Date(ad.start_date) <= new Date() && + new Date(ad.end_date) >= new Date(), + ) + } return { userData,