Fixed remaining rebase issues.

src/ChatWindow.vue

@@ -7,7 +7,7 @@
  :image-url="showingChatList ? chatListImageUrl : titleImageUrl"
  @close="$emit('close')"
  :colors="colors"
- :disable-user-list-toggle="disableUserListToggle || showingChatList"
+ :disable-list-toggle="disableUserListToggle || showingChatList"
  @toggleUserListMessageList="handleToggleUserListMessageList"
  @showChatList="handleShowChatList"
  >
@@ -77,6 +77,7 @@
 </template>
 
 <script>
+import {mapState} from './store/'
 import Header from './Header.vue'
 import MessageList from './MessageList.vue'
 import UserInput from './UserInput.vue'
@@ -211,7 +212,8 @@ export default {
  },
  showingMessageList() {
  return this.state == uiState.MESSAGE_LIST
- }
+ },
+ ...mapState(['titleImageUrl', 'disableUserListToggle'])
  },
  methods: {
  handleToggleUserListMessageList() {

src/Header.vue

@@ -7,7 +7,7 @@
  </div>
  <slot>
  <img v-if="titleImageUrl" class="sc-header--img" :src="titleImageUrl" alt="" />
- <div v-if="!disableUserListToggle" class="sc-header--title enabled" @click="toggleUserListMessageList">
+ <div v-if="!disableListToggle" class="sc-header--title enabled" @click="toggleUserListMessageList">
  {{ title }}
  </div>
  <div v-else class="sc-header--title">{{ title }}</div>
@@ -47,9 +47,13 @@ export default {
  type: Boolean,
  default: false
  },
+ disableListToggle: {
+ type: Boolean,
+ required: true
+ },
  },
  computed: {
- ...mapState(['disableUserListToggle', 'titleImageUrl', 'showCloseButton'])
+ ...mapState(['titleImageUrl', 'showCloseButton'])
  },
  methods: {
  toggleUserListMessageList() {

src/Launcher.vue

@@ -14,7 +14,6 @@
  <img v-else class="sc-open-icon" :src="icons.open.img" :alt="icons.open.name" />
  </div>
  <ChatWindow
- :multiple-chats="multipleChats"
  :message-list="messageList"
  :on-user-input-submit="onMessageWasSent"
  :participants="participants"