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

FIX: incorrect error handling when scanning invalid BC-UR data

Browse source
This commit is contained in:
overtorment 2023-06-28 22:59:36 +01:00
parent 6c87d23d05
commit 9a26be1c80
1 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
screen/send/ScanQRCode.js
View file

@ -156,16 +156,20 @@ const ScanQRCode = () => {
} catch (error) {
console.warn(error);
setIsLoading(true);
Alert.alert(loc.send.scan_error, loc._.invalid_animated_qr_code_fragment, [
{
text: loc._.ok,
onPress: () => {
setIsLoading(false);
Alert.alert(
loc.send.scan_error,
loc._.invalid_animated_qr_code_fragment,
[
{
text: loc._.ok,
onPress: () => {
setIsLoading(false);
},
style: 'default',
},
style: 'default',
},
],
{ cancelabe: false },
]);
);
}
};
@ -200,16 +204,20 @@ const ScanQRCode = () => {
} catch (error) {
console.warn(error);
setIsLoading(true);
Alert.alert(loc.send.scan_error, loc._.invalid_animated_qr_code_fragment, [
{
text: loc._.ok,
onPress: () => {
setIsLoading(false);
Alert.alert(
loc.send.scan_error,
loc._.invalid_animated_qr_code_fragment,
[
{
text: loc._.ok,
onPress: () => {
setIsLoading(false);
},
style: 'default',
},
style: 'default',
},
],
{ cancelabe: false },
]);
);
}
};
@ -229,6 +237,10 @@ const ScanQRCode = () => {
return _onReadUniformResourceV2(ret.data);
}
if (ret.data.toUpperCase().startsWith('UR:CRYPTO-OUTPUT')) {
return _onReadUniformResourceV2(ret.data);
}
if (ret.data.toUpperCase().startsWith('UR:BYTES')) {
const splitted = ret.data.split('/');
if (splitted.length === 3 && splitted[1].includes('-')) {