diff options
author | Claire <claire.github-309c@sitedethib.com> | 2023-03-27 12:49:33 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-03-27 12:49:33 +0200 |
commit | cbdb25ab0343603165fc89fd28b07c9ca0f2ae6d (patch) | |
tree | dc8aa1aa2449f54b530df0b251f7d126df0e525f /app/javascript/flavours/glitch/features/follow_requests | |
parent | 81e85782d1cf595310180c3106ed92682045b5fd (diff) | |
parent | 8215df76c070f7d400a6091fcb1c0f6ff78474a0 (diff) |
Merge pull request #2151 from ClearlyClaire/glitch-soc/main
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/follow_requests')
-rw-r--r-- | app/javascript/flavours/glitch/features/follow_requests/components/account_authorize.jsx | 3 | ||||
-rw-r--r-- | app/javascript/flavours/glitch/features/follow_requests/index.jsx | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/javascript/flavours/glitch/features/follow_requests/components/account_authorize.jsx b/app/javascript/flavours/glitch/features/follow_requests/components/account_authorize.jsx index cbe7a1032..af8a534fa 100644 --- a/app/javascript/flavours/glitch/features/follow_requests/components/account_authorize.jsx +++ b/app/javascript/flavours/glitch/features/follow_requests/components/account_authorize.jsx @@ -13,7 +13,6 @@ const messages = defineMessages({ reject: { id: 'follow_request.reject', defaultMessage: 'Reject' }, }); -export default @injectIntl class AccountAuthorize extends ImmutablePureComponent { static propTypes = { @@ -47,3 +46,5 @@ class AccountAuthorize extends ImmutablePureComponent { } } + +export default injectIntl(AccountAuthorize); diff --git a/app/javascript/flavours/glitch/features/follow_requests/index.jsx b/app/javascript/flavours/glitch/features/follow_requests/index.jsx index aa60bd7b8..a9a35f54b 100644 --- a/app/javascript/flavours/glitch/features/follow_requests/index.jsx +++ b/app/javascript/flavours/glitch/features/follow_requests/index.jsx @@ -25,8 +25,6 @@ const mapStateToProps = state => ({ domain: state.getIn(['meta', 'domain']), }); -export default @connect(mapStateToProps) -@injectIntl class FollowRequests extends ImmutablePureComponent { static propTypes = { @@ -90,3 +88,5 @@ class FollowRequests extends ImmutablePureComponent { } } + +export default connect(mapStateToProps)(injectIntl(FollowRequests)); |