From eb9abd23a07138bb8923ac691469ebf1b0bde3b5 Mon Sep 17 00:00:00 2001
From: Benjamin Wheeler <wheeler.benjamin@gmail.com>
Date: Tue, 25 Sep 2018 00:52:23 -0400
Subject: [PATCH] fixed errors in splash page that appear in develop (#2077)

---
 src/redux/splash.js               | 20 ++++++++++----------
 src/views/splash/presentation.jsx |  3 +--
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/redux/splash.js b/src/redux/splash.js
index 65840ddec..e617dfe8c 100644
--- a/src/redux/splash.js
+++ b/src/redux/splash.js
@@ -77,13 +77,13 @@ module.exports.getActivity = (username, token) => (dispatch => {
     api({
         uri: `/users/${username}/following/users/activity?limit=5`,
         authentication: token
-    }, (err, body) => {
+    }, (err, body, res) => {
         if (err) {
             dispatch(module.exports.setFetchStatus('activity', module.exports.Status.ERROR));
             dispatch(module.exports.setError(err));
             return;
         }
-        if (typeof body === 'undefined') {
+        if (typeof body === 'undefined' || res.statusCode !== 200) {
             dispatch(module.exports.setFetchStatus('activity', module.exports.Status.ERROR));
             dispatch(module.exports.setError('No session content'));
             return;
@@ -100,13 +100,13 @@ module.exports.getFeaturedGlobal = () => (dispatch => {
     dispatch(module.exports.setFetchStatus('featured', module.exports.Status.FETCHING));
     api({
         uri: '/proxy/featured'
-    }, (err, body) => {
+    }, (err, body, res) => {
         if (err) {
             dispatch(module.exports.setFetchStatus('featured', module.exports.Status.ERROR));
             dispatch(module.exports.setError(err));
             return;
         }
-        if (typeof body === 'undefined') {
+        if (typeof body === 'undefined' || res.statusCode !== 200) {
             dispatch(module.exports.setFetchStatus('featured', module.exports.Status.ERROR));
             dispatch(module.exports.setError('No session content'));
             return;
@@ -126,13 +126,13 @@ module.exports.getSharedByFollowing = (username, token) => (dispatch => {
     api({
         uri: `/users/${username}/following/users/projects`,
         authentication: token
-    }, (err, body) => {
+    }, (err, body, res) => {
         if (err) {
             dispatch(module.exports.setFetchStatus('shared', module.exports.Status.Status.ERROR));
             dispatch(module.exports.setError(err));
             return;
         }
-        if (typeof body === 'undefined') {
+        if (typeof body === 'undefined' || res.statusCode !== 200) {
             dispatch(module.exports.setFetchStatus('shared', module.exports.Status.ERROR));
             dispatch(module.exports.setError('No session content'));
             return;
@@ -152,13 +152,13 @@ module.exports.getInStudiosFollowing = (username, token) => (dispatch => {
     api({
         uri: `/users/${username}/following/studios/projects`,
         authentication: token
-    }, (err, body) => {
+    }, (err, body, res) => {
         if (err) {
             dispatch(module.exports.setFetchStatus('studios', module.exports.Status.ERROR));
             dispatch(module.exports.setError(err));
             return;
         }
-        if (typeof body === 'undefined') {
+        if (typeof body === 'undefined' || res.statusCode !== 200) {
             dispatch(module.exports.setFetchStatus('studios', module.exports.Status.ERROR));
             dispatch(module.exports.setError('No session content'));
             return;
@@ -178,13 +178,13 @@ module.exports.getLovedByFollowing = (username, token) => (dispatch => {
     api({
         uri: `/users/${username}/following/users/loves`,
         authentication: token
-    }, (err, body) => {
+    }, (err, body, res) => {
         if (err) {
             dispatch(module.exports.setFetchStatus('loved', module.exports.Status.ERROR));
             dispatch(module.exports.setError(err));
             return;
         }
-        if (typeof body === 'undefined') {
+        if (typeof body === 'undefined' || res.statusCode !== 200) {
             dispatch(module.exports.setFetchStatus('loved', module.exports.Status.ERROR));
             dispatch(module.exports.setError('No session content'));
             return;
diff --git a/src/views/splash/presentation.jsx b/src/views/splash/presentation.jsx
index e553db29d..1771a3f33 100644
--- a/src/views/splash/presentation.jsx
+++ b/src/views/splash/presentation.jsx
@@ -495,7 +495,6 @@ class SplashPresentation extends React.Component { // eslint-disable-line react/
                             </MediaQuery>
                         ]) : []
                     }
-                    
                     {featured}
 
                     {this.props.isAdmin ? [
@@ -555,7 +554,7 @@ SplashPresentation.propTypes = {
     isAdmin: PropTypes.bool.isRequired,
     isEducator: PropTypes.bool.isRequired,
     lovedByFollowing: PropTypes.arrayOf(PropTypes.object),
-    news: PropTypes.object, // eslint-disable-line react/forbid-prop-types
+    news: PropTypes.arrayOf(PropTypes.object),
     onDismiss: PropTypes.func.isRequired,
     onHideEmailConfirmationModal: PropTypes.func.isRequired,
     onRefreshHomepageCache: PropTypes.func.isRequired,