1 files changed, 12 insertions, 1 deletions
diff --git a/shard/lib/app/chat.ex b/shard/lib/app/chat.ex
index 471d8f7..4752dc6 100644
--- a/shard/lib/app/chat.ex
+++ b/shard/lib/app/chat.ex
@@ -160,6 +160,7 @@ defmodule SApp.Chat do
             if mst2.root == new_root do
               # This was the only message missing, we are happy!
               state = %{state | mst: mst2}
+              GenServer.cast(state.block_store, {:set_roots, [mst2.root]})
               msg_callback(state, msgitem)
               state
             else
@@ -186,9 +187,19 @@ defmodule SApp.Chat do
 
   defp init_merge(state, new_root, source_peer) do
     # TODO: make the merge asynchronous
+    prev_last = for {x, true} <- MST.last(state.mst, nil, 100), into: MapSet.new, do: x
+
     mgmst = %{state.mst | root: new_root}
     mgmst = put_in(mgmst.store.prefer_ask, [source_peer])
-    mst = MST.merge(state.mst, mgmst, fn msgitem, true -> msg_callback(state, msgitem) end)
+    mst = MST.merge(state.mst, mgmst)
+
+    for {x, true} <- MST.last(mst, nil, 100) do
+      if not MapSet.member? prev_last, x do
+        msg_callback(state, x)
+      end
+    end
+
+    GenServer.cast(state.block_store, {:set_roots, [mst.root]})
     %{state | mst: mst}
   end