Fix account signing state in offer book (#3390)

bisq-network · Oct 10, 2019 · 901fb95 · 901fb95
1 parent cda5dcc
commit 901fb95
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties
@@ -337,7 +337,7 @@ offerbook.timeSinceSigning.info=This account was verified and {0}
 offerbook.timeSinceSigning.info.arbitrator=signed by an arbitrator and can sign peers accounts
 offerbook.timeSinceSigning.info.peer=signed by a peer, waiting for limits to be lifted
 offerbook.timeSinceSigning.info.peerLimitLifted=signed by a peer and limits were lifted
-offerbook.timeSinceSigning.info.signer=signed by peer and can sign peers accounts
+offerbook.timeSinceSigning.info.signer=signed by peer and can sign peer accounts
 offerbook.timeSinceSigning.daysSinceSigning={0} days
 offerbook.timeSinceSigning.daysSinceSigning.long={0} since signing
 

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
@@ -1097,8 +1097,19 @@ public void updateItem(final OfferBookListItem item, boolean empty) {
                                         item.getOffer().getPaymentMethod(), item.getOffer().getCurrencyCode());
                                 if (needsSigning) {
                                     icon = MaterialDesignIcon.ALERT_CIRCLE_OUTLINE;
-                                    info = Res.get("shared.notSigned");
-                                    timeSinceSigning = Res.get("offerbook.timeSinceSigning.notSigned");
+
+                                    AccountAgeWitnessService.SignState signState = accountAgeWitnessService.getSignState(item.getOffer());
+
+                                    if (!signState.equals(AccountAgeWitnessService.SignState.UNSIGNED)) {
+                                        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 {
+                                        info = Res.get("shared.notSigned");
+                                        timeSinceSigning = Res.get("offerbook.timeSinceSigning.notSigned");
+                                    }
                                 } else {
                                     icon = MaterialDesignIcon.INFORMATION_OUTLINE;
                                     info = Res.get("shared.notSigned.noNeed");