diff options
author | Claire <claire.github-309c@sitedethib.com> | 2023-02-04 23:18:14 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-04 23:18:14 +0100 |
commit | 76b4e7727b7497c1b68e06133831701f8950ae19 (patch) | |
tree | dee110c9c6afd598b202e73283d5c8f8ae6d3999 /app/javascript/flavours/glitch/features/local_settings/navigation | |
parent | ec26f7c1b16ca1429991212292e35e520c617485 (diff) | |
parent | fa433ac5a638b00f5bf77ee52955696d7aa842d6 (diff) |
Merge pull request #2101 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/local_settings/navigation')
-rw-r--r-- | app/javascript/flavours/glitch/features/local_settings/navigation/index.js | 2 | ||||
-rw-r--r-- | app/javascript/flavours/glitch/features/local_settings/navigation/item/index.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/features/local_settings/navigation/index.js b/app/javascript/flavours/glitch/features/local_settings/navigation/index.js index 98dda182f..cc1f3df6d 100644 --- a/app/javascript/flavours/glitch/features/local_settings/navigation/index.js +++ b/app/javascript/flavours/glitch/features/local_settings/navigation/index.js @@ -72,7 +72,7 @@ class LocalSettingsNavigation extends React.PureComponent { /> <LocalSettingsNavigationItem active={index === 5} - href={ preferencesLink } + href={preferencesLink} index={5} icon='cog' title={intl.formatMessage(messages.preferences)} diff --git a/app/javascript/flavours/glitch/features/local_settings/navigation/item/index.js b/app/javascript/flavours/glitch/features/local_settings/navigation/item/index.js index 739c5ebae..a4d1b40fa 100644 --- a/app/javascript/flavours/glitch/features/local_settings/navigation/item/index.js +++ b/app/javascript/flavours/glitch/features/local_settings/navigation/item/index.js @@ -26,7 +26,7 @@ export default class LocalSettingsPage extends React.PureComponent { onNavigate(index); e.preventDefault(); } - } + }; render () { const { handleClick } = this; |