Fix incorrect available balance for voting

- Subtract vote fee from available wallet balance - Add log for errors - Update view in error case
bisq-network · Feb 24, 2019 · e52ac9d · e52ac9d
1 parent fb5c983
commit e52ac9d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/core/src/main/java/bisq/core/dao/governance/blindvote/MyBlindVoteListService.java b/core/src/main/java/bisq/core/dao/governance/blindvote/MyBlindVoteListService.java
@@ -221,6 +221,8 @@ public void publishBlindVote(Coin stake, ResultHandler resultHandler, ExceptionH
             publishTx(resultHandler, exceptionHandler, blindVoteTx);
         } catch (CryptoException | TransactionVerificationException | InsufficientMoneyException |
                 WalletException | IOException exception) {
+            log.error(exception.toString());
+            exception.printStackTrace();
             exceptionHandler.handleException(exception);
         }
     }

diff --git a/desktop/src/main/java/bisq/desktop/main/dao/governance/proposals/ProposalsView.java b/desktop/src/main/java/bisq/desktop/main/dao/governance/proposals/ProposalsView.java
@@ -40,6 +40,7 @@
 import bisq.core.btc.listeners.BsqBalanceListener;
 import bisq.core.btc.wallet.BsqWalletService;
 import bisq.core.dao.DaoFacade;
+import bisq.core.dao.governance.blindvote.BlindVoteConsensus;
 import bisq.core.dao.governance.myvote.MyVote;
 import bisq.core.dao.governance.proposal.param.ChangeParamValidator;
 import bisq.core.dao.state.DaoStateListener;
@@ -261,10 +262,12 @@ public void onUpdateBalances(Coin confirmedBalance,
                                  Coin lockedForVotingBalance,
                                  Coin lockupBondsBalance,
                                  Coin unlockingBondsBalance) {
-        if (isBlindVotePhaseButNotLastBlock())
+        Coin blindVoteFee = BlindVoteConsensus.getFee(daoStateService, daoStateService.getChainHeight());
+        if (isBlindVotePhaseButNotLastBlock()) {
+            Coin availableForVoting = confirmedBalance.subtract(blindVoteFee);
             stakeInputTextField.setPromptText(Res.get("dao.proposal.myVote.stake.prompt",
-                    bsqFormatter.formatCoinWithCode(confirmedBalance)));
-        else
+                    bsqFormatter.formatCoinWithCode(availableForVoting)));
+        } else
             stakeInputTextField.setPromptText("");
     }
 
@@ -523,6 +526,7 @@ private void publishBlindVote(Coin stake) {
                 }, exception -> {
                     voteButtonBusyAnimation.stop();
                     voteButtonInfoLabel.setText("");
+                    updateViews();
                     new Popup<>().warning(exception.toString()).show();
                 });