Recovered fixes lost during last pull

BlueComponents.js

@@ -4,7 +4,7 @@
 import React, { Component } from 'react';
 import Ionicons from 'react-native-vector-icons/Ionicons';
 import PropTypes from 'prop-types';
-import { Icon, Button, FormLabel, FormInput, Text, Header, List, ListItem } from 'react-native-elements';
+import { Icon, FormLabel, FormInput, Text, Header, List, ListItem } from 'react-native-elements';
 import {
   TouchableOpacity,
   TouchableWithoutFeedback,
@@ -146,26 +146,18 @@ export class LightningButton extends Component {
 
 export class BlueButtonLink extends Component {
   render() {
-    // eslint-disable-next-line
-    this.props.buttonStyle = this.props.buttonStyle || {};
-
     return (
-      <Button
-        activeOpacity={0.1}
-        delayPressIn={0}
-        {...this.props}
+      <TouchableOpacity
         style={{
-          marginTop: 20,
-          borderWidth: 0.7,
-          borderColor: 'transparent',
+          minHeight: 60,
+          minWidth: 100,
+          height: 60,
+          justifyContent: 'center',
         }}
-        buttonStyle={{
-          height: 45,
-          width: width / 1.5,
-        }}
-        backgroundColor="transparent"
-        color="#0c2550"
-      />
+        {...this.props}
+      >
+        <Text style={{ color: '#0c2550', textAlign: 'center', fontSize: 18 }}>{this.props.title}</Text>
+      </TouchableOpacity>
     );
   }
 }
@@ -1149,11 +1141,13 @@ export class BlueTransactionListItem extends Component {
           }
         }
       });
-      NavigationService.navigate('LNDViewInvoice', {
-        invoice: this.props.item,
-        fromWallet: lightningWallet[0],
-        isModal: false,
-      });
+      if (lightningWallet.length === 1) {
+        NavigationService.navigate('LNDViewInvoice', {
+          invoice: this.props.item,
+          fromWallet: lightningWallet[0],
+          isModal: false,
+        });
+      }
     }
   };
 
@@ -1195,7 +1189,7 @@ export class WalletsCarousel extends Component {
     let scaleValue = new Animated.Value(1.0);
     let props = { duration: 50 };
     if (Platform.OS === 'android') {
-      props.push({ useNativeDriver: true });
+      props['useNativeDriver'] = true;
     }
     this.onPressedIn = () => {
       props.toValue = 0.9;

ios/BlueWallet/AppDelegate.m

@@ -28,7 +28,7 @@
                                                       moduleName:@"BlueWallet"
                                                initialProperties:nil
                                                    launchOptions:launchOptions];
-  rootView.backgroundColor = [UIColor blackColor];
+  rootView.backgroundColor = [UIColor whiteColor];
 
   self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
   UIViewController *rootViewController = [UIViewController new];

package.json

@@ -57,7 +57,7 @@
     "mocha": "^5.2.0",
     "node-libs-react-native": "^1.0.1",
     "path-browserify": "0.0.0",
-    "prettier": "^1.16.1",
+    "prettier": "^1.16.2",
     "process": "^0.11.10",
     "prop-types": "^15.6.2",
     "react": "^16.7.0",
@@ -84,7 +84,7 @@
     "react-native-sentry": "^0.40.2",
     "react-native-snap-carousel": "^3.7.5",
     "react-native-sortable-list": "0.0.22",
-    "react-native-svg": "^9.0.4",
+    "react-native-svg": "^9.0.7",
     "react-native-tcp": "^3.3.0",
     "react-native-vector-icons": "^6.2.0",
     "react-native-webview": "^4.0.0",

screen/send/details.js

@@ -408,7 +408,13 @@ export default class SendDetails extends Component {
       <Modal
         isVisible={this.state.isFeeSelectionModalVisible}
         style={styles.bottomModal}
-        onBackdropPress={() => this.setState({ isFeeSelectionModalVisible: false })}
+        onBackdropPress={() => {
+          if (this.state.fee < 1 || this.state.feeSliderValue < 1) {
+            this.setState({ fee: Number(1), feeSliderValue: Number(1) });
+          }
+          Keyboard.dismiss();
+          this.setState({ isFeeSelectionModalVisible: false });
+        }}
       >
         <KeyboardAvoidingView behavior={Platform.OS === 'ios' ? 'position' : null}>
           <View style={styles.modalContent}>
@@ -419,12 +425,14 @@ export default class SendDetails extends Component {
                   this.textInput = ref;
                 }}
                 value={this.state.fee.toString()}
+                onEndEditing={() => {
+                  if (this.state.fee < 1 || this.state.feeSliderValue < 1) {
+                    this.setState({ fee: Number(1), feeSliderValue: Number(1) });
+                  }
+                }}
                 onChangeText={value => {
                   let newValue = value.replace(/\D/g, '');
-                  if (newValue.length === 0) {
-                    newValue = 1;
-                  }
-                  this.setState({ fee: newValue, feeSliderValue: newValue });
+                  this.setState({ fee: Number(newValue), feeSliderValue: Number(newValue) });
                 }}
                 maxLength={9}
                 editable={!this.state.isLoading}

screen/wallets/add.js

@@ -72,7 +72,7 @@ export default class WalletsAdd extends Component {
 
     return (
       <SafeBlueArea forceInset={{ horizontal: 'always' }} style={{ flex: 1, paddingTop: 40 }}>
-        <TouchableWithoutFeedback onPress={Keyboard.dismiss} accessible={false}>
+        <TouchableWithoutFeedback onPress={Keyboard.dismiss} accessible={false} style={{ flex: 1 }}>
           <BlueCard>
             <BlueFormLabel>{loc.wallets.add.wallet_name}</BlueFormLabel>
             <View
@@ -98,7 +98,6 @@ export default class WalletsAdd extends Component {
                 onChangeText={text => {
                   this.setLabel(text);
                 }}
-                autoFocus
                 style={{ flex: 1, marginHorizontal: 8, color: '#81868e' }}
                 editable={!this.state.isLoading}
                 underlineColorAndroid="transparent"