2 files changed, 8 insertions, 4 deletions
diff --git a/src/routes/Routes.tsx b/src/routes/Routes.tsx
index 6fc766ab..384021bc 100644
--- a/src/routes/Routes.tsx
+++ b/src/routes/Routes.tsx
@@ -52,9 +52,9 @@ const Routes: React.FC = () => {
   useEffect(() => {
     if (userId) {
       fcmService.setUpPushNotifications();
-      fcmService.sendFcmTokenToServer();
+      fcmService.sendFcmTokenToServer(chatClient);
     }
-  }, []);
+  });
 
   useEffect(() => {
     if (loggedInUserId) {
diff --git a/src/services/FCMService.ts b/src/services/FCMService.ts
index 84f30f09..711483ec 100644
--- a/src/services/FCMService.ts
+++ b/src/services/FCMService.ts
@@ -2,8 +2,10 @@ import AsyncStorage from '@react-native-community/async-storage';
 import messaging from '@react-native-firebase/messaging';
 import {Platform} from 'react-native';
 import {getDeviceId, getDeviceName} from 'react-native-device-info';
+import {StreamChat} from 'stream-chat';
 import {FCM_ENDPOINT} from '../constants';
 import * as RootNavigation from '../RootNavigation';
+
 class FCMService {
   setUpPushNotifications = () => {
     // Requesting user to permit notifications
@@ -78,10 +80,13 @@ class FCMService {
     return '';
   };
 
-  sendFcmTokenToServer = async () => {
+  sendFcmTokenToServer = async (chatClient: StreamChat) => {
     const registration_id: string | null = await AsyncStorage.getItem(
       '@fcmToken',
     );
+    if (registration_id !== null) {
+      chatClient.addDevice(registration_id, 'firebase');
+    }
     const device_id = getDeviceId();
     const type = Platform.OS;
     let active: boolean = false;
@@ -117,7 +122,6 @@ class FCMService {
         console.log('Successfully stored device token!');
       } else {
         console.log('Failed to store device token!');
-        console.log(response);
       }
     }
   };