From 47f73738389d50a026b7fc606933184ea1f705f3 Mon Sep 17 00:00:00 2001
From: Dario Gabriel Lipicar <dario@status.im>
Date: Fri, 11 Nov 2022 15:18:09 -0300
Subject: [PATCH] fix(@desktop/wallet): correct error message when adding own
 ENS name to saved addresses

#8114
---
 ui/app/AppLayouts/Wallet/popups/AddEditSavedAddressPopup.qml | 1 +
 ui/imports/shared/controls/AddressInput.qml                  | 1 +
 ui/imports/shared/controls/ContactsListAndSearch.qml         | 5 +++--
 ui/imports/shared/controls/RecipientSelector.qml             | 1 +
 ui/imports/shared/popups/AddEditSavedAddressPopup.qml        | 1 +
 5 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ui/app/AppLayouts/Wallet/popups/AddEditSavedAddressPopup.qml b/ui/app/AppLayouts/Wallet/popups/AddEditSavedAddressPopup.qml
index 3657838ed1..936ba71fca 100644
--- a/ui/app/AppLayouts/Wallet/popups/AddEditSavedAddressPopup.qml
+++ b/ui/app/AppLayouts/Wallet/popups/AddEditSavedAddressPopup.qml
@@ -100,6 +100,7 @@ StatusDialog {
             }
             readOnly: root.edit
             wrongInputValidationError: qsTr("Please enter a valid ENS name OR Ethereum Address")
+            ownAddressError: qsTr("Can't add yourself as a saved address")
         }
     }
 
diff --git a/ui/imports/shared/controls/AddressInput.qml b/ui/imports/shared/controls/AddressInput.qml
index af699bdf43..e0f63c7c03 100644
--- a/ui/imports/shared/controls/AddressInput.qml
+++ b/ui/imports/shared/controls/AddressInput.qml
@@ -21,6 +21,7 @@ Item {
     property int parentWidth
     property bool addContactEnabled: true
     property alias wrongInputValidationError: contactFieldAndList.wrongInputValidationError
+    property alias ownAddressError: contactFieldAndList.ownAddressError
 
     height: contactFieldAndList.chatKey.height
 
diff --git a/ui/imports/shared/controls/ContactsListAndSearch.qml b/ui/imports/shared/controls/ContactsListAndSearch.qml
index 4c984fb19e..ba05deb55b 100644
--- a/ui/imports/shared/controls/ContactsListAndSearch.qml
+++ b/ui/imports/shared/controls/ContactsListAndSearch.qml
@@ -37,6 +37,7 @@ Item {
     property bool hideCommunityMembers: false
     property bool addContactEnabled: true
     property string wrongInputValidationError: qsTr("Enter a valid chat key or ENS username");
+    property string ownAddressError: qsTr("Can't chat with yourself");
 
     readonly property var resolveENS: Backpressure.debounce(root, 500, function (ensName) {
         noContactsRect.visible = false
@@ -51,7 +52,7 @@ Item {
             pubKey = ""
             ensUsername = "";
         } else if (RootStore.userProfileInst.pubKey === chatKey.text) {
-            root.validationError = qsTr("Can't chat with yourself");
+            root.validationError = ownAddressError;
         } else {
             root.validationError = "";
         }
@@ -126,7 +127,7 @@ Item {
                         searchResults.showProfileNotFoundMessage = root.showContactList
                     } else {
                         if (userProfile.pubKey === resolvedPubKey) {
-                            root.validationError = qsTr("Can't chat with yourself");
+                            root.validationError = ownAddressError;
                         } else {
                             chatKey.hasValidSearchResult = true
                             searchResults.username = chatKey.text.trim()
diff --git a/ui/imports/shared/controls/RecipientSelector.qml b/ui/imports/shared/controls/RecipientSelector.qml
index dd83090343..7b5b23cf13 100644
--- a/ui/imports/shared/controls/RecipientSelector.qml
+++ b/ui/imports/shared/controls/RecipientSelector.qml
@@ -27,6 +27,7 @@ Item {
     property bool readOnly: false
     readonly property string addressValidationError: qsTr("Invalid ethereum address")
     property alias wrongInputValidationError: inpAddress.wrongInputValidationError
+    property alias ownAddressError: inpAddress.ownAddressError
     property bool isValid: false
     property bool isSelectorVisible: true
     property bool addContactEnabled: true
diff --git a/ui/imports/shared/popups/AddEditSavedAddressPopup.qml b/ui/imports/shared/popups/AddEditSavedAddressPopup.qml
index c2d312e437..c257e9c654 100644
--- a/ui/imports/shared/popups/AddEditSavedAddressPopup.qml
+++ b/ui/imports/shared/popups/AddEditSavedAddressPopup.qml
@@ -101,6 +101,7 @@ StatusDialog {
             }
             readOnly: root.edit || root.addAddress
             wrongInputValidationError: qsTr("Please enter a valid ENS name OR Ethereum Address")
+            ownAddressError: qsTr("Can't add yourself as a saved address")
         }
     }