about summary refs log tree commit diff
path: root/app/javascript/mastodon/features/account_timeline/components/header.js
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2022-10-19 11:30:59 +0200
committerGitHub <noreply@github.com>2022-10-19 11:30:59 +0200
commitaefa9253d61def572396c18a8d2ac3cc706ffa2e (patch)
treeb4a2e3e57323118249eddf4cb439505f1bc5b08c /app/javascript/mastodon/features/account_timeline/components/header.js
parent1b83040bd45770ff831ff697418aaa2468a1516a (diff)
Change featured hashtags to be displayed in navigation panel (#19382)
Diffstat (limited to 'app/javascript/mastodon/features/account_timeline/components/header.js')
-rw-r--r--app/javascript/mastodon/features/account_timeline/components/header.js20
1 files changed, 7 insertions, 13 deletions
diff --git a/app/javascript/mastodon/features/account_timeline/components/header.js b/app/javascript/mastodon/features/account_timeline/components/header.js
index ea34a934a..f31848f41 100644
--- a/app/javascript/mastodon/features/account_timeline/components/header.js
+++ b/app/javascript/mastodon/features/account_timeline/components/header.js
@@ -1,8 +1,7 @@
-import React, { Fragment } from 'react';
+import React from 'react';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import PropTypes from 'prop-types';
 import InnerHeader from '../../account/components/header';
-import FeaturedTags from '../../account/components/featured_tags';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import MovedNote from './moved_note';
 import { FormattedMessage } from 'react-intl';
@@ -28,7 +27,6 @@ export default class Header extends ImmutablePureComponent {
     hideTabs: PropTypes.bool,
     domain: PropTypes.string.isRequired,
     hidden: PropTypes.bool,
-    tagged: PropTypes.string,
   };
 
   static contextTypes = {
@@ -104,7 +102,7 @@ export default class Header extends ImmutablePureComponent {
   }
 
   render () {
-    const { account, hidden, hideTabs, tagged } = this.props;
+    const { account, hidden, hideTabs } = this.props;
 
     if (account === null) {
       return null;
@@ -136,15 +134,11 @@ export default class Header extends ImmutablePureComponent {
         />
 
         {!(hideTabs || hidden) && (
-          <Fragment>
-            <div className='account__section-headline'>
-              <NavLink exact to={`/@${account.get('acct')}`}><FormattedMessage id='account.posts' defaultMessage='Posts' /></NavLink>
-              <NavLink exact to={`/@${account.get('acct')}/with_replies`}><FormattedMessage id='account.posts_with_replies' defaultMessage='Posts and replies' /></NavLink>
-              <NavLink exact to={`/@${account.get('acct')}/media`}><FormattedMessage id='account.media' defaultMessage='Media' /></NavLink>
-            </div>
-
-            <FeaturedTags account={account} tagged={tagged} />
-          </Fragment>
+          <div className='account__section-headline'>
+            <NavLink exact to={`/@${account.get('acct')}`}><FormattedMessage id='account.posts' defaultMessage='Posts' /></NavLink>
+            <NavLink exact to={`/@${account.get('acct')}/with_replies`}><FormattedMessage id='account.posts_with_replies' defaultMessage='Posts and replies' /></NavLink>
+            <NavLink exact to={`/@${account.get('acct')}/media`}><FormattedMessage id='account.media' defaultMessage='Media' /></NavLink>
+          </div>
         )}
       </div>
     );