From 8ba10ce6b01d90421f0beef6f478a1fe85f625b0 Mon Sep 17 00:00:00 2001 From: Anthony Laibe Date: Tue, 7 Feb 2023 09:23:44 +0100 Subject: [PATCH] fix(@wallet): display network short name for collectible fixes #8850 --- .../collectibles/current_collectible/view.nim | 20 +++++++++---------- .../controls/CollectibleDetailsHeader.qml | 6 +++--- .../collectibles/CollectibleDetailView.qml | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/app/modules/main/wallet_section/collectibles/current_collectible/view.nim b/src/app/modules/main/wallet_section/collectibles/current_collectible/view.nim index 323a02845c..1a43402dbd 100644 --- a/src/app/modules/main/wallet_section/collectibles/current_collectible/view.nim +++ b/src/app/modules/main/wallet_section/collectibles/current_collectible/view.nim @@ -11,7 +11,7 @@ QtObject: View* = ref object of QObject delegate: io_interface.AccessInterface - networkName: string + networkShortName: string networkColor: string networkIconUrl: string @@ -47,14 +47,14 @@ QtObject: proc load*(self: View) = self.delegate.viewDidLoad() - proc getNetworkName(self: View): QVariant {.slot.} = - return newQVariant(self.networkName) + proc getNetworkShortName(self: View): QVariant {.slot.} = + return newQVariant(self.networkShortName) - proc networkNameChanged(self: View) {.signal.} + proc networkShortNameChanged(self: View) {.signal.} - QtProperty[QVariant] networkName: - read = getNetworkName - notify = networkNameChanged + QtProperty[QVariant] networkShortName: + read = getNetworkShortName + notify = networkShortNameChanged proc getNetworkColor(self: View): QVariant {.slot.} = return newQVariant(self.networkColor) @@ -177,9 +177,9 @@ QtObject: self.delegate.update(collectionSlug, id) proc setData*(self: View, collection: collectible_dto.CollectionDto, collectible: collectible_dto.CollectibleDto, network: network_dto.NetworkDto) = - if (self.networkName != network.chainName): - self.networkName = network.chainName - self.networkNameChanged() + if (self.networkShortName != network.shortName): + self.networkShortName = network.shortName + self.networkShortNameChanged() if (self.networkColor != network.chainColor): self.networkColor = network.chainColor diff --git a/ui/app/AppLayouts/Wallet/controls/CollectibleDetailsHeader.qml b/ui/app/AppLayouts/Wallet/controls/CollectibleDetailsHeader.qml index 823ce7cb75..8f385feb65 100644 --- a/ui/app/AppLayouts/Wallet/controls/CollectibleDetailsHeader.qml +++ b/ui/app/AppLayouts/Wallet/controls/CollectibleDetailsHeader.qml @@ -15,7 +15,7 @@ ColumnLayout { property alias primaryText: collectibleName.text property string secondaryText property bool isNarrowMode - property string networkName + property string networkShortName property string networkColor property string networkIconURL @@ -84,9 +84,9 @@ ColumnLayout { InformationTag { id: networkTag - readonly property bool isNetworkValid: networkName !== "" + readonly property bool isNetworkValid: networkShortName !== "" image.source: isNetworkValid && networkIconURL !== "" ? Style.svg("tiny/" + networkIconURL) : "" - tagPrimaryLabel.text: isNetworkValid ? networkName : "---" + tagPrimaryLabel.text: isNetworkValid ? networkShortName : "---" tagPrimaryLabel.color: isNetworkValid ? networkColor : "black" visible: isNetworkValid } diff --git a/ui/app/AppLayouts/Wallet/views/collectibles/CollectibleDetailView.qml b/ui/app/AppLayouts/Wallet/views/collectibles/CollectibleDetailView.qml index b5fff4c63e..a734030e90 100644 --- a/ui/app/AppLayouts/Wallet/views/collectibles/CollectibleDetailView.qml +++ b/ui/app/AppLayouts/Wallet/views/collectibles/CollectibleDetailView.qml @@ -28,7 +28,7 @@ Item { primaryText: currentCollectible.collectionName secondaryText: currentCollectible.id isNarrowMode: root.isNarrowMode - networkName: currentCollectible.networkName + networkShortName: currentCollectible.networkShortName networkColor: currentCollectible.networkColor networkIconURL: currentCollectible.networkIconUrl }