<p>See <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="584749883" data-permission-text="Title is private" data-url="https://github.com/bisq-network/bisq/issues/4078" data-hovercard-type="pull_request" data-hovercard-url="/bisq-network/bisq/pull/4078/hovercard" href="https://github.com/bisq-network/bisq/pull/4078">#4078</a> for details.</p>
<p>I had to create my own branch as I wasn't able to push to the PR and I had to cherry-pick the original commit as it wasn't signed by <a class="user-mention" data-hovercard-type="user" data-hovercard-url="/users/mercurytoxic/hovercard" data-octo-click="hovercard-link-click" data-octo-dimensions="link_type:self" href="https://github.com/mercurytoxic">@mercurytoxic</a>.</p>
<p>Tested it on Regtest and works still with the old test trade on Mainnet.</p>

<hr>

<h4>You can view, comment on, or merge this pull request online at:</h4>
<p>  <a href='https://github.com/bisq-network/bisq/pull/4743'>https://github.com/bisq-network/bisq/pull/4743</a></p>

<h4>Commit Summary</h4>
<ul>
  <li>Resolve conflicts with master</li>
  <li>Clean up code</li>
</ul>

<h4>File Changes</h4>
<ul>
  <li>
    <strong>A</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4743/files#diff-0091ca4468a17809cd84c51416cf79face8fc15aab915f058ef19d69bd1d0972">core/src/main/java/bisq/core/payment/AustraliaPayid.java</a>
    (53)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4743/files#diff-11507f8864c1ddf3d166bb552b66dc80532ae543d294f2e12c98ab21278e922c">core/src/main/java/bisq/core/payment/PaymentAccountFactory.java</a>
    (2)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4743/files#diff-8ed874633e5417cc6162bc255f6c2a0188eb1b1bd32ab002b29a9a24f53c8b71">core/src/main/java/bisq/core/payment/payload/AustraliaPayidPayload.java</a>
    (113)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4743/files#diff-4dcea846295ebb8de4e9633b0440ee222f5535c12fb168576b11e674e04ce60f">core/src/main/java/bisq/core/payment/payload/PaymentMethod.java</a>
    (5)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4743/files#diff-ebf0517b78fd6fd90d4a92f2b50757fe17da8d8c7d185ea9836c7b22ffba1989">core/src/main/java/bisq/core/proto/CoreProtoResolver.java</a>
    (3)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4743/files#diff-a6cc570e0f56a36136791beae8f497706216230467708be9343344cd953e5f08">core/src/main/resources/i18n/displayStrings.properties</a>
    (8)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4743/files#diff-ec699dee45387ca79679c5c6e170e7c347a5c9a48b336445fd55b77f51fa57e7">desktop/src/main/java/bisq/desktop/components/paymentmethods/AustraliaPayidForm.java</a>
    (122)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4743/files#diff-c5abb5ef938520e00047e774840a1990b4210c048e3f3fdf7478edca3935c0cb">desktop/src/main/java/bisq/desktop/main/account/content/fiataccounts/FiatAccountsView.java</a>
    (15)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4743/files#diff-9fa19cd611071e992ea92f87baf8893ba23459733a403bedf85254dc16247745">desktop/src/main/java/bisq/desktop/util/validation/AustraliaPayidAccountNameValidator.java</a>
    (51)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4743/files#diff-ed49e1fa19567289300186cad8770fb610257caa0abb73884f8e2128b94308c3">desktop/src/main/java/bisq/desktop/util/validation/AustraliaPayidValidator.java</a>
    (56)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4743/files#diff-51dcd1d852312df65738ff2bd493fdb0f187f50fb7d7324158c8b57fc1de7da7">proto/src/main/proto/pb.proto</a>
    (6)
  </li>
</ul>

<h4>Patch Links:</h4>
<ul>
  <li><a href='https://github.com/bisq-network/bisq/pull/4743.patch'>https://github.com/bisq-network/bisq/pull/4743.patch</a></li>
  <li><a href='https://github.com/bisq-network/bisq/pull/4743.diff'>https://github.com/bisq-network/bisq/pull/4743.diff</a></li>
</ul>

<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/4743">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNSWBWY75FIHLO42QJ3SOAJRNANCNFSM4TI2WDOA">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AJFFTNQPF2CKM6TZL3LVRN3SOAJRNA5CNFSM4TI2WDOKYY3PNVWWK3TUL52HS4DFUVEXG43VMWVGG33NNVSW45C7NFSM4K6U73RA.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/4743",
"url": "https://github.com/bisq-network/bisq/pull/4743",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>