mirror/YuruToot
1
0
Fork 0
mirror of https://github.com/funamitech/mastodon synced 2024-11-30 07:49:04 +09:00
Code

[Glitch] Wait until relationship is loaded before showing follow button

Browse Source 
Port cd049454be to glitch-soc
This commit is contained in:
Thibaut Girka 2018-08-27 17:43:55 +02:00 committed by ThibG
parent 8852fff3a4
commit 3106c81b1e
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/flavours/glitch/features/account/components/header.js
View File

@ -56,7 +56,9 @@ export default class Header extends ImmutablePureComponent {
} }
if (me !== account.get('id')) { if (me !== account.get('id')) {
if (account.getIn(['relationship', 'requested'])) { if (!account.get('relationship')) { // Wait until the relationship is loaded
actionBtn = '';
} else if (account.getIn(['relationship', 'requested'])) {
actionBtn = ( actionBtn = (
<div className='account--action-button'> <div className='account--action-button'>
<IconButton size={26} active icon='hourglass' title={intl.formatMessage(messages.requested)} onClick={this.props.onFollow} /> <IconButton size={26} active icon='hourglass' title={intl.formatMessage(messages.requested)} onClick={this.props.onFollow} />