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): Can't scroll the list of wallets till the end of the list 

fixes #5025
This commit is contained in:
Khushboo Mehta 2022-03-15 15:59:58 +01:00 committed by Iuri Matias
parent f5e67fc658
commit 41f9e70339
2 changed files with 100 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
ui/app/AppLayouts/Profile/views/WalletView.qml
View File

@ -19,70 +19,56 @@ ScrollView {
id: root
property var emojiPopup
anchors.fill: parent
contentHeight: advancedContainer.height + 100
clip: true
property WalletStore walletStore
Item {
id: advancedContainer
anchors.top: parent.top
anchors.left: parent.left
clip: true
StackLayout {
id: stackContainer
StackLayout {
id: stackContainer
anchors.fill: parent
currentIndex: 0
anchors.fill: parent
currentIndex: 0
MainView {
id: main
Layout.preferredWidth: 560
leftPadding: 64
topPadding: 64
walletStore: root.walletStore
MainView {
walletStore: root.walletStore
anchors.topMargin: 64
anchors.top: parent.top
anchors.leftMargin: 64
anchors.left: parent.left
width: 560
onGoToNetworksView: {
stackContainer.currentIndex = 1
}
onGoToAccountView: {
root.walletStore.switchAccountByAddress(address)
stackContainer.currentIndex = 2
}
onGoToDappPermissionsView: {
stackContainer.currentIndex = 3
}
onGoToNetworksView: {
stackContainer.currentIndex = 1
}
NetworksView {
walletStore: root.walletStore
anchors.fill: parent
onGoBack: {
stackContainer.currentIndex = 0
}
onGoToAccountView: {
root.walletStore.switchAccountByAddress(address)
stackContainer.currentIndex = 2
}
AccountView {
walletStore: root.walletStore
emojiPopup: root.emojiPopup
anchors.fill: parent
onGoBack: {
stackContainer.currentIndex = 0
}
onGoToDappPermissionsView: {
stackContainer.currentIndex = 3
}
}
DappPermissionsView {
walletStore: root.walletStore
anchors.fill: parent
onGoBack: {
stackContainer.currentIndex = 0
}
NetworksView {
walletStore: root.walletStore
onGoBack: {
stackContainer.currentIndex = 0
}
}
AccountView {
walletStore: root.walletStore
emojiPopup: root.emojiPopup
onGoBack: {
stackContainer.currentIndex = 0
}
}
DappPermissionsView {
walletStore: root.walletStore
onGoBack: {
stackContainer.currentIndex = 0
}
}
}

115
ui/app/AppLayouts/Profile/views/wallet/MainView.qml
View File

@ -5,6 +5,7 @@ import shared.status 1.0
import shared.panels 1.0
import StatusQ.Core.Theme 0.1
import StatusQ.Core 0.1
import StatusQ.Components 0.1
import "../../stores"
import "../../controls"
@ -32,13 +33,20 @@ Column {
width: parent.width
}
StatusSettingsLineButton {
text: qsTr("Manage Assets & List")
StatusListItem {
title: qsTr("Manage Assets & List")
height: 64
width: parent.width
onClicked: Global.openPopup(tokenSettingsModalComponent)
components: [
StatusIcon {
icon: "chevron-down"
rotation: 270
color: Theme.palette.baseColor1
}
]
}
Component {
id: tokenSettingsModalComponent
TokenSettingsModal {
@ -51,61 +59,55 @@ Column {
Separator {
height: 17
anchors.left: parent.left
anchors.leftMargin: -Style.current.padding
anchors.right: parent.right
anchors.rightMargin: -Style.current.padding
}
StatusSettingsLineButton {
text: qsTr("DApp Permissions")
currentValue: {
return qsTr("%1 DApps connected").arg(root.walletStore.dappList.count)
}
StatusListItem {
title: qsTr("DApp Permissions")
height: 64
onClicked: goToDappPermissionsView()
}
Separator {
height: 17
anchors.left: parent.left
anchors.leftMargin: -Style.current.padding
anchors.right: parent.right
anchors.rightMargin: -Style.current.padding
}
StatusSettingsLineButton {
text: qsTr("Networks")
height: 64
visible: root.walletStore.isMultiNetworkEnabled
onClicked: goToNetworksView()
}
Separator {
height: 17
anchors.left: parent.left
anchors.leftMargin: -Style.current.padding
anchors.right: parent.right
anchors.rightMargin: -Style.current.padding
visible: root.walletStore.isMultiNetworkEnabled
}
Item {
height: Style.current.bigPadding
width: parent.width
onClicked: goToDappPermissionsView()
components: [
StatusIcon {
icon: "chevron-down"
rotation: 270
color: Theme.palette.baseColor1
}
]
}
StatusBaseText {
id: accountsText
text: qsTr("Accounts")
font.pixelSize: 15
color: Theme.palette.directColor1
Separator {
height: 17
}
StatusListItem {
title: qsTr("Networks")
height: 64
width: parent.width
onClicked: goToNetworksView()
components: [
StatusIcon {
icon: "chevron-down"
rotation: 270
color: Theme.palette.baseColor1
}
]
}
Separator {
height: 17
visible: root.walletStore.isMultiNetworkEnabled
}
StatusDescriptionListItem {
height: 64
subTitle: qsTr("Accounts")
}
StatusSectionHeadline {
text: qsTr("Generated from Your Seed Phrase")
topPadding: Style.current.bigPadding
bottomPadding: Style.current.padding
leftPadding: Style.current.padding
topPadding: Style.current.halfPadding
bottomPadding: Style.current.halfPadding/2
}
Repeater {
@ -120,8 +122,9 @@ Column {
StatusSectionHeadline {
text: qsTr("Imported")
topPadding: Style.current.bigPadding
bottomPadding: Style.current.padding
leftPadding: Style.current.padding
topPadding: Style.current.halfPadding
bottomPadding: Style.current.halfPadding/2
}
Repeater {
@ -136,8 +139,9 @@ Column {
StatusSectionHeadline {
text: qsTr("Watch-Only")
topPadding: Style.current.bigPadding
bottomPadding: Style.current.padding
leftPadding: Style.current.padding
topPadding: Style.current.halfPadding
bottomPadding: Style.current.halfPadding/2
}
Repeater {
@ -149,4 +153,9 @@ Column {
}
}
}
}
Item {
height: Style.current.bigPadding
width: parent.width
}
}