Merge branch 'fix/chat-visibility' into 'develop'

Show chat only if channel is joined.

See merge request pleroma/pleroma-fe!197

2 files changed, 2 insertions, 2 deletions

diff --git a/src/App.js b/src/App.js
index 0636c47d..8e7acb42 100644
--- a/src/App.js
+++ b/src/App.js
@@ -24,7 +24,7 @@ export default {
     logoStyle () { return { 'background-image': `url(${this.$store.state.config.logo})` } },
     style () { return { 'background-image': `url(${this.background})` } },
     sitename () { return this.$store.state.config.name },
-    chat () { return this.$store.state.chat.channel }
+    chat () { return this.$store.state.chat.channel.state === 'joined' }
   },
   methods: {
     activatePanel (panelName) {
diff --git a/src/modules/chat.js b/src/modules/chat.js
index b1244ebe..383ac75c 100644
--- a/src/modules/chat.js
+++ b/src/modules/chat.js
@@ -1,7 +1,7 @@
 const chat = {
   state: {
     messages: [],
-    channel: null
+    channel: {state: ''}
   },
   mutations: {
     setChannel (state, channel) {