From fbc145e7559d2b0b6e475293320851442707e15d Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Sun, 17 Apr 2016 21:44:00 +0200 Subject: [PATCH] v0.4.2 --- .../java/io/bitsquare/gui/main/account/AccountView.java | 2 +- .../gui/main/offer/takeoffer/TakeOfferViewModel.java | 3 ++- .../java/io/bitsquare/p2p/seed/SeedNodesRepository.java | 6 +++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gui/src/main/java/io/bitsquare/gui/main/account/AccountView.java b/gui/src/main/java/io/bitsquare/gui/main/account/AccountView.java index d1e2eec711..aeff73c5b0 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/account/AccountView.java +++ b/gui/src/main/java/io/bitsquare/gui/main/account/AccountView.java @@ -121,7 +121,7 @@ public class AccountView extends ActivatableView { String key = "accountPrivacyInfo"; if (!BitsquareApp.DEV_MODE) - new Popup().backgroundInfo("In the account section you can setup your payment accounts for national currencies " + + new Popup().backgroundInfo("In the account screen you can setup your payment accounts for national currencies " + "as well as for crypto currencies.\n\n" + "Please note that this data is stored locally on your computer only. Bitsquare does not operate servers " + "and has no access to users data.\n\n" + diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferViewModel.java index b5edb1238e..d1ffbb74b9 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferViewModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/offer/takeoffer/TakeOfferViewModel.java @@ -385,7 +385,8 @@ class TakeOfferViewModel extends ActivatableWithDataModel im boolean inputDataValid = isBtcInputValid(amount.get()).isValid && dataModel.isMinAmountLessOrEqualAmount() && !dataModel.isAmountLargerThanOfferAmount() - && isOfferAvailable.get(); + && isOfferAvailable.get() + && !dataModel.wouldCreateDustForOfferer(); isNextButtonDisabled.set(!inputDataValid); // boolean notSufficientFees = dataModel.isWalletFunded.get() && dataModel.isMainNet.get() && !dataModel.isFeeFromFundingTxSufficient.get(); // isTakeOfferButtonDisabled.set(takeOfferRequested || !inputDataValid || notSufficientFees); diff --git a/network/src/main/java/io/bitsquare/p2p/seed/SeedNodesRepository.java b/network/src/main/java/io/bitsquare/p2p/seed/SeedNodesRepository.java index 21fd11882e..032193b136 100644 --- a/network/src/main/java/io/bitsquare/p2p/seed/SeedNodesRepository.java +++ b/network/src/main/java/io/bitsquare/p2p/seed/SeedNodesRepository.java @@ -32,9 +32,9 @@ public class SeedNodesRepository { new NodeAddress("b66vnevaljo6xt5a.onion:8000"),*/ // v0.4.2 - new NodeAddress("tyng4uwrmynumrlr.onion:8000"), - new NodeAddress("45tr2h3hte27tnx3.onion:8000"), - new NodeAddress("j5fjv3elo372agzo.onion:8000"), + new NodeAddress("uadzuib66jupaept.onion:8000"), + new NodeAddress("hbma455xxbqhcuqh.onion:8000"), + new NodeAddress("wgthuiqn3aoiovbm.onion:8000"), // testnet new NodeAddress("znmy44wcstn2rkva.onion:8001"),