From: Andrew Gundersen <gundersena@xavier.edu>
Date: Mon, 28 Jun 2021 16:36:25 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/dev' into dev
X-Git-Tag: v2.0.1~11^2~3
X-Git-Url: https://andrewgundersen.net/repos?a=commitdiff_plain;h=dd91a9ae9e402722d5c48398cf38a6ed5a38653c;p=mime-chat

Merge remote-tracking branch 'origin/dev' into dev

pulling connection status commits
---

dd91a9ae9e402722d5c48398cf38a6ed5a38653c
diff --cc src/render/listeners.ts
index 62f7cb7,3a7b547..90b3cc4
--- a/src/render/listeners.ts
+++ b/src/render/listeners.ts
@@@ -35,6 -36,7 +36,6 @@@ export const updateMessagesListener = n
  });
  
  export const connectionStatusListener = new IpcRendererListener({
-     channel: UPDATE_MESSAGE_CHANNEL,
+     channel: CONNECTION_STATUS_CHANNEL,
      listenerCallback: setConnectionStatus
  });
 -