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

Fix get all bonds not returning not active bonds #2576

Merged
merged 3 commits into from
Mar 25, 2019
Merged

Fix get all bonds not returning not active bonds #2576

merged 3 commits into from
Mar 25, 2019

Conversation

ManfredKarrer
Copy link
Member

Completes #2526

@ManfredKarrer ManfredKarrer mentioned this pull request Mar 23, 2019
Closed
@ManfredKarrer ManfredKarrer added this to the v0.9.6 milestone Mar 23, 2019
@ManfredKarrer ManfredKarrer self-assigned this Mar 23, 2019
devinbileck
devinbileck approved these changes Mar 25, 2019
View reviewed changes
Copy link
Member

@devinbileck devinbileck left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK
Aside from the conflict...

ben-kaufman and others added 3 commits March 25, 2019 10:05
@ben-kaufman @ripcurlx
Fix get all bonds not returning not active bonds
5c066a6 
Fix bisq-network#2522
@ben-kaufman @ripcurlx
Disallow proposing to confiscate inactive bonds
f1077b8
@ManfredKarrer @ripcurlx
Complete pull request
a9aaef7 
We only want to show active bonds in the list for confiscation.
The Inactive bond label is not necessary in the vote result as a
confiscated bond is inactive anyway. Intention was probably to show it
as inactive in the proposal display but they will be filtered out
anyway there.
ripcurlx
ripcurlx approved these changes Mar 25, 2019
View reviewed changes
Copy link
Contributor

@ripcurlx ripcurlx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK - and resolved conflict with master.

@ripcurlx ripcurlx merged commit f65b340 into bisq-network:master Mar 25, 2019
@ManfredKarrer ManfredKarrer deleted the mk-fix-get-all-bonds branch March 25, 2019 13:28
@devinbileck devinbileck mentioned this pull request Mar 26, 2019
Closed
@ripcurlx ripcurlx mentioned this pull request Mar 28, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ripcurlx ripcurlx ripcurlx approved these changes

@devinbileck devinbileck devinbileck approved these changes

@ben-kaufman ben-kaufman Awaiting requested review from ben-kaufman

Assignees

@ManfredKarrer ManfredKarrer

Labels
in:dao
Projects
None yet
Milestone
v0.9.6
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@ManfredKarrer @ripcurlx @devinbileck @ben-kaufman