From fc569d73a1b776e9a662fc27e5e6c4e45d7f5d15 Mon Sep 17 00:00:00 2001
From: Ivan Chen <ivan@tagg.id>
Date: Fri, 9 Apr 2021 18:34:07 -0400
Subject: resolved merge issues

---
 src/utils/messages.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/utils/messages.ts b/src/utils/messages.ts
index dc01d579..a0bbdb46 100644
--- a/src/utils/messages.ts
+++ b/src/utils/messages.ts
@@ -3,6 +3,7 @@ import moment from 'moment';
 import {loadChatTokenService} from '../services/ChatService';
 import {RootState} from '../store/rootReducer';
 import {ChannelGroupedType} from '../types';
+import {StreamChat} from 'stream-chat';
 
 /**
  * Finds the difference in time in minutes
@@ -86,7 +87,7 @@ export const getMember = (
 
 export const connectChatAccount = async (
   loggedInUserId: string,
-  chatClient,
+  chatClient: StreamChat,
 ) => {
   try {
     await getChatToken();
-- 
cgit v1.2.3-70-g09d2