Skip to content
This repository has been archived by the owner on Oct 11, 2022. It is now read-only.

Commit

Permalink
Merge pull request #3988 from withspectrum/2.4.41
Browse files Browse the repository at this point in the history
2.4.41
  • Loading branch information
brianlovin authored Oct 2, 2018
2 parents 372d377 + 7278631 commit 09fc604
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 15 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Spectrum",
"version": "2.4.40",
"version": "2.4.41",
"license": "BSD-3-Clause",
"devDependencies": {
"babel-cli": "^6.24.1",
Expand Down
32 changes: 18 additions & 14 deletions src/views/dashboard/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,21 +35,25 @@ import {
import { track, events } from 'src/helpers/analytics';
import { ErrorBoundary } from 'src/components/error';

const EverythingThreadFeed = compose(connect(), getEverythingThreads)(
DashboardThreadFeed
);
const EverythingThreadFeed = compose(
connect(),
getEverythingThreads
)(DashboardThreadFeed);

const CommunityThreadFeed = compose(connect(), getCommunityThreads)(
DashboardThreadFeed
);
const CommunityThreadFeed = compose(
connect(),
getCommunityThreads
)(DashboardThreadFeed);

const ChannelThreadFeed = compose(connect(), getChannelThreadConnection)(
DashboardThreadFeed
);
const ChannelThreadFeed = compose(
connect(),
getChannelThreadConnection
)(DashboardThreadFeed);

const SearchThreadFeed = compose(connect(), searchThreadsQuery)(
DashboardThreadFeed
);
const SearchThreadFeed = compose(
connect(),
searchThreadsQuery
)(DashboardThreadFeed);

type State = {
activeChannelObject: ?Object,
Expand Down Expand Up @@ -105,8 +109,8 @@ class Dashboard extends React.Component<Props, State> {
const { title, description } = generateMetaInfo();

if (user) {
// if the user has set a username but hasn't joined any communities yet, we have nothing to show them on the dashboard. So instead just render the onboarding step to upsell popular communities to join
if (user.username && user.communityConnection.edges.length === 0) {
// if the user hasn't joined any communities yet, we have nothing to show them on the dashboard. So instead just render the onboarding step to upsell popular communities to join
if (user.communityConnection.edges.length === 0) {
return (
<NewUserOnboarding
noCloseButton
Expand Down

0 comments on commit 09fc604

Please sign in to comment.