From b787b4cca7cf74eca4b3df0c94bb56f098f5f947 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Thu, 14 Sep 2023 13:38:43 -0500 Subject: [PATCH 1/3] ProfileFamiliarFollowers: add `key` prop, fix console error --- .../features/ui/components/profile-familiar-followers.tsx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/soapbox/features/ui/components/profile-familiar-followers.tsx b/app/soapbox/features/ui/components/profile-familiar-followers.tsx index 56023f42a5..bac65eb9db 100644 --- a/app/soapbox/features/ui/components/profile-familiar-followers.tsx +++ b/app/soapbox/features/ui/components/profile-familiar-followers.tsx @@ -44,7 +44,7 @@ const ProfileFamiliarFollowers: React.FC = ({ account } const accounts: Array = familiarFollowers.map(account => !!account && ( - + = ({ account truncate dangerouslySetInnerHTML={{ __html: account.display_name_html }} /> - {/* */} {account.verified && } - )).toArray(); + )).toArray().filter(Boolean); if (familiarFollowerIds.size > 2) { accounts.push( - + Date: Thu, 14 Sep 2023 13:45:09 -0500 Subject: [PATCH 2/3] ProfilePage: don't load account note panel until account is loaded Fixes https://gitlab.com/soapbox-pub/soapbox/-/issues/1514 --- app/soapbox/pages/profile-page.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/soapbox/pages/profile-page.tsx b/app/soapbox/pages/profile-page.tsx index 698edff77b..b9d6a33814 100644 --- a/app/soapbox/pages/profile-page.tsx +++ b/app/soapbox/pages/profile-page.tsx @@ -119,7 +119,7 @@ const ProfilePage: React.FC = ({ params, children }) => { )} - {features.notes && me !== account?.id && ( + {features.notes && account && account?.id !== me && ( {Component => } From 1e3b89ad135227c64dbae9ff6f7d5f6b8cd53f00 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Thu, 14 Sep 2023 13:48:21 -0500 Subject: [PATCH 3/3] ProfileFamiliarFollowers: use a div for the text element, fix console error --- .../features/ui/components/profile-familiar-followers.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/soapbox/features/ui/components/profile-familiar-followers.tsx b/app/soapbox/features/ui/components/profile-familiar-followers.tsx index bac65eb9db..9a19b525d1 100644 --- a/app/soapbox/features/ui/components/profile-familiar-followers.tsx +++ b/app/soapbox/features/ui/components/profile-familiar-followers.tsx @@ -75,7 +75,7 @@ const ProfileFamiliarFollowers: React.FC = ({ account return ( - +