Merge branch 'fix-follow-relationship' into 'develop'

Fix follow notifications not having relationship

Closes #1446

See merge request soapbox-pub/soapbox!2578

app/soapbox/containers/account-container.tsx

@@ -5,10 +5,11 @@ import Account, { IAccount } from 'soapbox/components/account';
 
 interface IAccountContainer extends Omit<IAccount, 'account'> {
   id: string
+  withRelationship?: boolean
 }
 
-const AccountContainer: React.FC<IAccountContainer> = ({ id, ...props }) => {
+const AccountContainer: React.FC<IAccountContainer> = ({ id, withRelationship, ...props }) => {
-  const { account } = useAccount(id);
+  const { account } = useAccount(id, { withRelationship });
 
   return (
     <Account account={account!} {...props} />

app/soapbox/features/notifications/components/notification.tsx

@@ -304,6 +304,7 @@ const Notification: React.FC<INotificaton> = (props) => {
             id={account.id}
             hidden={hidden}
             avatarSize={avatarSize}
+            withRelationship
           />
         ) : null;
       case 'follow_request':
@@ -313,6 +314,7 @@ const Notification: React.FC<INotificaton> = (props) => {
             hidden={hidden}
             avatarSize={avatarSize}
             actionType='follow_request'
+            withRelationship
           />
         ) : null;
       case 'move':
@@ -321,6 +323,7 @@ const Notification: React.FC<INotificaton> = (props) => {
             id={notification.target.id}
             hidden={hidden}
             avatarSize={avatarSize}
+            withRelationship
           />
         ) : null;
       case 'favourite':