diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2020-07-29 13:33:27 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2020-07-29 13:33:27 -0500 |
| commit | 721a0cbf914bfa35f59743dc54023e55afe8b0ec (patch) | |
| tree | 610a3c057ec88f0c78592e1d12c86e80f99dc566 /components | |
| parent | 63e32c4a83f798171c08e093680deafb8b0929a4 (diff) | |
| parent | 352da92229fc30b6494c46e7a3e7d9ed80521bb5 (diff) | |
| download | monzero-gui-721a0cbf914bfa35f59743dc54023e55afe8b0ec.tar.gz monzero-gui-721a0cbf914bfa35f59743dc54023e55afe8b0ec.tar.xz monzero-gui-721a0cbf914bfa35f59743dc54023e55afe8b0ec.zip | |
Merge pull request #3018
352da92 QrCodeScanner: use parse_uri_to_object to parse scanned codes (xiphon)
Diffstat (limited to 'components')
| -rw-r--r-- | components/QRCodeScanner.qml | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/components/QRCodeScanner.qml b/components/QRCodeScanner.qml index 67d76238..a4d6927c 100644 --- a/components/QRCodeScanner.qml +++ b/components/QRCodeScanner.qml @@ -86,9 +86,14 @@ Rectangle { id : finder objectName: "QrFinder" onDecoded : { - root.qrcode_decoded(address, payment_id, amount, tx_description, recipient_name, extra_parameters) - root.state = "Stopped" - } + const parsed = walletManager.parse_uri_to_object(data); + if (!parsed.error) { + root.qrcode_decoded(parsed.address, parsed.payment_id, parsed.amount, parsed.tx_description, parsed.recipient_name, parsed.extra_parameters); + root.state = "Stopped"; + } else { + onNotifyError(parsed.error); + } + } onNotifyError : { if( warning ) messageDialog.icon = StandardIcon.Critical |