<p>Ok. I've rebased this branch with master now to see how it looks. In my opinion, this is much easier to review than the wall of merges before and it will have a clean history once it is goes through the merge-commit path. The downside is the prior files are gone that the code review comments referenced, but the comments are still visible so the reviewers can verify the changes were actually implemented.</p>
<p>Let me know what you think and if this is a good path moving forward.</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/3556?email_source=notifications&email_token=AJFFTNT7YQC7WM4WYBWIFPTQTCURZA5CNFSM4JIYAKSKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEDVL3CI#issuecomment-552254857">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNUP42YV2AY7SUILZRDQTCURZANCNFSM4JIYAKSA">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AJFFTNTYWFZFD2CNNOWZM23QTCURZA5CNFSM4JIYAKSKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEDVL3CI.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/3556?email_source=notifications\u0026email_token=AJFFTNT7YQC7WM4WYBWIFPTQTCURZA5CNFSM4JIYAKSKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEDVL3CI#issuecomment-552254857",
"url": "https://github.com/bisq-network/bisq/pull/3556?email_source=notifications\u0026email_token=AJFFTNT7YQC7WM4WYBWIFPTQTCURZA5CNFSM4JIYAKSKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGOEDVL3CI#issuecomment-552254857",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>