Merge branch 'master' into tma784-style-message-input

# Conflicts:
#	src/screens/chat/ChatListScreen.tsx
#	src/screens/chat/ChatScreen.tsx

1 files changed, 0 insertions, 18 deletions

diff --git a/src/utils/common.ts b/src/utils/common.ts
index 0900a084..7ae36dc6 100644
--- a/src/utils/common.ts
+++ b/src/utils/common.ts
@@ -173,21 +173,3 @@ const _crestIcon = (university: UniversityType) => {
       return require('../assets/images/bwbadges.png');
   }
 };
-
-export const createChannel = async (
-  loggedInUser: string,
-  id: string,
-  chatClient: any,
-) => {
-  console.log(loggedInUser, id, chatClient);
-  try {
-    const channel = chatClient.channel('messaging', {
-      members: [loggedInUser, id],
-    });
-    await channel.watch();
-    return channel;
-  } catch (error) {
-    console.log(error);
-    throw error;
-  }
-};