From 2de2393ec17e60d5d40afab4956eebbb46d5683f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Cie=C5=9Blak?= Date: Wed, 30 Aug 2023 10:05:48 +0200 Subject: [PATCH] chore(AmountInput): Allow custom err msg for exceeding max, custom label and flag for zero as valid input --- ui/imports/shared/controls/AmountInput.qml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/ui/imports/shared/controls/AmountInput.qml b/ui/imports/shared/controls/AmountInput.qml index ba9de3cf9e..4a95139453 100644 --- a/ui/imports/shared/controls/AmountInput.qml +++ b/ui/imports/shared/controls/AmountInput.qml @@ -21,6 +21,11 @@ Input { property bool validateMaximumAmount: false property string maximumAmount: "0" + property bool allowZero: true + + property alias labelText: labelText.text + + property string maximumExceededErrorText: qsTr("Amount exceeds balance") validationErrorTopMargin: 8 fontPixelSize: 13 @@ -79,6 +84,12 @@ Input { return } + if (!root.allowZero && amountNumber === 0) { + d.amount = "0" + root.validationError = qsTr("Amount must be greater than 0") + return + } + const amount = SQUtils.AmountsArithmetic.fromNumber( amountNumber, d.multiplierIndex) @@ -90,7 +101,7 @@ Input { amount, maximumAmount) === 1 if (SQUtils.AmountsArithmetic.cmp(amount, maximumAmount) === 1) { - root.validationError = qsTr("Amount exceeds balance") + root.validationError = root.maximumExceededErrorText return } }