From 571f818dc567e5f50ffdb76aef034997a2a1a021 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Tinkl?= Date: Wed, 10 Jun 2026 01:53:27 +0200 Subject: [PATCH] fix(Wallet): unbreak the All Accounts bg color - seems like on Windows, an unstyled plain `Button` uses the native control now; use our own StatusFlatButton Fixes #21202 --- test/e2e/gui/objects_map/names.py | 4 ++-- test/e2e/gui/objects_map/wallet_names.py | 4 ++-- .../ui-test/testSuites/global_shared/scripts/wallet_names.py | 2 +- ui/app/AppLayouts/Wallet/views/LeftTabView.qml | 5 +---- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/test/e2e/gui/objects_map/names.py b/test/e2e/gui/objects_map/names.py index dfb16153f4..dd0c4055d6 100644 --- a/test/e2e/gui/objects_map/names.py +++ b/test/e2e/gui/objects_map/names.py @@ -1244,7 +1244,7 @@ mainWallet_Saved_Addresses_Button = {"container": statusDesktop_mainWindow, "obj walletAccounts_StatusListView = {"container": statusDesktop_mainWindow, "objectName": "walletAccountsListView", "type": "StatusListView", "visible": True} mainWallet_All_Accounts_Button = {"container": walletAccounts_StatusListView, "objectName": "allAccountsBtn", - "type": "Button", "visible": True} + "type": "StatusFlatButton", "visible": True} mainWallet_Add_Account_Button = {"container": statusDesktop_mainWindow, "objectName": "addAccountButton", "type": "StatusRoundButton", "visible": True} walletAccount_StatusListItem = {"container": walletAccounts_StatusListView, @@ -1344,4 +1344,4 @@ marketScreen = {"container": statusDesktop_mainWindow, "objectName": "marketLayo marketScreenTokensList = {"container": marketScreen, "objectName": "tokensList", "type": "StatusListView", "visible": True} marketScreenSwapButton = {"container": marketScreen, "objectName": "swapButton", "type": "StatusButton", "visible": True} marketScreenHeading = {"container": marketScreen, "objectName": "heading", "type": "StatusBaseText", "visible": True} -marketScreenToken = {"container": marketScreen, "type": "MarketTokenDelegate", "unnamed": 1, "visible": True} \ No newline at end of file +marketScreenToken = {"container": marketScreen, "type": "MarketTokenDelegate", "unnamed": 1, "visible": True} diff --git a/test/e2e/gui/objects_map/wallet_names.py b/test/e2e/gui/objects_map/wallet_names.py index d3710ec4b0..132c05f614 100644 --- a/test/e2e/gui/objects_map/wallet_names.py +++ b/test/e2e/gui/objects_map/wallet_names.py @@ -8,7 +8,7 @@ mainWallet_LeftTab = {"container": mainWindow_WalletLayout, "objectName": "walle mainWallet_Saved_Addresses_Button = { "container": mainWallet_LeftTab, "objectName": "savedAddressesBtn", "type": "StatusFlatButton", "visible": True} walletAccounts_StatusListView = {"container": mainWallet_LeftTab, "objectName": "walletAccountsListView", "type": "StatusListView", "visible": True} -mainWallet_All_Accounts_Button = {"container": walletAccounts_StatusListView, "objectName": "allAccountsBtn", "type": "Button", "visible": True} +mainWallet_All_Accounts_Button = {"container": walletAccounts_StatusListView, "objectName": "allAccountsBtn", "type": "StatusFlatButton", "visible": True} mainWallet_Add_Account_Button = {"container": mainWallet_LeftTab, "objectName": "addAccountButton", "type": "StatusRoundButton", "visible": True} walletAccount_StatusListItem = {"container": walletAccounts_StatusListView, "objectName": "walletAccountListItem", "type": "StatusListItem", "visible": True} mainWallet_All_Accounts_Balance = {"container": mainWallet_All_Accounts_Button, "objectName": "walletLeftListAmountValue", "type": "StatusTextWithLoadingState", "visible": True} @@ -79,4 +79,4 @@ qrCodeImage_Image = {"container": statusDesktop_mainWindow_overlay, "objectName" """Remove saved address popup""" removeSavedAddressPopup = {"container": statusDesktop_mainWindow_overlay, "objectName": "RemoveSavedAddressPopup", "type": "PopupItem", "visible": True} removeSavedAddressButton = {"container": statusDesktop_mainWindow_overlay, "objectName": "RemoveSavedAddressPopup-ConfirmButton", "type": "StatusButton", "visible": True} -cancelRemovalButton = {"container": statusDesktop_mainWindow_overlay, "objectName": "RemoveSavedAddressPopup-CancelButton", "type": "StatusFlatButton", "visible": True} \ No newline at end of file +cancelRemovalButton = {"container": statusDesktop_mainWindow_overlay, "objectName": "RemoveSavedAddressPopup-CancelButton", "type": "StatusFlatButton", "visible": True} diff --git a/test/ui-test/testSuites/global_shared/scripts/wallet_names.py b/test/ui-test/testSuites/global_shared/scripts/wallet_names.py index e2b4431e7a..03cf3f7c1a 100644 --- a/test/ui-test/testSuites/global_shared/scripts/wallet_names.py +++ b/test/ui-test/testSuites/global_shared/scripts/wallet_names.py @@ -11,7 +11,7 @@ walletAccounts_StatusListView = {"container": statusDesktop_mainWindow, "objectN walletAccounts_WalletAccountItem_Placeholder = {"container": walletAccounts_StatusListView, "objectName": "walletAccount-%NAME%", "type": "StatusListItem", "visible": True} walletAccount_StatusListItem = {"container": walletAccounts_StatusListView, "objectName": RegularExpression("walletAccount*"), "type": "StatusListItem", "visible": True} mainWallet_Hide_Show_Watch_Only_Button = {"container": statusDesktop_mainWindow, "objectName": "hideShowWatchOnlyButton", "type": "StatusButton", "visible": True} -mainWallet_All_Accounts_Button = {"container": walletAccounts_StatusListView, "objectName": "allAccountsBtn", "type": "Button", "visible": True} +mainWallet_All_Accounts_Button = {"container": walletAccounts_StatusListView, "objectName": "allAccountsBtn", "type": "StatusFlatButton", "visible": True} # Context Menu mainWallet_CopyAddress_MenuItem = {"container": contextMenu_PopupItem, "enabled": True, "objectName": RegularExpression("AccountMenu-CopyAddressAction*"), "type": "StatusMenuItem"} diff --git a/ui/app/AppLayouts/Wallet/views/LeftTabView.qml b/ui/app/AppLayouts/Wallet/views/LeftTabView.qml index c82aadef3b..31e2ed16cd 100644 --- a/ui/app/AppLayouts/Wallet/views/LeftTabView.qml +++ b/ui/app/AppLayouts/Wallet/views/LeftTabView.qml @@ -339,7 +339,7 @@ Rectangle { ] } - header: Button { + header: StatusFlatButton { id: header verticalPadding: Theme.padding horizontalPadding: Theme.padding @@ -357,9 +357,6 @@ Rectangle { implicitWidth: parent.ListView.view.width - Theme.padding * 2 } - HoverHandler { - cursorShape: Qt.PointingHandCursor - } onClicked: root.selectAllAccounts() contentItem: ColumnLayout {