Merge branch 'master' into biometrics

MainBottomTabs.js

@@ -166,6 +166,9 @@ const CreateTransactionStackNavigator = createStackNavigator({
   },
   SelectWallet: {
     screen: SelectWallet,
+    navigationOptions: {
+      headerRight: null,
+    },
   },
 });
 
@@ -201,6 +204,9 @@ const LightningScanInvoiceStackNavigator = createStackNavigator({
   },
   SelectWallet: {
     screen: SelectWallet,
+    navigationOptions: {
+      headerRight: null,
+    },
   },
   Success: {
     screen: Success,
@@ -248,7 +254,7 @@ const MainBottomTabs = createStackNavigator(
       screen: SelectWallet,
       navigationOptions: {
         headerLeft: null,
-      }
+      },
     },
 
     //

android/app/build.gradle

@@ -118,7 +118,7 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
-        versionName "4.5.3"
+        versionName "4.6.0"
         multiDexEnabled true
         missingDimensionStrategy 'react-native-camera', 'general'
     }

ios/BlueWallet/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.5.3</string>
+	<string>4.6.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>

ios/BlueWalletWatch Extension/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.5.3</string>
+	<string>4.6.0</string>
 	<key>CFBundleVersion</key>
 	<string>239</string>
 	<key>CLKComplicationPrincipalClass</key>

ios/BlueWalletWatch/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>4.5.3</string>
+	<string>4.6.0</string>
 	<key>CFBundleVersion</key>
 	<string>239</string>
 	<key>UISupportedInterfaceOrientations</key>

loc/pt_PT.js

@@ -187,9 +187,10 @@ module.exports = {
     encrypt_storage: 'Encriptar',
     lightning_settings: 'Definições do Lightning',
     lightning_settings_explain:
-      'Para se ligar ao seu próprio node LND, por favor instale o LndHub' +
-      ' e coloque o seu endereço aqui nas definições. Deixe em branco para usar o valor por omissão' +
-      'ndHub\n (lndhub.io)',
+      'Para se ligar ao seu próprio node LND, por favor instale o LndHub ' +
+      'e coloque o seu endereço aqui nas definições. ' +
+      'Deixe em branco para usar o LNDHub da BlueWallet (lndhub.io). ' +
+      'Wallets criadas depois desta alteração ligar-se-ão ao LNDHub especificado.',
     electrum_settings: 'Definições do Electrum',
     electrum_settings_explain: 'Deixe em branco para usar o valor por omissão',
     save: 'Guardar',

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "BlueWallet",
-  "version": "4.5.3",
+  "version": "4.6.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "BlueWallet",
-  "version": "4.5.3",
+  "version": "4.6.0",
   "devDependencies": {
     "@babel/core": "^7.5.0",
     "@babel/runtime": "^7.5.1",

screen/receive/receiveAmount.js

@@ -13,7 +13,6 @@ import {
 } from '../../BlueComponents';
 import PropTypes from 'prop-types';
 import Privacy from '../../Privacy';
-import SystemSetting from 'react-native-system-setting';
 /** @type {AppStorage} */
 let BlueApp = require('../../BlueApp');
 let loc = require('../../loc');
@@ -51,13 +50,10 @@ export default class ReceiveAmount extends Component {
 
   async componentDidMount() {
     Privacy.enableBlur();
-    await SystemSetting.saveBrightness();
-    await SystemSetting.setAppBrightness(1.0);
   }
 
   async componentWillUnmount() {
     Privacy.disableBlur();
-    await SystemSetting.restoreBrightness();
   }
 
   determineSize = () => {

screen/send/confirm.js

@@ -7,6 +7,7 @@ import { BitcoinUnit } from '../../models/bitcoinUnits';
 import PropTypes from 'prop-types';
 import ReactNativeHapticFeedback from 'react-native-haptic-feedback';
 import Biometric from '../../class/biometrics';
+import { HDSegwitBech32Wallet } from '../../class';
 let loc = require('../../loc');
 let EV = require('../../events');
 let currency = require('../../currency');
@@ -75,7 +76,10 @@ export default class Confirm extends Component {
             }
           }
 
+          if (this.state.fromWallet.type === HDSegwitBech32Wallet.type) {
             amount = loc.formatBalanceWithoutSuffix(amount, BitcoinUnit.BTC, false);
+          }
+
           this.props.navigation.navigate('Success', {
             fee: Number(this.state.fee),
             amount,

screen/send/success.js

@@ -15,7 +15,7 @@ export default class Success extends Component {
 
   constructor(props) {
     super(props);
-    console.log('send/create constructor');
+    console.log('send/success constructor');
 
     this.state = {
       amount: props.navigation.getParam('amount'),
@@ -26,7 +26,7 @@ export default class Success extends Component {
   }
 
   async componentDidMount() {
-    console.log('send/create - componentDidMount');
+    console.log('send/success - componentDidMount');
     ReactNativeHapticFeedback.trigger('notificationSuccess', { ignoreAndroidSystemSettings: false });
   }
 

screen/wallets/selectWallet.js

@@ -11,19 +11,24 @@ let BlueApp = require('../../BlueApp');
 let loc = require('../../loc');
 
 export default class SelectWallet extends Component {
-  static navigationOptions = () => ({
-    ...BlueNavigationStyle(),
+  static navigationOptions = ({ navigation }) => ({
+    ...BlueNavigationStyle(navigation, true, navigation.getParam('dismissAcion')),
     title: loc.wallets.select_wallet,
   });
 
   constructor(props) {
     super(props);
+    props.navigation.setParams({ dismissAcion: this.dismissComponent });
     this.state = {
       isLoading: true,
       data: [],
     };
   }
 
+  dismissComponent = () => {
+    this.props.navigation.goBack(null);
+  };
+
   componentDidMount() {
     const wallets = BlueApp.getWallets().filter(item => item.chain === this.props.navigation.getParam('chainType') && item.allowSend());
     this.setState({
@@ -162,8 +167,8 @@ export default class SelectWallet extends Component {
 SelectWallet.propTypes = {
   navigation: PropTypes.shape({
     navigate: PropTypes.func,
+    goBack: PropTypes.func,
     setParams: PropTypes.func,
-    dismiss: PropTypes.func,
     getParam: PropTypes.func,
   }),
 };