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

Port cd049454be to glitch-soc
6 years ago · 3106c81b1e
parent 8852fff3a4
commit 3106c81b1e
1 changed files with 3 additions and 1 deletions
--- 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} />