<p><span class="issue-keyword tooltipped tooltipped-se" aria-label="This pull request closes issue #4162.">Fixes</span> <a class="issue-link js-issue-link" data-error-text="Failed to load title" data-id="598442143" data-permission-text="Title is private" data-url="https://github.com/bisq-network/bisq/issues/4162" data-hovercard-type="issue" data-hovercard-url="/bisq-network/bisq/issues/4162/hovercard" href="https://github.com/bisq-network/bisq/issues/4162">#4162</a></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/4493'>https://github.com/bisq-network/bisq/pull/4493</a></p>

<h4>Commit Summary</h4>
<ul>
  <li>Deactivate confirm payment or payment received buttons once a dispute</li>
  <li>Rename method</li>
  <li>Add comment to empty method</li>
  <li>Add check if trade have been dispute to protocol classes</li>
  <li>Merge branch 'master_upstream' into deactive-confirm-buttons-once-mediation-started</li>
</ul>

<h4>File Changes</h4>
<ul>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4493/files#diff-3c1262edb5d4639e1b49dacef5776399">core/src/main/java/bisq/core/trade/protocol/BuyerAsMakerProtocol.java</a>
    (4)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4493/files#diff-fbdf903423fadf3e8d7b37a65a0267b5">core/src/main/java/bisq/core/trade/protocol/BuyerAsTakerProtocol.java</a>
    (4)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4493/files#diff-1c8b52329d4695d9437a4ea8a8fdfa07">core/src/main/java/bisq/core/trade/protocol/SellerAsMakerProtocol.java</a>
    (4)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4493/files#diff-5b8047903694e7f49f6eb5cb56c11ef9">core/src/main/java/bisq/core/trade/protocol/SellerAsTakerProtocol.java</a>
    (4)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4493/files#diff-7532dfd334eae58bd0b161ff73fb9cab">core/src/main/java/bisq/core/trade/protocol/TradeProtocol.java</a>
    (10)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4493/files#diff-62811e6004bb38ee1ee37843f31cc035">desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesDataModel.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4493/files#diff-8143d46c5a2fc15da135465947a688b8">desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/TradeStepView.java</a>
    (17)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4493/files#diff-e770e5c915ec3d9ac99a437272e29166">desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep2View.java</a>
    (8)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/4493/files#diff-2f65aa638ecad786658409b47ae03ca1">desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/seller/SellerStep3View.java</a>
    (4)
  </li>
</ul>

<h4>Patch Links:</h4>
<ul>
  <li><a href='https://github.com/bisq-network/bisq/pull/4493.patch'>https://github.com/bisq-network/bisq/pull/4493.patch</a></li>
  <li><a href='https://github.com/bisq-network/bisq/pull/4493.diff'>https://github.com/bisq-network/bisq/pull/4493.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/4493">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AJFFTNWUPDTREYMMUEMNIOLSERM4ZANCNFSM4Q5MVLPA">unsubscribe</a>.<img src="https://github.com/notifications/beacon/AJFFTNWV22GLHTGDNMLEJXLSERM4ZA5CNFSM4Q5MVLPKYY3PNVWWK3TUL52HS4DFUVEXG43VMWVGG33NNVSW45C7NFSM4KLIBWMQ.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/4493",
"url": "https://github.com/bisq-network/bisq/pull/4493",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>