Merge pull request #3292

e9b894d Transfer: implement 'Grab QR code from screen' functionality (xiphon)

1 files changed, 23 insertions, 2 deletions

diff --git a/pages/Transfer.qml b/pages/Transfer.qml
index 2e0624f7..828d7b5d 100644
--- a/pages/Transfer.qml
+++ b/pages/Transfer.qml
@@ -93,12 +93,16 @@ Rectangle {
       oaPopup.open()
     }
 
-    function updateFromQrCode(address, payment_id, amount, tx_description, recipient_name) {
-        console.log("updateFromQrCode")
+    function fillPaymentDetails(address, payment_id, amount, tx_description, recipient_name) {
         addressLine.text = address
         setPaymentId(payment_id);
         amountLine.text = amount
         setDescription((recipient_name ? recipient_name + " " : "") + tx_description);
+    }
+
+    function updateFromQrCode(address, payment_id, amount, tx_description, recipient_name) {
+        console.log("updateFromQrCode")
+        fillPaymentDetails(address, payment_id, amount, tx_description, recipient_name);
         cameraUi.qrcode_decoded.disconnect(updateFromQrCode)
     }
 
@@ -198,6 +202,23 @@ Rectangle {
 
                 MoneroComponents.InlineButton {
                     fontFamily: FontAwesome.fontFamily
+                    fontPixelSize: 18
+                    text: FontAwesome.desktop
+                    onClicked: {
+                        clearFields();
+                        const codes = oshelper.grabQrCodesFromScreen();
+                        for (var index = 0; index < codes.length; ++index) {
+                            const parsed = walletManager.parse_uri_to_object(codes[index]);
+                            if (!parsed.error) {
+                                fillPaymentDetails(parsed.address, parsed.payment_id, parsed.amount, parsed.tx_description, parsed.recipient_name);
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                MoneroComponents.InlineButton {
+                    fontFamily: FontAwesome.fontFamily
                     text: FontAwesome.addressBook
                     onClicked: {
                         middlePanel.addressBookView.selectAndSend = true;