Trade Info Popup

Issue #3317
bisq-network · Sep 26, 2019 · b5f6d0d · b5f6d0d
1 parent 490eaab
commit b5f6d0d
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 4 deletions.
diff --git a/core/src/main/java/bisq/core/payment/payload/AssetsAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/AssetsAccountPayload.java
@@ -67,7 +67,7 @@ protected AssetsAccountPayload(String paymentMethod,
 
     @Override
     public String getPaymentDetails() {
-        return Res.getWithCol("payment.altcoin.receiver.address") + " " + address;
+        return super.paymentDetails + " " + address;
     }
 
     @Override

diff --git a/core/src/main/java/bisq/core/payment/payload/PaymentAccountPayload.java b/core/src/main/java/bisq/core/payment/payload/PaymentAccountPayload.java
@@ -22,6 +22,7 @@
 import bisq.common.proto.network.NetworkPayload;
 import bisq.common.util.JsonExclude;
 import bisq.common.util.Utilities;
+import bisq.core.locale.Res;
 
 import org.apache.commons.lang3.ArrayUtils;
 
@@ -31,8 +32,10 @@
 import java.util.Map;
 import java.util.Optional;
 
+import lombok.AccessLevel;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
+import lombok.Setter;
 import lombok.ToString;
 import lombok.extern.slf4j.Slf4j;
 
@@ -70,6 +73,11 @@ public abstract class PaymentAccountPayload implements NetworkPayload, UsedForTr
     @Nullable
     protected final Map<String, String> excludeFromJsonDataMap;
 
+    @JsonExclude
+    @Getter(AccessLevel.NONE)
+    @Setter(AccessLevel.NONE)    
+	protected String paymentDetails;
+
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Constructor
@@ -117,6 +125,10 @@ protected protobuf.PaymentAccountPayload.Builder getPaymentAccountPayloadBuilder
     ///////////////////////////////////////////////////////////////////////////////////////////
     // API
     ///////////////////////////////////////////////////////////////////////////////////////////
+
+    public void setPaymentDetails(String paymentDetails) {
+    	this.paymentDetails = paymentDetails;
+    }
 
     public abstract String getPaymentDetails();
 

diff --git a/core/src/main/java/bisq/core/trade/protocol/tasks/ApplyFilter.java b/core/src/main/java/bisq/core/trade/protocol/tasks/ApplyFilter.java
@@ -19,6 +19,7 @@
 
 import bisq.core.filter.FilterManager;
 import bisq.core.filter.PaymentAccountFilter;
+import bisq.core.locale.Res;
 import bisq.core.payment.payload.PaymentAccountPayload;
 import bisq.core.trade.Trade;
 
@@ -60,6 +61,7 @@ protected void run() {
                 failed("Payment method is banned.\n" +
                         "Payment method=" + trade.getOffer().getPaymentMethod().getId());
             } else if (filterManager.isPeersPaymentAccountDataAreBanned(paymentAccountPayload, appliedPaymentAccountFilter)) {
+            	paymentAccountPayload.setPaymentDetails(Res.getWithCol("payment.altcoin.sender.address", trade.getOffer().getCurrencyCode()));
                 failed("Other trader is banned by their trading account data.\n" +
                         "paymentAccountPayload=" + paymentAccountPayload.getPaymentDetails() + "\n" +
                         "banFilter=" + appliedPaymentAccountFilter[0].toString());

diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties
@@ -2752,7 +2752,8 @@ payment.national.account.id.AR=CBU number
 
 #new
 payment.altcoin.address.dyn={0} address
-payment.altcoin.receiver.address=Receiver's altcoin address
+payment.altcoin.sender.address=Sender''s {0} address
+payment.altcoin.receiver.address=Receiver''s {0} address
 payment.accountNr=Account number
 payment.emailOrMobile=Email or mobile nr
 payment.useCustomAccountName=Use custom account name

diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/ContractWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/ContractWindow.java
@@ -136,13 +136,17 @@ private void addContent() {
         if (showAcceptedBanks)
             rows++;
 
+        String currencyCode = offer.getCurrencyCode();
         PaymentAccountPayload sellerPaymentAccountPayload = contract.getSellerPaymentAccountPayload();
+        PaymentAccountPayload buyerPaymentAccountPayload = contract.getBuyerPaymentAccountPayload();
+        buyerPaymentAccountPayload.setPaymentDetails(Res.getWithCol("payment.altcoin.receiver.address", currencyCode));
+        sellerPaymentAccountPayload.setPaymentDetails(Res.getWithCol("payment.altcoin.sender.address", currencyCode));
+
         addTitledGroupBg(gridPane, ++rowIndex, rows, Res.get("contractWindow.title"));
         addConfirmationLabelTextFieldWithCopyIcon(gridPane, rowIndex, Res.get("shared.offerId"), offer.getId(),
                 Layout.TWICE_FIRST_ROW_DISTANCE).second.setMouseTransparent(false);
         addConfirmationLabelLabel(gridPane, ++rowIndex, Res.get("contractWindow.dates"),
                 DisplayUtils.formatDateTime(offer.getDate()) + " / " + DisplayUtils.formatDateTime(dispute.getTradeDate()));
-        String currencyCode = offer.getCurrencyCode();
         addConfirmationLabelLabel(gridPane, ++rowIndex, Res.get("shared.offerType"),
                 DisplayUtils.getDirectionBothSides(offer.getDirection(), currencyCode));
         addConfirmationLabelLabel(gridPane, ++rowIndex, Res.get("shared.tradePrice"),
@@ -175,7 +179,7 @@ private void addContent() {
                 nrOfDisputesAsBuyer + " / " + nrOfDisputesAsSeller);
 
         addConfirmationLabelTextFieldWithCopyIcon(gridPane, ++rowIndex, Res.get("shared.paymentDetails", Res.get("shared.buyer")),
-                contract.getBuyerPaymentAccountPayload().getPaymentDetails()).second.setMouseTransparent(false);
+        		buyerPaymentAccountPayload.getPaymentDetails()).second.setMouseTransparent(false);
         addConfirmationLabelTextFieldWithCopyIcon(gridPane, ++rowIndex, Res.get("shared.paymentDetails", Res.get("shared.seller")),
                 sellerPaymentAccountPayload.getPaymentDetails()).second.setMouseTransparent(false);
 

diff --git a/desktop/src/main/java/bisq/desktop/main/overlays/windows/TradeDetailsWindow.java b/desktop/src/main/java/bisq/desktop/main/overlays/windows/TradeDetailsWindow.java
@@ -231,7 +231,9 @@ private void addContent() {
                     trade.getTradingPeerNodeAddress().getFullAddress());
 
         if (contract != null) {
+        	String currencyCode = contract.getTradePrice().getCurrencyCode();
             if (buyerPaymentAccountPayload != null) {
+            	buyerPaymentAccountPayload.setPaymentDetails(Res.getWithCol("payment.altcoin.sender.address", currencyCode));
                 String paymentDetails = buyerPaymentAccountPayload.getPaymentDetails();
                 long age = accountAgeWitnessService.getAccountAge(buyerPaymentAccountPayload, contract.getBuyerPubKeyRing());
                 buyersAccountAge = CurrencyUtil.isFiatCurrency(offer.getCurrencyCode()) ?
@@ -246,6 +248,7 @@ private void addContent() {
                 tf.setTooltip(new Tooltip(tf.getText()));
             }
             if (sellerPaymentAccountPayload != null) {
+            	sellerPaymentAccountPayload.setPaymentDetails(Res.getWithCol("payment.altcoin.receiver.address", currencyCode));
                 String paymentDetails = sellerPaymentAccountPayload.getPaymentDetails();
                 long age = accountAgeWitnessService.getAccountAge(sellerPaymentAccountPayload, contract.getSellerPubKeyRing());
                 sellersAccountAge = CurrencyUtil.isFiatCurrency(offer.getCurrencyCode()) ?

diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.java b/desktop/src/main/java/bisq/desktop/main/portfolio/closedtrades/ClosedTradesView.java
@@ -331,8 +331,11 @@ private void applyFilteredListPredicate(String filterString) {
                 boolean matchesTradeDate = DisplayUtils.formatDate(trade.getTakeOfferDate()).contains(filterString);
                 Contract contract = trade.getContract();
                 if (contract != null) {
+                	String currencyCode = contract.getTradePrice().getCurrencyCode();
                     isBuyerOnion = contract.getBuyerNodeAddress().getFullAddress().contains(filterString);
                     isSellerOnion = contract.getSellerNodeAddress().getFullAddress().contains(filterString);
+                    contract.getBuyerPaymentAccountPayload().setPaymentDetails(Res.getWithCol("payment.altcoin.receiver.address", currencyCode));
+                    contract.getSellerPaymentAccountPayload().setPaymentDetails(Res.getWithCol("payment.altcoin.sender.address", currencyCode));
                     matchesBuyersPaymentAccountData = contract.getBuyerPaymentAccountPayload().getPaymentDetails().contains(filterString);
                     matchesSellersPaymentAccountData = contract.getSellerPaymentAccountPayload().getPaymentDetails().contains(filterString);
                 }

diff --git a/...src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java b/...src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java
@@ -192,7 +192,10 @@ protected void addContent() {
                 peersTitle = Res.get("portfolio.pending.step3_seller.buyersAddress", nameByCode);
                 isBlockChain = true;
             } else {
+            	String currencyCode = contract.getTradePrice().getCurrencyCode();
+            	myPaymentAccountPayload.setPaymentDetails(Res.getWithCol("payment.altcoin.sender.address", currencyCode));
                 myPaymentDetails = myPaymentAccountPayload.getPaymentDetails();
+                peersPaymentAccountPayload.setPaymentDetails(Res.getWithCol("payment.altcoin.receiver.address", currencyCode));
                 peersPaymentDetails = peersPaymentAccountPayload.getPaymentDetails();
                 myTitle = Res.get("portfolio.pending.step3_seller.yourAccount");
                 peersTitle = Res.get("portfolio.pending.step3_seller.buyersAccount");

diff --git a/desktop/src/main/java/bisq/desktop/main/support/dispute/agent/DisputeAgentView.java b/desktop/src/main/java/bisq/desktop/main/support/dispute/agent/DisputeAgentView.java
@@ -79,10 +79,14 @@ public void initialize() {
     protected void applyFilteredListPredicate(String filterString) {
         // If in arbitrator view we must only display disputes where we are selected as arbitrator (must not receive others anyway)
         filteredList.setPredicate(dispute -> {
+        	String currencyCode = dispute.getContract().getTradePrice().getCurrencyCode();
             boolean matchesTradeId = dispute.getTradeId().contains(filterString);
             boolean matchesDate = DisplayUtils.formatDate(dispute.getOpeningDate()).contains(filterString);
             boolean isBuyerOnion = dispute.getContract().getBuyerNodeAddress().getFullAddress().contains(filterString);
             boolean isSellerOnion = dispute.getContract().getSellerNodeAddress().getFullAddress().contains(filterString);
+            dispute.getContract().getBuyerPaymentAccountPayload().setPaymentDetails(Res.getWithCol("payment.altcoin.receiver.address", currencyCode));
+            dispute.getContract().getSellerPaymentAccountPayload().setPaymentDetails(Res.getWithCol("payment.altcoin.sender.address", currencyCode));
+
             boolean matchesBuyersPaymentAccountData = dispute.getContract().getBuyerPaymentAccountPayload().getPaymentDetails().contains(filterString);
             boolean matchesSellersPaymentAccountData = dispute.getContract().getSellerPaymentAccountPayload().getPaymentDetails().contains(filterString);