Only allow decimal numbers in price text input

bisq-network · Jan 8, 2025 · 590a0b6 · 590a0b6
1 parent 35672c3
commit 590a0b6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.../desktop/desktop/src/main/java/bisq/desktop/main/content/bisq_easy/BisqEasyViewUtils.java b/.../desktop/desktop/src/main/java/bisq/desktop/main/content/bisq_easy/BisqEasyViewUtils.java
@@ -38,6 +38,7 @@
 import java.util.List;
 
 public class BisqEasyViewUtils {
+    public static final String NUMERIC_WITH_DECIMAL_REGEX = "\\d*([.,]\\d*)?";
     private static final String[] customPaymentIconIds = {
             "CUSTOM_PAYMENT_1", "CUSTOM_PAYMENT_2", "CUSTOM_PAYMENT_3",
             "CUSTOM_PAYMENT_4", "CUSTOM_PAYMENT_5", "CUSTOM_PAYMENT_6"};

diff --git a/...p/desktop/src/main/java/bisq/desktop/main/content/bisq_easy/components/PriceInputBox.java b/...p/desktop/src/main/java/bisq/desktop/main/content/bisq_easy/components/PriceInputBox.java
@@ -18,6 +18,7 @@
 package bisq.desktop.main.content.bisq_easy.components;
 
 import bisq.desktop.components.controls.MaterialTextField;
+import bisq.desktop.main.content.bisq_easy.BisqEasyViewUtils;
 import javafx.beans.property.StringProperty;
 import javafx.beans.value.ChangeListener;
 import javafx.geometry.Insets;
@@ -66,7 +67,8 @@ public PriceInputBox(String description, String prompt) {
         getStyleClass().add("price-input-box");
 
         textInputTextListener = (observable, oldValue, newValue) -> {
-            if (newValue.length() > INPUT_TEXT_MAX_LENGTH) {
+            if (newValue.length() > INPUT_TEXT_MAX_LENGTH
+                    || !newValue.matches(BisqEasyViewUtils.NUMERIC_WITH_DECIMAL_REGEX)) {
                 textInputControl.setText(oldValue);
             }
             applyFontStyle(textInputControl.getLength());

diff --git a/.../bisq/desktop/main/content/bisq_easy/components/amount_selection/QuoteAmountInputBox.java b/.../bisq/desktop/main/content/bisq_easy/components/amount_selection/QuoteAmountInputBox.java
@@ -21,6 +21,7 @@
 import bisq.common.monetary.Monetary;
 import bisq.common.util.MathUtils;
 import bisq.common.util.StringUtils;
+import bisq.desktop.main.content.bisq_easy.BisqEasyViewUtils;
 import bisq.presentation.formatters.AmountFormatter;
 import bisq.presentation.parser.AmountParser;
 import javafx.beans.property.BooleanProperty;
@@ -211,8 +212,6 @@ void reset() {
     }
 
     private static class View extends bisq.desktop.common.view.View<HBox, Model, Controller> {
-        private static final String NUMERIC_WITH_DECIMAL_REGEX = "\\d*([.,]\\d*)?";
-
         private final ChangeListener<String> textListener;
         private final ChangeListener<Boolean> focusListener;
         private final ChangeListener<Monetary> amountListener;
@@ -260,7 +259,8 @@ protected void onViewDetached() {
 
         private void onTextChanged(ObservableValue<? extends String> observable, String oldValue, String newValue) {
             if (model.textInputMaxCharCount.isPresent()) {
-                if (newValue.length() > model.textInputMaxCharCount.get() || !newValue.matches(NUMERIC_WITH_DECIMAL_REGEX)) {
+                if (newValue.length() > model.textInputMaxCharCount.get()
+                        || !newValue.matches(BisqEasyViewUtils.NUMERIC_WITH_DECIMAL_REGEX)) {
                     textInput.setText(oldValue);
                 }
             }