diff --git a/MainBottomTabs.js b/MainBottomTabs.js
index 9b731a61..1847a669 100644
--- a/MainBottomTabs.js
+++ b/MainBottomTabs.js
@@ -175,6 +175,9 @@ const CreateTransactionStackNavigator = createStackNavigator({
},
SelectWallet: {
screen: SelectWallet,
+ navigationOptions: {
+ headerRight: null,
+ },
},
});
@@ -210,6 +213,9 @@ const LightningScanInvoiceStackNavigator = createStackNavigator({
},
SelectWallet: {
screen: SelectWallet,
+ navigationOptions: {
+ headerRight: null,
+ },
},
Success: {
screen: Success,
@@ -257,7 +263,7 @@ const MainBottomTabs = createStackNavigator(
screen: SelectWallet,
navigationOptions: {
headerLeft: null,
- }
+ },
},
//
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 39014fd0..758eaa9e 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -118,7 +118,7 @@ android {
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
- versionName "4.5.2"
+ versionName "4.6.0"
multiDexEnabled true
missingDimensionStrategy 'react-native-camera', 'general'
}
diff --git a/ios/BlueWallet/Info.plist b/ios/BlueWallet/Info.plist
index d0f82241..5bdef1c1 100644
--- a/ios/BlueWallet/Info.plist
+++ b/ios/BlueWallet/Info.plist
@@ -17,7 +17,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 4.5.2
+ 4.6.0
CFBundleSignature
????
CFBundleURLTypes
diff --git a/ios/BlueWalletWatch Extension/Info.plist b/ios/BlueWalletWatch Extension/Info.plist
index 5b583bd5..fb8aa4e9 100644
--- a/ios/BlueWalletWatch Extension/Info.plist
+++ b/ios/BlueWalletWatch Extension/Info.plist
@@ -17,7 +17,7 @@
CFBundlePackageType
XPC!
CFBundleShortVersionString
- 4.5.2
+ 4.6.0
CFBundleVersion
239
CLKComplicationPrincipalClass
diff --git a/ios/BlueWalletWatch/Info.plist b/ios/BlueWalletWatch/Info.plist
index 5f1835ef..0daade98 100644
--- a/ios/BlueWalletWatch/Info.plist
+++ b/ios/BlueWalletWatch/Info.plist
@@ -17,7 +17,7 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 4.5.2
+ 4.6.0
CFBundleVersion
239
UISupportedInterfaceOrientations
diff --git a/loc/pt_PT.js b/loc/pt_PT.js
index 5dc9d67e..1787f176 100644
--- a/loc/pt_PT.js
+++ b/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',
diff --git a/package-lock.json b/package-lock.json
index 3d409fbd..c74e01ff 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "BlueWallet",
- "version": "4.5.2",
+ "version": "4.6.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
diff --git a/package.json b/package.json
index b0060fc6..c3d484f1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "BlueWallet",
- "version": "4.5.2",
+ "version": "4.6.0",
"devDependencies": {
"@babel/core": "^7.5.0",
"@babel/runtime": "^7.5.1",
diff --git a/screen/receive/receiveAmount.js b/screen/receive/receiveAmount.js
index c0ca7673..abfa1195 100644
--- a/screen/receive/receiveAmount.js
+++ b/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 = () => {
diff --git a/screen/wallets/selectWallet.js b/screen/wallets/selectWallet.js
index ae196524..a5c81f37 100644
--- a/screen/wallets/selectWallet.js
+++ b/screen/wallets/selectWallet.js
@@ -11,13 +11,14 @@ 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: [],
@@ -25,6 +26,10 @@ export default class SelectWallet extends Component {
this.chainType = props.navigation.getParam('chainType');
}
+ dismissComponent = () => {
+ this.props.navigation.goBack(null);
+ };
+
componentDidMount() {
const wallets = this.chainType
? BlueApp.getWallets().filter(item => item.chain === this.chainType && item.allowSend())
@@ -165,8 +170,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,
}),
};