status-im/status-desktop
2
0
Fork 0
mirror of https://github.com/status-im/status-desktop.git synced 2025-02-22 11:38:57 +00:00
Code Issues Projects Releases Wiki Activity

fix(@desktop/wallet): Wallet TEST_MODE: account ordering is buggy when in test mode

Browse Source 
fixes #12777
This commit is contained in:
Khushboo Mehta 2023-11-17 14:23:46 +01:00 committed by Khushboo-dev-cpp
parent a2e8655835
commit 961babc65a
2 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,7 +94,6 @@ ColumnLayout {
draggable: accountsList.count > 1 draggable: accountsList.count > 1
Drag.keys: [d.walletAccountDnDKey] Drag.keys: [d.walletAccountDnDKey]
title: model.name title: model.name
bgColor: Theme.palette.baseColor1
secondaryTitle: model.address secondaryTitle: model.address
secondaryTitleIcon: model.walletType === Constants.watchWalletType? "show" : secondaryTitleIcon: model.walletType === Constants.watchWalletType? "show" :
model.keycardAccount ? "keycard" : "" model.keycardAccount ? "keycard" : ""

49
ui/app/AppLayouts/Wallet/views/LeftTabView.qml
View File

@ -320,6 +320,8 @@ Rectangle {
leftInset: Style.current.padding leftInset: Style.current.padding
bottomInset: Style.current.padding bottomInset: Style.current.padding
leftPadding: Style.current.xlPadding
bottomPadding: Style.current.bigPadding
background: Rectangle { background: Rectangle {
MouseArea { MouseArea {
@ -333,37 +335,48 @@ Rectangle {
radius: Style.current.radius radius: Style.current.radius
color: header.highlighted || mouseArea.containsMouse ? Style.current.backgroundHover : root.color color: header.highlighted || mouseArea.containsMouse ? Style.current.backgroundHover : root.color
implicitWidth: parent.ListView.view.width - Style.current.padding * 2 implicitWidth: parent.ListView.view.width - Style.current.padding * 2
implicitHeight: parent.ListView.view.firstItem.height + Style.current.padding
} }
contentItem: Item { contentItem: ColumnLayout {
spacing: 0
StatusBaseText { StatusBaseText {
id: allAccounts id: allAccounts
leftPadding: Style.current.padding
color: Theme.palette.baseColor1 color: Theme.palette.baseColor1
text: qsTr("All accounts") text: qsTr("All accounts")
font.weight: Font.Medium font.weight: Font.Medium
font.pixelSize: 15 font.pixelSize: 15
lineHeightMode: Text.FixedHeight
lineHeight: 22
} }
RowLayout {
StatusTextWithLoadingState { spacing: 4
id: walletAmountValue StatusTextWithLoadingState {
objectName: "walletLeftListAmountValue" id: walletAmountValue
customColor: Style.current.textColor objectName: "walletLeftListAmountValue"
text: LocaleUtils.currencyAmountToLocaleString(RootStore.totalCurrencyBalance) customColor: Style.current.textColor
font.pixelSize: 22 text: LocaleUtils.currencyAmountToLocaleString(RootStore.totalCurrencyBalance, {noSymbol: true})
loading: RootStore.assetsLoading font.pixelSize: 22
loading: RootStore.assetsLoading
lineHeightMode: Text.FixedHeight
lineHeight: 36
verticalAlignment: Text.AlignVCenter
}
StatusTextWithLoadingState {
customColor: Style.current.textColor
text: RootStore.totalCurrencyBalance.symbol
font.pixelSize: 13
loading: RootStore.assetsLoading
font.weight: Font.Medium
lineHeightMode: Text.FixedHeight
lineHeight: 22
verticalAlignment: Text.AlignBottom
}
visible: !networkConnectionStore.accountBalanceNotAvailable visible: !networkConnectionStore.accountBalanceNotAvailable
anchors.top: allAccounts.bottom
anchors.topMargin: 4
anchors.bottomMargin: Style.current.padding
leftPadding: Style.current.padding
} }
StatusFlatRoundButton { StatusFlatRoundButton {
id: errorIcon id: errorIcon
width: 14 Layout.preferredWidth: 14
height: visible ? 14 : 0 Layout.preferredHeight: 14
icon.width: 14 icon.width: 14
icon.height: 14 icon.height: 14
icon.name: "tiny/warning" icon.name: "tiny/warning"