sforkowany z mirror/soapbox
Merge branch 'follow-button-fix' into 'develop'
Notification: treat follow differently from follow_request Closes #1055 See merge request soapbox-pub/soapbox-fe!1694react-query-api
commit
30ec3dbd9f
|
@ -270,6 +270,14 @@ const Notification: React.FC<INotificaton> = (props) => {
|
|||
const renderContent = () => {
|
||||
switch (type) {
|
||||
case 'follow':
|
||||
case 'user_approved':
|
||||
return account && typeof account === 'object' ? (
|
||||
<AccountContainer
|
||||
id={account.id}
|
||||
hidden={hidden}
|
||||
avatarSize={48}
|
||||
/>
|
||||
) : null;
|
||||
case 'follow_request':
|
||||
return account && typeof account === 'object' ? (
|
||||
<AccountContainer
|
||||
|
@ -279,14 +287,6 @@ const Notification: React.FC<INotificaton> = (props) => {
|
|||
actionType='follow_request'
|
||||
/>
|
||||
) : null;
|
||||
case 'user_approved':
|
||||
return account && typeof account === 'object' ? (
|
||||
<AccountContainer
|
||||
id={account.id}
|
||||
hidden={hidden}
|
||||
avatarSize={48}
|
||||
/>
|
||||
) : null;
|
||||
case 'move':
|
||||
return account && typeof account === 'object' && notification.target && typeof notification.target === 'object' ? (
|
||||
<AccountContainer
|
||||
|
|
Ładowanie…
Reference in New Issue