From a2af6b5fd68bfc2ebc5cc7d58efc7accf6eb5d8c Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Fri, 8 Jun 2018 16:18:14 -0400
Subject: [PATCH] Fix inApp notification handler (#1749)

---
 app/screens/entry/entry.js               |  2 +-
 app/screens/notification/notification.js | 38 ++++++++++++++++++++----
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/app/screens/entry/entry.js b/app/screens/entry/entry.js
index 9c4622cee..afda50b5c 100644
--- a/app/screens/entry/entry.js
+++ b/app/screens/entry/entry.js
@@ -227,7 +227,7 @@ export default class Entry extends PureComponent {
             navigator: this.props.navigator,
         };
 
-        return wrapWithContextProvider(ChannelScreen, true)(props);
+        return wrapWithContextProvider(ChannelScreen, false)(props);
     };
 
     render() {
diff --git a/app/screens/notification/notification.js b/app/screens/notification/notification.js
index 8efa23e59..1a949e018 100644
--- a/app/screens/notification/notification.js
+++ b/app/screens/notification/notification.js
@@ -92,8 +92,28 @@ export default class Notification extends PureComponent {
         return icon;
     };
 
-    getNotificationTitle = (titleText) => {
+    getNotificationTitle = (notification) => {
         const {channel} = this.props;
+        const {message, data} = notification;
+
+        if (data.version === 'v2') {
+            if (data.channel_name) {
+                return (
+                    <Text
+                        numberOfLines={1}
+                        ellipsizeMode='tail'
+                        style={style.title}
+                    >
+                        {data.channel_name}
+                    </Text>
+                );
+            }
+
+            return null;
+        }
+
+        const msg = message.split(':');
+        const titleText = msg.shift();
 
         let title = (
             <Text
@@ -165,14 +185,20 @@ export default class Notification extends PureComponent {
 
     render() {
         const {deviceWidth, notification} = this.props;
-        const {message} = notification;
+        const {data, message} = notification;
 
         if (message) {
-            const msg = message.split(':');
-            const titleText = msg.shift();
-            const messageText = msg.join('').trim();
+            let messageText;
+            if (data.version !== 'v2') {
+                const msg = message.split(':');
+                messageText = msg.join('').trim();
+            } else if (Platform.OS === 'ios') {
+                messageText = message.body || message;
+            } else {
+                messageText = message;
+            }
 
-            const title = this.getNotificationTitle(titleText);
+            const title = this.getNotificationTitle(notification);
             const icon = this.getNotificationIcon();
 
             return (