<ul>
<li>Check if conflicting node is seed node or not. Show info in list entry<br>
and only show resync button and red color in text if conflict is with<br>
seed node.</li>
<li>At resync move all p2p network data to a dedicated directory so they<br>
will be reloaded from the seeds.</li>
</ul>

<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/2674'>https://github.com/bisq-network/bisq/pull/2674</a></p>

<h4>Commit Summary</h4>
<ul>
  <li>Handle dao state conflicts better</li>
</ul>

<h4>File Changes</h4>
<ul>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/2674/files#diff-0">common/src/main/java/bisq/common/storage/FileManager.java</a>
    (11)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/2674/files#diff-1">core/src/main/java/bisq/core/dao/monitoring/BlindVoteStateMonitoringService.java</a>
    (33)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/2674/files#diff-2">core/src/main/java/bisq/core/dao/monitoring/DaoStateMonitoringService.java</a>
    (34)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/2674/files#diff-3">core/src/main/java/bisq/core/dao/monitoring/ProposalStateMonitoringService.java</a>
    (33)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/2674/files#diff-4">core/src/main/resources/i18n/displayStrings.properties</a>
    (18)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/2674/files#diff-5">desktop/src/main/java/bisq/desktop/main/dao/monitor/StateInConflictListItem.java</a>
    (15)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/2674/files#diff-6">desktop/src/main/java/bisq/desktop/main/dao/monitor/StateMonitorView.java</a>
    (72)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/2674/files#diff-7">desktop/src/main/java/bisq/desktop/main/dao/monitor/blindvotes/BlindVoteStateInConflictListItem.java</a>
    (9)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/2674/files#diff-8">desktop/src/main/java/bisq/desktop/main/dao/monitor/blindvotes/BlindVoteStateMonitorView.java</a>
    (40)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/2674/files#diff-9">desktop/src/main/java/bisq/desktop/main/dao/monitor/daostate/DaoStateInConflictListItem.java</a>
    (9)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/2674/files#diff-10">desktop/src/main/java/bisq/desktop/main/dao/monitor/daostate/DaoStateMonitorView.java</a>
    (32)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/2674/files#diff-11">desktop/src/main/java/bisq/desktop/main/dao/monitor/proposals/ProposalStateInConflictListItem.java</a>
    (9)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq/pull/2674/files#diff-12">desktop/src/main/java/bisq/desktop/main/dao/monitor/proposals/ProposalStateMonitorView.java</a>
    (34)
  </li>
</ul>

<h4>Patch Links:</h4>
<ul>
  <li><a href='https://github.com/bisq-network/bisq/pull/2674.patch'>https://github.com/bisq-network/bisq/pull/2674.patch</a></li>
  <li><a href='https://github.com/bisq-network/bisq/pull/2674.diff'>https://github.com/bisq-network/bisq/pull/2674.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/2674">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AkpZtuHBSbzH8quqdMYlnU5eWy9s6lROks5ve7cqgaJpZM4cjKrk">mute the thread</a>.<img src="https://github.com/notifications/beacon/AkpZtqoLTupSaaLcALddx2w0Z2zBZLp1ks5ve7cqgaJpZM4cjKrk.gif" height="1" width="1" alt="" /></p>
<script type="application/json" data-scope="inboxmarkup">{"api_version":"1.0","publisher":{"api_key":"05dde50f1d1a384dd78767c55493e4bb","name":"GitHub"},"entity":{"external_key":"github/bisq-network/bisq","title":"bisq-network/bisq","subtitle":"GitHub repository","main_image_url":"https://github.githubassets.com/images/email/message_cards/header.png","avatar_image_url":"https://github.githubassets.com/images/email/message_cards/avatar.png","action":{"name":"Open in GitHub","url":"https://github.com/bisq-network/bisq"}},"updates":{"snippets":[{"icon":"DESCRIPTION","message":"Handle dao state conflicts better (#2674)"}],"action":{"name":"View Pull Request","url":"https://github.com/bisq-network/bisq/pull/2674"}}}</script>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/bisq-network/bisq/pull/2674",
"url": "https://github.com/bisq-network/bisq/pull/2674",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>