From aa494560ae9775e5fc2fb91edf5fabe09e1e049d Mon Sep 17 00:00:00 2001 From: Sean King Date: Tue, 11 Aug 2020 11:49:15 -0600 Subject: [PATCH] Beginning works of remote follow based on Pleroma FE version~ --- .../features/account/components/header.js | 29 +++++++++---------- .../features/ui/components/action_button.js | 5 +++- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/soapbox/features/account/components/header.js b/app/soapbox/features/account/components/header.js index a26ff710f..467908303 100644 --- a/app/soapbox/features/account/components/header.js +++ b/app/soapbox/features/account/components/header.js @@ -286,22 +286,19 @@ class Header extends ImmutablePureComponent { } - { - me && -
- - {account.get('id') !== me && - - } - -
- } +
+ + {(me && account.get('id') !== me) && + + } + { me && } +
diff --git a/app/soapbox/features/ui/components/action_button.js b/app/soapbox/features/ui/components/action_button.js index b0b114ee6..830ce33a8 100644 --- a/app/soapbox/features/ui/components/action_button.js +++ b/app/soapbox/features/ui/components/action_button.js @@ -16,6 +16,7 @@ import { const messages = defineMessages({ unfollow: { id: 'account.unfollow', defaultMessage: 'Unfollow' }, follow: { id: 'account.follow', defaultMessage: 'Follow' }, + remote_follow: { id: 'account.remote_follow', defaultMessage: 'Remote follow' }, requested: { id: 'account.requested', defaultMessage: 'Awaiting approval. Click to cancel follow request' }, requested_small: { id: 'account.requested_small', defaultMessage: 'Awaiting approval' }, unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' }, @@ -83,7 +84,9 @@ class ActionButton extends ImmutablePureComponent { const { account, intl, me, small } = this.props; let actionBtn = null; - if (!account || !me) return actionBtn; + if (!me) { + actionBtn =