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(@desktop/wallet): display short address form in the wallet settings account order page

This commit is contained in:
Sale Djenic 2023-12-20 15:10:50 +01:00 committed by saledjenic
parent a055ad4d71
commit bc2642c5e8
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/StatusQ/src/StatusQ/Components/StatusDraggableListItem.qml
View File

@ -212,6 +212,12 @@ ItemDelegate {
*/
property color assetBgColor: "transparent"
/*!
\qmlproperty alias StatusDraggableListItem::containsMouse
Used to read if the component cotains mouse
*/
readonly property alias containsMouse: dragHandler.containsMouse
Drag.dragType: Drag.Automatic
Drag.hotSpot.x: dragHandler.mouseX
Drag.hotSpot.y: dragHandler.mouseY

7
ui/app/AppLayouts/Profile/controls/WalletAccountDelegate.qml
View File

@ -3,7 +3,6 @@ import QtQuick 2.14
import StatusQ.Components 0.1
import StatusQ.Core.Theme 0.1
import StatusQ.Core 0.1
import StatusQ.Core.Utils 0.1 as StatusQUtils
import AppLayouts.Wallet 1.0
@ -21,11 +20,7 @@ StatusListItem {
objectName: account.name
title: account.name
subTitle: {
const elidedAddress = StatusQUtils.Utils.elideText(account.address,6,4)
let chainShortNames = root.getNetworkShortNames(account.preferredSharingChainIds)
return sensor.containsMouse ? WalletUtils.colorizedChainPrefix(chainShortNames) + Utils.richColorText(elidedAddress, Theme.palette.directColor1) : chainShortNames + elidedAddress
}
subTitle: WalletUtils.addressToDisplay(account.address, root.getNetworkShortNames(account.preferredSharingChainIds), true, sensor.containsMouse)
asset.color: !!account.colorId ? Utils.getColorForId(account.colorId): ""
asset.emoji: account.emoji
asset.name: !account.emoji ? "filled-account": ""

4
ui/app/AppLayouts/Profile/views/wallet/AccountOrderView.qml
View File

@ -10,6 +10,8 @@ import StatusQ.Popups 0.1
import StatusQ.Core 0.1
import StatusQ.Core.Theme 0.1
import AppLayouts.Wallet 1.0
import utils 1.0
import "../../stores"
@ -92,7 +94,7 @@ ColumnLayout {
draggable: accountsList.count > 1
Drag.keys: [d.walletAccountDnDKey]
title: model.name
secondaryTitle: model.address
secondaryTitle: WalletUtils.addressToDisplay(model.address, "", true, containsMouse)
secondaryTitleIcon: model.walletType === Constants.watchWalletType? "show" :
model.keycardAccount ? "keycard" : ""
hasEmoji: true

10
ui/app/AppLayouts/Wallet/WalletUtils.qml
View File

@ -5,6 +5,8 @@ import QtQuick 2.14
import utils 1.0
import StatusQ.Core.Theme 0.1
import StatusQ.Core.Utils 0.1 as StatusQUtils
import "stores" as WalletStores
QtObject {
@ -47,4 +49,12 @@ QtObject {
}
return timestamp + Constants.time.secondsIn7Days
}
function addressToDisplay(address, chainShortNames, shortForm, hovered) {
let finalAddress = address
if (shortForm) {
finalAddress = StatusQUtils.Utils.elideText(address,6,4)
}
return hovered? WalletUtils.colorizedChainPrefix(chainShortNames) + Utils.richColorText(finalAddress, Theme.palette.directColor1) : chainShortNames + finalAddress
}
}