diff --git a/packages/pl-fe/src/api/hooks/admin/useAnnouncements.ts b/packages/pl-fe/src/api/hooks/admin/useAnnouncements.ts index 43eaf91240..a17eebc1cf 100644 --- a/packages/pl-fe/src/api/hooks/admin/useAnnouncements.ts +++ b/packages/pl-fe/src/api/hooks/admin/useAnnouncements.ts @@ -25,7 +25,7 @@ const useAnnouncements = () => { const result = useQuery>({ queryKey: ['admin', 'announcements'], queryFn: getAnnouncements, - placeholderData: [], + placeholderData: [] as ReadonlyArray, }); const { diff --git a/packages/pl-fe/src/features/admin/announcements.tsx b/packages/pl-fe/src/features/admin/announcements.tsx index fe1473bd71..772c135611 100644 --- a/packages/pl-fe/src/features/admin/announcements.tsx +++ b/packages/pl-fe/src/features/admin/announcements.tsx @@ -88,7 +88,7 @@ const Announcements: React.FC = () => { const intl = useIntl(); const { openModal } = useModalsStore(); - const { data: announcements, isLoading } = useAnnouncements(); + const { data: announcements, isLoading, isPending } = useAnnouncements(); const handleCreateAnnouncement = () => { openModal('EDIT_ANNOUNCEMENT'); @@ -112,7 +112,7 @@ const Announcements: React.FC = () => { emptyMessage={emptyMessage} itemClassName='py-3 first:pt-0 last:pb-0' isLoading={isLoading} - showLoading={isLoading && !announcements?.length} + showLoading={isLoading && isPending} > {announcements!.map((announcement) => (