status-im/status-desktop
2
0
Fork 0
mirror of https://github.com/status-im/status-desktop.git synced 2025-02-03 10:14:04 +00:00
Code Issues Projects Releases Wiki Activity

feat(wallet): Update send modal height handling (#17143)

Browse Source
This commit is contained in:
Cuteivist 2025-02-02 07:22:07 +01:00 committed by GitHub
parent ea33f151db
commit 3b56fc0895
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 61 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui/app/AppLayouts/Wallet/panels/RecipientSelectorPanel.qml
View File

@ -33,8 +33,11 @@ Rectangle {
/** Search pattern in recipient view input **/
readonly property string searchPattern: recipientInputLoader.searchPattern
/** Currently viewed tab is empty **/
readonly property bool emptyListVisible: emptyListText.visible && !selectedRecipientAddress
/** Currently selected recipient tab **/
readonly property int selectedRecipientType: Constants.RecipientAddressObjectType.RecentsAddress
readonly property alias selectedRecipientType: d.selectedRecipientType
/** Selected recipient address. It is input and output property **/
property alias selectedRecipientAddress: recipientInputLoader.selectedRecipientAddress
@ -62,6 +65,7 @@ Rectangle {
readonly property bool searchInProgress: !!root.searchPattern && root.recipientsFilterModel.ModelCount.count > 0
property int highlightedIndex: 0
property int selectedRecipientType: Constants.RecipientAddressObjectType.RecentsAddress
function handleKeyPressOnSearch(event) {
if (!event || !d.searchInProgress || highlightedIndex === -1)
@ -144,19 +148,19 @@ Rectangle {
width: implicitWidth
objectName: "recentAddressesTab"
text: qsTr("Recent")
onClicked: root.selectedRecipientType = Constants.RecipientAddressObjectType.RecentsAddress
onClicked: d.selectedRecipientType = Constants.RecipientAddressObjectType.RecentsAddress
}
StatusTabButton {
width: implicitWidth
objectName: "savedAddressesTab"
text: qsTr("Saved")
onClicked: root.selectedRecipientType = Constants.RecipientAddressObjectType.SavedAddress
onClicked: d.selectedRecipientType = Constants.RecipientAddressObjectType.SavedAddress
}
StatusTabButton {
width: implicitWidth
objectName: "myAccountsTab"
text: qsTr("My Accounts")
onClicked: root.selectedRecipientType = Constants.RecipientAddressObjectType.Account
onClicked: d.selectedRecipientType = Constants.RecipientAddressObjectType.Account
}
visible: !root.selectedRecipientAddress && !d.searchInProgress

67
ui/app/AppLayouts/Wallet/popups/simpleSend/SimpleSendModal.qml
View File

@ -1,4 +1,5 @@
import QtQuick 2.15
import QtQuick.Window 2.15
import QtQuick.Layouts 1.15
import QtQml.Models 2.15
@ -335,10 +336,32 @@ StatusDialog {
}
width: 556
height: {
if (!selectedRecipientAddress)
return root.contentItem.Window.height - topMargin - margins
let contentHeight = Math.max(sendModalHeader.height +
amountToSend.height +
recipientsPanelLayout.height +
feesLayout.height +
scrollViewLayout.spacing*3 +
28,
scrollView.implicitHeight) + footer.height
if (!!footer.errorTags && !feesLayout.visible) {
// Utilize empty space when fees are not visible and error is shown
contentHeight -= feesLayout.height
}
return contentHeight
}
padding: 0
horizontalPadding: Theme.xlPadding
topMargin: margins + accountSelector.height + Theme.padding
Behavior on height {
enabled: !!root.selectedRecipientAddress
NumberAnimation { duration: 100; easing: Easing.OutCurve }
}
background: StatusDialogBackground {
color: Theme.palette.baseColor3
}
@ -353,13 +376,6 @@ StatusDialog {
anchors.top: parent.top
implicitWidth: parent.width
implicitHeight: Math.max(sendModalHeader.height +
amountToSend.height +
recipientsPanelLayout.height +
feesLayout.height +
scrollViewLayout.spacing*3 +
28,
scrollView.implicitHeight)
// Floating account Selector
AccountSelectorHeader {
@ -523,26 +539,49 @@ StatusDialog {
id: recipientsPanelLayout
Layout.fillWidth: true
Layout.fillHeight: true
spacing: Theme.halfPadding
StatusBaseText {
elide: Text.ElideRight
text: qsTr("To")
Layout.alignment: Qt.AlignTop
}
RecipientSelectorPanel {
id: recipientsPanel
Item {
Layout.alignment: Qt.AlignTop
Layout.fillWidth: true
Layout.fillHeight: true
Layout.bottomMargin: feesLayout.visible ? 0 : Theme.xlPadding
implicitHeight: recipientsPanel.height
interactive: root.interactive
Rectangle {
anchors {
top: recipientsPanel.top
left: recipientsPanel.left
right: recipientsPanel.right
}
// Imitate recipient background and overflow the rectangle under footer
height: recipientsPanel.emptyListVisible ? sendModalcontentItem.height : 0
color: recipientsPanel.color
radius: recipientsPanel.radius
}
recipientsModel: root.recipientsModel
recipientsFilterModel: root.recipientsFilterModel
RecipientSelectorPanel {
id: recipientsPanel
anchors {
top: parent.top
left: parent.left
right: parent.right
}
onResolveENS: root.fnResolveENS(ensName, uuid)
interactive: root.interactive
recipientsModel: root.recipientsModel
recipientsFilterModel: root.recipientsFilterModel
onResolveENS: root.fnResolveENS(ensName, uuid)
}
}
}