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

Merge pull request #5953 from BlueWallet/fix-broadcast-after-scanqr

Browse source 
FIX: exception trying broadcast after scanning PSBT from QR
This commit is contained in:
GLaDOS 2023-12-25 21:48:50 +00:00 • committed by GitHub
commit 4b8a956a00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
screen/send/ScanQRCode.js
View file

@ -126,7 +126,7 @@ const ScanQRCode = () => {
const data = decoder.toString();
decoder = false; // nullify for future use (?)
if (launchedBy) {
navigation.navigate(launchedBy, {});
navigation.navigate({ name: launchedBy, params: {}, merge: true });
}
onBarScanned({ data });
} else {
@ -175,7 +175,7 @@ const ScanQRCode = () => {
data = Buffer.from(payload, 'hex').toString();
}
if (launchedBy) {
navigation.navigate(launchedBy, {});
navigation.navigate({ name: launchedBy, params: {}, merge: true });
}
onBarScanned({ data });
} else {
@ -238,7 +238,7 @@ const ScanQRCode = () => {
bitcoin.Psbt.fromHex(hex); // if it doesnt throw - all good
if (launchedBy) {
navigation.navigate(launchedBy, {});
navigation.navigate({ name: launchedBy, params: {}, merge: true });
}
onBarScanned({ data: Buffer.from(hex, 'hex').toString('base64') });
return;
@ -248,7 +248,7 @@ const ScanQRCode = () => {
setIsLoading(true);
try {
if (launchedBy) {
navigation.navigate(launchedBy, {});
navigation.navigate({ name: launchedBy, params: {}, merge: true });
}
onBarScanned(ret.data);
} catch (e) {
@ -304,7 +304,7 @@ const ScanQRCode = () => {
const dismiss = () => {
onBarScannerDismissWithoutData();
if (launchedBy) {
navigation.navigate(launchedBy, {});
navigation.navigate({ name: launchedBy, params: {}, merge: true });
} else {
navigation.goBack();
}