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(ImportCommunityPopup): Support uncompressed public keys

This commit is contained in:
Igor Sirotin 2023-05-15 13:31:23 +03:00 committed by Iuri Matias
parent 68065f1c6c
commit 086e05cec3
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ui/imports/shared/popups/ImportCommunityPopup.qml
View File

@ -24,9 +24,18 @@ StatusDialog {
property string importErrorMessage
readonly property string inputErrorMessage: isInputValid ? "" : qsTr("Invalid key")
readonly property string errorMessage: importErrorMessage || inputErrorMessage
readonly property string inputKey: Utils.dropCommunityLinkPrefix(keyInput.text.trim())
readonly property string inputKey: keyInput.text.trim()
readonly property bool isPrivateKey: Utils.isPrivateKey(inputKey)
readonly property bool isPublicKey: Utils.isChatKey(inputKey)
readonly property bool isPublicKey: publicKey !== ""
readonly property string publicKey: {
const key = Utils.dropCommunityLinkPrefix(inputKey)
if (!Utils.isCommunityPublicKey(key))
return ""
if (!Utils.isCompressedPubKey(key))
return key
return Utils.changeCommunityKeyCompression(key)
}
readonly property bool isInputValid: isPrivateKey || isPublicKey
}
@ -41,8 +50,8 @@ StatusDialog {
enabled: d.isInputValid
text: d.isPrivateKey ? qsTr("Make this an Owner Node") : qsTr("Import")
onClicked: {
let communityKey = d.inputKey
if (d.isPrivateKey) {
const communityKey = d.inputKey
if (!communityKey.startsWith("0x")) {
communityKey = "0x" + communityKey;
}
@ -51,7 +60,7 @@ StatusDialog {
}
if (d.isPublicKey) {
importButton.loading = true
root.store.requestCommunityInfo(communityKey, true)
root.store.requestCommunityInfo(d.publicKey, true)
root.close();
}
}

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

@ -28,6 +28,10 @@ QtObject {
return (startsWith0x(value) && isHex(value) && value.length === 132) || globalUtilsInst.isCompressedPubKey(value)
}
function isCommunityPublicKey(value) {
return (startsWith0x(value) && isHex(value) && value.length === 68) || globalUtilsInst.isCompressedPubKey(value)
}
function isCompressedPubKey(pubKey) {
return globalUtilsInst.isCompressedPubKey(pubKey)
}