Merge patchset from akko branch

2023-10-12 20:13:42 +02:00
parent d235afc303
commit 960614ec6f
22 changed files with 350 additions and 69 deletions
@@ -27,16 +27,10 @@ export default class NavigationBar extends ImmutablePureComponent {
        </Permalink>

        <div className='navigation-bar__profile'>
+          <div>{this.props.account.get('display_name')}</div>
          <Permalink className='acct' href={this.props.account.get('url')} to={`/@${this.props.account.get('acct')}`}>
            <strong>@{this.props.account.get('acct')}</strong>
          </Permalink>
-
-          { profileLink !== undefined && (
-            <a
-              className='edit'
-              href={profileLink}
-            ><FormattedMessage id='navigation_bar.edit_profile' defaultMessage='Edit profile' /></a>
-          )}
        </div>

        <div className='navigation-bar__actions'>