Resolve merge conflict,

Fix few issues (conversation page highlight, fetch conversation, ...)
This commit is contained in:
dave 2019-03-25 14:47:54 -04:00
commit 6143b1ce0f
11 changed files with 69 additions and 60 deletions

View file

@ -1,5 +1,4 @@
import Conversation from '../conversation/conversation.vue'
import { find } from 'lodash'
const conversationPage = {
components: {
@ -8,8 +7,8 @@ const conversationPage = {
computed: {
statusoid () {
const id = this.$route.params.id
const statuses = this.$store.state.statuses.allStatuses
const status = find(statuses, {id})
const statuses = this.$store.state.statuses.allStatusesObject
const status = statuses[id]
return status
}