From 876c6e99f8a0402923354a4ee8ba8a02c97434b4 Mon Sep 17 00:00:00 2001 From: Jonathan Rainville Date: Fri, 5 Nov 2021 14:08:31 -0400 Subject: [PATCH] fix(StatusAccountSelector): adapt AccountSelector to new model (#482) --- .../Controls/StatusAccountSelector.qml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ui/StatusQ/src/StatusQ/Controls/StatusAccountSelector.qml b/ui/StatusQ/src/StatusQ/Controls/StatusAccountSelector.qml index 5347359416..be5df6bff7 100644 --- a/ui/StatusQ/src/StatusQ/Controls/StatusAccountSelector.qml +++ b/ui/StatusQ/src/StatusQ/Controls/StatusAccountSelector.qml @@ -54,8 +54,8 @@ Item { if (!selectedAccount) { return } - if (selectedAccount.iconColor) { - selectedIconImg.color = Utils.getThemeAccountColor(selectedAccount.iconColor, Theme.palette.accountColors) || Theme.palette.accountColors[0] + if (selectedAccount.color) { + selectedIconImg.color = Utils.getThemeAccountColor(selectedAccount.color, Theme.palette.accountColors) || Theme.palette.accountColors[0] } if (selectedAccount.name) { selectedTextField.text = selectedAccount.name @@ -63,8 +63,8 @@ Item { if (selectedAccount.address) { textSelectedAddress.text = selectedAccount.address + " •" } - if (selectedAccount.fiatBalance) { - textSelectedAddressFiatBalance.text = selectedAccount.fiatBalance + " " + currency.toUpperCase() + if (selectedAccount.currencyBalance) { + textSelectedAddressFiatBalance.text = selectedAccount.currencyBalance + " " + currency.toUpperCase() } if (selectedAccount.assets && showBalanceForAssetSymbol) { assetFound = Utils.findAssetBySymbol(selectedAccount.assets, showBalanceForAssetSymbol) @@ -90,11 +90,11 @@ Item { id: txtAssetBalance visible: root.assetFound !== undefined anchors.bottom: select.top - anchors.bottomMargin: -18 + anchors.bottomMargin: -18 anchors.right: txtAssetSymbol.left anchors.left: select.left anchors.leftMargin: select.width / 2.5 - + color: !root.isValid ? Theme.palette.dangerColor1 : Theme.palette.baseColor1 elide: Text.ElideRight font.pixelSize: 13 @@ -194,7 +194,7 @@ Item { Component.onCompleted: { if (!root.selectedAccount && isFirstItem) { - root.selectedAccount = { address, name, iconColor, assets, fiatBalance } + root.selectedAccount = { address, name, color: model.color, assets, currencyBalance } } } @@ -208,7 +208,7 @@ Item { width: 20 height: 20 icon: "filled-account" - color: Utils.getThemeAccountColor(iconColor, Theme.palette.accountColors) || Theme.palette.accountColors[0] + color: Utils.getThemeAccountColor(model.color, Theme.palette.accountColors) || Theme.palette.accountColors[0] } Column { @@ -247,7 +247,7 @@ Item { anchors.verticalCenter: parent.verticalCenter font.pixelSize: 15 height: 22 - text: fiatBalance + text: currencyBalance color: Theme.palette.directColor1 } StatusBaseText { @@ -267,7 +267,7 @@ Item { cursorShape: Qt.PointingHandCursor anchors.fill: itemContainer onClicked: { - root.selectedAccount = { address, name, iconColor, assets, fiatBalance } + root.selectedAccount = { address, name, color: model.color, assets, currencyBalance } select.selectMenu.close() } }