mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-21 14:24:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add account age to trade details window

Browse source
This commit is contained in:
Manfred Karrer 2019-04-19 22:00:41 -05:00
parent 1f00e8c3aa
commit c145cab7b8
No known key found for this signature in database
GPG key ID: 401250966A6B2C46
1 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
desktop/src/main/java/bisq/desktop/main/overlays/windows/TradeDetailsWindow.java
View file

@ -24,8 +24,11 @@ import bisq.desktop.main.overlays.Overlay;
import bisq.desktop.util.Layout;
import bisq.core.arbitration.DisputeManager;
import bisq.core.locale.CurrencyUtil;
import bisq.core.locale.Res;
import bisq.core.offer.Offer;
import bisq.core.payment.AccountAgeWitness;
import bisq.core.payment.AccountAgeWitnessService;
import bisq.core.payment.payload.PaymentAccountPayload;
import bisq.core.trade.Contract;
import bisq.core.trade.Trade;
@ -56,6 +59,9 @@ import javafx.beans.property.IntegerProperty;
import javafx.beans.property.SimpleIntegerProperty;
import javafx.beans.value.ChangeListener;
import java.util.Date;
import java.util.Optional;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -67,6 +73,7 @@ public class TradeDetailsWindow extends Overlay<TradeDetailsWindow> {
private final BSFormatter formatter;
private final DisputeManager disputeManager;
private final TradeManager tradeManager;
private final AccountAgeWitnessService accountAgeWitnessService;
private Trade trade;
private ChangeListener<Number> changeListener;
private TextArea textArea;
@ -77,10 +84,12 @@ public class TradeDetailsWindow extends Overlay<TradeDetailsWindow> {
///////////////////////////////////////////////////////////////////////////////////////////
@Inject
public TradeDetailsWindow(BSFormatter formatter, DisputeManager disputeManager, TradeManager tradeManager) {
public TradeDetailsWindow(BSFormatter formatter, DisputeManager disputeManager, TradeManager tradeManager,
AccountAgeWitnessService accountAgeWitnessService) {
this.formatter = formatter;
this.disputeManager = disputeManager;
this.tradeManager = tradeManager;
this.accountAgeWitnessService = accountAgeWitnessService;
type = Type.Confirmation;
}
@ -216,15 +225,31 @@ public class TradeDetailsWindow extends Overlay<TradeDetailsWindow> {
if (contract != null) {
if (buyerPaymentAccountPayload != null) {
String paymentDetails = buyerPaymentAccountPayload.getPaymentDetails();
Optional<AccountAgeWitness> witness = accountAgeWitnessService.findWitness(buyerPaymentAccountPayload, contract.getBuyerPubKeyRing());
long age = witness.map(accountAgeWitness -> accountAgeWitnessService.getAccountAge(accountAgeWitness, new Date()))
.orElse(-1L);
String accountAge = CurrencyUtil.isFiatCurrency(offer.getCurrencyCode()) ?
age > -1 ? Res.get("peerInfoIcon.tooltip.age", formatter.formatAccountAge(age)) :
Res.get("peerInfoIcon.tooltip.unknownAge") :
"";
TextFieldWithCopyIcon tf = addConfirmationLabelTextFieldWithCopyIcon(gridPane, ++rowIndex,
Res.get("shared.paymentDetails", Res.get("shared.buyer")),
buyerPaymentAccountPayload.getPaymentDetails()).second;
paymentDetails + " / " + accountAge).second;
tf.setTooltip(new Tooltip(tf.getText()));
}
if (sellerPaymentAccountPayload != null) {
String paymentDetails = sellerPaymentAccountPayload.getPaymentDetails();
Optional<AccountAgeWitness> witness = accountAgeWitnessService.findWitness(sellerPaymentAccountPayload, contract.getSellerPubKeyRing());
long age = witness.map(accountAgeWitness -> accountAgeWitnessService.getAccountAge(accountAgeWitness, new Date()))
.orElse(-1L);
String accountAge = CurrencyUtil.isFiatCurrency(offer.getCurrencyCode()) ?
age > -1 ? Res.get("peerInfoIcon.tooltip.age", formatter.formatAccountAge(age)) :
Res.get("peerInfoIcon.tooltip.unknownAge") :
"";
TextFieldWithCopyIcon tf = addConfirmationLabelTextFieldWithCopyIcon(gridPane, ++rowIndex,
Res.get("shared.paymentDetails", Res.get("shared.seller")),
sellerPaymentAccountPayload.getPaymentDetails()).second;
paymentDetails + " / " + accountAge).second;
tf.setTooltip(new Tooltip(tf.getText()));
}
if (buyerPaymentAccountPayload == null && sellerPaymentAccountPayload == null)