diff --git a/src/main/java/com/sparrowwallet/sparrow/control/FeeRangeSlider.java b/src/main/java/com/sparrowwallet/sparrow/control/FeeRangeSlider.java index 3db207fb..f636ce8c 100644 --- a/src/main/java/com/sparrowwallet/sparrow/control/FeeRangeSlider.java +++ b/src/main/java/com/sparrowwallet/sparrow/control/FeeRangeSlider.java @@ -1,25 +1,17 @@ package com.sparrowwallet.sparrow.control; -import static com.sparrowwallet.sparrow.AppServices.DOUBLE_FEE_RATES_RANGE; -import static com.sparrowwallet.sparrow.AppServices.FEE_RATES_RANGE; -import static com.sparrowwallet.sparrow.AppServices.TARGET_BLOCKS_RANGE; -import static com.sparrowwallet.sparrow.AppServices.getFallbackFeeRate; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - import com.sparrowwallet.sparrow.AppServices; import com.sparrowwallet.sparrow.net.FeeRatesSource; - import javafx.application.Platform; import javafx.scene.Node; import javafx.scene.control.Slider; import javafx.util.StringConverter; +import java.util.*; +import java.util.stream.Collectors; + +import static com.sparrowwallet.sparrow.AppServices.*; + public class FeeRangeSlider extends Slider { private static final double FEE_RATE_SCROLL_INCREMENT = 0.01; diff --git a/src/main/java/com/sparrowwallet/sparrow/wallet/SendController.java b/src/main/java/com/sparrowwallet/sparrow/wallet/SendController.java index 22ec533a..71bbb97b 100644 --- a/src/main/java/com/sparrowwallet/sparrow/wallet/SendController.java +++ b/src/main/java/com/sparrowwallet/sparrow/wallet/SendController.java @@ -456,8 +456,8 @@ public class SendController extends WalletFormController implements Initializabl validationSupport.setValidationDecorator(new StyleClassValidationDecoration()); validationSupport.registerValidator(fee, Validator.combine( (Control c, String newValue) -> ValidationResult.fromErrorIf( c, "Insufficient Inputs", userFeeSet.get() && insufficientInputsProperty.get()), - (Control c, String newValue) -> ValidationResult.fromErrorIf( c, "Insufficient Fee", getFeeValueSats() != null && getFeeValueSats() == 0), - (Control c, String newValue) -> ValidationResult.fromErrorIf( c, "Insufficient Fee Rate", isInsufficientFeeRate()) + (Control c, String newValue) -> ValidationResult.fromErrorIf( c, "Insufficient Fee", getFeeValueSats() == null || getFeeValueSats() == 0), + (Control c, String newValue) -> ValidationResult.fromWarningIf( c, "Insufficient Fee Rate", isInsufficientFeeRate()) )); validationSupport.setErrorDecorationEnabled(false);