From c6ec2e50d5f7f107bd64c117ae14fd3f031194c0 Mon Sep 17 00:00:00 2001 From: Eric Frias Date: Wed, 5 Nov 2025 16:11:28 -0500 Subject: [PATCH 1/2] Update submodules: - haf: release/1.28.3 (a4daf3db6b8cfa6e0bf5a9bffd1550db3f65c118) --- .gitlab-ci.yml | 2 +- haf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ea313a0c6..c67c025cf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,7 @@ include: - '/templates/docker_image_jobs.gitlab-ci.yml' - '/templates/cache_cleanup.gitlab-ci.yml' - project: 'hive/haf' - ref: 5e15be4e8351e096ee436dcc8294ea4c7bed4bac #develop + ref: a4daf3db6b8cfa6e0bf5a9bffd1550db3f65c118 #develop file: '/scripts/ci-helpers/prepare_data_image_job.yml' - project: 'hive/haf_api_node' ref: denser-11 diff --git a/haf b/haf index 5e15be4e8..a4daf3db6 160000 --- a/haf +++ b/haf @@ -1 +1 @@ -Subproject commit 5e15be4e8351e096ee436dcc8294ea4c7bed4bac +Subproject commit a4daf3db6b8cfa6e0bf5a9bffd1550db3f65c118 -- GitLab From 96999716f62be9ca1b405935fed5c7418b7bc08f Mon Sep 17 00:00:00 2001 From: jlachor Date: Fri, 7 Nov 2025 12:08:06 +0100 Subject: [PATCH 2/2] Add toast error handling instead of replacing page --- apps/blog/components/main-page.tsx | 11 ++++++++++- apps/blog/feature/account-profile/main-page.tsx | 11 ++++++++++- apps/blog/pages/[param]/feed.tsx | 10 +++++++++- apps/blog/pages/roles/[param].tsx | 15 ++++++++++++--- 4 files changed, 41 insertions(+), 6 deletions(-) diff --git a/apps/blog/components/main-page.tsx b/apps/blog/components/main-page.tsx index 1ff505c98..ef49bd201 100644 --- a/apps/blog/components/main-page.tsx +++ b/apps/blog/components/main-page.tsx @@ -22,6 +22,7 @@ import NoDataError from '@/blog/components/no-data-error'; import { PageType } from '@/blog/pages/[...param]'; import { Preferences } from '@/blog/lib/utils'; import PostCardSkeleton from '@hive/ui/components/card-skeleton'; +import { toast } from '@ui/components/hooks/use-toast'; const validSorts = ['trending', 'hot', 'created', 'payout', 'payout_comments', 'muted']; @@ -171,7 +172,15 @@ const MainPage = ({ fetchNextPage(); } }, [fetchNextPage, hasNextPage, inView]); - if (isError) return ; + + useEffect(() => { + if (isError) + toast({ + variant: 'destructive', + title: 'Error fetching your data', + description: 'Bad internet connection or troubles with API' + }); + }, [isError]) return ( <> diff --git a/apps/blog/feature/account-profile/main-page.tsx b/apps/blog/feature/account-profile/main-page.tsx index d734a220c..58c8be4e5 100644 --- a/apps/blog/feature/account-profile/main-page.tsx +++ b/apps/blog/feature/account-profile/main-page.tsx @@ -14,6 +14,7 @@ import { MetadataProps } from '@/blog/lib/get-translations'; import NoDataError from '@/blog/components/no-data-error'; import { Preferences } from '@/blog/lib/utils'; import PostCardSkeleton from '@hive/ui/components/card-skeleton'; +import { toast } from '@ui/components/hooks/use-toast'; const AccountProfileMainPage = ({ metadata, @@ -52,7 +53,15 @@ const AccountProfileMainPage = ({ } }, [fetchNextPage, hasNextPage, inView]); - if (isError) return ; + useEffect(() => { + if (isError) + toast({ + variant: 'destructive', + title: 'Error fetching your data', + description: 'Bad internet connection or troubles with API' + }); + }, [isError]) + return ( <> diff --git a/apps/blog/pages/[param]/feed.tsx b/apps/blog/pages/[param]/feed.tsx index 1ccde5a4c..cad54ffc7 100644 --- a/apps/blog/pages/[param]/feed.tsx +++ b/apps/blog/pages/[param]/feed.tsx @@ -21,6 +21,7 @@ import { DEFAULT_PREFERENCES, Preferences } from '@/blog/lib/utils'; import { useLocalStorage } from 'usehooks-ts'; import PostCardSkeleton from '@ui/components/card-skeleton'; import {commonVariables} from'@ui/lib/common-variables'; +import { toast } from '@ui/components/hooks/use-toast'; export const getServerSideProps: GetServerSideProps = getDefaultProps; @@ -79,7 +80,14 @@ const FeedPage: FC = () => { } }, [accountFetchNextPage, accountHasNextPage, inViewAcc]); - if (accountEntriesIsError || mySubsIsError) return ; + useEffect(() => { + if (accountEntriesIsError || mySubsIsError) + toast({ + variant: 'destructive', + title: 'Error fetching your data', + description: 'Bad internet connection or troubles with API' + }); + }, [accountEntriesIsError, mySubsIsError]) if (accountEntriesIsLoading && accountEntriesIsFetching) { return ; diff --git a/apps/blog/pages/roles/[param].tsx b/apps/blog/pages/roles/[param].tsx index 02569eb03..4f1505583 100644 --- a/apps/blog/pages/roles/[param].tsx +++ b/apps/blog/pages/roles/[param].tsx @@ -1,4 +1,4 @@ -import { FC } from 'react'; +import { FC, useEffect } from 'react'; import { useQuery } from '@tanstack/react-query'; import { useRouter } from 'next/router'; import { GetServerSideProps } from 'next'; @@ -14,6 +14,7 @@ import { getRoleValue, Roles, rolesLevels } from '@/blog/feature/community-roles import CommunityLayout from '@/blog/feature/community-layout/community-layout'; import TableItem from '@/blog/feature/community-roles/table-item'; import NoDataError from '@/blog/components/no-data-error'; +import { toast } from '@ui/components/hooks/use-toast'; const RolesPage: FC<{ metadata: MetadataProps }> = ({ metadata }) => { const router = useRouter(); @@ -55,7 +56,15 @@ const RolesPage: FC<{ metadata: MetadataProps }> = ({ metadata }) => { }; if (isLoading) return ; - if (isError) return ; + useEffect(() => { + if (isError) + toast({ + variant: 'destructive', + title: 'Error fetching your data', + description: 'Bad internet connection or troubles with API' + }); + }, [isError]) + return ( <> @@ -78,7 +87,7 @@ const RolesPage: FC<{ metadata: MetadataProps }> = ({ metadata }) => { - {data.map((e) => ( + {data?.map((e) => ( ))} -- GitLab