Merge branch 'fix-1385' into 'develop'

Fix #1385

Closes #1385

See merge request pleroma/pleroma-fe!2188

changelog.d/anon-setting.fix

@@ -0,0 +1 @@
+fixed settings not appearing if user never touched "show advanced" toggle

changelog.d/countdown.change

@@ -0,0 +1 @@
+temporary changes modal now shows actual countdown instead of fixed timeout

changelog.d/disabled.change

@@ -0,0 +1 @@
+disabled elements are more disabled now

src/components/settings_modal/helpers/setting.js

@@ -271,7 +271,10 @@ export default {
       return this.realSource === 'admin' && this.$store.state.adminSettings.modifiedPaths?.has(this.canonPath.join(' -> '))
     },
     matchesExpertLevel () {
-      return (this.expert || 0) <= this.$store.state.config.expertLevel > 0
+      const settingExpertLevel = this.expert || 0
+      const userToggleExpert = this.$store.state.config.expertLevel || 0
+
+      return settingExpertLevel <= userToggleExpert
     }
   },
   methods: {

src/components/settings_modal/settings_modal_user_content.vue

@@ -24,6 +24,7 @@
       <ProfileTab />
     </div>
     <div
+      v-if="isLoggedIn"
       :label="$t('settings.composing')"
       icon="pen-alt"
       data-tab-name="composing"