diff --git a/pages/Transfer.qml b/pages/Transfer.qml index 3921b1ef..88ab5a92 100644 --- a/pages/Transfer.qml +++ b/pages/Transfer.qml @@ -239,6 +239,19 @@ Rectangle { anchors.topMargin: 5 } + function checkAddressAndPaymentID(address, payment_id, testnet) { + print ("testing") + if (!walletManager.addressValid(address, testnet)) + return false + print ("address is valid") + var ipid = walletManager.paymentIdFromAddress(address, testnet) + print ("ipid: [" + ipid + "]") + if (ipid.length > 0) + return payment_id === "" + print ("payment_id: [" + payment_id + "]") + return payment_id === "" || walletManager.paymentIdValid(payment_id) + } + StandardButton { id: sendButton anchors.left: parent.left @@ -251,7 +264,7 @@ Rectangle { shadowPressedColor: "#B32D00" releasedColor: "#FF6C3C" pressedColor: "#FF4304" - enabled : addressLine.text.length > 0 && amountLine.text.length > 0 + enabled : amountLine.text.length > 0 && checkAddressAndPaymentID(addressLine.text.trim(), paymentIdLine.text.trim(), appWindow.persistentSettings.testnet) onClicked: { console.log("Transfer: paymentClicked") var priority = priorityModel.get(priorityDropdown.currentIndex).priority diff --git a/src/libwalletqt/WalletManager.cpp b/src/libwalletqt/WalletManager.cpp index 2e1fe57b..7b60c528 100644 --- a/src/libwalletqt/WalletManager.cpp +++ b/src/libwalletqt/WalletManager.cpp @@ -149,6 +149,21 @@ quint64 WalletManager::amountFromDouble(double amount) const return Bitmonero::Wallet::amountFromDouble(amount); } +bool WalletManager::paymentIdValid(const QString &payment_id) const +{ + return Bitmonero::Wallet::paymentIdValid(payment_id.toStdString()); +} + +bool WalletManager::addressValid(const QString &address, bool testnet) const +{ + return Bitmonero::Wallet::addressValid(address.toStdString(), testnet); +} + +QString WalletManager::paymentIdFromAddress(const QString &address, bool testnet) const +{ + return QString::fromStdString(Bitmonero::Wallet::paymentIdFromAddress(address.toStdString(), testnet)); +} + void WalletManager::setLogLevel(int logLevel) { Bitmonero::WalletManagerFactory::setLogLevel(logLevel); diff --git a/src/libwalletqt/WalletManager.h b/src/libwalletqt/WalletManager.h index 24fb60fc..51ad0dbf 100644 --- a/src/libwalletqt/WalletManager.h +++ b/src/libwalletqt/WalletManager.h @@ -89,6 +89,10 @@ public: // QML JS engine doesn't support unsigned integers Q_INVOKABLE QString maximumAllowedAmountAsSting() const; + Q_INVOKABLE bool paymentIdValid(const QString &payment_id) const; + Q_INVOKABLE bool addressValid(const QString &address, bool testnet) const; + Q_INVOKABLE QString paymentIdFromAddress(const QString &address, bool testnet) const; + // QML missing such functionality, implementing these helpers here Q_INVOKABLE QString urlToLocalPath(const QUrl &url) const; Q_INVOKABLE QUrl localPathToUrl(const QString &path) const;