FIX: Change propType to correct type. Fixed an issue where goBack wou…

…ldnt pop the stack navigation
appbootup · Feb 1, 2019 · a440c61 · a440c61
1 parent 157c407
commit a440c61
Show file tree

Hide file tree

Showing 17 changed files with 45 additions and 45 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -71,7 +71,7 @@
     "react-native-fs": "^2.13.3",
     "react-native-gesture-handler": "^1.0.15",
     "react-native-google-analytics-bridge": "^7.0.0",
-    "react-native-haptic-feedback": "^1.4.2",
+    "react-native-haptic-feedback": "^1.5.0",
     "react-native-image-picker": "^0.28.0",
     "react-native-level-fs": "^3.0.1",
     "react-native-linear-gradient": "^2.5.3",

diff --git a/screen/lnd/browser.js b/screen/lnd/browser.js
@@ -495,7 +495,7 @@ export default class Browser extends Component {
 
 Browser.propTypes = {
   navigation: PropTypes.shape({
-    getParam: PropTypes.function,
+    getParam: PropTypes.func,
     navigate: PropTypes.func,
   }),
 };
diff --git a/screen/lnd/lndCreateInvoice.js b/screen/lnd/lndCreateInvoice.js
@@ -116,7 +116,7 @@ export default class LNDCreateInvoice extends Component {
 
 LNDCreateInvoice.propTypes = {
   navigation: PropTypes.shape({
-    goBack: PropTypes.function,
+    goBack: PropTypes.func,
     navigate: PropTypes.func,
     getParam: PropTypes.func,
   }),

diff --git a/screen/lnd/lndViewAdditionalInvoiceInformation.js b/screen/lnd/lndViewAdditionalInvoiceInformation.js
@@ -82,8 +82,8 @@ export default class LNDViewAdditionalInvoiceInformation extends Component {
 
 LNDViewAdditionalInvoiceInformation.propTypes = {
   navigation: PropTypes.shape({
-    goBack: PropTypes.function,
-    getParam: PropTypes.function,
-    dismiss: PropTypes.function,
+    goBack: PropTypes.func,
+    getParam: PropTypes.func,
+    dismiss: PropTypes.func,
   }),
 };
diff --git a/screen/lnd/lndViewInvoice.js b/screen/lnd/lndViewInvoice.js
@@ -236,9 +236,9 @@ export default class LNDViewInvoice extends Component {
 
 LNDViewInvoice.propTypes = {
   navigation: PropTypes.shape({
-    goBack: PropTypes.function,
-    navigate: PropTypes.function,
-    getParam: PropTypes.function,
-    dismiss: PropTypes.function,
+    goBack: PropTypes.func,
+    navigate: PropTypes.func,
+    getParam: PropTypes.func,
+    dismiss: PropTypes.func,
   }),
 };
diff --git a/screen/lnd/manageFunds.js b/screen/lnd/manageFunds.js
@@ -83,10 +83,10 @@ export default class ManageFunds extends Component {
 
 ManageFunds.propTypes = {
   navigation: PropTypes.shape({
-    goBack: PropTypes.function,
-    dismiss: PropTypes.function,
-    navigate: PropTypes.function,
-    getParam: PropTypes.function,
+    goBack: PropTypes.func,
+    dismiss: PropTypes.func,
+    navigate: PropTypes.func,
+    getParam: PropTypes.func,
     state: PropTypes.shape({
       params: PropTypes.shape({
         fromSecret: PropTypes.string,

diff --git a/screen/lnd/scanLndInvoice.js b/screen/lnd/scanLndInvoice.js
@@ -258,10 +258,10 @@ export default class ScanLndInvoice extends React.Component {
 
 ScanLndInvoice.propTypes = {
   navigation: PropTypes.shape({
-    goBack: PropTypes.function,
-    navigate: PropTypes.function,
-    getParam: PropTypes.function,
-    dismiss: PropTypes.function,
+    goBack: PropTypes.func,
+    navigate: PropTypes.func,
+    getParam: PropTypes.func,
+    dismiss: PropTypes.func,
     state: PropTypes.shape({
       params: PropTypes.shape({
         uri: PropTypes.string,

diff --git a/screen/receive/details.js b/screen/receive/details.js
@@ -130,8 +130,8 @@ export default class ReceiveDetails extends Component {
 
 ReceiveDetails.propTypes = {
   navigation: PropTypes.shape({
-    goBack: PropTypes.function,
-    navigate: PropTypes.function,
+    goBack: PropTypes.func,
+    navigate: PropTypes.func,
     state: PropTypes.shape({
       params: PropTypes.shape({
         address: PropTypes.string,

diff --git a/screen/send/confirm.js b/screen/send/confirm.js
@@ -146,10 +146,10 @@ const styles = StyleSheet.create({
 
 Confirm.propTypes = {
   navigation: PropTypes.shape({
-    goBack: PropTypes.function,
-    getParam: PropTypes.function,
-    navigate: PropTypes.function,
-    dismiss: PropTypes.function,
+    goBack: PropTypes.func,
+    getParam: PropTypes.func,
+    navigate: PropTypes.func,
+    dismiss: PropTypes.func,
     state: PropTypes.shape({
       params: PropTypes.shape({
         amount: PropTypes.string,

diff --git a/screen/send/create.js b/screen/send/create.js
@@ -108,10 +108,10 @@ const styles = StyleSheet.create({
 
 SendCreate.propTypes = {
   navigation: PropTypes.shape({
-    goBack: PropTypes.function,
-    getParam: PropTypes.function,
-    navigate: PropTypes.function,
-    dismiss: PropTypes.function,
+    goBack: PropTypes.func,
+    getParam: PropTypes.func,
+    navigate: PropTypes.func,
+    dismiss: PropTypes.func,
     state: PropTypes.shape({
       params: PropTypes.shape({
         amount: PropTypes.string,

diff --git a/screen/send/details.js b/screen/send/details.js
@@ -132,7 +132,7 @@ export default class SendDetails extends Component {
     try {
       const cachedNetworkTransactionFees = JSON.parse(await AsyncStorage.getItem(NetworkTransactionFee.StorageKey));
 
-      if (cachedNetworkTransactionFees.halfHourFee) {
+      if (cachedNetworkTransactionFees && cachedNetworkTransactionFees.hasOwnProperty('halfHourFee')) {
         this.setState({
           fee: cachedNetworkTransactionFees.halfHourFee,
           networkTransactionFees: cachedNetworkTransactionFees,
@@ -142,7 +142,7 @@ export default class SendDetails extends Component {
     } catch (_) {}
 
     let recommendedFees = await NetworkTransactionFees.recommendedFees();
-    if (recommendedFees.halfHourFee) {
+    if (recommendedFees && recommendedFees.hasOwnProperty('halfHourFee')) {
       await AsyncStorage.setItem(NetworkTransactionFee.StorageKey, JSON.stringify(recommendedFees));
       this.setState({
         fee: recommendedFees.halfHourFee,
@@ -408,9 +408,9 @@ export default class SendDetails extends Component {
   }
 
   onWalletSelect = wallet => {
-    this.setState({ fromAddress: wallet.getAddress(), fromSecret: wallet.getSecret(), fromWallet: wallet }, () =>
-      this.props.navigation.goBack(),
-    );
+    this.setState({ fromAddress: wallet.getAddress(), fromSecret: wallet.getSecret(), fromWallet: wallet }, () => {
+      this.props.navigation.pop();
+    });
   };
 
   useAllFundsPressed = async () => {
@@ -663,7 +663,7 @@ const styles = StyleSheet.create({
 
 SendDetails.propTypes = {
   navigation: PropTypes.shape({
-    goBack: PropTypes.func,
+    pop: PropTypes.func,
     navigate: PropTypes.func,
     getParam: PropTypes.func,
     state: PropTypes.shape({

diff --git a/screen/send/success.js b/screen/send/success.js
@@ -115,10 +115,10 @@ export default class Success extends Component {
 
 Success.propTypes = {
   navigation: PropTypes.shape({
-    goBack: PropTypes.function,
-    getParam: PropTypes.function,
-    navigate: PropTypes.function,
-    dismiss: PropTypes.function,
+    goBack: PropTypes.func,
+    getParam: PropTypes.func,
+    navigate: PropTypes.func,
+    dismiss: PropTypes.func,
     state: PropTypes.shape({
       params: PropTypes.shape({
         amount: PropTypes.string,

diff --git a/screen/transactions/RBF-create.js b/screen/transactions/RBF-create.js
@@ -234,7 +234,7 @@ export default class SendCreate extends Component {
 
 SendCreate.propTypes = {
   navigation: PropTypes.shape({
-    goBack: PropTypes.function,
+    goBack: PropTypes.func,
     navigate: PropTypes.func,
     state: PropTypes.shape({
       params: PropTypes.shape({

diff --git a/screen/transactions/RBF.js b/screen/transactions/RBF.js
@@ -191,7 +191,7 @@ export default class RBF extends Component {
 
 RBF.propTypes = {
   navigation: PropTypes.shape({
-    goBack: PropTypes.function,
+    goBack: PropTypes.func,
     navigate: PropTypes.func,
     state: PropTypes.shape({
       params: PropTypes.shape({

diff --git a/screen/transactions/details.js b/screen/transactions/details.js
@@ -215,7 +215,7 @@ export default class TransactionsDetails extends Component {
 
 TransactionsDetails.propTypes = {
   navigation: PropTypes.shape({
-    goBack: PropTypes.function,
+    goBack: PropTypes.func,
     navigate: PropTypes.func,
     state: PropTypes.shape({
       params: PropTypes.shape({

diff --git a/screen/wallets/buyBitcoin.js b/screen/wallets/buyBitcoin.js
@@ -107,7 +107,7 @@ export default class BuyBitcoin extends Component {
 
 BuyBitcoin.propTypes = {
   navigation: PropTypes.shape({
-    goBack: PropTypes.function,
+    goBack: PropTypes.func,
     state: PropTypes.shape({
       params: PropTypes.shape({
         address: PropTypes.string,