Merge patchset from akko branch

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)}
@@ -288,12 +288,12 @@ class LocalSettingsPage extends PureComponent {
                defaultMessage="This setting is now controlled from Mastodon's {settings_page_link}"
                values={{
                  settings_page_link: (
-                    <a href={preferenceLink('user_setting_expand_spoilers')}>
+                    <span>
                      <FormattedMessage
                        id='settings.shared_settings_link'
                        defaultMessage='user preferences'
                      />
-                    </a>
+                    </span>
                  ),
                }}
              />