Merge branch 'master' into tma767-message-button

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

1 files changed, 24 insertions, 6 deletions

diff --git a/src/utils/common.ts b/src/utils/common.ts
index 4f31af8e..0900a084 100644
--- a/src/utils/common.ts
+++ b/src/utils/common.ts
@@ -1,14 +1,14 @@
+import AsyncStorage from '@react-native-community/async-storage';
+import moment from 'moment';
+import {Linking} from 'react-native';
+import {getAll} from 'react-native-contacts';
+import {BROWSABLE_SOCIAL_URLS, TOGGLE_BUTTON_TYPE} from '../constants';
 import {
   ContactType,
   NotificationType,
-  UniversityType,
   UniversityBadgeType,
+  UniversityType,
 } from './../types/types';
-import moment from 'moment';
-import {Linking} from 'react-native';
-import {BROWSABLE_SOCIAL_URLS, TOGGLE_BUTTON_TYPE} from '../constants';
-import AsyncStorage from '@react-native-community/async-storage';
-import {getAll} from 'react-native-contacts';
 
 export const getToggleButtonText: (
   buttonType: string,
@@ -173,3 +173,21 @@ 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;
+  }
+};