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

<hr>

<p>In <a href="https://github.com/bisq-network/bisq/pull/3566#discussion_r343159300">core/src/main/java/bisq/core/btc/wallet/BtcWalletService.java</a>:</p>
<pre style='color:#555'>> @@ -672,7 +672,13 @@ public void resetAddressEntriesForOpenOffer(String offerId) {
 
     public void resetAddressEntriesForPendingTrade(String offerId) {
         swapTradeEntryToAvailableEntry(offerId, AddressEntry.Context.MULTI_SIG);
-        // Don't swap TRADE_PAYOUT as it might be still open in the last trade step to be used for external transfer
+        // We swap also TRADE_PAYOUT to be sure all is cleaned  up. There might be cases where a user cannot send the funds
+        // to an external wallet directly in the last step of the trade, but the funds are in the Bisq wallet anyway and
+        // the dealing with the external wallet is pure UI thing. The user can move the funds to the wallet and then
+        // send out the funds to the external wallet. As this cleanup is a rare situation and most users do not use
+        // the feature to send out the funds we prefer that strategy (if we keep the address entry it might cause
+        // complications in some edge cases after a SPV resync).
+        swapTradeEntryToAvailableEntry(offerId, AddressEntry.Context.TRADE_PAYOUT);
</pre>
<p>I think it was never used in that use case (failed trade), so its a fresh address.</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=AJFFTNR2PIUQJKGJZWL4VJTQSLPCDA5CNFSM4JJPDRB2YY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOCKQKWVQ#discussion_r343159300">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNTVX2GWBKPU3PSNAODQSLPCDANCNFSM4JJPDRBQ">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AJFFTNTXU7CBAHAJ5LHXWD3QSLPCDA5CNFSM4JJPDRB2YY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOCKQKWVQ.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=AJFFTNR2PIUQJKGJZWL4VJTQSLPCDA5CNFSM4JJPDRB2YY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOCKQKWVQ#discussion_r343159300",
"url": "https://github.com/bisq-network/bisq/pull/3566?email_source=notifications\u0026email_token=AJFFTNR2PIUQJKGJZWL4VJTQSLPCDA5CNFSM4JJPDRB2YY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOCKQKWVQ#discussion_r343159300",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>