historique agent nano credit OK & notification OK

App.js

@@ -9,10 +9,7 @@
 import React, { Component } from 'react';
 import { ActionSheetProvider, connectActionSheet } from '@expo/react-native-action-sheet'
 import { Platform, StyleSheet, Text, View, YellowBox, AsyncStorage } from 'react-native';
-import { createAppContainer, HeaderBackButton, createSwitchNavigator } from 'react-navigation';
+import { createAppContainer, HeaderBackButton, createSwitchNavigator, createStackNavigator, createBottomTabNavigator, createDrawerNavigator } from 'react-navigation';
-import { createStackNavigator } from 'react-navigation-stack';
-import { createBottomTabNavigator } from 'react-navigation-tabs';
-import { createDrawerNavigator } from 'react-navigation-drawer';
 import OneSignal from 'react-native-onesignal';
 import _ from 'lodash';
 import Connect from "./screens/login/Connect";
@@ -475,7 +472,7 @@ class App extends React.Component {
           //const dataParse = data.replace("'", "\"");
           console.warn("HANDLE DEEP LINK", data);
           this.goToScreen(data.screen, {
-               id: JSON.parse(data.data).id
+               id: data.data.id
           });
           /*           if (data && data.id) {
                          this.goToScreen(data.screen, {

android/app/src/main/res/raw/utils_i18n_en.json

@@ -173,6 +173,7 @@
   "AMOUNT_PARTIALLY_REFUND": "Amount partially refunded",
   "FINAL_DATE": "End date",
   "CASSATION_DATE": "Cassation date",
+  "VALIDATION_DATE": "Validation date",
 
   "DEMAND_DURATION_IN_MONTH": "Duration (in months)",
   "PAIEMENT_FACTURE": "Bill payment",

android/app/src/main/res/raw/utils_i18n_fr.json

@@ -180,6 +180,7 @@
   "AMOUNT_PARTIALLY_REFUND": "Montant partiellement remboursé",
   "FINAL_DATE": "Date de fin",
   "CASSATION_DATE": "Date de cassation",
+  "VALIDATION_DATE": "Date de validation",
 
   "DEMAND_DURATION_IN_MONTH": "Durée (en mois)",
   "PAIEMENT_FACTURE": "Paiement de facture",

package.json

@@ -76,10 +76,9 @@
     "react-native-tab-view": "^2.14.0",
     "react-native-textinput-effects": "^0.5.1",
     "react-native-vector-icons": "^6.5.0",
-    "react-navigation": "^4.4.0",
+    "react-navigation": "3.11.0",
     "react-navigation-drawer": "^1.4.0",
     "react-navigation-material-bottom-tabs": "^1.0.0",
-    "react-navigation-stack": "^1.7.3",
     "react-navigation-tabs": "^1.2.0",
     "react-navigation-transitions": "^1.0.12",
     "react-redux": "^7.2.0",

screens/home/Home.js

@@ -1532,7 +1532,7 @@ class Home extends BaseScreen {
 
                          text: I18n.t('REFUSED'),
                          onPress: () => {
-
+                              BackHandler.exitApp();
                          }
                     },
                     {

screens/notifications/Notifications.js

@@ -61,14 +61,15 @@ class Notifications extends BaseScreen {
                                    this.props.getNotificationAction({
                                         agent_code: user.code_membre
                                    });
-                              } else {
+                              }
+                         }
+                         else {
                               this.props.getNotificationAction({
                                    user_code: user.user_code
                               });
                          }
                     }
                }
-               }
           });
 
      }

screens/wallet/WalletOptionSelect.js

@@ -60,10 +60,11 @@ class WalletOptionSelect extends Component {
           readUser().then((user) => {
                if (user) {
                     if (user !== undefined) {
-                         if (typeof user.category === 'undefined') {
+                         if (user.category === undefined) {
                               this.props.getNanoCreditAccountAction(user.id);
                               this.props.getNanoCreditUserHistoryAction(user.id, true);
                          } else {
+                              if (user.category === 'geolocated')
                                    this.props.getNanoCreditUserHistoryAction(this.state.wallet.id, false);
                          }
                          this.setState({ user });
@@ -78,11 +79,12 @@ class WalletOptionSelect extends Component {
                     readUser().then((user) => {
                          if (user) {
                               if (user !== undefined) {
-                                   if (typeof user.category === 'undefined') {
+                                   if (user.category === undefined) {
                                         this.props.getNanoCreditAccountAction(user.id);
                                         this.props.getNanoCreditUserHistoryAction(user.id, true);
                                    } else {
-                                        this.props.getNanoCreditUserHistoryAction(user.agentId, false);
+                                        if (user.category === 'geolocated')
+                                             this.props.getNanoCreditUserHistoryAction(this.state.wallet.id, false);
                                    }
                               }
                          }
@@ -414,6 +416,7 @@ class WalletOptionSelect extends Component {
           return (
                <TouchableOpacity onPress={() => { this.setState({ displayModalHistory: true, historyItemDetail: item }) }} style={[styles.contentService, { borderBottomColor: Color.primaryColor }]}>
                     {
+
                          !isNil(this.state.user.category) ?
                               Object.keys(omit(item, ['id', 'retrait_cash', 'id_demande', 'montant_rembourse', 'partiellement_rembourse', 'duree_mois', 'etat', 'interet', 'taxe', 'date_validation', 'date_remboursement_prevu', 'date_remboursement', 'id_user', 'id_wallet_agent', 'id_network', 'user', 'user_phone', 'agent', 'codeParrain'])).map((element, i) => (
                                    <View style={{ alignItems: 'center' }} key={i}>
@@ -432,6 +435,9 @@ class WalletOptionSelect extends Component {
                                    </View>
                               ))
                               :
+                              readUser().then((user) => {
+                                   (user !== undefined) &&
+                                        (typeof user.category === 'undefined') &&
                                         Object.keys(omit(item, ['id', 'type', 'id_epargne', 'date_demande', 'id_demande', 'duree_mois', 'taxe', '', 'date_fin', 'date_cassation', 'etat', 'id_user', 'id_network', 'user', 'partiellement_rembourse', 'user_phone', 'type_caution', 'interet', 'date_remboursement_prevu', 'date_remboursement', 'id_wallet_agent', 'retrait_cash', 'codeParrain', 'agent', 'montant_rembourse', ''])).map((element, i) => (
                                              <View style={{ alignItems: 'center' }} key={i}>
 
@@ -448,6 +454,7 @@ class WalletOptionSelect extends Component {
                                                   </Text>
                                              </View>
                                         ))
+                              })
                     }
                </TouchableOpacity>
           );
@@ -461,8 +468,8 @@ class WalletOptionSelect extends Component {
                <Dialog.Container useNativeDriver={true} visible={this.state.displayModalHistory}>
 
                     <Dialog.Title>Détail de l'historique</Dialog.Title>
-
                     {
+                         isNil(this.state.user.category) ?
                               isEqual(historyItemDetail.type_historique, 'N') ?
                                    <ScrollView persistentScrollbar={true}>
                                         <View style={[styles.blockView, { borderBottomColor: Color.borderColor }]}>
@@ -671,9 +678,124 @@ class WalletOptionSelect extends Component {
                                              </View>
                                         </View>
                                    </View>
+
+                              : <ScrollView persistentScrollbar={true}>
+                                   <View style={[styles.blockView, { borderBottomColor: Color.borderColor }]}>
+                                        <View style={{ flexDirection: 'row', marginTop: 10 }}>
+                                             <View style={{ flex: 1 }}>
+                                                  <Text style={[styles.body2]}>Type</Text>
+                                             </View>
+                                             <View style={{ flex: 1, alignItems: 'flex-end' }}>
+                                                  <Text style={[Typography.caption1, Color.grayColor]}>{displayTransactionType(this.state.historyItemDetail.type_historique)}</Text>
+                                             </View>
+                                        </View>
+                                        <View style={{ flexDirection: 'row', marginTop: 10 }}>
+                                             <View style={{ flex: 1 }}>
+                                                  <Text style={[styles.body2]}>{I18n.t('ID_DEMAND')}</Text>
+                                             </View>
+                                             <View style={{ flex: 1, alignItems: 'flex-end' }}>
+                                                  <Text style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.id_demande}</Text>
+                                             </View>
+                                        </View>
+                                        <View style={{ flexDirection: 'row', marginTop: 10 }}>
+                                             <View style={{ flex: 1 }}>
+                                                  <Text style={[styles.body2]}>{I18n.t('STATUS')}</Text>
+                                             </View>
+                                             <View style={{ flex: 1, alignItems: 'flex-end' }}>
+                                                  <Text style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.etat}</Text>
+                                             </View>
+                                        </View>
+                                        <View style={{ flexDirection: 'row', marginTop: 10 }}>
+                                             <View style={{ flex: 1 }}>
+                                                  <Text style={[styles.body2]}>{I18n.t('DEMAND_DURATION_IN_MONTH')}</Text>
+                                             </View>
+                                             <View style={{ flex: 1, alignItems: 'flex-end' }}>
+                                                  <Text style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.duree_mois}</Text>
+                                             </View>
+                                        </View>
+                                        <View style={{ flexDirection: 'row', marginTop: 10 }}>
+                                             <View style={{ flex: 1 }}>
+                                                  <Text tyle={[Typography.body2]}>{I18n.t('AMOUNT')}</Text>
+                                             </View>
+                                             <View style={{ flex: 1, alignItems: 'flex-end' }}>
+                                                  <Text style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.montant + ' ' + this.state.wallet.currency_code}</Text>
+                                             </View>
+                                        </View>
+                                        <View style={{ flexDirection: 'row', marginTop: 10 }}>
+                                             <View style={{ flex: 1 }}>
+                                                  <Text tyle={[Typography.body2]}>{I18n.t('AMOUNT_REFUND')}</Text>
+                                             </View>
+                                             <View style={{ flex: 1, alignItems: 'flex-end' }}>
+                                                  <Text style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.montant_rembourse + ' ' + this.state.wallet.currency_code}</Text>
+                                             </View>
+                                        </View>
+                                        <View style={{ flexDirection: 'row', marginTop: 10 }}>
+                                             <View style={{ flex: 1 }}>
+                                                  <Text tyle={[Typography.body2]}>{I18n.t('AMOUNT_PARTIALLY_REFUND')}</Text>
+                                             </View>
+                                             <View style={{ flex: 1, alignItems: 'flex-end' }}>
+                                                  <Text style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.partiellement_rembourse + ' ' + this.state.wallet.currency_code}</Text>
+                                             </View>
+                                        </View>
+                                        <View style={{ flexDirection: 'row', marginTop: 10 }}>
+                                             <View style={{ flex: 1 }}>
+                                                  <Text tyle={[Typography.body2]}>{I18n.t('TAXES')}</Text>
+                                             </View>
+                                             <View style={{ flex: 1, alignItems: 'flex-end' }}>
+                                                  <Text style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.taxe + ' ' + this.state.wallet.currency_code}</Text>
+                                             </View>
+                                        </View>
+                                        <View style={{ flexDirection: 'row', marginTop: 10 }}>
+                                             <View style={{ flex: 1 }}>
+                                                  <Text tyle={[Typography.body2]}>{I18n.t('INTERET')}</Text>
+                                             </View>
+                                             <View style={{ flex: 1, alignItems: 'flex-end' }}>
+                                                  <Text style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.interet + ' ' + this.state.wallet.currency_code}</Text>
+                                             </View>
+                                        </View>
+                                        <View style={{ flexDirection: 'row', marginTop: 10 }}>
+                                             <View style={{ flex: 1 }}>
+                                                  <Text tyle={[Typography.body2]}>{I18n.t('WITHDRAWAL_IN_CASH')}</Text>
+                                             </View>
+                                             <View style={{ flex: 1, alignItems: 'flex-end' }}>
+                                                  <Text style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.retrait_cash + ' ' + this.state.wallet.currency_code}</Text>
+                                             </View>
+                                        </View>
+                                        <View style={{ flexDirection: 'row', marginTop: 10 }}>
+                                             <View style={{ flex: 1 }}>
+                                                  <Text style={[styles.body2]}>{I18n.t('CREATION_DATE')}</Text>
+                                             </View>
+                                             <View style={{ flex: 1, alignItems: 'flex-end' }}>
+                                                  <Text style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.date_creation}</Text>
+                                             </View>
+                                        </View>
+                                        <View style={{ flexDirection: 'row', marginTop: 10 }}>
+                                             <View style={{ flex: 1 }}>
+                                                  <Text tyle={[Typography.body2]}>{I18n.t('VALIDATION_DATE')}</Text>
+                                             </View>
+                                             <View style={{ flex: 1, alignItems: 'flex-end' }}>
+                                                  <Text style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.date_validation}</Text>
+                                             </View>
+                                        </View>
+                                        <View style={{ flexDirection: 'row', marginTop: 10 }}>
+                                             <View style={{ flex: 1 }}>
+                                                  <Text tyle={[Typography.body2]}>{I18n.t('DATE_REMBOURSEMENT_PREVU')}</Text>
+                                             </View>
+                                             <View style={{ flex: 1, alignItems: 'flex-end' }}>
+                                                  <Text style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.date_remboursement_prevu}</Text>
+                                             </View>
+                                        </View>
+                                        <View style={{ flexDirection: 'row', marginTop: 10 }}>
+                                             <View style={{ flex: 1 }}>
+                                                  <Text tyle={[Typography.body2]}>{I18n.t('DATE_REMBOURSEMENT')}</Text>
+                                             </View>
+                                             <View style={{ flex: 1, alignItems: 'flex-end' }}>
+                                                  <Text style={[Typography.caption1, Color.grayColor]}>{this.state.historyItemDetail.date_remboursement}</Text>
+                                             </View>
+                                        </View>
+                                   </View>
+                              </ScrollView>
                     }
-
-
                     <Dialog.Button bold={true} label={I18n.t('OK')} onPress={() => {
                          this.setState({
                               displayModalHistory: !this.state.displayModalHistory,
@@ -715,7 +837,7 @@ class WalletOptionSelect extends Component {
                                              </>
                                         }
                                    </View>
-                              ) :
+                              ) : !isNil(this.state.user) &&
                               this.renderHistoryTransactionList()
 
                     }

utils/i18n/en.json

@@ -173,6 +173,7 @@
   "AMOUNT_PARTIALLY_REFUND": "Amount partially refunded",
   "FINAL_DATE": "End date",
   "CASSATION_DATE": "Cassation date",
+  "VALIDATION_DATE": "Validation date",
 
   "DEMAND_DURATION_IN_MONTH": "Duration (in months)",
   "PAIEMENT_FACTURE": "Bill payment",

utils/i18n/fr.json

@@ -180,6 +180,7 @@
   "AMOUNT_PARTIALLY_REFUND": "Montant partiellement remboursé",
   "FINAL_DATE": "Date de fin",
   "CASSATION_DATE": "Date de cassation",
+  "VALIDATION_DATE": "Date de validation",
 
   "DEMAND_DURATION_IN_MONTH": "Durée (en mois)",
   "PAIEMENT_FACTURE": "Paiement de facture",

yarn.lock

@@ -1003,23 +1003,24 @@
   resolved "https://registry.yarnpkg.com/@react-native-community/viewpager/-/viewpager-3.3.0.tgz#e613747a43a31a6f3278f817ba96fdaaa7941f23"
   integrity sha512-tyzh79l4t/hxiyS9QD3LRmWMs8KVkZzjrkQ8U8+8To1wmvVCBtp8BenvNsDLTBO7CpO/YmiThpmIdEZMr1WuVw==
 
-"@react-navigation/core@^3.7.6":
+"@react-navigation/core@~3.4.1":
-  version "3.7.6"
+  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-3.7.6.tgz#e0244fcdc22937825b252197f70308bbe5709c58"
+  resolved "https://registry.yarnpkg.com/@react-navigation/core/-/core-3.4.2.tgz#bec563e94fde40fbab3730cdc97f22afbb2a1498"
-  integrity sha512-loYFIn0Boy7C+vYxwcqsBVRFRO1EizZJErdutE6/3Jw6dbzz3Bnzupbw5hckZNB16GckacMwGoepZNIK51IIcg==
+  integrity sha512-7G+iDzLSTeOUU4vVZeRZKJ+Bd7ds7ZxYNqZcB8i0KlBeQEQfR74Ounfu/p0KIEq2RiNnaE3QT7WVP3C87sebzw==
   dependencies:
-    hoist-non-react-statics "^3.3.2"
+    hoist-non-react-statics "^3.3.0"
-    path-to-regexp "^1.8.0"
+    path-to-regexp "^1.7.0"
-    query-string "^6.11.1"
+    query-string "^6.4.2"
-    react-is "^16.13.0"
+    react-is "^16.8.6"
 
-"@react-navigation/native@^3.8.0":
+"@react-navigation/native@~3.5.0":
-  version "3.8.0"
+  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/@react-navigation/native/-/native-3.8.0.tgz#35882c3fc2f997ea1a43c12a15088cf4c818fd92"
+  resolved "https://registry.yarnpkg.com/@react-navigation/native/-/native-3.5.0.tgz#f5d16e0845ac26d1147d1caa481f18a00740e7ae"
-  integrity sha512-Uym5XdNOTpTR6XC4IVa/Shfn12DUF3DUIqch+cpiLNfvauQukVmWoz+Rfxd2faGOzxT12EhrWGFsMJ/8nuTfcw==
+  integrity sha512-TmGOis++ejEXG3sqNJhCSKqB0/qLu3FQgDtO959qpqif36R/diR8SQwJqeSdofoEiK3CepdhFlTCeHdS1/+MsQ==
   dependencies:
-    hoist-non-react-statics "^3.3.2"
+    hoist-non-react-statics "^3.0.1"
-    react-native-safe-area-view "^0.14.9"
+    react-native-safe-area-view "^0.14.1"
+    react-native-screens "^1.0.0 || ^1.0.0-alpha"
 
 "@types/babel__core@^7.1.0":
   version "7.1.6"
@@ -3860,7 +3861,7 @@ hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.0:
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"
   integrity sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==
 
-hoist-non-react-statics@^3.0.1, hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
+hoist-non-react-statics@^3.0.1, hoist-non-react-statics@^3.1.0, hoist-non-react-statics@^3.3.0:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
   integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
@@ -6064,7 +6065,7 @@ path-parse@^1.0.6:
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
   integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
 
-path-to-regexp@^1.8.0:
+path-to-regexp@^1.7.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-1.8.0.tgz#887b3ba9d84393e87a0a0b9f4cb756198b53548a"
   integrity sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==
@@ -6273,10 +6274,10 @@ qs@~6.5.2:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
   integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
-query-string@^6.11.1:
+query-string@^6.4.2:
-  version "6.13.2"
+  version "6.13.5"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.13.2.tgz#3585aa9412c957cbd358fd5eaca7466f05586dda"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.13.5.tgz#99e95e2fb7021db90a6f373f990c0c814b3812d8"
-  integrity sha512-BMmDaUiLDFU1hlM38jTFcRt7HYiGP/zt1sRzrIWm5zpeEuO1rkbPS0ELI3uehoLuuhHDCS8u8lhFN3fEN4JzPQ==
+  integrity sha512-svk3xg9qHR39P3JlHuD7g3nRnyay5mHbrPctEBDUxUkHRifPHXJDhBUycdCC0NBjXoDf44Gb+IsOZL1Uwn8M/Q==
   dependencies:
     decode-uri-component "^0.2.0"
     split-on-first "^1.0.0"
@@ -6332,7 +6333,7 @@ react-is@^16.12.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.3, react-i
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.0.tgz#0f37c3613c34fe6b37cd7f763a0d6293ab15c527"
   integrity sha512-GFMtL0vHkiBv9HluwNZTggSn/sCyEt9n02aM0dSAjGGyqyNlAyftYm4phPxdvCigG15JreC5biwxCgTAJZ7yAA==
 
-react-is@^16.13.0, react-is@^16.9.0:
+react-is@^16.8.6, react-is@^16.9.0:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
@@ -6713,7 +6714,7 @@ react-native-safe-area-view@^0.12.0:
   dependencies:
     hoist-non-react-statics "^2.3.1"
 
-react-native-safe-area-view@^0.14.9:
+react-native-safe-area-view@^0.14.1:
   version "0.14.9"
   resolved "https://registry.yarnpkg.com/react-native-safe-area-view/-/react-native-safe-area-view-0.14.9.tgz#90ee8383037010d9a5055a97cf97e4c1da1f0c3d"
   integrity sha512-WII/ulhpVyL/qbYb7vydq7dJAfZRBcEhg4/UWt6F6nAKpLa3gAceMOxBxI914ppwSP/TdUsandFy6lkJQE0z4A==
@@ -6727,6 +6728,13 @@ react-native-safe-modules@^1.0.0:
   dependencies:
     dedent "^0.6.0"
 
+"react-native-screens@^1.0.0 || ^1.0.0-alpha":
+  version "1.0.0-alpha.23"
+  resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-1.0.0-alpha.23.tgz#25d7ea4d11bda4fcde2d1da7ae50271c6aa636e0"
+  integrity sha512-tOxHGQUN83MTmQB4ghoQkibqOdGiX4JQEmeyEv96MKWO/x8T2PJv84ECUos9hD3blPRQwVwSpAid1PPPhrVEaw==
+  dependencies:
+    debounce "^1.2.0"
+
 react-native-screens@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-2.3.0.tgz#fd2b0c841f4fdebb2937c0e84acccc62bf9ebb22"
@@ -6860,6 +6868,13 @@ react-navigation-drawer@^1.4.0:
   dependencies:
     react-native-tab-view "^1.2.0"
 
+react-navigation-drawer@~1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/react-navigation-drawer/-/react-navigation-drawer-1.2.1.tgz#7bd5efeee7d2f611d3ebb0933e0c8e8eb7cafe52"
+  integrity sha512-T2kaBjY2c4/3I6noWFnaf/c18ntNH5DsST38i+pdc2NPxn5Yi5lkK+ZZTeKuHSFD4a7G0jWY9OGf1iRkHWLMAQ==
+  dependencies:
+    react-native-tab-view "^1.2.0"
+
 react-navigation-material-bottom-tabs@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/react-navigation-material-bottom-tabs/-/react-navigation-material-bottom-tabs-1.1.1.tgz#17e12719958c1d6770b3138789608f54d5cb7f57"
@@ -6869,12 +6884,10 @@ react-navigation-material-bottom-tabs@^1.0.0:
     prop-types "^15.6.0"
     react-navigation-tabs "~1.2.0"
 
-react-navigation-stack@^1.7.3:
+react-navigation-stack@~1.4.0:
-  version "1.10.3"
+  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/react-navigation-stack/-/react-navigation-stack-1.10.3.tgz#e714e442b20427f0d2d3c18fce1f9e8cfe69be0b"
+  resolved "https://registry.yarnpkg.com/react-navigation-stack/-/react-navigation-stack-1.4.0.tgz#69cdb029ea4ee5877d7e933b3117dc90bc841eb2"
-  integrity sha512-1gksFi/g/Lg9sBhgLlD0OiEB5xnatHb4C0eNMA5tli9cTVlhq375XNPIqOiTyftibBmjdApAsZFj5srUCoOu/w==
+  integrity sha512-zEe9wCA0Ot8agarYb//0nSWYW1GM+1R0tY/nydUV0EizeJ27At0EklYVWvYEuYU6C48va6cu8OPL7QD/CcJACw==
-  dependencies:
-    prop-types "^15.7.2"
 
 react-navigation-tabs@^1.2.0, react-navigation-tabs@~1.2.0:
   version "1.2.0"
@@ -6885,18 +6898,31 @@ react-navigation-tabs@^1.2.0, react-navigation-tabs@~1.2.0:
     prop-types "^15.6.1"
     react-native-tab-view "^1.4.1"
 
+react-navigation-tabs@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/react-navigation-tabs/-/react-navigation-tabs-1.1.4.tgz#00a312250df3c519c60b7815a523ace5ee11163a"
+  integrity sha512-py2hLCRxPwXOzmY1W9XcY1rWXxdK6RGW/aXh56G9gIf8cpHNDhy/bJV4e46/JrVcse3ybFaN0liT09/DM/NdwQ==
+  dependencies:
+    hoist-non-react-statics "^2.5.0"
+    prop-types "^15.6.1"
+    react-lifecycles-compat "^3.0.4"
+    react-native-tab-view "^1.4.1"
+
 react-navigation-transitions@^1.0.12:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/react-navigation-transitions/-/react-navigation-transitions-1.0.12.tgz#7307668bc7d5fdbdc1954224e7891f7fe6cb5f74"
   integrity sha512-Hp0wX9KoXwsFch6Fgiz9HpGjQZDhnyucLbCai0LcaOC3VpmgYmvkbeAg/mQ5Z5exuY6PPrh/+FXU00yMPDHkcw==
 
-react-navigation@^4.4.0:
+react-navigation@3.11.0:
-  version "4.4.0"
+  version "3.11.0"
-  resolved "https://registry.yarnpkg.com/react-navigation/-/react-navigation-4.4.0.tgz#c5523669df642aab23ff9e2ceb2109d3492a9374"
+  resolved "https://registry.yarnpkg.com/react-navigation/-/react-navigation-3.11.0.tgz#2c82217c452d07d8b9b0929bc7e77e2bcfaf9388"
-  integrity sha512-BtxqNNlEGm/ve1mGHxCvrtvDzZ+2OF/V9OJaDPz/Cdx2VvYiFGaq6mtlFQm5/2bLxiEVXhNFcYSTCP26YGiENA==
+  integrity sha512-wlPcDtNiIdPeYxNQ/MN4arY5Xe9EphD2QVpRuvvuPWW+BamF3AJaIy060r3Yz59DODAoWllscabat/yqnih8Tg==
   dependencies:
-    "@react-navigation/core" "^3.7.6"
+    "@react-navigation/core" "~3.4.1"
-    "@react-navigation/native" "^3.8.0"
+    "@react-navigation/native" "~3.5.0"
+    react-navigation-drawer "~1.2.1"
+    react-navigation-stack "~1.4.0"
+    react-navigation-tabs "~1.1.4"
 
 react-proxy@^1.1.7:
   version "1.1.8"