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/getting_started | |
| 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/getting_started')
| -rw-r--r-- | app/javascript/flavours/glitch/features/getting_started/components/announcements.jsx | 3 | ||||
| -rw-r--r-- | app/javascript/flavours/glitch/features/getting_started/index.jsx | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/app/javascript/flavours/glitch/features/getting_started/components/announcements.jsx b/app/javascript/flavours/glitch/features/getting_started/components/announcements.jsx index fb9024447..5c3a27f93 100644 --- a/app/javascript/flavours/glitch/features/getting_started/components/announcements.jsx +++ b/app/javascript/flavours/glitch/features/getting_started/components/announcements.jsx @@ -355,7 +355,6 @@ class Announcement extends ImmutablePureComponent { } -export default @injectIntl class Announcements extends ImmutablePureComponent { static propTypes = { @@ -447,3 +446,5 @@ class Announcements extends ImmutablePureComponent { } } + +export default injectIntl(Announcements); diff --git a/app/javascript/flavours/glitch/features/getting_started/index.jsx b/app/javascript/flavours/glitch/features/getting_started/index.jsx index 91b33c1dd..4064a5451 100644 --- a/app/javascript/flavours/glitch/features/getting_started/index.jsx +++ b/app/javascript/flavours/glitch/features/getting_started/index.jsx @@ -79,8 +79,6 @@ const badgeDisplay = (number, limit) => { const NAVIGATION_PANEL_BREAKPOINT = 600 + (285 * 2) + (10 * 2); -export default @connect(makeMapStateToProps, mapDispatchToProps) - @injectIntl class GettingStarted extends ImmutablePureComponent { static contextTypes = { @@ -202,3 +200,5 @@ class GettingStarted extends ImmutablePureComponent { } } + +export default connect(makeMapStateToProps, mapDispatchToProps)(injectIntl(GettingStarted)); |