feat(chat): resolved conflicts

Satellite-im · Jul 8, 2022 · b2437af · b2437af
1 parent bffd700
commit b2437af
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/components/views/chat/chatbar/Chatbar.vue b/components/views/chat/chatbar/Chatbar.vue
@@ -1,6 +1,6 @@
 <template src="./Chatbar.html"></template>
 <script lang="ts">
-import Vue from 'vue'
+import Vue, { PropType } from 'vue'
 import { mapState, mapGetters } from 'vuex'
 import { throttle } from 'lodash'
 import { TerminalIcon } from 'satellite-lucide-icons'
@@ -23,9 +23,15 @@ export default Vue.extend({
   components: {
     TerminalIcon,
   },
+  props: {
+    recipient: {
+      type: Object as PropType<Friend | Group>,
+      default: () => {},
+    },
+  },
   computed: {
     ...mapGetters({
-      recipient: 'conversation/recipient',
+      // recipient: 'conversation/recipient',
       getFiles: 'chat/getFiles',
       isGroup: 'conversation/isGroup',
     }),

diff --git a/layouts/chat.vue b/layouts/chat.vue
@@ -85,7 +85,7 @@
             </UiChatScroll>-->
             <Nuxt />
             <WalletMini v-if="ui.modals.walletMini" />
-            <Chatbar ref="chatbar" />
+            <Chatbar v-if="recipient" ref="chatbar" :recipient="recipient" />
           </DroppableWrapper>
         </swiper-slide>
         <swiper-slide v-if="$data.asidebar" class="aside-container">

diff --git a/libraries/Iridium/chat/ChatManager.ts b/libraries/Iridium/chat/ChatManager.ts
@@ -2,10 +2,11 @@ import {
   IridiumPeerMessage,
   IridiumPubsubEvent,
   Iridium,
-} from '@satellite-im/iridium/dist/index.browser'
+  Emitter,
+  EmitterCallback,
+} from '@satellite-im/iridium'
 // Iridium import above has static function called hash, use to hash this user id and the name of the chat
 
-import { EmitterCallback, Emitter } from '@satellite-im/iridium/src/emitter'
 import {
   Conversation,
   ConversationMessage,