Merge pull request #1161

c8f0cf3 Stagenet

5 files changed, 20 insertions, 20 deletions

diff --git a/pages/AddressBook.qml b/pages/AddressBook.qml
index 3bce2f55..4b406af8 100644
--- a/pages/AddressBook.qml
+++ b/pages/AddressBook.qml
@@ -109,7 +109,7 @@ Rectangle {
                 releasedColor: "#FF6C3C"
                 pressedColor: "#FF4304"
                 text: qsTr("Add") + translationManager.emptyString
-                enabled: checkInformation(addressLine.text, paymentIdLine.text, appWindow.persistentSettings.testnet)
+                enabled: checkInformation(addressLine.text, paymentIdLine.text, appWindow.persistentSettings.nettype)
 
                 onClicked: {
                     if (!currentWallet.addressBook.addRow(addressLine.text.trim(), paymentIdLine.text.trim(), descriptionLine.text)) {
@@ -177,13 +177,13 @@ Rectangle {
         }
     }
 
-    function checkInformation(address, payment_id, testnet) {
+    function checkInformation(address, payment_id, nettype) {
       address = address.trim()
       payment_id = payment_id.trim()
 
-      var address_ok = walletManager.addressValid(address, testnet)
+      var address_ok = walletManager.addressValid(address, nettype)
       var payment_id_ok = payment_id.length == 0 || walletManager.paymentIdValid(payment_id)
-      var ipid = walletManager.paymentIdFromAddress(address, testnet)
+      var ipid = walletManager.paymentIdFromAddress(address, nettype)
       if (ipid.length > 0 && payment_id.length > 0)
          payment_id_ok = false
 
diff --git a/pages/Settings.qml b/pages/Settings.qml
index 9550d9a3..f9d1e3bc 100644
--- a/pages/Settings.qml
+++ b/pages/Settings.qml
@@ -129,7 +129,7 @@ Rectangle {
                         walletManager.closeWallet();
                         walletManager.clearWalletCache(persistentSettings.wallet_path);
                         walletManager.openWalletAsync(persistentSettings.wallet_path, appWindow.walletPassword,
-                                                          persistentSettings.testnet);
+                                                          persistentSettings.nettype);
                     }
 
                     confirmationDialog.onRejectedCallback = null;
@@ -291,7 +291,7 @@ Rectangle {
                 releasedColor: "#FF6C3C"
                 pressedColor: "#FF4304"
                 onClicked: {
-                    daemonManager.sendCommand("status",currentWallet.testnet);
+                    daemonManager.sendCommand("status",currentWallet.nettype);
                     daemonConsolePopup.open();
                 }
             }
@@ -598,7 +598,7 @@ Rectangle {
                         walletManager.closeWallet();
                         walletManager.clearWalletCache(persistentSettings.wallet_path);
                         walletManager.openWalletAsync(persistentSettings.wallet_path, appWindow.walletPassword,
-                                                          persistentSettings.testnet);
+                                                          persistentSettings.nettype);
                     }
 
                     confirmationDialog.onRejectedCallback = null;
@@ -698,7 +698,7 @@ Rectangle {
 
 
         if(typeof daemonManager != "undefined")
-            appWindow.daemonRunning =  daemonManager.running(persistentSettings.testnet)
+            appWindow.daemonRunning =  daemonManager.running(persistentSettings.nettype)
     }
 
     // fires only once
diff --git a/pages/Sign.qml b/pages/Sign.qml
index d69e5f8b..6ff8dd6a 100644
--- a/pages/Sign.qml
+++ b/pages/Sign.qml
@@ -43,8 +43,8 @@ Rectangle {
 
     Clipboard { id: clipboard }
 
-    function checkAddress(address, testnet) {
-      return walletManager.addressValid(address, testnet)
+    function checkAddress(address, nettype) {
+      return walletManager.addressValid(address, nettype)
     }
 
     MessageDialog {
diff --git a/pages/Transfer.qml b/pages/Transfer.qml
index 2b6c0b12..8e6daebf 100644
--- a/pages/Transfer.qml
+++ b/pages/Transfer.qml
@@ -268,7 +268,7 @@ Rectangle {
                       if (result) {
                         var parts = result.split("|")
                         if (parts.length == 2) {
-                          var address_ok = walletManager.addressValid(parts[1], appWindow.persistentSettings.testnet)
+                          var address_ok = walletManager.addressValid(parts[1], appWindow.persistentSettings.nettype)
                           if (parts[0] === "true") {
                             if (address_ok) {
                               addressLine.text = parts[1]
@@ -329,7 +329,7 @@ Rectangle {
               shadowPressedColor: "#B32D00"
               releasedColor: "#FF6C3C"
               pressedColor: "#FF4304"
-              enabled : !appWindow.viewOnly && pageRoot.checkInformation(amountLine.text, addressLine.text, paymentIdLine.text, appWindow.persistentSettings.testnet)
+              enabled : !appWindow.viewOnly && pageRoot.checkInformation(amountLine.text, addressLine.text, paymentIdLine.text, appWindow.persistentSettings.nettype)
               onClicked: {
                   console.log("Transfer: paymentClicked")
                   var priority = priorityModelV5.get(priorityDropdown.currentIndex).priority
@@ -344,14 +344,14 @@ Rectangle {
           }
       }
 
-      function checkInformation(amount, address, payment_id, testnet) {
+      function checkInformation(amount, address, payment_id, nettype) {
         address = address.trim()
         payment_id = payment_id.trim()
 
         var amount_ok = amount.length > 0
-        var address_ok = walletManager.addressValid(address, testnet)
+        var address_ok = walletManager.addressValid(address, nettype)
         var payment_id_ok = payment_id.length == 0 || walletManager.paymentIdValid(payment_id)
-        var ipid = walletManager.paymentIdFromAddress(address, testnet)
+        var ipid = walletManager.paymentIdFromAddress(address, nettype)
         if (ipid.length > 0 && payment_id.length > 0)
            payment_id_ok = false
 
@@ -472,7 +472,7 @@ Rectangle {
                 releasedColor: "#FF6C3C"
                 pressedColor: "#FF4304"
                 visible: appWindow.viewOnly
-                enabled: pageRoot.checkInformation(amountLine.text, addressLine.text, paymentIdLine.text, appWindow.persistentSettings.testnet)
+                enabled: pageRoot.checkInformation(amountLine.text, addressLine.text, paymentIdLine.text, appWindow.persistentSettings.nettype)
                 onClicked: {
                     console.log("Transfer: saveTx Clicked")
                     var priority = priorityModelV5.get(priorityDropdown.currentIndex).priority
diff --git a/pages/TxKey.qml b/pages/TxKey.qml
index e8bc1214..e0455168 100644
--- a/pages/TxKey.qml
+++ b/pages/TxKey.qml
@@ -40,8 +40,8 @@ Rectangle {
 
     Clipboard { id: clipboard }
 
-    function checkAddress(address, testnet) {
-      return walletManager.addressValid(address, testnet)
+    function checkAddress(address, nettype) {
+      return walletManager.addressValid(address, nettype)
     }
 
     function check256(str, length) {
@@ -188,7 +188,7 @@ Rectangle {
             shadowPressedColor: "#B32D00"
             releasedColor: "#FF6C3C"
             pressedColor: "#FF4304"
-            enabled: checkTxID(getProofTxIdLine.text) && (getProofAddressLine.text.length == 0 || checkAddress(getProofAddressLine.text, appWindow.persistentSettings.testnet))
+            enabled: checkTxID(getProofTxIdLine.text) && (getProofAddressLine.text.length == 0 || checkAddress(getProofAddressLine.text, appWindow.persistentSettings.nettype))
             onClicked: {
                 console.log("getProof: Generate clicked: txid " + getProofTxIdLine.text + ", address " + getProofAddressLine.text + ", message: " + getProofMessageLine.text);
                 root.getProofClicked(getProofTxIdLine.text, getProofAddressLine.text, getProofMessageLine.text)
@@ -328,7 +328,7 @@ Rectangle {
             shadowPressedColor: "#B32D00"
             releasedColor: "#FF6C3C"
             pressedColor: "#FF4304"
-            enabled: checkTxID(checkProofTxIdLine.text) && checkSignature(checkProofSignatureLine.text) && ((checkProofSignatureLine.text.indexOf("SpendProofV") === 0 && checkProofAddressLine.text.length == 0) || (checkProofSignatureLine.text.indexOf("SpendProofV") !== 0 && checkAddress(checkProofAddressLine.text, appWindow.persistentSettings.testnet)))
+            enabled: checkTxID(checkProofTxIdLine.text) && checkSignature(checkProofSignatureLine.text) && ((checkProofSignatureLine.text.indexOf("SpendProofV") === 0 && checkProofAddressLine.text.length == 0) || (checkProofSignatureLine.text.indexOf("SpendProofV") !== 0 && checkAddress(checkProofAddressLine.text, appWindow.persistentSettings.nettype)))
             onClicked: {
                 console.log("checkProof: Check clicked: txid " + checkProofTxIdLine.text + ", address " + checkProofAddressLine.text + ", message " + checkProofMessageLine.text + ", signature " + checkProofSignatureLine.text);
                 root.checkProofClicked(checkProofTxIdLine.text, checkProofAddressLine.text, checkProofMessageLine.text, checkProofSignatureLine.text)