status-im
/
status-desktop
mirror of https://github.com/status-im/status-desktop.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(@desktop/wallet): Can't add an address to saved addresses 

fixes #5534
This commit is contained in:
Khushboo Mehta 2022-04-13 12:21:12 +02:00 committed by Khushboo-dev-cpp
parent feaa91d062
commit 29db292472
5 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/app/AppLayouts/Wallet/popups/AddEditSavedAddressPopup.qml
View File

@ -88,6 +88,7 @@ StatusModal {
accounts: RootStore.accounts
contactsStore: root.contactsStore
label: qsTr("Address")
input.placeholderText: qsTr("Enter ENS Name or Ethereum Address")
labelFont.pixelSize: 15
labelFont.weight: Font.Normal
input.implicitHeight: 56
@ -97,6 +98,7 @@ StatusModal {
root.address = selectedRecipient.address
}
readOnly: root.edit
wrongInputValidationError: qsTr("Please enter a valid ENS name OR Ethereum Address")
}
}
}

1
ui/imports/shared/controls/AddressInput.qml
View File

@ -21,6 +21,7 @@ Item {
property bool isResolvedAddress: false
property int parentWidth
property bool addContactEnabled: true
property alias wrongInputValidationError: contactFieldAndList.wrongInputValidationError
height: contactFieldAndList.chatKey.height

7
ui/imports/shared/controls/ContactsListAndSearch.qml
View File

@ -38,6 +38,7 @@ Item {
property var pubKeys: ([])
property bool hideCommunityMembers: false
property bool addContactEnabled: true
property string wrongInputValidationError: qsTr("Enter a valid chat key or ENS username");
property var resolveENS: Backpressure.debounce(root, 500, function (ensName) {
@ -49,7 +50,7 @@ Item {
function validate() {
if (!Utils.isChatKey(chatKey.text) && !Utils.isValidETHNamePrefix(chatKey.text)) {
root.validationError = qsTr("Enter a valid chat key or ENS username");
root.validationError = wrongInputValidationError
pubKey = ""
ensUsername = "";
} else if (RootStore.userProfileInst.pubKey === chatKey.text) {
@ -223,11 +224,11 @@ Item {
width: searchResultsWidth > 0 ? searchResultsWidth : parent.width
addContactEnabled: root.addContactEnabled
onResultClicked: {
chatKey.hasValidSearchResult = false
userClicked(pubKey, isAddedContact, username, searchResults.address)
if (!validate()) {
return
}
chatKey.hasValidSearchResult = false
userClicked(pubKey, isAddedContact, username, searchResults.address)
}
onAddToContactsButtonClicked: {
root.contactsStore.addContact(pubKey)

1
ui/imports/shared/controls/RecipientSelector.qml
View File

@ -28,6 +28,7 @@ Item {
height: inpAddress.height + txtLabel.height
//% "Invalid ethereum address"
readonly property string addressValidationError: qsTrId("invalid-ethereum-address")
property alias wrongInputValidationError: inpAddress.wrongInputValidationError
property bool isValid: false
property bool isSelectorVisible: true
property bool addContactEnabled: true

2
ui/imports/utils/Utils.qml
View File

@ -16,7 +16,7 @@ QtObject {
function isChatKey(value) {
return (startsWith0x(value) && isHex(value) && value.length === 132) ||
/^z[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{48}$/.test(inputValue)
/^z[123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz]{48}$/.test(value)
}
function isValidETHNamePrefix(value) {