diff --git a/src/main/java/io/bitsquare/gui/main/MainModel.java b/src/main/java/io/bitsquare/gui/main/MainModel.java index 2291611195..145835c57e 100644 --- a/src/main/java/io/bitsquare/gui/main/MainModel.java +++ b/src/main/java/io/bitsquare/gui/main/MainModel.java @@ -23,6 +23,7 @@ import io.bitsquare.gui.UIModel; import io.bitsquare.gui.util.Profiler; import io.bitsquare.msg.DHTSeedService; import io.bitsquare.msg.MessageFacade; +import io.bitsquare.msg.actor.event.PeerInitialized; import io.bitsquare.msg.listeners.BootstrapListener; import io.bitsquare.persistence.Persistence; import io.bitsquare.trade.Trade; @@ -104,8 +105,8 @@ class MainModel extends UIModel { // For testing with the serverside seednode we need the BootstrappedPeerFactory which gets started form // messageFacade.init - - /*dhtSeedService.setHandler(m -> { + + dhtSeedService.setHandler(m -> { if (m instanceof PeerInitialized) { log.debug("dht seed initialized. "); // init messageFacade after seed node initialized @@ -124,9 +125,9 @@ class MainModel extends UIModel { } }); - dhtSeedService.initializePeer();*/ + dhtSeedService.initializePeer(); - messageFacade.init(new BootstrapListener() { + /* messageFacade.init(new BootstrapListener() { @Override public void onCompleted() { messageFacadeInited = true; @@ -137,7 +138,7 @@ class MainModel extends UIModel { public void onFailed(Throwable throwable) { log.error(throwable.toString()); } - }); + });*/ Profiler.printMsgWithTime("MainModel.initFacades"); diff --git a/src/main/java/io/bitsquare/gui/main/funds/FundsView.fxml b/src/main/java/io/bitsquare/gui/main/funds/FundsView.fxml index 3f58bc1db7..b6abe3ed7b 100644 --- a/src/main/java/io/bitsquare/gui/main/funds/FundsView.fxml +++ b/src/main/java/io/bitsquare/gui/main/funds/FundsView.fxml @@ -24,6 +24,6 @@ xmlns:fx="http://javafx.com/fxml"> - + \ No newline at end of file diff --git a/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesPM.java b/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesPM.java index 12562bf5d3..757f13f64f 100644 --- a/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesPM.java +++ b/src/main/java/io/bitsquare/gui/main/orders/pending/PendingTradesPM.java @@ -17,7 +17,6 @@ package io.bitsquare.gui.main.orders.pending; -import io.bitsquare.btc.FeePolicy; import io.bitsquare.btc.WalletFacade; import io.bitsquare.gui.PresentationModel; import io.bitsquare.gui.components.Popups; @@ -151,7 +150,7 @@ public class PendingTradesPM extends PresentationModel { } String getAmountToWithdraw() { - return formatter.formatCoinWithCode(model.getAmountToWithdraw().subtract(FeePolicy.TX_FEE)); + return formatter.formatCoinWithCode(model.getAmountToWithdraw()); //.subtract(FeePolicy.TX_FEE)); } /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java index 4647802ca9..292a431528 100644 --- a/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/trade/createoffer/CreateOfferViewCB.java @@ -285,6 +285,8 @@ public class CreateOfferViewCB extends CachedViewCB { private void close() { TabPane tabPane = ((TabPane) (root.getParent().getParent())); tabPane.getTabs().remove(tabPane.getSelectionModel().getSelectedItem()); + + navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.ORDERS, Navigation.Item.OFFERS); } diff --git a/src/main/resources/i18n/displayStrings.properties b/src/main/resources/i18n/displayStrings.properties index 0851e9af11..510f53fd0b 100644 --- a/src/main/resources/i18n/displayStrings.properties +++ b/src/main/resources/i18n/displayStrings.properties @@ -71,7 +71,8 @@ createOffer.advancedBox.county=Payments account country: createOffer.advancedBox.info=Your trading partners must fulfill your offer restrictions. You can edit the accepted countries, languages and arbitrators in the settings. The payments account details are used from your current selected payments account (if you have multiple payments accounts). createOffer.success.headline=Your offer has been successfully published to the distributed offerbook. -createOffer.success.info=The Transaction ID for the offer payment is: {0} +createOffer.success.info=The Transaction ID for the offer payment is: {0}\n\nIn the Offers screen you can manage your\ + open offers. createOffer.error.message=An error occurred when placing the offer.\n{0}