Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reputation BSQ added to BSQ Wallet screen #3366

Merged
merged 3 commits into from Nov 26, 2019
+11 −2
Merged

Reputation BSQ added to BSQ Wallet screen #3366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fb073c7
BSQ Merit now displayed - fixes issue #3352
niyid Oct 6, 2019
0711947
Broke merit text setting to 2 lines.
niyid Nov 18, 2019
8cfe221
Fix formatting
niyid Nov 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions core/src/main/resources/i18n/displayStrings.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 10 additions & 2 deletions desktop/src/main/java/bisq/desktop/main/dao/wallet/BsqBalanceUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
}


Expand Down Expand Up @@ -125,6 +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);
}


Expand Down Expand Up @@ -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<Label, TextField, VBox> tuple3 = FormBuilder.addTopLabelReadOnlyTextField(gridPane, ++gridRow, columnIndex,
Res.get("dao.availableNonBsqBalance"));
// Match left column
Expand Down