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(@wallet): wallet color fixes

Browse Source 
* Left bar hover color fix
* Network filter darkmode border
* No footer in all addresses

fixes #11659
This commit is contained in:
Anthony Laibe 2023-07-27 12:08:06 +01:00
parent 90f4d60059
commit 22c07efcd9
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ui/app/AppLayouts/Wallet/WalletLayout.qml
View File

@ -17,6 +17,7 @@ Item {
id: root id: root
property bool hideSignPhraseModal: false property bool hideSignPhraseModal: false
property bool showAllAccounts: true
property var store property var store
property var contactsStore property var contactsStore
property var emojiPopup: null property var emojiPopup: null
@ -25,6 +26,14 @@ Item {
onVisibleChanged: resetView() onVisibleChanged: resetView()
Connections {
target: walletSection
function onFilterChanged(address, includeWatchOnly, allAddresses) {
root.showAllAccounts = allAddresses
}
}
function showSigningPhrasePopup(){ function showSigningPhrasePopup(){
if(!hideSignPhraseModal && !RootStore.hideSignPhraseModal){ if(!hideSignPhraseModal && !RootStore.hideSignPhraseModal){
signPhrasePopup.open(); signPhrasePopup.open();
@ -84,14 +93,6 @@ Item {
rightPanelStackView.currentItem.resetStack(); rightPanelStackView.currentItem.resetStack();
} }
Component.onCompleted: {
// Read in RootStore
// if(RootStore.firstTimeLogin){
// RootStore.firstTimeLogin = false
// RootStore.setInitialRange()
// }
}
leftPanel: LeftTabView { leftPanel: LeftTabView {
id: leftTab id: leftTab
anchors.fill: parent anchors.fill: parent
@ -133,8 +134,10 @@ Item {
} }
footer: WalletFooter { footer: WalletFooter {
visible: !root.showAllAccounts
sendModal: root.sendModalPopup sendModal: root.sendModalPopup
width: parent.width width: parent.width
height: root.showAllAccounts ? implicitHeight : 61
walletStore: RootStore walletStore: RootStore
networkConnectionStore: root.networkConnectionStore networkConnectionStore: root.networkConnectionStore
onLaunchShareAddressModal: Global.openPopup(receiveModalComponent) onLaunchShareAddressModal: Global.openPopup(receiveModalComponent)

2
ui/app/AppLayouts/Wallet/controls/NetworkFilter.qml
View File

@ -122,8 +122,6 @@ StatusComboBox {
width: 24 width: 24
height: 24 height: 24
visible: image.source !== "" visible: image.source !== ""
border.width: index === 0 ? 0 : 1
border.color: Theme.palette.white
image.source: Style.svg(model.iconUrl) image.source: Style.svg(model.iconUrl)
z: index + 1 z: index + 1
} }

1
ui/app/AppLayouts/Wallet/panels/WalletFooter.qml
View File

@ -21,7 +21,6 @@ Rectangle {
signal launchShareAddressModal() signal launchShareAddressModal()
height: 61
color: Theme.palette.statusAppLayout.rightPanelBackgroundColor color: Theme.palette.statusAppLayout.rightPanelBackgroundColor
StatusModalDivider { StatusModalDivider {

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

@ -293,7 +293,7 @@ Rectangle {
hoverEnabled: true hoverEnabled: true
} }
radius: Style.current.radius radius: Style.current.radius
color: header.highlighted || mouseArea.containsMouse ? Style.current.backgroundHover : root.color color: header.highlighted || mouseArea.containsMouse ? Theme.palette.baseColor3 : 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 implicitHeight: parent.ListView.view.firstItem.height + Style.current.padding
@ -383,7 +383,7 @@ Rectangle {
id: savedAddressesBtn id: savedAddressesBtn
objectName: "savedAddressesBtn" objectName: "savedAddressesBtn"
hoverColor: Theme.palette.primaryColor3 hoverColor: Theme.palette.baseColor3
asset.bgColor: Theme.palette.primaryColor3 asset.bgColor: Theme.palette.primaryColor3
text: qsTr("Saved addresses") text: qsTr("Saved addresses")
icon.name: "address" icon.name: "address"