diff --git a/core/src/main/java/io/bitsquare/btc/FeePolicy.java b/core/src/main/java/io/bitsquare/btc/FeePolicy.java index c5937f3ee4..b4c0dc8eca 100644 --- a/core/src/main/java/io/bitsquare/btc/FeePolicy.java +++ b/core/src/main/java/io/bitsquare/btc/FeePolicy.java @@ -78,8 +78,9 @@ public class FeePolicy { } - // 0.1 BTC; about 4 EUR @ 400 EUR/BTC + // TODO will be increased once we get higher limits + // 0.01 BTC; about 0.4 EUR @ 400 EUR/BTC public static Coin getSecurityDeposit() { - return Coin.valueOf(10_000_000); + return Coin.valueOf(1_000_000); } } diff --git a/core/src/main/java/io/bitsquare/payment/PaymentMethod.java b/core/src/main/java/io/bitsquare/payment/PaymentMethod.java index ce687f6653..af66dcf40c 100644 --- a/core/src/main/java/io/bitsquare/payment/PaymentMethod.java +++ b/core/src/main/java/io/bitsquare/payment/PaymentMethod.java @@ -67,7 +67,7 @@ public final class PaymentMethod implements Persistable, Comparable { public static PaymentMethod BLOCK_CHAINS; public static final List ALL_VALUES = new ArrayList<>(Arrays.asList( - OK_PAY = new PaymentMethod(OK_PAY_ID, 0, DAY, Coin.parseCoin("0.5")), // tx instant so min. wait time + OK_PAY = new PaymentMethod(OK_PAY_ID, 0, DAY, Coin.parseCoin("0.2")), // tx instant so min. wait time PERFECT_MONEY = new PaymentMethod(PERFECT_MONEY_ID, 0, DAY, Coin.parseCoin("0.2")), SEPA = new PaymentMethod(SEPA_ID, 0, 8 * DAY, Coin.parseCoin("0.1")), // sepa takes 1-3 business days. We use 8 days to include safety for holidays NATIONAL_BANK = new PaymentMethod(NATIONAL_BANK_ID, 0, 4 * DAY, Coin.parseCoin("0.1")), @@ -78,7 +78,7 @@ public final class PaymentMethod implements Persistable, Comparable { /* FED_WIRE = new PaymentMethod(FED_WIRE_ID, 0, DAY, Coin.parseCoin("0.1")),*/ /* TRANSFER_WISE = new PaymentMethod(TRANSFER_WISE_ID, 0, DAY, Coin.parseCoin("0.1")),*/ /* US_POSTAL_MONEY_ORDER = new PaymentMethod(US_POSTAL_MONEY_ORDER_ID, 0, DAY, Coin.parseCoin("0.1")),*/ - BLOCK_CHAINS = new PaymentMethod(BLOCK_CHAINS_ID, 0, DAY, Coin.parseCoin("0.2")) + BLOCK_CHAINS = new PaymentMethod(BLOCK_CHAINS_ID, 0, DAY, Coin.parseCoin("0.3")) )); diff --git a/core/src/main/java/io/bitsquare/trade/offer/Offer.java b/core/src/main/java/io/bitsquare/trade/offer/Offer.java index 9372c6f286..92fcef3d30 100644 --- a/core/src/main/java/io/bitsquare/trade/offer/Offer.java +++ b/core/src/main/java/io/bitsquare/trade/offer/Offer.java @@ -58,9 +58,9 @@ public final class Offer implements StoragePayload, RequiresOwnerIsOnlinePayload @JsonExclude private static final Logger log = LoggerFactory.getLogger(Offer.class); public static final long TTL = TimeUnit.SECONDS.toMillis(4 * 60); - public final static String TAC_OFFERER = "When placing that offer I accept that anyone who fulfills my conditions can " + - "take that offer."; - public static final String TAC_TAKER = "With taking the offer I commit to the trade conditions as defined."; + public final static String TAC_OFFERER = "With placing that offer I accept to trade " + + "with anyone who fulfills the conditions as defined above."; + public static final String TAC_TAKER = "With taking that offer I commit to the trade conditions as defined above."; /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/gui/src/main/java/io/bitsquare/gui/bitsquare.css b/gui/src/main/java/io/bitsquare/gui/bitsquare.css index 7903a083b6..888545e22d 100644 --- a/gui/src/main/java/io/bitsquare/gui/bitsquare.css +++ b/gui/src/main/java/io/bitsquare/gui/bitsquare.css @@ -68,7 +68,7 @@ bg color of non edit textFields: fafafa -bs-sell-hover: derive(-bs-sell, -10%); -bs-sell-transparent: derive(-bs-sell, 95%); - -bs-cancel: -bs-light-grey; + -bs-cancel: #ddd; -bs-cancel-focus: derive(-bs-cancel, -50%); -bs-cancel-hover: derive(-bs-cancel, -10%); @@ -930,7 +930,7 @@ textfield */ #cancel-button { -fx-base: -bs-cancel; - -fx-text-fill: white; + -fx-text-fill: #444; -fx-font-weight: bold; } diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java index a78e8fc3ed..87c988fa83 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferDataModel.java @@ -304,7 +304,8 @@ class CreateOfferDataModel extends ActivatableDataModel { String code = tradeCurrency.getCode(); tradeCurrencyCode.set(code); - paymentAccount.setSelectedTradeCurrency(tradeCurrency); + if (paymentAccount != null) + paymentAccount.setSelectedTradeCurrency(tradeCurrency); priceFeed.setCurrencyCode(code); } diff --git a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java index 127e1d9e39..3a9dac7277 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/offer/createoffer/CreateOfferViewModel.java @@ -313,7 +313,8 @@ class CreateOfferViewModel extends ActivatableWithDataModel onRemoveOpenOffer(offer)); } else { boolean isSellOffer = offer.getDirection() == Offer.Direction.SELL; iconView.setId(isSellOffer ? "image-buy-white" : "image-sell-white"); button.setId(isSellOffer ? "buy-button" : "sell-button"); + button.setStyle("-fx-text-fill: white;"); // does not take the font colors sometimes from the style title = model.getDirectionLabel(offer); button.setOnAction(e -> onTakeOffer(offer)); } diff --git a/gui/src/main/java/io/bitsquare/gui/util/validation/BtcValidator.java b/gui/src/main/java/io/bitsquare/gui/util/validation/BtcValidator.java index a8255a0ecb..da51abf14a 100644 --- a/gui/src/main/java/io/bitsquare/gui/util/validation/BtcValidator.java +++ b/gui/src/main/java/io/bitsquare/gui/util/validation/BtcValidator.java @@ -70,7 +70,7 @@ public class BtcValidator extends NumberValidator { } protected ValidationResult validateIfNotExceedsMaxBtcValue(String input) { - if (Coin.parseCoin(input).compareTo(paymentMethod.getMaxTradeLimitInBitcoin()) > 0) + if (paymentMethod != null && Coin.parseCoin(input).compareTo(paymentMethod.getMaxTradeLimitInBitcoin()) > 0) return new ValidationResult(false, BSResources.get("validation.btc.toLarge", formatter.formatCoinWithCode(paymentMethod.getMaxTradeLimitInBitcoin()))); else return new ValidationResult(true);