From 81c88c4bfccb09522fcdd7171d0e627b9db33139 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Wed, 13 Apr 2016 18:33:31 +0200 Subject: [PATCH] Remove currency field --- .../gui/main/overlays/windows/OfferDetailsWindow.java | 4 +--- .../gui/main/overlays/windows/TradeDetailsWindow.java | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/OfferDetailsWindow.java b/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/OfferDetailsWindow.java index 1d622aab2d..1aed3ea396 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/OfferDetailsWindow.java +++ b/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/OfferDetailsWindow.java @@ -133,7 +133,7 @@ public class OfferDetailsWindow extends Overlay { } private void addContent() { - int rows = 6; + int rows = 5; List acceptedBanks = offer.getAcceptedBankIds(); boolean showAcceptedBanks = acceptedBanks != null && !acceptedBanks.isEmpty(); @@ -174,8 +174,6 @@ public class OfferDetailsWindow extends Overlay { addLabelTextField(gridPane, ++rowIndex, "Price:", formatter.formatFiat(offer.getPrice()) + " " + offer.getCurrencyCode() + "/" + "BTC"); - addLabelTextField(gridPane, ++rowIndex, "Currency:", offer.getCurrencyCode()); - if (offer.isMyOffer(keyRing) && user.getPaymentAccount(offer.getOffererPaymentAccountId()) != null) addLabelTextField(gridPane, ++rowIndex, "Payment account:", user.getPaymentAccount(offer.getOffererPaymentAccountId()).getAccountName()); else diff --git a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TradeDetailsWindow.java b/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TradeDetailsWindow.java index 1314cdccb0..c795d6b50f 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TradeDetailsWindow.java +++ b/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/TradeDetailsWindow.java @@ -109,7 +109,7 @@ public class TradeDetailsWindow extends Overlay { Offer offer = trade.getOffer(); Contract contract = trade.getContract(); - int rows = 6; + int rows = 5; addTitledGroupBg(gridPane, ++rowIndex, rows, "Trade"); boolean myOffer = tradeManager.isMyOffer(offer); @@ -128,7 +128,6 @@ public class TradeDetailsWindow extends Overlay { addLabelTextField(gridPane, ++rowIndex, "Bitcoin amount" + btcDirectionInfo, formatter.formatCoinWithCode(trade.getTradeAmount())); addLabelTextField(gridPane, ++rowIndex, CurrencyUtil.getNameByCode(offer.getCurrencyCode()) + " amount" + fiatDirectionInfo, formatter.formatFiatWithCode(trade.getTradeVolume())); addLabelTextField(gridPane, ++rowIndex, "Price:", formatter.formatPriceWithCode(offer.getPrice())); - addLabelTextField(gridPane, ++rowIndex, "Currency:", offer.getCurrencyCode()); addLabelTextField(gridPane, ++rowIndex, "Payment method:", BSResources.get(offer.getPaymentMethod().getId())); // second group