Revert "Removed straggling code related to popular services."

This reverts commit a9c1abc6f11cb193388fad505c0304f1efe60a30.

2 files changed, 11 insertions, 6 deletions

diff --git a/src/containers/auth/WelcomeScreen.js b/src/containers/auth/WelcomeScreen.js
index c6de3729f..7e1a7a83e 100644
--- a/src/containers/auth/WelcomeScreen.js
+++ b/src/containers/auth/WelcomeScreen.js
@@ -15,7 +15,7 @@ class WelcomeScreen extends Component {
         loginRoute={user.loginRoute}
         signupRoute={user.signupRoute}
         changeServerRoute={user.changeServerRoute}
-        recipes={recipePreviews.all}
+        recipes={recipePreviews.featured}
       />
     );
   }
diff --git a/src/containers/settings/RecipesScreen.js b/src/containers/settings/RecipesScreen.js
index b81336c12..e8f0a7282 100644
--- a/src/containers/settings/RecipesScreen.js
+++ b/src/containers/settings/RecipesScreen.js
@@ -54,6 +54,8 @@ class RecipesScreen extends Component {
 
       if (filter === 'all' && currentFilter !== 'all') {
         this.setState({ currentFilter: 'all' });
+      } else if (filter === 'featured' && currentFilter !== 'featured') {
+        this.setState({ currentFilter: 'featured' });
       } else if (filter === 'dev' && currentFilter !== 'dev') {
         this.setState({ currentFilter: 'dev' });
       }
@@ -113,7 +115,7 @@ class RecipesScreen extends Component {
 
     const { app: appActions, service: serviceActions } = this.props.actions;
 
-    const { filter } = { filter: 'all', ...this.props.params };
+    const { filter } = this.props.params;
     let recipeFilter;
 
     if (filter === 'all') {
@@ -123,6 +125,8 @@ class RecipesScreen extends Component {
       ]);
     } else if (filter === 'dev') {
       recipeFilter = communityRecipesStore.communityRecipes;
+    } else {
+      recipeFilter = recipePreviews.featured;
     }
     recipeFilter = recipeFilter.sort(this._sortByName);
 
@@ -149,10 +153,10 @@ class RecipesScreen extends Component {
       service => service.id === CUSTOM_WEBSITE_RECIPE_ID,
     );
 
-    const isLoading =
-      recipePreviews.allRecipePreviewsRequest.isExecuting ||
-      recipes.installRecipeRequest.isExecuting ||
-      recipePreviews.searchRecipePreviewsRequest.isExecuting;
+    const isLoading = recipePreviews.featuredRecipePreviewsRequest.isExecuting
+      || recipePreviews.allRecipePreviewsRequest.isExecuting
+      || recipes.installRecipeRequest.isExecuting
+      || recipePreviews.searchRecipePreviewsRequest.isExecuting;
 
     const recipeDirectory = userDataRecipesPath('dev');
 
@@ -163,6 +167,7 @@ class RecipesScreen extends Component {
           customWebsiteRecipe={customWebsiteRecipe}
           isLoading={isLoading}
           addedServiceCount={services.all.length}
+          hasLoadedRecipes={recipePreviews.featuredRecipePreviewsRequest.wasExecuted}
           showAddServiceInterface={serviceActions.showAddServiceInterface}
           searchRecipes={e => this.searchRecipes(e)}
           resetSearch={() => this.resetSearch()}