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: fix nickname not refreshing in contact lists for groups

This commit is contained in:
Jonathan Rainville 2020-09-17 15:39:02 -04:00 committed by Iuri Matias
parent fd93650b23
commit f359f7c45d
3 changed files with 32 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui/app/AppLayouts/Chat/components/GroupChatPopup.qml
View File

@ -28,9 +28,11 @@ ModalPopup {
}
data.clear();
for(let i = 0; i < profileModel.contactList.rowCount(); i++){
const nbContacts = profileModel.contactList.rowCount()
for(let i = 0; i < nbContacts; i++){
data.append({
name: profileModel.contactList.rowData(i, "name"),
localNickname: profileModel.contactList.rowData(i, "localNickname"),
pubKey: profileModel.contactList.rowData(i, "pubKey"),
address: profileModel.contactList.rowData(i, "address"),
identicon: profileModel.contactList.rowData(i, "identicon"),
@ -163,13 +165,14 @@ ModalPopup {
pubKey: model.pubKey
isContact: model.isContact
isUser: model.isUser
name: model.name
name: !model.name.endsWith(".eth") && !!model.localNickname ?
model.localNickname : Utils.removeStatusEns(model.name)
address: model.address
identicon: model.identicon
onItemChecked: function(pubKey, itemChecked){
var idx = pubKeys.indexOf(pubKey)
if(itemChecked){
if(idx == -1){
if(idx === -1){
pubKeys.push(pubKey)
}
} else {

66
ui/app/AppLayouts/Chat/components/GroupInfoPopup.qml
View File

@ -19,11 +19,13 @@ ModalPopup {
memberCount = chatsModel.activeChannel.members.rowCount();
currMemberCount = memberCount;
data.clear();
for(let i = 0; i < profileModel.contactList.rowCount(); i++){
const nbContacts = profileModel.contactList.rowCount()
for(let i = 0; i < nbContacts; i++){
if(chatsModel.activeChannel.contains(profileModel.contactList.rowData(i, "pubKey"))) continue;
if(profileModel.contactList.rowData(i, "isContact") === "false") continue;
data.append({
name: profileModel.contactList.rowData(i, "name"),
localNickname: profileModel.contactList.rowData(i, "localNickname"),
pubKey: profileModel.contactList.rowData(i, "pubKey"),
address: profileModel.contactList.rowData(i, "address"),
identicon: profileModel.contactList.rowData(i, "identicon"),
@ -215,13 +217,14 @@ ModalPopup {
showCheckbox: memberCount < maxMembers
pubKey: model.pubKey
isUser: model.isUser
name: Utils.removeStatusEns(model.name)
name: model.name.endsWith(".eth") && !!model.localNickname ?
Utils.removeStatusEns(model.name) : model.localNickname
address: model.address
identicon: model.identicon
onItemChecked: function(pubKey, itemChecked){
var idx = pubKeys.indexOf(pubKey)
if(itemChecked){
if(idx == -1){
if(idx === -1){
pubKeys.push(pubKey)
}
} else {
@ -252,34 +255,6 @@ ModalPopup {
color: Style.current.darkGrey
}
ListModel {
id: exampleModel
ListElement {
isAdmin: false
joined: true
identicon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII="
userName: "The UserName"
pubKey: "0x12345678"
}
ListElement {
isAdmin: false
joined: true
identicon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII="
userName: "The UserName"
pubKey: "0x12345678"
}
ListElement {
isAdmin: false
joined: true
identicon: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII="
userName: "The UserName"
pubKey: "0x12345678"
}
}
ListView {
id: memberList
anchors.fill: parent
@ -290,9 +265,21 @@ ModalPopup {
spacing: 4
Layout.fillWidth: true
Layout.fillHeight: true
//model: exampleModel
model: chatsModel.activeChannel.members
delegate: Row {
id: contactRow
property string nickname: {
// Get contact nickname
const contactList = profileModel.contactList
const contactCount = contactList.rowCount()
let nickname = ""
for (let i = 0; i < contactCount; i++) {
if (contactList.rowData(i, 'pubKey') === model.pubKey) {
return contactList.rowData(i, 'localNickname')
}
}
}
Column {
Image {
source: model.identicon
@ -303,7 +290,8 @@ ModalPopup {
}
Column {
StyledText {
text: Utils.removeStatusEns(model.userName)
text: !model.userName.endsWith(".eth") && !!contactRow.nickname ?
contactRow.nickname : Utils.removeStatusEns(model.userName)
width: 300
elide: Text.ElideRight
Layout.fillWidth: true
@ -312,17 +300,7 @@ ModalPopup {
anchors.fill: parent
cursorShape: Qt.PointingHandCursor
onClicked: {
// Get contact nickname
const contactList = profileModel.contactList
const contactCount = contactList.rowCount()
let nickname = ""
for (let i = 0; i < contactCount; i++) {
if (contactList.rowData(i, 'pubKey') === model.pubKey) {
nickname = contactList.rowData(i, 'localNickname')
break;
}
}
popup.profileClick(model.userName, model.pubKey, model.identicon, '', nickname)
popup.profileClick(model.userName, model.pubKey, model.identicon, '', contactRow.nickname)
popup.close()
}
}

5
ui/app/AppLayouts/Chat/components/NicknamePopup.qml
View File

@ -77,7 +77,10 @@ ModalPopup {
anchors.bottom: parent.bottom
disabled: popup.nicknameLength === 0 || popup.nicknameTooLong
onClicked: {
userName = nicknameInput.textField.text
if (!userName.startsWith("@")) {
// Replace username only if it was not an ENS name
userName = nicknameInput.textField.text
}
nickname = nicknameInput.textField.text
profileModel.changeContactNickname(fromAuthor, nicknameInput.textField.text)
popup.close()