diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.fxml b/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.fxml index 7161bdd295..fcb47a78e4 100644 --- a/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.fxml +++ b/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioView.fxml @@ -25,7 +25,7 @@ xmlns:fx="http://javafx.com/fxml"> - + diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioViewCB.java b/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioViewCB.java index d1211da49d..9628618e4e 100644 --- a/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/PortfolioViewCB.java @@ -47,7 +47,7 @@ public class PortfolioViewCB extends CachedViewCB { private Navigation.Listener navigationListener; private ChangeListener tabChangeListener; - @FXML Tab offersTab, pendingTradesTab, closedTradesTab; + @FXML Tab offersTab, openTradesTab, closedTradesTab; /////////////////////////////////////////////////////////////////////////////////////////// @@ -78,7 +78,7 @@ public class PortfolioViewCB extends CachedViewCB { tabChangeListener = (ov, oldValue, newValue) -> { if (newValue == offersTab) navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.PORTFOLIO, Navigation.Item.OFFERS); - else if (newValue == pendingTradesTab) + else if (newValue == openTradesTab) navigation.navigationTo(Navigation.Item.MAIN, Navigation.Item.PORTFOLIO, Navigation.Item.PENDING_TRADES); else if (newValue == closedTradesTab) @@ -132,7 +132,7 @@ public class PortfolioViewCB extends CachedViewCB { tab = offersTab; break; case PENDING_TRADES: - tab = pendingTradesTab; + tab = openTradesTab; break; case CLOSED_TRADES: tab = closedTradesTab; 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 880b0a915d..639d048998 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 @@ -103,6 +103,8 @@ class PendingTradesModel extends UIModel { list.add(new PendingTradesListItem(change.getValueAdded())); else if (change.wasRemoved()) closedTrade = change.getValueRemoved(); + + sortList(); }; super.initialize(); @@ -119,7 +121,7 @@ class PendingTradesModel extends UIModel { tradeManager.getPendingTrades().addListener(mapChangeListener); // we sort by date, earliest first - list.sort((o1, o2) -> o2.getTrade().getDate().compareTo(o1.getTrade().getDate())); + sortList(); // select either currentPendingTrade or first in the list Optional currentTradeItemOptional = list.stream() @@ -140,12 +142,6 @@ class PendingTradesModel extends UIModel { selectTrade(null); } - @SuppressWarnings("EmptyMethod") - @Override - public void terminate() { - super.terminate(); - } - /////////////////////////////////////////////////////////////////////////////////////////// // Methods @@ -327,5 +323,9 @@ class PendingTradesModel extends UIModel { } } + private void sortList() { + list.sort((o1, o2) -> o2.getTrade().getDate().compareTo(o1.getTrade().getDate())); + } + } diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesPM.java b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesPM.java index 814423a547..1409135b80 100644 --- a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesPM.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesPM.java @@ -115,12 +115,6 @@ public class PendingTradesPM extends PresentationModel { model.tradeState.removeListener(stateChangeListener); } - @SuppressWarnings("EmptyMethod") - @Override - public void terminate() { - super.terminate(); - } - /////////////////////////////////////////////////////////////////////////////////////////// // Methods diff --git a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewCB.java b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewCB.java index ae3eb587cd..a5e12af9d2 100644 --- a/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewCB.java +++ b/src/main/java/io/bitsquare/gui/main/portfolio/pending/PendingTradesViewCB.java @@ -193,12 +193,6 @@ public class PendingTradesViewCB extends CachedViewCB { presentationModel.state.removeListener(takerStateChangeListener); } - @SuppressWarnings("EmptyMethod") - @Override - public void terminate() { - super.terminate(); - } - /////////////////////////////////////////////////////////////////////////////////////////// // GUI handlers