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

mark dispute closed per ticket and sync for payout on ack

Browse source
This commit is contained in:
woodser 2023-12-08 15:34:29 -05:00
parent 3730773006
commit 0c149b780f
4 changed files with 41 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -581,6 +581,8 @@ public class DisputeSummaryWindow extends Overlay<DisputeSummaryWindow> {
Button cancelButton = tuple.second;
closeTicketButton.setOnAction(e -> {
closeTicketButton.disableProperty().unbind();
closeTicketButton.setDisable(true);
if (dispute.getSupportType() == SupportType.ARBITRATION &&
peersDisputeOptional.isPresent() &&
!peersDisputeOptional.get().isClosed() &&

17
desktop/src/main/java/haveno/desktop/main/support/dispute/DisputeView.java
View file

@ -40,7 +40,6 @@ import haveno.core.support.messages.ChatMessage;
import haveno.core.trade.Contract;
import haveno.core.trade.HavenoUtils;
import haveno.core.trade.Trade;
import haveno.core.trade.Trade.DisputeState;
import haveno.core.trade.TradeManager;
import haveno.core.user.Preferences;
import haveno.core.util.FormattingUtils;
@ -1353,7 +1352,7 @@ public abstract class DisputeView extends ActivatableView<VBox, Void> {
// subscribe to trade's dispute state
Trade trade = tradeManager.getTrade(item.getTradeId());
if (trade == null) log.warn("Dispute's trade is null for trade {}", item.getTradeId());
else subscription = EasyBind.subscribe(trade.disputeStateProperty(), disputeState -> setText(getDisputeStateText(disputeState)));
else subscription = EasyBind.subscribe(item.isClosedProperty(), closedProp -> setText(getDisputeStateText(item)));
} else {
if (closedProperty != null) {
closedProperty.removeListener(listener);
@ -1373,28 +1372,16 @@ public abstract class DisputeView extends ActivatableView<VBox, Void> {
return column;
}
private String getDisputeStateText(DisputeState disputeState) {
switch (disputeState) {
case DISPUTE_REQUESTED:
return Res.get("support.requested");
case DISPUTE_CLOSED:
return Res.get("support.closed");
default:
return Res.get("support.open");
}
}
private String getDisputeStateText(Dispute dispute) {
Trade trade = tradeManager.getTrade(dispute.getTradeId());
if (trade == null) {
log.warn("Dispute's trade is null for trade {}", dispute.getTradeId());
return Res.get("support.closed");
}
if (dispute.isClosed()) return Res.get("support.closed");
switch (trade.getDisputeState()) {
case DISPUTE_REQUESTED:
return Res.get("support.requested");
case DISPUTE_CLOSED:
return Res.get("support.closed");
default:
return Res.get("support.open");
}