From fb073c70566aedc00c5c31d958bfc8226cac8fc0 Mon Sep 17 00:00:00 2001 From: Niyi Dada Date: Sun, 6 Oct 2019 18:45:16 +0100 Subject: [PATCH 1/3] BSQ Merit now displayed - fixes issue #3352 --- .../main/resources/i18n/displayStrings.properties | 1 + .../bisq/desktop/main/dao/wallet/BsqBalanceUtil.java | 12 ++++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/core/src/main/resources/i18n/displayStrings.properties b/core/src/main/resources/i18n/displayStrings.properties index aae6f7ad16a..3e4b18ed5be 100644 --- a/core/src/main/resources/i18n/displayStrings.properties +++ b/core/src/main/resources/i18n/displayStrings.properties @@ -1472,6 +1472,7 @@ dao.lockedForVoteBalance=Used for voting dao.lockedInBonds=Locked in bonds dao.availableNonBsqBalance=Available non-BSQ balance (BTC) dao.totalBsqBalance=Total BSQ balance +dao.reputationBalance=Merit Value (not spendable) dao.tx.published.success=Your transaction has been successfully published. dao.proposal.menuItem.make=Make proposal 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 index 9e7dc5b36a9..7f3595e2316 100644 --- a/desktop/src/main/java/bisq/desktop/main/dao/wallet/BsqBalanceUtil.java +++ b/desktop/src/main/java/bisq/desktop/main/dao/wallet/BsqBalanceUtil.java @@ -23,6 +23,7 @@ import bisq.core.btc.listeners.BsqBalanceListener; import bisq.core.btc.wallet.BsqWalletService; +import bisq.core.dao.DaoFacade; import bisq.core.dao.state.DaoStateListener; import bisq.core.dao.state.DaoStateService; import bisq.core.dao.state.model.blockchain.Block; @@ -49,11 +50,12 @@ public class BsqBalanceUtil implements BsqBalanceListener, DaoStateListener { private final BsqWalletService bsqWalletService; private final DaoStateService daoStateService; private final BsqFormatter bsqFormatter; + private final DaoFacade daoFacade; // Displaying general BSQ info private TextField availableBalanceTextField, verifiedBalanceTextField, availableNonBsqBalanceTextField, unverifiedBalanceTextField, lockedForVoteBalanceTextField, - lockedInBondsBalanceTextField, unconfirmedChangTextField; + lockedInBondsBalanceTextField, unconfirmedChangTextField, reputationBalanceTextField; // Displaying bond dashboard info private TextField lockupAmountTextField, unlockingAmountTextField; @@ -62,10 +64,12 @@ public class BsqBalanceUtil implements BsqBalanceListener, DaoStateListener { @Inject private BsqBalanceUtil(BsqWalletService bsqWalletService, DaoStateService daoStateService, - BsqFormatter bsqFormatter) { + BsqFormatter bsqFormatter, + DaoFacade daoFacade) { this.bsqWalletService = bsqWalletService; this.daoStateService = daoStateService; this.bsqFormatter = bsqFormatter; + this.daoFacade = daoFacade; } @@ -125,6 +129,8 @@ public void onUpdateBalances(Coin availableBalance, availableNonBsqBalanceTextField.setVisible(isNonBsqBalanceAvailable); availableNonBsqBalanceTextField.setManaged(isNonBsqBalanceAvailable); availableNonBsqBalanceTextField.setText(bsqFormatter.formatBTCWithCode(availableNonBsqBalance.value)); + + reputationBalanceTextField.setText(bsqFormatter.formatBSQSatoshisWithCode(daoFacade.getAvailableMerit())); } @@ -162,6 +168,8 @@ public int addGroup(GridPane gridPane, int gridRow) { Res.get("dao.lockedForVoteBalance"), Layout.FIRST_ROW_DISTANCE).second; lockedInBondsBalanceTextField = FormBuilder.addTopLabelReadOnlyTextField(gridPane, ++gridRow, columnIndex, Res.get("dao.lockedInBonds")).second; + reputationBalanceTextField = FormBuilder.addTopLabelReadOnlyTextField(gridPane, ++gridRow, columnIndex, + Res.get("dao.reputationBalance")).second; Tuple3 tuple3 = FormBuilder.addTopLabelReadOnlyTextField(gridPane, ++gridRow, columnIndex, Res.get("dao.availableNonBsqBalance")); // Match left column From 07119470ffb886adbce50ca3561d1f7594ff9460 Mon Sep 17 00:00:00 2001 From: Niyi Dada Date: Mon, 18 Nov 2019 15:47:53 +0100 Subject: [PATCH 2/3] Broke merit text setting to 2 lines. --- .../main/java/bisq/desktop/main/dao/wallet/BsqBalanceUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 index 7f3595e2316..f65637c9349 100644 --- a/desktop/src/main/java/bisq/desktop/main/dao/wallet/BsqBalanceUtil.java +++ b/desktop/src/main/java/bisq/desktop/main/dao/wallet/BsqBalanceUtil.java @@ -130,7 +130,8 @@ public void onUpdateBalances(Coin availableBalance, availableNonBsqBalanceTextField.setManaged(isNonBsqBalanceAvailable); availableNonBsqBalanceTextField.setText(bsqFormatter.formatBTCWithCode(availableNonBsqBalance.value)); - reputationBalanceTextField.setText(bsqFormatter.formatBSQSatoshisWithCode(daoFacade.getAvailableMerit())); + String bsqSatoshi = bsqFormatter.formatBSQSatoshisWithCode(daoFacade.getAvailableMerit()); + reputationBalanceTextField.setText(bsqSatoshi); } From 8cfe221bbfe532a7f33848e1ab62cf339a86556b Mon Sep 17 00:00:00 2001 From: Niyi Dada Date: Tue, 19 Nov 2019 15:16:17 +0100 Subject: [PATCH 3/3] Fix formatting --- .../main/java/bisq/desktop/main/dao/wallet/BsqBalanceUtil.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 index f65637c9349..eb92c889c6a 100644 --- a/desktop/src/main/java/bisq/desktop/main/dao/wallet/BsqBalanceUtil.java +++ b/desktop/src/main/java/bisq/desktop/main/dao/wallet/BsqBalanceUtil.java @@ -129,9 +129,8 @@ public void onUpdateBalances(Coin availableBalance, availableNonBsqBalanceTextField.setVisible(isNonBsqBalanceAvailable); availableNonBsqBalanceTextField.setManaged(isNonBsqBalanceAvailable); availableNonBsqBalanceTextField.setText(bsqFormatter.formatBTCWithCode(availableNonBsqBalance.value)); - String bsqSatoshi = bsqFormatter.formatBSQSatoshisWithCode(daoFacade.getAvailableMerit()); - reputationBalanceTextField.setText(bsqSatoshi); + reputationBalanceTextField.setText(bsqSatoshi); }