mirror of
https://github.com/status-im/status-desktop.git
synced 2025-01-22 04:21:44 +00:00
(desktop/fix) Fix Owner token holder representation (#13712)
fix #12065 token owner presentation in Token section by displaying the owner token holder as contact
This commit is contained in:
parent
09c0f1b0c8
commit
0a42bd0742
@ -50,6 +50,7 @@ StackView {
|
||||
|
||||
// Models:
|
||||
property var tokensModel
|
||||
property var membersModel
|
||||
property var accounts // Expected roles: address, name, color, emoji, walletType
|
||||
required property var referenceAssetsBySymbolModel
|
||||
|
||||
@ -481,6 +482,7 @@ StackView {
|
||||
property TokenObject token: TokenObject {}
|
||||
readonly property bool deploymentFailed: view.deployState === Constants.ContractTransactionStatus.Failed
|
||||
|
||||
property var membersModel
|
||||
property var tokenOwnersModel
|
||||
property string airdropKey
|
||||
// Owner and TMaster related props
|
||||
@ -547,7 +549,9 @@ StackView {
|
||||
viewWidth: root.viewWidth
|
||||
|
||||
token: tokenViewPage.token
|
||||
membersModel: tokenViewPage.membersModel
|
||||
tokenOwnersModel: tokenViewPage.tokenOwnersModel
|
||||
isOwnerTokenItem: tokenViewPage.isOwnerTokenItem
|
||||
|
||||
onGeneralAirdropRequested: {
|
||||
root.airdropToken(view.airdropKey,
|
||||
@ -942,6 +946,7 @@ StackView {
|
||||
anchors.fill: parent
|
||||
|
||||
tokenOwnersModel: model.tokenOwnersModel
|
||||
membersModel: root.membersModel
|
||||
airdropKey: model.symbol // TO BE REMOVED: When airdrop backend is ready to use token key instead of symbol
|
||||
|
||||
token.privilegesLevel: model.privilegesLevel
|
||||
|
@ -349,6 +349,7 @@ StatusSectionLayout {
|
||||
|
||||
// Models
|
||||
tokensModel: root.community.communityTokens
|
||||
membersModel: root.community.members
|
||||
layer1Networks: communityTokensStore.layer1Networks
|
||||
layer2Networks: communityTokensStore.layer2Networks
|
||||
enabledNetworks: communityTokensStore.enabledNetworks
|
||||
|
@ -2,6 +2,7 @@ import QtQuick 2.15
|
||||
import QtQuick.Layouts 1.14
|
||||
import QtGraphicalEffects 1.0
|
||||
|
||||
import StatusQ 0.1
|
||||
import StatusQ.Core 0.1
|
||||
import StatusQ.Core.Theme 0.1
|
||||
import StatusQ.Controls 0.1
|
||||
@ -21,6 +22,7 @@ StatusScrollView {
|
||||
|
||||
property int viewWidth: 560 // by design
|
||||
property bool preview: false
|
||||
property bool isOwnerTokenItem: false
|
||||
|
||||
// https://bugreports.qt.io/browse/QTBUG-84269
|
||||
/* required */ property TokenObject token
|
||||
@ -60,6 +62,7 @@ StatusScrollView {
|
||||
|
||||
// Models:
|
||||
property var tokenOwnersModel
|
||||
property var membersModel
|
||||
|
||||
// Required for preview mode:
|
||||
property var accounts
|
||||
@ -79,6 +82,23 @@ StatusScrollView {
|
||||
id: d
|
||||
|
||||
readonly property int iconSize: 20
|
||||
|
||||
readonly property var renamedTokenOwnersModel: RolesRenamingModel {
|
||||
sourceModel: root.tokenOwnersModel
|
||||
mapping: [
|
||||
RoleRename {
|
||||
from: "contactId"
|
||||
to: "pubKey"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
readonly property LeftJoinModel joinModel: LeftJoinModel {
|
||||
leftModel: root.membersModel
|
||||
rightModel: d.renamedTokenOwnersModel
|
||||
|
||||
joinRole: "pubKey"
|
||||
}
|
||||
}
|
||||
|
||||
padding: 0
|
||||
@ -196,9 +216,17 @@ StatusScrollView {
|
||||
onClicked: root.mintClicked()
|
||||
}
|
||||
|
||||
SortableTokenHoldersPanel {
|
||||
visible: !root.preview && root.deploymentCompleted
|
||||
Loader {
|
||||
id: tokenHolderLoader
|
||||
|
||||
visible: !root.preview && root.deploymentCompleted
|
||||
sourceComponent: isOwnerTokenItem ? tokenHolderContact : sortableTokenHolderPanel
|
||||
}
|
||||
|
||||
Component {
|
||||
id: sortableTokenHolderPanel
|
||||
|
||||
SortableTokenHoldersPanel {
|
||||
model: root.tokenOwnersModel
|
||||
tokenName: root.name
|
||||
showRemotelyDestructMenuItem: !root.isAssetView && root.remotelyDestruct
|
||||
@ -219,4 +247,72 @@ StatusScrollView {
|
||||
onBanRequested: root.banRequested(name, contactId, address)
|
||||
}
|
||||
}
|
||||
|
||||
Component {
|
||||
id: tokenHolderContact
|
||||
|
||||
ColumnLayout {
|
||||
Layout.topMargin: Style.current.padding
|
||||
Layout.fillWidth: true
|
||||
|
||||
StatusBaseText {
|
||||
Layout.fillWidth: true
|
||||
|
||||
wrapMode: Text.Wrap
|
||||
font.pixelSize: Style.current.primaryTextFontSize
|
||||
color: Theme.palette.baseColor1
|
||||
|
||||
text: qsTr("%1 token hodler").arg(root.name)
|
||||
}
|
||||
|
||||
StatusInfoBoxPanel {
|
||||
id: infoBoxPanel
|
||||
|
||||
Layout.fillWidth: true
|
||||
Layout.topMargin: Style.current.padding
|
||||
|
||||
enabled: root.deploymentCompleted && (token.infiniteSupply || token.remainingTokens > 0)
|
||||
visible: d.joinModel.rowCount() === 0
|
||||
title: qsTr("No hodlers just yet")
|
||||
text: qsTr("You can Airdrop tokens to deserving Community members or to give individuals token-based permissions.")
|
||||
buttonText: qsTr("Airdrop")
|
||||
|
||||
onClicked: root.generalAirdropRequested()
|
||||
}
|
||||
|
||||
StatusListView {
|
||||
id: tokenOwnerList
|
||||
objectName: "tokenOwnerList"
|
||||
|
||||
clip: false
|
||||
|
||||
Layout.fillWidth: true
|
||||
Layout.fillHeight: true
|
||||
anchors.bottomMargin: Style.current.bigPadding
|
||||
displayMarginEnd: anchors.bottomMargin
|
||||
|
||||
model: d.joinModel
|
||||
delegate: StatusMemberListItem {
|
||||
color: "transparent"
|
||||
leftPadding: 0
|
||||
rightPadding: 0
|
||||
sensor.enabled: false
|
||||
|
||||
nickName: model.localNickname
|
||||
userName: ProfileUtils.displayName("", model.ensName, model.displayName, model.alias)
|
||||
pubKey: model.isEnsVerified ? "" : Utils.getCompressedPk(model.pubKey)
|
||||
isContact: model.isContact
|
||||
isVerified: model.verificationStatus === Constants.verificationStatus.verified
|
||||
isUntrustworthy: model.trustStatus === Constants.trustStatus.untrustworthy
|
||||
status: model.onlineStatus
|
||||
asset.name: model.icon
|
||||
asset.isImage: (asset.name !== "")
|
||||
asset.isLetterIdenticon: (asset.name === "")
|
||||
asset.color: Utils.colorForPubkey(model.pubKey)
|
||||
ringSettings.ringSpecModel: Utils.getColorHashAsJson(model.pubKey)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user