From afc93e01ad92b882ff641b7c53b03d1011358086 Mon Sep 17 00:00:00 2001
From: Sacha Froment <sfroment42@gmail.com>
Date: Fri, 15 Mar 2019 10:57:02 +0100
Subject: [PATCH] fix(mobile): fix badges road

Signed-off-by: Sacha Froment <sfroment42@gmail.com>
---
 .../common/components/Navigator/BottomNavigator.js    | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/client/react-native/common/components/Navigator/BottomNavigator.js b/client/react-native/common/components/Navigator/BottomNavigator.js
index e27dedb5e3..2d562fb667 100644
--- a/client/react-native/common/components/Navigator/BottomNavigator.js
+++ b/client/react-native/common/components/Navigator/BottomNavigator.js
@@ -35,7 +35,7 @@ class TabBarIconBase extends Component {
       shouldRefresh: false,
       stored: [],
       queryList: queries.EventList.graphql,
-      queryVariables: props.routeName === 'contacts'
+      queryVariables: props.routeName === 'contacts' || props.routeName === 'side/contacts'
         ? merge([queries.EventList.defaultVariables, {
           filter: {
             kind: 201,
@@ -49,7 +49,7 @@ class TabBarIconBase extends Component {
             direction: 1,
           },
         }]),
-      subscription: props.routeName === 'contacts'
+      subscription: props.routeName === 'contacts' || props.routeName === 'side/contacts'
         ? [subscriptions.contactRequest]
         : [subscriptions.message],
     }
@@ -70,14 +70,13 @@ class TabBarIconBase extends Component {
     const idx = stored.indexOf(id)
 
     if (idx === -1 && seenAt === null) {
-      console.log('props.data', props.data)
       this.setState({
         stored: [
           ...stored,
           id,
         ],
       })
-    } else if (idx !== -1 && routeName === 'chats' && new Date(seenAt).getTime() > 0) {
+    } else if (idx !== -1 && (routeName === 'chats' || routeName === 'side/chats') && new Date(seenAt).getTime() > 0) {
       stored.splice(stored.indexOf(id), 1)
       this.setState({
         stored,
@@ -127,11 +126,11 @@ class TabBarIconBase extends Component {
       'side/settings': 'settings',
     }[routeName]
 
-    if (routeName === 'contacts' && navigation.isFocused() === true) {
+    if ((routeName === 'contacts' || routeName === 'side/contacts') && navigation.isFocused() === true) {
       this.contactSeen()
     }
 
-    return routeName === 'settings'
+    return routeName === 'settings' || routeName === 'side/settings'
       ? (
         <UpdateContext.Consumer>
           {({ availableUpdate }) => (