<blockquote>
<p>So only a merge conflict resolution with WalletsSetup.java is missing to make this PR mergeable again.</p>
</blockquote>
<p>Right, I've fixed that locally, and just talked with <a class="user-mention" data-hovercard-type="user" data-hovercard-url="/users/ripcurlx/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/ripcurlx">@ripcurlx</a> about how we want to actually go ahead with the merge. No need to go into detail about it here, but anyone else who would like to review this PR, please do, thanks.</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/3889?email_source=notifications&email_token=AJFFTNU75PO7LDMP7E63KVTQ6IFI3A5CNFSM4KFNLJBKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEJI2AMA#issuecomment-575774768">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNXKCEYV6QBH7NGZZ53Q6IFI3ANCNFSM4KFNLJBA">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AJFFTNS4JNOUGTCILLIPR33Q6IFI3A5CNFSM4KFNLJBKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEJI2AMA.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/3889?email_source=notifications\u0026email_token=AJFFTNU75PO7LDMP7E63KVTQ6IFI3A5CNFSM4KFNLJBKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEJI2AMA#issuecomment-575774768",
"url": "https://github.com/bisq-network/bisq/pull/3889?email_source=notifications\u0026email_token=AJFFTNU75PO7LDMP7E63KVTQ6IFI3A5CNFSM4KFNLJBKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEJI2AMA#issuecomment-575774768",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>