Commit d3685610 authored by Ben Wheeler's avatar Ben Wheeler

fix logic for when to show intro to users

parent 8827fca1
...@@ -165,6 +165,13 @@ class Splash extends React.Component { ...@@ -165,6 +165,13 @@ class Splash extends React.Component {
shouldShowHOCMiddleBanner () { shouldShowHOCMiddleBanner () {
return false; // we did not use this middle banner in last HoC return false; // we did not use this middle banner in last HoC
} }
shouldShowIntro () {
return (
this.props.sessionStatus === sessionActions.Status.FETCHED && // done fetching session
Object.keys(this.props.user).length === 0 && // no user session found
this.shouldShowHOCTopBanner() !== true
);
}
shouldShowDonateBanner () { shouldShowDonateBanner () {
return ( return (
this.state.dismissedDonateBanner === false && this.state.dismissedDonateBanner === false &&
...@@ -180,7 +187,7 @@ class Splash extends React.Component { ...@@ -180,7 +187,7 @@ class Splash extends React.Component {
const showDonateBanner = this.shouldShowDonateBanner() || false; const showDonateBanner = this.shouldShowDonateBanner() || false;
const showHOCTopBanner = this.shouldShowHOCTopBanner() || false; const showHOCTopBanner = this.shouldShowHOCTopBanner() || false;
const showHOCMiddleBanner = this.shouldShowHOCMiddleBanner() || false; const showHOCMiddleBanner = this.shouldShowHOCMiddleBanner() || false;
const showIntro = showHOCTopBanner !== true; const showIntro = this.shouldShowIntro() || false;
const showWelcome = this.shouldShowWelcome(); const showWelcome = this.shouldShowWelcome();
const homepageRefreshStatus = this.getHomepageRefreshStatus(); const homepageRefreshStatus = this.getHomepageRefreshStatus();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment