diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2021-07-06 11:48:58 -0400 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2021-07-06 11:48:58 -0400 |
| commit | 24d113377beaa5e924434a1b24e81f365f2bbecf (patch) | |
| tree | 8f0d6c0630504a529d78bb4d8accb12cc068c483 | |
| parent | 5e076325cdbd115565a1844ccdacb014c773e090 (diff) | |
| parent | dbc8c7d47349798f27a106f9c5e3c4e852d6901c (diff) | |
| download | monzero-gui-24d113377beaa5e924434a1b24e81f365f2bbecf.tar.gz monzero-gui-24d113377beaa5e924434a1b24e81f365f2bbecf.tar.xz monzero-gui-24d113377beaa5e924434a1b24e81f365f2bbecf.zip | |
Merge pull request #3598
dbc8c7d qr: scan valid addresses that miss an uri prefix (selsta)
| -rw-r--r-- | components/QRCodeScanner.qml | 3 | ||||
| -rw-r--r-- | pages/Transfer.qml | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/components/QRCodeScanner.qml b/components/QRCodeScanner.qml index a4d6927c..f3dd4a0d 100644 --- a/components/QRCodeScanner.qml +++ b/components/QRCodeScanner.qml @@ -90,6 +90,9 @@ Rectangle { 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 if (walletManager.addressValid(data, appWindow.persistentSettings.nettype)) { + root.qrcode_decoded(data, "", "", "", "", null); + root.state = "Stopped"; } else { onNotifyError(parsed.error); } diff --git a/pages/Transfer.qml b/pages/Transfer.qml index e1dfe06f..e061c759 100644 --- a/pages/Transfer.qml +++ b/pages/Transfer.qml @@ -285,6 +285,9 @@ Rectangle { if (!parsed.error) { fillPaymentDetails(parsed.address, parsed.payment_id, parsed.amount, parsed.tx_description, parsed.recipient_name); break; + } else if (walletManager.addressValid(codes[index], appWindow.persistentSettings.nettype)) { + fillPaymentDetails(codes[index]); + break; } } } |