From e43d6dc6b16318437af75a2ee161fee606c6a860 Mon Sep 17 00:00:00 2001
From: Brice Zele <bricezele1@gmail.com>
Date: Wed, 19 Aug 2020 04:53:12 +0100
Subject: [PATCH] Demands Detail OK

---
 App.js                                             | 14 +++++++-------
 package.json                                       |  1 -
 screens/nano-credit/DemandGroupNanoCredit.js       |  4 ++--
 screens/nano-credit/DemandGroupNanoCreditDetail.js |  3 ++-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/App.js b/App.js
index f751978b..4e1a824f 100644
--- a/App.js
+++ b/App.js
@@ -145,7 +145,7 @@ const AppStack = createDrawerNavigator({
                          },
                     }
                }),
-               navigationOptions: ({ navigation }) => ({
+               navigationOptions: () => ({
                     header: null,
                     headerMode: 'none',
                     headerTitle: null,
@@ -187,7 +187,7 @@ const AppAgentStack = createDrawerNavigator({
                          },
                     }
                }),
-               navigationOptions: ({ navigation }) => ({
+               navigationOptions: () => ({
                     header: null,
                     headerMode: 'none',
                     headerTitle: null,
@@ -251,7 +251,7 @@ const AppAdministratorStack = createDrawerNavigator({
                          },
                     }
                }),
-               navigationOptions: ({ navigation }) => ({
+               navigationOptions: () => ({
                     header: null,
                     headerMode: 'none',
                     headerTitle: null,
@@ -304,7 +304,7 @@ const AppSuperAdministrator = createDrawerNavigator({
                          },
                     }
                }),
-               navigationOptions: ({ navigation }) => ({
+               navigationOptions: () => ({
                     title: I18n.t('CREDIT_MANAGE'),
                     headerMode: "none",
                     header: null,
@@ -350,8 +350,8 @@ const AppContainer = createAppContainer(AppNavigator);
 class App extends React.Component {
 
 
-     constructor(properties) {
-          super(properties);
+     constructor(props) {
+          super(props);
           console.log("APP PROPS", this.props);
 
           //Remove this method to stop OneSignal Debugging 
@@ -400,7 +400,7 @@ class App extends React.Component {
 
      onOpened(openResult) {
           let data = openResult.notification.payload.additionalData;
-          NavigationService.navigate('useraccount');
+          //this.handleDeepLink(openResult);
           console.log('Message: ', openResult.notification.payload.body);
           console.log('Data: ', openResult.notification.payload.additionalData);
           console.log('isActive: ', openResult.notification.isAppInFocus);
diff --git a/package.json b/package.json
index df108814..6cb2b5be 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,6 @@
     "react-native-material-cards": "^1.0.9",
     "react-native-material-dialog": "^0.7.6",
     "react-native-material-dropdown": "^0.11.1",
-    "react-native-onesignal": "^3.9.0",
     "react-native-paper": "^2.16.0",
     "react-native-phone-call": "^1.0.9",
     "react-native-popup-dialog": "^0.18.3",
diff --git a/screens/nano-credit/DemandGroupNanoCredit.js b/screens/nano-credit/DemandGroupNanoCredit.js
index c3ba1722..52d15a52 100644
--- a/screens/nano-credit/DemandGroupNanoCredit.js
+++ b/screens/nano-credit/DemandGroupNanoCredit.js
@@ -125,7 +125,7 @@ class DemandValidationGroup extends React.Component {
           this.navigation = this.props.navigation
           this.currentLocale = DeviceInfo.getDeviceLocale().includes("fr") ? "fr" : "en-gb";
           //moment.locale(this.currentLocale);
-          IlinkEmitter.on('treatNanoGroupDemand', this.refreshData);
+          //IlinkEmitter.on('treatNanoGroupDemand', this.refreshData);
      };
 
      componentDidMount() {
@@ -297,7 +297,7 @@ class DemandValidationGroup extends React.Component {
      }
 
      refreshData() {
-          this.props.getNanoCreditDemandsAction(this.state.user.id);
+          //this.props.getNanoCreditDemandsAction(this.state.user.id);
      }
 
      render() {
diff --git a/screens/nano-credit/DemandGroupNanoCreditDetail.js b/screens/nano-credit/DemandGroupNanoCreditDetail.js
index c6c2e15b..a972cd3e 100644
--- a/screens/nano-credit/DemandGroupNanoCreditDetail.js
+++ b/screens/nano-credit/DemandGroupNanoCreditDetail.js
@@ -25,6 +25,7 @@ import { FontWeight } from '../../config/typography'
 import DeviceInfo from 'react-native-device-info'
 import { getNanoCreditUniqueDemandsAction, getNanoCreditUniqueDemandsReset } from '../../webservice/user/NanoCreditApi'
 import { treatDemandGroupAction, treatDemandGroupReset } from '../../webservice/NanoCreditApi'
+import { IlinkEmitter } from '../../utils/events';
 
 class DemandGroupNanoCreditDetail extends Component {
 
@@ -162,7 +163,7 @@ class DemandGroupNanoCreditDetail extends Component {
                if (resultTreatDemand.status === 200) {
                     this.displayToast(resultTreatDemand.response);
                     this.props.navigation.goBack();
-                    IlinkEmitter.emit('treatNanoGroupDemand');
+                    //IlinkEmitter.emit('treatNanoGroupDemand');
                     this.props.treatDemandGroupReset();
                }
           }