Syncing with feat branch
This commit is contained in:
parent
2cea6dab4a
commit
18fbd1ab91
3 changed files with 13 additions and 12 deletions
|
@ -65,10 +65,10 @@ export default {
|
|||
computed: {
|
||||
...mapGetters({
|
||||
availableAgents: 'agent/availableAgents',
|
||||
metaIn: 'conversationV2/metaIn',
|
||||
currentUser: 'contactV2/getCurrentUser',
|
||||
getTotalMessageCount: 'conversationV2/allMessagesCountIn',
|
||||
getGroupedMessages: 'conversationV2/groupByMessagesIn',
|
||||
metaIn: 'conversation/metaIn',
|
||||
currentUser: 'contact/getCurrentUser',
|
||||
getTotalMessageCount: 'conversation/allMessagesCountIn',
|
||||
getGroupedMessages: 'conversation/groupByMessagesIn',
|
||||
}),
|
||||
conversationId() {
|
||||
const { conversationId } = this.$route.params;
|
||||
|
@ -104,7 +104,7 @@ export default {
|
|||
this.setUserLastSeen();
|
||||
},
|
||||
methods: {
|
||||
...mapActions('conversationV2', ['setUserLastSeenIn']),
|
||||
...mapActions('conversation', ['setUserLastSeenIn']),
|
||||
closeChat() {
|
||||
IFrameHelper.sendMessage({ event: 'closeChat' });
|
||||
},
|
||||
|
|
|
@ -12,10 +12,7 @@
|
|||
v-if="lastActiveConversationId"
|
||||
:conversations="allActiveConversations"
|
||||
/>
|
||||
<team-availability
|
||||
:available-agents="availableAgents"
|
||||
@start-conversation="startConversation"
|
||||
/>
|
||||
<team-availability :available-agents="availableAgents" />
|
||||
|
||||
<div class="footer-wrap">
|
||||
<branding></branding>
|
||||
|
@ -54,12 +51,16 @@ export default {
|
|||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
isCampaignViewClicked: {
|
||||
type: Boolean,
|
||||
default: false,
|
||||
},
|
||||
},
|
||||
computed: {
|
||||
...mapGetters({
|
||||
availableAgents: 'agent/availableAgents',
|
||||
lastActiveConversationId: 'conversationV2/lastActiveConversationId',
|
||||
allActiveConversations: 'conversationV2/allActiveConversations',
|
||||
lastActiveConversationId: 'conversation/lastActiveConversationId',
|
||||
allActiveConversations: 'conversation/allActiveConversations',
|
||||
}),
|
||||
},
|
||||
methods: {
|
||||
|
|
|
@ -40,7 +40,7 @@ export default {
|
|||
computed: {
|
||||
...mapGetters({
|
||||
availableAgents: 'agent/availableAgents',
|
||||
currentUser: 'contactV2/getCurrentUser',
|
||||
currentUser: 'contact/getCurrentUser',
|
||||
}),
|
||||
},
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue