Merge branch 'feature/discussions' into develop

weni-ai · Nov 23, 2023 · f2c685e · f2c685e
2 parents a38867d + 287d761
commit f2c685e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/components/chats/chat/ModalGetChat.vue b/src/components/chats/chat/ModalGetChat.vue
@@ -75,7 +75,6 @@ export default {
 
     async setActiveRoom(uuid) {
       const room = this.$store.getters['chats/rooms/getRoomById'](uuid);
-      if (!room) this.$router.push({ name: 'home' });
       await this.$store.dispatch('chats/rooms/setActiveRoom', room);
     },
   },

diff --git a/src/views/chats/Home.vue b/src/views/chats/Home.vue
@@ -369,7 +369,8 @@ export default {
           }
           this.isRoomSkeletonActive = false;
         }
-        if (this.$route.name !== 'room' && newValue.uuid !== this.roomId && !this.discussionId) {
+
+        if (newValue.uuid !== this.roomId && !this.discussionId) {
           this.$router.replace({ name: 'room', params: { roomId: newValue.uuid } });
         }
       }
@@ -405,7 +406,11 @@ export default {
           return;
         }
 
-        if (this.$route.name !== 'discussion' && newValue && newValue.uuid !== this.discussionId) {
+        if (!newValue?.uuid) {
+          return;
+        }
+
+        if (newValue.uuid !== this.discussionId) {
           this.$router.replace({ name: 'discussion', params: { discussionId: newValue.uuid } });
         }
       }