Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-06-24 14:50:28 -04:00
Code Issues Projects Releases Packages Wiki Activity

fix custom amounts for dispute result

Browse source
This commit is contained in:
woodser 2025-05-29 17:07:20 -04:00 • committed by woodser
parent 85ee6787cd
commit dd65cdca13
1 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

23
desktop/src/main/java/haveno/desktop/main/overlays/windows/DisputeSummaryWindow.java
View file

@ -25,6 +25,7 @@ import haveno.common.handlers.ResultHandler;
import haveno.common.util.Tuple2; import haveno.common.util.Tuple2;
import haveno.common.util.Tuple3; import haveno.common.util.Tuple3;
import haveno.core.api.CoreDisputesService; import haveno.core.api.CoreDisputesService;
import haveno.core.api.CoreDisputesService.PayoutSuggestion;
import haveno.core.locale.Res; import haveno.core.locale.Res;
import haveno.core.support.SupportType; import haveno.core.support.SupportType;
import haveno.core.support.dispute.Dispute; import haveno.core.support.dispute.Dispute;
@ -138,6 +139,7 @@ public class DisputeSummaryWindow extends Overlay<DisputeSummaryWindow> {
public void show(Dispute dispute) { public void show(Dispute dispute) {
this.dispute = dispute; this.dispute = dispute;
this.trade = tradeManager.getTrade(dispute.getTradeId()); this.trade = tradeManager.getTrade(dispute.getTradeId());
this.payoutSuggestion = null;
rowIndex = -1; rowIndex = -1;
width = 1150; width = 1150;
@ -243,7 +245,6 @@ public class DisputeSummaryWindow extends Overlay<DisputeSummaryWindow> {
reasonWasPeerWasLateRadioButton.setDisable(true); reasonWasPeerWasLateRadioButton.setDisable(true);
reasonWasTradeAlreadySettledRadioButton.setDisable(true); reasonWasTradeAlreadySettledRadioButton.setDisable(true);
applyPayoutAmounts(tradeAmountToggleGroup.selectedToggleProperty().get());
applyTradeAmountRadioButtonStates(); applyTradeAmountRadioButtonStates();
} }
@ -724,6 +725,10 @@ public class DisputeSummaryWindow extends Overlay<DisputeSummaryWindow> {
private void applyTradeAmountRadioButtonStates() { private void applyTradeAmountRadioButtonStates() {
if (payoutSuggestion == null) {
payoutSuggestion = getPayoutSuggestionFromDisputeResult();
}
BigInteger buyerPayoutAmount = disputeResult.getBuyerPayoutAmountBeforeCost(); BigInteger buyerPayoutAmount = disputeResult.getBuyerPayoutAmountBeforeCost();
BigInteger sellerPayoutAmount = disputeResult.getSellerPayoutAmountBeforeCost(); BigInteger sellerPayoutAmount = disputeResult.getSellerPayoutAmountBeforeCost();
@ -748,4 +753,20 @@ public class DisputeSummaryWindow extends Overlay<DisputeSummaryWindow> {
break; break;
} }
} }
// TODO: Persist the payout suggestion to DisputeResult like Bisq upstream?
// That would be a better design, but it's not currently needed.
private PayoutSuggestion getPayoutSuggestionFromDisputeResult() {
if (disputeResult.getBuyerPayoutAmountBeforeCost().equals(BigInteger.ZERO)) {
return PayoutSuggestion.SELLER_GETS_ALL;
} else if (disputeResult.getSellerPayoutAmountBeforeCost().equals(BigInteger.ZERO)) {
return PayoutSuggestion.BUYER_GETS_ALL;
} else if (disputeResult.getBuyerPayoutAmountBeforeCost().equals(trade.getAmount().add(trade.getBuyer().getSecurityDeposit()))) {
return PayoutSuggestion.BUYER_GETS_TRADE_AMOUNT;
} else if (disputeResult.getSellerPayoutAmountBeforeCost().equals(trade.getAmount().add(trade.getSeller().getSecurityDeposit()))) {
return PayoutSuggestion.SELLER_GETS_TRADE_AMOUNT;
} else {
return PayoutSuggestion.CUSTOM;
}
}
} }