Merge pull request #3219 from yakotika/alpha

Refactoring

Author: mxstbr

src/views/community/index.js

@@ -124,7 +124,7 @@ class CommunityView extends React.Component<Props, State> {
 
     const isNewAndOwned =
       community.communityPermissions.isOwner && community.metaData.members < 2;
-    return this.setState({ showComposerUpsell: isNewAndOwned ? true : false });
+    return this.setState({ showComposerUpsell: isNewAndOwned });
   };
 
   handleSegmentClick = label => {

src/views/dashboard/index.js

@@ -112,23 +112,12 @@ class Dashboard extends React.Component<Props, State> {
     } = this.props;
     const { activeChannelObject } = this.state;
 
-    let searchFilter = {};
-    if (activeChannel) {
-      searchFilter.everythingFeed = false;
-      searchFilter.communityId = null;
-      searchFilter.creatorId = null;
-      searchFilter.channelId = activeChannel;
-    } else if (activeCommunity) {
-      searchFilter.everythingFeed = false;
-      searchFilter.channelId = null;
-      searchFilter.creatorId = null;
-      searchFilter.communityId = activeCommunity;
-    } else {
-      searchFilter.channelId = null;
-      searchFilter.communityId = null;
-      searchFilter.creatorId = null;
-      searchFilter.everythingFeed = false;
-    }
+    const searchFilter = {
+      everythingFeed: false,
+      creatorId: null,
+      channelId: activeChannel || null,
+      communityId: activeChannel ? null : activeCommunity || null
+    };
     const { title, description } = generateMetaInfo();
 
     if (user) {
@@ -145,9 +134,9 @@ class Dashboard extends React.Component<Props, State> {
 
       // at this point we have succesfully validated a user, and the user has both a username and joined communities - we can show their thread feed!
       const communities = user.communityConnection.edges.map(c => c && c.node);
-      const activeCommunityObject = communities.filter(
+      const activeCommunityObject = communities.find(
         c => c && c.id === activeCommunity
-      )[0];
+      );
 
       return (
         <DashboardWrapper data-cy="inbox-view" id="main">

src/views/pages/terms/index.js

@@ -13,8 +13,7 @@ import {
 import { PrivacyTermsList } from './style';
 
 class Terms extends React.Component<{}> {
-  componentDidMount() {}
-
+  
   render() {
     return (
       <Wrapper data-cy="terms-page">