From f3f0987d4358ac9043c4f9038148d7bbd2adf23a Mon Sep 17 00:00:00 2001
From: Richard Ramos <info@richardramos.me>
Date: Wed, 1 Sep 2021 18:34:51 -0400
Subject: [PATCH] fix: wakuV2 mailserver cycle

---
 src/app/node/core.nim                               | 1 +
 src/app_service/tasks/marathon/mailserver/model.nim | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/app/node/core.nim b/src/app/node/core.nim
index 7c9b927a8b..bd463487d7 100644
--- a/src/app/node/core.nim
+++ b/src/app/node/core.nim
@@ -33,6 +33,7 @@ proc setPeers(self: NodeController, peers: seq[string]) =
 
 proc init*(self: NodeController) =
   self.isWakuV2 = self.status.settings.getWakuVersion() == 2
+  
   self.status.events.on(SignalType.Wallet.event) do(e:Args):
     self.view.setLastMessage($WalletSignal(e).blockNumber)
 
diff --git a/src/app_service/tasks/marathon/mailserver/model.nim b/src/app_service/tasks/marathon/mailserver/model.nim
index 241c51c624..676296e801 100644
--- a/src/app_service/tasks/marathon/mailserver/model.nim
+++ b/src/app_service/tasks/marathon/mailserver/model.nim
@@ -71,6 +71,9 @@ proc init*(self: MailserverModel) =
       "/../resources/fleets.json"
     else:
       "/../fleets.json"
+
+  self.wakuVersion = status_settings.getWakuVersion()
+
   let fleetConfig = readFile(joinPath(getAppDir(), fleets))
   self.fleet = newFleetModel(fleetConfig)
   self.wakuVersion = status_settings.getWakuVersion()
@@ -118,7 +121,7 @@ proc connect(self: MailserverModel, nodeAddr: string) =
     else:
       status_mailservers.update(nodeAddr)
       self.nodes[nodeAddr] = MailserverStatus.Connecting
-
+      
     self.lastConnectionAttempt = cpuTime()
 
   if connected: