From a2302b3e0bde27b55477ca41c6235ed5d66d281e Mon Sep 17 00:00:00 2001 From: Christoph Atteneder Date: Mon, 3 Aug 2020 12:03:52 +0200 Subject: [PATCH] Only show signing state if signing for payment method is required --- .../main/offer/offerbook/OfferBookView.java | 36 ++++++++++--------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java b/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java index fa6d6663116..40ebfc78b77 100644 --- a/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java +++ b/desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java @@ -1153,19 +1153,20 @@ public void updateItem(final OfferBookListItem item, boolean empty) { String info; String timeSinceSigning; - if (accountAgeWitnessService.hasSignedWitness(item.getOffer())) { - AccountAgeWitnessService.SignState signState = accountAgeWitnessService.getSignState(item.getOffer()); - icon = GUIUtil.getIconForSignState(signState); - info = Res.get("offerbook.timeSinceSigning.info", - signState.getPresentation()); - long daysSinceSigning = TimeUnit.MILLISECONDS.toDays( - accountAgeWitnessService.getWitnessSignAge(item.getOffer(), new Date())); - timeSinceSigning = Res.get("offerbook.timeSinceSigning.daysSinceSigning", - daysSinceSigning); - } else { - boolean needsSigning = PaymentMethod.hasChargebackRisk( - item.getOffer().getPaymentMethod(), item.getOffer().getCurrencyCode()); - if (needsSigning) { + boolean needsSigning = PaymentMethod.hasChargebackRisk( + item.getOffer().getPaymentMethod(), item.getOffer().getCurrencyCode()); + + if (needsSigning) { + if (accountAgeWitnessService.hasSignedWitness(item.getOffer())) { + AccountAgeWitnessService.SignState signState = accountAgeWitnessService.getSignState(item.getOffer()); + icon = GUIUtil.getIconForSignState(signState); + info = Res.get("offerbook.timeSinceSigning.info", + signState.getPresentation()); + long daysSinceSigning = TimeUnit.MILLISECONDS.toDays( + accountAgeWitnessService.getWitnessSignAge(item.getOffer(), new Date())); + timeSinceSigning = Res.get("offerbook.timeSinceSigning.daysSinceSigning", + daysSinceSigning); + } else { AccountAgeWitnessService.SignState signState = accountAgeWitnessService.getSignState(item.getOffer()); icon = GUIUtil.getIconForSignState(signState); @@ -1180,11 +1181,12 @@ public void updateItem(final OfferBookListItem item, boolean empty) { info = Res.get("shared.notSigned"); timeSinceSigning = Res.get("offerbook.timeSinceSigning.notSigned"); } - } else { - icon = MaterialDesignIcon.INFORMATION_OUTLINE; - info = Res.get("shared.notSigned.noNeed"); - timeSinceSigning = Res.get("offerbook.timeSinceSigning.notSigned.noNeed"); } + + } else { + icon = MaterialDesignIcon.INFORMATION_OUTLINE; + info = Res.get("shared.notSigned.noNeed"); + timeSinceSigning = Res.get("offerbook.timeSinceSigning.notSigned.noNeed"); } InfoAutoTooltipLabel label = new InfoAutoTooltipLabel(timeSinceSigning, icon, ContentDisplay.RIGHT, info);