Rebased and merged

bisq-network · Nov 14, 2019 · 42a732f · 42a732f
1 parent 82df9b2
commit 42a732f
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 1 deletion.
diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties
@@ -1473,7 +1473,16 @@ dao.lockedInBonds=Locked in bonds
 dao.availableNonBsqBalance=Available non-BSQ balance (BTC)
 dao.totalBsqBalance=Total BSQ balance
 dao.reputationBalance=Merit Value (not spendable)
-
+<<<<<<< Upstream, based on origin/master
+=======
+<<<<<<< Upstream, based on origin/master
+=======
+<<<<<<< Upstream, based on bae6e7ab337e8129d03199b9cca99f3ee559c80b
+=======
+>>>>>>> 27527e9 Reputation BSQ added to BSQ Wallet screen - issue #3352 resolved.
+>>>>>>> 3c75c22 Reputation BSQ added to BSQ Wallet screen - issue #3352 resolved.
+
+>>>>>>> 58a1fb0 Reputation BSQ added.
 dao.tx.published.success=Your transaction has been successfully published.
 dao.proposal.menuItem.make=Make proposal
 dao.proposal.menuItem.browse=Browse open proposals

diff --git a/desktop/src/main/java/bisq/desktop/main/dao/wallet/BsqBalanceUtil.java b/desktop/src/main/java/bisq/desktop/main/dao/wallet/BsqBalanceUtil.java
@@ -24,7 +24,11 @@
 import bisq.core.btc.listeners.BsqBalanceListener;
 import bisq.core.btc.wallet.BsqWalletService;
 import bisq.core.btc.wallet.BtcWalletService;
+<<<<<<< Upstream, based on origin/master
 import bisq.core.dao.governance.blindvote.MyBlindVoteListService;
+=======
+import bisq.core.dao.DaoFacade;
+>>>>>>> 3c75c22 Reputation BSQ added to BSQ Wallet screen - issue #3352 resolved.
 import bisq.core.dao.state.DaoStateListener;
 import bisq.core.dao.state.DaoStateService;
 import bisq.core.dao.state.model.blockchain.Block;
@@ -57,7 +61,11 @@ public class BsqBalanceUtil implements BsqBalanceListener, DaoStateListener {
     private final BsqWalletService bsqWalletService;
     private final DaoStateService daoStateService;
     private final BsqFormatter bsqFormatter;
+<<<<<<< Upstream, based on origin/master
 	private MyBlindVoteListService myBlindVoteListService;
+=======
+	private final DaoFacade daoFacade;
+>>>>>>> 3c75c22 Reputation BSQ added to BSQ Wallet screen - issue #3352 resolved.
 
     // Displaying general BSQ info
     private TextField availableBalanceTextField, verifiedBalanceTextField, availableNonBsqBalanceTextField,
@@ -72,11 +80,20 @@ public class BsqBalanceUtil implements BsqBalanceListener, DaoStateListener {
     private BsqBalanceUtil(BsqWalletService bsqWalletService,
                            DaoStateService daoStateService,
                            BsqFormatter bsqFormatter, 
+<<<<<<< Upstream, based on origin/master
                            MyBlindVoteListService myBlindVoteListService) {
+=======
+                           BsqFormatter bsqFormatter, 
+                           DaoFacade daoFacade) {
+>>>>>>> 3c75c22 Reputation BSQ added to BSQ Wallet screen - issue #3352 resolved.
         this.bsqWalletService = bsqWalletService;
         this.daoStateService = daoStateService;
         this.bsqFormatter = bsqFormatter;
+<<<<<<< Upstream, based on origin/master
         this.myBlindVoteListService = myBlindVoteListService;
+=======
+        this.daoFacade = daoFacade;
+>>>>>>> 3c75c22 Reputation BSQ added to BSQ Wallet screen - issue #3352 resolved.
     }
 
 
@@ -138,7 +155,11 @@ public void onUpdateBalances(Coin availableBalance,
         availableNonBsqBalanceTextField.setText(bsqFormatter.formatBTCWithCode(availableNonBsqBalance.value));
 
         // Update reputationBalanceTextField
+<<<<<<< Upstream, based on origin/master
         reputationBalanceTextField.setText(bsqFormatter.formatBSQSatoshisWithCode(myBlindVoteListService.getCurrentlyAvailableMerit())); 
+=======
+        reputationBalanceTextField.setText(bsqFormatter.formatBSQSatoshisWithCode(daoFacade.getAvailableMerit())); 
+>>>>>>> 3c75c22 Reputation BSQ added to BSQ Wallet screen - issue #3352 resolved.
     }