From f327d20deb08d948829d2c2214af3cc3ac254456 Mon Sep 17 00:00:00 2001
From: selsta <selsta@sent.at>
Date: Sun, 5 Sep 2021 05:48:50 +0200
Subject: qml: use libwalletqt make_uri function

---
 pages/Receive.qml           | 9 ++++-----
 pages/merchant/Merchant.qml | 6 +++---
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'pages')

diff --git a/pages/Receive.qml b/pages/Receive.qml
index 5282a106..6045c324 100644
--- a/pages/Receive.qml
+++ b/pages/Receive.qml
@@ -63,12 +63,11 @@ Rectangle {
 
     function generateQRCodeString() {
         if (pageReceive.state == "PaymentRequest") {
-            return TxUtils.makeQRCodeString(appWindow.current_address,
-                                           (amountToReceiveXMR.text != "" && parseFloat(amountToReceiveXMR.text) != 0 ? amountToReceiveXMR.text : ""),
-                                           (txDescriptionInput.text != "" ? txDescriptionInput.text : ""),
-                                           (receiverNameInput.text != "" ? receiverNameInput.text : ""));
+            return walletManager.make_uri(appWindow.current_address,
+                walletManager.amountFromString(amountToReceiveXMR.text),
+                txDescriptionInput.text, receiverNameInput.text);
         } else {
-            return TxUtils.makeQRCodeString(appWindow.current_address);
+            return walletManager.make_uri(appWindow.current_address);
         }
     }
 
diff --git a/pages/merchant/Merchant.qml b/pages/merchant/Merchant.qml
index 3722a7a6..e17ed870 100644
--- a/pages/merchant/Merchant.qml
+++ b/pages/merchant/Merchant.qml
@@ -211,7 +211,7 @@ Item {
 
                     smooth: false
                     fillMode: Image.PreserveAspectFit
-                    source: "image://qrcode/" + TxUtils.makeQRCodeString(appWindow.current_address, amountToReceive.text)
+                    source: "image://qrcode/" + walletManager.make_uri(appWindow.current_address, walletManager.amountFromString(amountToReceive.text))
 
                     MouseArea {
                         anchors.fill: parent
@@ -400,7 +400,7 @@ Item {
                         font.pixelSize: 12
                         font.bold: true
                         color: _color
-                        text: TxUtils.makeQRCodeString(appWindow.current_address, amountToReceive.text)
+                        text: walletManager.make_uri(appWindow.current_address, walletManager.amountFromString(amountToReceive.text))
                         themeTransition: false
 
                         MouseArea {
@@ -685,7 +685,7 @@ Item {
         selectExisting: false
         nameFilters: ["Image (*.png)"]
         onAccepted: {
-            if(!walletManager.saveQrCode(TxUtils.makeQRCodeString(appWindow.current_address, amountToReceive.text), walletManager.urlToLocalPath(fileUrl))) {
+            if (!walletManager.saveQrCode(walletManager.make_uri(appWindow.current_address, walletManager.amountFromString(amountToReceive.text)), walletManager.urlToLocalPath(fileUrl))) {
                 console.log("Failed to save QrCode to file " + walletManager.urlToLocalPath(fileUrl) )
                 receivePageDialog.title = qsTr("Save QrCode") + translationManager.emptyString;
                 receivePageDialog.text = qsTr("Failed to save QrCode to ") + walletManager.urlToLocalPath(fileUrl) + translationManager.emptyString;
-- 
cgit v1.2.3