Merge pull request #386 from IvanIFChen/hotfix-navigation-after-chat-notification

[HOTFIX] Added logic to navigate on notification opened

1 files changed, 5 insertions, 6 deletions

diff --git a/src/services/FCMService.ts b/src/services/FCMService.ts
index 711483ec..f76e94b6 100644
--- a/src/services/FCMService.ts
+++ b/src/services/FCMService.ts
@@ -135,12 +135,11 @@ class FCMService {
     // Called when app is opened from backrground state
     messaging().onNotificationOpenedApp((remoteMessage) => {
       if (remoteMessage) {
-        // TODO: Get {name, params} of screen when user must be redirected to
-        // Redirected to Notification Screen for now
-        const redirectTo = 'Notifications';
-        /* TODO: Check login status and redirect user/store screen to async as
-        initialRoute for NavigationBar Stack */
-        RootNavigation.navigate(redirectTo);
+        if (remoteMessage.category === 'CHAT') {
+          RootNavigation.navigate('ChatList');
+        } else {
+          RootNavigation.navigate('Notifications');
+        }
       }
     });