From b3f58b4d9f614dd50c923043efa711a37d77cc7f Mon Sep 17 00:00:00 2001
From: Mustafa Buyukcelebi <mustafa.buyukcel@gmail.com>
Date: Mon, 2 Dec 2019 23:03:34 +0300
Subject: [PATCH] Fixed search result tag issue

---
 src/components/posts/view/postsView.js            | 15 ++++-----------
 src/constants/options/filters.js                  |  3 +++
 .../searchResult/screen/searchResultScreen.js     |  8 ++++----
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/components/posts/view/postsView.js b/src/components/posts/view/postsView.js
index 8dd98c903..632a925a4 100644
--- a/src/components/posts/view/postsView.js
+++ b/src/components/posts/view/postsView.js
@@ -162,19 +162,12 @@ const PostsView = ({
       setIsLoading(true);
 
       const filter = type || selectedFilterValue;
-      let options;
       const limit = 3;
 
-      if (filter === 'feed' || filter === 'blog' || getFor === 'blog' || filter === 'reblogs') {
-        options = {
-          tag,
-          limit,
-        };
-      } else {
-        options = {
-          limit,
-        };
-      }
+      const options = {
+        tag,
+        limit,
+      };
 
       if (startAuthor && startPermlink && !refreshing) {
         options.start_author = startAuthor;
diff --git a/src/constants/options/filters.js b/src/constants/options/filters.js
index 8189b7fef..6dfe4de3a 100644
--- a/src/constants/options/filters.js
+++ b/src/constants/options/filters.js
@@ -1,6 +1,9 @@
 export const POPULAR_FILTERS = ['FEED', 'TOP', 'HOT', 'NEW'];
 export const POPULAR_FILTERS_VALUE = ['feed', 'trending', 'hot', 'created'];
 
+export const GLOBAL_POST_FILTERS = ['TOP', 'HOT', 'NEW'];
+export const GLOBAL_POST_FILTERS_VALUE = ['trending', 'hot', 'created'];
+
 export const PROFILE_FILTERS = ['BLOG', 'FEED'];
 export const PROFILE_FILTERS_VALUE = ['blog', 'feed'];
 
diff --git a/src/screens/searchResult/screen/searchResultScreen.js b/src/screens/searchResult/screen/searchResultScreen.js
index 04d0682b2..567a12c6c 100644
--- a/src/screens/searchResult/screen/searchResultScreen.js
+++ b/src/screens/searchResult/screen/searchResultScreen.js
@@ -10,7 +10,7 @@ import { SearchInput, Posts, TabBar } from '../../../components';
 import styles from './searchResultStyles';
 import globalStyles from '../../../globalStyles';
 
-import { POPULAR_FILTERS, POPULAR_FILTERS_VALUE } from '../../../constants/options/filters';
+import { GLOBAL_POST_FILTERS, GLOBAL_POST_FILTERS_VALUE } from '../../../constants/options/filters';
 
 const SearchResultScreen = ({ navigation }) => {
   const tag = navigation.getParam('tag', '');
@@ -33,7 +33,7 @@ const SearchResultScreen = ({ navigation }) => {
 
   const _getSelectedIndex = () => {
     if (filter) {
-      const selectedIndex = POPULAR_FILTERS_VALUE.indexOf(filter);
+      const selectedIndex = GLOBAL_POST_FILTERS_VALUE.indexOf(filter);
       if (selectedIndex > 0) {
         return selectedIndex;
       }
@@ -54,8 +54,8 @@ const SearchResultScreen = ({ navigation }) => {
         <View tabLabel={intl.formatMessage({ id: 'search.posts' })} style={styles.tabbarItem}>
           <Posts
             key={tag}
-            filterOptions={POPULAR_FILTERS}
-            filterOptionsValue={POPULAR_FILTERS_VALUE}
+            filterOptions={GLOBAL_POST_FILTERS}
+            filterOptionsValue={GLOBAL_POST_FILTERS_VALUE}
             selectedOptionIndex={_getSelectedIndex()}
             tag={tag}
           />