Improve error message

See #2620 #2614 (comment)
bisq-network · Apr 3, 2019 · 8d22d7b · 8d22d7b
1 parent 7f2e406
commit 8d22d7b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/core/src/main/java/bisq/core/btc/wallet/BsqWalletService.java b/core/src/main/java/bisq/core/btc/wallet/BsqWalletService.java
@@ -557,16 +557,16 @@ private void addInputsAndChangeOutputForTx(Transaction tx, Coin fee, BsqCoinSele
             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.");
+                                "At least " + Restrictions.getMinNonDustOutput().add(fee) + " " +
+                                "BSQ is needed for this transaction");
             }
 
             if (change.isPositive()) {
                 checkArgument(Restrictions.isAboveDust(change),
                         "The change output of " + change.value / 100d + " BSQ is below the min. dust value of "
                                 + Restrictions.getMinNonDustOutput().value / 100d +
-                                " BSQ. You are missing " + (Restrictions.getMinNonDustOutput().value - change.value) / 100d +
-                                " BSQ for a non dust change output.");
+                                ". At least " + Restrictions.getMinNonDustOutput().add(fee) + " " +
+                                "BSQ is needed for this transaction");
                 tx.addOutput(change, getChangeAddress());
             }
         } catch (InsufficientMoneyException e) {

diff --git a/desktop/src/main/java/bisq/desktop/main/dao/governance/make/MakeProposalView.java b/desktop/src/main/java/bisq/desktop/main/dao/governance/make/MakeProposalView.java
@@ -321,6 +321,10 @@ private void publishMyProposal(ProposalType type) {
                 message = e.getMessage();
             }
             new Popup<>().warning(message).show();
+        } catch (IllegalArgumentException e) {
+            log.error(e.toString());
+            e.printStackTrace();
+            new Popup<>().warning(e.getMessage()).show();
         } catch (Throwable e) {
             log.error(e.toString());
             e.printStackTrace();