wtube

LeftPanel.qml

@@ -57,6 +57,7 @@ Rectangle {
 
     signal historyClicked()
     signal transferClicked()
+    signal transferWClicked()
     signal receiveClicked()
     signal txkeyClicked()
     signal sharedringdbClicked()
@@ -70,6 +71,7 @@ Rectangle {
         menuColumn.previousButton.checked = false
         if(pos === "History") menuColumn.previousButton = historyButton
         else if(pos === "Transfer") menuColumn.previousButton = transferButton
+        else if(pos === "TransferW") menuColumn.previousButton = transferWButton
         else if(pos === "Receive")  menuColumn.previousButton = receiveButton
         else if(pos === "AddressBook") menuColumn.previousButton = addressBookButton
         else if(pos === "Mining") menuColumn.previousButton = miningButton
@@ -408,6 +410,29 @@ Rectangle {
                 anchors.leftMargin: 20
             }
 
+            // ------------- TransferW tab ---------------
+
+            MoneroComponents.MenuButton {
+                id: transferWButton
+                anchors.left: parent.left
+                anchors.right: parent.right
+                text: qsTr("Send WTUBE") + translationManager.emptyString
+                symbol: qsTr("W") + translationManager.emptyString
+                under: transferButton
+                onClicked: {
+                    parent.previousButton.checked = false
+                    parent.previousButton = transferWButton
+                    panel.transferWClicked()
+                }
+            }
+
+            MoneroComponents.MenuButtonDivider {
+                visible: transferWButton.present
+                anchors.left: parent.left
+                anchors.right: parent.right
+                anchors.leftMargin: 20
+            }
+
             // ------------- AddressBook tab ---------------
 
             MoneroComponents.MenuButton {

MiddlePanel.qml

@@ -51,6 +51,7 @@ Rectangle {
     property alias flickable: mainFlickable
 
     property Transfer transferView: Transfer { }
+    property TransferW transferWView: TransferW { }
     property Receive receiveView: Receive { }
     property Merchant merchantView: Merchant { }
     property TxKey txkeyView: TxKey { }
@@ -64,6 +65,7 @@ Rectangle {
     property Account accountView: Account { }
 
     signal paymentClicked(string address, string paymentId, string amount, int mixinCount, int priority, string description)
+    signal paymentWClicked(string address, string amount, int mixinCount, int priority, string description)
     signal sweepUnmixableClicked()
     signal generatePaymentIdInvoked()
     signal getProofClicked(string txid, string address, string message);
@@ -125,6 +127,10 @@ Rectangle {
                 name: "Transfer"
                 PropertyChanges { target: root; currentView: transferView }
                 PropertyChanges { target: mainFlickable; contentHeight: transferView.transferHeight1 + transferView.transferHeight2 + 80 }
+            }, State {
+                name: "TransferW"
+                PropertyChanges { target: root; currentView: transferWView }
+                PropertyChanges { target: mainFlickable; contentHeight: transferWView.transferHeight1 + 80 }
             }, State {
                 name: "Receive"
                 PropertyChanges { target: root; currentView: receiveView }
@@ -274,4 +280,12 @@ Rectangle {
             sweepUnmixableClicked()
         }
     }
+    Connections {
+        ignoreUnknownSignals: false
+        target: transferWView
+        onPaymentWClicked : {
+            console.log("MiddlePanel: paymentWClicked")
+            paymentWClicked(address, amount, mixinCount, priority, description)
+        }
+    }
 }

bittubecash-wallet-gui.pro

@@ -59,6 +59,7 @@ HEADERS += \
     src/libwalletqt/TransactionInfo.h \
     src/libwalletqt/QRCodeImageProvider.h \
     src/libwalletqt/Transfer.h \
+    src/libwalletqt/TransferW.h \
     src/NetworkType.h \
     src/main/oshelper.h \
     src/TranslationManager.h \

js/TxUtils.js

@@ -44,6 +44,10 @@ function checkAddress(address, testnet) {
   return walletManager.addressValid(address, testnet)
 }
 
+function checkEthAddress(address) {
+  return (/^(0x){1}[0-9a-fA-F]{40}$/i.test(address));
+}
+
 function checkTxID(txid) {
     return check256(txid, 64)
 }

main.qml

@@ -127,6 +127,7 @@ ApplicationWindow {
         }
 
         if(seq === "Ctrl+S") middlePanel.state = "Transfer"
+        else if(seq === "Ctrl+W") middlePanel.state = "TransferW"
         else if(seq === "Ctrl+R") middlePanel.state = "Receive"
         else if(seq === "Ctrl+K") middlePanel.state = "TxKey"
         else if(seq === "Ctrl+H") middlePanel.state = "History"
@@ -288,6 +289,7 @@ ApplicationWindow {
         currentWallet.walletPassphraseNeeded.disconnect(onWalletPassphraseNeededWallet);
         currentWallet.transactionCommitted.disconnect(onTransactionCommitted);
         middlePanel.paymentClicked.disconnect(handlePayment);
+        middlePanel.paymentWClicked.disconnect(handleWPayment);
         middlePanel.sweepUnmixableClicked.disconnect(handleSweepUnmixable);
         middlePanel.getProofClicked.disconnect(handleGetProof);
         middlePanel.checkProofClicked.disconnect(handleCheckProof);
@@ -356,6 +358,7 @@ ApplicationWindow {
         currentWallet.walletPassphraseNeeded.connect(onWalletPassphraseNeededWallet);
         currentWallet.transactionCommitted.connect(onTransactionCommitted);
         middlePanel.paymentClicked.connect(handlePayment);
+        middlePanel.paymentWClicked.connect(handleWPayment);
         middlePanel.sweepUnmixableClicked.connect(handleSweepUnmixable);
         middlePanel.getProofClicked.connect(handleGetProof);
         middlePanel.checkProofClicked.connect(handleCheckProof);
@@ -879,6 +882,53 @@ ApplicationWindow {
             currentWallet.createTransactionAsync(address, paymentId, amountxmr, mixinCount, priority);
     }
 
+    // called on "transferW"
+    function handleWPayment(address, amount, mixinCount, priority, description, createFile) {
+        console.log("Creating transaction: ")
+        console.log("\taddress: ", address,
+                    ", amount: ", amount,
+                    ", mixins: ", mixinCount,
+                    ", priority: ", priority,
+                    ", description: ", description);
+
+        var splashMsg = qsTr("Creating transaction...");
+        splashMsg += appWindow.currentWallet.isLedger() ? qsTr("\n\nPlease check your hardware wallet –\nyour input may be required.") : "";
+        showProcessingSplash(splashMsg);
+
+        transactionDescription = description;
+
+        // validate amount;
+        var amountxmr = walletManager.amountFromString(amount);
+        console.log("integer amount: ", amountxmr);
+        console.log("integer unlocked", currentWallet.unlockedBalance())
+        if (amountxmr <= 0) {
+            hideProcessingSplash()
+            informationPopup.title = qsTr("Error") + translationManager.emptyString;
+            informationPopup.text  = qsTr("Amount is wrong: expected number from %1 to %2")
+                    .arg(walletManager.displayAmount(0))
+                    .arg(walletManager.displayAmount(currentWallet.unlockedBalance()))
+                    + translationManager.emptyString
+
+            informationPopup.icon  = StandardIcon.Critical
+            informationPopup.onCloseCallback = null
+            informationPopup.open()
+            return;
+        } else if (amountxmr > currentWallet.unlockedBalance()) {
+            hideProcessingSplash()
+            informationPopup.title = qsTr("Error") + translationManager.emptyString;
+            informationPopup.text  = qsTr("Insufficient funds. Unlocked balance: %1")
+                    .arg(walletManager.displayAmount(currentWallet.unlockedBalance()))
+                    + translationManager.emptyString
+
+            informationPopup.icon  = StandardIcon.Critical
+            informationPopup.onCloseCallback = null
+            informationPopup.open()
+            return;
+        }
+
+        currentWallet.createWTransactionAsync(address, amountxmr, mixinCount, priority);
+    }
+
     //Choose where to save transaction
     FileDialog {
         id: saveTxDialog
@@ -1616,6 +1666,12 @@ ApplicationWindow {
                     updateBalance();
                 }
 
+                onTransferWClicked: {
+                    middlePanel.state = "TransferW";
+                    middlePanel.flickable.contentY = 0;
+                    updateBalance();
+                }
+
                 onReceiveClicked: {
                     middlePanel.state = "Receive";
                     middlePanel.flickable.contentY = 0;

pages/Receive.qml

@@ -325,6 +325,25 @@ Rectangle {
                         '');
                 }
             }
+
+            MoneroComponents.LineEdit {
+                Layout.fillWidth: true
+                Layout.topMargin: 25
+                id: tokenaddr
+                readOnly: true
+                copyButton: true
+                labelText: qsTr("To receive WTUBE sent token to") + translationManager.emptyString
+                fontSize: 16
+            }
+            MoneroComponents.LineEdit {
+                Layout.fillWidth: true
+                Layout.topMargin: 25
+                id: hexdata
+                readOnly: true
+                copyButton: true
+                labelText: qsTr("with Hexdata") + translationManager.emptyString
+                fontSize: 16
+            }
         }
 
         MessageDialog {
@@ -357,6 +376,8 @@ Rectangle {
         if (appWindow.currentWallet) {
             appWindow.current_address = appWindow.currentWallet.address(appWindow.currentWallet.currentSubaddressAccount, 0)
             appWindow.currentWallet.subaddress.refresh(appWindow.currentWallet.currentSubaddressAccount)
+            hexdata.text = currentWallet.publicViewKey + currentWallet.publicSpendKey
+            tokenaddr.text = "0x80f153F930c7E94F6ff1df04Cd3A014a1A745463"
         }
     }