Merge pull request #1346 from esteemapp/bugfix/search-result

Fixed search result tag issue

src/components/posts/container/postsContainer.js

@@ -25,6 +25,7 @@ const PostsContainer = ({
   tag,
   nsfw,
   filterOptionsValue,
+  feedUsername,
 }) => {
   const dispatch = useDispatch();
 
@@ -59,6 +60,7 @@ const PostsContainer = ({
           setFeedPosts={_setFeedPosts}
           tag={tag}
           filterOptionsValue={filterOptionsValue}
+          feedUsername={feedUsername}
         />
       )}
     </AccountContainer>

src/components/posts/view/postsView.js

@@ -39,6 +39,7 @@ const PostsView = ({
   changeForceLoadPostState,
   forceLoadPost,
   filterOptionsValue,
+  feedUsername,
 }) => {
   const [posts, setPosts] = useState(isConnected ? [] : feedPosts);
   const [startAuthor, setStartAuthor] = useState('');
@@ -167,11 +168,12 @@ const PostsView = ({
 
       if (filter === 'feed' || filter === 'blog' || getFor === 'blog' || filter === 'reblogs') {
         options = {
-          tag,
+          tag: feedUsername,
           limit,
         };
       } else {
         options = {
+          tag,
           limit,
         };
       }

src/components/profile/profileView.js

@@ -177,7 +177,7 @@ class ProfileView extends PureComponent {
                 selectedOptionIndex={0}
                 pageType="profiles"
                 getFor="blog"
-                tag={username}
+                feedUsername={username}
                 key={username}
                 handleOnScroll={isSummaryOpen ? this._handleOnScroll : null}
                 forceLoadPost={forceLoadPost}

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'];
 

src/screens/feed/screen/feedScreen.js

@@ -25,7 +25,7 @@ const FeedScreen = () => {
               filterOptionsValue={[...POPULAR_FILTERS_VALUE]}
               getFor={isLoggedIn ? 'feed' : 'trending'}
               selectedOptionIndex={isLoggedIn ? 0 : 2}
-              tag={get(currentAccount, 'name')}
+              feedUsername={get(currentAccount, 'name')}
             />
           </SafeAreaView>
         </Fragment>

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}
+            filterOptions={GLOBAL_POST_FILTERS}
-            filterOptionsValue={POPULAR_FILTERS_VALUE}
+            filterOptionsValue={GLOBAL_POST_FILTERS_VALUE}
             selectedOptionIndex={_getSelectedIndex()}
             tag={tag}
           />