mirror of
https://github.com/status-im/status-desktop.git
synced 2025-01-18 10:32:53 +00:00
feat(HoldingsDropdown): maximum amount validation
This commit is contained in:
Michał Cieślak
Michał
parent
27aac8d83a
commit
45aaa5a3de
@ -63,7 +63,7 @@ SplitView {
|
||||
proxyRoles: [
|
||||
ExpressionRole {
|
||||
name: "supply"
|
||||
expression: ((model.index + 1) * 115).toString()
|
||||
expression: (model.index + 1) * 115
|
||||
},
|
||||
ExpressionRole {
|
||||
name: "infiniteSupply"
|
||||
@ -75,8 +75,8 @@ SplitView {
|
||||
},
|
||||
ExpressionRole {
|
||||
|
||||
readonly property string icon1: Style.svg("network/Network=Optimism")
|
||||
readonly property string icon2: Style.svg("network/Network=Arbitrum")
|
||||
readonly property string icon1: "network/Network=Optimism"
|
||||
readonly property string icon2: "network/Network=Arbitrum"
|
||||
|
||||
name: "chainIcon"
|
||||
expression: model.index ? icon1 : icon2
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
import QtQuick 2.15
|
||||
import QtQuick.Controls 2.15
|
||||
import QtQuick.Layouts 1.15
|
||||
|
||||
import Models 1.0
|
||||
import utils 1.0
|
||||
@ -12,17 +13,20 @@ Item {
|
||||
{
|
||||
name: "Optimism",
|
||||
icon: Style.svg(ModelsData.networks.optimism),
|
||||
amount: "300"
|
||||
amount: 300,
|
||||
infiniteAmount: false
|
||||
},
|
||||
{
|
||||
name: "Arbitrum",
|
||||
icon: Style.svg(ModelsData.networks.arbitrum),
|
||||
amount: "400"
|
||||
amount: 400,
|
||||
infiniteAmount: false
|
||||
},
|
||||
{
|
||||
name: "Hermez",
|
||||
icon: Style.svg(ModelsData.networks.hermez),
|
||||
amount: "500"
|
||||
amount: 0,
|
||||
infiniteAmount: true
|
||||
}
|
||||
]
|
||||
|
||||
@ -48,11 +52,13 @@ Item {
|
||||
model: singleItemRadioButton.checked ? singleItemModel
|
||||
: multipleItemsModel
|
||||
}
|
||||
|
||||
Row {
|
||||
Pane {
|
||||
anchors.bottom: parent.bottom
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
anchors.margins: implicitHeight / 2
|
||||
|
||||
ColumnLayout {
|
||||
Row {
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
|
||||
RadioButton {
|
||||
id: singleItemRadioButton
|
||||
@ -63,4 +69,19 @@ Item {
|
||||
checked: true
|
||||
}
|
||||
}
|
||||
|
||||
Label {
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
text: `current name: ${comboBox.control.displayText}`
|
||||
}
|
||||
Label {
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
text: `current amount: ${comboBox.currentAmount}`
|
||||
}
|
||||
Label {
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
text: `current amount infinite: ${comboBox.currentInfiniteAmount}`
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -429,7 +429,9 @@ StatusDropdown {
|
||||
|
||||
append({
|
||||
name:chainName,
|
||||
icon: chainIcon
|
||||
icon: chainIcon,
|
||||
amount: collectible.supply,
|
||||
infiniteAmount: collectible.infiniteSupply
|
||||
})
|
||||
|
||||
collectiblePanel.networksModel = this
|
||||
|
||||
@ -11,6 +11,11 @@ import SortFilterProxyModel 0.2
|
||||
StatusComboBox {
|
||||
id: root
|
||||
|
||||
readonly property string currentName: control.currentText
|
||||
readonly property alias currentAmount: instantiator.amount
|
||||
readonly property alias currentInfiniteAmount: instantiator.infiniteAmount
|
||||
readonly property alias currentIcon: instantiator.icon
|
||||
|
||||
type: StatusComboBox.Type.Secondary
|
||||
size: StatusComboBox.Size.Small
|
||||
|
||||
@ -42,6 +47,8 @@ StatusComboBox {
|
||||
readonly property int radius: 8
|
||||
readonly property int fontSize: 13
|
||||
readonly property int iconSize: 32
|
||||
|
||||
readonly property string infinitySymbol: "∞"
|
||||
}
|
||||
|
||||
component CustomText: StatusBaseText {
|
||||
@ -87,7 +94,8 @@ StatusComboBox {
|
||||
id: instantiator
|
||||
|
||||
property string icon
|
||||
property string amount
|
||||
property int amount
|
||||
property bool infiniteAmount
|
||||
|
||||
model: SortFilterProxyModel {
|
||||
sourceModel: root.model
|
||||
@ -100,7 +108,8 @@ StatusComboBox {
|
||||
component Bind: Binding { target: instantiator }
|
||||
readonly property list<Binding> bindings: [
|
||||
Bind { property: "icon"; value: model.icon },
|
||||
Bind { property: "amount"; value: model.amount }
|
||||
Bind { property: "amount"; value: model.amount },
|
||||
Bind { property: "infiniteAmount"; value: model.infiniteAmount }
|
||||
]
|
||||
}
|
||||
}
|
||||
@ -109,7 +118,10 @@ StatusComboBox {
|
||||
title: root.control.displayText
|
||||
iconSource: instantiator.icon
|
||||
|
||||
amount: !d.oneItem ? instantiator.amount : ""
|
||||
amount: !d.oneItem
|
||||
? (instantiator.infiniteAmount ? d.infinitySymbol
|
||||
: instantiator.amount)
|
||||
: ""
|
||||
cursorShape: d.oneItem ? Qt.ArrowCursor : Qt.PointingHandCursor
|
||||
|
||||
onClicked: {
|
||||
@ -123,7 +135,7 @@ StatusComboBox {
|
||||
delegate: DelegateItem {
|
||||
title: model.name
|
||||
iconSource: model.icon
|
||||
amount: model.amount
|
||||
amount: model.infiniteAmount ? d.infinitySymbol : model.amount
|
||||
|
||||
width: root.width
|
||||
height: root.height
|
||||
|
||||
@ -73,6 +73,8 @@ ColumnLayout {
|
||||
}
|
||||
|
||||
Loader {
|
||||
id: networksComboBoxLoader
|
||||
|
||||
active: !!root.networksModel
|
||||
visible: active
|
||||
|
||||
@ -83,6 +85,9 @@ ColumnLayout {
|
||||
sourceComponent: ColumnLayout {
|
||||
spacing: 10
|
||||
|
||||
property alias currentAmount: inlineNetworksComboBox.currentAmount
|
||||
property alias currentInfiniteAmount: inlineNetworksComboBox.currentInfiniteAmount
|
||||
|
||||
CustomText {
|
||||
id: networkLabel
|
||||
|
||||
@ -94,6 +99,8 @@ ColumnLayout {
|
||||
}
|
||||
|
||||
InlineNetworksComboBox {
|
||||
id: inlineNetworksComboBox
|
||||
|
||||
Layout.fillWidth: true
|
||||
|
||||
model: root.networksModel
|
||||
@ -107,10 +114,18 @@ ColumnLayout {
|
||||
locale: LocaleUtils.userInputLocale
|
||||
|
||||
Layout.fillWidth: true
|
||||
Layout.bottomMargin: (validationError !== "") ? root.spacing : 0
|
||||
Layout.bottomMargin: (validationError !== "") ? root.spacing * 2 : 0
|
||||
customHeight: d.defaultHeight
|
||||
allowDecimals: true
|
||||
keepHeight: true
|
||||
|
||||
validateMaximumAmount:
|
||||
!!networksComboBoxLoader.item &&
|
||||
!networksComboBoxLoader.item.currentInfiniteAmount
|
||||
|
||||
maximumAmount: !!networksComboBoxLoader.item
|
||||
? networksComboBoxLoader.item.currentAmount : 0
|
||||
|
||||
onKeyPressed: {
|
||||
if(!addOrUpdateButton.enabled) return
|
||||
|
||||
|
||||
@ -16,6 +16,9 @@ Input {
|
||||
readonly property bool valid: validationError.length === 0
|
||||
property bool allowDecimals: true
|
||||
|
||||
property bool validateMaximumAmount: false
|
||||
property real maximumAmount: 0
|
||||
|
||||
validationErrorTopMargin: 8
|
||||
fontPixelSize: 13
|
||||
customHeight: 36
|
||||
@ -28,6 +31,10 @@ Input {
|
||||
root.text = LocaleUtils.numberToLocaleString(amount, -1, root.locale)
|
||||
}
|
||||
|
||||
onTextChanged: d.validate()
|
||||
onValidateMaximumAmountChanged: d.validate()
|
||||
onMaximumAmountChanged: d.validate()
|
||||
|
||||
QtObject {
|
||||
id: d
|
||||
|
||||
@ -37,22 +44,12 @@ Input {
|
||||
const digits = LocaleUtils.getLocalizedDigitsCount(text, root.locale)
|
||||
return str.startsWith(locale.decimalPoint) ? digits + 1 : digits
|
||||
}
|
||||
}
|
||||
|
||||
validator: DoubleValidator {
|
||||
id: doubleValidator
|
||||
function validate() {
|
||||
if (!root.allowDecimals)
|
||||
root.text = root.text.replace(root.locale.decimalPoint, "")
|
||||
|
||||
decimals: root.allowDecimals ? 100 : 0
|
||||
bottom: 0
|
||||
notation: DoubleValidator.StandardNotation
|
||||
locale: root.locale.name
|
||||
}
|
||||
|
||||
onTextChanged: {
|
||||
if (!allowDecimals)
|
||||
text = text.replace(root.locale.decimalPoint, "")
|
||||
|
||||
if(text.length === 0) {
|
||||
if(root.text.length === 0) {
|
||||
d.amount = 0
|
||||
root.validationError = ""
|
||||
return
|
||||
@ -63,15 +60,27 @@ Input {
|
||||
return
|
||||
}
|
||||
|
||||
let amount = LocaleUtils.numberFromLocaleString(text, root.locale)
|
||||
const amount = LocaleUtils.numberFromLocaleString(root.text, root.locale)
|
||||
if (isNaN(amount)) {
|
||||
d.amount = 0
|
||||
root.validationError = qsTr("Invalid amount format")
|
||||
} else if (root.validateMaximumAmount && amount > root.maximumAmount) {
|
||||
root.validationError = qsTr("Amount exceeds balance")
|
||||
} else {
|
||||
d.amount = amount
|
||||
root.validationError = ""
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
validator: DoubleValidator {
|
||||
id: doubleValidator
|
||||
|
||||
decimals: root.allowDecimals ? 100 : 0
|
||||
bottom: 0
|
||||
notation: DoubleValidator.StandardNotation
|
||||
locale: root.locale.name
|
||||
}
|
||||
|
||||
StatusBaseText {
|
||||
id: labelText
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user