diff --git a/src/main/java/io/bitsquare/btc/FeePolicy.java b/src/main/java/io/bitsquare/btc/FeePolicy.java index 3b5079414e..dfadbe1980 100644 --- a/src/main/java/io/bitsquare/btc/FeePolicy.java +++ b/src/main/java/io/bitsquare/btc/FeePolicy.java @@ -33,7 +33,7 @@ public class FeePolicy { // TODO: Change REGISTRATION_FEE to 0.00001 (See https://github.com/bitsquare/bitsquare/issues/228) public static final Coin REGISTRATION_FEE = TX_FEE.add(TX_FEE); - public static final Coin CREATE_OFFER_FEE = Coin.valueOf(20000); // 0.00002 BTC + public static final Coin CREATE_OFFER_FEE = Coin.valueOf(20000); // 0.0002 BTC public static final Coin TAKE_OFFER_FEE = CREATE_OFFER_FEE; private final BitcoinNetwork bitcoinNetwork; diff --git a/src/main/java/io/bitsquare/btc/WalletService.java b/src/main/java/io/bitsquare/btc/WalletService.java index ea75621223..d8edd969b6 100644 --- a/src/main/java/io/bitsquare/btc/WalletService.java +++ b/src/main/java/io/bitsquare/btc/WalletService.java @@ -242,6 +242,7 @@ public class WalletService { @Override public void onTransactionConfidenceChanged(Wallet wallet, Transaction tx) { + log.trace("onTransactionConfidenceChanged " + tx.getHashAsString()); notifyConfidenceListeners(tx); } diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesModel.java b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesModel.java index 9b6a0bb4a1..f40ee878a8 100644 --- a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesModel.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesModel.java @@ -159,6 +159,8 @@ class PendingTradesModel extends UIModel { Trade trade = getTrade(); trade.stateProperty().addListener(stateChangeListener); tradeState.set(trade.stateProperty().get()); + log.trace("selectTrade trade.stateProperty().get() " + trade.stateProperty().get()); + if (trade.getDepositTx() != null) txId.set(trade.getDepositTx().getHashAsString()); @@ -304,7 +306,8 @@ class PendingTradesModel extends UIModel { /////////////////////////////////////////////////////////////////////////////////////////// private void updateConfidence(TransactionConfidence confidence) { - log.debug("confidence " + confidence); + log.trace("updateConfidence confidence " + confidence); + log.trace("updateConfidence getTrade().getState() " + getTrade().getState()); if (confidence != null && confidence.getConfidenceType() == TransactionConfidence.ConfidenceType.BUILDING && (getTrade().getState() == Trade.State.DEPOSIT_PUBLISHED || diff --git a/src/main/java/io/bitsquare/util/Utilities.java b/src/main/java/io/bitsquare/util/Utilities.java index 652ec14135..83170bf31a 100644 --- a/src/main/java/io/bitsquare/util/Utilities.java +++ b/src/main/java/io/bitsquare/util/Utilities.java @@ -17,8 +17,6 @@ package io.bitsquare.util; -import io.bitsquare.BitsquareException; - import com.google.gson.FieldNamingPolicy; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -31,7 +29,6 @@ import java.io.ObjectOutputStream; import java.io.Serializable; import java.net.URI; -import java.net.URISyntaxException; import java.util.function.Function; @@ -141,14 +138,14 @@ public class Utilities { printElapsedTime(""); } - public static void openURI(URI uri) throws BitsquareException { + public static void openURI(URI uri) throws Exception { // On Linux Desktop is poorly implemented. // See https://stackoverflow.com/questions/18004150/desktop-api-is-not-supported-on-the-current-platform if (!DesktopApi.browse(uri)) - throw new BitsquareException("Failed to open URI: " + uri.toString()); + throw new Exception("Failed to open URI: " + uri.toString()); } - public static void openWebPage(String target) throws URISyntaxException, IOException { + public static void openWebPage(String target) throws Exception { openURI(new URI(target)); } diff --git a/src/main/java/net/mightypork/rpack/utils/DesktopApi.java b/src/main/java/net/mightypork/rpack/utils/DesktopApi.java index c654a32d59..b69ec553e3 100644 --- a/src/main/java/net/mightypork/rpack/utils/DesktopApi.java +++ b/src/main/java/net/mightypork/rpack/utils/DesktopApi.java @@ -13,7 +13,7 @@ import java.util.List; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - +// Taken form https://stackoverflow.com/questions/18004150/desktop-api-is-not-supported-on-the-current-platform public class DesktopApi { private static final Logger log = LoggerFactory.getLogger(DesktopApi.class);