<p><b>@devinbileck</b> approved this pull request.</p>

<p>ACK<br>
Tested with no change output (2 BSQ available), and below minimum dust output (<7.46 BSQ available).</p><hr>

<p>In <a href="https://github.com/bisq-network/bisq/pull/2614#discussion_r271152180">core/src/main/java/bisq/core/btc/wallet/BsqWalletService.java</a>:</p>
<pre style='color:#555'>> @@ -550,10 +554,19 @@ private void addInputsAndChangeOutputForTx(Transaction tx, Coin fee, BsqCoinSele
         try {
             // TODO why is fee passed to getChange ???
             Coin change = bsqCoinSelector.getChange(fee, coinSelection);
+            if (requireChangeOutput) {
+                checkArgument(change.isPositive(),
+                        "This transaction requires a mandatory BSQ change output. " +
+                                "You are missing " + Restrictions.getMinNonDustOutput().value / 100d +
+                                " BSQ for a non dust change output.");
</pre>
<p>I guess all these checkArgument messages should eventually be translated.</p>

<hr>

<p>In <a href="https://github.com/bisq-network/bisq/pull/2614#discussion_r271162281">core/src/main/java/bisq/core/btc/wallet/BsqWalletService.java</a>:</p>
<pre style='color:#555'>> @@ -550,10 +554,19 @@ private void addInputsAndChangeOutputForTx(Transaction tx, Coin fee, BsqCoinSele
         try {
             // TODO why is fee passed to getChange ???
             Coin change = bsqCoinSelector.getChange(fee, coinSelection);
+            if (requireChangeOutput) {
+                checkArgument(change.isPositive(),
+                        "This transaction requires a mandatory BSQ change output. " +
+                                "You are missing " + Restrictions.getMinNonDustOutput().value / 100d +
+                                " BSQ for a non dust change output.");
</pre>
<p>And perhaps we should look into stripping the exception type when showing the popup to the user.<br>
<a target="_blank" rel="noopener noreferrer" href="https://user-images.githubusercontent.com/603793/55383495-2febd100-54dd-11e9-948a-c2ddfa5806bf.png"><img src="https://user-images.githubusercontent.com/603793/55383495-2febd100-54dd-11e9-948a-c2ddfa5806bf.png" alt="image" style="max-width:100%;"></a></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/2614#pullrequestreview-221472038">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AkpZtlYU-hYcdpYJyAEGHHypf1UEPXYeks5vcwYDgaJpZM4cXAte">mute the thread</a>.<img src="https://github.com/notifications/beacon/AkpZtn8PVVw2FmC8yVvfUzl0BWvrpZcWks5vcwYDgaJpZM4cXAte.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":"PERSON","message":"@devinbileck approved #2614"}],"action":{"name":"View Pull Request","url":"https://github.com/bisq-network/bisq/pull/2614#pullrequestreview-221472038"}}}</script>
<script type="application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/bisq-network/bisq/pull/2614#pullrequestreview-221472038",
"url": "https://github.com/bisq-network/bisq/pull/2614#pullrequestreview-221472038",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>