<p><b>@sqrrm</b> commented on this pull request.</p>

<hr>

<p>In <a href="https://github.com/bisq-network/bisq/pull/3566#discussion_r343176171">core/src/main/java/bisq/core/trade/TradeManager.java</a>:</p>
<pre style='color:#555'>> -                    log.warn("We found a closed trade with locked up funds. " +
-                            "That should never happen. trade ID=" + e.getId());
-                    return e.getId();
+        tradesIdSet.addAll(closedTradableManager.getTradesStreamWithFundsLockedIn()
+                .map(trade -> {
+                    Transaction depositTx = trade.getDepositTx();
+                    if (depositTx != null) {
+                        TransactionConfidence confidence = btcWalletService.getConfidenceForTxId(depositTx.getHashAsString());
+                        if (confidence != null && confidence.getConfidenceType() != TransactionConfidence.ConfidenceType.BUILDING) {
+                            tradeTxException.set(new TradeTxException(Res.get("error.closedTradeWithUnconfirmedDepositTx", trade.getShortId())));
+                        } else {
+                            log.warn("We found a closed trade with locked up funds. " +
+                                    "That should never happen. trade ID=" + trade.getId());
+                        }
+                    } else {
+                        tradeTxException.set(new TradeTxException(Res.get("error.closedTradeWithNoDepositTx", trade.getShortId())));
</pre>
<p>Looks like it will work due to how the result of <code>getSetOfFailedOrClosedTradeIdsFromLockedInFunds</code> is used, but perhaps the function name is a bit misguiding since there is no locked in fund. Could return <code>null</code> there and filter out nulls before collect().</p>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/bisq-network/bisq/pull/3566?email_source=notifications&email_token=AJFFTNRRUWUXOTAXF7FPKJLQSLSJNA5CNFSM4JJPDRB2YY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOCKQQMBA#discussion_r343176171">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNQQA5GJIUUPS4XMRELQSLSJNANCNFSM4JJPDRBQ">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AJFFTNSAKN6BMV65UM2JLR3QSLSJNA5CNFSM4JJPDRB2YY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOCKQQMBA.gif" height="1" width="1" alt="" /></p>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/bisq-network/bisq/pull/3566?email_source=notifications\u0026email_token=AJFFTNRRUWUXOTAXF7FPKJLQSLSJNA5CNFSM4JJPDRB2YY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOCKQQMBA#discussion_r343176171",
"url": "https://github.com/bisq-network/bisq/pull/3566?email_source=notifications\u0026email_token=AJFFTNRRUWUXOTAXF7FPKJLQSLSJNA5CNFSM4JJPDRB2YY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOCKQQMBA#discussion_r343176171",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>