Merge pull request #1849

6778742 openalias: handle address validation correctly (mmbyday)

pages/Transfer.qml

@@ -35,6 +35,7 @@ import moneroComponents.Wallet 1.0
 import "../components"
 import "../components" as MoneroComponents
 import "." 1.0
+import "../js/TxUtils.js" as TxUtils
 
 
 Rectangle {
@@ -51,15 +52,6 @@ Rectangle {
 
     Clipboard { id: clipboard }
 
-    function isValidOpenAliasAddress(address) {
-      address = address.trim()
-      var dot = address.indexOf('.')
-      if (dot < 0)
-        return false
-      // we can get an awful lot of valid domains, including non ASCII chars... accept anything
-      return true
-    }
-
     function oa_message(text) {
       oaPopup.title = qsTr("OpenAlias error") + translationManager.emptyString
       oaPopup.text = text
@@ -249,8 +241,8 @@ Rectangle {
           id: resolveButton
           width: 80
           text: qsTr("Resolve") + translationManager.emptyString
-          visible: isValidOpenAliasAddress(addressLine.text)
-          enabled : isValidOpenAliasAddress(addressLine.text)
+          visible: TxUtils.isValidOpenAliasAddress(addressLine.text)
+          enabled : visible
           onClicked: {
               var result = walletManager.resolveOpenAlias(addressLine.text)
               if (result) {