pleroma-fe

commit: ff5f69b8fd781d2fc8175c074f30aa35c0fea55c
parent d7da9f80a7ddf98ffc9438f6e50af525ff76aef1
Author: Tusooa Zhu <tusooa@kazv.moe>
Date:   Sat,  7 Aug 2021 19:24:27 -0400

Use mergedConfig properly

Diffstat:
M
src/components/conversation/conversation.js
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js
@@ -77,7 +77,7 @@ const conversation = {
       return 4
     },
     displayStyle () {
-      return this.$store.state.config.conversationDisplay || 'simple_tree'
+      return this.$store.getters.mergedConfig.conversationDisplay
     },
     isTreeView () {
       return this.displayStyle === 'tree' || this.displayStyle === 'simple_tree'