mirrors/BlueWallet
1
0
Fork 0
mirror of https://github.com/BlueWallet/BlueWallet.git synced 2025-03-26 08:55:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

FIX: Fixed an import bug due to wrong property

Browse source
This commit is contained in:
Marcos Rodriguez Vélez 2018-12-29 22:54:25 -05:00
parent ef7d543c6a
commit 3baf4a439a
4 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ios/BlueWallet/Info.plist
View file

@ -33,7 +33,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>190</string>
<string>192</string>
<key>ITSAppUsesNonExemptEncryption</key>
<false/>
<key>LSRequiresIPhoneOS</key>

2
loc/en.js
View file

@ -185,7 +185,7 @@ module.exports = {
help:
'Under certain circumstances, you might be forced to disclose a ' +
'password. To keep your coins safe, BlueWallet can create another ' +
'encrypted storage, with a different password. Under the pressure, ' +
'encrypted storage, with a different password. Under pressure, ' +
'you can disclose this password to a 3rd party. If entered in ' +
"BlueWallet, it will unlock new 'fake' storage. This will seem " +
'legit to a 3rd party, but will secretly keep your main storage ' +

23
screen/send/details.js
View file

@ -44,21 +44,20 @@ export default class SendDetails extends Component {
this.state = { isLoading: true };
const wallets = BlueApp.getWallets();
if (!BlueApp.getWallets().some(item => item.type !== LightningCustodianWallet.type)) {
console.log('props.navigation.state.params=', props.navigation.state.params);
let address;
let memo;
if (props.navigation.state.params) address = props.navigation.state.params.address;
if (props.navigation.state.params) memo = props.navigation.state.params.memo;
let fromAddress;
if (props.navigation.state.params) fromAddress = props.navigation.state.params.fromAddress;
let fromSecret;
if (props.navigation.state.params) fromSecret = props.navigation.state.params.fromSecret;
let fromWallet;
if (!BlueApp.getWallets().some(item => item.type !== LightningCustodianWallet.type) && typeof address === 'undefined') {
alert('Before sending Bitcoins, you must first add a Bitcoin wallet.');
props.navigation.dismiss();
} else {
console.log('props.navigation.state.params=', props.navigation.state.params);
let address;
let memo;
if (props.navigation.state.params) address = props.navigation.state.params.address;
if (props.navigation.state.params) memo = props.navigation.state.params.memo;
let fromAddress;
if (props.navigation.state.params) fromAddress = props.navigation.state.params.fromAddress;
let fromSecret;
if (props.navigation.state.params) fromSecret = props.navigation.state.params.fromSecret;
let fromWallet = null;
for (let w of wallets) {
if (w.getSecret() === fromSecret) {
fromWallet = w;

4
screen/wallets/import.js
View file

@ -55,7 +55,7 @@ export default class WalletsImport extends Component {
} else {
alert(loc.wallets.import.success);
ReactNativeHapticFeedback.trigger('notificationSuccess', false);
w.setLabel(loc.wallets.import.imported + ' ' + w.getTypeReadable());
w.setLabel(loc.wallets.import.imported + ' ' + w.typeReadable);
BlueApp.wallets.push(w);
await BlueApp.saveToDisk();
EV(EV.enum.WALLETS_COUNT_CHANGED);
@ -263,7 +263,7 @@ export default class WalletsImport extends Component {
WalletsImport.propTypes = {
navigation: PropTypes.shape({
navigate: PropTypes.func,
dismiss: PropTypes.func,
goBack: PropTypes.func,
dismiss: PropTypes.func,
}),
};