akadmin/chatwoot
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:chatwoot/chatwoot into chore/vuelidate-v2-migration

Browse Source
This commit is contained in:
Shivam Mishra
2024-07-22 15:04:26 +05:30
parent 9aeccf63c4 81d7c51a84
commit 2a2cd30c6b
42 changed files with 644 additions and 624 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/javascript/widget/components/AgentMessage.vue
+4 -4
View File
@@ -30,7 +30,7 @@
/>
<div
v-if="hasAttachments"
class="chat-bubble has-attachment space-y-2 agent"
class="space-y-2 chat-bubble has-attachment agent"
:class="(wrapClass, $dm('bg-white', 'dark:bg-slate-700'))"
>
<div
@@ -90,7 +90,7 @@
import UserMessage from 'widget/components/UserMessage.vue';
import AgentMessageBubble from 'widget/components/AgentMessageBubble.vue';
import MessageReplyButton from 'widget/components/MessageReplyButton.vue';
import timeMixin from 'dashboard/mixins/time';
import { messageStamp } from 'shared/helpers/timeHelper';
import ImageBubble from 'widget/components/ImageBubble.vue';
import VideoBubble from 'widget/components/VideoBubble.vue';
import FileBubble from 'widget/components/FileBubble.vue';
@@ -116,7 +116,7 @@ export default {
MessageReplyButton,
ReplyToChip,
},
mixins: [timeMixin, configMixin, messageMixin, darkModeMixin],
mixins: [configMixin, messageMixin, darkModeMixin],
props: {
message: {
type: Object,
@@ -146,7 +146,7 @@ export default {
},
readableTime() {
const { created_at: createdAt = '' } = this.message;
return this.messageStamp(createdAt, 'LLL d yyyy, h:mm a');
return messageStamp(createdAt, 'LLL d yyyy, h:mm a');
},
messageType() {
const { message_type: type = 1 } = this.message;
app/javascript/widget/components/UserMessage.vue
+3 -3
View File
@@ -83,7 +83,7 @@ import ImageBubble from 'widget/components/ImageBubble.vue';
import VideoBubble from 'widget/components/VideoBubble.vue';
import FluentIcon from 'shared/components/FluentIcon/Index.vue';
import FileBubble from 'widget/components/FileBubble.vue';
import timeMixin from 'dashboard/mixins/time';
import { messageStamp } from 'shared/helpers/timeHelper';
import messageMixin from '../mixins/messageMixin';
import ReplyToChip from 'widget/components/ReplyToChip.vue';
import DragWrapper from 'widget/components/DragWrapper.vue';
@@ -103,7 +103,7 @@ export default {
ReplyToChip,
DragWrapper,
},
mixins: [timeMixin, messageMixin],
mixins: [messageMixin],
props: {
message: {
type: Object,
@@ -135,7 +135,7 @@ export default {
},
readableTime() {
const { created_at: createdAt = '' } = this.message;
return this.messageStamp(createdAt);
return messageStamp(createdAt);
},
isFailed() {
const { status = '' } = this.message;