From 32ede640af6737ed9b30a2838f0c5acd0aa97860 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Thu, 29 Mar 2018 14:46:00 +0200 Subject: [PATCH] [Glitch] Display unfollow button even if account moved Backport 1a90ef9c256aa2cdf3a8e2741c2dd8099bb24441 to glitch-soc --- app/javascript/flavours/glitch/components/account.js | 2 +- .../flavours/glitch/features/account/components/header.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/javascript/flavours/glitch/components/account.js b/app/javascript/flavours/glitch/components/account.js index df17f18970..80f20b8adf 100644 --- a/app/javascript/flavours/glitch/components/account.js +++ b/app/javascript/flavours/glitch/components/account.js @@ -99,7 +99,7 @@ export default class Account extends ImmutablePureComponent { {hidingNotificationsButton} ); - } else if (!account.get('moved')) { + } else if (!account.get('moved') || following) { buttons = ; } } diff --git a/app/javascript/flavours/glitch/features/account/components/header.js b/app/javascript/flavours/glitch/features/account/components/header.js index 1170bdb490..a208f1a8e5 100644 --- a/app/javascript/flavours/glitch/features/account/components/header.js +++ b/app/javascript/flavours/glitch/features/account/components/header.js @@ -76,7 +76,7 @@ export default class Header extends ImmutablePureComponent { } } - if (account.get('moved')) { + if (account.get('moved') && !account.getIn(['relationship', 'following'])) { actionBtn = ''; }