From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sat, 25 Aug 2018 20:46:59 +0000 (+0200)
Subject: Wait until relationship is loaded before showing follow button (#8440)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=cd049454be9cb8bf5fb6bc5316539432316033aa;p=mastodon.git

Wait until relationship is loaded before showing follow button (#8440)

Fix #8410
---

diff --git a/app/javascript/mastodon/features/account/components/header.js b/app/javascript/mastodon/features/account/components/header.js
index dd2cd406b..eb9236aeb 100644
--- a/app/javascript/mastodon/features/account/components/header.js
+++ b/app/javascript/mastodon/features/account/components/header.js
@@ -104,7 +104,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} />