Merge pull request #1431 from ripcurlx/clean-volume-usage

Use Amount term for Volume
bisq-network · Mar 7, 2018 · d079063 · d079063
2 parents 1ebbd87 + fbfcc83
commit d079063
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesView.java b/gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesView.java
@@ -96,7 +96,7 @@ public ClosedTradesView(ClosedTradesViewModel model,
     public void initialize() {
         priceColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.price")));
         amountColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.amountWithCur", Res.getBaseCurrencyCode())));
-        volumeColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.volume")));
+        volumeColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.amount")));
         marketColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.market")));
         directionColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.offerType")));
         dateColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.dateTime")));

diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java b/gui/src/main/java/io/bisq/gui/main/portfolio/closedtrades/ClosedTradesViewModel.java
@@ -53,7 +53,7 @@ String getTradeId(ClosedTradableListItem item) {
 
     String getAmount(ClosedTradableListItem item) {
         if (item != null && item.getTradable() instanceof Trade)
-            return formatter.formatCoinWithCode(((Trade) item.getTradable()).getTradeAmount());
+            return formatter.formatCoin(((Trade) item.getTradable()).getTradeAmount());
         else if (item != null && item.getTradable() instanceof OpenOffer)
             return "-";
         else

diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesView.java b/gui/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesView.java
@@ -56,7 +56,7 @@ public FailedTradesView(FailedTradesViewModel model, TradeDetailsWindow tradeDet
     public void initialize() {
         priceColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.price")));
         amountColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.amountWithCur", Res.getBaseCurrencyCode())));
-        volumeColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.volume")));
+        volumeColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.amount")));
         marketColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.market")));
         directionColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.offerType")));
         dateColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.dateTime")));

diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesViewModel.java b/gui/src/main/java/io/bisq/gui/main/portfolio/failedtrades/FailedTradesViewModel.java
@@ -45,7 +45,7 @@ String getTradeId(FailedTradesListItem item) {
 
     String getAmount(FailedTradesListItem item) {
         if (item != null && item.getTrade() != null)
-            return formatter.formatCoinWithCode(item.getTrade().getTradeAmount());
+            return formatter.formatCoin(item.getTrade().getTradeAmount());
         else
             return "";
     }

diff --git a/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesView.java b/gui/src/main/java/io/bisq/gui/main/portfolio/pendingtrades/PendingTradesView.java
@@ -101,7 +101,7 @@ public PendingTradesView(PendingTradesViewModel model,
     public void initialize() {
         priceColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.price")));
         amountColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.amountWithCur", Res.getBaseCurrencyCode())));
-        volumeColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.volume")));
+        volumeColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.amount")));
         marketColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.market")));
         roleColumn.setGraphic(new AutoTooltipLabel(Res.get("portfolio.pending.role")));
         dateColumn.setGraphic(new AutoTooltipLabel(Res.get("shared.dateTime")));
@@ -343,7 +343,7 @@ public TableCell<PendingTradesListItem, PendingTradesListItem> call(
                             public void updateItem(final PendingTradesListItem item, boolean empty) {
                                 super.updateItem(item, empty);
                                 if (item != null && !empty)
-                                    setGraphic(new AutoTooltipLabel(formatter.formatCoinWithCode(item.getTrade().getTradeAmount())));
+                                    setGraphic(new AutoTooltipLabel(formatter.formatCoin(item.getTrade().getTradeAmount())));
                                 else
                                     setGraphic(null);
                             }