<p>There have been several changes in the voting branch (and api-integration) which I want to get into master to avoid that those branches run out of sync as well as to apply the improvements.<br>
The main changes are:</p>
<ul>
<li>The handling of persisted data in the p2p library (<a class="issue-link js-issue-link" data-error-text="Failed to load issue title" data-id="318480043" data-permission-text="Issue title is private" data-url="https://github.com/bisq-network/bisq-p2p/issues/8" href="https://github.com/bisq-network/bisq-p2p/issues/8">bisq-network/bisq-p2p#8</a>)</li>
<li>Improvements of the app setup to support API projects in headless mode as well as in mixed mode</li>
<li>Use custom TxBroadcaster class for better error handling</li>
</ul>
<p>Beside that there are many smaller trivial improvements, fixes, refactoring and cleanups.</p>
<p>Changes in that project:</p>
<ul>
<li>Add onUiReadyHandler to BisqApp and MainView</li>
<li>Add startApplication and onApplicationStarted to BisqAppMain</li>
<li>Improve MenuItem component</li>
<li>Use TxBroadcaster.Callback() instead of FutureCallback()</li>
<li>Apply startup changes to MainViewModel</li>
<li>Apply changes of data storage</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-desktop/pull/1601'>https://github.com/bisq-network/bisq-desktop/pull/1601</a></p>

<h4>Commit Summary</h4>
<ul>
  <li>Sync up with changes vrom voting branch</li>
</ul>

<h4>File Changes</h4>
<ul>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-0">src/main/java/bisq/desktop/app/BisqApp.java</a>
    (3)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-1">src/main/java/bisq/desktop/app/BisqAppMain.java</a>
    (10)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-2">src/main/java/bisq/desktop/app/BisqAppModule.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-3">src/main/java/bisq/desktop/components/MenuItem.java</a>
    (28)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-4">src/main/java/bisq/desktop/components/paymentmethods/MoneyGramForm.java</a>
    (4)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-5">src/main/java/bisq/desktop/main/MainView.java</a>
    (5)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-6">src/main/java/bisq/desktop/main/MainViewModel.java</a>
    (172)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-7">src/main/java/bisq/desktop/main/dao/DaoView.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-8">src/main/java/bisq/desktop/main/dao/proposal/ProposalView.java</a>
    (17)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-9">src/main/java/bisq/desktop/main/dao/wallet/send/BsqSendView.java</a>
    (11)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-10">src/main/java/bisq/desktop/main/funds/withdrawal/WithdrawalView.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-11">src/main/java/bisq/desktop/main/market/MarketView.java</a>
    (7)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-12">src/main/java/bisq/desktop/main/offer/MutableOfferDataModel.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-13">src/main/java/bisq/desktop/main/offer/MutableOfferView.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-14">src/main/java/bisq/desktop/main/offer/offerbook/OfferBookViewModel.java</a>
    (7)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-15">src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-16">src/main/java/bisq/desktop/main/overlays/windows/ManualPayoutTxWindow.java</a>
    (15)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-17">src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferDataModel.java</a>
    (1)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-18">src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersView.java</a>
    (6)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-19">src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesViewModel.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-20">src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep4View.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-21">src/main/java/bisq/desktop/setup/DesktopPersistedDataHost.java</a>
    (2)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-22">src/main/java/bisq/desktop/util/GUIUtil.java</a>
    (19)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-23">src/main/java/bisq/desktop/util/validation/BsqValidator.java</a>
    (2)
  </li>
  <li>
    <strong>D</strong>
    <a href="https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-24">src/main/java/bisq/desktop/util/validation/BtcAddressValidator.java</a>
    (53)
  </li>
</ul>

<h4>Patch Links:</h4>
<ul>
  <li><a href='https://github.com/bisq-network/bisq-desktop/pull/1601.patch'>https://github.com/bisq-network/bisq-desktop/pull/1601.patch</a></li>
  <li><a href='https://github.com/bisq-network/bisq-desktop/pull/1601.diff'>https://github.com/bisq-network/bisq-desktop/pull/1601.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-desktop/pull/1601">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AkpZtrho8Fz9ZEe9yGAUiYu84SoWofFpks5uEfMAgaJpZM4VGsof">mute the thread</a>.<img src="https://github.com/notifications/beacon/AkpZtuepsF0LKLRTToucMASjW-_eiLnoks5uEfMAgaJpZM4VGsof.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-desktop","title":"bisq-network/bisq-desktop","subtitle":"GitHub repository","main_image_url":"https://assets-cdn.github.com/images/email/message_cards/header.png","avatar_image_url":"https://assets-cdn.github.com/images/email/message_cards/avatar.png","action":{"name":"Open in GitHub","url":"https://github.com/bisq-network/bisq-desktop"}},"updates":{"snippets":[{"icon":"DESCRIPTION","message":"Sync up with changes from voting branch (#1601)"}],"action":{"name":"View Pull Request","url":"https://github.com/bisq-network/bisq-desktop/pull/1601"}}}</script>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/bisq-network/bisq-desktop/pull/1601",
"url": "https://github.com/bisq-network/bisq-desktop/pull/1601",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
},
{
"@type": "MessageCard",
"@context": "http://schema.org/extensions",
"hideOriginalBody": "false",
"originator": "AF6C5A86-E920-430C-9C59-A73278B5EFEB",
"title": "Sync up with changes from voting branch (#1601)",
"sections": [
{
"text": "",
"activityTitle": "**Manfred Karrer**",
"activityImage": "https://assets-cdn.github.com/images/email/message_cards/avatar.png",
"activitySubtitle": "@ManfredKarrer",
"facts": [

]
},
{
"title": "Commit Summary",
"facts": [
{
"name": "20414bc",
"value": "Sync up with changes vrom voting branch"
}
]
},
{
"title": "File Changes",
"facts": [
{
"name": "Modified",
"value": "[src/main/java/bisq/desktop/app/BisqApp.java](https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-0) (3 changes)"
},
{
"name": "Modified",
"value": "[src/main/java/bisq/desktop/app/BisqAppMain.java](https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-1) (10 changes)"
},
{
"name": "Modified",
"value": "[src/main/java/bisq/desktop/app/BisqAppModule.java](https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-2) (2 changes)"
},
{
"name": "Modified",
"value": "[src/main/java/bisq/desktop/components/MenuItem.java](https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-3) (28 changes)"
},
{
"name": "Modified",
"value": "[src/main/java/bisq/desktop/components/paymentmethods/MoneyGramForm.java](https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-4) (4 changes)"
},
{
"name": "Modified",
"value": "[src/main/java/bisq/desktop/main/MainView.java](https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-5) (5 changes)"
},
{
"name": "Modified",
"value": "[src/main/java/bisq/desktop/main/MainViewModel.java](https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-6) (172 changes)"
},
{
"name": "Modified",
"value": "[src/main/java/bisq/desktop/main/dao/DaoView.java](https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-7) (2 changes)"
},
{
"name": "Modified",
"value": "[src/main/java/bisq/desktop/main/dao/proposal/ProposalView.java](https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-8) (17 changes)"
},
{
"name": "Modified",
"value": "[src/main/java/bisq/desktop/main/dao/wallet/send/BsqSendView.java](https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-9) (11 changes)"
},
{
"name": "Modified",
"value": "[src/main/java/bisq/desktop/main/funds/withdrawal/WithdrawalView.java](https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-10) (2 changes)"
},
{
"name": "Modified",
"value": "[src/main/java/bisq/desktop/main/market/MarketView.java](https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-11) (7 changes)"
},
{
"name": "Modified",
"value": "[src/main/java/bisq/desktop/main/offer/MutableOfferDataModel.java](https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-12) (2 changes)"
},
{
"name": "Modified",
"value": "[src/main/java/bisq/desktop/main/offer/MutableOfferView.java](https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-13) (2 changes)"
},
{
"name": "Modified",
"value": "[src/main/java/bisq/desktop/main/offer/offerbook/OfferBookViewModel.java](https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-14) (7 changes)"
},
{
"name": "Modified",
"value": "[src/main/java/bisq/desktop/main/offer/takeoffer/TakeOfferView.java](https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-15) (2 changes)"
},
{
"name": "Modified",
"value": "[src/main/java/bisq/desktop/main/overlays/windows/ManualPayoutTxWindow.java](https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-16) (15 changes)"
},
{
"name": "Modified",
"value": "[src/main/java/bisq/desktop/main/portfolio/editoffer/EditOfferDataModel.java](https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-17) (1 changes)"
},
{
"name": "Modified",
"value": "[src/main/java/bisq/desktop/main/portfolio/openoffer/OpenOffersView.java](https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-18) (6 changes)"
},
{
"name": "Modified",
"value": "[src/main/java/bisq/desktop/main/portfolio/pendingtrades/PendingTradesViewModel.java](https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-19) (2 changes)"
},
{
"name": "Modified",
"value": "[src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/buyer/BuyerStep4View.java](https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-20) (2 changes)"
},
{
"name": "Modified",
"value": "[src/main/java/bisq/desktop/setup/DesktopPersistedDataHost.java](https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-21) (2 changes)"
},
{
"name": "Modified",
"value": "[src/main/java/bisq/desktop/util/GUIUtil.java](https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-22) (19 changes)"
},
{
"name": "Modified",
"value": "[src/main/java/bisq/desktop/util/validation/BsqValidator.java](https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-23) (2 changes)"
},
{
"name": "Removed",
"value": "[src/main/java/bisq/desktop/util/validation/BtcAddressValidator.java](https://github.com/bisq-network/bisq-desktop/pull/1601/files#diff-24) (53 changes)"
}
]
}
],
"potentialAction": [
{
"name": "Add a comment",
"@type": "ActionCard",
"inputs": [
{
"isMultiLine": true,
"@type": "TextInput",
"id": "IssueComment",
"isRequired": false
}
],
"actions": [
{
"name": "Comment",
"@type": "HttpPOST",
"target": "https://api.github.com",
"body": "{\n\"commandName\": \"IssueComment\",\n\"repositoryFullName\": \"bisq-network/bisq-desktop\",\n\"issueId\": 1601,\n\"IssueComment\": \"{{IssueComment.value}}\"\n}"
}
]
},
{
"name": "Close pull request",
"@type": "HttpPOST",
"target": "https://api.github.com",
"body": "{\n\"commandName\": \"PullRequestClose\",\n\"repositoryFullName\": \"bisq-network/bisq-desktop\",\n\"pullRequestId\": 1601\n}"
},
{
"targets": [
{
"os": "default",
"uri": "https://github.com/bisq-network/bisq-desktop/pull/1601"
}
],
"@type": "OpenUri",
"name": "View on GitHub"
},
{
"targets": [
{
"os": "default",
"uri": "https://github.com/bisq-network/bisq-desktop/pull/1601.patch"
}
],
"@type": "OpenUri",
"name": "View patch"
},
{
"targets": [
{
"os": "default",
"uri": "https://github.com/bisq-network/bisq-desktop/pull/1601.diff"
}
],
"@type": "OpenUri",
"name": "View diff"
},
{
"name": "Unsubscribe",
"@type": "HttpPOST",
"target": "https://api.github.com",
"body": "{\n\"commandName\": \"MuteNotification\",\n\"threadId\": 354077215\n}"
}
],
"themeColor": "26292E"
}
]</script>