Merge branch 'bugfixes' into 'develop'

ProfilePage: don't load account note panel until account is loaded

Closes #1514

See merge request soapbox-pub/soapbox!2677

app/soapbox/features/ui/components/profile-familiar-followers.tsx

@@ -44,7 +44,7 @@ const ProfileFamiliarFollowers: React.FC<IProfileFamiliarFollowers> = ({ account
   }
 
   const accounts: Array<React.ReactNode> = familiarFollowers.map(account => !!account && (
-    <HoverRefWrapper accountId={account.id} inline>
+    <HoverRefWrapper accountId={account.id} key={account.id} inline>
       <Link className='mention inline-block' to={`/@${account.acct}`}>
         <HStack space={1} alignItems='center' grow>
           <Text
@@ -53,17 +53,16 @@ const ProfileFamiliarFollowers: React.FC<IProfileFamiliarFollowers> = ({ account
             truncate
             dangerouslySetInnerHTML={{ __html: account.display_name_html }}
           />
-          {/* <span dangerouslySetInnerHTML={{ __html: account.display_name_html }} /> */}
 
           {account.verified && <VerificationBadge />}
         </HStack>
       </Link>
     </HoverRefWrapper>
-  )).toArray();
+  )).toArray().filter(Boolean);
 
   if (familiarFollowerIds.size > 2) {
     accounts.push(
-      <span className='cursor-pointer hover:underline' role='presentation' onClick={openFamiliarFollowersModal}>
+      <span key='_' className='cursor-pointer hover:underline' role='presentation' onClick={openFamiliarFollowersModal}>
         <FormattedMessage
           id='account.familiar_followers.more'
           defaultMessage='{count, plural, one {# other} other {# others}} you follow'
@@ -76,7 +75,7 @@ const ProfileFamiliarFollowers: React.FC<IProfileFamiliarFollowers> = ({ account
   return (
     <HStack space={2} alignItems='center'>
       <AvatarStack accountIds={familiarFollowerIds} />
-      <Text theme='muted' size='sm'>
+      <Text theme='muted' size='sm' tag='div'>
         <FormattedMessage
           id='account.familiar_followers'
           defaultMessage='Followed by {accounts}'

app/soapbox/pages/profile-page.tsx

@@ -119,7 +119,7 @@ const ProfilePage: React.FC<IProfilePage> = ({ params, children }) => {
           </BundleContainer>
         )}
 
-        {features.notes && me !== account?.id && (
+        {features.notes && account && account?.id !== me && (
           <BundleContainer fetchComponent={AccountNotePanel}>
             {Component => <Component account={account} />}
           </BundleContainer>