<p></p>
<p>I just tried merging with master and there are some slightly nontrivial conflicts in <code>CoreWalletsService</code> and a few other places. As the draft changes haven't been touched for a while, I'll try rebasing onto master as it stood a few weeks ago, which should address all the conflicts I saw. (That way it will be easier to cherry pick into the 1.6.3 release if there's time.)</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/5109#issuecomment-827432835">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNTOWA2F4CWWMGVG4S3TKZ2UTANCNFSM4WP4XQZQ">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AJFFTNVQXY2L2HAFHFEEJB3TKZ2UTA5CNFSM4WP4XQZ2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOGFIZ7AY.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/5109#issuecomment-827432835",
"url": "https://github.com/bisq-network/bisq/pull/5109#issuecomment-827432835",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>