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(PRofileShowcase): Fixing conflict merge error

This commit is contained in:
Alex Jbanca 2024-04-02 10:45:38 +03:00 committed by Alex Jbanca
parent 7fa3771e4e
commit 684fb787a6
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ui/app/AppLayouts/Profile/helpers/ProfileShowcaseModelAdapter.qml
View File

@ -58,6 +58,13 @@ QObject {
name: "membersCount"
expression: model.members.count
expectedRoles: ["members"]
},
FastExpressionRole {
name: "showcaseVisibility"
expression: getShowcaseVisibility()
function getShowcaseVisibility() {
return Constants.ShowcaseVisibility.Everyone
}
}
]
}
@ -79,6 +86,13 @@ QObject {
name: "saved"
expression: root.isAddressSaved(model.address)
expectedRoles: ["address"]
},
FastExpressionRole {
name: "showcaseVisibility"
expression: getShowcaseVisibility()
function getShowcaseVisibility() {
return Constants.ShowcaseVisibility.Everyone
}
}
]
}
@ -92,6 +106,13 @@ QObject {
name: "showcaseKey"
expression: model.uid
expectedRoles: ["uid"]
},
FastExpressionRole {
name: "showcaseVisibility"
expression: getShowcaseVisibility()
function getShowcaseVisibility() {
return Constants.ShowcaseVisibility.Everyone
}
}
]
}

2
ui/imports/shared/views/profile/ProfileShowcaseView.qml
View File

@ -241,8 +241,6 @@ Control {
}
onClicked: {
print ("!!communitiesProxyModel", JSON.stringify(StatusQUtils.ModelUtils.modelToArray(communitiesProxyModel)))
if (root.readOnly)
return
root.closeRequested()