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

check trades, disputes, and offers and add prompt on shut down

Browse source 
Co-authored-by: jmacxx <47253594+jmacxx@users.noreply.github.com>
This commit is contained in:
woodser 2023-08-14 08:19:03 -04:00
parent 3b89212c6f
commit cb7d9364e5
14 changed files with 155 additions and 217 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -125,8 +125,6 @@ public class ContractWindow extends Overlay<ContractWindow> {
boolean showAcceptedCountryCodes = acceptedCountryCodes != null && !acceptedCountryCodes.isEmpty();
int rows = 18;
if (dispute.getDepositTxSerialized() != null)
rows++;
if (dispute.getPayoutTxSerialized() != null)
rows++;
if (dispute.getDelayedPayoutTxId() != null)

4
desktop/src/main/java/haveno/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java
View file

@ -473,9 +473,7 @@ public class PendingTradesDataModel extends ActivatableDataModel {
// trade.getMaxTradePeriodDate().getTime(),
// trade.getContract(),
// trade.getContractHash(),
// depositTxSerialized,
// payoutTxSerialized,
// depositTxHashAsString,
// payoutTxHashAsString,
// trade.getContractAsJson(),
// trade.getMakerContractSignature(),
@ -503,9 +501,7 @@ public class PendingTradesDataModel extends ActivatableDataModel {
trade.getMaxTradePeriodDate().getTime(),
trade.getContract(),
trade.getContractHash(),
depositTxSerialized,
payoutTxSerialized,
depositTxId,
payoutTxHashAsString,
trade.getContractAsJson(),
trade.getMaker().getContractSignature(),

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

@ -440,9 +440,6 @@ public abstract class DisputeView extends ActivatableView<VBox, Void> {
return FilterResult.SELLER_ACCOUNT_DETAILS;
}
if (dispute.getDepositTxId() != null && dispute.getDepositTxId().contains(filter)) {
return FilterResult.DEPOSIT_TX;
}
if (dispute.getPayoutTxId() != null && dispute.getPayoutTxId().contains(filter)) {
return FilterResult.PAYOUT_TX;
}