Only show accepted bonded roles in bond view.

Fixes bisq-network#3271 Replaces bisq-network#3320
chimp1984 · Nov 24, 2019 · ff10f7c · ff10f7c
1 parent d12a404
commit ff10f7c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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()));