mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-24 15:10:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

BSQ Merit now displayed - fixes issue #3352

Browse source
This commit is contained in:
Niyi Dada 2019-10-06 18:45:16 +01:00
parent bae6e7ab33
commit fb073c7056
No known key found for this signature in database
GPG key ID: 9EA74873E269CB4E
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/src/main/resources/i18n/displayStrings.properties
View file

@ -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

12
desktop/src/main/java/bisq/desktop/main/dao/wallet/BsqBalanceUtil.java
View file

@ -23,6 +23,7 @@ import bisq.desktop.util.Layout;
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 class BsqBalanceUtil implements BsqBalanceListener, DaoStateListener {
availableNonBsqBalanceTextField.setVisible(isNonBsqBalanceAvailable);
availableNonBsqBalanceTextField.setManaged(isNonBsqBalanceAvailable);
availableNonBsqBalanceTextField.setText(bsqFormatter.formatBTCWithCode(availableNonBsqBalance.value));
reputationBalanceTextField.setText(bsqFormatter.formatBSQSatoshisWithCode(daoFacade.getAvailableMerit()));
}
@ -162,6 +168,8 @@ public class BsqBalanceUtil implements BsqBalanceListener, DaoStateListener {
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<Label, TextField, VBox> tuple3 = FormBuilder.addTopLabelReadOnlyTextField(gridPane, ++gridRow, columnIndex,
Res.get("dao.availableNonBsqBalance"));
// Match left column