Skip to content

Commit ee83704

Browse files
authored
fix(Wallet): Keep onchain friends tab accessible (#21121)
Reserve bottom space for wallet footer actions so Onchain friends stays accessible on Android, and align the scrollbar width with Activity Center. Closes #20816
1 parent 5cd8a1a commit ee83704

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

ui/app/AppLayouts/Wallet/views/LeftTabView.qml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,8 @@ Rectangle {
5151
property bool loaded: false
5252

5353
readonly property string removeAccountIdentifier: "wallet-section-remove-account"
54+
readonly property real bottomSafeMargin: root.SafeArea.margins.bottom
55+
readonly property real footerHeight: footer.height + followingAddressesFooter.height
5456
}
5557

5658
Loader {
@@ -273,14 +275,15 @@ Rectangle {
273275
left: parent.left
274276
right: parent.right
275277
}
276-
height: parent.height - footer.height
278+
height: Math.max(0, parent.height - d.footerHeight)
277279

278280
spacing: Theme.smallPadding
279281
currentIndex: -1
280282
highlightRangeMode: ListView.ApplyRange
281283
preferredHighlightBegin: 0
282284
preferredHighlightEnd: height
283285
bottomMargin: Theme.padding
286+
verticalScrollBar.implicitWidth: Math.max(Theme.halfPadding, 8)
284287

285288
readonly property Item firstItem: count > 0 ? itemAtIndex(0) : null
286289
readonly property bool footerOverlayed: d.loaded && contentHeight > availableHeight
@@ -422,7 +425,7 @@ Rectangle {
422425
anchors {
423426
top: parent.top
424427
// Bottom Margin is not applied to ListView if it's fully visible
425-
topMargin: Math.min(walletAccountsListView.contentHeight, parent.height - height) + (walletAccountsListView.footerOverlayed ? 0 : walletAccountsListView.bottomMargin)
428+
topMargin: Math.min(walletAccountsListView.contentHeight, parent.height - d.footerHeight) + (walletAccountsListView.footerOverlayed ? 0 : walletAccountsListView.bottomMargin)
426429
left: parent.left
427430
right: parent.right
428431
}
@@ -481,7 +484,8 @@ Rectangle {
481484
}
482485

483486
horizontalPadding: Theme.padding
484-
verticalPadding: 0
487+
topPadding: 0
488+
bottomPadding: d.bottomSafeMargin
485489

486490
contentItem: StatusFlatButton {
487491
objectName: "followingAddressesBtn"

0 commit comments

Comments
 (0)