boldsuck/haveno
1
0
Fork 0
mirror of https://github.com/boldsuck/haveno.git synced 2025-01-24 08:35:51 +00:00
Code Issues 1 Projects Releases Packages Wiki Activity Actions

fix resolved dispute chat message

Browse source
This commit is contained in:
woodser 2022-12-19 10:45:55 +00:00
parent 05ba2ce305
commit e85682e635
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/src/main/java/bisq/core/api/CoreDisputesService.java
View file

@ -257,10 +257,10 @@ public class CoreDisputesService {
agentNodeAddress, agentNodeAddress,
dispute.getShortTradeId(), dispute.getShortTradeId(),
currencyCode, currencyCode,
Res.get("disputeSummaryWindow.reason." + reason.name()),
amount, amount,
formatter.formatCoinWithCode(disputeResult.getBuyerPayoutAmount()), formatter.formatCoinWithCode(disputeResult.getBuyerPayoutAmount()),
formatter.formatCoinWithCode(disputeResult.getSellerPayoutAmount()), formatter.formatCoinWithCode(disputeResult.getSellerPayoutAmount()),
Res.get("disputeSummaryWindow.reason." + reason.name()),
disputeResult.summaryNotesProperty().get() disputeResult.summaryNotesProperty().get()
); );

1
core/src/main/java/bisq/core/offer/OfferBookService.java
View file

@ -294,7 +294,6 @@ public class OfferBookService {
if (keyImagePoller == null) return; if (keyImagePoller == null) return;
for (String keyImage : offer.getOfferPayload().getReserveTxKeyImages()) { for (String keyImage : offer.getOfferPayload().getReserveTxKeyImages()) {
if (Boolean.TRUE.equals(keyImagePoller.isSpent(keyImage))) { if (Boolean.TRUE.equals(keyImagePoller.isSpent(keyImage))) {
log.warn("Reserved funds spent for offer {}", offer.getId());
offer.setReservedFundsSpent(true); offer.setReservedFundsSpent(true);
} }
} }

11
core/src/main/resources/i18n/displayStrings.properties
View file

@ -477,7 +477,7 @@ createOffer.createOfferFundWalletInfo.headline=Fund your offer
# suppress inspection "TrailingSpacesInProperty" # suppress inspection "TrailingSpacesInProperty"
createOffer.createOfferFundWalletInfo.tradeAmount=- Trade amount: {0} \n createOffer.createOfferFundWalletInfo.tradeAmount=- Trade amount: {0} \n
createOffer.createOfferFundWalletInfo.msg=You need to deposit {0} to this offer.\n\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\ The amount is the sum of:\n\
{1}\ {1}\
- Your security deposit: {2}\n\ - Your security deposit: {2}\n\
@ -1830,11 +1830,10 @@ disputeSummaryWindow.close.msg=Ticket closed on {0}\n\
Trade ID: {3}\n\ Trade ID: {3}\n\
Currency: {4}\n\ Currency: {4}\n\
Reason for dispute: {5}\n\ Reason for dispute: {5}\n\
Payout suggestion: {6}\n\ Trade amount: {6}\n\
Trade amount: {7}\n\ Payout amount for XMR buyer: {7}\n\
Payout amount for XMR buyer: {8}\n\ Payout amount for XMR seller: {8}\n\n\
Payout amount for XMR seller: {9}\n\n\ Summary notes:\n{9}\n
Summary notes:\n{10}\n
# Do no change any line break or order of tokens as the structure is used for signature verification # 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} disputeSummaryWindow.close.msgWithSig={0}{1}{2}{3}