fix(mobile): fix update badge

Signed-off-by: Sacha Froment <sfroment42@gmail.com>
berty · Feb 28, 2019 · cdfb3c3 · cdfb3c3
1 parent ead32ed
commit cdfb3c3
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 17 deletions.
diff --git a/client/react-native/common/components/App.js b/client/react-native/common/components/App.js
@@ -106,6 +106,7 @@ export default class App extends PureComponent {
       process.env['ENVIRONMENT'] !== 'integration_test' &&
       Platform.OS !== 'web',
     relayContext: null,
+    availableUpdate: false,
     deepLink: {
       routeName: 'main',
       params: {},
@@ -206,7 +207,7 @@ export default class App extends PureComponent {
     this.setState({ deepLink })
   }
 
-  setStateBis = (i, f) => {
+  setStateContext = (i, f) => {
     this.setState(i, () => {
       if (i.relayContext !== null && i.loading === false) {
         this.setState({
@@ -218,7 +219,7 @@ export default class App extends PureComponent {
   }
 
   render () {
-    const { loading, deepLink, showAnim, relayContext } = this.state
+    const { loading, deepLink, showAnim, relayContext, availableUpdate } = this.state
 
     return (
       <I18nextProvider i18n={i18n}>
@@ -239,9 +240,10 @@ export default class App extends PureComponent {
             </Flex.Rows>
           ) : null }
           { !loading
-            ? <RelayContext.Provider value={{ ...relayContext, setStateBis: this.setStateBis }}>
+            ? <RelayContext.Provider value={{ ...relayContext, setState: this.setStateContext }}>
               <AppContainer
                 screenProps={{
+                  availableUpdate,
                   deepLink,
                   setDeepLink: (deepLink) => this.setDeepLink(deepLink),
                   clearDeepLink: () => this.clearDeepLink(),

diff --git a/client/react-native/common/components/Navigator/BottomNavigator.js b/client/react-native/common/components/Navigator/BottomNavigator.js
@@ -25,12 +25,18 @@ const TabBarIcon = (tintColor, routeName, badgeValue) => {
   )
 }
 
-const handleBothNavigationsOptions = ({ navigation, screenProps }) => {
+const handleBothNavigationsOptions = (
+  {
+    navigation,
+    screenProps: {
+      availableUpdate,
+    },
+  }) => {
   let badge = null
 
   if (
     navigation.state.routeName === 'settings' &&
-    screenProps.availableUpdate
+    availableUpdate
   ) {
     badge = '!'
   }

diff --git a/client/react-native/common/components/Navigator/DevtoolsNavigator.js b/client/react-native/common/components/Navigator/DevtoolsNavigator.js
@@ -15,12 +15,22 @@ export default createStackNavigator(
   {
     'devtools/list': List,
     'devtools/database': Database,
-    'devtools/network': DevtoolsNetworkNavigator,
+    'devtools/network': {
+      screen: DevtoolsNetworkNavigator,
+      navigationOptions: () => ({
+        header: null,
+      }),
+    },
     'devtools/eventlist': EventList,
     'devtools/eventlistfilter': EventListFilterModal,
     'devtools/eventdetails': EventDetails,
     'devtools/deviceinfos': DeviceInfos,
-    'devtools/logs': DevtoolsLogNavigator,
+    'devtools/logs': {
+      screen: DevtoolsLogNavigator,
+      navigationOptions: () => ({
+        header: null,
+      }),
+    },
     'devtools/tests': Tests,
     'devtools/testresult': TestResult,
     'devtools/language': Language,

diff --git a/client/react-native/common/components/Screens/Accounts/Auth.js b/client/react-native/common/components/Screens/Accounts/Auth.js
@@ -147,7 +147,7 @@ class Auth extends PureComponent {
     await this.start(nickname)
     const context = await this.getRelayContext()
     const availableUpdate = await getAvailableUpdate(context)
-    this.props.context.setStateBis(
+    this.props.context.setState(
       {
         relayContext: context,
         availableUpdate: availableUpdate,

diff --git a/client/react-native/common/components/Screens/Contacts/Detail/Detail.js b/client/react-native/common/components/Screens/Contacts/Detail/Detail.js
@@ -5,6 +5,7 @@ import React, { PureComponent } from 'react'
 
 import { Menu, Header, Screen, Avatar } from '../../../Library'
 import { colors } from '../../../../constants'
+import withRelayContext from '../../../../helpers/withRelayContext'
 
 class Detail extends PureComponent {
   static navigationOptions = ({ navigation }) => ({
@@ -69,7 +70,7 @@ class Detail extends PureComponent {
 
   deleteContact = async () => {
     try {
-      await this.props.screenProps.context.mutations.contactRemove({
+      await this.props.context.mutations.contactRemove({
         id: this.props.navigation.getParam('contact').id,
       })
       this.props.navigation.goBack(null)
@@ -132,4 +133,4 @@ class Detail extends PureComponent {
   }
 }
 
-export default withNamespaces()(Detail)
+export default withRelayContext(withNamespaces()(Detail))
diff --git a/client/react-native/common/components/Screens/Settings/Devtools/EventList.js b/client/react-native/common/components/Screens/Settings/Devtools/EventList.js
@@ -91,7 +91,7 @@ const Item = fragments.Event(({ data, navigation }) => (
   </TouchableOpacity>
 ))
 
-export default class EventList extends PureComponent {
+class EventList extends PureComponent {
   state = {
     search: '',
   }
@@ -136,9 +136,7 @@ export default class EventList extends PureComponent {
   render () {
     const {
       navigation,
-      screenProps: {
-        context: { queries },
-      },
+      context: { queries },
     } = this.props
     return (
       <Screen style={{ backgroundColor: colors.white }}>
@@ -212,3 +210,4 @@ class EventListFilterModalWithContext extends PureComponent {
 }
 
 export const EventListFilterModal = withRelayContext(EventListFilterModalWithContext)
+export default withRelayContext(EventList)
diff --git a/client/react-native/common/components/Screens/Settings/Devtools/Logs.js b/client/react-native/common/components/Screens/Settings/Devtools/Logs.js
@@ -8,7 +8,7 @@ import {
   ActivityIndicator,
   Linking,
 } from 'react-native'
-import React, { PureComponent, Component } from 'react'
+import React, { PureComponent } from 'react'
 
 import { Menu, Header, Text, Flex } from '../../../Library'
 import { borderBottom } from '../../../../styles'
@@ -22,7 +22,7 @@ var maxBufferSize = 10000
 var antispamModalOpen = false
 var antispamModalSave = false
 
-export class FilterModal extends Component {
+export class FilterModal extends PureComponent {
   static navigationOptions = ({ navigation }) => ({
     header: (
       <Header
@@ -338,7 +338,7 @@ class Line extends PureComponent {
   }
 }
 
-class LogStreamWithContext extends Component {
+class LogStreamWithContext extends PureComponent {
   static navigationOptions = ({ navigation }) => ({
     header: (
       <Header