mirror of
https://github.com/boldsuck/haveno.git
synced 2024-12-22 20:19:21 +00:00
cancel tx on dispute summary window re-enables buttons
This commit is contained in:
parent
00ceeeba5f
commit
d9630a13b5
1 changed files with 8 additions and 2 deletions
|
@ -594,7 +594,11 @@ public class DisputeSummaryWindow extends Overlay<DisputeSummaryWindow> {
|
||||||
// show confirmation
|
// show confirmation
|
||||||
showPayoutTxConfirmation(contract,
|
showPayoutTxConfirmation(contract,
|
||||||
payoutTx,
|
payoutTx,
|
||||||
() -> doClose(closeTicketButton, cancelButton));
|
() -> doClose(closeTicketButton, cancelButton),
|
||||||
|
() -> {
|
||||||
|
closeTicketButton.setDisable(false);
|
||||||
|
cancelButton.setDisable(false);
|
||||||
|
});
|
||||||
} else {
|
} else {
|
||||||
doClose(closeTicketButton, cancelButton);
|
doClose(closeTicketButton, cancelButton);
|
||||||
}
|
}
|
||||||
|
@ -607,7 +611,7 @@ public class DisputeSummaryWindow extends Overlay<DisputeSummaryWindow> {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private void showPayoutTxConfirmation(Contract contract, MoneroTxWallet payoutTx, ResultHandler resultHandler) {
|
private void showPayoutTxConfirmation(Contract contract, MoneroTxWallet payoutTx, ResultHandler resultHandler, ResultHandler cancelHandler) {
|
||||||
|
|
||||||
// get buyer and seller destinations (order not preserved)
|
// get buyer and seller destinations (order not preserved)
|
||||||
String buyerPayoutAddressString = contract.getBuyerPayoutAddressString();
|
String buyerPayoutAddressString = contract.getBuyerPayoutAddressString();
|
||||||
|
@ -641,6 +645,7 @@ public class DisputeSummaryWindow extends Overlay<DisputeSummaryWindow> {
|
||||||
.actionButtonText(Res.get("shared.yes"))
|
.actionButtonText(Res.get("shared.yes"))
|
||||||
.onAction(() -> resultHandler.handleResult())
|
.onAction(() -> resultHandler.handleResult())
|
||||||
.closeButtonText(Res.get("shared.cancel"))
|
.closeButtonText(Res.get("shared.cancel"))
|
||||||
|
.onClose(() -> cancelHandler.handleResult())
|
||||||
.show();
|
.show();
|
||||||
} else {
|
} else {
|
||||||
// No payout will be made
|
// No payout will be made
|
||||||
|
@ -649,6 +654,7 @@ public class DisputeSummaryWindow extends Overlay<DisputeSummaryWindow> {
|
||||||
.actionButtonText(Res.get("shared.yes"))
|
.actionButtonText(Res.get("shared.yes"))
|
||||||
.onAction(resultHandler::handleResult)
|
.onAction(resultHandler::handleResult)
|
||||||
.closeButtonText(Res.get("shared.cancel"))
|
.closeButtonText(Res.get("shared.cancel"))
|
||||||
|
.onClose(() -> cancelHandler.handleResult())
|
||||||
.show();
|
.show();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue