diff --git a/core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java b/core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java index 69b308831b..659cd0d0f0 100644 --- a/core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java +++ b/core/src/main/java/bisq/core/account/witness/AccountAgeWitnessService.java @@ -104,6 +104,7 @@ public class AccountAgeWitnessService { private String presentation; private String hash = ""; + private long daysUntilLimitLifted = 0; SignState(String presentation) { this.presentation = presentation; @@ -114,11 +115,16 @@ public class AccountAgeWitnessService { return this; } + public SignState setDaysUntilLimitLifted(long days) { + this.daysUntilLimitLifted = days; + return this; + } + public String getPresentation() { if (!hash.isEmpty()) { // Only showing in DEBUG mode return presentation + " " + hash; } - return presentation; + return String.format(presentation, daysUntilLimitLifted); } } @@ -806,7 +812,8 @@ public class AccountAgeWitnessService { case ONE_TO_TWO_MONTHS: return SignState.PEER_SIGNER.addHash(hash); case LESS_ONE_MONTH: - return SignState.PEER_INITIAL.addHash(hash); + return SignState.PEER_INITIAL.addHash(hash) + .setDaysUntilLimitLifted(30 - TimeUnit.MILLISECONDS.toDays(accountSignAge)); case UNVERIFIED: default: return SignState.UNSIGNED.addHash(hash); diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index f0b7303b85..915030e395 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -340,10 +340,10 @@ offerbook.offerersAcceptedBankSeats=Accepted seat of bank countries (taker):\n { offerbook.availableOffers=Available offers offerbook.filterByCurrency=Filter by currency offerbook.filterByPaymentMethod=Filter by payment method -offerbook.timeSinceSigning=Signed since +offerbook.timeSinceSigning=Account info offerbook.timeSinceSigning.info=This account was verified and {0} offerbook.timeSinceSigning.info.arbitrator=signed by an arbitrator and can sign peer accounts -offerbook.timeSinceSigning.info.peer=signed by a peer, waiting for limits to be lifted +offerbook.timeSinceSigning.info.peer=signed by a peer, waiting %d days 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 peer accounts (limits lifted) offerbook.timeSinceSigning.info.banned=account was banned @@ -354,9 +354,12 @@ offerbook.xmrAutoConf=Is auto-confirm enabled offerbook.timeSinceSigning.help=When you successfully complete a trade with a peer who has a signed payment account, your payment account is signed.\n\ {0} days later, the initial limit of {1} is lifted and your account can sign other peers'' payment accounts. offerbook.timeSinceSigning.notSigned=Not signed yet +offerbook.timeSinceSigning.notSigned.ageDays={0} days offerbook.timeSinceSigning.notSigned.noNeed=N/A -shared.notSigned=This account hasn't been signed yet -shared.notSigned.noNeed=This account type doesn't use signing +shared.notSigned=This account has not been signed yet and was created {0} days ago +shared.notSigned.noNeed=This account type does not require signing +shared.notSigned.noNeedDays=This account type does not require signing and was created {0} days ago +shared.notSigned.noNeedAlts=Altcoin accounts do not feature signing or aging offerbook.nrOffers=No. of offers: {0} offerbook.volume={0} (min - max) 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 c913c8e977..a753a8bfd8 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 @@ -376,7 +376,7 @@ public class OfferBookView extends ActivatableViewAndModel