#1080: allowed pasting address containing trailing or leading spaces

Author: roman-strilets

ui/view/controls/MessengerAddReceiver.qml

@@ -110,7 +110,12 @@ CustomDialog {
                 text:             addressAddModel.address
                 font.pixelSize:   14
                 focus:            !control.nameEditMode
-                validator:        RegularExpressionValidator { regularExpression: /[0-9a-zA-Z]{1,}/ }
+                validator:        RegularExpressionValidator { regularExpression: /\s*[0-9a-zA-Z]*\s*/ }
+                Keys.onPressed: function (event) {
+                    if (event.key === Qt.Key_Space) {
+                        event.accepted = true
+                    }
+                }
                 Binding {
                     target:   addressAddModel
                     property: "address"

ui/view/send_regular.qml

@@ -140,7 +140,13 @@ ColumnLayout {
                                 backgroundColor:  tokenError ? Style.validator_error : Style.content_main
                                 font.italic :     tokenError
                                 text:             viewModel.token
-                                validator:        RegularExpressionValidator { regularExpression: /[0-9a-zA-Z]{1,}/ }
+                                validator:        RegularExpressionValidator { regularExpression: /\s*[0-9a-zA-Z]*\s*/ }
+
+                                Keys.onPressed: function (event) {
+                                    if (event.key === Qt.Key_Space) {
+                                        event.accepted = true
+                                    }
+                                }
 
                                 //% "Paste recipient address here"
                                 placeholderText:  qsTrId("send-contact-address-placeholder")

ui/viewmodel/messenger_address_add.cpp

@@ -50,9 +50,10 @@ QString MessengerAddressAdd::getPeerID() const
 
 void MessengerAddressAdd::setAddress(const QString& addr)
 {
-    if (_address != addr)
+    const auto trimmed = addr.trimmed();
+    if (_address != trimmed)
     {
-        _address = addr;
+        _address = trimmed;
         emit addressChanged();
 
         auto p = beam::wallet::ParseParameters(_address.toStdString());

ui/viewmodel/send_view.cpp

@@ -236,10 +236,11 @@ QString SendViewModel::getToken() const
 
 void SendViewModel::setToken(const QString& value)
 {
-    if (_token != value)
+    const auto trimmed = value.trimmed();
+    if (_token != trimmed)
     {
         _newTokenMsg.clear();
-        _token = value;
+        _token = trimmed;
         _choiceOffline = false;
 
         if (QMLGlobals::isSwapToken(value))