Skip to content

Commit fd664d1

Browse files
authored
remove min. non-dust from preferences (#1860)
1 parent dff7e88 commit fd664d1

File tree

1 file changed

+4
-30
lines changed

1 file changed

+4
-30
lines changed

desktop/src/main/java/haveno/desktop/main/settings/preferences/PreferencesView.java

Lines changed: 4 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
package haveno.desktop.main.settings.preferences;
1919

20-
import static com.google.common.base.Preconditions.checkArgument;
2120
import com.google.inject.Inject;
2221
import com.google.inject.name.Named;
2322
import haveno.common.UserThread;
@@ -47,7 +46,6 @@
4746
import haveno.core.util.validation.IntegerValidator;
4847
import haveno.core.util.validation.RegexValidator;
4948
import haveno.core.util.validation.RegexValidatorFactory;
50-
import haveno.core.xmr.wallet.Restrictions;
5149
import haveno.desktop.common.view.ActivatableViewAndModel;
5250
import haveno.desktop.common.view.FxmlView;
5351
import haveno.desktop.components.AutoTooltipButton;
@@ -112,7 +110,7 @@ public class PreferencesView extends ActivatableViewAndModel<GridPane, Preferenc
112110
notifyOnPreReleaseToggle;
113111
private int gridRow = 0;
114112
private int displayCurrenciesGridRowIndex = 0;
115-
private InputTextField ignoreTradersListInputTextField, ignoreDustThresholdInputTextField,
113+
private InputTextField ignoreTradersListInputTextField,
116114
autoConfRequiredConfirmationsTf, autoConfServiceAddressTf, autoConfTradeLimitTf, /*referralIdInputTextField,*/
117115
rpcUserTextField, blockNotifyPortTextField;
118116
private PasswordTextField rpcPwTextField;
@@ -136,7 +134,7 @@ public class PreferencesView extends ActivatableViewAndModel<GridPane, Preferenc
136134
private ObservableList<CryptoCurrency> allCryptoCurrencies;
137135
private ObservableList<TradeCurrency> tradeCurrencies;
138136
private InputTextField deviationInputTextField;
139-
private ChangeListener<String> deviationListener, ignoreTradersListListener, ignoreDustThresholdListener,
137+
private ChangeListener<String> deviationListener, ignoreTradersListListener,
140138
rpcUserListener, rpcPwListener, blockNotifyPortListener,
141139
autoConfTradeLimitListener, autoConfServiceAddressListener;
142140
private ChangeListener<Boolean> deviationFocusedListener;
@@ -209,7 +207,7 @@ protected void deactivate() {
209207
///////////////////////////////////////////////////////////////////////////////////////////
210208

211209
private void initializeGeneralOptions() {
212-
int titledGroupBgRowSpan = displayStandbyModeFeature ? 8 : 7;
210+
int titledGroupBgRowSpan = displayStandbyModeFeature ? 7 : 6;
213211
TitledGroupBg titledGroupBg = addTitledGroupBg(root, gridRow, titledGroupBgRowSpan, Res.get("setting.preferences.general"));
214212
GridPane.setColumnSpan(titledGroupBg, 1);
215213

@@ -259,35 +257,14 @@ private void initializeGeneralOptions() {
259257
}
260258
};
261259

262-
263-
// ignoreDustThreshold
264-
ignoreDustThresholdInputTextField = addInputTextField(root, ++gridRow, Res.get("setting.preferences.ignoreDustThreshold"));
265-
IntegerValidator validator = new IntegerValidator();
266-
validator.setMinValue((int) Restrictions.getMinNonDustOutput().value);
267-
validator.setMaxValue(2000);
268-
ignoreDustThresholdInputTextField.setValidator(validator);
269-
ignoreDustThresholdListener = (observable, oldValue, newValue) -> {
270-
try {
271-
int value = Integer.parseInt(newValue);
272-
checkArgument(value >= Restrictions.getMinNonDustOutput().value,
273-
"Input must be at least " + Restrictions.getMinNonDustOutput().value);
274-
checkArgument(value <= 2000,
275-
"Input must not be higher than 2000 Satoshis");
276-
if (!newValue.equals(oldValue)) {
277-
preferences.setIgnoreDustThreshold(value);
278-
}
279-
} catch (Throwable ignore) {
280-
}
281-
};
282-
283260
if (displayStandbyModeFeature) {
284261
// AvoidStandbyModeService feature works only on OSX & Windows
285262
avoidStandbyMode = addSlideToggleButton(root, ++gridRow,
286263
Res.get("setting.preferences.avoidStandbyMode"));
287264
}
288265

289266
useSoundForNotifications = addSlideToggleButton(root, ++gridRow,
290-
Res.get("setting.preferences.useSoundForNotifications"), Layout.GROUP_DISTANCE * -1); // TODO: why must negative value be used to place toggle consistently?
267+
Res.get("setting.preferences.useSoundForNotifications"));
291268
}
292269

293270
private void initializeSeparator() {
@@ -636,7 +613,6 @@ private void activateGeneralOptions() {
636613
ignoreTradersListInputTextField.setText(String.join(", ", preferences.getIgnoreTradersList()));
637614
/* referralIdService.getOptionalReferralId().ifPresent(referralId -> referralIdInputTextField.setText(referralId));
638615
referralIdInputTextField.setPromptText(Res.get("setting.preferences.refererId.prompt"));*/
639-
ignoreDustThresholdInputTextField.setText(String.valueOf(preferences.getIgnoreDustThreshold()));
640616
userLanguageComboBox.setItems(languageCodes);
641617
userLanguageComboBox.getSelectionModel().select(preferences.getUserLanguage());
642618
userLanguageComboBox.setConverter(new StringConverter<>() {
@@ -696,7 +672,6 @@ public Country fromString(String string) {
696672

697673
ignoreTradersListInputTextField.textProperty().addListener(ignoreTradersListListener);
698674
//referralIdInputTextField.textProperty().addListener(referralIdListener);
699-
ignoreDustThresholdInputTextField.textProperty().addListener(ignoreDustThresholdListener);
700675
}
701676

702677
private void activateDisplayCurrencies() {
@@ -830,7 +805,6 @@ private void deactivateGeneralOptions() {
830805
deviationInputTextField.focusedProperty().removeListener(deviationFocusedListener);
831806
ignoreTradersListInputTextField.textProperty().removeListener(ignoreTradersListListener);
832807
//referralIdInputTextField.textProperty().removeListener(referralIdListener);
833-
ignoreDustThresholdInputTextField.textProperty().removeListener(ignoreDustThresholdListener);
834808
}
835809

836810
private void deactivateDisplayCurrencies() {

0 commit comments

Comments
 (0)