From c47f0c6b5f5deadd14453cbb634e50df7eb778f3 Mon Sep 17 00:00:00 2001 From: nestordavalos Date: Mon, 24 Jun 2024 14:58:46 -0400 Subject: [PATCH] fix: --- .../dashboard/components/ChatList.vue | 31 +++++-------------- .../widgets/conversation/bubble/ReplyTo.vue | 2 +- 2 files changed, 9 insertions(+), 24 deletions(-) diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue index 5811266a8..2162199e7 100644 --- a/app/javascript/dashboard/components/ChatList.vue +++ b/app/javascript/dashboard/components/ChatList.vue @@ -7,6 +7,7 @@ ]" > + { const count = this.conversationStats[ASSIGNEE_TYPE_TAB_KEYS[key]] || 0; return { @@ -420,7 +406,6 @@ export default { labels: this.label ? [this.label] : undefined, teamId: this.teamId || undefined, conversationType: this.conversationType || undefined, - folders: this.hasActiveFolders ? this.savedFoldersValue : undefined, }; }, conversationListPagination() { @@ -763,7 +748,7 @@ export default { fetchConversations() { this.$store.dispatch('updateChatListFilters', this.conversationFilters); this.$store - .dispatch('fetchAllConversations', this.conversationFilters) + .dispatch('fetchAllConversations') .then(this.emitConversationLoaded); }, loadMoreConversations() { diff --git a/app/javascript/dashboard/components/widgets/conversation/bubble/ReplyTo.vue b/app/javascript/dashboard/components/widgets/conversation/bubble/ReplyTo.vue index 5cb063d23..83614e1e7 100644 --- a/app/javascript/dashboard/components/widgets/conversation/bubble/ReplyTo.vue +++ b/app/javascript/dashboard/components/widgets/conversation/bubble/ReplyTo.vue @@ -5,7 +5,7 @@ 'bg-slate-50 dark:bg-slate-600 dark:text-slate-50': messageType === MESSAGE_TYPE.INCOMING, 'bg-woot-600 text-woot-50': messageType === MESSAGE_TYPE.OUTGOING, - '-mx-2': !parentHasAttachments, + '-mx-2': message.content, }" @click="scrollToMessage" >