diff options
| author | pluralcafe-docker <docker@plural.cafe> | 2018-08-30 05:23:58 +0000 |
|---|---|---|
| committer | pluralcafe-docker <docker@plural.cafe> | 2018-08-30 05:23:58 +0000 |
| commit | cc7437e25597e24b9a5f06f7991861506d9abe5c (patch) | |
| tree | e627d32df29ef7ae30a67607caf3ecdc1ae333a9 /app/javascript/flavours/glitch/features/account | |
| parent | 395164add468b1079669699dfe8eeaab73f69c15 (diff) | |
| parent | 5ce67276691c37baad149f2f89f765543f70e6f9 (diff) | |
Merge branch 'glitch'
Diffstat (limited to 'app/javascript/flavours/glitch/features/account')
| -rw-r--r-- | app/javascript/flavours/glitch/features/account/components/header.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/features/account/components/header.js b/app/javascript/flavours/glitch/features/account/components/header.js index 174df0cc9..eda0d637e 100644 --- a/app/javascript/flavours/glitch/features/account/components/header.js +++ b/app/javascript/flavours/glitch/features/account/components/header.js @@ -56,7 +56,9 @@ export default class Header extends ImmutablePureComponent { } 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 = ( <div className='account--action-button'> <IconButton size={26} active icon='hourglass' title={intl.formatMessage(messages.requested)} onClick={this.props.onFollow} /> |