From 277084ce391c94999d368b8a14edc35ef62386c2 Mon Sep 17 00:00:00 2001
From: Christoph Atteneder <christoph.atteneder@gmail.com>
Date: Tue, 12 Feb 2019 15:02:11 +0100
Subject: [PATCH] Update view on activation with block at current chain height

---
 core/src/main/java/bisq/core/dao/DaoFacade.java          | 9 +++++++++
 .../main/dao/governance/make/MakeProposalView.java       | 6 +++++-
 2 files changed, 14 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 149a28c8daa..21c29f132a8 100644
--- a/core/src/main/java/bisq/core/dao/DaoFacade.java
+++ b/core/src/main/java/bisq/core/dao/DaoFacade.java
@@ -55,6 +55,7 @@
 import bisq.core.dao.state.DaoStateListener;
 import bisq.core.dao.state.DaoStateService;
 import bisq.core.dao.state.DaoStateStorageService;
+import bisq.core.dao.state.model.blockchain.Block;
 import bisq.core.dao.state.model.blockchain.Tx;
 import bisq.core.dao.state.model.blockchain.TxOutput;
 import bisq.core.dao.state.model.blockchain.TxOutputKey;
@@ -484,6 +485,14 @@ public int getChainHeight() {
         return daoStateService.getChainHeight();
     }
 
+    public Optional<Block> getBlockAtChainHeight() {
+        return getBlockAtHeight(getChainHeight());
+    }
+
+    public Optional<Block> getBlockAtHeight(int chainHeight) {
+        return daoStateService.getBlockAtHeight(chainHeight);
+    }
+
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Use case: Bonding
diff --git a/desktop/src/main/java/bisq/desktop/main/dao/governance/make/MakeProposalView.java b/desktop/src/main/java/bisq/desktop/main/dao/governance/make/MakeProposalView.java
index 2f41c4fc847..9c4cd8b1ae1 100644
--- a/desktop/src/main/java/bisq/desktop/main/dao/governance/make/MakeProposalView.java
+++ b/desktop/src/main/java/bisq/desktop/main/dao/governance/make/MakeProposalView.java
@@ -85,6 +85,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.annotation.Nullable;
@@ -199,7 +200,10 @@ protected void activate() {
         if (makeProposalButton != null)
             setMakeProposalButtonHandler();
 
-        onNewBlockHeight(daoFacade.getChainHeight());
+        Optional<Block> blockAtChainHeight = daoFacade.getBlockAtChainHeight();
+
+        if (blockAtChainHeight.isPresent())
+            onParseTxsCompleteAfterBatchProcessing(blockAtChainHeight.get());
     }
 
     @Override