From ff10f7cf3f8f2ae35fb699cc057839d6ee26dfb5 Mon Sep 17 00:00:00 2001
From: chimp1984 <chimp1984@gmx.com>
Date: Sun, 24 Nov 2019 13:10:10 -0500
Subject: [PATCH] Only show accepted bonded roles in bond view.

Fixes #3271

Replaces https://github.com/bisq-network/bisq/pull/3320
---
 core/src/main/java/bisq/core/dao/DaoFacade.java           | 4 ++++
 .../dao/governance/bond/role/BondedRolesRepository.java   | 8 ++++++++
 .../bisq/desktop/main/dao/bonding/roles/RolesView.java    | 2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/bisq/core/dao/DaoFacade.java b/core/src/main/java/bisq/core/dao/DaoFacade.java
index 0f9d1fa113d..d8d4ec72021 100644
--- a/core/src/main/java/bisq/core/dao/DaoFacade.java
+++ b/core/src/main/java/bisq/core/dao/DaoFacade.java
@@ -294,6 +294,10 @@ public ObservableList<BondedRole> getBondedRoles() {
         return bondedRolesRepository.getBonds();
     }
 
+    public List<BondedRole> getAcceptedBondedRoles() {
+        return bondedRolesRepository.getAcceptedBonds();
+    }
+
     // Show fee
     public Coin getProposalFee(int chainHeight) {
         return ProposalConsensus.getFee(daoStateService, chainHeight);
diff --git a/core/src/main/java/bisq/core/dao/governance/bond/role/BondedRolesRepository.java b/core/src/main/java/bisq/core/dao/governance/bond/role/BondedRolesRepository.java
index a262712cf55..e9b976fe2da 100644
--- a/core/src/main/java/bisq/core/dao/governance/bond/role/BondedRolesRepository.java
+++ b/core/src/main/java/bisq/core/dao/governance/bond/role/BondedRolesRepository.java
@@ -32,6 +32,7 @@
 import javax.inject.Inject;
 
 import java.util.Arrays;
+import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -74,6 +75,13 @@ public Optional<RoleProposal> getAcceptedBondedRoleProposal(Role role) {
     }
 
 
+    public List<BondedRole> getAcceptedBonds() {
+        return bonds.stream()
+                .filter(bondedRole -> getAcceptedBondedRoleProposal(bondedRole.getBondedAsset()).isPresent())
+                .collect(Collectors.toList());
+    }
+
+
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Protected
     ///////////////////////////////////////////////////////////////////////////////////////////
diff --git a/desktop/src/main/java/bisq/desktop/main/dao/bonding/roles/RolesView.java b/desktop/src/main/java/bisq/desktop/main/dao/bonding/roles/RolesView.java
index 595c45d16d9..febf166e449 100644
--- a/desktop/src/main/java/bisq/desktop/main/dao/bonding/roles/RolesView.java
+++ b/desktop/src/main/java/bisq/desktop/main/dao/bonding/roles/RolesView.java
@@ -120,7 +120,7 @@ protected void deactivate() {
     ///////////////////////////////////////////////////////////////////////////////////////////
 
     private void updateList() {
-        observableList.setAll(daoFacade.getBondedRoles().stream()
+        observableList.setAll(daoFacade.getAcceptedBondedRoles().stream()
                 .map(bond -> new RolesListItem(bond, daoFacade))
                 .sorted(Comparator.comparing(RolesListItem::getLockupDate).reversed())
                 .collect(Collectors.toList()));