From e85682e635c52b4328b11a4e58f786b8efa79174 Mon Sep 17 00:00:00 2001 From: woodser Date: Mon, 19 Dec 2022 10:45:55 +0000 Subject: [PATCH] fix resolved dispute chat message --- .../main/java/bisq/core/api/CoreDisputesService.java | 2 +- .../main/java/bisq/core/offer/OfferBookService.java | 1 - .../src/main/resources/i18n/displayStrings.properties | 11 +++++------ 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/core/src/main/java/bisq/core/api/CoreDisputesService.java b/core/src/main/java/bisq/core/api/CoreDisputesService.java index c9e8125fc0..4f8a9d1b83 100644 --- a/core/src/main/java/bisq/core/api/CoreDisputesService.java +++ b/core/src/main/java/bisq/core/api/CoreDisputesService.java @@ -257,10 +257,10 @@ public class CoreDisputesService { agentNodeAddress, dispute.getShortTradeId(), currencyCode, + Res.get("disputeSummaryWindow.reason." + reason.name()), amount, formatter.formatCoinWithCode(disputeResult.getBuyerPayoutAmount()), formatter.formatCoinWithCode(disputeResult.getSellerPayoutAmount()), - Res.get("disputeSummaryWindow.reason." + reason.name()), disputeResult.summaryNotesProperty().get() ); diff --git a/core/src/main/java/bisq/core/offer/OfferBookService.java b/core/src/main/java/bisq/core/offer/OfferBookService.java index ac0c190d6f..1845968249 100644 --- a/core/src/main/java/bisq/core/offer/OfferBookService.java +++ b/core/src/main/java/bisq/core/offer/OfferBookService.java @@ -294,7 +294,6 @@ public class OfferBookService { if (keyImagePoller == null) return; for (String keyImage : offer.getOfferPayload().getReserveTxKeyImages()) { if (Boolean.TRUE.equals(keyImagePoller.isSpent(keyImage))) { - log.warn("Reserved funds spent for offer {}", offer.getId()); offer.setReservedFundsSpent(true); } } diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index 9d6d1358c0..86ac0e3c44 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -477,7 +477,7 @@ createOffer.createOfferFundWalletInfo.headline=Fund your offer # suppress inspection "TrailingSpacesInProperty" createOffer.createOfferFundWalletInfo.tradeAmount=- Trade amount: {0} \n createOffer.createOfferFundWalletInfo.msg=You need to deposit {0} to this offer.\n\n\ - Those funds are reserved in your local wallet and will get locked into the multisig wallet once someone takes your offer.\n\n\ + These funds are reserved in your local wallet and will get locked into a multisig wallet once someone takes your offer.\n\n\ The amount is the sum of:\n\ {1}\ - Your security deposit: {2}\n\ @@ -1830,11 +1830,10 @@ disputeSummaryWindow.close.msg=Ticket closed on {0}\n\ Trade ID: {3}\n\ Currency: {4}\n\ Reason for dispute: {5}\n\ - Payout suggestion: {6}\n\ - Trade amount: {7}\n\ - Payout amount for XMR buyer: {8}\n\ - Payout amount for XMR seller: {9}\n\n\ - Summary notes:\n{10}\n + Trade amount: {6}\n\ + Payout amount for XMR buyer: {7}\n\ + Payout amount for XMR seller: {8}\n\n\ + Summary notes:\n{9}\n # Do no change any line break or order of tokens as the structure is used for signature verification disputeSummaryWindow.close.msgWithSig={0}{1}{2}{3}