From dd379676fdaad8454ef630ee1e073d493a0f7829 Mon Sep 17 00:00:00 2001
From: Maciej Hirsz <1096222+maciejhirsz@users.noreply.github.com>
Date: Sun, 30 Sep 2018 09:43:03 +0200
Subject: [PATCH] Clear nodes on re-subbing (#69)

---
 packages/backend/src/Aggregator.ts  | 2 +-
 packages/common/src/index.ts        | 2 +-
 packages/frontend/src/Connection.ts | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/Aggregator.ts b/packages/backend/src/Aggregator.ts
index 175a33d..f730ea3 100644
--- a/packages/backend/src/Aggregator.ts
+++ b/packages/backend/src/Aggregator.ts
@@ -33,8 +33,8 @@ export default class Aggregator {
       const chain = this.chains.get(label);
 
       if (chain) {
-        chain.addFeed(feed);
         feed.sendMessage(Feed.subscribedTo(label));
+        chain.addFeed(feed);
       }
     });
 
diff --git a/packages/common/src/index.ts b/packages/common/src/index.ts
index 1c06a99..7500fb1 100644
--- a/packages/common/src/index.ts
+++ b/packages/common/src/index.ts
@@ -8,4 +8,4 @@ import * as FeedMessage from './feed';
 export { Types, FeedMessage };
 
 // Increment this if breaking changes were made to types in `feed.ts`
-export const VERSION: Types.FeedVersion = 15 as Types.FeedVersion;
+export const VERSION: Types.FeedVersion = 16 as Types.FeedVersion;
diff --git a/packages/frontend/src/Connection.ts b/packages/frontend/src/Connection.ts
index 74a6107..6002147 100644
--- a/packages/frontend/src/Connection.ts
+++ b/packages/frontend/src/Connection.ts
@@ -281,7 +281,10 @@ export class Connection {
         }
 
         case Actions.SubscribedTo: {
-          this.state = this.update({ subscribed: message.payload });
+          nodes.clear();
+          sortedNodes = [];
+
+          this.state = this.update({ subscribed: message.payload, nodes, sortedNodes });
 
           continue messages;
         }