Merge patchset from akko branch

This commit is contained in:
Laura Hausmann
2023-10-12 20:13:42 +02:00
parent d235afc303
commit 960614ec6f
22 changed files with 350 additions and 69 deletions
@@ -73,15 +73,8 @@ class LocalSettingsNavigation extends PureComponent {
/>
<LocalSettingsNavigationItem
active={index === 5}
href={preferencesLink}
index={5}
icon='cog'
title={intl.formatMessage(messages.preferences)}
/>
<LocalSettingsNavigationItem
active={index === 6}
className='close'
index={6}
index={5}
onNavigate={onClose}
icon='times'
title={intl.formatMessage(messages.close)}