diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-03-15 08:58:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-15 08:58:12 +0100 |
| commit | 6a0ed45aa3f11f0343a7be556b36b4d075ba08df (patch) | |
| tree | 0bbd3318c61cf062f17386f4da166864c9db8138 /app/javascript/flavours/glitch/features/ui/components | |
| parent | bb4e211c86270de6de8a78da96295208ee77dce1 (diff) | |
| parent | 7f96391eaef601ea34672551bb06915acec7e492 (diff) | |
Merge pull request #2122 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/ui/components')
| -rw-r--r-- | app/javascript/flavours/glitch/features/ui/components/header.jsx | 4 | ||||
| -rw-r--r-- | app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/javascript/flavours/glitch/features/ui/components/header.jsx b/app/javascript/flavours/glitch/features/ui/components/header.jsx index d9ad94961..5aa045fee 100644 --- a/app/javascript/flavours/glitch/features/ui/components/header.jsx +++ b/app/javascript/flavours/glitch/features/ui/components/header.jsx @@ -23,8 +23,8 @@ const mapDispatchToProps = (dispatch) => ({ }, }); -export default @connect(null, mapDispatchToProps) -@withRouter +export default @withRouter +@connect(null, mapDispatchToProps) class Header extends React.PureComponent { static contextTypes = { diff --git a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx index 3b46c6eec..5a296435f 100644 --- a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx +++ b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx @@ -78,8 +78,8 @@ class NavigationPanel extends React.Component { {signedIn && ( <React.Fragment> <ColumnLink transparent to='/conversations' icon='at' text={intl.formatMessage(messages.direct)} /> - <ColumnLink transparent to='/favourites' icon='star' text={intl.formatMessage(messages.favourites)} /> <ColumnLink transparent to='/bookmarks' icon='bookmark' text={intl.formatMessage(messages.bookmarks)} /> + <ColumnLink transparent to='/favourites' icon='star' text={intl.formatMessage(messages.favourites)} /> <ColumnLink transparent to='/lists' icon='list-ul' text={intl.formatMessage(messages.lists)} /> <ListPanel /> |