diff --git a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java b/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java index cf5d4f68a2..4a3a8d392e 100644 --- a/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java +++ b/desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java @@ -495,7 +495,8 @@ public class PendingTradesDataModel extends ActivatableDataModel { } Trade.DisputeState disputeState = trade.getDisputeState(); DisputeManager> disputeManager; - long remainingLockTime = trade.getDelayedPayoutTx().getLockTime() - btcWalletService.getBestChainHeight(); + long lockTime = trade.getDelayedPayoutTx() == null ? trade.getLockTime() : trade.getDelayedPayoutTx().getLockTime(); + long remainingLockTime = lockTime - btcWalletService.getBestChainHeight(); // In case we re-open a dispute we allow Trade.DisputeState.MEDIATION_REQUESTED boolean useMediation = disputeState == Trade.DisputeState.NO_DISPUTE || (disputeState == Trade.DisputeState.MEDIATION_REQUESTED && remainingLockTime > 0);