Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+61 −18
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions ui/app/AppLayouts/Wallet/panels/RecipientSelectorPanel.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
67 changes: 53 additions & 14 deletions ui/app/AppLayouts/Wallet/popups/simpleSend/SimpleSendModal.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import QtQuick 2.15
import QtQuick.Window 2.15
import QtQuick.Layouts 1.15
import QtQml.Models 2.15

Expand Down Expand Up @@ -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
}
Expand All @@ -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 {
Expand Down Expand Up @@ -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

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
}

RecipientSelectorPanel {
id: recipientsPanel
anchors {
top: parent.top
left: parent.left
right: parent.right
}

interactive: root.interactive
interactive: root.interactive

recipientsModel: root.recipientsModel
recipientsFilterModel: root.recipientsFilterModel
recipientsModel: root.recipientsModel
recipientsFilterModel: root.recipientsFilterModel

onResolveENS: root.fnResolveENS(ensName, uuid)
onResolveENS: root.fnResolveENS(ensName, uuid)
}
}
}

Expand Down