diff --git a/app/soapbox/pages/home_page.js b/app/soapbox/pages/home_page.js
index b39403c2f..5ed036719 100644
--- a/app/soapbox/pages/home_page.js
+++ b/app/soapbox/pages/home_page.js
@@ -86,9 +86,9 @@ class HomePage extends ImmutablePureComponent {
+ {me ?
:
}
{showTrendsPanel &&
}
{showWhoToFollowPanel &&
}
- {me ?
:
}
diff --git a/app/soapbox/pages/remote_instance_page.js b/app/soapbox/pages/remote_instance_page.js
index bf2b9f04c..b1a86ba9a 100644
--- a/app/soapbox/pages/remote_instance_page.js
+++ b/app/soapbox/pages/remote_instance_page.js
@@ -1,12 +1,9 @@
import React from 'react';
import { connect } from 'react-redux';
import ImmutablePureComponent from 'react-immutable-pure-component';
-import WhoToFollowPanel from 'soapbox/features/ui/components/who_to_follow_panel';
-import TrendsPanel from 'soapbox/features/ui/components/trends_panel';
import PromoPanel from 'soapbox/features/ui/components/promo_panel';
import FeaturesPanel from 'soapbox/features/ui/components/features_panel';
import LinkFooter from 'soapbox/features/ui/components/link_footer';
-import { getFeatures } from 'soapbox/utils/features';
import InstanceInfoPanel from 'soapbox/features/ui/components/instance_info_panel';
import InstanceModerationPanel from 'soapbox/features/ui/components/instance_moderation_panel';
import { federationRestrictionsDisclosed } from 'soapbox/utils/state';
@@ -15,12 +12,9 @@ import { isAdmin } from 'soapbox/utils/accounts';
const mapStateToProps = state => {
const me = state.get('me');
const account = state.getIn(['accounts', me]);
- const features = getFeatures(state.get('instance'));
return {
me,
- showTrendsPanel: features.trends,
- showWhoToFollowPanel: features.suggestions,
disclosed: federationRestrictionsDisclosed(state),
isAdmin: isAdmin(account),
};
@@ -30,7 +24,7 @@ export default @connect(mapStateToProps)
class RemoteInstancePage extends ImmutablePureComponent {
render() {
- const { me, children, showTrendsPanel, showWhoToFollowPanel, params: { instance: host }, disclosed, isAdmin } = this.props;
+ const { me, children, params: { instance: host }, disclosed, isAdmin } = this.props;
return (
@@ -52,8 +46,6 @@ class RemoteInstancePage extends ImmutablePureComponent {
- {showTrendsPanel &&
}
- {showWhoToFollowPanel &&
}
{me &&
}