Ecosystem/haveno
Ecosystem/haveno
2
1
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-01-07 03:19:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

show security deposit from trade amount in take offer and trade details
Some checks failed
CI / build (macos-13) (push) Has been cancelled
Details
CI / build (ubuntu-22.04) (push) Has been cancelled
Details
CI / build (windows-latest) (push) Has been cancelled
Details
Codacy Coverage Reporter / Publish coverage (push) Has been cancelled
Details
CodeQL / Analyze (push) Has been cancelled
Details

Browse source
This commit is contained in:
woodser 2024-12-23 06:28:31 -05:00
parent f053a274a4
commit adcf158a90
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
desktop/src/main/java/haveno/desktop/main/overlays/windows/OfferDetailsWindow.java
View file

@ -368,11 +368,11 @@ public class OfferDetailsWindow extends Overlay<OfferDetailsWindow> {
DisplayUtils.formatDateTime(offer.getDate())); DisplayUtils.formatDateTime(offer.getDate()));
String value = Res.getWithColAndCap("shared.buyer") + String value = Res.getWithColAndCap("shared.buyer") +
" " + " " +
HavenoUtils.formatXmr(offer.getOfferPayload().getMaxBuyerSecurityDeposit(), true) + HavenoUtils.formatXmr(takeOfferHandlerOptional.isPresent() ? offer.getOfferPayload().getBuyerSecurityDepositForTradeAmount(tradeAmount) : offer.getOfferPayload().getMaxBuyerSecurityDeposit(), true) +
" / " + " / " +
Res.getWithColAndCap("shared.seller") + Res.getWithColAndCap("shared.seller") +
" " + " " +
HavenoUtils.formatXmr(offer.getOfferPayload().getMaxSellerSecurityDeposit(), true); HavenoUtils.formatXmr(takeOfferHandlerOptional.isPresent() ? offer.getOfferPayload().getSellerSecurityDepositForTradeAmount(tradeAmount) : offer.getOfferPayload().getMaxSellerSecurityDeposit(), true);
addConfirmationLabelLabel(gridPane, ++rowIndex, Res.get("shared.securityDeposit"), value); addConfirmationLabelLabel(gridPane, ++rowIndex, Res.get("shared.securityDeposit"), value);
if (reservedAmount != null) { if (reservedAmount != null) {

4
desktop/src/main/java/haveno/desktop/main/overlays/windows/TradeDetailsWindow.java
View file

@ -201,11 +201,11 @@ public class TradeDetailsWindow extends Overlay<TradeDetailsWindow> {
DisplayUtils.formatDateTime(trade.getDate())); DisplayUtils.formatDateTime(trade.getDate()));
String securityDeposit = Res.getWithColAndCap("shared.buyer") + String securityDeposit = Res.getWithColAndCap("shared.buyer") +
" " + " " +
HavenoUtils.formatXmr(offer.getMaxBuyerSecurityDeposit(), true) + HavenoUtils.formatXmr(trade.getBuyerSecurityDepositBeforeMiningFee(), true) +
" / " + " / " +
Res.getWithColAndCap("shared.seller") + Res.getWithColAndCap("shared.seller") +
" " + " " +
HavenoUtils.formatXmr(offer.getMaxSellerSecurityDeposit(), true); HavenoUtils.formatXmr(trade.getSellerSecurityDepositBeforeMiningFee(), true);
addConfirmationLabelTextField(gridPane, ++rowIndex, Res.get("shared.securityDeposit"), securityDeposit); addConfirmationLabelTextField(gridPane, ++rowIndex, Res.get("shared.securityDeposit"), securityDeposit);
NodeAddress arbitratorNodeAddress = trade.getArbitratorNodeAddress(); NodeAddress arbitratorNodeAddress = trade.getArbitratorNodeAddress();