Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2024-12-25 07:19:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

show either dispute payout tx id or normal payout tx id

Browse Source
This commit is contained in:
woodser 2024-12-16 09:34:12 -05:00
parent 9ec2794931
commit 140961d885
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
desktop/src/main/java/haveno/desktop/main/overlays/windows/TradeDetailsWindow.java
View File

@ -183,12 +183,12 @@ public class TradeDetailsWindow extends Overlay<TradeDetailsWindow> {
rows++; rows++;
} }
if (trade.getPayoutTxId() != null)
rows++;
boolean showDisputedTx = arbitrationManager.findOwnDispute(trade.getId()).isPresent() && boolean showDisputedTx = arbitrationManager.findOwnDispute(trade.getId()).isPresent() &&
arbitrationManager.findOwnDispute(trade.getId()).get().getDisputePayoutTxId() != null; arbitrationManager.findOwnDispute(trade.getId()).get().getDisputePayoutTxId() != null;
if (showDisputedTx) if (showDisputedTx)
rows++; rows++;
else if (trade.getPayoutTxId() != null)
rows++;
if (trade.hasFailed()) if (trade.hasFailed())
rows += 2; rows += 2;
if (trade.getTradePeerNodeAddress() != null) if (trade.getTradePeerNodeAddress() != null)
@ -244,16 +244,18 @@ public class TradeDetailsWindow extends Overlay<TradeDetailsWindow> {
if (trade.getMaker().getDepositTxHash() != null) if (trade.getMaker().getDepositTxHash() != null)
addLabelTxIdTextField(gridPane, ++rowIndex, Res.get("shared.makerDepositTransactionId"), addLabelTxIdTextField(gridPane, ++rowIndex, Res.get("shared.makerDepositTransactionId"),
trade.getMaker().getDepositTxHash()); trade.getMaker().getDepositTxHash());
if (trade.getTaker().getDepositTxHash() != null) if (trade.getTaker().getDepositTxHash() != null)
addLabelTxIdTextField(gridPane, ++rowIndex, Res.get("shared.takerDepositTransactionId"), addLabelTxIdTextField(gridPane, ++rowIndex, Res.get("shared.takerDepositTransactionId"),
trade.getTaker().getDepositTxHash()); trade.getTaker().getDepositTxHash());
if (trade.getPayoutTxId() != null && !trade.getPayoutTxId().isBlank())
addLabelTxIdTextField(gridPane, ++rowIndex, Res.get("shared.payoutTxId"), if (showDisputedTx) {
trade.getPayoutTxId());
if (showDisputedTx)
addLabelTxIdTextField(gridPane, ++rowIndex, Res.get("tradeDetailsWindow.disputedPayoutTxId"), addLabelTxIdTextField(gridPane, ++rowIndex, Res.get("tradeDetailsWindow.disputedPayoutTxId"),
arbitrationManager.findOwnDispute(trade.getId()).get().getDisputePayoutTxId()); arbitrationManager.findOwnDispute(trade.getId()).get().getDisputePayoutTxId());
} else if (trade.getPayoutTxId() != null && !trade.getPayoutTxId().isBlank()) {
addLabelTxIdTextField(gridPane, ++rowIndex, Res.get("shared.payoutTxId"),
trade.getPayoutTxId());
}
if (trade.hasFailed()) { if (trade.hasFailed()) {
textArea = addConfirmationLabelTextArea(gridPane, ++rowIndex, Res.get("shared.errorMessage"), "", 0).second; textArea = addConfirmationLabelTextArea(gridPane, ++rowIndex, Res.get("shared.errorMessage"), "", 0).second;