1 files changed, 8 insertions, 9 deletions

diff --git a/src/containers/settings/RecipesScreen.tsx b/src/containers/settings/RecipesScreen.tsx
index bc7fa9ba0..fffdd39fa 100644
--- a/src/containers/settings/RecipesScreen.tsx
+++ b/src/containers/settings/RecipesScreen.tsx
@@ -3,6 +3,7 @@ import { Component, ReactElement } from 'react';
 import { autorun, IReactionDisposer } from 'mobx';
 import { inject, observer } from 'mobx-react';
 
+import { Params } from 'react-router-dom';
 import Recipe from '../../models/Recipe';
 import { StoresProps } from '../../@types/ferdium-components.types';
 import RecipesDashboard from '../../components/settings/recipes/RecipesDashboard';
@@ -13,11 +14,10 @@ import { asarRecipesPath } from '../../helpers/asar-helpers';
 import { communityRecipesStore } from '../../features/communityRecipes';
 import RecipePreview from '../../models/RecipePreview';
 import { openPath } from '../../helpers/url-helpers';
+import withParams from '../../components/util/WithParams';
 
 interface RecipesScreenProps extends StoresProps {
-  params: {
-    filter?: string | null;
-  };
+  params: Params;
 }
 
 class RecipesScreen extends Component<RecipesScreenProps> {
@@ -36,8 +36,6 @@ class RecipesScreen extends Component<RecipesScreenProps> {
   constructor(props: RecipesScreenProps) {
     super(props);
 
-    this.props.params.filter = this.props.params.filter || null;
-
     this.customRecipes = readJsonSync(asarRecipesPath('all.json'));
   }
 
@@ -104,7 +102,7 @@ class RecipesScreen extends Component<RecipesScreenProps> {
   }
 
   resetSearch(): void {
-    this.setState({ needle: null });
+    this.setState({ needle: null, currentFilter: 'featured' });
   }
 
   render(): ReactElement {
@@ -112,7 +110,8 @@ class RecipesScreen extends Component<RecipesScreenProps> {
 
     const { app: appActions, service: serviceActions } = this.props.actions;
 
-    const { filter } = this.props.params;
+    const filter = this.state.currentFilter;
+
     let recipeFilter;
 
     if (filter === 'all') {
@@ -125,7 +124,7 @@ class RecipesScreen extends Component<RecipesScreenProps> {
     } else {
       recipeFilter = recipePreviews.featured;
     }
-    recipeFilter = recipeFilter.sort(this._sortByName);
+    recipeFilter = [...recipeFilter].sort(this._sortByName);
 
     const { needle } = this.state;
     const allRecipes =
@@ -185,4 +184,4 @@ class RecipesScreen extends Component<RecipesScreenProps> {
   }
 }
 
-export default inject('stores', 'actions')(observer(RecipesScreen));
+export default withParams(inject('stores', 'actions')(observer(RecipesScreen)));