mirrors/BlueWallet
1
0
Fork 0
mirror of https://github.com/BlueWallet/BlueWallet.git synced 2025-02-22 15:04:50 +01:00
Code Issues Projects Releases Packages Wiki Activity

FIX: Crash

Browse source
This commit is contained in:
marcosrdz 2020-08-15 23:35:28 -04:00 • committed by Overtorment
parent b1143c0664
commit 9f5f229c3f
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
screen/send/ScanQRCode.js
View file

@ -146,7 +146,11 @@ const ScanQRCode = () => {
};
const dismiss = () => {
navigation.navigate(launchedBy);
if (launchedBy) {
navigation.navigate(launchedBy);
} else {
navigation.goBack();
}
};
return isLoading ? (

7
screen/send/psbtWithHardwareWallet.js
View file

@ -168,13 +168,13 @@ export default class PsbtWithHardwareWallet extends Component {
);
};
onBarCodeRead = ret => {
onBarScanned = ret => {
if (ret.data.toUpperCase().startsWith('UR')) {
return this._onReadUniformResource(ret.data);
}
if (ret.data.indexOf('+') === -1 && ret.data.indexOf('=') === -1 && ret.data.indexOf('=') === -1) {
// this looks like NOT base64, so maybe its transaction's hex
this.setState({ txhex: ret.data });
this.setState({ txhex: ret.data }, () => this.props.navigation.dangerouslyGetParent().pop());
return;
}
try {
@ -328,7 +328,7 @@ export default class PsbtWithHardwareWallet extends Component {
});
const file = await RNFS.readFile(res.uri);
if (file) {
this.setState({ isSecondPSBTAlreadyBase64: true }, () => this.onBarCodeRead({ data: file }));
this.setState({ isSecondPSBTAlreadyBase64: true }, () => this.onBarScanned({ data: file }));
} else {
this.setState({ isSecondPSBTAlreadyBase64: false });
throw new Error();
@ -365,7 +365,6 @@ export default class PsbtWithHardwareWallet extends Component {
this.props.navigation.navigate('ScanQRCodeRoot', {
screen: 'ScanQRCode',
params: {
launchedBy: this.props.route.name,
onBarScanned: this.onBarScanned,
},
});