From c1e53285e627845dc15b5a88976c628919025c00 Mon Sep 17 00:00:00 2001
From: Emmanouil Konstantinidis <hello@manos.im>
Date: Sat, 12 Dec 2020 21:35:24 +0000
Subject: [PATCH 1/2] fix: Hide dock icon & update electron

---
 main.js      | 11 +++--------
 package.json |  2 +-
 yarn.lock    |  8 ++++----
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/main.js b/main.js
index f6ad081f1..92be54d21 100644
--- a/main.js
+++ b/main.js
@@ -26,13 +26,6 @@ const browserWindowOpts = {
   },
 };
 
-const delayedHideAppIcon = () =>
-  // Setting a timeout because the showDockIcon is not currently working
-  // See more at https://github.com/maxogden/menubar/issues/306
-  setTimeout(() => {
-    app.dock.hide();
-  }, 1500);
-
 app.on('ready', async () => {
   await onFirstRunMaybe();
 });
@@ -45,7 +38,9 @@ const menubarApp = menubar({
 });
 
 menubarApp.on('ready', () => {
-  delayedHideAppIcon();
+  if (app.dock && app.dock.hide) {
+    app.dock.hide();
+  }
 
   menubarApp.tray.setIgnoreDoubleClickEvents(true);
 
diff --git a/package.json b/package.json
index 54d4f6806..51de2af30 100644
--- a/package.json
+++ b/package.json
@@ -144,7 +144,7 @@
     "@types/react-transition-group": "^4.2.4",
     "@types/styled-components": "^5.0.1",
     "css-loader": "^5.0.1",
-    "electron": "^11.0.2",
+    "electron": "^11.1.0",
     "electron-builder": "^22.9.1",
     "electron-notarize": "^1.0.0",
     "jest": "^26.6.3",
diff --git a/yarn.lock b/yarn.lock
index 927ee4cc9..18a7d5824 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2215,10 +2215,10 @@ electron-updater@^4.3.5:
     lodash.isequal "^4.5.0"
     semver "^7.3.2"
 
-electron@^11.0.2:
-  version "11.0.2"
-  resolved "https://registry.yarnpkg.com/electron/-/electron-11.0.2.tgz#c7bd2b9abdc1446f4578dbfa22573014b6b2df58"
-  integrity sha512-FTYtCm0oj8B8EJhp99BQSW2bd40xYEG/txMj+W3Ed0CNu5zVIIXb5WIrhXLvhcasN5LKy9nkmSZ+u220lCaARg==
+electron@^11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/electron/-/electron-11.1.0.tgz#8dfdf579d1eb79feef3e3d2937fc022e72129c90"
+  integrity sha512-RFAhR/852VMaRd9NSe7jprwSoG9dLc6u1GwnqRWg+/3cy/8Zrwt1Betw1lXiZH7hGuB9K2cqju83Xv5Pq5ZSGA==
   dependencies:
     "@electron/get" "^1.0.1"
     "@types/node" "^12.0.12"

From 57db78d30cd6d9245e554f768fcb957fe5bf42ea Mon Sep 17 00:00:00 2001
From: Emmanouil Konstantinidis <hello@manos.im>
Date: Sat, 12 Dec 2020 21:54:16 +0000
Subject: [PATCH 2/2] chore: Rollback to timeout and run only if dock exists
 (fix Windows)

---
 main.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/main.js b/main.js
index 92be54d21..44af2e6c8 100644
--- a/main.js
+++ b/main.js
@@ -26,6 +26,16 @@ const browserWindowOpts = {
   },
 };
 
+const delayedHideAppIcon = () => {
+  if (app.dock && app.dock.hide) {
+    // Setting a timeout because the showDockIcon is not currently working
+    // See more at https://github.com/maxogden/menubar/issues/306
+    setTimeout(() => {
+      app.dock.hide();
+    }, 1500);
+  }
+};
+
 app.on('ready', async () => {
   await onFirstRunMaybe();
 });
@@ -38,9 +48,7 @@ const menubarApp = menubar({
 });
 
 menubarApp.on('ready', () => {
-  if (app.dock && app.dock.hide) {
-    app.dock.hide();
-  }
+  delayedHideAppIcon();
 
   menubarApp.tray.setIgnoreDoubleClickEvents(true);