Merge branch 'fix-effect' into 'next'

Remove conditional to run style logic

See merge request soapbox-pub/soapbox-fe!1142
This commit is contained in:
Justin 2022-03-24 16:34:12 +00:00
commit e0b1abdfc0
3 changed files with 16 additions and 26 deletions

View file

@ -94,7 +94,6 @@ const Account = ({
};
React.useEffect(() => {
if (isOnScreen) {
const style: React.CSSProperties = {};
const actionWidth = actionRef.current?.clientWidth;
@ -105,7 +104,6 @@ const Account = ({
}
setStyle(style);
}
}, [isOnScreen, overflowRef, actionRef]);
if (!account) {

View file

@ -105,19 +105,15 @@ class Followers extends ImmutablePureComponent {
if (accountId === -1 || (!accountIds)) {
return (
<Column>
<Spinner />
</Column>
);
}
if (unavailable) {
return (
<Column>
<div className='empty-column-indicator'>
<FormattedMessage id='empty_column.account_unavailable' defaultMessage='Profile unavailable' />
</div>
</Column>
);
}

View file

@ -105,19 +105,15 @@ class Following extends ImmutablePureComponent {
if (accountId === -1 || (!accountIds)) {
return (
<Column>
<Spinner />
</Column>
);
}
if (unavailable) {
return (
<Column>
<div className='empty-column-indicator'>
<FormattedMessage id='empty_column.account_unavailable' defaultMessage='Profile unavailable' />
</div>
</Column>
);
}