Merge branch 'develop' of akkoma.dev:AkkomaGang/pleroma-fe into develop

This commit is contained in:
FloatingGhost 2022-11-11 16:05:10 +00:00
commit 4b5536ae68
2 changed files with 4 additions and 1 deletions

View file

@ -100,6 +100,9 @@ export default {
privateMode () { return this.$store.state.instance.private }, privateMode () { return this.$store.state.instance.private },
shouldConfirmLogout () { shouldConfirmLogout () {
return this.$store.getters.mergedConfig.modalOnLogout return this.$store.getters.mergedConfig.modalOnLogout
},
showBubbleTimeline () {
return this.$store.state.instance.localBubbleInstances.length > 0
} }
}, },
methods: { methods: {

View file

@ -55,7 +55,7 @@
/> />
</router-link> </router-link>
<router-link <router-link
v-if="currentUser" v-if="currentUser && showBubbleTimeline"
:to="{ name: 'bubble-timeline' }" :to="{ name: 'bubble-timeline' }"
class="nav-icon" class="nav-icon"
> >