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

pulling connection status commits

diff --cc src/render/listeners.ts
index 62f7cb7d0ce5ce4f9b780f26462035d09963493b,3a7b5471a8462808a1d098fde68e020b2aa6f800..90b3cc45d8415c234e7a6990522b73a055a82823
--- 1/src/render/listeners.ts
--- 2/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
  });
 -

diff --cc src/session.ts
Simple merge