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

Allow spending of unconfirmed BSQ change outputs #2482

Merged
merged 12 commits into from
Mar 4, 2019
Merged

Allow spending of unconfirmed BSQ change outputs #2482

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
03d0a22
Allow spending of unconfirmed BSQ change outputs
ManfredKarrer Mar 1, 2019
4332c16
Cleanup
ManfredKarrer Mar 1, 2019
e62557c
Merge branch 'master' into allow-spending-unconfirmed-bsq-utxs
ManfredKarrer Mar 2, 2019
9475cf2
Merge branch 'master' into allow-spending-unconfirmed-bsq-utxs
ManfredKarrer Mar 3, 2019
1802508
Fix BSQ balance display for unconfirmed change outputs
ManfredKarrer Mar 3, 2019
568be3d
Add missing check for isAvailableForSpending at unverifiedBalance
ManfredKarrer Mar 3, 2019
a0dd010
Fix balance update in case at vote result. Rename methods
ManfredKarrer Mar 3, 2019
8d73308
Refactor: Rename onParseTxsComplete to onParseBlockComplete
ManfredKarrer Mar 3, 2019
e414e91
Refactor: Rename onParseTxsCompleteAfterBatchProcessing to
ManfredKarrer Mar 3, 2019
c5a383d
Fix balance for confiscated bonds
ManfredKarrer Mar 3, 2019
afd9d9c
Fix table layout
ManfredKarrer Mar 4, 2019
c91792c
Fix incorrect BSQ validator in send BSQ view
ManfredKarrer Mar 4, 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
2 changes: 1 addition & 1 deletion desktop/src/main/java/bisq/desktop/main/dao/governance/proposals/ProposalsView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ private void updateListItems() {
onSelectProposal(null);
}

GUIUtil.setFitToRowsForTableView(tableView, 37, 28, 2, 4);
GUIUtil.setFitToRowsForTableView(tableView, 38, 28, 2, 6);
tableView.layout();
root.layout();
}
Expand Down
6 changes: 3 additions & 3 deletions desktop/src/main/java/bisq/desktop/main/dao/governance/result/VoteResultView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ private void fillCycleList() {
});
Collections.reverse(cycleListItemList);

GUIUtil.setFitToRowsForTableView(cyclesTableView, 24, 28, 2, 4);
GUIUtil.setFitToRowsForTableView(cyclesTableView, 25, 28, 2, 4);
}


Expand Down Expand Up @@ -409,7 +409,7 @@ private void createProposalsTable() {
ballotByProposalTxIdMap.get(evaluatedProposal.getProposalTxId()),
bsqFormatter))
.collect(Collectors.toList()));
GUIUtil.setFitToRowsForTableView(proposalsTableView, 33, 28, 2, 4);
GUIUtil.setFitToRowsForTableView(proposalsTableView, 25, 28, 2, 4);
}


Expand Down Expand Up @@ -480,7 +480,7 @@ private void createVotesTable() {
});

voteListItemList.sort(Comparator.comparing(VoteListItem::getBlindVoteTxId));
GUIUtil.setFitToRowsForTableView(votesTableView, 33, 28, 2, 4);
GUIUtil.setFitToRowsForTableView(votesTableView, 25, 28, 2, 4);
}


Expand Down